aboutsummaryrefslogtreecommitdiff
path: root/libbb/xconnect.c
diff options
context:
space:
mode:
authorvda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-01-24 23:53:22 +0000
committervda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-01-24 23:53:22 +0000
commit89fc336b577c7e70cde5ad1bdd0bcd8c9b42ebc2 (patch)
tree6a995795abf0322f540585a6c4d28847fbebb773 /libbb/xconnect.c
parentd890b9bb85ac20865a8a57223df7bc376d8181a0 (diff)
downloadbusybox-w32-89fc336b577c7e70cde5ad1bdd0bcd8c9b42ebc2.tar.gz
busybox-w32-89fc336b577c7e70cde5ad1bdd0bcd8c9b42ebc2.tar.bz2
busybox-w32-89fc336b577c7e70cde5ad1bdd0bcd8c9b42ebc2.zip
Unify ping and ping6. ping has -4 and -6 which force
name resolution into IP or IPv6 only, otherwise we take address family returned by host2sockaddr() in lsa->sa.sa_family. IOW: "ping ::1" with do IPv6 ping, "ping 127.0.0.1" will do IPv4 ping. ping6 is aliased to "ping -6". git-svn-id: svn://busybox.net/trunk/busybox@17513 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'libbb/xconnect.c')
-rw-r--r--libbb/xconnect.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index 61fe7fd6c..2b35baab7 100644
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -296,10 +296,12 @@ char* xmalloc_sockaddr2host(const struct sockaddr *sa, socklen_t salen)
296 return sockaddr2str(sa, salen, 0); 296 return sockaddr2str(sa, salen, 0);
297} 297}
298 298
299/* Unused
299char* xmalloc_sockaddr2host_noport(const struct sockaddr *sa, socklen_t salen) 300char* xmalloc_sockaddr2host_noport(const struct sockaddr *sa, socklen_t salen)
300{ 301{
301 return sockaddr2str(sa, salen, IGNORE_PORT); 302 return sockaddr2str(sa, salen, IGNORE_PORT);
302} 303}
304*/
303 305
304char* xmalloc_sockaddr2hostonly_noport(const struct sockaddr *sa, socklen_t salen) 306char* xmalloc_sockaddr2hostonly_noport(const struct sockaddr *sa, socklen_t salen)
305{ 307{