commit c5849a6381a918a5606db2bdba8c670e34c46dbb
author Igor Sysoev <igor@sysoev.ru> Thu Aug 21 19:24:07 2008 +0000
committer Igor Sysoev <igor@sysoev.ru> Thu Aug 21 19:24:07 2008 +0000
tree 0141e389ad48610a1826e0ebde144498838b1a7f
parent 6a75019ad6847a5bf8c0dcd1f0ad87ed715add7e

ngx_sock_ntop() takes family from sockaddr, remove duplicate field

src/core/ngx_connection.c

diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index 8274775..226dc1e 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -49,7 +49,6 @@
                         - ls->addr_text.data;
 
     ls->fd = (ngx_socket_t) -1;
-    ls->family = AF_INET;
     ls->type = SOCK_STREAM;
     ls->sockaddr = (struct sockaddr *) sin;
     ls->socklen = sizeof(struct sockaddr_in);
@@ -113,9 +112,8 @@
             return NGX_ERROR;
         }
 
-        ls[i].family = sin->sin_family;
-        len = ngx_sock_ntop(ls[i].family, ls[i].sockaddr,
-                            ls[i].addr_text.data, NGX_INET_ADDRSTRLEN);
+        len = ngx_sock_ntop(ls[i].sockaddr, ls[i].addr_text.data,
+                            NGX_INET_ADDRSTRLEN);
         if (len == 0) {
             return NGX_ERROR;
         }
@@ -255,7 +253,7 @@
                 continue;
             }
 
-            s = ngx_socket(ls[i].family, ls[i].type, 0);
+            s = ngx_socket(ls[i].sockaddr->sa_family, ls[i].type, 0);
 
             if (s == -1) {
                 ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno,