Fix Matter resumption final ack (#21673)

Author: s-hadinger

lib/libesp32/berry_matter/src/embedded/Matter_Commissioning.be

@@ -349,6 +349,7 @@ class Matter_Commisioning_Context
     # Check that it's a resumption
     if   is_resumption
       # Resumption p.169
+      log("MTR:                     Sigma1 Resumption", 3)
       var s1rk_salt = sigma1.initiatorRandom + sigma1.resumptionID
       var s1rk_info = bytes().fromstring("Sigma1_Resume")
       var s1rk = crypto.HKDF_SHA256().derive(session_resumption.shared_secret, s1rk_salt, s1rk_info, 16)
@@ -696,7 +697,8 @@ class Matter_Commisioning_Context
   # placeholder, nothing to run for now
   def parse_StatusReport(msg)
     var session = msg.session
-    log("MTR: >Status    "+msg.raw[msg.app_payload_idx..].tohex(), 3)
+    var status_msg = msg.raw[msg.app_payload_idx..].tohex()
+    log(f"MTR: >Status    {status_msg}", (status_msg != "0000000000000000") ? 3 : 4)
     return false      # we don't explicitly ack the message
   end
 

lib/libesp32/berry_matter/src/embedded/Matter_Message.be

@@ -215,7 +215,7 @@ class Matter_Frame
     raw.add(self.x_flags, 1)
     # opcode (mandatory)
     raw.add(self.opcode, 1)
-    raw.add(self.exchange_id & 0xFFFF, 2)
+    raw.add((self.exchange_id != nil) ? self.exchange_id & 0xFFFF : 0, 2)
     raw.add(self.protocol_id, 2)
     if self.x_flag_a    raw.add(self.ack_message_counter, 4) end
     # finally payload

lib/libesp32/berry_matter/src/embedded/Matter_MessageHandler.be

@@ -50,6 +50,8 @@ class Matter_MessageHandler
   def send_simple_ack(frame, reliable)
     if frame.x_flag_r                   # nothing to respond, check if we need a standalone ack
       var resp = frame.build_standalone_ack(reliable)
+      # special case, the local_session_id is not the one from the session
+      resp.local_session_id = frame.local_session_id
       resp.encode_frame()
       if tasmota.loglevel(4)
         log(format("MTR: <Ack       (%6i) ack=%i id=%i %s", resp.session.local_session_id, resp.ack_message_counter, resp.message_counter, reliable ? '{reliable}' : ''), 4)
@@ -125,7 +127,8 @@ class Matter_MessageHandler
           var op_name = matter.get_opcode_name(frame.opcode)
           if !op_name   op_name = format("0x%02X", frame.opcode) end
           if tasmota.loglevel(3)
-            log(format("MTR: >Received  (%6i) %s rid=%i exch=%i from [%s]:%i", session.local_session_id, op_name, frame.message_counter, frame.exchange_id, addr, port), 3)
+            log(format("MTR: >Received  (%6i) %s from [%s]:%i", session.local_session_id, op_name, addr, port), 3)
+            # log(format("MTR: >Received  (%6i) %s rid=%i exch=%i from [%s]:%i", session.local_session_id, op_name, frame.message_counter, frame.exchange_id, addr, port), 3)
           end
         else
           if tasmota.loglevel(4)