rename ngx_peer_addr_t to ngx_addr_t
diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c index 7dfd341..5d2f86e 100644 --- a/src/core/ngx_inet.c +++ b/src/core/ngx_inet.c
@@ -485,7 +485,7 @@ 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 @@ /* 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 @@ /* 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; }
diff --git a/src/core/ngx_inet.h b/src/core/ngx_inet.h index f3bf9e4..7e8cce6 100644 --- a/src/core/ngx_inet.h +++ b/src/core/ngx_inet.h
@@ -70,7 +70,7 @@ struct sockaddr *sockaddr; socklen_t socklen; ngx_str_t name; -} ngx_peer_addr_t; +} ngx_addr_t; typedef struct { @@ -94,7 +94,7 @@ socklen_t socklen; u_char sockaddr[NGX_SOCKADDRLEN]; - ngx_peer_addr_t *addrs; + ngx_addr_t *addrs; ngx_uint_t naddrs; char *err;
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c index d0ba8bc..9adc2d2 100644 --- a/src/core/ngx_resolver.c +++ b/src/core/ngx_resolver.c
@@ -92,7 +92,7 @@ /* 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;
diff --git a/src/core/ngx_resolver.h b/src/core/ngx_resolver.h index 6c4afac..3e7c388 100644 --- a/src/core/ngx_resolver.h +++ b/src/core/ngx_resolver.h
@@ -135,7 +135,7 @@ }; -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);
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h index b0c8a60..2d3bc20 100644 --- a/src/http/ngx_http_upstream.h +++ b/src/http/ngx_http_upstream.h
@@ -80,7 +80,7 @@ typedef struct { - ngx_peer_addr_t *addrs; + ngx_addr_t *addrs; ngx_uint_t naddrs; ngx_uint_t weight; ngx_uint_t max_fails;
diff --git a/src/mail/ngx_mail.h b/src/mail/ngx_mail.h index 32f2edd..fd6d318 100644 --- a/src/mail/ngx_mail.h +++ b/src/mail/ngx_mail.h
@@ -394,7 +394,7 @@ /* 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); /**/
diff --git a/src/mail/ngx_mail_auth_http_module.c b/src/mail/ngx_mail_auth_http_module.c index a27b116..c755c72 100644 --- 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 @@ 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 @@ 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);
diff --git a/src/mail/ngx_mail_proxy_module.c b/src/mail/ngx_mail_proxy_module.c index b408ed7..1689776 100644 --- a/src/mail/ngx_mail_proxy_module.c +++ b/src/mail/ngx_mail_proxy_module.c
@@ -108,7 +108,7 @@ 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;
diff --git a/src/mysql/ngx_http_mysql_test.c b/src/mysql/ngx_http_mysql_test.c index 6b9d7b0..b618bd6 100644 --- a/src/mysql/ngx_http_mysql_test.c +++ b/src/mysql/ngx_http_mysql_test.c
@@ -10,8 +10,8 @@ typedef struct { - ngx_peer_addr_t *peers; - ngx_uint_t npeers; + ngx_addr_t *peers; + ngx_uint_t npeers; } ngx_http_mysql_test_conf_t;