Fixes for validation of dial info

veilid-core/src/network_manager/native/mod.rs

@@ -310,10 +310,10 @@ impl Network {
         // Handle connectionless protocol
         if descriptor.protocol_type() == ProtocolType::UDP {
             // send over the best udp socket we have bound since UDP is not connection oriented
-            let peer_socket_addr = descriptor.remote.to_socket_addr();
+            let peer_socket_addr = descriptor.remote().to_socket_addr();
             if let Some(ph) = self.find_best_udp_protocol_handler(
                 &peer_socket_addr,
-                &descriptor.local.map(|sa| sa.to_socket_addr()),
+                &descriptor.local().map(|sa| sa.to_socket_addr()),
             ) {
                 log_net!(
                     "send_data_to_existing_connection connectionless to {:?}",
@@ -345,7 +345,7 @@ impl Network {
 
             // Network accounting
             self.network_manager()
-                .stats_packet_sent(descriptor.remote.to_socket_addr().ip(), data_len as u64);
+                .stats_packet_sent(descriptor.remote().to_socket_addr().ip(), data_len as u64);
 
             // Data was consumed
             Ok(None)

veilid-core/src/network_manager/native/network_class_discovery.rs

@@ -150,6 +150,12 @@ impl DiscoveryContext {
         redirect: bool,
     ) -> bool {
         let rpc = self.routing_table.rpc_processor();
+
+        // asking for node validation doesn't have to use the dial info filter of the dial info we are validating
+        let mut node_ref = node_ref.clone();
+        node_ref.set_filter(None);
+
+        // ask the node to send us a dial info validation receipt
         rpc.rpc_call_validate_dial_info(node_ref.clone(), dial_info, redirect)
             .await
             .map_err(logthru_net!(
@@ -229,7 +235,7 @@ impl DiscoveryContext {
 
     // If we know we are not behind NAT, check our firewall status
     pub async fn protocol_process_no_nat(&self) -> Result<(), String> {
-        let (node_b, external_1_dial_info) = {
+        let (node_1, external_1_dial_info) = {
             let inner = self.inner.lock();
             (
                 inner.node_1.as_ref().unwrap().clone(),
@@ -239,7 +245,7 @@ impl DiscoveryContext {
 
         // Do a validate_dial_info on the external address from a redirected node
         if self
-            .validate_dial_info(node_b.clone(), external_1_dial_info.clone(), true)
+            .validate_dial_info(node_1.clone(), external_1_dial_info.clone(), true)
             .await
         {
             // Add public dial info with Direct dialinfo class

veilid-core/src/network_manager/native/network_udp.rs

@@ -55,7 +55,7 @@ impl Network {
 
                             // Network accounting
                             network_manager.stats_packet_rcvd(
-                                descriptor.remote.to_socket_addr().ip(),
+                                descriptor.remote_address().to_ip_addr(),
                                 size as u64,
                             );
 

veilid-core/src/network_manager/native/protocol/tcp.rs

@@ -180,10 +180,10 @@ impl RawTcpProtocolHandler {
 
         // Wrap the stream in a network connection and return it
         let conn = ProtocolNetworkConnection::RawTcp(RawTcpNetworkConnection::new(
-            ConnectionDescriptor {
-                local: Some(SocketAddress::from_socket_addr(actual_local_address)),
-                remote: dial_info.to_peer_address(),
-            },
+            ConnectionDescriptor::new(
+                dial_info.to_peer_address(),
+                SocketAddress::from_socket_addr(actual_local_address),
+            ),
             ps,
             ts,
         ));

veilid-core/src/network_manager/native/protocol/ws.rs

@@ -243,10 +243,10 @@ impl WebsocketProtocolHandler {
             .map_err(logthru_net!())?;
 
         // Make our connection descriptor
-        let descriptor = ConnectionDescriptor {
-            local: Some(SocketAddress::from_socket_addr(actual_local_addr)),
-            remote: dial_info.to_peer_address(),
-        };
+        let descriptor = ConnectionDescriptor::new(
+            dial_info.to_peer_address(),
+            SocketAddress::from_socket_addr(actual_local_addr),
+        );
         // Negotiate TLS if this is WSS
         if tls {
             let connector = TlsConnector::default();