misc. commissioning fixes

Author: jdomnitz

MatterDotNet/OperationalDiscovery/CommissioningMode.cs

@@ -0,0 +1,33 @@
+// MatterDotNet Copyright (C) 2025 
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or any later version.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY, without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace MatterDotNet.OperationalDiscovery
+{
+    /// <summary>
+    /// Device Commissioning Mode
+    /// </summary>
+    public enum CommissioningMode
+    {
+        /// <summary>
+        /// Device cannot be commissioined
+        /// </summary>
+        None = 0,
+        /// <summary>
+        /// Device is in Basic Commissioning Mode
+        /// </summary>
+        Basic = 1,
+        /// <summary>
+        /// Device is in Dynamic Commissioning Mode (with dynamically generated PIN)
+        /// </summary>
+        Dynamic = 2,
+    }
+}

MatterDotNet/OperationalDiscovery/ODNode.cs

@@ -30,6 +30,6 @@ public record ODNode
         public uint Vendor { get; set; }
         public uint Product {  get; set; }
         public ushort Descriminator { get; set; }
-        public bool Commissionable { get; set; }
+        public CommissioningMode CommissioningMode { get; set; }
     }
 }

MatterDotNet/OperationalDiscovery/SupportedTransportMode.cs

@@ -15,19 +15,24 @@ namespace MatterDotNet.OperationalDiscovery
     /// <summary>
     /// Supported node IP transport
     /// </summary>
+    [Flags]
     public enum SupportedTransportMode
     {
         /// <summary>
         /// MRP Only
         /// </summary>
         None = 0,
         /// <summary>
+        /// Deprecated
+        /// </summary>
+        Reserved = 1,
+        /// <summary>
         /// TCP in Client Mode
         /// </summary>
-        TCPClient = 1,
+        TCPClient = 2,
         /// <summary>
         /// TCP in Server Mode
         /// </summary>
-        TCPServer = 2
+        TCPServer = 4
     }
 }

MatterDotNet/Protocol/Payloads/Frame.cs

@@ -65,15 +65,15 @@ public void Serialize(PayloadWriter stream, SessionContext session)
                 {
                     PayloadWriter secureStream = new PayloadWriter(temp);
                     Message.Serialize(secureStream);
-                    SecureSession? secureContext = session as SecureSession;
+                    SecureSession secureContext = (SecureSession)session;
                     Span<byte> nonce = new byte[Crypto.NONCE_LENGTH_BYTES];
                     stream.GetPayload().Span.Slice(3, 5).CopyTo(nonce);
                     if ((Security & SecurityFlags.GroupSession) == SecurityFlags.GroupSession)
                         BinaryPrimitives.WriteUInt64LittleEndian(nonce.Slice(5, 8), SourceNodeID);
-                    else if (!secureContext!.PASE)
+                    else if (!secureContext.PASE)
                         BinaryPrimitives.WriteUInt64LittleEndian(nonce.Slice(5, 8), session.Initiator ? session.InitiatorNodeID : session.ResponderNodeID);
 
-                    ReadOnlySpan<byte> mic = Crypto.AEAD_GenerateEncrypt(secureContext!.Initiator ? secureContext.I2RKey : secureContext.R2IKey, secureStream.GetPayload().Span, stream.GetPayload().Span, nonce);
+                    ReadOnlySpan<byte> mic = Crypto.AEAD_GenerateEncrypt(secureContext.Initiator ? secureContext.I2RKey : secureContext.R2IKey, secureStream.GetPayload().Span, stream.GetPayload().Span, nonce);
                     stream.Write(secureStream);
                     stream.Write(mic);
                     if ((Security & SecurityFlags.Privacy) == SecurityFlags.Privacy)

MatterDotNet/Protocol/Payloads/Version1Payload.cs

@@ -32,7 +32,24 @@ public class Version1Payload : IPayload
 
         public override string ToString()
         {
-            return $"[Flags: {Flags}, Proto: {Protocol}, Op: {OpCode}, Exchange: {ExchangeID}, Ack: {AckCounter}, Content: {Payload}]";
+            return $"[Flags: {Flags}, Proto: {Protocol}, Op: {GetOp(Protocol, OpCode)}, Exchange: {ExchangeID}, Ack: {AckCounter}, Content: {Payload}]";
+        }
+
+        private string GetOp(ProtocolType protocol, byte opCode)
+        {
+            switch (protocol)
+            {
+                case ProtocolType.SecureChannel:
+                    return ((SecureOpCodes)opCode).ToString();
+                case ProtocolType.InteractionModel:
+                    return ((IMOpCodes)opCode).ToString();
+                case ProtocolType.BDX:
+                    return ((BDXOpCodes)opCode).ToString();
+                case ProtocolType.UserDirectedCommissioning:
+                    return ((UDCOpCodes)opCode).ToString();
+                default:
+                    return opCode.ToString();
+            }
         }
 
         public Version1Payload(IPayload? payload, byte opCode)

MatterDotNet/Protocol/Subprotocols/CASE.cs

@@ -15,6 +15,7 @@
 using MatterDotNet.PKI;
 using MatterDotNet.Protocol.Cryptography;
 using MatterDotNet.Protocol.Payloads;
+using MatterDotNet.Protocol.Payloads.Flags;
 using MatterDotNet.Protocol.Payloads.OpCodes;
 using MatterDotNet.Protocol.Payloads.Status;
 using MatterDotNet.Protocol.Sessions;
@@ -67,6 +68,7 @@ public class CASE(SessionContext unsecureSession)
                 };
 
                 Frame sigma1 = new Frame(Msg1, (byte)SecureOpCodes.CASESigma1);
+                sigma1.Flags |= MessageFlags.SourceNodeID;
                 await exchange.SendFrame(sigma1);
                 resp = await exchange.Read();
                 if (resp.Message.Payload is StatusPayload error)
@@ -159,7 +161,9 @@ public class CASE(SessionContext unsecureSession)
             PayloadWriter Msg3Bytes = new PayloadWriter(1024);
             Msg3.Serialize(Msg3Bytes);
 
-            await exchange.SendFrame(new Frame(Msg3, (byte)SecureOpCodes.CASESigma3));
+            Frame sigma3 = new Frame(Msg3, (byte)SecureOpCodes.CASESigma3);
+            sigma3.Flags |= MessageFlags.SourceNodeID;
+            await exchange.SendFrame(sigma3);
             Frame? resp = await exchange.Read();
 
             StatusPayload s3resp = (StatusPayload)resp.Message.Payload!;
@@ -211,6 +215,7 @@ public class CASE(SessionContext unsecureSession)
                 };
 
                 Frame sigma1 = new Frame(Msg1, (byte)SecureOpCodes.CASESigma1);
+                sigma1.Flags |= MessageFlags.SourceNodeID;
                 await exchange.SendFrame(sigma1);
                 resp = await exchange.Read();
 

MatterDotNet/Protocol/Subprotocols/PASE.cs

@@ -72,6 +72,7 @@ private Frame GeneratePake1(PBKDFParamResp paramResp, uint passcode)
             BigIntegerPoint pA = spake.PAKEValues_Initiator(passcode, (int)paramResp.Pbkdf_parameters!.Iterations, paramResp.Pbkdf_parameters!.Salt);
             Pake1 pk1 = new Pake1() { PA = pA.ToBytes(false) };
             Frame frame = new Frame(pk1, (byte)SecureOpCodes.PASEPake1);
+            frame.Flags |= MessageFlags.SourceNodeID;
             return frame;
         }
 
@@ -86,6 +87,7 @@ private Frame GeneratePake3(Pake1 pake1, Pake2 pake2, PBKDFParamReq req, PBKDFPa
                 CA = SessionKeys.cA
             };
             Frame frame = new Frame(pake3, (byte)SecureOpCodes.PASEPake3);
+            frame.Flags |= MessageFlags.SourceNodeID;
             return frame;
         }
 
@@ -100,6 +102,7 @@ private Frame GenerateParamRequest(bool hasOnboardingPayload = false)
             };
 
             Frame frame = new Frame(req, (byte)SecureOpCodes.PBKDFParamRequest);
+            frame.Flags |= MessageFlags.SourceNodeID;
             return frame;
         }
     }

MatterDotNet/Protocol/TLV/TLVReader.cs

@@ -80,7 +80,7 @@ public void StartList(long listNumber = -1)
         public void EndContainer()
         {
             while (type != ElementType.EndOfContainer && type != ElementType.None)
-                GetAny(tagNumber);
+                GetAny(tagNumber, true);
             if (type != ElementType.EndOfContainer)
                 throw new InvalidDataException("End structure was not found");
             ReadTag();