Mercurial > hg > nginx

comparison src/http/modules/ngx_http_access_module.c @ 3921:bab3488bd113

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix testing IPv4 address mapped to IPv6, when only IPv6 access rules are defined
author Igor Sysoev <igor@sysoev.ru>
date Mon, 16 May 2011 14:01:23 +0000
parents 9ec7238feac6
children d620f497c50f
comparison
equal deleted inserted replaced
3920:bfe4af74a4f4 3921:bab3488bd113
106 static ngx_int_t 106 static ngx_int_t
107 ngx_http_access_handler(ngx_http_request_t *r) 107 ngx_http_access_handler(ngx_http_request_t *r)
108 { 108 {
109 struct sockaddr_in *sin; 109 struct sockaddr_in *sin;
110 ngx_http_access_loc_conf_t *alcf; 110 ngx_http_access_loc_conf_t *alcf;
111 #if (NGX_HAVE_INET6)
112 u_char *p;
113 in_addr_t addr;
114 struct sockaddr_in6 *sin6;
115 #endif
111 116
112 alcf = ngx_http_get_module_loc_conf(r, ngx_http_access_module); 117 alcf = ngx_http_get_module_loc_conf(r, ngx_http_access_module);
113 118
114 #if (NGX_HAVE_INET6) 119 switch (r->connection->sockaddr->sa_family) {
115 120
116 if (alcf->rules6 && r->connection->sockaddr->sa_family == AF_INET6) { 121 case AF_INET:
117 u_char *p; 122 if (alcf->rules) {
118 in_addr_t addr; 123 sin = (struct sockaddr_in *) r->connection->sockaddr;
119 struct sockaddr_in6 *sin6; 124 return ngx_http_access_inet(r, alcf, sin->sin_addr.s_addr);
120 125 }
126 break;
127
128 #if (NGX_HAVE_INET6)
129
130 case AF_INET6:
121 sin6 = (struct sockaddr_in6 *) r->connection->sockaddr; 131 sin6 = (struct sockaddr_in6 *) r->connection->sockaddr;
122 p = sin6->sin6_addr.s6_addr; 132 p = sin6->sin6_addr.s6_addr;
123 133
124 if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) { 134 if (alcf->rules && IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
125 addr = p[12] << 24; 135 addr = p[12] << 24;
126 addr += p[13] << 16; 136 addr += p[13] << 16;
127 addr += p[14] << 8; 137 addr += p[14] << 8;
128 addr += p[15]; 138 addr += p[15];
129 return ngx_http_access_inet(r, alcf, htonl(addr)); 139 return ngx_http_access_inet(r, alcf, htonl(addr));
130 } 140 }
131 141
132 return ngx_http_access_inet6(r, alcf, p); 142 if (alcf->rules6) {
133 } 143 return ngx_http_access_inet6(r, alcf, p);
134 144 }
135 #endif 145
136 146 #endif
137 if (alcf->rules && r->connection->sockaddr->sa_family == AF_INET) {
138 sin = (struct sockaddr_in *) r->connection->sockaddr;
139 return ngx_http_access_inet(r, alcf, sin->sin_addr.s_addr);
140 } 147 }
141 148
142 return NGX_DECLINED; 149 return NGX_DECLINED;
143 } 150 }
144 151