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

support IPv6 addresses in Real IP headers

Browse Source
This commit is contained in:
Igor Sysoev 2009-11-02 16:24:27 +00:00
parent 8b816d88a9
commit a9aaa4a78d
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/http/modules/ngx_http_realip_module.c
View File

@ -29,9 +29,10 @@ typedef struct {
typedef struct { typedef struct {
ngx_connection_t *connection; ngx_connection_t *connection;
in_addr_t addr; struct sockaddr *sockaddr;
ngx_str_t addr_text; socklen_t socklen;
ngx_str_t addr_text;
} ngx_http_realip_ctx_t; } ngx_http_realip_ctx_t;
@ -103,8 +104,9 @@ ngx_http_realip_handler(ngx_http_request_t *r)
{ {
u_char *ip, *p; u_char *ip, *p;
size_t len; size_t len;
in_addr_t addr; ngx_int_t rc;
ngx_uint_t i, hash; ngx_uint_t i, hash;
ngx_addr_t addr;
ngx_list_part_t *part; ngx_list_part_t *part;
ngx_table_elt_t *header; ngx_table_elt_t *header;
struct sockaddr_in *sin; struct sockaddr_in *sin;
@ -226,10 +228,15 @@ found:
ngx_http_set_ctx(r, ctx, ngx_http_realip_module); ngx_http_set_ctx(r, ctx, ngx_http_realip_module);
addr = ngx_inet_addr(ip, len); rc = ngx_parse_addr(c->pool, &addr, ip, len);
if (addr == INADDR_NONE) { switch (rc) {
case NGX_DECLINED:
return NGX_DECLINED; return NGX_DECLINED;
case NGX_ERROR:
return NGX_HTTP_INTERNAL_SERVER_ERROR;
default: /* NGX_OK */
break;
} }
p = ngx_pnalloc(c->pool, len); p = ngx_pnalloc(c->pool, len);
@ -242,11 +249,12 @@ found:
cln->handler = ngx_http_realip_cleanup; cln->handler = ngx_http_realip_cleanup;
ctx->connection = c; ctx->connection = c;
ctx->addr = sin->sin_addr.s_addr; ctx->sockaddr = c->sockaddr;
ctx->socklen = c->socklen;
ctx->addr_text = c->addr_text; ctx->addr_text = c->addr_text;
sin->sin_addr.s_addr = addr; c->sockaddr = addr.sockaddr;
c->socklen = addr.socklen;
c->addr_text.len = len; c->addr_text.len = len;
c->addr_text.data = p; c->addr_text.data = p;
@ -263,14 +271,12 @@ ngx_http_realip_cleanup(void *data)
{ {
ngx_http_realip_ctx_t *ctx = data; ngx_http_realip_ctx_t *ctx = data;
ngx_connection_t *c; ngx_connection_t *c;
struct sockaddr_in *sin;
c = ctx->connection; c = ctx->connection;
sin = (struct sockaddr_in *) c->sockaddr; c->sockaddr = ctx->sockaddr;
sin->sin_addr.s_addr = ctx->addr; c->socklen = ctx->socklen;
c->addr_text = ctx->addr_text; c->addr_text = ctx->addr_text;
} }