diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-26 01:09:46 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-26 01:09:46 +0000 |
| commit | 1457915afcb8fb0697f441dce1697b278d25f4a5 (patch) | |
| tree | 4f61a7fd5a6a3ebbca053c55dc68b8a3edb7700b /networking | |
| parent | 940b2e4b734e92cd6dd10c33910439478812d106 (diff) | |
| download | busybox-1457915afcb8fb0697f441dce1697b278d25f4a5.tar.gz | |
xconnect is non-conforming to "xfunc like libc" rule. Fixing
Diffstat (limited to 'networking')
| -rw-r--r-- | networking/ftpgetput.c | 4 | ||||
| -rw-r--r-- | networking/telnet.c | 2 | ||||
| -rw-r--r-- | networking/wget.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c index aafeaf6e9..6608e6830 100644 --- a/networking/ftpgetput.c +++ b/networking/ftpgetput.c @@ -67,7 +67,7 @@ static int xconnect_ftpdata(ftp_host_info_t *server, const char *buf) port_num += xatoul_range(buf_ptr + 1, 0, 255) * 256; server->s_in->sin_port = htons(port_num); - return xconnect(server->s_in); + return xconnect_tcp_v4(server->s_in); } static FILE *ftp_login(ftp_host_info_t *server) @@ -76,7 +76,7 @@ static FILE *ftp_login(ftp_host_info_t *server) char buf[512]; /* Connect to the command socket */ - control_stream = fdopen(xconnect(server->s_in), "r+"); + control_stream = fdopen(xconnect_tcp_v4(server->s_in), "r+"); if (control_stream == NULL) { bb_perror_msg_and_die("cannot open control stream"); } diff --git a/networking/telnet.c b/networking/telnet.c index cd4c33a86..5b8c885e2 100644 --- a/networking/telnet.c +++ b/networking/telnet.c @@ -639,7 +639,7 @@ int telnet_main(int argc, char** argv) s_in.sin_port = bb_lookup_port((argc == 3) ? argv[2] : "telnet", "tcp", 23); #endif - G.netfd = xconnect(&s_in); + G.netfd = xconnect_tcp_v4(&s_in); setsockopt(G.netfd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof one); diff --git a/networking/wget.c b/networking/wget.c index 090b58d9a..425abc13f 100644 --- a/networking/wget.c +++ b/networking/wget.c @@ -585,7 +585,7 @@ static FILE *open_socket(struct sockaddr_in *s_in) { FILE *fp; - fp = fdopen(xconnect(s_in), "r+"); + fp = fdopen(xconnect_tcp_v4(s_in), "r+"); if (fp == NULL) bb_perror_msg_and_die("fdopen"); |