mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename ngx_peer_addr_t to ngx_addr_t

Browse Source
This commit is contained in:
Igor Sysoev 2009-11-02 15:14:17 +00:00
parent 67765e8918
commit 0c189c5159
9 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/ngx_inet.c
View File

@ -485,7 +485,7 @@ ngx_parse_unix_domain_url(ngx_pool_t *pool, ngx_url_t *u)
saun->sun_family = AF_UNIX; saun->sun_family = AF_UNIX;
(void) ngx_cpystrn((u_char *) saun->sun_path, path, len); (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) { if (u->addrs == NULL) {
return NGX_ERROR; return NGX_ERROR;
} }
@ -846,7 +846,7 @@ ngx_inet_resolve_host(ngx_pool_t *pool, ngx_url_t *u)
/* MP: ngx_shared_palloc() */ /* 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) { if (u->addrs == NULL) {
return NGX_ERROR; return NGX_ERROR;
} }
@ -884,7 +884,7 @@ ngx_inet_resolve_host(ngx_pool_t *pool, ngx_url_t *u)
/* MP: ngx_shared_palloc() */ /* 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) { if (u->addrs == NULL) {
return NGX_ERROR; return NGX_ERROR;
} }

4
src/core/ngx_inet.h
View File

@ -70,7 +70,7 @@ typedef struct {
struct sockaddr *sockaddr; struct sockaddr *sockaddr;
socklen_t socklen; socklen_t socklen;
ngx_str_t name; ngx_str_t name;
} ngx_peer_addr_t; } ngx_addr_t;
typedef struct { typedef struct {
@ -94,7 +94,7 @@ typedef struct {
socklen_t socklen; socklen_t socklen;
u_char sockaddr[NGX_SOCKADDRLEN]; u_char sockaddr[NGX_SOCKADDRLEN];
ngx_peer_addr_t *addrs; ngx_addr_t *addrs;
ngx_uint_t naddrs; ngx_uint_t naddrs;
char *err; char *err;

2
src/core/ngx_resolver.c
View File

@ -92,7 +92,7 @@ static void *ngx_resolver_dup(ngx_resolver_t *r, void *src, size_t size);
/* STUB: ngx_peer_addr_t * */ /* STUB: ngx_peer_addr_t * */
ngx_resolver_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_resolver_t *r;
ngx_pool_cleanup_t *cln; ngx_pool_cleanup_t *cln;

2
src/core/ngx_resolver.h
View File

@ -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 *ngx_resolve_start(ngx_resolver_t *r,
ngx_resolver_ctx_t *temp); ngx_resolver_ctx_t *temp);
ngx_int_t ngx_resolve_name(ngx_resolver_ctx_t *ctx); ngx_int_t ngx_resolve_name(ngx_resolver_ctx_t *ctx);

2
src/http/ngx_http_upstream.h
View File

@ -80,7 +80,7 @@ typedef struct {
typedef struct { typedef struct {
ngx_peer_addr_t *addrs; ngx_addr_t *addrs;
ngx_uint_t naddrs; ngx_uint_t naddrs;
ngx_uint_t weight; ngx_uint_t weight;
ngx_uint_t max_fails; ngx_uint_t max_fails;

2
src/mail/ngx_mail.h
View File

@ -394,7 +394,7 @@ char *ngx_mail_capabilities(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
/* STUB */ /* 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); void ngx_mail_auth_http_init(ngx_mail_session_t *s);
/**/ /**/

6
src/mail/ngx_mail_auth_http_module.c
View File

@ -12,7 +12,7 @@
typedef struct { typedef struct {
ngx_peer_addr_t *peer; ngx_addr_t *peer;
ngx_msec_t timeout; ngx_msec_t timeout;
@ -457,7 +457,7 @@ ngx_mail_auth_http_process_headers(ngx_mail_session_t *s,
time_t timer; time_t timer;
size_t len, size; size_t len, size;
ngx_int_t rc, port, n; ngx_int_t rc, port, n;
ngx_peer_addr_t *peer; ngx_addr_t *peer;
struct sockaddr_in *sin; struct sockaddr_in *sin;
ngx_log_debug0(NGX_LOG_DEBUG_MAIL, s->connection->log, 0, ngx_log_debug0(NGX_LOG_DEBUG_MAIL, s->connection->log, 0,
@ -764,7 +764,7 @@ ngx_mail_auth_http_process_headers(ngx_mail_session_t *s,
return; 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) { if (peer == NULL) {
ngx_destroy_pool(ctx->pool); ngx_destroy_pool(ctx->pool);
ngx_mail_session_internal_server_error(s); ngx_mail_session_internal_server_error(s);

2
src/mail/ngx_mail_proxy_module.c
View File

@ -108,7 +108,7 @@ static u_char smtp_auth_ok[] = "235 2.0.0 OK" CRLF;
void 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; int keepalive;
ngx_int_t rc; ngx_int_t rc;

4
src/mysql/ngx_http_mysql_test.c
View File

@ -10,8 +10,8 @@
typedef struct { typedef struct {
ngx_peer_addr_t *peers; ngx_addr_t *peers;
ngx_uint_t npeers; ngx_uint_t npeers;
} ngx_http_mysql_test_conf_t; } ngx_http_mysql_test_conf_t;