comparison src/core/ngx_inet.c @ 3269:f0d596e84634

rename ngx_peer_addr_t to ngx_addr_t
author Igor Sysoev <igor@sysoev.ru>
date Mon, 02 Nov 2009 15:14:17 +0000
parents c6a40c815d45
children 7d1a04259e3f
comparison
equal deleted inserted replaced
3268:c6a40c815d45 3269:f0d596e84634
483 u->socklen = sizeof(struct sockaddr_un); 483 u->socklen = sizeof(struct sockaddr_un);
484 saun = (struct sockaddr_un *) &u->sockaddr; 484 saun = (struct sockaddr_un *) &u->sockaddr;
485 saun->sun_family = AF_UNIX; 485 saun->sun_family = AF_UNIX;
486 (void) ngx_cpystrn((u_char *) saun->sun_path, path, len); 486 (void) ngx_cpystrn((u_char *) saun->sun_path, path, len);
487 487
488 u->addrs = ngx_pcalloc(pool, sizeof(ngx_peer_addr_t)); 488 u->addrs = ngx_pcalloc(pool, sizeof(ngx_addr_t));
489 if (u->addrs == NULL) { 489 if (u->addrs == NULL) {
490 return NGX_ERROR; 490 return NGX_ERROR;
491 } 491 }
492 492
493 saun = ngx_pcalloc(pool, sizeof(struct sockaddr_un)); 493 saun = ngx_pcalloc(pool, sizeof(struct sockaddr_un));
844 i = 1; 844 i = 1;
845 } 845 }
846 846
847 /* MP: ngx_shared_palloc() */ 847 /* MP: ngx_shared_palloc() */
848 848
849 u->addrs = ngx_pcalloc(pool, i * sizeof(ngx_peer_addr_t)); 849 u->addrs = ngx_pcalloc(pool, i * sizeof(ngx_addr_t));
850 if (u->addrs == NULL) { 850 if (u->addrs == NULL) {
851 return NGX_ERROR; 851 return NGX_ERROR;
852 } 852 }
853 853
854 u->naddrs = i; 854 u->naddrs = i;
882 882
883 } else { 883 } else {
884 884
885 /* MP: ngx_shared_palloc() */ 885 /* MP: ngx_shared_palloc() */
886 886
887 u->addrs = ngx_pcalloc(pool, sizeof(ngx_peer_addr_t)); 887 u->addrs = ngx_pcalloc(pool, sizeof(ngx_addr_t));
888 if (u->addrs == NULL) { 888 if (u->addrs == NULL) {
889 return NGX_ERROR; 889 return NGX_ERROR;
890 } 890 }
891 891
892 sin = ngx_pcalloc(pool, sizeof(struct sockaddr_in)); 892 sin = ngx_pcalloc(pool, sizeof(struct sockaddr_in));