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/core/ngx_inet.c | |
| parent | 6a75019ad6847a5bf8c0dcd1f0ad87ed715add7e (diff) | |
| download | nginx-c5849a6381a918a5606db2bdba8c670e34c46dbb.tar.gz nginx-c5849a6381a918a5606db2bdba8c670e34c46dbb.zip | |
ngx_sock_ntop() takes family from sockaddr, remove duplicate field
Diffstat (limited to 'src/core/ngx_inet.c')
| -rw-r--r-- | src/core/ngx_inet.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c index dc0a550c6..a22b2ccf5 100644 --- a/src/core/ngx_inet.c +++ b/src/core/ngx_inet.c @@ -56,12 +56,12 @@ ngx_inet_addr(u_char *text, size_t len) /* AF_INET only */ 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; struct sockaddr_in *sin; - if (family == AF_INET) { + if (sa->sa_family == AF_INET) { sin = (struct sockaddr_in *) sa; 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; } - 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.data = p; |