diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-01 01:18:20 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-01 01:18:20 +0000 |
commit | 2856dab4770e521a87c18b04ae8ebc209a9b95f9 (patch) | |
tree | d4f6495339702c0b6d79816d0bb07ba4b6679ce8 /libbb/xconnect.c | |
parent | f443bffd3c24c4b7fcbc0472c75e747e26c24fef (diff) | |
download | busybox-w32-2856dab4770e521a87c18b04ae8ebc209a9b95f9.tar.gz busybox-w32-2856dab4770e521a87c18b04ae8ebc209a9b95f9.tar.bz2 busybox-w32-2856dab4770e521a87c18b04ae8ebc209a9b95f9.zip |
tcpsvd: new applet
It's a GPL-ed 'clone' of Dan Bernstein's tcpserver.
Author: Gerrit Pape <pape@smarden.org>
http://smarden.sunsite.dk/ipsvd/
size tcpsvd.o
text data bss dec hex filename
2571 4 16 2591 a1f tcpsvd.o
Diffstat (limited to 'libbb/xconnect.c')
-rw-r--r-- | libbb/xconnect.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libbb/xconnect.c b/libbb/xconnect.c index 118fe3e75..a331e6bc4 100644 --- a/libbb/xconnect.c +++ b/libbb/xconnect.c | |||
@@ -82,15 +82,15 @@ int xconnect_tcp_v4(struct sockaddr_in *s_addr) | |||
82 | /* "New" networking API */ | 82 | /* "New" networking API */ |
83 | 83 | ||
84 | 84 | ||
85 | int get_nport(const len_and_sockaddr *lsa) | 85 | int get_nport(const struct sockaddr *sa) |
86 | { | 86 | { |
87 | #if ENABLE_FEATURE_IPV6 | 87 | #if ENABLE_FEATURE_IPV6 |
88 | if (lsa->sa.sa_family == AF_INET6) { | 88 | if (sa->sa_family == AF_INET6) { |
89 | return lsa->sin6.sin6_port; | 89 | return ((struct sockaddr_in6*)sa)->sin6_port; |
90 | } | 90 | } |
91 | #endif | 91 | #endif |
92 | if (lsa->sa.sa_family == AF_INET) { | 92 | if (sa->sa_family == AF_INET) { |
93 | return lsa->sin.sin_port; | 93 | return ((struct sockaddr_in*)sa)->sin_port; |
94 | } | 94 | } |
95 | /* What? UNIX socket? IPX?? :) */ | 95 | /* What? UNIX socket? IPX?? :) */ |
96 | return -1; | 96 | return -1; |
@@ -308,12 +308,10 @@ char* xmalloc_sockaddr2host(const struct sockaddr *sa, socklen_t salen) | |||
308 | return sockaddr2str(sa, salen, 0); | 308 | return sockaddr2str(sa, salen, 0); |
309 | } | 309 | } |
310 | 310 | ||
311 | /* Unused | ||
312 | char* xmalloc_sockaddr2host_noport(const struct sockaddr *sa, socklen_t salen) | 311 | char* xmalloc_sockaddr2host_noport(const struct sockaddr *sa, socklen_t salen) |
313 | { | 312 | { |
314 | return sockaddr2str(sa, salen, IGNORE_PORT); | 313 | return sockaddr2str(sa, salen, IGNORE_PORT); |
315 | } | 314 | } |
316 | */ | ||
317 | 315 | ||
318 | char* xmalloc_sockaddr2hostonly_noport(const struct sockaddr *sa, socklen_t salen) | 316 | char* xmalloc_sockaddr2hostonly_noport(const struct sockaddr *sa, socklen_t salen) |
319 | { | 317 | { |