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

support IPv4 mapped to IPv6 in geo module

Browse Source
This commit is contained in:
Igor Sysoev 2011-05-16 13:54:42 +00:00
parent dd39f60014
commit 529b5f1938
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/http/modules/ngx_http_geo_module.c
View File

@ -257,17 +257,41 @@ ngx_http_geo_real_addr(ngx_http_request_t *r, ngx_http_geo_ctx_t *ctx)
{ {
struct sockaddr_in *sin; struct sockaddr_in *sin;
ngx_http_variable_value_t *v; ngx_http_variable_value_t *v;
#if (NGX_HAVE_INET6)
u_char *p;
in_addr_t addr;
struct sockaddr_in6 *sin6;
#endif
if (ctx->index == -1) { if (ctx->index == -1) {
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http geo started: %V", &r->connection->addr_text); "http geo started: %V", &r->connection->addr_text);
if (r->connection->sockaddr->sa_family != AF_INET) { switch (r->connection->sockaddr->sa_family) {
return 0;
case AF_INET:
sin = (struct sockaddr_in *) r->connection->sockaddr;
return ntohl(sin->sin_addr.s_addr);
#if (NGX_HAVE_INET6)
case AF_INET6:
sin6 = (struct sockaddr_in6 *) r->connection->sockaddr;
if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
p = sin6->sin6_addr.s6_addr;
addr = p[12] << 24;
addr += p[13] << 16;
addr += p[14] << 8;
addr += p[15];
return addr;
}
#endif
} }
sin = (struct sockaddr_in *) r->connection->sockaddr; return INADDR_NONE;
return ntohl(sin->sin_addr.s_addr);
} }
v = ngx_http_get_flushed_variable(r, ctx->index); v = ngx_http_get_flushed_variable(r, ctx->index);