Mercurial > hg > nginx

comparison src/event/ngx_event_acceptex.c @ 2198:5975975eedc0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ngx_sock_ntop() takes family from sockaddr, remove duplicate field
author Igor Sysoev <igor@sysoev.ru>
date Thu, 21 Aug 2008 19:24:07 +0000
parents 2a92804f4109
children 2e91aecb9e57
comparison
equal deleted inserted replaced
2197:74477ea8074f 2198:5975975eedc0
63 if (c->addr_text.data == NULL) { 63 if (c->addr_text.data == NULL) {
64 /* TODO: close socket */ 64 /* TODO: close socket */
65 return; 65 return;
66 } 66 }
67 67
68 c->addr_text.len = ngx_sock_ntop(c->listening->family, c->sockaddr, 68 c->addr_text.len = ngx_sock_ntop(c->sockaddr, c->addr_text.data,
69 c->addr_text.data,
70 c->listening->addr_text_max_len); 69 c->listening->addr_text_max_len);
71 if (c->addr_text.len == 0) { 70 if (c->addr_text.len == 0) {
72 /* TODO: close socket */ 71 /* TODO: close socket */
73 return; 72 return;
74 } 73 }
98 97
99 for (i = 0; i < n; i++) { 98 for (i = 0; i < n; i++) {
100 99
101 /* TODO: look up reused sockets */ 100 /* TODO: look up reused sockets */
102 101
103 s = ngx_socket(ls->family, ls->type, 0); 102 s = ngx_socket(ls->sockaddr->sa_family, ls->type, 0);
104 103
105 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, &ls->log, 0, 104 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, &ls->log, 0,
106 ngx_socket_n " s:%d", s); 105 ngx_socket_n " s:%d", s);
107 106
108 if (s == -1) { 107 if (s == -1) {