Mercurial > hg > nginx

comparison src/core/ngx_inet.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 74477ea8074f
children fd15c193572d
comparison
equal deleted inserted replaced
2197:74477ea8074f 2198:5975975eedc0
54 54
55 55
56 /* AF_INET only */ 56 /* AF_INET only */
57 57
58 size_t 58 size_t
59 ngx_sock_ntop(int family, struct sockaddr *sa, u_char *text, size_t len) 59 ngx_sock_ntop(struct sockaddr *sa, u_char *text, size_t len)
60 { 60 {
61 u_char *p; 61 u_char *p;
62 struct sockaddr_in *sin; 62 struct sockaddr_in *sin;
63 63
64 if (family == AF_INET) { 64 if (sa->sa_family == AF_INET) {
65 65
66 sin = (struct sockaddr_in *) sa; 66 sin = (struct sockaddr_in *) sa;
67 p = (u_char *) &sin->sin_addr; 67 p = (u_char *) &sin->sin_addr;
68 68
69 return ngx_snprintf(text, len, "%ud.%ud.%ud.%ud", 69 return ngx_snprintf(text, len, "%ud.%ud.%ud.%ud",
455 p = ngx_pnalloc(pool, len); 455 p = ngx_pnalloc(pool, len);
456 if (p == NULL) { 456 if (p == NULL) {
457 return NGX_ERROR; 457 return NGX_ERROR;
458 } 458 }
459 459
460 len = ngx_sock_ntop(AF_INET, (struct sockaddr *) sin, p, len); 460 len = ngx_sock_ntop((struct sockaddr *) sin, p, len);
461 461
462 u->addrs[i].name.len = ngx_sprintf(&p[len], ":%d", u->port) - p; 462 u->addrs[i].name.len = ngx_sprintf(&p[len], ":%d", u->port) - p;
463 u->addrs[i].name.data = p; 463 u->addrs[i].name.data = p;
464 } 464 }
465 465