You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2019/12/09 14:26:58 UTC

[plc4x] 03/04: If the connection request is not "OK", then some fields are not transmitted (So I made them optional)

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch feature/knxnet-ip
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit d5bf86924c75fa24d5898fbd8d2af22a9ce0ed97
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Dec 9 15:26:20 2019 +0100

    If the connection request is not "OK", then some fields are not transmitted (So I made them optional)
---
 .../src/main/resources/protocols/knxnetip/knxnetip.mspec       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/protocols/knxnetip/src/main/resources/protocols/knxnetip/knxnetip.mspec b/protocols/knxnetip/src/main/resources/protocols/knxnetip/knxnetip.mspec
index 9535903..2434cc5 100644
--- a/protocols/knxnetip/src/main/resources/protocols/knxnetip/knxnetip.mspec
+++ b/protocols/knxnetip/src/main/resources/protocols/knxnetip/knxnetip.mspec
@@ -21,7 +21,7 @@
     [implicit      uint 8  'headerLength'    '6']
     [const         uint 8  'protocolVersion' '0x10']
     [discriminator uint 16 'msgType']
-    [implicit      uint 16 'totalLength' 'lengthInBytes']
+    [implicit      uint 16 'totalLength'     'lengthInBytes']
     [typeSwitch 'msgType'
         ['0x0201' SearchRequest
             [simple HPAIDiscoveryEndpoint 'hpaiIDiscoveryEndpoint']
@@ -44,10 +44,10 @@
             [simple ConnectionRequestInformation 'connectionRequestInformation']
         ]
         ['0x0206' ConnectionResponse
-            [simple uint 8 'communicationChannelId']
-            [enum   Status 'status']
-            [simple HPAIDataEndpoint            'hpaiDataEndpoint']
-            [simple ConnectionResponseDataBlock 'connectionResponseDataBlock']
+            [simple   uint 8 'communicationChannelId']
+            [enum     Status 'status']
+            [optional HPAIDataEndpoint            'hpaiDataEndpoint'            'status == Status.NO_ERROR']
+            [optional ConnectionResponseDataBlock 'connectionResponseDataBlock' 'status == Status.NO_ERROR']
         ]
         ['0x0207' ConnectionStateRequest
             [simple   uint 8 'communicationChannelId']