Mercurial > hg > nginx
comparison src/mail/ngx_mail_core_module.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 | adf25b8d0431 |
children | 3d5202c71f94 |
comparison
equal
deleted
inserted
replaced
6559:adf25b8d0431 | 6560:c90cf79d0e1d |
---|---|
316 | 316 |
317 ls = cmcf->listen.elts; | 317 ls = cmcf->listen.elts; |
318 | 318 |
319 for (i = 0; i < cmcf->listen.nelts; i++) { | 319 for (i = 0; i < cmcf->listen.nelts; i++) { |
320 | 320 |
321 if (ngx_cmp_sockaddr(&ls[i].u.sockaddr, ls[i].socklen, | 321 if (ngx_cmp_sockaddr(&ls[i].sockaddr.sockaddr, ls[i].socklen, |
322 (struct sockaddr *) &u.sockaddr, u.socklen, 1) | 322 (struct sockaddr *) &u.sockaddr, u.socklen, 1) |
323 != NGX_OK) | 323 != NGX_OK) |
324 { | 324 { |
325 continue; | 325 continue; |
326 } | 326 } |
335 return NGX_CONF_ERROR; | 335 return NGX_CONF_ERROR; |
336 } | 336 } |
337 | 337 |
338 ngx_memzero(ls, sizeof(ngx_mail_listen_t)); | 338 ngx_memzero(ls, sizeof(ngx_mail_listen_t)); |
339 | 339 |
340 ngx_memcpy(&ls->u.sockaddr, &u.sockaddr, u.socklen); | 340 ngx_memcpy(&ls->sockaddr.sockaddr, &u.sockaddr, u.socklen); |
341 | 341 |
342 ls->socklen = u.socklen; | 342 ls->socklen = u.socklen; |
343 ls->backlog = NGX_LISTEN_BACKLOG; | 343 ls->backlog = NGX_LISTEN_BACKLOG; |
344 ls->wildcard = u.wildcard; | 344 ls->wildcard = u.wildcard; |
345 ls->ctx = cf->ctx; | 345 ls->ctx = cf->ctx; |
392 if (ngx_strncmp(value[i].data, "ipv6only=o", 10) == 0) { | 392 if (ngx_strncmp(value[i].data, "ipv6only=o", 10) == 0) { |
393 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) | 393 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) |
394 size_t len; | 394 size_t len; |
395 u_char buf[NGX_SOCKADDR_STRLEN]; | 395 u_char buf[NGX_SOCKADDR_STRLEN]; |
396 | 396 |
397 if (ls->u.sockaddr.sa_family == AF_INET6) { | 397 if (ls->sockaddr.sockaddr.sa_family == AF_INET6) { |
398 | 398 |
399 if (ngx_strcmp(&value[i].data[10], "n") == 0) { | 399 if (ngx_strcmp(&value[i].data[10], "n") == 0) { |
400 ls->ipv6only = 1; | 400 ls->ipv6only = 1; |
401 | 401 |
402 } else if (ngx_strcmp(&value[i].data[10], "ff") == 0) { | 402 } else if (ngx_strcmp(&value[i].data[10], "ff") == 0) { |
410 } | 410 } |
411 | 411 |
412 ls->bind = 1; | 412 ls->bind = 1; |
413 | 413 |
414 } else { | 414 } else { |
415 len = ngx_sock_ntop(&ls->u.sockaddr, ls->socklen, buf, | 415 len = ngx_sock_ntop(&ls->sockaddr.sockaddr, ls->socklen, buf, |
416 NGX_SOCKADDR_STRLEN, 1); | 416 NGX_SOCKADDR_STRLEN, 1); |
417 | 417 |
418 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | 418 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
419 "ipv6only is not supported " | 419 "ipv6only is not supported " |
420 "on addr \"%*s\", ignored", len, buf); | 420 "on addr \"%*s\", ignored", len, buf); |