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 227803a..0a8322c 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 break; } - if (pfd[TO_CGI].revents & POLLOUT) { + if (pfd[TO_CGI].revents) { /* hdr_cnt > 0 here due to the way pfd[TO_CGI].events set */ /* Have data from peer and can write to CGI */ 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 } } - if (pfd[0].revents & POLLIN) { + if (pfd[0].revents) { /* post_len > 0 && hdr_cnt == 0 here */ /* We expect data, prev data portion is eaten by CGI * 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 } } - if (pfd[FROM_CGI].revents & POLLIN) { + if (pfd[FROM_CGI].revents) { /* There is something to read from CGI */ char *rbuf = iobuf; diff --git a/networking/telnet.c b/networking/telnet.c index 013d959..6a84e94 100644 --- a/networking/telnet.c +++ b/networking/telnet.c @@ -618,7 +618,7 @@ int telnet_main(int argc UNUSED_PARAM, char **argv) default: #ifdef USE_POLL - if (ufds[0].revents & POLLIN) + if (ufds[0].revents) #else if (FD_ISSET(STDIN_FILENO, &rfds)) #endif @@ -631,7 +631,7 @@ int telnet_main(int argc UNUSED_PARAM, char **argv) } #ifdef USE_POLL - if (ufds[1].revents & POLLIN) + if (ufds[1].revents) #else if (FD_ISSET(netfd, &rfds)) #endif diff --git a/networking/tftp.c b/networking/tftp.c index 8d60388..b2c3c03 100644 --- a/networking/tftp.c +++ b/networking/tftp.c @@ -308,7 +308,7 @@ static int tftp_protocol( if (!ENABLE_TFTP || our_lsa) { /* tftpd */ /* Open file (must be after changing user) */ - local_fd = open(local_file, open_mode); + local_fd = open(local_file, open_mode, 0666); if (local_fd < 0) { error_pkt_reason = ERR_NOFILE; strcpy((char*)error_pkt_str, "can't open file"); diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c index dc5d9ff..7fff56b 100644 --- a/networking/udhcp/dhcpd.c +++ b/networking/udhcp/dhcpd.c @@ -61,7 +61,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv) logmode |= LOGMODE_SYSLOG; } #if ENABLE_FEATURE_UDHCP_PORT - if (opt & 4) { /* -P */ + if (opt & 8) { /* -P */ SERVER_PORT = xatou16(str_P); CLIENT_PORT = SERVER_PORT + 1; } diff --git a/networking/wget.c b/networking/wget.c index ad1770b..0aab3c2 100644 --- a/networking/wget.c +++ b/networking/wget.c @@ -546,6 +546,8 @@ int wget_main(int argc UNUSED_PARAM, char **argv) "passive-ftp\0" No_argument "\xff" "header\0" Required_argument "\xfe" "post-data\0" Required_argument "\xfd" + /* Ignored (we don't do ssl) */ + "no-check-certificate\0" No_argument "\xfc" ; #endif @@ -590,6 +592,7 @@ int wget_main(int argc UNUSED_PARAM, char **argv) if (use_proxy) { proxy = getenv(target.is_ftp ? "ftp_proxy" : "http_proxy"); if (proxy && proxy[0]) { + server.user = NULL; parse_url(proxy, &server); } else { use_proxy = 0; |