Mercurial > hg > nginx
changeset 5463:1ab1cf63f885
Core: keep the length of the local sockaddr.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Mon, 09 Dec 2013 10:14:51 +0400 |
parents | 58716fd3bd2d |
children | 30e806b8636a |
files | src/core/ngx_connection.c src/core/ngx_connection.h src/event/ngx_event_accept.c src/event/ngx_event_acceptex.c |
diffstat | 4 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_connection.c Fri Dec 06 16:00:49 2013 -0800 +++ b/src/core/ngx_connection.c Mon Dec 09 10:14:51 2013 +0400 @@ -1078,12 +1078,15 @@ struct sockaddr_in6 *sin6; #endif + if (c->local_socklen == 0) { + return NGX_ERROR; + } + switch (c->local_sockaddr->sa_family) { #if (NGX_HAVE_INET6) case AF_INET6: sin6 = (struct sockaddr_in6 *) c->local_sockaddr; - len = sizeof(struct sockaddr_in6); for (addr = 0, i = 0; addr == 0 && i < 16; i++) { addr |= sin6->sin6_addr.s6_addr[i]; @@ -1094,7 +1097,6 @@ default: /* AF_INET */ sin = (struct sockaddr_in *) c->local_sockaddr; - len = sizeof(struct sockaddr_in); addr = sin->sin_addr.s_addr; break; } @@ -1114,13 +1116,16 @@ } ngx_memcpy(c->local_sockaddr, &sa, len); + + c->local_socklen = len; } if (s == NULL) { return NGX_OK; } - s->len = ngx_sock_ntop(c->local_sockaddr, len, s->data, s->len, port); + s->len = ngx_sock_ntop(c->local_sockaddr, c->local_socklen, + s->data, s->len, port); return NGX_OK; }
--- a/src/core/ngx_connection.h Fri Dec 06 16:00:49 2013 -0800 +++ b/src/core/ngx_connection.h Mon Dec 09 10:14:51 2013 +0400 @@ -143,6 +143,7 @@ #endif struct sockaddr *local_sockaddr; + socklen_t local_socklen; ngx_buf_t *buffer;
--- a/src/event/ngx_event_accept.c Fri Dec 06 16:00:49 2013 -0800 +++ b/src/event/ngx_event_accept.c Mon Dec 09 10:14:51 2013 +0400 @@ -212,6 +212,7 @@ c->socklen = socklen; c->listening = ls; c->local_sockaddr = ls->sockaddr; + c->local_socklen = ls->socklen; c->unexpected_eof = 1;
--- a/src/event/ngx_event_acceptex.c Fri Dec 06 16:00:49 2013 -0800 +++ b/src/event/ngx_event_acceptex.c Mon Dec 09 10:14:51 2013 +0400 @@ -18,7 +18,6 @@ { ngx_listening_t *ls; ngx_connection_t *c; - socklen_t len; c = rev->data; ls = c->listening; @@ -50,7 +49,7 @@ ls->post_accept_buffer_size, ls->socklen + 16, ls->socklen + 16, - &c->local_sockaddr, &len, + &c->local_sockaddr, &c->local_socklen, &c->sockaddr, &c->socklen); if (ls->post_accept_buffer_size) {