Mercurial > hg > nginx

comparison src/core/ngx_inet.c @ 3268:c6a40c815d45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use sin6_addr.s6_addr instead of "(u_char *) & .sin6_addr"
author Igor Sysoev <igor@sysoev.ru>
date Mon, 02 Nov 2009 14:32:46 +0000
parents fb4f7605505f
children f0d596e84634
comparison
equal deleted inserted replaced
3267:fb4f7605505f 3268:c6a40c815d45
219 219
220 if (port) { 220 if (port) {
221 text[n++] = '['; 221 text[n++] = '[';
222 } 222 }
223 223
224 n = ngx_inet6_ntop((u_char *) &sin6->sin6_addr, &text[n], len); 224 n = ngx_inet6_ntop(sin6->sin6_addr.s6_addr, &text[n], len);
225 225
226 if (port) { 226 if (port) {
227 n = ngx_sprintf(&text[1 + n], "]:%d", 227 n = ngx_sprintf(&text[1 + n], "]:%d",
228 ntohs(sin6->sin6_port)) - text; 228 ntohs(sin6->sin6_port)) - text;
229 } 229 }
769 } 769 }
770 770
771 u->host.len = len; 771 u->host.len = len;
772 u->host.data = host; 772 u->host.data = host;
773 773
774 if (ngx_inet6_addr(host, len, (u_char *) &sin6->sin6_addr) != NGX_OK) { 774 if (ngx_inet6_addr(host, len, sin6->sin6_addr.s6_addr) != NGX_OK) {
775 u->err = "invalid IPv6 address"; 775 u->err = "invalid IPv6 address";
776 return NGX_ERROR; 776 return NGX_ERROR;
777 } 777 }
778 778
779 if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) { 779 if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {