technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed the bug introduced in the previous changeset.

Browse Source
This commit is contained in:
Igor Sysoev
2017-10-19 17:22:33 +03:00
parent 3c6edead25
commit 0833074f30
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/nxt_router.c
View File

@@ -3016,7 +3016,7 @@ static nxt_sockaddr_t *
nxt_router_local_addr(nxt_task_t *task, nxt_conn_t *c) nxt_router_local_addr(nxt_task_t *task, nxt_conn_t *c)
{ {
int ret; int ret;
size_t size; size_t size, length;
socklen_t socklen; socklen_t socklen;
nxt_sockaddr_t *sa; nxt_sockaddr_t *sa;
@@ -3030,13 +3030,15 @@ nxt_router_local_addr(nxt_task_t *task, nxt_conn_t *c)
#if (NXT_INET6) #if (NXT_INET6)
case AF_INET6: case AF_INET6:
socklen = sizeof(struct sockaddr_in6); socklen = sizeof(struct sockaddr_in6);
size = offsetof(nxt_sockaddr_t, u) + socklen + NXT_INET6_ADDR_STR_LEN; length = NXT_INET6_ADDR_STR_LEN;
size = offsetof(nxt_sockaddr_t, u) + socklen + length;
break; break;
#endif #endif
case AF_INET: case AF_INET:
default: default:
socklen = sizeof(struct sockaddr_in6); socklen = sizeof(struct sockaddr_in);
size = offsetof(nxt_sockaddr_t, u) + socklen + NXT_INET_ADDR_STR_LEN; length = NXT_INET_ADDR_STR_LEN;
size = offsetof(nxt_sockaddr_t, u) + socklen + length;
break; break;
} }
@@ -3045,6 +3047,9 @@ nxt_router_local_addr(nxt_task_t *task, nxt_conn_t *c)
return NULL; return NULL;
} }
sa->socklen = socklen;
sa->length = length;
ret = getsockname(c->socket.fd, &sa->u.sockaddr, &socklen); ret = getsockname(c->socket.fd, &sa->u.sockaddr, &socklen);
if (nxt_slow_path(ret != 0)) { if (nxt_slow_path(ret != 0)) {
nxt_log(task, NXT_LOG_CRIT, "getsockname(%d) failed", c->socket.fd); nxt_log(task, NXT_LOG_CRIT, "getsockname(%d) failed", c->socket.fd);