client-network/src/lib.rs

@@ -360,10 +360,11 @@ pub fn start_p2p_executor(
                             let peer_addr_query = get_socket_address(username.clone(), ip.clone());
 
                             match server_addr_query.await {
-                                Some(server_addr) => {
+                                Some(server_addr) => match peer_addr_query.await {
+                                    Some(peer_addr) => {
                                         let natreq = construct_message(
                                             NATTRAVERSALREQUEST,
-                                        ip.to_string().into_bytes(),
+                                            peer_addr.to_string().into_bytes(),
                                             8,
                                             &sd.cryptopair(),
                                         );
@@ -378,6 +379,12 @@ pub fn start_p2p_executor(
                                             sd.messages_list_ref(),
                                         );
                                     }
+                                    None => {
+                                        let err_msg = format!("failed to retreive socket address")
+                                            .to_string();
+                                        let res = event_tx.send(NetworkEvent::Error(err_msg));
+                                    }
+                                },
                                 None => {
                                     let err_msg =
                                         format!("failed to retreive socket address").to_string();