mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-08 02:02:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ngx_sock_ntop() takes family from sockaddr, remove duplicate field

Browse Source
This commit is contained in:
Igor Sysoev 2008-08-21 19:24:07 +00:00
parent 6a75019ad6
commit c5849a6381
7 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/ngx_connection.c
View File

@ -49,7 +49,6 @@ ngx_listening_inet_stream_socket(ngx_conf_t *cf, in_addr_t addr, in_port_t port)
- ls->addr_text.data; - ls->addr_text.data;
ls->fd = (ngx_socket_t) -1; ls->fd = (ngx_socket_t) -1;
ls->family = AF_INET;
ls->type = SOCK_STREAM; ls->type = SOCK_STREAM;
ls->sockaddr = (struct sockaddr *) sin; ls->sockaddr = (struct sockaddr *) sin;
ls->socklen = sizeof(struct sockaddr_in); ls->socklen = sizeof(struct sockaddr_in);
@ -113,9 +112,8 @@ ngx_set_inherited_sockets(ngx_cycle_t *cycle)
return NGX_ERROR; return NGX_ERROR;
} }
ls[i].family = sin->sin_family; len = ngx_sock_ntop(ls[i].sockaddr, ls[i].addr_text.data,
len = ngx_sock_ntop(ls[i].family, ls[i].sockaddr, NGX_INET_ADDRSTRLEN);
ls[i].addr_text.data, NGX_INET_ADDRSTRLEN);
if (len == 0) { if (len == 0) {
return NGX_ERROR; return NGX_ERROR;
} }
@ -255,7 +253,7 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle)
continue; 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) { if (s == -1) {
ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno, ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno,

1
src/core/ngx_connection.h
View File

@ -23,7 +23,6 @@ struct ngx_listening_s {
size_t addr_text_max_len; size_t addr_text_max_len;
ngx_str_t addr_text; ngx_str_t addr_text;
int family;
int type; int type;
int backlog; int backlog;

6
src/core/ngx_inet.c
View File

@ -56,12 +56,12 @@ ngx_inet_addr(u_char *text, size_t len)
/* AF_INET only */ /* AF_INET only */
size_t size_t
ngx_sock_ntop(int family, struct sockaddr *sa, u_char *text, size_t len) ngx_sock_ntop(struct sockaddr *sa, u_char *text, size_t len)
{ {
u_char *p; u_char *p;
struct sockaddr_in *sin; struct sockaddr_in *sin;
if (family == AF_INET) { if (sa->sa_family == AF_INET) {
sin = (struct sockaddr_in *) sa; sin = (struct sockaddr_in *) sa;
p = (u_char *) &sin->sin_addr; p = (u_char *) &sin->sin_addr;
@ -457,7 +457,7 @@ ngx_inet_resolve_host(ngx_pool_t *pool, ngx_url_t *u)
return NGX_ERROR; return NGX_ERROR;
} }
len = ngx_sock_ntop(AF_INET, (struct sockaddr *) sin, p, len); len = ngx_sock_ntop((struct sockaddr *) sin, p, len);
u->addrs[i].name.len = ngx_sprintf(&p[len], ":%d", u->port) - p; u->addrs[i].name.len = ngx_sprintf(&p[len], ":%d", u->port) - p;
u->addrs[i].name.data = p; u->addrs[i].name.data = p;

2
src/core/ngx_inet.h
View File

@ -63,7 +63,7 @@ typedef struct {
in_addr_t ngx_inet_addr(u_char *text, size_t len); in_addr_t ngx_inet_addr(u_char *text, size_t len);
size_t ngx_sock_ntop(int family, struct sockaddr *sa, u_char *text, size_t len); size_t ngx_sock_ntop(struct sockaddr *sa, u_char *text, size_t len);
size_t ngx_inet_ntop(int family, void *addr, u_char *text, size_t len); size_t ngx_inet_ntop(int family, void *addr, u_char *text, size_t len);
ngx_int_t ngx_ptocidr(ngx_str_t *text, void *cidr); ngx_int_t ngx_ptocidr(ngx_str_t *text, void *cidr);
ngx_int_t ngx_parse_url(ngx_pool_t *pool, ngx_url_t *u); ngx_int_t ngx_parse_url(ngx_pool_t *pool, ngx_url_t *u);

3
src/event/ngx_event_accept.c
View File

@ -207,8 +207,7 @@ ngx_event_accept(ngx_event_t *ev)
return; return;
} }
c->addr_text.len = ngx_sock_ntop(ls->family, c->sockaddr, c->addr_text.len = ngx_sock_ntop(c->sockaddr, c->addr_text.data,
c->addr_text.data,
ls->addr_text_max_len); ls->addr_text_max_len);
if (c->addr_text.len == 0) { if (c->addr_text.len == 0) {
ngx_close_accepted_connection(c); ngx_close_accepted_connection(c);

5
src/event/ngx_event_acceptex.c
View File

@ -65,8 +65,7 @@ ngx_event_acceptex(ngx_event_t *rev)
return; return;
} }
c->addr_text.len = ngx_sock_ntop(c->listening->family, c->sockaddr, c->addr_text.len = ngx_sock_ntop(c->sockaddr, c->addr_text.data,
c->addr_text.data,
c->listening->addr_text_max_len); c->listening->addr_text_max_len);
if (c->addr_text.len == 0) { if (c->addr_text.len == 0) {
/* TODO: close socket */ /* TODO: close socket */
@ -100,7 +99,7 @@ ngx_event_post_acceptex(ngx_listening_t *ls, ngx_uint_t n)
/* TODO: look up reused sockets */ /* 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_log_debug1(NGX_LOG_DEBUG_EVENT, &ls->log, 0,
ngx_socket_n " s:%d", s); ngx_socket_n " s:%d", s);

4
src/http/ngx_http_core_module.c
View File

@ -1625,8 +1625,8 @@ ngx_http_server_addr(ngx_http_request_t *r, ngx_str_t *s)
return NGX_OK; return NGX_OK;
} }
s->len = ngx_inet_ntop(c->listening->family, &r->in_addr, s->len = ngx_sock_ntop((struct sockaddr *) &sin, s->data,
s->data, NGX_INET_ADDRSTRLEN); NGX_INET_ADDRSTRLEN);
return NGX_OK; return NGX_OK;
} }