Mercurial > hg > nginx
changeset 2202:2300ab9b069e
*) refactor ngx_ptocidr()
*) allow address without bitmask
*) thus now ngx_http_geo_module accepts addresses without bitmask
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 26 Aug 2008 14:19:37 +0000 |
parents | 49a269b67213 |
children | 8e5bf1bc87e2 |
files | src/core/ngx_inet.c src/event/ngx_event.c src/http/modules/ngx_http_access_module.c src/http/modules/ngx_http_realip_module.c |
diffstat | 4 files changed, 24 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_inet.c Tue Aug 26 14:16:36 2008 +0000 +++ b/src/core/ngx_inet.c Tue Aug 26 14:19:37 2008 +0000 @@ -102,43 +102,48 @@ ngx_int_t ngx_ptocidr(ngx_str_t *text, void *cidr) { - ngx_int_t m; - ngx_uint_t i; + u_char *addr, *mask, *last; + ngx_int_t shift; ngx_inet_cidr_t *in_cidr; in_cidr = cidr; - - for (i = 0; i < text->len; i++) { - if (text->data[i] == '/') { - break; - } - } + addr = text->data; + last = addr + text->len; - if (i == text->len) { - return NGX_ERROR; - } + mask = ngx_strlchr(addr, last, '/'); - text->data[i] = '\0'; - in_cidr->addr = inet_addr((char *) text->data); - text->data[i] = '/'; + in_cidr->addr = ngx_inet_addr(addr, (mask ? mask : last) - addr); + if (in_cidr->addr == INADDR_NONE) { return NGX_ERROR; } - m = ngx_atoi(&text->data[i + 1], text->len - (i + 1)); - if (m == NGX_ERROR) { + if (mask == NULL) { + in_cidr->mask = 0xffffffff; + return NGX_OK; + } + + mask++; + + shift = ngx_atoi(mask, last - mask); + if (shift == NGX_ERROR) { return NGX_ERROR; } - if (m == 0) { + if (shift == 0) { /* the x86 compilers use the shl instruction that shifts by modulo 32 */ in_cidr->mask = 0; - return NGX_OK; + + if (in_cidr->addr == 0) { + return NGX_OK; + } + + return NGX_DONE; } - in_cidr->mask = htonl((ngx_uint_t) (0 - (1 << (32 - m)))); + in_cidr->mask = htonl((ngx_uint_t) (0 - (1 << (32 - shift)))); if (in_cidr->addr == (in_cidr->addr & in_cidr->mask)) { return NGX_OK;
--- a/src/event/ngx_event.c Tue Aug 26 14:16:36 2008 +0000 +++ b/src/event/ngx_event.c Tue Aug 26 14:19:37 2008 +0000 @@ -1051,13 +1051,6 @@ return NGX_CONF_ERROR; } - dc->addr = inet_addr((char *) value[1].data); - - if (dc->addr != INADDR_NONE) { - dc->mask = 0xffffffff; - return NGX_CONF_OK; - } - rc = ngx_ptocidr(&value[1], &in_cidr); if (rc == NGX_DONE) {
--- a/src/http/modules/ngx_http_access_module.c Tue Aug 26 14:16:36 2008 +0000 +++ b/src/http/modules/ngx_http_access_module.c Tue Aug 26 14:19:37 2008 +0000 @@ -166,14 +166,6 @@ return NGX_CONF_OK; } - rule->addr = inet_addr((char *) value[1].data); - - if (rule->addr != INADDR_NONE) { - rule->mask = 0xffffffff; - - return NGX_CONF_OK; - } - rc = ngx_ptocidr(&value[1], &in_cidr); if (rc == NGX_ERROR) {
--- a/src/http/modules/ngx_http_realip_module.c Tue Aug 26 14:16:36 2008 +0000 +++ b/src/http/modules/ngx_http_realip_module.c Tue Aug 26 14:19:37 2008 +0000 @@ -251,14 +251,6 @@ value = cf->args->elts; - from->addr = inet_addr((char *) value[1].data); - - if (from->addr != INADDR_NONE) { - from->mask = 0xffffffff; - - return NGX_CONF_OK; - } - rc = ngx_ptocidr(&value[1], &in_cidr); if (rc == NGX_ERROR) {