# HG changeset patch # User Igor Sysoev # Date 1257172366 0 # Node ID c6a40c815d4529596782f682e106620a99327200 # Parent fb4f7605505f064ac04551e5d88f8c965a73bf9e use sin6_addr.s6_addr instead of "(u_char *) & .sin6_addr" diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c --- a/src/core/ngx_inet.c +++ b/src/core/ngx_inet.c @@ -221,7 +221,7 @@ ngx_sock_ntop(struct sockaddr *sa, u_cha 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, ng 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 --- 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 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