Mercurial > hg > nginx
changeset 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 |
| files | src/core/ngx_inet.c src/core/ngx_inet.h src/core/ngx_resolver.c src/core/ngx_resolver.h src/http/ngx_http_upstream.h src/mail/ngx_mail.h src/mail/ngx_mail_auth_http_module.c src/mail/ngx_mail_proxy_module.c src/mysql/ngx_http_mysql_test.c |
| diffstat | 9 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_inet.c +++ b/src/core/ngx_inet.c @@ -485,7 +485,7 @@ ngx_parse_unix_domain_url(ngx_pool_t *po saun->sun_family = AF_UNIX; (void) ngx_cpystrn((u_char *) saun->sun_path, path, len); - u->addrs = ngx_pcalloc(pool, sizeof(ngx_peer_addr_t)); + u->addrs = ngx_pcalloc(pool, sizeof(ngx_addr_t)); if (u->addrs == NULL) { return NGX_ERROR; } @@ -846,7 +846,7 @@ ngx_inet_resolve_host(ngx_pool_t *pool, /* MP: ngx_shared_palloc() */ - u->addrs = ngx_pcalloc(pool, i * sizeof(ngx_peer_addr_t)); + u->addrs = ngx_pcalloc(pool, i * sizeof(ngx_addr_t)); if (u->addrs == NULL) { return NGX_ERROR; } @@ -884,7 +884,7 @@ ngx_inet_resolve_host(ngx_pool_t *pool, /* MP: ngx_shared_palloc() */ - u->addrs = ngx_pcalloc(pool, sizeof(ngx_peer_addr_t)); + u->addrs = ngx_pcalloc(pool, sizeof(ngx_addr_t)); if (u->addrs == NULL) { return NGX_ERROR; }
--- a/src/core/ngx_inet.h +++ b/src/core/ngx_inet.h @@ -70,7 +70,7 @@ typedef struct { struct sockaddr *sockaddr; socklen_t socklen; ngx_str_t name; -} ngx_peer_addr_t; +} ngx_addr_t; typedef struct { @@ -94,7 +94,7 @@ typedef struct { socklen_t socklen; u_char sockaddr[NGX_SOCKADDRLEN]; - ngx_peer_addr_t *addrs; + ngx_addr_t *addrs; ngx_uint_t naddrs; char *err;
--- a/src/core/ngx_resolver.c +++ b/src/core/ngx_resolver.c @@ -92,7 +92,7 @@ static void *ngx_resolver_dup(ngx_resolv /* STUB: ngx_peer_addr_t * */ ngx_resolver_t * -ngx_resolver_create(ngx_conf_t *cf, ngx_peer_addr_t *addr) +ngx_resolver_create(ngx_conf_t *cf, ngx_addr_t *addr) { ngx_resolver_t *r; ngx_pool_cleanup_t *cln;
--- a/src/core/ngx_resolver.h +++ b/src/core/ngx_resolver.h @@ -135,7 +135,7 @@ struct ngx_resolver_ctx_s { }; -ngx_resolver_t *ngx_resolver_create(ngx_conf_t *cf, ngx_peer_addr_t *addr); +ngx_resolver_t *ngx_resolver_create(ngx_conf_t *cf, ngx_addr_t *addr); ngx_resolver_ctx_t *ngx_resolve_start(ngx_resolver_t *r, ngx_resolver_ctx_t *temp); ngx_int_t ngx_resolve_name(ngx_resolver_ctx_t *ctx);
--- a/src/http/ngx_http_upstream.h +++ b/src/http/ngx_http_upstream.h @@ -80,7 +80,7 @@ typedef struct { typedef struct { - ngx_peer_addr_t *addrs; + ngx_addr_t *addrs; ngx_uint_t naddrs; ngx_uint_t weight; ngx_uint_t max_fails;
--- a/src/mail/ngx_mail.h +++ b/src/mail/ngx_mail.h @@ -394,7 +394,7 @@ char *ngx_mail_capabilities(ngx_conf_t * /* STUB */ -void ngx_mail_proxy_init(ngx_mail_session_t *s, ngx_peer_addr_t *peer); +void ngx_mail_proxy_init(ngx_mail_session_t *s, ngx_addr_t *peer); void ngx_mail_auth_http_init(ngx_mail_session_t *s); /**/
--- a/src/mail/ngx_mail_auth_http_module.c +++ b/src/mail/ngx_mail_auth_http_module.c @@ -12,7 +12,7 @@ typedef struct { - ngx_peer_addr_t *peer; + ngx_addr_t *peer; ngx_msec_t timeout; @@ -457,7 +457,7 @@ ngx_mail_auth_http_process_headers(ngx_m time_t timer; size_t len, size; ngx_int_t rc, port, n; - ngx_peer_addr_t *peer; + ngx_addr_t *peer; struct sockaddr_in *sin; ngx_log_debug0(NGX_LOG_DEBUG_MAIL, s->connection->log, 0, @@ -764,7 +764,7 @@ ngx_mail_auth_http_process_headers(ngx_m return; } - peer = ngx_pcalloc(s->connection->pool, sizeof(ngx_peer_addr_t)); + peer = ngx_pcalloc(s->connection->pool, sizeof(ngx_addr_t)); if (peer == NULL) { ngx_destroy_pool(ctx->pool); ngx_mail_session_internal_server_error(s);
--- a/src/mail/ngx_mail_proxy_module.c +++ b/src/mail/ngx_mail_proxy_module.c @@ -108,7 +108,7 @@ static u_char smtp_auth_ok[] = "235 2.0 void -ngx_mail_proxy_init(ngx_mail_session_t *s, ngx_peer_addr_t *peer) +ngx_mail_proxy_init(ngx_mail_session_t *s, ngx_addr_t *peer) { int keepalive; ngx_int_t rc;