Pull in latest development changes

.github/workflows/cmake.yml

@@ -19,7 +19,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                ubuntu_version: [22.04]
+                ubuntu_version: [22.04,24.10,25.04]
                 shared: [ON, OFF]
 
         steps:
@@ -59,4 +59,4 @@ jobs:
           run: cmake -DCMAKE_BUILD_TYPE="${{env.BUILD_TYPE}}" -DBUILD_SHARED_LIBS=${{ matrix.shared }} -B "${{github.workspace}}/build"
 
         - name: Build
-          run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+          run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

include/dnet/icmp.h

@@ -153,8 +153,8 @@ struct icmp_msg_rtradvert {
  * Timestamp message data
  */
 struct icmp_msg_tstamp {
-	uint32_t	icmp_id;		/* identifier */
-	uint32_t	icmp_seq;		/* sequence number */
+	uint16_t	icmp_id;		/* identifier */
+	uint16_t	icmp_seq;		/* sequence number */
 	uint32_t	icmp_ts_orig;		/* originate timestamp */
 	uint32_t	icmp_ts_rx;		/* receive timestamp */
 	uint32_t	icmp_ts_tx;		/* transmit timestamp */
@@ -164,8 +164,8 @@ struct icmp_msg_tstamp {
  * Address mask message data, RFC 950
  */
 struct icmp_msg_mask {
-	uint32_t	icmp_id;		/* identifier */
-	uint32_t	icmp_seq;		/* sequence number */
+	uint16_t	icmp_id;		/* identifier */
+	uint16_t	icmp_seq;		/* sequence number */
 	uint32_t	icmp_mask;		/* address mask */
 };