Merge remote-tracking branch 'origin/enhancements'

OpenKNX · Nov 26, 2024 · 4411fa1 · 4411fa1
2 parents 3a78ffa + 7dd1618
commit 4411fa1
Show file tree

Hide file tree

Showing 14 changed files with 1,674 additions and 677 deletions.
diff --git a/ConfigRequest.pcapng b/ConfigRequest.pcapng
diff --git a/Kaenx.Konnect/Builders/ConnectionRequest.cs b/Kaenx.Konnect/Builders/ConnectionRequest.cs
@@ -9,7 +9,7 @@ class ConnectionRequest : IRequestBuilder
     {
         private List<byte> bytes = new List<byte>();
 
-        public void Build(IPEndPoint source, byte communicationChannel)
+        public void Build(IPEndPoint source, bool isConfig = false)
         {
             byte[] header = { 0x06, 0x10, 0x02, 0x05 };
             bytes.AddRange(header);
@@ -31,10 +31,16 @@ public void Build(IPEndPoint source, byte communicationChannel)
             bytes.AddRange(port); // IP Adress Port
 
 
-            bytes.Add(0x04); // Request Structure Length
-            bytes.Add(0x04); // Tunnel Connection
-            bytes.Add(0x02); // Tunnel Link Layer
-            bytes.Add(0x00); // Reserved
+            if(isConfig)
+            {
+                bytes.Add(0x02); // Request Structure Length
+                bytes.Add(0x03); // Config Connection
+            } else {
+                bytes.Add(0x04); // Request Structure Length
+                bytes.Add(0x04); // Tunnel Connection
+                bytes.Add(0x02); // Tunnel Link Layer
+                bytes.Add(0x00); // Reserved
+            }
 
             byte[] length = BitConverter.GetBytes((ushort)(bytes.Count + 2));
             Array.Reverse(length);

diff --git a/Kaenx.Konnect/Classes/BusDevice.cs b/Kaenx.Konnect/Classes/BusDevice.cs
diff --git a/Kaenx.Konnect/Classes/ReceiverParserDispatcher.cs b/Kaenx.Konnect/Classes/ReceiverParserDispatcher.cs
@@ -9,6 +9,16 @@ namespace Kaenx.Konnect.Classes
 {
     class ReceiverParserDispatcher
     {
+        private static ReceiverParserDispatcher _instance;
+        public static ReceiverParserDispatcher Instance
+        {
+            get {
+                if( _instance == null)
+                    _instance = new ReceiverParserDispatcher();
+                return _instance;
+            }
+        }
+
         private readonly List<IReceiveParser> _responseParsers;
 
         public ReceiverParserDispatcher()
@@ -23,7 +33,6 @@ public ReceiverParserDispatcher()
                     parsers.Add(type);
             }
 
-
             foreach (Type t in parsers)
             {
                 IReceiveParser parser = (IReceiveParser)Activator.CreateInstance(t);
@@ -40,7 +49,7 @@ public IParserMessage Build(byte[] responseBytes)
 
             //Console.WriteLine($"ServiceType: {serviceTypeIdentifier} {responseBytes[2]:X}-{responseBytes[3]:X}");
 
-            IReceiveParser parser = _responseParsers.AsQueryable().SingleOrDefault(x => x.ServiceTypeIdentifier == serviceTypeIdentifier);
+            IReceiveParser parser = _responseParsers.SingleOrDefault(x => x.ServiceTypeIdentifier == serviceTypeIdentifier);
             IParserMessage result = parser?.Build(headerLength, protocolVersion, totalLength, responseBytes.Skip(6).ToArray());
             return result;
         }

diff --git a/Kaenx.Konnect/Connections/IKnxConnection.cs b/Kaenx.Konnect/Connections/IKnxConnection.cs
@@ -12,7 +12,7 @@
 
 namespace Kaenx.Konnect.Connections
 {
-    public interface IKnxConnection
+    public interface IKnxConnection : IDisposable
     {
         public delegate void TunnelRequestHandler(IMessageRequest message);
         public event TunnelRequestHandler OnTunnelRequest;
@@ -21,11 +21,6 @@ public interface IKnxConnection
         public delegate void TunnelAckHandler(MsgAckRes message);
         public event TunnelAckHandler OnTunnelAck;
 
-        public delegate void SearchResponseHandler(MsgSearchRes message);
-        public event SearchResponseHandler OnSearchResponse;
-        public delegate void SearchRequestHandler(MsgSearchReq message);
-        public event SearchRequestHandler OnSearchRequest;
-
         public delegate void ConnectionChangedHandler(bool isConnected);
         public event ConnectionChangedHandler ConnectionChanged;
 
@@ -45,6 +40,11 @@ public interface IKnxConnection
         /// </summary>
         public UnicastAddress PhysicalAddress { get; set; }
 
+        /// <summary>
+        /// Returns the max APDU length of the interface
+        /// </summary>
+        public int MaxFrameLength { get; set; }
+
         /// <summary>
         /// Connects the interface to the bus.
         /// </summary>