Mercurial > hg > nginx

comparison src/mail/ngx_mail.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 cf5e822cf470
children b3b7e33083ac
comparison
equal deleted inserted replaced
6559:adf25b8d0431 6560:c90cf79d0e1d
233 ngx_mail_conf_addr_t *addr; 233 ngx_mail_conf_addr_t *addr;
234 #if (NGX_HAVE_INET6) 234 #if (NGX_HAVE_INET6)
235 struct sockaddr_in6 *sin6; 235 struct sockaddr_in6 *sin6;
236 #endif 236 #endif
237 237
238 sa = &listen->u.sockaddr; 238 sa = &listen->sockaddr.sockaddr;
239 239
240 switch (sa->sa_family) { 240 switch (sa->sa_family) {
241 241
242 #if (NGX_HAVE_INET6) 242 #if (NGX_HAVE_INET6)
243 case AF_INET6: 243 case AF_INET6:
244 sin6 = &listen->u.sockaddr_in6; 244 sin6 = &listen->sockaddr.sockaddr_in6;
245 p = sin6->sin6_port; 245 p = sin6->sin6_port;
246 break; 246 break;
247 #endif 247 #endif
248 248
249 #if (NGX_HAVE_UNIX_DOMAIN) 249 #if (NGX_HAVE_UNIX_DOMAIN)
251 p = 0; 251 p = 0;
252 break; 252 break;
253 #endif 253 #endif
254 254
255 default: /* AF_INET */ 255 default: /* AF_INET */
256 sin = &listen->u.sockaddr_in; 256 sin = &listen->sockaddr.sockaddr_in;
257 p = sin->sin_port; 257 p = sin->sin_port;
258 break; 258 break;
259 } 259 }
260 260
261 port = ports->elts; 261 port = ports->elts;
338 if (bind_wildcard && !addr[i].opt.bind) { 338 if (bind_wildcard && !addr[i].opt.bind) {
339 i++; 339 i++;
340 continue; 340 continue;
341 } 341 }
342 342
343 ls = ngx_create_listening(cf, &addr[i].opt.u.sockaddr, 343 ls = ngx_create_listening(cf, &addr[i].opt.sockaddr.sockaddr,
344 addr[i].opt.socklen); 344 addr[i].opt.socklen);
345 if (ls == NULL) { 345 if (ls == NULL) {
346 return NGX_CONF_ERROR; 346 return NGX_CONF_ERROR;
347 } 347 }
348 348
421 421
422 addrs = mport->addrs; 422 addrs = mport->addrs;
423 423
424 for (i = 0; i < mport->naddrs; i++) { 424 for (i = 0; i < mport->naddrs; i++) {
425 425
426 sin = &addr[i].opt.u.sockaddr_in; 426 sin = &addr[i].opt.sockaddr.sockaddr_in;
427 addrs[i].addr = sin->sin_addr.s_addr; 427 addrs[i].addr = sin->sin_addr.s_addr;
428 428
429 addrs[i].conf.ctx = addr[i].opt.ctx; 429 addrs[i].conf.ctx = addr[i].opt.ctx;
430 #if (NGX_MAIL_SSL) 430 #if (NGX_MAIL_SSL)
431 addrs[i].conf.ssl = addr[i].opt.ssl; 431 addrs[i].conf.ssl = addr[i].opt.ssl;
432 #endif 432 #endif
433 433
434 len = ngx_sock_ntop(&addr[i].opt.u.sockaddr, addr[i].opt.socklen, buf, 434 len = ngx_sock_ntop(&addr[i].opt.sockaddr.sockaddr, addr[i].opt.socklen,
435 NGX_SOCKADDR_STRLEN, 1); 435 buf, NGX_SOCKADDR_STRLEN, 1);
436 436
437 p = ngx_pnalloc(cf->pool, len); 437 p = ngx_pnalloc(cf->pool, len);
438 if (p == NULL) { 438 if (p == NULL) {
439 return NGX_ERROR; 439 return NGX_ERROR;
440 } 440 }
470 470
471 addrs6 = mport->addrs; 471 addrs6 = mport->addrs;
472 472
473 for (i = 0; i < mport->naddrs; i++) { 473 for (i = 0; i < mport->naddrs; i++) {
474 474
475 sin6 = &addr[i].opt.u.sockaddr_in6; 475 sin6 = &addr[i].opt.sockaddr.sockaddr_in6;
476 addrs6[i].addr6 = sin6->sin6_addr; 476 addrs6[i].addr6 = sin6->sin6_addr;
477 477
478 addrs6[i].conf.ctx = addr[i].opt.ctx; 478 addrs6[i].conf.ctx = addr[i].opt.ctx;
479 #if (NGX_MAIL_SSL) 479 #if (NGX_MAIL_SSL)
480 addrs6[i].conf.ssl = addr[i].opt.ssl; 480 addrs6[i].conf.ssl = addr[i].opt.ssl;
481 #endif 481 #endif
482 482
483 len = ngx_sock_ntop(&addr[i].opt.u.sockaddr, addr[i].opt.socklen, buf, 483 len = ngx_sock_ntop(&addr[i].opt.sockaddr.sockaddr, addr[i].opt.socklen,
484 NGX_SOCKADDR_STRLEN, 1); 484 buf, NGX_SOCKADDR_STRLEN, 1);
485 485
486 p = ngx_pnalloc(cf->pool, len); 486 p = ngx_pnalloc(cf->pool, len);
487 if (p == NULL) { 487 if (p == NULL) {
488 return NGX_ERROR; 488 return NGX_ERROR;
489 } 489 }