aboutsummaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorvda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-10-26 01:09:46 +0000
committervda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-10-26 01:09:46 +0000
commitecf2793bffe34a7300f20b77ab39b67a6e939e59 (patch)
tree4f61a7fd5a6a3ebbca053c55dc68b8a3edb7700b /networking
parente4d50cf154eab6730b3ba1dfb443d36d63a6ba3e (diff)
downloadbusybox-w32-ecf2793bffe34a7300f20b77ab39b67a6e939e59.tar.gz
busybox-w32-ecf2793bffe34a7300f20b77ab39b67a6e939e59.tar.bz2
busybox-w32-ecf2793bffe34a7300f20b77ab39b67a6e939e59.zip
xconnect is non-conforming to "xfunc like libc" rule. Fixing
git-svn-id: svn://busybox.net/trunk/busybox@16440 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'networking')
-rw-r--r--networking/ftpgetput.c4
-rw-r--r--networking/telnet.c2
-rw-r--r--networking/wget.c2
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)
67 port_num += xatoul_range(buf_ptr + 1, 0, 255) * 256; 67 port_num += xatoul_range(buf_ptr + 1, 0, 255) * 256;
68 68
69 server->s_in->sin_port = htons(port_num); 69 server->s_in->sin_port = htons(port_num);
70 return xconnect(server->s_in); 70 return xconnect_tcp_v4(server->s_in);
71} 71}
72 72
73static FILE *ftp_login(ftp_host_info_t *server) 73static FILE *ftp_login(ftp_host_info_t *server)
@@ -76,7 +76,7 @@ static FILE *ftp_login(ftp_host_info_t *server)
76 char buf[512]; 76 char buf[512];
77 77
78 /* Connect to the command socket */ 78 /* Connect to the command socket */
79 control_stream = fdopen(xconnect(server->s_in), "r+"); 79 control_stream = fdopen(xconnect_tcp_v4(server->s_in), "r+");
80 if (control_stream == NULL) { 80 if (control_stream == NULL) {
81 bb_perror_msg_and_die("cannot open control stream"); 81 bb_perror_msg_and_die("cannot open control stream");
82 } 82 }
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)
639 s_in.sin_port = bb_lookup_port((argc == 3) ? argv[2] : "telnet", "tcp", 23); 639 s_in.sin_port = bb_lookup_port((argc == 3) ? argv[2] : "telnet", "tcp", 23);
640#endif 640#endif
641 641
642 G.netfd = xconnect(&s_in); 642 G.netfd = xconnect_tcp_v4(&s_in);
643 643
644 setsockopt(G.netfd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof one); 644 setsockopt(G.netfd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof one);
645 645
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)
585{ 585{
586 FILE *fp; 586 FILE *fp;
587 587
588 fp = fdopen(xconnect(s_in), "r+"); 588 fp = fdopen(xconnect_tcp_v4(s_in), "r+");
589 if (fp == NULL) 589 if (fp == NULL)
590 bb_perror_msg_and_die("fdopen"); 590 bb_perror_msg_and_die("fdopen");
591 591