Mercurial > hg > nginx

comparison src/http/ngx_http_upstream_round_robin.c @ 2197:74477ea8074f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*) remove zero termination in ngx_inet_ntop() and ngx_sock_ntop() *) use ngx_snprintf() in ngx_inet_ntop() and ngx_sock_ntop() as they are called just once per connection *) NGX_INET_ADDRSTRLEN
author Igor Sysoev <igor@sysoev.ru>
date Thu, 21 Aug 2008 18:47:23 +0000
parents 2a92804f4109
children 70a2bcc7e307
comparison
equal deleted inserted replaced
2196:fab3fa7339ff 2197:74477ea8074f
279 peers->number = ur->naddrs; 279 peers->number = ur->naddrs;
280 peers->name = &ur->host; 280 peers->name = &ur->host;
281 281
282 for (i = 0; i < ur->naddrs; i++) { 282 for (i = 0; i < ur->naddrs; i++) {
283 283
284 len = INET_ADDRSTRLEN - 1 + 1 + sizeof(":65536") - 1; 284 len = NGX_INET_ADDRSTRLEN + sizeof(":65536") - 1;
285 285
286 p = ngx_pnalloc(r->pool, len); 286 p = ngx_pnalloc(r->pool, len);
287 if (p == NULL) { 287 if (p == NULL) {
288 return NGX_ERROR; 288 return NGX_ERROR;
289 } 289 }
290 290
291 len = ngx_inet_ntop(AF_INET, &ur->addrs[i], p, INET_ADDRSTRLEN); 291 len = ngx_inet_ntop(AF_INET, &ur->addrs[i], p, NGX_INET_ADDRSTRLEN);
292 len = ngx_sprintf(&p[len], ":%d", ur->port) - p; 292 len = ngx_sprintf(&p[len], ":%d", ur->port) - p;
293 293
294 sin = ngx_pcalloc(r->pool, sizeof(struct sockaddr_in)); 294 sin = ngx_pcalloc(r->pool, sizeof(struct sockaddr_in));
295 if (sin == NULL) { 295 if (sin == NULL) {
296 return NGX_ERROR; 296 return NGX_ERROR;