Cleanup of the server main and socket binding as server

Author: mgrojo

server/src/coap_server.adb

@@ -7,16 +7,10 @@ with Secure_Server;
 with CoAP_SPARK.Channel;
 with CoAP_SPARK.Server_Session;
 with CoAP_SPARK.Log;
-with CoAP_SPARK.Messages;
-with CoAP_SPARK.URI;
 with CoAP_SPARK.Utils;
 
-with Interfaces;
-
 with RFLX.CoAP_Server.Main_Loop_Environment;
 with RFLX.CoAP_Server.Main_Loop.FSM;
-with RFLX.CoAP;
-with RFLX.RFLX_Types;
 
 -- The following package is used, instead of Ada.Command_Line, for the reasons
 -- explained in the package itself (related to the use of SPARK).
@@ -29,12 +23,8 @@ with Server_Handling;
 procedure CoAP_Server is
    package FSM renames RFLX.CoAP_Server.Main_Loop.FSM;
    package Main_Loop_Environment renames RFLX.CoAP_Server.Main_Loop_Environment;
-   package Types renames RFLX.RFLX_Types;
-   package Channel renames CoAP_SPARK.Channel;
 
    use type CoAP_SPARK.Status_Type;
-   use type Types.Index;
-   use type Types.Bytes_Ptr;
 
    procedure Usage (Is_Failure : Boolean := True) is
       procedure Put (Text : String;
@@ -44,7 +34,7 @@ procedure CoAP_Server is
                           Level : CoAP_SPARK.Log.Level_Type := CoAP_SPARK.Log.Info)
          renames CoAP_SPARK.Log.Put_Line;
    begin
-      Put ("Usage: coap_server [-p PORT] [-A <Address>] ");
+      Put ("Usage: coap_server [-p PORT] [-A <Address>] "); -- TODO add Address
       Put_Line ("[-k <PSK>] [-u <Identity>] [-v <verbosity>] ");
 
       Ada.Command_Line.Set_Exit_Status
@@ -55,59 +45,20 @@ procedure CoAP_Server is
    end Usage;
 
    procedure Run_Session
-     (Method : RFLX.CoAP.Method_Code;
-      URI_String : String;
-      Payload : in out CoAP_SPARK.Messages.Payload_Ptr)
-   with
-      Pre =>
-        URI_String'Length <= CoAP_SPARK.Max_URI_Length
+     (Port      : CoAP_SPARK.Channel.Port_Type;
+      Is_Secure : Boolean)
    is
-      URI        : constant CoAP_SPARK.URI.URI :=
-        CoAP_SPARK.URI.Create (URI_String);
-      Ctx        : FSM.Context;
-      Skt        :
-        CoAP_SPARK.Channel.Socket_Type
-          (Is_Secure =>
-             CoAP_SPARK.URI.Scheme (URI) = CoAP_SPARK.Secure_Scheme);
-      Valid_URI : Boolean := True;
-   begin
-
-      if URI_String = "" or else URI_String (URI_String'First) = '-' then
-         CoAP_SPARK.Log.Put ("Unrecognized option: ", CoAP_SPARK.Log.Error);
-         CoAP_SPARK.Log.Put_Line (URI_String, CoAP_SPARK.Log.Error);
-         Valid_URI := False;
-      elsif not CoAP_SPARK.URI.Is_Valid (URI)
-        or else not CoAP_SPARK.URI.Has_Valid_Lengths (URI)
-      then
-         CoAP_SPARK.Log.Put ("Invalid URI: ", CoAP_SPARK.Log.Error);
-         CoAP_SPARK.Log.Put_Line (URI_String, CoAP_SPARK.Log.Error);
-         Valid_URI := False;
-      end if;
 
-      if not Valid_URI then
-         Usage;
-         return;
-      end if;
-
-      CoAP_SPARK.Log.Put ("Method: ");
-      CoAP_SPARK.Log.Put_Line (RFLX.CoAP.Method_Code'Image (Method));
-      CoAP_SPARK.Log.Put ("Scheme: ");
-      CoAP_SPARK.Log.Put_Line (CoAP_SPARK.URI.Scheme (URI));
-      CoAP_SPARK.Log.Put ("Host: ");
-      CoAP_SPARK.Log.Put_Line (CoAP_SPARK.URI.Host (URI));
-      CoAP_SPARK.Log.Put ("Port:");
-      CoAP_SPARK.Log.Put_Line
-        (Interfaces.Unsigned_16'Image (CoAP_SPARK.URI.Port (URI)));
-      CoAP_SPARK.Log.Put ("Path: ");
-      CoAP_SPARK.Log.Put_Line (CoAP_SPARK.URI.Path (URI));
-      CoAP_SPARK.Log.Put ("Query: ");
-      CoAP_SPARK.Log.Put_Line (CoAP_SPARK.URI.Query (URI));
+      Ctx : FSM.Context;
+      Skt : CoAP_SPARK.Channel.Socket_Type (Is_Secure);
+   begin
 
-      Secure_Server.Initialize (Socket => Skt);
+      Secure_Server.Initialize
+        (Socket => Skt,
+         Port   => Port);
       if not CoAP_SPARK.Channel.Is_Valid (Skt) then
          CoAP_SPARK.Log.Put_Line
            ("Communication problems.", CoAP_SPARK.Log.Error);
-         RFLX.RFLX_Types.Free (Payload);
          return;
       end if;
 
@@ -118,29 +69,13 @@ procedure CoAP_Server is
       if Ctx.E.Current_Status /= CoAP_SPARK.OK then
          CoAP_SPARK.Log.Put_Line
            (Ctx.E.Current_Status'Image, CoAP_SPARK.Log.Error);
-         RFLX.RFLX_Types.Free (Payload);
          --  Main_Loop_Environment.Finalize (Ctx.E);
          --  pragma Assert (Main_Loop_Environment.Is_Finalized (Ctx.E));
          return;
       end if;
       pragma Assert (FSM.Uninitialized (Ctx));
 
       FSM.Initialize (Ctx);
-      Channel.Connect
-        (Socket => Skt,
-         Server => CoAP_SPARK.URI.Host (URI),
-         Port   => CoAP_SPARK.Channel.Port_Type (CoAP_SPARK.URI.Port (URI)));
-
-      if not CoAP_SPARK.Channel.Is_Valid (Skt) then
-         CoAP_SPARK.Log.Put_Line
-           ("Connection problems.", CoAP_SPARK.Log.Error);
-         RFLX.RFLX_Types.Free (Payload);
-         FSM.Finalize (Ctx);
-         pragma Assert (FSM.Uninitialized (Ctx));
-         --  Main_Loop_Environment.Finalize (Ctx.E);
-         --  pragma Assert (Main_Loop_Environment.Is_Finalized (Ctx.E));
-         return;
-      end if;
 
       CoAP_SPARK.Server_Session.Run_Session_Loop (Ctx, Skt);
 
@@ -154,17 +89,16 @@ procedure CoAP_Server is
       --  pragma Assert (Main_Loop_Environment.Is_Finalized (Ctx.E));
    end Run_Session;
 
-   Method : RFLX.CoAP.Method_Code := RFLX.CoAP.Get;
-   Payload : CoAP_SPARK.Messages.Payload_Ptr := null;
-
+   Port : CoAP_SPARK.Channel.Port_Type := CoAP_SPARK.Default_Port;
    Argument_Index : Natural := 1;
 
    Valid_Command_Line : Boolean := True;
+   Is_Secure          : Boolean := False;
 begin
 
-   if Ada.Command_Line.Argument_Count = 0
-     or else Ada.Command_Line.Argument (1) = "-h"
-     or else Ada.Command_Line.Argument (1) = "--help"
+   if Ada.Command_Line.Argument_Count = 1
+     and then (Ada.Command_Line.Argument (1) = "-h"
+               or else Ada.Command_Line.Argument (1) = "--help")
    then
       Usage (Is_Failure => False);
       return;
@@ -181,45 +115,29 @@ begin
       return;
    end if;
 
+   -- Any other single command line argument is an error, since all remaining
+   --  ones are an option and a value.
+   if Ada.Command_Line.Argument_Count = 1 then
+      Usage (Is_Failure => True);
+      return;
+   end if;
+
    while Argument_Index < Ada.Command_Line.Argument_Count loop
 
-      if Ada.Command_Line.Argument (Argument_Index) = "-m" then
+      if Ada.Command_Line.Argument (Argument_Index) = "-p" then
          Argument_Index := @ + 1;
-         if CoAP_SPARK.Utils.Is_Valid_As_Method
+         if CoAP_SPARK.Utils.Valid_Unsigned_16_Values.Is_Valid_As_Number
               (Ada.Command_Line.Argument (Argument_Index))
          then
-            Method := CoAP_SPARK.Utils.Value
-                (Ada.Command_Line.Argument (Argument_Index));
+            Port :=
+              CoAP_SPARK.Channel.Port_Type
+                (CoAP_SPARK.Utils.Valid_Unsigned_16_Values.Value
+                   (Ada.Command_Line.Argument (Argument_Index)));
          else
-            CoAP_SPARK.Log.Put_Line ("Invalid method", CoAP_SPARK.Log.Error);
+            CoAP_SPARK.Log.Put_Line ("Invalid specified port", CoAP_SPARK.Log.Error);
             Valid_Command_Line := False;
          end if;
 
-      elsif Ada.Command_Line.Argument (Argument_Index) = "-e" then
-         Argument_Index := @ + 1;
-         declare
-            Payload_Length : constant Natural :=
-              Ada.Command_Line.Argument (Argument_Index)'Length;
-         begin
-            if Payload_Length = 0
-              or else Payload_Length > CoAP_SPARK.Max_Payload_Length
-            then
-               CoAP_SPARK.Log.Put_Line
-                 ("Payload too long", CoAP_SPARK.Log.Error);
-               Valid_Command_Line := False;
-            elsif Payload /= null then
-               CoAP_SPARK.Log.Put_Line
-                 ("Payload already provided", CoAP_SPARK.Log.Error);
-               Valid_Command_Line := False;
-            else
-               Payload :=
-                 new Types.Bytes'(1 .. Types.Index (Payload_Length) => 0);
-               CoAP_SPARK.Utils.Copy_String
-                 (Source => Ada.Command_Line.Argument (Argument_Index),
-                  Target => Payload.all);
-            end if;
-         end;
-
       elsif Ada.Command_Line.Argument (Argument_Index) = "-v" then
          Argument_Index := @ + 1;
          if CoAP_SPARK.Utils.Valid_Natural_Values.Is_Valid_As_Number
@@ -251,16 +169,11 @@ begin
             Valid_Command_Line := False;
          end if;
 
-      elsif Ada.Command_Line.Argument (Argument_Index) = "-B" then
-         -- This is allowed but not implemented. For compatibility to
-         -- libcoap's coap-server, which uses this switch for specifying a
-         -- timeout.
-         Argument_Index := @ + 1;
-
       elsif Ada.Command_Line.Argument (Argument_Index) = "-k"
         or else Ada.Command_Line.Argument (Argument_Index) = "-u"
       then
          Argument_Index := @ + 1;
+         Is_Secure := True;
 
          if Argument_Index = Ada.Command_Line.Argument_Count then
             CoAP_SPARK.Log.Put ("Missing argument for ", CoAP_SPARK.Log.Error);
@@ -277,37 +190,20 @@ begin
          Valid_Command_Line := False;
       end if;
 
-      if Valid_Command_Line and Argument_Index = Ada.Command_Line.Argument_Count
-      then
-         CoAP_SPARK.Log.Put_Line ("URI is missing", CoAP_SPARK.Log.Error);
-         Valid_Command_Line := False;
-      end if;
-
       exit when not Valid_Command_Line;
 
       pragma Loop_Invariant (Argument_Index < Ada.Command_Line.Argument_Count);
       Argument_Index := @ + 1;
    end loop;
 
-   if Ada.Command_Line.Argument (Argument_Index)'Length
-     > CoAP_SPARK.Max_URI_Length
-   then
-      CoAP_SPARK.Log.Put_Line ("URI too long", CoAP_SPARK.Log.Error);
-      Valid_Command_Line := False;
-   end if;
-
    if not Valid_Command_Line then
-      RFLX.RFLX_Types.Free (Payload);
       Usage;
       return;
    end if;
 
    Run_Session
-     (URI_String => Ada.Command_Line.Argument (Argument_Index),
-      Method     => Method,
-      Payload    => Payload);
-
-   RFLX.RFLX_Types.Free (Payload);
+     (Port      => Port,
+      Is_Secure => Is_Secure);
 
    -- This has no effect, but it is needed to avoid a linking error with
    -- SPARKLib in the validation profile.

server/src/secure_server.adb

@@ -92,14 +92,19 @@ is
       end;
    end PSK_Server_Callback;
 
-   procedure Initialize (Socket : out CoAP_SPARK.Channel.Socket_Type)
-   with SPARK_Mode => Off
-   -- Access to function with side effects is not allowed in SPARK
+   procedure Initialize
+     (Socket : out CoAP_SPARK.Channel.Socket_Type;
+      Port   : CoAP_SPARK.Channel.Port_Type)
+   with
+     SPARK_Mode => Off
+     -- Access to function with side effects is not allowed in SPARK
    is
    begin
       CoAP_SPARK.Channel.Initialize
         (Socket              => Socket,
-         PSK_Server_Callback => Secure_Server.PSK_Server_Callback'Access);
+         PSK_Server_Callback => Secure_Server.PSK_Server_Callback'Access,
+         Port                => Port,
+         Server              => True);
    end Initialize;
 
 end Secure_Server;

server/src/secure_server.ads

@@ -26,8 +26,9 @@ is
      Convention => C,
      Side_Effects;
 
-   procedure Initialize (Socket : out CoAP_SPARK.Channel.Socket_Type) with
-      Global =>
-         null;
+   procedure Initialize
+     (Socket : out CoAP_SPARK.Channel.Socket_Type;
+      Port   : CoAP_SPARK.Channel.Port_Type)
+   with Global => null;
 
 end Secure_Server;