Mercurial > hg > nginx

comparison src/http/ngx_http.c @ 6560:c90cf79d0e1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
6559:adf25b8d0431 6560:c90cf79d0e1d
1159 if (cmcf->ports == NULL) { 1159 if (cmcf->ports == NULL) {
1160 return NGX_ERROR; 1160 return NGX_ERROR;
1161 } 1161 }
1162 } 1162 }
1163 1163
1164 sa = &lsopt->u.sockaddr; 1164 sa = &lsopt->sockaddr.sockaddr;
1165 1165
1166 switch (sa->sa_family) { 1166 switch (sa->sa_family) {
1167 1167
1168 #if (NGX_HAVE_INET6) 1168 #if (NGX_HAVE_INET6)
1169 case AF_INET6: 1169 case AF_INET6:
1170 sin6 = &lsopt->u.sockaddr_in6; 1170 sin6 = &lsopt->sockaddr.sockaddr_in6;
1171 p = sin6->sin6_port; 1171 p = sin6->sin6_port;
1172 break; 1172 break;
1173 #endif 1173 #endif
1174 1174
1175 #if (NGX_HAVE_UNIX_DOMAIN) 1175 #if (NGX_HAVE_UNIX_DOMAIN)
1177 p = 0; 1177 p = 0;
1178 break; 1178 break;
1179 #endif 1179 #endif
1180 1180
1181 default: /* AF_INET */ 1181 default: /* AF_INET */
1182 sin = &lsopt->u.sockaddr_in; 1182 sin = &lsopt->sockaddr.sockaddr_in;
1183 p = sin->sin_port; 1183 p = sin->sin_port;
1184 break; 1184 break;
1185 } 1185 }
1186 1186
1187 port = cmcf->ports->elts; 1187 port = cmcf->ports->elts;
1231 1231
1232 addr = port->addrs.elts; 1232 addr = port->addrs.elts;
1233 1233
1234 for (i = 0; i < port->addrs.nelts; i++) { 1234 for (i = 0; i < port->addrs.nelts; i++) {
1235 1235
1236 if (ngx_cmp_sockaddr(&lsopt->u.sockaddr, lsopt->socklen, 1236 if (ngx_cmp_sockaddr(&lsopt->sockaddr.sockaddr, lsopt->socklen,
1237 &addr[i].opt.u.sockaddr, addr[i].opt.socklen, 0) 1237 &addr[i].opt.sockaddr.sockaddr,
1238 addr[i].opt.socklen, 0)
1238 != NGX_OK) 1239 != NGX_OK)
1239 { 1240 {
1240 continue; 1241 continue;
1241 } 1242 }
1242 1243
1725 { 1726 {
1726 ngx_listening_t *ls; 1727 ngx_listening_t *ls;
1727 ngx_http_core_loc_conf_t *clcf; 1728 ngx_http_core_loc_conf_t *clcf;
1728 ngx_http_core_srv_conf_t *cscf; 1729 ngx_http_core_srv_conf_t *cscf;
1729 1730
1730 ls = ngx_create_listening(cf, &addr->opt.u.sockaddr, addr->opt.socklen); 1731 ls = ngx_create_listening(cf, &addr->opt.sockaddr.sockaddr,
1732 addr->opt.socklen);
1731 if (ls == NULL) { 1733 if (ls == NULL) {
1732 return NULL; 1734 return NULL;
1733 } 1735 }
1734 1736
1735 ls->addr_ntop = 1; 1737 ls->addr_ntop = 1;
1815 1817
1816 addrs = hport->addrs; 1818 addrs = hport->addrs;
1817 1819
1818 for (i = 0; i < hport->naddrs; i++) { 1820 for (i = 0; i < hport->naddrs; i++) {
1819 1821
1820 sin = &addr[i].opt.u.sockaddr_in; 1822 sin = &addr[i].opt.sockaddr.sockaddr_in;
1821 addrs[i].addr = sin->sin_addr.s_addr; 1823 addrs[i].addr = sin->sin_addr.s_addr;
1822 addrs[i].conf.default_server = addr[i].default_server; 1824 addrs[i].conf.default_server = addr[i].default_server;
1823 #if (NGX_HTTP_SSL) 1825 #if (NGX_HTTP_SSL)
1824 addrs[i].conf.ssl = addr[i].opt.ssl; 1826 addrs[i].conf.ssl = addr[i].opt.ssl;
1825 #endif 1827 #endif
1880 1882
1881 addrs6 = hport->addrs; 1883 addrs6 = hport->addrs;
1882 1884
1883 for (i = 0; i < hport->naddrs; i++) { 1885 for (i = 0; i < hport->naddrs; i++) {
1884 1886
1885 sin6 = &addr[i].opt.u.sockaddr_in6; 1887 sin6 = &addr[i].opt.sockaddr.sockaddr_in6;
1886 addrs6[i].addr6 = sin6->sin6_addr; 1888 addrs6[i].addr6 = sin6->sin6_addr;
1887 addrs6[i].conf.default_server = addr[i].default_server; 1889 addrs6[i].conf.default_server = addr[i].default_server;
1888 #if (NGX_HTTP_SSL) 1890 #if (NGX_HTTP_SSL)
1889 addrs6[i].conf.ssl = addr[i].opt.ssl; 1891 addrs6[i].conf.ssl = addr[i].opt.ssl;
1890 #endif 1892 #endif