Mercurial > hg > nginx

comparison src/stream/ngx_stream_core_module.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 adf25b8d0431
children 2f41d383c9c7
comparison
equal deleted inserted replaced
6559:adf25b8d0431 6560:c90cf79d0e1d
278 return NGX_CONF_ERROR; 278 return NGX_CONF_ERROR;
279 } 279 }
280 280
281 ngx_memzero(ls, sizeof(ngx_stream_listen_t)); 281 ngx_memzero(ls, sizeof(ngx_stream_listen_t));
282 282
283 ngx_memcpy(&ls->u.sockaddr, &u.sockaddr, u.socklen); 283 ngx_memcpy(&ls->sockaddr.sockaddr, &u.sockaddr, u.socklen);
284 284
285 ls->socklen = u.socklen; 285 ls->socklen = u.socklen;
286 ls->backlog = NGX_LISTEN_BACKLOG; 286 ls->backlog = NGX_LISTEN_BACKLOG;
287 ls->type = SOCK_STREAM; 287 ls->type = SOCK_STREAM;
288 ls->wildcard = u.wildcard; 288 ls->wildcard = u.wildcard;
326 if (ngx_strncmp(value[i].data, "ipv6only=o", 10) == 0) { 326 if (ngx_strncmp(value[i].data, "ipv6only=o", 10) == 0) {
327 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) 327 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
328 size_t len; 328 size_t len;
329 u_char buf[NGX_SOCKADDR_STRLEN]; 329 u_char buf[NGX_SOCKADDR_STRLEN];
330 330
331 if (ls->u.sockaddr.sa_family == AF_INET6) { 331 if (ls->sockaddr.sockaddr.sa_family == AF_INET6) {
332 332
333 if (ngx_strcmp(&value[i].data[10], "n") == 0) { 333 if (ngx_strcmp(&value[i].data[10], "n") == 0) {
334 ls->ipv6only = 1; 334 ls->ipv6only = 1;
335 335
336 } else if (ngx_strcmp(&value[i].data[10], "ff") == 0) { 336 } else if (ngx_strcmp(&value[i].data[10], "ff") == 0) {
344 } 344 }
345 345
346 ls->bind = 1; 346 ls->bind = 1;
347 347
348 } else { 348 } else {
349 len = ngx_sock_ntop(&ls->u.sockaddr, ls->socklen, buf, 349 len = ngx_sock_ntop(&ls->sockaddr.sockaddr, ls->socklen, buf,
350 NGX_SOCKADDR_STRLEN, 1); 350 NGX_SOCKADDR_STRLEN, 1);
351 351
352 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 352 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
353 "ipv6only is not supported " 353 "ipv6only is not supported "
354 "on addr \"%*s\", ignored", len, buf); 354 "on addr \"%*s\", ignored", len, buf);
503 for (i = 0; i < cmcf->listen.nelts - 1; i++) { 503 for (i = 0; i < cmcf->listen.nelts - 1; i++) {
504 if (ls->type != als[i].type) { 504 if (ls->type != als[i].type) {
505 continue; 505 continue;
506 } 506 }
507 507
508 if (ngx_cmp_sockaddr(&als[i].u.sockaddr, als[i].socklen, 508 if (ngx_cmp_sockaddr(&als[i].sockaddr.sockaddr, als[i].socklen,
509 &ls->u.sockaddr, ls->socklen, 1) 509 &ls->sockaddr.sockaddr, ls->socklen, 1)
510 != NGX_OK) 510 != NGX_OK)
511 { 511 {
512 continue; 512 continue;
513 } 513 }
514 514