[BusyBox-cvs] busybox/networking ftpgetput.c, 1.10, 1.11 telnet.c, 1.39, 1.40 wget.c, 1.62, 1.63

[Glenn McGrath]

Update of /var/cvs/busybox/networking
In directory nail:/tmp/cvs-serv1871/networking

Modified Files:
	ftpgetput.c telnet.c wget.c 
Log Message:
Change interface to bb_lookup_host, dont try and set port inside this 
function as there is no gracefull way of handling failures.
Rename bb_getport to bb_lookup_port, allow a default port to be 
specified so it always returns a correct value.
Modify ftpgetput/rdate/wget to use the new interface.
wget/rdate now use etc/services with a falback default value.


Index: telnet.c
===================================================================
RCS file: /var/cvs/busybox/networking/telnet.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- telnet.c	31 Oct 2003 09:31:43 -0000	1.39
+++ telnet.c	20 Dec 2003 01:47:18 -0000	1.40
@@ -570,8 +570,6 @@
 
 extern int telnet_main(int argc, char** argv)
 {
-	char *host;
-	char *port;
 	int len;
 	struct sockaddr_in s_in;
 #ifdef USE_POLL
@@ -597,12 +595,12 @@
 	G.termios_raw = G.termios_def;
 	cfmakeraw(&G.termios_raw);
 	
-	if (argc < 2)	bb_show_usage();
-	port = (argc > 2)? argv[2] : "23";
+	if (argc < 2)
+		bb_show_usage();
 	
-	host = argv[1];
+	bb_lookup_host(&s_in, argv[1]);
+	s_in.sin_port = bb_lookup_port((argc == 3) ? argv[2] : "telnet", 23);
 	
-	bb_lookup_host(&s_in, host, port);
 	G.netfd = xconnect(&s_in);
 
 	setsockopt(G.netfd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof one);

Index: ftpgetput.c
===================================================================
RCS file: /var/cvs/busybox/networking/ftpgetput.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ftpgetput.c	19 Dec 2003 10:37:52 -0000	1.10
+++ ftpgetput.c	20 Dec 2003 01:47:18 -0000	1.11
@@ -356,7 +356,8 @@
 	 * and we want to connect to only one IP... */
 	server->s_in = &s_in;
 	server->host = argv[optind];
-	bb_lookup_host(&s_in, server->host, NULL);
+	bb_lookup_host(&s_in, server->host);
+	s_in.sin_port = bb_lookup_port(server->port, 21);
 	if (verbose_flag) {
 		fprintf(stdout, "Connecting to %s[%s]:%s\n",
 				server->host, inet_ntoa(s_in.sin_addr), server->port);

Index: wget.c
===================================================================
RCS file: /var/cvs/busybox/networking/wget.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- wget.c	19 Dec 2003 12:08:56 -0000	1.62
+++ wget.c	20 Dec 2003 01:47:18 -0000	1.63
@@ -40,7 +40,7 @@
 };
 
 static void parse_url(char *url, struct host_info *h);
-static FILE *open_socket(struct sockaddr_in *s_in, int port);
+static FILE *open_socket(struct sockaddr_in *s_in);
 static char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc);
 static int ftpcmd(char *s1, char *s2, FILE *fp, char *buf);
 
@@ -286,10 +286,11 @@
 	/* We want to do exactly _one_ DNS lookup, since some
 	 * sites (i.e. ftp.us.debian.org) use round-robin DNS
 	 * and we want to connect to only one IP... */
-	bb_lookup_host(&s_in, server.host, NULL);
+	bb_lookup_host(&s_in, server.host);
+	s_in.sin_port = server.port;
 	if (quiet_flag==FALSE) {
 		fprintf(stdout, "Connecting to %s[%s]:%d\n",
-				server.host, inet_ntoa(s_in.sin_addr), server.port);
+				server.host, inet_ntoa(s_in.sin_addr), ntohs(server.port));
 	}
 
 	if (proxy || !target.is_ftp) {
@@ -306,7 +307,7 @@
 			 * Open socket to http server
 			 */
 			if (sfp) fclose(sfp);
-			sfp = open_socket(&s_in, server.port);
+			sfp = open_socket(&s_in);
 			
 			/*
 			 * Send HTTP request.
@@ -418,7 +419,7 @@
 		if (! target.user)
 			target.user = bb_xstrdup("anonymous:busybox@");
 
-		sfp = open_socket(&s_in, server.port);
+		sfp = open_socket(&s_in);
 		if (ftpcmd(NULL, NULL, sfp, buf) != 220)
 			close_delete_and_die("%s", buf+4);
 
@@ -461,7 +462,8 @@
 		port = atoi(s+1);
 		s = strrchr(buf, ',');
 		port += atoi(s+1) * 256;
-		dfp = open_socket(&s_in, port);
+		s_in.sin_port = htons(port);
+		dfp = open_socket(&s_in);
 
 		if (do_continue) {
 			sprintf(buf, "REST %ld", beg_range);
@@ -535,11 +537,11 @@
 	char *cp, *sp, *up, *pp;
 
 	if (strncmp(url, "http://", 7) == 0) {
-		h->port = 80;
+		h->port = bb_lookup_port("http", 80);
 		h->host = url + 7;
 		h->is_ftp = 0;
 	} else if (strncmp(url, "ftp://", 6) == 0) {
-		h->port = 21;
+		h->port = bb_lookup_port("ftp", 21);
 		h->host = url + 6;
 		h->is_ftp = 1;
 	} else
@@ -586,21 +588,12 @@
 }
 
 
-FILE *open_socket(struct sockaddr_in *s_in, int port)
+FILE *open_socket(struct sockaddr_in *s_in)
 {
-	int fd;
 	FILE *fp;
 
-	if (port>0 && port < 65536) {
-		s_in->sin_port=htons(port);
-	}
-
-	fd=xconnect(s_in);
-
-	/*
-	 * Get the server onto a stdio stream.
-	 */
-	if ((fp = fdopen(fd, "r+")) == NULL)
+	fp = fdopen(xconnect(s_in), "r+");
+	if (fp == NULL)
 		bb_perror_msg_and_die("fdopen()");
 
 	return fp;