Mercurial > hg > nginx

comparison src/http/modules/ngx_http_access_module.c @ 1380:b590a528fd41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ignore meaningless bits in CIDR and warn about them
author Igor Sysoev <igor@sysoev.ru>
date Fri, 10 Aug 2007 13:13:28 +0000
parents 7e24168b0853
children adca43955f79
comparison
equal deleted inserted replaced
1379:cc8ac1936aa4 1380:b590a528fd41
135 static char * 135 static char *
136 ngx_http_access_rule(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) 136 ngx_http_access_rule(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
137 { 137 {
138 ngx_http_access_loc_conf_t *alcf = conf; 138 ngx_http_access_loc_conf_t *alcf = conf;
139 139
140 ngx_int_t rc;
140 ngx_str_t *value; 141 ngx_str_t *value;
141 ngx_inet_cidr_t in_cidr; 142 ngx_inet_cidr_t in_cidr;
142 ngx_http_access_rule_t *rule; 143 ngx_http_access_rule_t *rule;
143 144
144 if (alcf->rules == NULL) { 145 if (alcf->rules == NULL) {
171 rule->mask = 0xffffffff; 172 rule->mask = 0xffffffff;
172 173
173 return NGX_CONF_OK; 174 return NGX_CONF_OK;
174 } 175 }
175 176
176 if (ngx_ptocidr(&value[1], &in_cidr) == NGX_ERROR) { 177 rc = ngx_ptocidr(&value[1], &in_cidr);
178
179 if (rc == NGX_ERROR) {
177 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid parameter \"%V\"", 180 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid parameter \"%V\"",
178 &value[1]); 181 &value[1]);
179 return NGX_CONF_ERROR; 182 return NGX_CONF_ERROR;
180 } 183 }
181 184
185 if (rc == NGX_DONE) {
186 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
187 "low address bits of %V are meaningless", &value[1]);
188 }
189
182 rule->mask = in_cidr.mask; 190 rule->mask = in_cidr.mask;
183 rule->addr = in_cidr.addr; 191 rule->addr = in_cidr.addr;
184 192
185 return NGX_CONF_OK; 193 return NGX_CONF_OK;
186 } 194 }