diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2008-08-21 19:24:07 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2008-08-21 19:24:07 +0000 |
| commit | c5849a6381a918a5606db2bdba8c670e34c46dbb (patch) | |
| tree | 0141e389ad48610a1826e0ebde144498838b1a7f /src/event | |
| parent | 6a75019ad6847a5bf8c0dcd1f0ad87ed715add7e (diff) | |
| download | nginx-c5849a6381a918a5606db2bdba8c670e34c46dbb.tar.gz nginx-c5849a6381a918a5606db2bdba8c670e34c46dbb.tar.bz2 | |
ngx_sock_ntop() takes family from sockaddr, remove duplicate field
Diffstat (limited to 'src/event')
| -rw-r--r-- | src/event/ngx_event_accept.c | 3 | ||||
| -rw-r--r-- | src/event/ngx_event_acceptex.c | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c index e48da2a84..39b651539 100644 --- a/src/event/ngx_event_accept.c +++ b/src/event/ngx_event_accept.c @@ -207,8 +207,7 @@ ngx_event_accept(ngx_event_t *ev) return; } - c->addr_text.len = ngx_sock_ntop(ls->family, c->sockaddr, - c->addr_text.data, + c->addr_text.len = ngx_sock_ntop(c->sockaddr, c->addr_text.data, ls->addr_text_max_len); if (c->addr_text.len == 0) { ngx_close_accepted_connection(c); diff --git a/src/event/ngx_event_acceptex.c b/src/event/ngx_event_acceptex.c index d2752aa8b..7b14839c9 100644 --- a/src/event/ngx_event_acceptex.c +++ b/src/event/ngx_event_acceptex.c @@ -65,8 +65,7 @@ ngx_event_acceptex(ngx_event_t *rev) return; } - c->addr_text.len = ngx_sock_ntop(c->listening->family, c->sockaddr, - c->addr_text.data, + c->addr_text.len = ngx_sock_ntop(c->sockaddr, c->addr_text.data, c->listening->addr_text_max_len); if (c->addr_text.len == 0) { /* TODO: close socket */ @@ -100,7 +99,7 @@ ngx_event_post_acceptex(ngx_listening_t *ls, ngx_uint_t n) /* TODO: look up reused sockets */ - s = ngx_socket(ls->family, ls->type, 0); + s = ngx_socket(ls->sockaddr->sa_family, ls->type, 0); ngx_log_debug1(NGX_LOG_DEBUG_EVENT, &ls->log, 0, ngx_socket_n " s:%d", s); |