From ca18311d0ae16a96e988df15a9009095f93df85e Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 7 Apr 2011 17:52:20 +0200 Subject: libbb: make set_nport accept pointer to sockaddr, not to len_and_sockaddr. Signed-off-by: Denys Vlasenko --- networking/traceroute.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'networking/traceroute.c') diff --git a/networking/traceroute.c b/networking/traceroute.c index 82bb0118c..55dc15b66 100644 --- a/networking/traceroute.c +++ b/networking/traceroute.c @@ -482,7 +482,7 @@ send_probe(int seq, int ttl) if (!(option_mask32 & OPT_USE_ICMP)) { out = outdata; len -= sizeof(*outudp); - set_nport(dest_lsa, htons(port + seq)); + set_nport(&dest_lsa->u.sa, htons(port + seq)); } } @@ -1018,10 +1018,10 @@ common_traceroute_main(int op, char **argv) int probe_fd = xsocket(af, SOCK_DGRAM, 0); if (op & OPT_DEVICE) setsockopt_bindtodevice(probe_fd, device); - set_nport(dest_lsa, htons(1025)); + set_nport(&dest_lsa->u.sa, htons(1025)); /* dummy connect. makes kernel pick source IP (and port) */ xconnect(probe_fd, &dest_lsa->u.sa, dest_lsa->len); - set_nport(dest_lsa, htons(port)); + set_nport(&dest_lsa->u.sa, htons(port)); /* read IP and port */ source_lsa = get_sock_lsa(probe_fd); @@ -1031,7 +1031,7 @@ common_traceroute_main(int op, char **argv) close(probe_fd); /* bind our sockets to this IP (but not port) */ - set_nport(source_lsa, 0); + set_nport(&source_lsa->u.sa, 0); xbind(sndsock, &source_lsa->u.sa, source_lsa->len); xbind(rcvsock, &source_lsa->u.sa, source_lsa->len); -- cgit v1.2.3