mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-08-05 22:26:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

use sin6_addr.s6_addr instead of "(u_char *) & .sin6_addr"

Browse Source
This commit is contained in:
Igor Sysoev 2009-11-02 14:32:46 +00:00
parent 0f25ed3d77
commit 67765e8918
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/ngx_inet.c
View File

@ -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;
}

2
src/http/ngx_http_variables.c
View File

@ -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