From: Aaron Lipinski <aaron.lipinski@roboticsplus.co.nz>
Date: Sat, 3 Apr 2021 02:34:31 +0000 (+1300)
Subject: refactor - group local, remote inits
X-Git-Tag: v0.95~8^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F393%2Fhead;p=thirdparty%2Fmtr.git

refactor - group local, remote inits
---

diff --git a/ui/net.c b/ui/net.c
index e47cbcf..a44a81e 100644
--- a/ui/net.c
+++ b/ui/net.c
@@ -766,23 +766,22 @@ void net_reopen(
     net_reset(ctl);
 
     remotesockaddr->sa_family = sourcesockaddr->sa_family = hostent->h_addrtype;
-    memcpy(sockaddr_addr_offset(remotesockaddr), hostent->h_addr, sockaddr_addr_size(remotesockaddr));
-
-    sourceaddress = sockaddr_addr_offset(sourcesockaddr);
     remoteaddress = sockaddr_addr_offset(remotesockaddr);
     memcpy(remoteaddress, hostent->h_addr, sockaddr_addr_size(remotesockaddr));
+    inet_ntop(remotesockaddr->sa_family, remoteaddress, remoteaddr, sizeof(remoteaddr));
+
+    sourceaddress = sockaddr_addr_offset(sourcesockaddr);
 
     if (ctl->InterfaceAddress) {
         net_validate_interface_address(ctl->af, ctl->InterfaceAddress);
     } else if (ctl->InterfaceName) {
         net_find_interface_address_from_name(
             &sourcesockaddr_struct, ctl->af, ctl->InterfaceName);
-        inet_ntop(sourcesockaddr->sa_family, sockaddr_addr_offset(sourcesockaddr), localaddr, sizeof(localaddr));
+        inet_ntop(sourcesockaddr->sa_family, sourceaddress, localaddr, sizeof(localaddr));
     } else {
         net_find_local_address();
     }
 
-    inet_ntop(remotesockaddr->sa_family, sockaddr_addr_offset(remotesockaddr), remoteaddr, sizeof(remoteaddr));
 }