Mercurial > hg > nginx

comparison src/stream/ngx_stream.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 8f038068f4bc
children b3b7e33083ac
comparison
equal deleted inserted replaced
6559:adf25b8d0431 6560:c90cf79d0e1d
248 ngx_stream_conf_addr_t *addr; 248 ngx_stream_conf_addr_t *addr;
249 #if (NGX_HAVE_INET6) 249 #if (NGX_HAVE_INET6)
250 struct sockaddr_in6 *sin6; 250 struct sockaddr_in6 *sin6;
251 #endif 251 #endif
252 252
253 sa = &listen->u.sockaddr; 253 sa = &listen->sockaddr.sockaddr;
254 254
255 switch (sa->sa_family) { 255 switch (sa->sa_family) {
256 256
257 #if (NGX_HAVE_INET6) 257 #if (NGX_HAVE_INET6)
258 case AF_INET6: 258 case AF_INET6:
259 sin6 = &listen->u.sockaddr_in6; 259 sin6 = &listen->sockaddr.sockaddr_in6;
260 p = sin6->sin6_port; 260 p = sin6->sin6_port;
261 break; 261 break;
262 #endif 262 #endif
263 263
264 #if (NGX_HAVE_UNIX_DOMAIN) 264 #if (NGX_HAVE_UNIX_DOMAIN)
266 p = 0; 266 p = 0;
267 break; 267 break;
268 #endif 268 #endif
269 269
270 default: /* AF_INET */ 270 default: /* AF_INET */
271 sin = &listen->u.sockaddr_in; 271 sin = &listen->sockaddr.sockaddr_in;
272 p = sin->sin_port; 272 p = sin->sin_port;
273 break; 273 break;
274 } 274 }
275 275
276 port = ports->elts; 276 port = ports->elts;
357 if (bind_wildcard && !addr[i].opt.bind) { 357 if (bind_wildcard && !addr[i].opt.bind) {
358 i++; 358 i++;
359 continue; 359 continue;
360 } 360 }
361 361
362 ls = ngx_create_listening(cf, &addr[i].opt.u.sockaddr, 362 ls = ngx_create_listening(cf, &addr[i].opt.sockaddr.sockaddr,
363 addr[i].opt.socklen); 363 addr[i].opt.socklen);
364 if (ls == NULL) { 364 if (ls == NULL) {
365 return NGX_CONF_ERROR; 365 return NGX_CONF_ERROR;
366 } 366 }
367 367
451 451
452 addrs = stport->addrs; 452 addrs = stport->addrs;
453 453
454 for (i = 0; i < stport->naddrs; i++) { 454 for (i = 0; i < stport->naddrs; i++) {
455 455
456 sin = &addr[i].opt.u.sockaddr_in; 456 sin = &addr[i].opt.sockaddr.sockaddr_in;
457 addrs[i].addr = sin->sin_addr.s_addr; 457 addrs[i].addr = sin->sin_addr.s_addr;
458 458
459 addrs[i].conf.ctx = addr[i].opt.ctx; 459 addrs[i].conf.ctx = addr[i].opt.ctx;
460 #if (NGX_STREAM_SSL) 460 #if (NGX_STREAM_SSL)
461 addrs[i].conf.ssl = addr[i].opt.ssl; 461 addrs[i].conf.ssl = addr[i].opt.ssl;
462 #endif 462 #endif
463 463
464 len = ngx_sock_ntop(&addr[i].opt.u.sockaddr, addr[i].opt.socklen, buf, 464 len = ngx_sock_ntop(&addr[i].opt.sockaddr.sockaddr, addr[i].opt.socklen,
465 NGX_SOCKADDR_STRLEN, 1); 465 buf, NGX_SOCKADDR_STRLEN, 1);
466 466
467 p = ngx_pnalloc(cf->pool, len); 467 p = ngx_pnalloc(cf->pool, len);
468 if (p == NULL) { 468 if (p == NULL) {
469 return NGX_ERROR; 469 return NGX_ERROR;
470 } 470 }
500 500
501 addrs6 = stport->addrs; 501 addrs6 = stport->addrs;
502 502
503 for (i = 0; i < stport->naddrs; i++) { 503 for (i = 0; i < stport->naddrs; i++) {
504 504
505 sin6 = &addr[i].opt.u.sockaddr_in6; 505 sin6 = &addr[i].opt.sockaddr.sockaddr_in6;
506 addrs6[i].addr6 = sin6->sin6_addr; 506 addrs6[i].addr6 = sin6->sin6_addr;
507 507
508 addrs6[i].conf.ctx = addr[i].opt.ctx; 508 addrs6[i].conf.ctx = addr[i].opt.ctx;
509 #if (NGX_STREAM_SSL) 509 #if (NGX_STREAM_SSL)
510 addrs6[i].conf.ssl = addr[i].opt.ssl; 510 addrs6[i].conf.ssl = addr[i].opt.ssl;
511 #endif 511 #endif
512 512
513 len = ngx_sock_ntop(&addr[i].opt.u.sockaddr, addr[i].opt.socklen, buf, 513 len = ngx_sock_ntop(&addr[i].opt.sockaddr.sockaddr, addr[i].opt.socklen,
514 NGX_SOCKADDR_STRLEN, 1); 514 buf, NGX_SOCKADDR_STRLEN, 1);
515 515
516 p = ngx_pnalloc(cf->pool, len); 516 p = ngx_pnalloc(cf->pool, len);
517 if (p == NULL) { 517 if (p == NULL) {
518 return NGX_ERROR; 518 return NGX_ERROR;
519 } 519 }