Commit 9c388c0a7fc86beeb584744b5bd5884884111732 - nginx

*) refactor ngx_ptocidr() *) allow address without bitmask *) thus now ngx_http_geo_module accepts addresses without bitmask Igor Sysoev 13 years ago

4 changed file(s) with 31 addition(s) and 49 deletion(s). Raw diff Collapse all Expand all

+31

-26

src/core/ngx_inet.c less more

101	101	ngx_int_t
102	102	ngx_ptocidr(ngx_str_t text, void cidr)
103	103	{
104		ngx_int_t m;
105		ngx_uint_t i;
	104	u_char addr, mask, *last;
	105	ngx_int_t shift;
106	106	ngx_inet_cidr_t *in_cidr;
107	107
108	108	in_cidr = cidr;
109
110		for (i = 0; i < text->len; i++) {
111		if (text->data[i] == '/') {
112		break;
113		}
114		}
115
116		if (i == text->len) {
117		return NGX_ERROR;
118		}
119
120		text->data[i] = '\0';
121		in_cidr->addr = inet_addr((char *) text->data);
122		text->data[i] = '/';
	109	addr = text->data;
	110	last = addr + text->len;
	111
	112	mask = ngx_strlchr(addr, last, '/');
	113
	114	in_cidr->addr = ngx_inet_addr(addr, (mask ? mask : last) - addr);
	115
123	116	if (in_cidr->addr == INADDR_NONE) {
124	117	return NGX_ERROR;
125	118	}
126	119
127		m = ngx_atoi(&text->data[i + 1], text->len - (i + 1));
128		if (m == NGX_ERROR) {
129		return NGX_ERROR;
130		}
131
132		if (m == 0) {
	120	if (mask == NULL) {
	121	in_cidr->mask = 0xffffffff;
	122	return NGX_OK;
	123	}
	124
	125	mask++;
	126
	127	shift = ngx_atoi(mask, last - mask);
	128	if (shift == NGX_ERROR) {
	129	return NGX_ERROR;
	130	}
	131
	132	if (shift == 0) {
133	133
134	134	/* the x86 compilers use the shl instruction that shifts by modulo 32 */
135	135
136	136	in_cidr->mask = 0;
137		return NGX_OK;
138		}
139
140		in_cidr->mask = htonl((ngx_uint_t) (0 - (1 << (32 - m))));
	137
	138	if (in_cidr->addr == 0) {
	139	return NGX_OK;
	140	}
	141
	142	return NGX_DONE;
	143	}
	144
	145	in_cidr->mask = htonl((ngx_uint_t) (0 - (1 << (32 - shift))));
141	146
142	147	if (in_cidr->addr == (in_cidr->addr & in_cidr->mask)) {
143	148	return NGX_OK;

-7

src/event/ngx_event.c less more

1050	1050	return NGX_CONF_ERROR;
1051	1051	}
1052	1052
1053		dc->addr = inet_addr((char *) value[1].data);
1054
1055		if (dc->addr != INADDR_NONE) {
1056		dc->mask = 0xffffffff;
1057		return NGX_CONF_OK;
1058		}
1059
1060	1053	rc = ngx_ptocidr(&value[1], &in_cidr);
1061	1054
1062	1055	if (rc == NGX_DONE) {

-8

src/http/modules/ngx_http_access_module.c less more

165	165	return NGX_CONF_OK;
166	166	}
167	167
168		rule->addr = inet_addr((char *) value[1].data);
169
170		if (rule->addr != INADDR_NONE) {
171		rule->mask = 0xffffffff;
172
173		return NGX_CONF_OK;
174		}
175
176	168	rc = ngx_ptocidr(&value[1], &in_cidr);
177	169
178	170	if (rc == NGX_ERROR) {

-8

src/http/modules/ngx_http_realip_module.c less more

250	250
251	251	value = cf->args->elts;
252	252
253		from->addr = inet_addr((char *) value[1].data);
254
255		if (from->addr != INADDR_NONE) {
256		from->mask = 0xffffffff;
257
258		return NGX_CONF_OK;
259		}
260
261	253	rc = ngx_ptocidr(&value[1], &in_cidr);
262	254
263	255	if (rc == NGX_ERROR) {