Ensure received messages are sent from the proper ports in

statime-netptp.

Author: davidv1992

statime-netptp/src/addresses/ipv4.rs

@@ -125,18 +125,29 @@ impl BoundInterface for Ipv4BoundInterface {
     }
 
     fn poll_recv(&self, buf: &mut [u8], cx: &mut Context) -> Poll<Result<RecvResult<Self::Addr>>> {
-        if let Poll::Ready(result) = self.event_socket.poll_recv(buf, cx) {
-            Poll::Ready(result)
-        } else {
-            self.general_socket.poll_recv(buf, cx)
+        loop {
+            return if let Poll::Ready(result) = self.event_socket.poll_recv(buf, cx) {
+                if let Ok(recv_result) = &result
+                    && recv_result.remote_addr.port() != GENERAL_PORT
+                    && recv_result.remote_addr.port() != EVENT_PORT
+                {
+                    // Ignore messages not sent from the PORTS we can send messages to.
+                    // This avoids the potentially confusing situation of a message send
+                    // from a random port triggering a response being send to port 319 or 320.
+                    continue;
+                }
+                Poll::Ready(result)
+            } else {
+                self.general_socket.poll_recv(buf, cx)
+            }
+            .map_ok(|result| RecvResult {
+                bytes_read: result.bytes_read,
+                remote_addr: *result.remote_addr.ip(),
+                local_addr: *result.local_addr.ip(),
+                timestamp: result.timestamp,
+                full_timestamp_data: result.full_timestamp_data,
+            });
         }
-        .map_ok(|result| RecvResult {
-            bytes_read: result.bytes_read,
-            remote_addr: *result.remote_addr.ip(),
-            local_addr: *result.local_addr.ip(),
-            timestamp: result.timestamp,
-            full_timestamp_data: result.full_timestamp_data,
-        })
     }
 
     fn poll_recv_timestamp(

statime-netptp/src/addresses/ipv6.rs

@@ -125,18 +125,29 @@ impl BoundInterface for Ipv6BoundInterface {
     }
 
     fn poll_recv(&self, buf: &mut [u8], cx: &mut Context) -> Poll<Result<RecvResult<Self::Addr>>> {
-        if let Poll::Ready(result) = self.event_socket.poll_recv(buf, cx) {
-            Poll::Ready(result)
-        } else {
-            self.general_socket.poll_recv(buf, cx)
+        loop {
+            return if let Poll::Ready(result) = self.event_socket.poll_recv(buf, cx) {
+                if let Ok(recv_result) = &result
+                    && recv_result.remote_addr.port() != GENERAL_PORT
+                    && recv_result.remote_addr.port() != EVENT_PORT
+                {
+                    // Ignore messages not sent from the PORTS we can send messages to.
+                    // This avoids the potentially confusing situation of a message send
+                    // from a random port triggering a response being send to port 319 or 320.
+                    continue;
+                }
+                Poll::Ready(result)
+            } else {
+                self.general_socket.poll_recv(buf, cx)
+            }
+            .map_ok(|result| RecvResult {
+                bytes_read: result.bytes_read,
+                remote_addr: *result.remote_addr.ip(),
+                local_addr: *result.local_addr.ip(),
+                timestamp: result.timestamp,
+                full_timestamp_data: result.full_timestamp_data,
+            });
         }
-        .map_ok(|result| RecvResult {
-            bytes_read: result.bytes_read,
-            remote_addr: *result.remote_addr.ip(),
-            local_addr: *result.local_addr.ip(),
-            timestamp: result.timestamp,
-            full_timestamp_data: result.full_timestamp_data,
-        })
     }
 
     fn poll_recv_timestamp(

statime-netptp/src/test.rs

@@ -1,4 +1,9 @@
-use std::net::{Ipv4Addr, Ipv6Addr};
+use std::{
+    net::{Ipv4Addr, Ipv6Addr},
+    time::Duration,
+};
+
+use tokio::net::UdpSocket;
 
 use crate::NetworkManager;
 
@@ -23,6 +28,17 @@ async fn test_ipv4() {
     let result = socket.recv().await.unwrap();
     assert_eq!(&*result.bytes_read, [5, 6, 7, 8].as_slice());
     assert!(result.timestamp.is_some());
+
+    let external = UdpSocket::bind("0.0.0.0:0").await.unwrap();
+    external
+        .send_to(&[9, 10, 11, 12], "127.0.0.1:4319")
+        .await
+        .unwrap();
+    assert!(
+        tokio::time::timeout(Duration::from_millis(100), socket.recv())
+            .await
+            .is_err()
+    );
 }
 
 #[tokio::test]
@@ -46,4 +62,15 @@ async fn test_ipv6() {
     let result = socket.recv().await.unwrap();
     assert_eq!(&*result.bytes_read, [5, 6, 7, 8].as_slice());
     assert!(result.timestamp.is_some());
+
+    let external = UdpSocket::bind("[::]:0").await.unwrap();
+    external
+        .send_to(&[9, 10, 11, 12], "[::1]:4319")
+        .await
+        .unwrap();
+    assert!(
+        tokio::time::timeout(Duration::from_millis(100), socket.recv())
+            .await
+            .is_err()
+    );
 }