aboutsummaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-08-18 14:16:39 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-08-18 14:16:39 +0000
commita27a11bb2c033d3e0312dc1d62430a002314686f (patch)
tree74b32a18cb1e09c4f663a49c27ffa3725d3e4ee5 /networking
parentb98c26ad684e3aed8f1480458737f1ab90477c9e (diff)
downloadbusybox-w32-a27a11bb2c033d3e0312dc1d62430a002314686f.tar.gz
busybox-w32-a27a11bb2c033d3e0312dc1d62430a002314686f.tar.bz2
busybox-w32-a27a11bb2c033d3e0312dc1d62430a002314686f.zip
introduce and use xdup2(int, int)
stop checking whether setsockopt_reuseaddr(int fd) was successful (it always is) remove second parameter (sockllen) from xmalloc_sockaddr2xxxxx functions sockaddr2str 142 156 +14 collect_blk 467 474 +7 xdup2 28 33 +5 singlemount 4456 4454 -2 print_host 214 212 -2 nslookup_main 139 137 -2 ftpgetput_main 414 412 -2 udhcpd_main 1258 1255 -3 udhcpc_main 2405 2402 -3 traceroute_main 4125 4122 -3 nc_main 1072 1069 -3 buffer_fill_and_print 76 73 -3 xmalloc_sockaddr2hostonly_noport 18 14 -4 xmalloc_sockaddr2host_noport 18 14 -4 xmalloc_sockaddr2host 15 11 -4 xmalloc_sockaddr2dotted_noport 18 14 -4 xmalloc_sockaddr2dotted 18 14 -4 wget_main 2618 2614 -4 ping_main 393 389 -4 ip_port_str 120 115 -5 dhcprelay_main 1146 1141 -5 dnsd_main 1531 1525 -6 passwd_main 1110 1102 -8 udhcp_kernel_packet 206 197 -9 udhcp_listen_socket 154 144 -10 getty_main 2576 2566 -10 setup 655 640 -15 xmove_fd 51 34 -17 dolisten 759 742 -17 tcpudpsvd_main 1866 1836 -30 startservice 339 299 -40
Diffstat (limited to 'networking')
-rw-r--r--networking/dnsd.c2
-rw-r--r--networking/ftpgetput.c2
-rw-r--r--networking/inetd.c3
-rw-r--r--networking/nc_bloaty.c12
-rw-r--r--networking/netstat.c4
-rw-r--r--networking/nslookup.c7
-rw-r--r--networking/ping.c4
-rw-r--r--networking/tftp.c2
-rw-r--r--networking/traceroute.c2
-rw-r--r--networking/udhcp/common.h2
-rw-r--r--networking/udhcp/dhcpc.c2
-rw-r--r--networking/udhcp/dhcpd.c2
-rw-r--r--networking/udhcp/dhcprelay.c9
-rw-r--r--networking/udhcp/packet.c7
-rw-r--r--networking/udhcp/socket.c42
-rw-r--r--networking/wget.c2
16 files changed, 43 insertions, 61 deletions
diff --git a/networking/dnsd.c b/networking/dnsd.c
index 32166e555..672b729e0 100644
--- a/networking/dnsd.c
+++ b/networking/dnsd.c
@@ -375,7 +375,7 @@ int dnsd_main(int argc, char **argv)
375 xbind(udps, &lsa->sa, lsa->len); 375 xbind(udps, &lsa->sa, lsa->len);
376 /* xlisten(udps, 50); - ?!! DGRAM sockets are never listened on I think? */ 376 /* xlisten(udps, 50); - ?!! DGRAM sockets are never listened on I think? */
377 bb_info_msg("Accepting UDP packets on %s", 377 bb_info_msg("Accepting UDP packets on %s",
378 xmalloc_sockaddr2dotted(&lsa->sa, lsa->len)); 378 xmalloc_sockaddr2dotted(&lsa->sa));
379 379
380 while (1) { 380 while (1) {
381 int r; 381 int r;
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index f3d6009dd..255e413cb 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -348,7 +348,7 @@ int ftpgetput_main(int argc, char **argv)
348 server->lsa = xhost2sockaddr(argv[0], bb_lookup_port(port, "tcp", 21)); 348 server->lsa = xhost2sockaddr(argv[0], bb_lookup_port(port, "tcp", 21));
349 if (verbose_flag) { 349 if (verbose_flag) {
350 printf("Connecting to %s (%s)\n", argv[0], 350 printf("Connecting to %s (%s)\n", argv[0],
351 xmalloc_sockaddr2dotted(&server->lsa->sa, server->lsa->len)); 351 xmalloc_sockaddr2dotted(&server->lsa->sa));
352 } 352 }
353 353
354 /* Connect/Setup/Configure the FTP session */ 354 /* Connect/Setup/Configure the FTP session */
diff --git a/networking/inetd.c b/networking/inetd.c
index 211a8dcbf..a7517ebdf 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -453,8 +453,7 @@ static void setup(servtab_t *sep)
453 bb_perror_msg("%s/%s: socket", sep->se_service, sep->se_proto); 453 bb_perror_msg("%s/%s: socket", sep->se_service, sep->se_proto);
454 return; 454 return;
455 } 455 }
456 if (setsockopt_reuseaddr(sep->se_fd) < 0) 456 setsockopt_reuseaddr(sep->se_fd);
457 bb_perror_msg("setsockopt(SO_REUSEADDR)");
458 457
459#if ENABLE_FEATURE_INETD_RPC 458#if ENABLE_FEATURE_INETD_RPC
460 if (isrpcservice(sep)) { 459 if (isrpcservice(sep)) {
diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c
index 0d1071499..30abb3c1c 100644
--- a/networking/nc_bloaty.c
+++ b/networking/nc_bloaty.c
@@ -278,7 +278,7 @@ static void dolisten(void)
278 rr = getsockname(netfd, &ouraddr->sa, &ouraddr->len); 278 rr = getsockname(netfd, &ouraddr->sa, &ouraddr->len);
279 if (rr < 0) 279 if (rr < 0)
280 bb_perror_msg_and_die("getsockname after bind"); 280 bb_perror_msg_and_die("getsockname after bind");
281 addr = xmalloc_sockaddr2dotted(&ouraddr->sa, ouraddr->len); 281 addr = xmalloc_sockaddr2dotted(&ouraddr->sa);
282 fprintf(stderr, "listening on %s ...\n", addr); 282 fprintf(stderr, "listening on %s ...\n", addr);
283 free(addr); 283 free(addr);
284 } 284 }
@@ -341,7 +341,7 @@ create new one, and bind() it. TODO */
341 /* nc 1.10 bails out instead, and its error message 341 /* nc 1.10 bails out instead, and its error message
342 * is not suppressed by o_verbose */ 342 * is not suppressed by o_verbose */
343 if (o_verbose) { 343 if (o_verbose) {
344 char *remaddr = xmalloc_sockaddr2dotted(&remend.sa, remend.len); 344 char *remaddr = xmalloc_sockaddr2dotted(&remend.sa);
345 bb_error_msg("connect from wrong ip/port %s ignored", remaddr); 345 bb_error_msg("connect from wrong ip/port %s ignored", remaddr);
346 free(remaddr); 346 free(remaddr);
347 } 347 }
@@ -393,9 +393,9 @@ create new one, and bind() it. TODO */
393 accept the connection and then reject undesireable ones by closing. 393 accept the connection and then reject undesireable ones by closing.
394 In other words, we need a TCP MSG_PEEK. */ 394 In other words, we need a TCP MSG_PEEK. */
395 /* bbox: removed most of it */ 395 /* bbox: removed most of it */
396 lcladdr = xmalloc_sockaddr2dotted(&ouraddr->sa, ouraddr->len); 396 lcladdr = xmalloc_sockaddr2dotted(&ouraddr->sa);
397 remaddr = xmalloc_sockaddr2dotted(&remend.sa, remend.len); 397 remaddr = xmalloc_sockaddr2dotted(&remend.sa);
398 remhostname = o_nflag ? remaddr : xmalloc_sockaddr2host(&remend.sa, remend.len); 398 remhostname = o_nflag ? remaddr : xmalloc_sockaddr2host(&remend.sa);
399 fprintf(stderr, "connect to %s from %s (%s)\n", 399 fprintf(stderr, "connect to %s from %s (%s)\n",
400 lcladdr, remhostname, remaddr); 400 lcladdr, remhostname, remaddr);
401 free(lcladdr); 401 free(lcladdr);
@@ -796,7 +796,7 @@ int nc_main(int argc, char **argv)
796 796
797 remend = *themaddr; 797 remend = *themaddr;
798 if (o_verbose) 798 if (o_verbose)
799 themdotted = xmalloc_sockaddr2dotted(&themaddr->sa, themaddr->len); 799 themdotted = xmalloc_sockaddr2dotted(&themaddr->sa);
800 800
801 x = connect_w_timeout(netfd); 801 x = connect_w_timeout(netfd);
802 if (o_zero && x == 0 && o_udpmode) /* if UDP scanning... */ 802 if (o_zero && x == 0 && o_udpmode) /* if UDP scanning... */
diff --git a/networking/netstat.c b/networking/netstat.c
index 014e5e251..9fd3d2f86 100644
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -140,8 +140,8 @@ static char *ip_port_str(struct sockaddr *addr, int port, const char *proto, int
140 /* Code which used "*" for INADDR_ANY is removed: it's ambiguous in IPv6, 140 /* Code which used "*" for INADDR_ANY is removed: it's ambiguous in IPv6,
141 * while "0.0.0.0" is not. */ 141 * while "0.0.0.0" is not. */
142 142
143 host = numeric ? xmalloc_sockaddr2dotted_noport(addr, salen) 143 host = numeric ? xmalloc_sockaddr2dotted_noport(addr)
144 : xmalloc_sockaddr2host_noport(addr, salen); 144 : xmalloc_sockaddr2host_noport(addr);
145 145
146 host_port = xasprintf("%s:%s", host, get_sname(htons(port), proto, numeric)); 146 host_port = xasprintf("%s:%s", host, get_sname(htons(port), proto, numeric));
147 free(host); 147 free(host);
diff --git a/networking/nslookup.c b/networking/nslookup.c
index 608e65462..0036d0d17 100644
--- a/networking/nslookup.c
+++ b/networking/nslookup.c
@@ -72,8 +72,8 @@ static int print_host(const char *hostname, const char *header)
72 // printf("%s\n", cur->ai_canonname); ? 72 // printf("%s\n", cur->ai_canonname); ?
73 while (cur) { 73 while (cur) {
74 char *dotted, *revhost; 74 char *dotted, *revhost;
75 dotted = xmalloc_sockaddr2dotted_noport(cur->ai_addr, cur->ai_addrlen); 75 dotted = xmalloc_sockaddr2dotted_noport(cur->ai_addr);
76 revhost = xmalloc_sockaddr2hostonly_noport(cur->ai_addr, cur->ai_addrlen); 76 revhost = xmalloc_sockaddr2hostonly_noport(cur->ai_addr);
77 77
78 printf("Address %u: %s%c", ++cnt, dotted, revhost ? ' ' : '\n'); 78 printf("Address %u: %s%c", ++cnt, dotted, revhost ? ' ' : '\n');
79 if (revhost) { 79 if (revhost) {
@@ -102,8 +102,7 @@ static void server_print(void)
102{ 102{
103 char *server; 103 char *server;
104 104
105 server = xmalloc_sockaddr2dotted_noport((struct sockaddr*)&_res.nsaddr_list[0], 105 server = xmalloc_sockaddr2dotted_noport((struct sockaddr*)&_res.nsaddr_list[0]);
106 sizeof(struct sockaddr_in));
107 /* I honestly don't know what to do if DNS server has _IPv6 address_. 106 /* I honestly don't know what to do if DNS server has _IPv6 address_.
108 * Probably it is listed in 107 * Probably it is listed in
109 * _res._u._ext_.nsaddrs[MAXNS] (of type "struct sockaddr_in6*" each) 108 * _res._u._ext_.nsaddrs[MAXNS] (of type "struct sockaddr_in6*" each)
diff --git a/networking/ping.c b/networking/ping.c
index 127474ccc..d1a413dd3 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -664,7 +664,7 @@ static void ping(len_and_sockaddr *lsa)
664 printf("PING %s (%s)", hostname, dotted); 664 printf("PING %s (%s)", hostname, dotted);
665 if (source_lsa) { 665 if (source_lsa) {
666 printf(" from %s", 666 printf(" from %s",
667 xmalloc_sockaddr2dotted_noport(&source_lsa->sa, source_lsa->len)); 667 xmalloc_sockaddr2dotted_noport(&source_lsa->sa));
668 } 668 }
669 printf(": %d data bytes\n", datalen); 669 printf(": %d data bytes\n", datalen);
670 670
@@ -715,7 +715,7 @@ int ping_main(int argc, char **argv)
715 /* leaking it here... */ 715 /* leaking it here... */
716 source_lsa = NULL; 716 source_lsa = NULL;
717 717
718 dotted = xmalloc_sockaddr2dotted_noport(&lsa->sa, lsa->len); 718 dotted = xmalloc_sockaddr2dotted_noport(&lsa->sa);
719 ping(lsa); 719 ping(lsa);
720 pingstats(0); 720 pingstats(0);
721 return EXIT_SUCCESS; 721 return EXIT_SUCCESS;
diff --git a/networking/tftp.c b/networking/tftp.c
index 85d1a857f..030c0116e 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -443,7 +443,7 @@ int tftp_main(int argc, char **argv)
443 443
444#if ENABLE_DEBUG_TFTP 444#if ENABLE_DEBUG_TFTP
445 fprintf(stderr, "using server '%s', remotefile '%s', localfile '%s'\n", 445 fprintf(stderr, "using server '%s', remotefile '%s', localfile '%s'\n",
446 xmalloc_sockaddr2dotted(&peer_lsa->sa, peer_lsa->len), 446 xmalloc_sockaddr2dotted(&peer_lsa->sa),
447 remotefile, localfile); 447 remotefile, localfile);
448#endif 448#endif
449 449
diff --git a/networking/traceroute.c b/networking/traceroute.c
index 20f304d53..0923d97dc 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -812,7 +812,7 @@ print_inetname(struct sockaddr_in *from)
812 else { 812 else {
813 char *n = NULL; 813 char *n = NULL;
814 if (from->sin_addr.s_addr != INADDR_ANY) 814 if (from->sin_addr.s_addr != INADDR_ANY)
815 n = xmalloc_sockaddr2host_noport((struct sockaddr*)from, sizeof(*from)); 815 n = xmalloc_sockaddr2host_noport((struct sockaddr*)from);
816 printf(" %s (%s)", (n ? n : ina), ina); 816 printf(" %s (%s)", (n ? n : ina), ina);
817 free(n); 817 free(n);
818 } 818 }
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index bc21176a5..33417af09 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -83,7 +83,7 @@ int udhcp_sp_fd_set(fd_set *rfds, int extra_fd);
83int udhcp_sp_read(fd_set *rfds); 83int udhcp_sp_read(fd_set *rfds);
84int raw_socket(int ifindex); 84int raw_socket(int ifindex);
85int read_interface(const char *interface, int *ifindex, uint32_t *addr, uint8_t *arp); 85int read_interface(const char *interface, int *ifindex, uint32_t *addr, uint8_t *arp);
86int listen_socket(uint32_t ip, int port, const char *inf); 86int listen_socket(/*uint32_t ip,*/ int port, const char *inf);
87/* Returns 1 if no reply received */ 87/* Returns 1 if no reply received */
88int arpping(uint32_t test_ip, uint32_t from_ip, uint8_t *from_mac, const char *interface); 88int arpping(uint32_t test_ip, uint32_t from_ip, uint8_t *from_mac, const char *interface);
89 89
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 7d38742b9..f0a3351fd 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -311,7 +311,7 @@ int udhcpc_main(int argc, char **argv)
311 311
312 if (listen_mode != LISTEN_NONE && sockfd < 0) { 312 if (listen_mode != LISTEN_NONE && sockfd < 0) {
313 if (listen_mode == LISTEN_KERNEL) 313 if (listen_mode == LISTEN_KERNEL)
314 sockfd = listen_socket(INADDR_ANY, CLIENT_PORT, client_config.interface); 314 sockfd = listen_socket(/*INADDR_ANY,*/ CLIENT_PORT, client_config.interface);
315 else 315 else
316 sockfd = raw_socket(client_config.ifindex); 316 sockfd = raw_socket(client_config.ifindex);
317 } 317 }
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index fb42e2f73..2fd16ce9b 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -95,7 +95,7 @@ int udhcpd_main(int argc, char **argv)
95 while (1) { /* loop until universe collapses */ 95 while (1) { /* loop until universe collapses */
96 96
97 if (server_socket < 0) { 97 if (server_socket < 0) {
98 server_socket = listen_socket(INADDR_ANY, SERVER_PORT, 98 server_socket = listen_socket(/*INADDR_ANY,*/ SERVER_PORT,
99 server_config.interface); 99 server_config.interface);
100 } 100 }
101 101
diff --git a/networking/udhcp/dhcprelay.c b/networking/udhcp/dhcprelay.c
index 4ed65a2d6..3e1758d5c 100644
--- a/networking/udhcp/dhcprelay.c
+++ b/networking/udhcp/dhcprelay.c
@@ -167,16 +167,17 @@ static int init_sockets(char **client, int num_clients,
167 int i; 167 int i;
168 168
169 /* talk to real server on bootps */ 169 /* talk to real server on bootps */
170 fds[0] = listen_socket(htonl(INADDR_ANY), 67, server); 170 fds[0] = listen_socket(/*INADDR_ANY,*/ 67, server);
171 *max_socket = fds[0]; 171 *max_socket = fds[0];
172 172
173 /* array starts at 1 since server is 0 */ 173 /* array starts at 1 since server is 0 */
174 num_clients++; 174 num_clients++;
175 175
176 for (i=1; i < num_clients; i++) { 176 for (i = 1; i < num_clients; i++) {
177 /* listen for clients on bootps */ 177 /* listen for clients on bootps */
178 fds[i] = listen_socket(htonl(INADDR_ANY), 67, client[i-1]); 178 fds[i] = listen_socket(/*NADDR_ANY,*/ 67, client[i-1]);
179 if (fds[i] > *max_socket) *max_socket = fds[i]; 179 if (fds[i] > *max_socket)
180 *max_socket = fds[i];
180 } 181 }
181 182
182 return i; 183 return i;
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index 272e79df1..41cd32135 100644
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -194,17 +194,14 @@ int udhcp_kernel_packet(struct dhcpMessage *payload,
194 if (fd < 0) 194 if (fd < 0)
195 return -1; 195 return -1;
196 196
197 if (setsockopt_reuseaddr(fd) == -1) { 197 setsockopt_reuseaddr(fd);
198 close(fd);
199 return -1;
200 }
201 198
202 memset(&client, 0, sizeof(client)); 199 memset(&client, 0, sizeof(client));
203 client.sin_family = AF_INET; 200 client.sin_family = AF_INET;
204 client.sin_port = htons(source_port); 201 client.sin_port = htons(source_port);
205 client.sin_addr.s_addr = source_ip; 202 client.sin_addr.s_addr = source_ip;
206 203
207 if (bind(fd, (struct sockaddr *)&client, sizeof(struct sockaddr)) == -1) { 204 if (bind(fd, (struct sockaddr *)&client, sizeof(client)) == -1) {
208 close(fd); 205 close(fd);
209 return -1; 206 return -1;
210 } 207 }
diff --git a/networking/udhcp/socket.c b/networking/udhcp/socket.c
index 1e62f8e40..79ddfb1e2 100644
--- a/networking/udhcp/socket.c
+++ b/networking/udhcp/socket.c
@@ -45,10 +45,6 @@ int read_interface(const char *interface, int *ifindex, uint32_t *addr, uint8_t
45 45
46 memset(&ifr, 0, sizeof(ifr)); 46 memset(&ifr, 0, sizeof(ifr));
47 fd = xsocket(AF_INET, SOCK_RAW, IPPROTO_RAW); 47 fd = xsocket(AF_INET, SOCK_RAW, IPPROTO_RAW);
48// if (fd < 0) {
49// bb_perror_msg("socket failed");
50// return -1;
51// }
52 48
53 ifr.ifr_addr.sa_family = AF_INET; 49 ifr.ifr_addr.sa_family = AF_INET;
54 strncpy(ifr.ifr_name, interface, sizeof(ifr.ifr_name)); 50 strncpy(ifr.ifr_name, interface, sizeof(ifr.ifr_name));
@@ -87,40 +83,30 @@ int read_interface(const char *interface, int *ifindex, uint32_t *addr, uint8_t
87 return 0; 83 return 0;
88} 84}
89 85
90 86/* 1. None of the callers expects it to ever fail */
91int listen_socket(uint32_t ip, int port, const char *inf) 87/* 2. ip was always INADDR_ANY */
88int listen_socket(/*uint32_t ip,*/ int port, const char *inf)
92{ 89{
93 struct ifreq interface;
94 int fd; 90 int fd;
91 struct ifreq interface;
95 struct sockaddr_in addr; 92 struct sockaddr_in addr;
96 93
97 DEBUG("Opening listen socket on 0x%08x:%d %s", ip, port, inf); 94 DEBUG("Opening listen socket on 0x%08x:%d %s", ip, port, inf);
98 fd = xsocket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); 95 fd = xsocket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
99 96
100 memset(&addr, 0, sizeof(addr)); 97 setsockopt_reuseaddr(fd);
101 addr.sin_family = AF_INET; 98 if (setsockopt_broadcast(fd) == -1)
102 addr.sin_port = htons(port); 99 bb_perror_msg_and_die("SO_BROADCAST");
103 addr.sin_addr.s_addr = ip;
104
105 if (setsockopt_reuseaddr(fd) == -1) {
106 close(fd);
107 return -1;
108 }
109 if (setsockopt_broadcast(fd) == -1) {
110 close(fd);
111 return -1;
112 }
113 100
114 strncpy(interface.ifr_name, inf, IFNAMSIZ); 101 strncpy(interface.ifr_name, inf, IFNAMSIZ);
115 if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, &interface, sizeof(interface)) < 0) { 102 if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, &interface, sizeof(interface)) == -1)
116 close(fd); 103 bb_perror_msg_and_die("SO_BINDTODEVICE");
117 return -1;
118 }
119 104
120 if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)) == -1) { 105 memset(&addr, 0, sizeof(addr));
121 close(fd); 106 addr.sin_family = AF_INET;
122 return -1; 107 addr.sin_port = htons(port);
123 } 108 /* addr.sin_addr.s_addr = ip; - all-zeros is INADDR_ANY */
109 xbind(fd, (struct sockaddr *)&addr, sizeof(addr));
124 110
125 return fd; 111 return fd;
126} 112}
diff --git a/networking/wget.c b/networking/wget.c
index d90368c40..3e61ea656 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -236,7 +236,7 @@ int wget_main(int argc, char **argv)
236 lsa = xhost2sockaddr(server.host, server.port); 236 lsa = xhost2sockaddr(server.host, server.port);
237 if (!(opt & WGET_OPT_QUIET)) { 237 if (!(opt & WGET_OPT_QUIET)) {
238 fprintf(stderr, "Connecting to %s (%s)\n", server.host, 238 fprintf(stderr, "Connecting to %s (%s)\n", server.host,
239 xmalloc_sockaddr2dotted(&lsa->sa, lsa->len)); 239 xmalloc_sockaddr2dotted(&lsa->sa));
240 /* We leak result of xmalloc_sockaddr2dotted */ 240 /* We leak result of xmalloc_sockaddr2dotted */
241 } 241 }
242 242