diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-01-29 10:33:34 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-01-29 10:33:34 +0000 |
commit | 8c69afd992d7cc6c2fc7dea59c3c2bd3f3c21f15 (patch) | |
tree | 998a337ecd57b737423a3793365519213f97da72 /networking/httpd.c | |
parent | c882f341cec8451ee87af6746abb7208272d5b1a (diff) | |
download | busybox-w32-8c69afd992d7cc6c2fc7dea59c3c2bd3f3c21f15.tar.gz busybox-w32-8c69afd992d7cc6c2fc7dea59c3c2bd3f3c21f15.tar.bz2 busybox-w32-8c69afd992d7cc6c2fc7dea59c3c2bd3f3c21f15.zip |
- be C99 friendly. Anonymous unions are a GNU extension. This change is
size-neutral WRT -std=gnu99 and fixes several compilation errors for strict
C99 mode.
Diffstat (limited to 'networking/httpd.c')
-rw-r--r-- | networking/httpd.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/networking/httpd.c b/networking/httpd.c index 72949755a..0f18b0fd0 100644 --- a/networking/httpd.c +++ b/networking/httpd.c | |||
@@ -1781,18 +1781,18 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr) | |||
1781 | iobuf = xmalloc(IOBUF_SIZE); | 1781 | iobuf = xmalloc(IOBUF_SIZE); |
1782 | 1782 | ||
1783 | rmt_ip = 0; | 1783 | rmt_ip = 0; |
1784 | if (fromAddr->sa.sa_family == AF_INET) { | 1784 | if (fromAddr->u.sa.sa_family == AF_INET) { |
1785 | rmt_ip = ntohl(fromAddr->sin.sin_addr.s_addr); | 1785 | rmt_ip = ntohl(fromAddr->u.sin.sin_addr.s_addr); |
1786 | } | 1786 | } |
1787 | #if ENABLE_FEATURE_IPV6 | 1787 | #if ENABLE_FEATURE_IPV6 |
1788 | if (fromAddr->sa.sa_family == AF_INET6 | 1788 | if (fromAddr->u.sa.sa_family == AF_INET6 |
1789 | && fromAddr->sin6.sin6_addr.s6_addr32[0] == 0 | 1789 | && fromAddr->u.sin6.sin6_addr.s6_addr32[0] == 0 |
1790 | && fromAddr->sin6.sin6_addr.s6_addr32[1] == 0 | 1790 | && fromAddr->u.sin6.sin6_addr.s6_addr32[1] == 0 |
1791 | && ntohl(fromAddr->sin6.sin6_addr.s6_addr32[2]) == 0xffff) | 1791 | && ntohl(fromAddr->u.sin6.sin6_addr.s6_addr32[2]) == 0xffff) |
1792 | rmt_ip = ntohl(fromAddr->sin6.sin6_addr.s6_addr32[3]); | 1792 | rmt_ip = ntohl(fromAddr->u.sin6.sin6_addr.s6_addr32[3]); |
1793 | #endif | 1793 | #endif |
1794 | if (ENABLE_FEATURE_HTTPD_CGI || DEBUG || verbose) { | 1794 | if (ENABLE_FEATURE_HTTPD_CGI || DEBUG || verbose) { |
1795 | rmt_ip_str = xmalloc_sockaddr2dotted(&fromAddr->sa); | 1795 | rmt_ip_str = xmalloc_sockaddr2dotted(&fromAddr->u.sa); |
1796 | } | 1796 | } |
1797 | if (verbose) { | 1797 | if (verbose) { |
1798 | /* this trick makes -v logging much simpler */ | 1798 | /* this trick makes -v logging much simpler */ |
@@ -2047,7 +2047,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr) | |||
2047 | lsa = host2sockaddr(proxy_entry->host_port, 80); | 2047 | lsa = host2sockaddr(proxy_entry->host_port, 80); |
2048 | if (lsa == NULL) | 2048 | if (lsa == NULL) |
2049 | send_headers_and_exit(HTTP_INTERNAL_SERVER_ERROR); | 2049 | send_headers_and_exit(HTTP_INTERNAL_SERVER_ERROR); |
2050 | if (connect(proxy_fd, &lsa->sa, lsa->len) < 0) | 2050 | if (connect(proxy_fd, &lsa->u.sa, lsa->len) < 0) |
2051 | send_headers_and_exit(HTTP_INTERNAL_SERVER_ERROR); | 2051 | send_headers_and_exit(HTTP_INTERNAL_SERVER_ERROR); |
2052 | fdprintf(proxy_fd, "%s %s%s%s%s HTTP/%c.%c\r\n", | 2052 | fdprintf(proxy_fd, "%s %s%s%s%s HTTP/%c.%c\r\n", |
2053 | prequest, /* GET or POST */ | 2053 | prequest, /* GET or POST */ |
@@ -2140,7 +2140,7 @@ static void mini_httpd(int server_socket) | |||
2140 | 2140 | ||
2141 | /* Wait for connections... */ | 2141 | /* Wait for connections... */ |
2142 | fromAddr.len = LSA_SIZEOF_SA; | 2142 | fromAddr.len = LSA_SIZEOF_SA; |
2143 | n = accept(server_socket, &fromAddr.sa, &fromAddr.len); | 2143 | n = accept(server_socket, &fromAddr.u.sa, &fromAddr.len); |
2144 | 2144 | ||
2145 | if (n < 0) | 2145 | if (n < 0) |
2146 | continue; | 2146 | continue; |
@@ -2222,7 +2222,7 @@ static void mini_httpd_inetd(void) | |||
2222 | len_and_sockaddr fromAddr; | 2222 | len_and_sockaddr fromAddr; |
2223 | 2223 | ||
2224 | fromAddr.len = LSA_SIZEOF_SA; | 2224 | fromAddr.len = LSA_SIZEOF_SA; |
2225 | getpeername(0, &fromAddr.sa, &fromAddr.len); | 2225 | getpeername(0, &fromAddr.u.sa, &fromAddr.len); |
2226 | handle_incoming_and_exit(&fromAddr); | 2226 | handle_incoming_and_exit(&fromAddr); |
2227 | } | 2227 | } |
2228 | 2228 | ||