Implement Get_Error_Options_And_Payload and fix some failing verification conditions

Author: mgrojo

alire.toml

@@ -13,7 +13,7 @@ This version implements the client side of the protocol with some limitations:
 
 See LICENSING for licensing information.
 """
-version = "0.9.0"
+version = "0.10.0-dev"
 
 authors = ["Manuel Gomez"]
 maintainers = ["Manuel Gomez <mgrojo@gmail.com>"]

src/coap_spark-messages.adb

@@ -1,3 +1,4 @@
+with Ada.Unchecked_Conversion;
 
 with CoAP_SPARK.Content_Formats;
 with CoAP_SPARK.Options.Text_IO;
@@ -69,6 +70,26 @@ is
         & Detail_Image;
    end Image;
 
+   procedure Initialize_With_Text_Payload
+     (Text : String;
+      Item : out Content)
+   is
+      use type RFLX.RFLX_Types.Index;
+      function To_Byte
+        is new Ada.Unchecked_Conversion (Character, RFLX.RFLX_Types.Byte);
+   begin
+      Item.Options := CoAP_SPARK.Options.Lists.Empty_Vector;
+      Item.Format := CoAP_SPARK.Content_Formats.text.plain_charset_utf_8;
+
+      Item.Payload :=
+         new RFLX.RFLX_Types.Bytes'([1 .. Text'Length => 0]);
+
+      for I in Item.Payload.all'Range loop
+         Item.Payload (I) :=
+           To_Byte (Text (Text'First - 1 + Integer (I)));
+      end loop;
+   end Initialize_With_Text_Payload;
+
    procedure Finalize (Item : in out Content)
    is
    begin

src/coap_spark-messages.ads

@@ -56,6 +56,16 @@ is
    is (CoAP_SPARK.Options.Lists.Is_Empty (Item.Options)
        and then Item.Payload = null);
 
+   --  Set the payload of Item to Text and set the appropriate content format.
+   --  The payload is freed if it is not null.
+   procedure Initialize_With_Text_Payload
+     (Text : String;
+      Item : out Content)
+   with
+     Pre => Text'Length <= CoAP_SPARK.Max_Payload_Length,
+     Post => not Is_Empty (Item) and then
+      Item.Payload'Length = Text'Length;
+
    procedure Finalize (Item : in out Content)
    with
      Post => Is_Empty (Item);

src/rflx-coap_client-session.adb

@@ -73,8 +73,6 @@ is
    is
    begin
 
-      RFLX_Result := (Length => 0, Options_And_Payload => [others => 0]);
-
       CoAP_SPARK.Messages.Encoding.Encode_Options_And_Payload
         (Options_And_Payload => State.Request_Content,
          Status              => CoAP_SPARK.Status_Type (State.Current_Status),
@@ -92,6 +90,11 @@ is
       use type CoAP_Client.Session_Environment.Status_Type;
    begin
 
+      if not CoAP_SPARK.Messages.Is_Empty (State.Response_Content) then
+         CoAP_SPARK.Messages.Finalize (State.Response_Content);
+         pragma Assert (CoAP_SPARK.Messages.Is_Empty (State.Response_Content));
+      end if;
+
       CoAP_SPARK.Messages.Encoding.Decode_Options_And_Payload
         (Data            => Data,
          Status          => CoAP_SPARK.Status_Type (State.Current_Status),

src/rflx-coap_server-main_loop.adb

@@ -34,6 +34,15 @@ is
 
    begin
 
+      RFLX_Result :=
+         (Message_Class        => RFLX.CoAP.Server_Error,
+          Success_Code         => RFLX.CoAP.Success_Response'Last,
+          Client_Error_Code    => RFLX.CoAP.Client_Error_Response'Last,
+          Server_Error_Code    => RFLX.CoAP.Internal_Server_Error,
+          Padding              => 0,
+          Options_And_Payload_Options_And_Payload => [others => 0],
+          Options_And_Payload_Length => 0);
+
       RFLX.CoAP.CoAP_Message.Initialize
         (Ctx    => Context,
          Buffer => Buffer,
@@ -74,7 +83,6 @@ is
               RFLX.CoAP.Client_Error_Response'Last;
             RFLX_Result.Server_Error_Code :=
               RFLX.CoAP.Server_Error_Response'Last;
-            RFLX_Result.Padding := 0;
             RFLX_Result.Message_Class := Response_Codes.Code_Class;
 
             case CoAP_SPARK.Messages.Response_Code (Response_Codes.Code_Class)
@@ -97,13 +105,64 @@ is
          end if;
       end if;
 
+      RFLX.CoAP.CoAP_Message.Take_Buffer
+        (Ctx    => Context,
+         Buffer => Buffer);
+      pragma Assert (not RFLX.CoAP.CoAP_Message.Has_Buffer (Context));
+
+      RFLX.RFLX_Types.Free (Buffer);
    end Get_Response;
 
    procedure Get_Error_Options_And_Payload
      (State       : in out RFLX.CoAP_Server.Main_Loop_Environment.State;
-      RFLX_Result : out RFLX.CoAP_Server.Options_And_Payload_Data.Structure) is
+      RFLX_Result : out RFLX.CoAP_Server.Options_And_Payload_Data.Structure)
+   is
+      use type CoAP_SPARK.Status_Type;
+
+      Status_Image : constant String :=
+        CoAP_SPARK.Status_Type'Image (State.Current_Status);
+      Buffer  : RFLX_Types.Bytes_Ptr :=
+        new RFLX_Types.Bytes'([1 .. RFLX_Result.Options_And_Payload'Length => 0]);
+      Context : RFLX.CoAP.CoAP_Message.Context;
+
+      Response_Content : CoAP_SPARK.Messages.Content;
+
    begin
-      null;
+      RFLX.CoAP.CoAP_Message.Initialize
+        (Ctx    => Context,
+         Buffer => Buffer);
+
+      -- This procedure is only called when there is an error in the
+      -- main loop state machine, so if we haven't set an error status yet,
+      -- we have to set it to Unexpected_Case, since the cause is unknown.
+      if State.Current_Status = CoAP_SPARK.OK or else
+         Status_Image'Length > CoAP_SPARK.Max_Payload_Length
+      then
+         CoAP_SPARK.Messages.Initialize_With_Text_Payload
+           (Text => "Unexpected case in main loop",
+            Item => Response_Content);
+      else
+         CoAP_SPARK.Messages.Initialize_With_Text_Payload
+           (Text => Status_Image,
+            Item => Response_Content);
+      end if;
+
+      CoAP_SPARK.Messages.Encoding.Encode_Options_And_Payload
+        (Options_And_Payload => Response_Content,
+         Status              => State.Current_Status,
+         Encoded_Data        => RFLX_Result.Options_And_Payload,
+         Encoded_Length      => RFLX.CoAP.Length_16
+            (RFLX_Result.Length));
+
+      CoAP_SPARK.Messages.Finalize (Response_Content);
+      pragma Assert (CoAP_SPARK.Messages.Is_Empty (Response_Content));
+
+      RFLX.CoAP.CoAP_Message.Take_Buffer
+        (Ctx    => Context,
+         Buffer => Buffer);
+      pragma Assert (not RFLX.CoAP.CoAP_Message.Has_Buffer (Context));
+
+      RFLX.RFLX_Types.Free (Buffer);
    end Get_Error_Options_And_Payload;
 
 end RFLX.CoAP_Server.Main_Loop;