From: Aaron Lipinski Date: Sat, 3 Apr 2021 02:07:17 +0000 (+1300) Subject: re-init source too X-Git-Tag: v0.95~8^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c3b1bd36624609f83c6ce3563c3bcfb98d824ae;p=thirdparty%2Fmtr.git re-init source too --- diff --git a/ui/net.c b/ui/net.c index f7aa088..866879b 100644 --- a/ui/net.c +++ b/ui/net.c @@ -747,6 +747,22 @@ int net_open( return err; } + net_reopen(ctl, hostent); + + return 0; +} + + +void net_reopen( + struct mtr_ctl *ctl, + struct hostent *hostent) +{ + int at; + + for (at = 0; at < MaxHost; at++) { + memset(&host[at], 0, sizeof(host[at])); + } + net_reset(ctl); remotesockaddr->sa_family = sourcesockaddr->sa_family = hostent->h_addrtype; @@ -766,25 +782,6 @@ int net_open( } inet_ntop(remotesockaddr->sa_family, sockaddr_addr_offset(remotesockaddr), remoteaddr, sizeof(remoteaddr)); - - return 0; -} - - -void net_reopen( - struct mtr_ctl *ctl, - struct hostent *hostent) -{ - int at; - - for (at = 0; at < MaxHost; at++) { - memset(&host[at], 0, sizeof(host[at])); - } - - remotesockaddr->sa_family = hostent->h_addrtype; - memcpy(remoteaddress, hostent->h_addr, sockaddr_addr_size(remotesockaddr)); - memcpy(sockaddr_addr_offset(remotesockaddr), hostent->h_addr, sockaddr_addr_size(remotesockaddr)); - net_reset(ctl); }