summaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorDenis Vlasenko2007-02-04 02:39:08 +0000
committerDenis Vlasenko2007-02-04 02:39:08 +0000
commit42823d597a9029ac497edda9102f61283630635b (patch)
tree848e71f864ad0675e19c8dcdce94c11a5dcc3d7a /networking
parent45854b5e3ff265c23dc36c139f09ea8eb3790ad1 (diff)
downloadbusybox-42823d597a9029ac497edda9102f61283630635b.zip
busybox-42823d597a9029ac497edda9102f61283630635b.tar.gz
add x to IPv6 functions which can die
Diffstat (limited to 'networking')
-rw-r--r--networking/arping.c2
-rw-r--r--networking/dnsd.c2
-rw-r--r--networking/ftpgetput.c2
-rw-r--r--networking/nslookup.c2
-rw-r--r--networking/ping.c8
-rw-r--r--networking/tftp.c2
-rw-r--r--networking/wget.c4
7 files changed, 11 insertions, 11 deletions
diff --git a/networking/arping.c b/networking/arping.c
index 20c782f..d71ac49 100644
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -307,7 +307,7 @@ int arping_main(int argc, char **argv)
if (!inet_aton(target, &dst)) {
len_and_sockaddr *lsa;
- lsa = host_and_af2sockaddr(target, 0, AF_INET);
+ lsa = xhost_and_af2sockaddr(target, 0, AF_INET);
memcpy(&dst, &lsa->sin.sin_addr.s_addr, 4);
if (ENABLE_FEATURE_CLEAN_UP)
free(lsa);
diff --git a/networking/dnsd.c b/networking/dnsd.c
index 6d1335e..78722d6 100644
--- a/networking/dnsd.c
+++ b/networking/dnsd.c
@@ -377,7 +377,7 @@ int dnsd_main(int argc, char **argv)
signal(SIGURG, SIG_IGN);
#endif
- lsa = host2sockaddr(listen_interface, port);
+ lsa = xhost2sockaddr(listen_interface, port);
udps = xsocket(lsa->sa.sa_family, SOCK_DGRAM, 0);
xbind(udps, &lsa->sa, lsa->len);
// xlisten(udps, 50); - ?!! DGRAM sockets are never listened on I think?
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index dad1c99..9b0510d 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -346,7 +346,7 @@ int ftpgetput_main(int argc, char **argv)
/* We want to do exactly _one_ DNS lookup, since some
* sites (i.e. ftp.us.debian.org) use round-robin DNS
* and we want to connect to only one IP... */
- server->lsa = host2sockaddr(argv[0], bb_lookup_port(port, "tcp", 21));
+ server->lsa = xhost2sockaddr(argv[0], bb_lookup_port(port, "tcp", 21));
if (verbose_flag) {
printf("Connecting to %s (%s)\n", argv[0],
xmalloc_sockaddr2dotted(&server->lsa->sa, server->lsa->len));
diff --git a/networking/nslookup.c b/networking/nslookup.c
index 14c05b3..8076aff 100644
--- a/networking/nslookup.c
+++ b/networking/nslookup.c
@@ -49,7 +49,7 @@
static int print_host(const char *hostname, const char *header)
{
- /* We can't use host2sockaddr() - we want to get ALL addresses,
+ /* We can't use xhost2sockaddr() - we want to get ALL addresses,
* not just one */
struct addrinfo *result = NULL;
diff --git a/networking/ping.c b/networking/ping.c
index d0e6f3a..e765843 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -211,9 +211,9 @@ int ping_main(int argc, char **argv)
bb_show_usage();
#if ENABLE_PING6
- lsa = host_and_af2sockaddr(hostname, 0, af);
+ lsa = xhost_and_af2sockaddr(hostname, 0, af);
#else
- lsa = host_and_af2sockaddr(hostname, 0, AF_INET);
+ lsa = xhost_and_af2sockaddr(hostname, 0, AF_INET);
#endif
/* Set timer _after_ DNS resolution */
signal(SIGALRM, noresp);
@@ -743,9 +743,9 @@ int ping_main(int argc, char **argv)
af = AF_INET;
if (option_mask32 & OPT_IPV6)
af = AF_INET6;
- lsa = host_and_af2sockaddr(hostname, 0, af);
+ lsa = xhost_and_af2sockaddr(hostname, 0, af);
#else
- lsa = host_and_af2sockaddr(hostname, 0, AF_INET);
+ lsa = xhost_and_af2sockaddr(hostname, 0, AF_INET);
#endif
dotted = xmalloc_sockaddr2dotted_noport(&lsa->sa, lsa->len);
#if ENABLE_PING6
diff --git a/networking/tftp.c b/networking/tftp.c
index a6d85a5..9083257 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -488,7 +488,7 @@ int tftp_main(int argc, char **argv)
}
port = bb_lookup_port(argv[optind + 1], "udp", 69);
- peer_lsa = host2sockaddr(argv[optind], port);
+ peer_lsa = xhost2sockaddr(argv[optind], port);
#if ENABLE_DEBUG_TFTP
fprintf(stderr, "using server \"%s\", "
diff --git a/networking/wget.c b/networking/wget.c
index e1a4bab..e649ccd 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -234,7 +234,7 @@ int wget_main(int argc, char **argv)
/* We want to do exactly _one_ DNS lookup, since some
* sites (i.e. ftp.us.debian.org) use round-robin DNS
* and we want to connect to only one IP... */
- lsa = host2sockaddr(server.host, server.port);
+ lsa = xhost2sockaddr(server.host, server.port);
if (!(opt & WGET_OPT_QUIET)) {
fprintf(stderr, "Connecting to %s (%s)\n", server.host,
xmalloc_sockaddr2dotted(&lsa->sa, lsa->len));
@@ -354,7 +354,7 @@ int wget_main(int argc, char **argv)
server.port = target.port;
}
free(lsa);
- lsa = host2sockaddr(server.host, server.port);
+ lsa = xhost2sockaddr(server.host, server.port);
break;
}
}