Mercurial > hg > nginx

diff src/stream/ngx_stream_core_module.c @ 6170:c13091e6292c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Stream: embed ngx_stream_listen_t into ngx_stream_conf_addr_t.
author Ruslan Ermilov <ru@nginx.com>
date Mon, 08 Jun 2015 23:11:42 +0300
parents 4f6efabcb09b
children 3e8cddcff381
line wrap: on
line diff
--- a/src/stream/ngx_stream_core_module.c
+++ b/src/stream/ngx_stream_core_module.c
@@ -272,7 +272,7 @@ ngx_stream_core_listen(ngx_conf_t *cf, n
 
     for (i = 0; i < cmcf->listen.nelts; i++) {
 
-        sa = (struct sockaddr *) ls[i].sockaddr;
+        sa = &ls[i].u.sockaddr;
 
         if (sa->sa_family != u.family) {
             continue;
@@ -284,7 +284,7 @@ ngx_stream_core_listen(ngx_conf_t *cf, n
         case AF_INET6:
             off = offsetof(struct sockaddr_in6, sin6_addr);
             len = 16;
-            sin6 = (struct sockaddr_in6 *) sa;
+            sin6 = &ls[i].u.sockaddr_in6;
             port = sin6->sin6_port;
             break;
 #endif
@@ -300,12 +300,14 @@ ngx_stream_core_listen(ngx_conf_t *cf, n
         default: /* AF_INET */
             off = offsetof(struct sockaddr_in, sin_addr);
             len = 4;
-            sin = (struct sockaddr_in *) sa;
+            sin = &ls[i].u.sockaddr_in;
             port = sin->sin_port;
             break;
         }
 
-        if (ngx_memcmp(ls[i].sockaddr + off, u.sockaddr + off, len) != 0) {
+        if (ngx_memcmp(ls[i].u.sockaddr_data + off, u.sockaddr + off, len)
+            != 0)
+        {
             continue;
         }
 
@@ -325,7 +327,7 @@ ngx_stream_core_listen(ngx_conf_t *cf, n
 
     ngx_memzero(ls, sizeof(ngx_stream_listen_t));
 
-    ngx_memcpy(ls->sockaddr, u.sockaddr, u.socklen);
+    ngx_memcpy(&ls->u.sockaddr, u.sockaddr, u.socklen);
 
     ls->socklen = u.socklen;
     ls->wildcard = u.wildcard;
@@ -347,7 +349,7 @@ ngx_stream_core_listen(ngx_conf_t *cf, n
             struct sockaddr  *sa;
             u_char            buf[NGX_SOCKADDR_STRLEN];
 
-            sa = (struct sockaddr *) ls->sockaddr;
+            sa = &ls->u.sockaddr;
 
             if (sa->sa_family == AF_INET6) {