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

use ngx_http_server_addr()

Browse Source
This commit is contained in:
Igor Sysoev 2007-12-29 16:00:34 +00:00
parent 3f24ae2be2
commit c7a9b7a990
3 changed files with 17 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/http/modules/ngx_http_userid_filter_module.c
View File

@ -300,12 +300,10 @@ static ngx_int_t
ngx_http_userid_set_uid(ngx_http_request_t *r, ngx_http_userid_ctx_t *ctx, ngx_http_userid_set_uid(ngx_http_request_t *r, ngx_http_userid_ctx_t *ctx,
ngx_http_userid_conf_t *conf) ngx_http_userid_conf_t *conf)
{ {
u_char *cookie, *p; u_char *cookie, *p;
size_t len; size_t len;
socklen_t slen; ngx_str_t src, dst;
struct sockaddr_in sin; ngx_table_elt_t *set_cookie, *p3p;
ngx_str_t src, dst;
ngx_table_elt_t *set_cookie, *p3p;
/* /*
* TODO: in the threaded mode the sequencers should be in TLS and their * TODO: in the threaded mode the sequencers should be in TLS and their
@ -327,18 +325,8 @@ ngx_http_userid_set_uid(ngx_http_request_t *r, ngx_http_userid_ctx_t *ctx,
} else { } else {
if (conf->service == NGX_CONF_UNSET) { if (conf->service == NGX_CONF_UNSET) {
if (r->in_addr == 0) { if (ngx_http_server_addr(r, NULL) != NGX_OK) {
slen = sizeof(struct sockaddr_in); return NGX_ERROR;
if (getsockname(r->connection->fd,
(struct sockaddr *) &sin, &slen)
== -1)
{
ngx_connection_error(r->connection, ngx_socket_errno,
"getsockname() failed");
return NGX_ERROR;
}
r->in_addr = sin.sin_addr.s_addr;
} }
ctx->uid_set[0] = htonl(r->in_addr); ctx->uid_set[0] = htonl(r->in_addr);

15
src/http/ngx_http_request.c
View File

@ -220,9 +220,7 @@ static void
ngx_http_init_request(ngx_event_t *rev) ngx_http_init_request(ngx_event_t *rev)
{ {
ngx_time_t *tp; ngx_time_t *tp;
socklen_t len;
ngx_uint_t i; ngx_uint_t i;
struct sockaddr_in sin;
ngx_connection_t *c; ngx_connection_t *c;
ngx_http_request_t *r; ngx_http_request_t *r;
ngx_http_in_port_t *hip; ngx_http_in_port_t *hip;
@ -295,6 +293,8 @@ ngx_http_init_request(ngx_event_t *rev)
i = 0; i = 0;
r->connection = c;
if (hip->naddrs > 1) { if (hip->naddrs > 1) {
/* /*
@ -302,7 +302,7 @@ ngx_http_init_request(ngx_event_t *rev)
* is the "*:port" wildcard so getsockname() is needed to determine * is the "*:port" wildcard so getsockname() is needed to determine
* the server address. * the server address.
* *
* AcceptEx() already gave this address. * AcceptEx() already has given this address.
*/ */
#if (NGX_WIN32) #if (NGX_WIN32)
@ -313,15 +313,10 @@ ngx_http_init_request(ngx_event_t *rev)
} else } else
#endif #endif
{ {
len = sizeof(struct sockaddr_in); if (ngx_http_server_addr(r, NULL) != NGX_OK) {
if (getsockname(c->fd, (struct sockaddr *) &sin, &len) == -1) {
ngx_connection_error(c, ngx_socket_errno,
"getsockname() failed");
ngx_http_close_connection(c); ngx_http_close_connection(c);
return; return;
} }
r->in_addr = sin.sin_addr.s_addr;
} }
/* the last address is "*" */ /* the last address is "*" */
@ -426,8 +421,6 @@ ngx_http_init_request(ngx_event_t *rev)
c->single_connection = 1; c->single_connection = 1;
c->destroyed = 0; c->destroyed = 0;
r->connection = c;
r->main = r; r->main = r;
tp = ngx_timeofday(); tp = ngx_timeofday();

24
src/http/ngx_http_variables.c
View File

@ -808,32 +808,22 @@ static ngx_int_t
ngx_http_variable_server_addr(ngx_http_request_t *r, ngx_http_variable_server_addr(ngx_http_request_t *r,
ngx_http_variable_value_t *v, uintptr_t data) ngx_http_variable_value_t *v, uintptr_t data)
{ {
socklen_t len; ngx_str_t s;
ngx_connection_t *c;
struct sockaddr_in sin;
v->data = ngx_palloc(r->pool, INET_ADDRSTRLEN); s.data = ngx_palloc(r->pool, INET_ADDRSTRLEN);
if (v->data == NULL) { if (s.data == NULL) {
return NGX_ERROR; return NGX_ERROR;
} }
c = r->connection; if (ngx_http_server_addr(r, &s) != NGX_OK) {
return NGX_ERROR;
if (r->in_addr == 0) {
len = sizeof(struct sockaddr_in);
if (getsockname(c->fd, (struct sockaddr *) &sin, &len) == -1) {
ngx_connection_error(c, ngx_socket_errno, "getsockname() failed");
return NGX_ERROR;
}
r->in_addr = sin.sin_addr.s_addr;
} }
v->len = ngx_inet_ntop(c->listening->family, &r->in_addr, v->len = s.len;
v->data, INET_ADDRSTRLEN);
v->valid = 1; v->valid = 1;
v->no_cacheable = 0; v->no_cacheable = 0;
v->not_found = 0; v->not_found = 0;
v->data = s.data;
return NGX_OK; return NGX_OK;
} }