emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xconnect is non-conforming to "xfunc like libc" rule. Fixing

Browse Source
This commit is contained in:
Denis Vlasenko
2006-10-26 01:09:46 +00:00
parent 940b2e4b73
commit 1457915afc
6 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
networking/ftpgetput.c
View File

@@ -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");
}

2
networking/telnet.c
View File

@@ -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);

2
networking/wget.c
View File

@@ -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");