diff options
Diffstat (limited to 'networking')
-rw-r--r-- | networking/httpd.c | 6 | ||||
-rw-r--r-- | networking/telnet.c | 4 | ||||
-rw-r--r-- | networking/tftp.c | 2 | ||||
-rw-r--r-- | networking/udhcp/dhcpd.c | 2 | ||||
-rw-r--r-- | networking/wget.c | 3 |
5 files changed, 10 insertions, 7 deletions
diff --git a/networking/httpd.c b/networking/httpd.c index 227803abf..0a8322c88 100644 --- a/networking/httpd.c +++ b/networking/httpd.c | |||
@@ -1167,7 +1167,7 @@ static NOINLINE void cgi_io_loop_and_exit(int fromCgi_rd, int toCgi_wr, int post | |||
1167 | break; | 1167 | break; |
1168 | } | 1168 | } |
1169 | 1169 | ||
1170 | if (pfd[TO_CGI].revents & POLLOUT) { | 1170 | if (pfd[TO_CGI].revents) { |
1171 | /* hdr_cnt > 0 here due to the way pfd[TO_CGI].events set */ | 1171 | /* hdr_cnt > 0 here due to the way pfd[TO_CGI].events set */ |
1172 | /* Have data from peer and can write to CGI */ | 1172 | /* Have data from peer and can write to CGI */ |
1173 | count = safe_write(toCgi_wr, hdr_ptr, hdr_cnt); | 1173 | count = safe_write(toCgi_wr, hdr_ptr, hdr_cnt); |
@@ -1184,7 +1184,7 @@ static NOINLINE void cgi_io_loop_and_exit(int fromCgi_rd, int toCgi_wr, int post | |||
1184 | } | 1184 | } |
1185 | } | 1185 | } |
1186 | 1186 | ||
1187 | if (pfd[0].revents & POLLIN) { | 1187 | if (pfd[0].revents) { |
1188 | /* post_len > 0 && hdr_cnt == 0 here */ | 1188 | /* post_len > 0 && hdr_cnt == 0 here */ |
1189 | /* We expect data, prev data portion is eaten by CGI | 1189 | /* We expect data, prev data portion is eaten by CGI |
1190 | * and there *is* data to read from the peer | 1190 | * and there *is* data to read from the peer |
@@ -1202,7 +1202,7 @@ static NOINLINE void cgi_io_loop_and_exit(int fromCgi_rd, int toCgi_wr, int post | |||
1202 | } | 1202 | } |
1203 | } | 1203 | } |
1204 | 1204 | ||
1205 | if (pfd[FROM_CGI].revents & POLLIN) { | 1205 | if (pfd[FROM_CGI].revents) { |
1206 | /* There is something to read from CGI */ | 1206 | /* There is something to read from CGI */ |
1207 | char *rbuf = iobuf; | 1207 | char *rbuf = iobuf; |
1208 | 1208 | ||
diff --git a/networking/telnet.c b/networking/telnet.c index 013d959a1..6a84e9405 100644 --- a/networking/telnet.c +++ b/networking/telnet.c | |||
@@ -618,7 +618,7 @@ int telnet_main(int argc UNUSED_PARAM, char **argv) | |||
618 | default: | 618 | default: |
619 | 619 | ||
620 | #ifdef USE_POLL | 620 | #ifdef USE_POLL |
621 | if (ufds[0].revents & POLLIN) | 621 | if (ufds[0].revents) |
622 | #else | 622 | #else |
623 | if (FD_ISSET(STDIN_FILENO, &rfds)) | 623 | if (FD_ISSET(STDIN_FILENO, &rfds)) |
624 | #endif | 624 | #endif |
@@ -631,7 +631,7 @@ int telnet_main(int argc UNUSED_PARAM, char **argv) | |||
631 | } | 631 | } |
632 | 632 | ||
633 | #ifdef USE_POLL | 633 | #ifdef USE_POLL |
634 | if (ufds[1].revents & POLLIN) | 634 | if (ufds[1].revents) |
635 | #else | 635 | #else |
636 | if (FD_ISSET(netfd, &rfds)) | 636 | if (FD_ISSET(netfd, &rfds)) |
637 | #endif | 637 | #endif |
diff --git a/networking/tftp.c b/networking/tftp.c index 8d6038853..b2c3c033c 100644 --- a/networking/tftp.c +++ b/networking/tftp.c | |||
@@ -308,7 +308,7 @@ static int tftp_protocol( | |||
308 | 308 | ||
309 | if (!ENABLE_TFTP || our_lsa) { /* tftpd */ | 309 | if (!ENABLE_TFTP || our_lsa) { /* tftpd */ |
310 | /* Open file (must be after changing user) */ | 310 | /* Open file (must be after changing user) */ |
311 | local_fd = open(local_file, open_mode); | 311 | local_fd = open(local_file, open_mode, 0666); |
312 | if (local_fd < 0) { | 312 | if (local_fd < 0) { |
313 | error_pkt_reason = ERR_NOFILE; | 313 | error_pkt_reason = ERR_NOFILE; |
314 | strcpy((char*)error_pkt_str, "can't open file"); | 314 | strcpy((char*)error_pkt_str, "can't open file"); |
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c index dc5d9ffe9..7fff56b4b 100644 --- a/networking/udhcp/dhcpd.c +++ b/networking/udhcp/dhcpd.c | |||
@@ -61,7 +61,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv) | |||
61 | logmode |= LOGMODE_SYSLOG; | 61 | logmode |= LOGMODE_SYSLOG; |
62 | } | 62 | } |
63 | #if ENABLE_FEATURE_UDHCP_PORT | 63 | #if ENABLE_FEATURE_UDHCP_PORT |
64 | if (opt & 4) { /* -P */ | 64 | if (opt & 8) { /* -P */ |
65 | SERVER_PORT = xatou16(str_P); | 65 | SERVER_PORT = xatou16(str_P); |
66 | CLIENT_PORT = SERVER_PORT + 1; | 66 | CLIENT_PORT = SERVER_PORT + 1; |
67 | } | 67 | } |
diff --git a/networking/wget.c b/networking/wget.c index ad1770b58..0aab3c288 100644 --- a/networking/wget.c +++ b/networking/wget.c | |||
@@ -546,6 +546,8 @@ int wget_main(int argc UNUSED_PARAM, char **argv) | |||
546 | "passive-ftp\0" No_argument "\xff" | 546 | "passive-ftp\0" No_argument "\xff" |
547 | "header\0" Required_argument "\xfe" | 547 | "header\0" Required_argument "\xfe" |
548 | "post-data\0" Required_argument "\xfd" | 548 | "post-data\0" Required_argument "\xfd" |
549 | /* Ignored (we don't do ssl) */ | ||
550 | "no-check-certificate\0" No_argument "\xfc" | ||
549 | ; | 551 | ; |
550 | #endif | 552 | #endif |
551 | 553 | ||
@@ -590,6 +592,7 @@ int wget_main(int argc UNUSED_PARAM, char **argv) | |||
590 | if (use_proxy) { | 592 | if (use_proxy) { |
591 | proxy = getenv(target.is_ftp ? "ftp_proxy" : "http_proxy"); | 593 | proxy = getenv(target.is_ftp ? "ftp_proxy" : "http_proxy"); |
592 | if (proxy && proxy[0]) { | 594 | if (proxy && proxy[0]) { |
595 | server.user = NULL; | ||
593 | parse_url(proxy, &server); | 596 | parse_url(proxy, &server); |
594 | } else { | 597 | } else { |
595 | use_proxy = 0; | 598 | use_proxy = 0; |