From e486335d7552c2a87b4a14bdf04394a590be3441 Mon Sep 17 00:00:00 2001 From: Aaron Lipinski Date: Sat, 3 Apr 2021 15:34:31 +1300 Subject: [PATCH] refactor - group local, remote inits --- ui/net.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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)); } -- 2.47.2