mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-14 03:39:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replaced ngx_http_realip_from_t with ngx_in_cidr_t.

Browse Source
This commit is contained in:
Ruslan Ermilov 2012-03-28 09:29:09 +00:00
parent 52fcfd042e
commit feda353cb3
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,13 +16,7 @@
typedef struct { typedef struct {
in_addr_t mask; ngx_array_t *from; /* array of ngx_in_cidr_t */
in_addr_t addr;
} ngx_http_realip_from_t;
typedef struct {
ngx_array_t *from; /* array of ngx_http_realip_from_t */
ngx_uint_t type; ngx_uint_t type;
ngx_uint_t hash; ngx_uint_t hash;
ngx_str_t header; ngx_str_t header;
@ -114,9 +108,9 @@ ngx_http_realip_handler(ngx_http_request_t *r)
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;
ngx_in_cidr_t *from;
ngx_connection_t *c; ngx_connection_t *c;
ngx_http_realip_ctx_t *ctx; ngx_http_realip_ctx_t *ctx;
ngx_http_realip_from_t *from;
ngx_http_realip_loc_conf_t *rlcf; ngx_http_realip_loc_conf_t *rlcf;
ctx = ngx_http_get_module_ctx(r, ngx_http_realip_module); ctx = ngx_http_get_module_ctx(r, ngx_http_realip_module);
@ -317,7 +311,7 @@ ngx_http_realip_from(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_int_t rc; ngx_int_t rc;
ngx_str_t *value; ngx_str_t *value;
ngx_cidr_t cidr; ngx_cidr_t cidr;
ngx_http_realip_from_t *from; ngx_in_cidr_t *from;
value = cf->args->elts; value = cf->args->elts;
@ -332,7 +326,7 @@ ngx_http_realip_from(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
if (rlcf->from == NULL) { if (rlcf->from == NULL) {
rlcf->from = ngx_array_create(cf->pool, 2, rlcf->from = ngx_array_create(cf->pool, 2,
sizeof(ngx_http_realip_from_t)); sizeof(ngx_in_cidr_t));
if (rlcf->from == NULL) { if (rlcf->from == NULL) {
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }