Mercurial > hg > nginx

diff src/mail/ngx_mail_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 3d5202c71f94
line wrap: on
line diff
--- a/src/mail/ngx_mail_core_module.c
+++ b/src/mail/ngx_mail_core_module.c
@@ -318,7 +318,7 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx
 
     for (i = 0; i < cmcf->listen.nelts; i++) {
 
-        if (ngx_cmp_sockaddr(&ls[i].u.sockaddr, ls[i].socklen,
+        if (ngx_cmp_sockaddr(&ls[i].sockaddr.sockaddr, ls[i].socklen,
                              (struct sockaddr *) &u.sockaddr, u.socklen, 1)
             != NGX_OK)
         {
@@ -337,7 +337,7 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx
 
     ngx_memzero(ls, sizeof(ngx_mail_listen_t));
 
-    ngx_memcpy(&ls->u.sockaddr, &u.sockaddr, u.socklen);
+    ngx_memcpy(&ls->sockaddr.sockaddr, &u.sockaddr, u.socklen);
 
     ls->socklen = u.socklen;
     ls->backlog = NGX_LISTEN_BACKLOG;
@@ -394,7 +394,7 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx
             size_t  len;
             u_char  buf[NGX_SOCKADDR_STRLEN];
 
-            if (ls->u.sockaddr.sa_family == AF_INET6) {
+            if (ls->sockaddr.sockaddr.sa_family == AF_INET6) {
 
                 if (ngx_strcmp(&value[i].data[10], "n") == 0) {
                     ls->ipv6only = 1;
@@ -412,7 +412,7 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx
                 ls->bind = 1;
 
             } else {
-                len = ngx_sock_ntop(&ls->u.sockaddr, ls->socklen, buf,
+                len = ngx_sock_ntop(&ls->sockaddr.sockaddr, ls->socklen, buf,
                                     NGX_SOCKADDR_STRLEN, 1);
 
                 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,