Mercurial > hg > nginx

comparison src/core/ngx_inet.c @ 2049:2a92804f4109

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*) back out r2040 *) refactor ngx_palloc() *) introduce ngx_pnalloc() *) additional pool blocks have smaller header
author Igor Sysoev <igor@sysoev.ru>
date Tue, 17 Jun 2008 15:00:30 +0000
parents 04b04e6d60f4
children 74477ea8074f
comparison
equal deleted inserted replaced
2048:824615f3b4ec 2049:2a92804f4109
576 u->addrs[i].sockaddr = (struct sockaddr *) sin; 576 u->addrs[i].sockaddr = (struct sockaddr *) sin;
577 u->addrs[i].socklen = sizeof(struct sockaddr_in); 577 u->addrs[i].socklen = sizeof(struct sockaddr_in);
578 578
579 len = INET_ADDRSTRLEN - 1 + 1 + sizeof(":65536") - 1; 579 len = INET_ADDRSTRLEN - 1 + 1 + sizeof(":65536") - 1;
580 580
581 p = ngx_palloc(pool, len); 581 p = ngx_pnalloc(pool, len);
582 if (p == NULL) { 582 if (p == NULL) {
583 return NGX_ERROR; 583 return NGX_ERROR;
584 } 584 }
585 585
586 len = ngx_sock_ntop(AF_INET, (struct sockaddr *) sin, p, len); 586 len = ngx_sock_ntop(AF_INET, (struct sockaddr *) sin, p, len);
612 sin->sin_addr.s_addr = in_addr; 612 sin->sin_addr.s_addr = in_addr;
613 613
614 u->addrs[0].sockaddr = (struct sockaddr *) sin; 614 u->addrs[0].sockaddr = (struct sockaddr *) sin;
615 u->addrs[0].socklen = sizeof(struct sockaddr_in); 615 u->addrs[0].socklen = sizeof(struct sockaddr_in);
616 616
617 p = ngx_palloc(pool, u->host.len + sizeof(":65536") - 1); 617 p = ngx_pnalloc(pool, u->host.len + sizeof(":65536") - 1);
618 if (p == NULL) { 618 if (p == NULL) {
619 return NGX_ERROR; 619 return NGX_ERROR;
620 } 620 }
621 621
622 u->addrs[0].name.len = ngx_sprintf(p, "%V:%d", &u->host, u->port) - p; 622 u->addrs[0].name.len = ngx_sprintf(p, "%V:%d", &u->host, u->port) - p;