Save socket address on object construction.

Author: Flone-dnb

server/server/src/services/network/user_service.rs

@@ -84,6 +84,8 @@ impl UserService {
             );
         }
 
+        let socket_addr = socket.peer_addr().unwrap();
+
         UserService {
             logger,
             socket,
@@ -93,7 +95,7 @@ impl UserService {
             database,
             ban_manager,
             username: None,
-            socket_addr: None,
+            socket_addr: Some(socket_addr),
             time_of_last_received_packet: Local::now(),
         }
     }
@@ -119,6 +121,8 @@ impl UserService {
             );
         }
 
+        let socket_addr = socket.peer_addr().unwrap();
+
         UserService {
             logger,
             socket,
@@ -127,7 +131,7 @@ impl UserService {
             secret_key: [0; SECRET_KEY_SIZE],
             database,
             ban_manager: None,
-            socket_addr: None,
+            socket_addr: Some(socket_addr),
             username: None,
             time_of_last_received_packet: Local::now(),
         }
@@ -168,8 +172,6 @@ impl UserService {
         }
         let packet = packet.unwrap();
 
-        self.socket_addr = Some(self.socket.peer_addr().unwrap());
-
         let result = self.handle_reporter_packet(packet);
         if let Err(app_error) = result {
             self.exit_error = Some(Err(app_error.add_entry(file!(), line!())));
@@ -233,9 +235,6 @@ impl UserService {
             return;
         }
 
-        // Save address.
-        self.socket_addr = Some(self.socket.peer_addr().unwrap());
-
         // Connected.
         let result = self.wait_for_client_requests();
         if let Err(app_error) = result {