fix(plc4j/profinet): Updated magic numbers in discovery packets

apache · Jan 31, 2023 · cb8402f · cb8402f
1 parent b32e9f4
commit cb8402f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/...rofinet/src/main/java/org/apache/plc4x/java/profinet/discovery/ProfinetPlcDiscoverer.java b/...rofinet/src/main/java/org/apache/plc4x/java/profinet/discovery/ProfinetPlcDiscoverer.java
@@ -308,23 +308,21 @@ public void startPnDcpPoll(long period) {
                                     Collections.singletonList(
                                         new PnDcp_Block_ALLSelector()
                                     )))));
-                    WriteBufferByteBased buffer = new WriteBufferByteBased(34);
+                    WriteBufferByteBased buffer = new WriteBufferByteBased(identificationRequest.getLengthInBytes());
                     try {
                         identificationRequest.serialize(buffer);
                     } catch (SerializationException e) {
                         throw new RuntimeException(e);
                     }
                     Packet packet = null;
                     try {
-                        packet = EthernetPacket.newPacket(buffer.getData(), 0, 34);
+                        packet = EthernetPacket.newPacket(buffer.getBytes(), 0, identificationRequest.getLengthInBytes());
                     } catch (IllegalRawDataException e) {
                         throw new RuntimeException(e);
                     }
                     try {
                         handle.sendPacket(packet);
-                    } catch (PcapNativeException e) {
-                        throw new RuntimeException(e);
-                    } catch (NotOpenException e) {
+                    } catch (PcapNativeException | NotOpenException e) {
                         throw new RuntimeException(e);
                     }
                     return null;

diff --git a/protocols/profinet/src/main/resources/protocols/profinet/profinet.mspec b/protocols/profinet/src/main/resources/protocols/profinet/profinet.mspec
@@ -553,8 +553,7 @@
             [array    byte        deviceVendorValue count 'blockLength-2'             ]
             [padding  uint 8      pad '0x00' 'STATIC_CALL("arrayLength", deviceVendorValue) % 2']
         ]
-        ['DEVICE_PROPERTIES_OPTION','2' PnDcp_Block_DevicePropertiesNameOfStation(uint 16 blockLength)
-            [reserved uint 16     '0x0000'                                            ]
+        ['DEVICE_PROPERTIES_OPTION','2' PnDcp_Block_DevicePropertiesNameOfStation(uint 16 blockLength)                                                      ]
             [array    byte        nameOfStation count 'blockLength-2'                 ]
             [padding  uint 8      pad '0x00' 'STATIC_CALL("arrayLength", nameOfStation) % 2']
         ]