diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-11-02 14:32:46 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-11-02 14:32:46 +0000 |
| commit | 67765e89188c58fba8b70605bf8da742666e7d7e (patch) | |
| tree | feccf948416b095ffe965ccecf979ba8650a97cb | |
| parent | 0f25ed3d779e3d31aff3c9484c77ccb8353fcdf4 (diff) | |
| download | nginx-67765e89188c58fba8b70605bf8da742666e7d7e.tar.gz nginx-67765e89188c58fba8b70605bf8da742666e7d7e.zip | |
use sin6_addr.s6_addr instead of "(u_char *) & .sin6_addr"
| -rw-r--r-- | src/core/ngx_inet.c | 4 | ||||
| -rw-r--r-- | src/http/ngx_http_variables.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c index 326383b8f..7dfd3413e 100644 --- a/src/core/ngx_inet.c +++ b/src/core/ngx_inet.c @@ -221,7 +221,7 @@ ngx_sock_ntop(struct sockaddr *sa, u_char *text, size_t len, ngx_uint_t port) text[n++] = '['; } - n = ngx_inet6_ntop((u_char *) &sin6->sin6_addr, &text[n], len); + n = ngx_inet6_ntop(sin6->sin6_addr.s6_addr, &text[n], len); if (port) { n = ngx_sprintf(&text[1 + n], "]:%d", @@ -771,7 +771,7 @@ ngx_parse_inet6_url(ngx_pool_t *pool, ngx_url_t *u) u->host.len = len; u->host.data = host; - if (ngx_inet6_addr(host, len, (u_char *) &sin6->sin6_addr) != NGX_OK) { + if (ngx_inet6_addr(host, len, sin6->sin6_addr.s6_addr) != NGX_OK) { u->err = "invalid IPv6 address"; return NGX_ERROR; } diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c index b25e64889..a8f5d96c8 100644 --- a/src/http/ngx_http_variables.c +++ b/src/http/ngx_http_variables.c @@ -887,7 +887,7 @@ ngx_http_variable_binary_remote_addr(ngx_http_request_t *r, v->valid = 1; v->no_cacheable = 0; v->not_found = 0; - v->data = (u_char *) &sin6->sin6_addr; + v->data = sin6->sin6_addr.s6_addr; break; #endif |