Mercurial > hg > nginx-quic
diff src/http/ngx_http.c @ 6560:c90cf79d0e1d
Renamed "u" to "sockaddr" in listen options types.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 23 May 2016 16:37:28 +0300 |
parents | 6f8254ae61b8 |
children | b3b7e33083ac |
line wrap: on
line diff
--- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -1161,13 +1161,13 @@ ngx_http_add_listen(ngx_conf_t *cf, ngx_ } } - sa = &lsopt->u.sockaddr; + sa = &lsopt->sockaddr.sockaddr; switch (sa->sa_family) { #if (NGX_HAVE_INET6) case AF_INET6: - sin6 = &lsopt->u.sockaddr_in6; + sin6 = &lsopt->sockaddr.sockaddr_in6; p = sin6->sin6_port; break; #endif @@ -1179,7 +1179,7 @@ ngx_http_add_listen(ngx_conf_t *cf, ngx_ #endif default: /* AF_INET */ - sin = &lsopt->u.sockaddr_in; + sin = &lsopt->sockaddr.sockaddr_in; p = sin->sin_port; break; } @@ -1233,8 +1233,9 @@ ngx_http_add_addresses(ngx_conf_t *cf, n for (i = 0; i < port->addrs.nelts; i++) { - if (ngx_cmp_sockaddr(&lsopt->u.sockaddr, lsopt->socklen, - &addr[i].opt.u.sockaddr, addr[i].opt.socklen, 0) + if (ngx_cmp_sockaddr(&lsopt->sockaddr.sockaddr, lsopt->socklen, + &addr[i].opt.sockaddr.sockaddr, + addr[i].opt.socklen, 0) != NGX_OK) { continue; @@ -1727,7 +1728,8 @@ ngx_http_add_listening(ngx_conf_t *cf, n ngx_http_core_loc_conf_t *clcf; ngx_http_core_srv_conf_t *cscf; - ls = ngx_create_listening(cf, &addr->opt.u.sockaddr, addr->opt.socklen); + ls = ngx_create_listening(cf, &addr->opt.sockaddr.sockaddr, + addr->opt.socklen); if (ls == NULL) { return NULL; } @@ -1817,7 +1819,7 @@ ngx_http_add_addrs(ngx_conf_t *cf, ngx_h for (i = 0; i < hport->naddrs; i++) { - sin = &addr[i].opt.u.sockaddr_in; + sin = &addr[i].opt.sockaddr.sockaddr_in; addrs[i].addr = sin->sin_addr.s_addr; addrs[i].conf.default_server = addr[i].default_server; #if (NGX_HTTP_SSL) @@ -1882,7 +1884,7 @@ ngx_http_add_addrs6(ngx_conf_t *cf, ngx_ for (i = 0; i < hport->naddrs; i++) { - sin6 = &addr[i].opt.u.sockaddr_in6; + sin6 = &addr[i].opt.sockaddr.sockaddr_in6; addrs6[i].addr6 = sin6->sin6_addr; addrs6[i].conf.default_server = addr[i].default_server; #if (NGX_HTTP_SSL)