nginx: src/core/ngx_inet.c annotate

annotate src/core/ngx_inet.c @ 3272:98f49b2bcae8

change ngx_parse_addr() interface

author	Igor Sysoev <igor@sysoev.ru>
date	Mon, 02 Nov 2009 16:11:06 +0000
parents	7d1a04259e3f
children	beaf94f2f265

rev	line source
441 da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 425 diff changeset	1
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 425 diff changeset	2 /*
444 42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright Igor Sysoev <igor@sysoev.ru> parents: 441 diff changeset	3 * Copyright (C) Igor Sysoev
441 da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 425 diff changeset	4 */
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 425 diff changeset	5
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 425 diff changeset	6
26 53cb81681040 nginx-0.0.1-2002-12-15-09:25:09 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	7 #include <ngx_config.h>
100 7ebc8b7fb816 nginx-0.0.1-2003-06-03-19:42:58 import Igor Sysoev <igor@sysoev.ru> parents: 57 diff changeset	8 #include <ngx_core.h>
26 53cb81681040 nginx-0.0.1-2002-12-15-09:25:09 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	9
53cb81681040 nginx-0.0.1-2002-12-15-09:25:09 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	10
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	11 #if (NGX_HAVE_INET6)
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	12 static size_t ngx_inet6_ntop(u_char p, u_char text, size_t len);
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	13 #endif
2200 fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	14 static ngx_int_t ngx_parse_unix_domain_url(ngx_pool_t pool, ngx_url_t u);
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	15 static ngx_int_t ngx_parse_inet_url(ngx_pool_t pool, ngx_url_t u);
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	16 static ngx_int_t ngx_parse_inet6_url(ngx_pool_t pool, ngx_url_t u);
2200 fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	17
1647 c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	18
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	19 in_addr_t
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	20 ngx_inet_addr(u_char *text, size_t len)
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	21 {
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	22 u_char *p, c;
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	23 in_addr_t addr;
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	24 ngx_uint_t octet, n;
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	25
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	26 addr = 0;
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	27 octet = 0;
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	28 n = 0;
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	29
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	30 for (p = text; p < text + len; p++) {
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	31
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	32 c = *p;
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	33
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	34 if (c >= '0' && c <= '9') {
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	35 octet = octet * 10 + (c - '0');
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	36 continue;
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	37 }
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	38
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	39 if (c == '.' && octet < 256) {
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	40 addr = (addr << 8) + octet;
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	41 octet = 0;
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	42 n++;
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	43 continue;
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	44 }
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	45
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	46 return INADDR_NONE;
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	47 }
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	48
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	49 if (n != 3) {
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	50 return INADDR_NONE;
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	51 }
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	52
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	53 if (octet < 256) {
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	54 addr = (addr << 8) + octet;
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	55 return htonl(addr);
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	56 }
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	57
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	58 return INADDR_NONE;
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	59 }
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	60
c68477afa410 ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	61
3265 0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	62 #if (NGX_HAVE_INET6)
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	63
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	64 ngx_int_t
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	65 ngx_inet6_addr(u_char p, size_t len, u_char addr)
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	66 {
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	67 u_char c, zero, digit, s, d;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	68 size_t len4;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	69 ngx_uint_t n, nibbles, word;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	70
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	71 if (len == 0) {
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	72 return NGX_ERROR;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	73 }
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	74
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	75 zero = NULL;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	76 digit = NULL;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	77 len4 = 0;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	78 nibbles = 0;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	79 word = 0;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	80 n = 8;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	81
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	82 if (p[0] == ':') {
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	83 p++;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	84 len--;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	85 }
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	86
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	87 for (/* void */; len; len--) {
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	88 c = *p++;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	89
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	90 if (c == ':') {
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	91 if (nibbles) {
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	92 digit = p;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	93 len4 = len;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	94 *addr++ = (u_char) (word >> 8);
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	95 *addr++ = (u_char) (word & 0xff);
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	96
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	97 if (--n) {
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	98 nibbles = 0;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	99 word = 0;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	100 continue;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	101 }
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	102
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	103 } else {
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	104 if (zero == NULL) {
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	105 digit = p;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	106 len4 = len;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	107 zero = addr;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	108 continue;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	109 }
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	110 }
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	111
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	112 return NGX_ERROR;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	113 }
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	114
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	115 if (c == '.' && nibbles) {
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	116 if (n < 2) {
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	117 return NGX_ERROR;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	118 }
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	119
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	120 word = ngx_inet_addr(digit, len4 - 1);
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	121 if (word == INADDR_NONE) {
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	122 return NGX_ERROR;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	123 }
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	124
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	125 word = ntohl(word);
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	126 *addr++ = (u_char) ((word >> 24) & 0xff);
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	127 *addr++ = (u_char) ((word >> 16) & 0xff);
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	128 n--;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	129 break;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	130 }
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	131
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	132 if (++nibbles > 4) {
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	133 return NGX_ERROR;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	134 }
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	135
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	136 if (c >= '0' && c <= '9') {
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	137 word = word * 16 + (c - '0');
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	138 continue;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	139 }
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	140
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	141 c \|= 0x20;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	142
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	143 if (c >= 'a' && c <= 'f') {
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	144 word = word * 16 + (c - 'a') + 10;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	145 continue;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	146 }
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	147
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	148 return NGX_ERROR;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	149 }
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	150
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	151 if (nibbles == 0 && zero == NULL) {
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	152 return NGX_ERROR;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	153 }
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	154
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	155 *addr++ = (u_char) (word >> 8);
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	156 *addr++ = (u_char) (word & 0xff);
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	157
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	158 if (--n) {
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	159 if (zero) {
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	160 n *= 2;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	161 s = addr - 1;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	162 d = s + n;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	163 while (s >= zero) {
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	164 d-- = s--;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	165 }
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	166 ngx_memzero(zero, n);
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	167 return NGX_OK;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	168 }
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	169
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	170 } else {
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	171 if (zero == NULL) {
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	172 return NGX_OK;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	173 }
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	174 }
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	175
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	176 return NGX_ERROR;
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	177 }
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	178
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	179 #endif
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	180
0c5c5e876391 ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3230 diff changeset	181
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	182 size_t
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	183 ngx_sock_ntop(struct sockaddr sa, u_char text, size_t len, ngx_uint_t port)
57 a499e0d1f16e nginx-0.0.1-2003-01-30-10:28:09 import Igor Sysoev <igor@sysoev.ru> parents: 26 diff changeset	184 {
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	185 u_char *p;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	186 struct sockaddr_in *sin;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	187 #if (NGX_HAVE_INET6)
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	188 size_t n;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	189 struct sockaddr_in6 *sin6;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	190 #endif
3230 a7491af45540 http listen unix domain sockets Igor Sysoev <igor@sysoev.ru> parents: 2856 diff changeset	191 #if (NGX_HAVE_UNIX_DOMAIN)
a7491af45540 http listen unix domain sockets Igor Sysoev <igor@sysoev.ru> parents: 2856 diff changeset	192 struct sockaddr_un *saun;
a7491af45540 http listen unix domain sockets Igor Sysoev <igor@sysoev.ru> parents: 2856 diff changeset	193 #endif
57 a499e0d1f16e nginx-0.0.1-2003-01-30-10:28:09 import Igor Sysoev <igor@sysoev.ru> parents: 26 diff changeset	194
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	195 switch (sa->sa_family) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	196
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	197 case AF_INET:
291 117ccc7c4055 nginx-0.0.3-2004-03-16-16:35:20 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	198
2197 74477ea8074f ) remove zero termination in ngx_inet_ntop() and ngx_sock_ntop() Igor Sysoev <igor@sysoev.ru>* parents: 2049 diff changeset	199 sin = (struct sockaddr_in *) sa;
74477ea8074f ) remove zero termination in ngx_inet_ntop() and ngx_sock_ntop() Igor Sysoev <igor@sysoev.ru>* parents: 2049 diff changeset	200 p = (u_char *) &sin->sin_addr;
57 a499e0d1f16e nginx-0.0.1-2003-01-30-10:28:09 import Igor Sysoev <igor@sysoev.ru> parents: 26 diff changeset	201
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	202 if (port) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	203 p = ngx_snprintf(text, len, "%ud.%ud.%ud.%ud:%d",
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	204 p[0], p[1], p[2], p[3], ntohs(sin->sin_port));
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	205 } else {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	206 p = ngx_snprintf(text, len, "%ud.%ud.%ud.%ud",
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	207 p[0], p[1], p[2], p[3]);
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	208 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	209
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	210 return (p - text);
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	211
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	212 #if (NGX_HAVE_INET6)
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	213
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	214 case AF_INET6:
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	215
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	216 sin6 = (struct sockaddr_in6 *) sa;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	217
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	218 n = 0;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	219
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	220 if (port) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	221 text[n++] = '[';
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	222 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	223
3268 c6a40c815d45 use sin6_addr.s6_addr instead of "(u_char ) & .sin6_addr" Igor Sysoev <igor@sysoev.ru>* parents: 3267 diff changeset	224 n = ngx_inet6_ntop(sin6->sin6_addr.s6_addr, &text[n], len);
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	225
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	226 if (port) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	227 n = ngx_sprintf(&text[1 + n], "]:%d",
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	228 ntohs(sin6->sin6_port)) - text;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	229 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	230
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	231 return n;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	232 #endif
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	233
3230 a7491af45540 http listen unix domain sockets Igor Sysoev <igor@sysoev.ru> parents: 2856 diff changeset	234 #if (NGX_HAVE_UNIX_DOMAIN)
a7491af45540 http listen unix domain sockets Igor Sysoev <igor@sysoev.ru> parents: 2856 diff changeset	235
a7491af45540 http listen unix domain sockets Igor Sysoev <igor@sysoev.ru> parents: 2856 diff changeset	236 case AF_UNIX:
a7491af45540 http listen unix domain sockets Igor Sysoev <igor@sysoev.ru> parents: 2856 diff changeset	237 saun = (struct sockaddr_un *) sa;
a7491af45540 http listen unix domain sockets Igor Sysoev <igor@sysoev.ru> parents: 2856 diff changeset	238
a7491af45540 http listen unix domain sockets Igor Sysoev <igor@sysoev.ru> parents: 2856 diff changeset	239 /* we do not include trailing zero in address length */
a7491af45540 http listen unix domain sockets Igor Sysoev <igor@sysoev.ru> parents: 2856 diff changeset	240
a7491af45540 http listen unix domain sockets Igor Sysoev <igor@sysoev.ru> parents: 2856 diff changeset	241 return ngx_snprintf(text, len, "unix:%s%Z", saun->sun_path) - text - 1;
a7491af45540 http listen unix domain sockets Igor Sysoev <igor@sysoev.ru> parents: 2856 diff changeset	242
a7491af45540 http listen unix domain sockets Igor Sysoev <igor@sysoev.ru> parents: 2856 diff changeset	243 #endif
a7491af45540 http listen unix domain sockets Igor Sysoev <igor@sysoev.ru> parents: 2856 diff changeset	244
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	245 default:
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	246 return 0;
291 117ccc7c4055 nginx-0.0.3-2004-03-16-16:35:20 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	247 }
57 a499e0d1f16e nginx-0.0.1-2003-01-30-10:28:09 import Igor Sysoev <igor@sysoev.ru> parents: 26 diff changeset	248 }
a499e0d1f16e nginx-0.0.1-2003-01-30-10:28:09 import Igor Sysoev <igor@sysoev.ru> parents: 26 diff changeset	249
1830 cac010479ea0 change order Igor Sysoev <igor@sysoev.ru> parents: 1671 diff changeset	250
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	251 size_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	252 ngx_inet_ntop(int family, void addr, u_char text, size_t len)
26 53cb81681040 nginx-0.0.1-2002-12-15-09:25:09 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	253 {
2197 74477ea8074f ) remove zero termination in ngx_inet_ntop() and ngx_sock_ntop() Igor Sysoev <igor@sysoev.ru>* parents: 2049 diff changeset	254 u_char *p;
291 117ccc7c4055 nginx-0.0.3-2004-03-16-16:35:20 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	255
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	256 switch (family) {
291 117ccc7c4055 nginx-0.0.3-2004-03-16-16:35:20 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	257
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	258 case AF_INET:
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	259
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	260 p = addr;
291 117ccc7c4055 nginx-0.0.3-2004-03-16-16:35:20 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	261
2197 74477ea8074f ) remove zero termination in ngx_inet_ntop() and ngx_sock_ntop() Igor Sysoev <igor@sysoev.ru>* parents: 2049 diff changeset	262 return ngx_snprintf(text, len, "%ud.%ud.%ud.%ud",
74477ea8074f ) remove zero termination in ngx_inet_ntop() and ngx_sock_ntop() Igor Sysoev <igor@sysoev.ru>* parents: 2049 diff changeset	263 p[0], p[1], p[2], p[3])
74477ea8074f ) remove zero termination in ngx_inet_ntop() and ngx_sock_ntop() Igor Sysoev <igor@sysoev.ru>* parents: 2049 diff changeset	264 - text;
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	265
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	266 #if (NGX_HAVE_INET6)
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	267
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	268 case AF_INET6:
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	269 return ngx_inet6_ntop(addr, text, len);
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	270
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	271 #endif
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	272
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	273 default:
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	274 return 0;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	275 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	276 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	277
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	278
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	279 #if (NGX_HAVE_INET6)
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	280
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	281 static size_t
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	282 ngx_inet6_ntop(u_char p, u_char text, size_t len)
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	283 {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	284 u_char *dst;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	285 size_t max, n;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	286 ngx_uint_t i, zero, last;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	287
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	288 if (len < NGX_INET6_ADDRSTRLEN) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	289 return 0;
291 117ccc7c4055 nginx-0.0.3-2004-03-16-16:35:20 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	290 }
117ccc7c4055 nginx-0.0.3-2004-03-16-16:35:20 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	291
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	292 zero = (ngx_uint_t) -1;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	293 last = (ngx_uint_t) -1;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	294 max = 1;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	295 n = 0;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	296
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	297 for (i = 0; i < 16; i += 2) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	298
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	299 if (p[i] \|\| p[i + 1]) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	300
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	301 if (max < n) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	302 zero = last;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	303 max = n;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	304 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	305
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	306 n = 0;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	307 continue;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	308 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	309
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	310 if (n++ == 0) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	311 last = i;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	312 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	313 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	314
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	315 if (max < n) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	316 zero = last;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	317 max = n;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	318 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	319
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	320 dst = text;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	321 n = 16;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	322
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	323 if (zero == 0) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	324
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	325 if ((max == 5 && p[10] == 0xff && p[11] == 0xff)
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	326 \|\| (max == 6)
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	327 \|\| (max == 7 && p[14] != 0 && p[15] != 1))
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	328 {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	329 n = 12;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	330 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	331
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	332 *dst++ = ':';
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	333 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	334
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	335 for (i = 0; i < n; i += 2) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	336
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	337 if (i == zero) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	338 *dst++ = ':';
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	339 i += (max - 1) * 2;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	340 continue;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	341 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	342
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	343 dst = ngx_sprintf(dst, "%uxi", p[i] * 256 + p[i + 1]);
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	344
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	345 if (i < 14) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	346 *dst++ = ':';
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	347 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	348 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	349
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	350 if (n == 12) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	351 dst = ngx_sprintf(dst, "%ud.%ud.%ud.%ud", p[12], p[13], p[14], p[15]);
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	352 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	353
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	354 return dst - text;
1830 cac010479ea0 change order Igor Sysoev <igor@sysoev.ru> parents: 1671 diff changeset	355 }
cac010479ea0 change order Igor Sysoev <igor@sysoev.ru> parents: 1671 diff changeset	356
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	357 #endif
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	358
1830 cac010479ea0 change order Igor Sysoev <igor@sysoev.ru> parents: 1671 diff changeset	359
340 0bf903191ceb nginx-0.0.3-2004-05-25-19:28:46 import Igor Sysoev <igor@sysoev.ru> parents: 291 diff changeset	360 /* AF_INET only */
0bf903191ceb nginx-0.0.3-2004-05-25-19:28:46 import Igor Sysoev <igor@sysoev.ru> parents: 291 diff changeset	361
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	362 ngx_int_t
2537 a472d954c534 prepare ngx_ptocidr() for IPv6 Igor Sysoev <igor@sysoev.ru> parents: 2517 diff changeset	363 ngx_ptocidr(ngx_str_t text, ngx_cidr_t cidr)
340 0bf903191ceb nginx-0.0.3-2004-05-25-19:28:46 import Igor Sysoev <igor@sysoev.ru> parents: 291 diff changeset	364 {
2537 a472d954c534 prepare ngx_ptocidr() for IPv6 Igor Sysoev <igor@sysoev.ru> parents: 2517 diff changeset	365 u_char addr, mask, *last;
a472d954c534 prepare ngx_ptocidr() for IPv6 Igor Sysoev <igor@sysoev.ru> parents: 2517 diff changeset	366 ngx_int_t shift;
340 0bf903191ceb nginx-0.0.3-2004-05-25-19:28:46 import Igor Sysoev <igor@sysoev.ru> parents: 291 diff changeset	367
2202 2300ab9b069e ) refactor ngx_ptocidr() Igor Sysoev <igor@sysoev.ru>* parents: 2200 diff changeset	368 addr = text->data;
2300ab9b069e ) refactor ngx_ptocidr() Igor Sysoev <igor@sysoev.ru>* parents: 2200 diff changeset	369 last = addr + text->len;
340 0bf903191ceb nginx-0.0.3-2004-05-25-19:28:46 import Igor Sysoev <igor@sysoev.ru> parents: 291 diff changeset	370
2202 2300ab9b069e ) refactor ngx_ptocidr() Igor Sysoev <igor@sysoev.ru>* parents: 2200 diff changeset	371 mask = ngx_strlchr(addr, last, '/');
340 0bf903191ceb nginx-0.0.3-2004-05-25-19:28:46 import Igor Sysoev <igor@sysoev.ru> parents: 291 diff changeset	372
2537 a472d954c534 prepare ngx_ptocidr() for IPv6 Igor Sysoev <igor@sysoev.ru> parents: 2517 diff changeset	373 cidr->u.in.addr = ngx_inet_addr(addr, (mask ? mask : last) - addr);
2202 2300ab9b069e ) refactor ngx_ptocidr() Igor Sysoev <igor@sysoev.ru>* parents: 2200 diff changeset	374
2537 a472d954c534 prepare ngx_ptocidr() for IPv6 Igor Sysoev <igor@sysoev.ru> parents: 2517 diff changeset	375 if (cidr->u.in.addr == INADDR_NONE) {
340 0bf903191ceb nginx-0.0.3-2004-05-25-19:28:46 import Igor Sysoev <igor@sysoev.ru> parents: 291 diff changeset	376 return NGX_ERROR;
0bf903191ceb nginx-0.0.3-2004-05-25-19:28:46 import Igor Sysoev <igor@sysoev.ru> parents: 291 diff changeset	377 }
0bf903191ceb nginx-0.0.3-2004-05-25-19:28:46 import Igor Sysoev <igor@sysoev.ru> parents: 291 diff changeset	378
2202 2300ab9b069e ) refactor ngx_ptocidr() Igor Sysoev <igor@sysoev.ru>* parents: 2200 diff changeset	379 if (mask == NULL) {
2537 a472d954c534 prepare ngx_ptocidr() for IPv6 Igor Sysoev <igor@sysoev.ru> parents: 2517 diff changeset	380 cidr->family = AF_INET;
a472d954c534 prepare ngx_ptocidr() for IPv6 Igor Sysoev <igor@sysoev.ru> parents: 2517 diff changeset	381 cidr->u.in.mask = 0xffffffff;
2202 2300ab9b069e ) refactor ngx_ptocidr() Igor Sysoev <igor@sysoev.ru>* parents: 2200 diff changeset	382 return NGX_OK;
2300ab9b069e ) refactor ngx_ptocidr() Igor Sysoev <igor@sysoev.ru>* parents: 2200 diff changeset	383 }
2300ab9b069e ) refactor ngx_ptocidr() Igor Sysoev <igor@sysoev.ru>* parents: 2200 diff changeset	384
2300ab9b069e ) refactor ngx_ptocidr() Igor Sysoev <igor@sysoev.ru>* parents: 2200 diff changeset	385 mask++;
2300ab9b069e ) refactor ngx_ptocidr() Igor Sysoev <igor@sysoev.ru>* parents: 2200 diff changeset	386
2300ab9b069e ) refactor ngx_ptocidr() Igor Sysoev <igor@sysoev.ru>* parents: 2200 diff changeset	387 shift = ngx_atoi(mask, last - mask);
2300ab9b069e ) refactor ngx_ptocidr() Igor Sysoev <igor@sysoev.ru>* parents: 2200 diff changeset	388 if (shift == NGX_ERROR) {
340 0bf903191ceb nginx-0.0.3-2004-05-25-19:28:46 import Igor Sysoev <igor@sysoev.ru> parents: 291 diff changeset	389 return NGX_ERROR;
0bf903191ceb nginx-0.0.3-2004-05-25-19:28:46 import Igor Sysoev <igor@sysoev.ru> parents: 291 diff changeset	390 }
0bf903191ceb nginx-0.0.3-2004-05-25-19:28:46 import Igor Sysoev <igor@sysoev.ru> parents: 291 diff changeset	391
2537 a472d954c534 prepare ngx_ptocidr() for IPv6 Igor Sysoev <igor@sysoev.ru> parents: 2517 diff changeset	392 cidr->family = AF_INET;
a472d954c534 prepare ngx_ptocidr() for IPv6 Igor Sysoev <igor@sysoev.ru> parents: 2517 diff changeset	393
2202 2300ab9b069e ) refactor ngx_ptocidr() Igor Sysoev <igor@sysoev.ru>* parents: 2200 diff changeset	394 if (shift == 0) {
368 15c84a40e87d nginx-0.0.7-2004-06-24-20:07:04 import Igor Sysoev <igor@sysoev.ru> parents: 340 diff changeset	395
15c84a40e87d nginx-0.0.7-2004-06-24-20:07:04 import Igor Sysoev <igor@sysoev.ru> parents: 340 diff changeset	396 /* the x86 compilers use the shl instruction that shifts by modulo 32 */
15c84a40e87d nginx-0.0.7-2004-06-24-20:07:04 import Igor Sysoev <igor@sysoev.ru> parents: 340 diff changeset	397
2537 a472d954c534 prepare ngx_ptocidr() for IPv6 Igor Sysoev <igor@sysoev.ru> parents: 2517 diff changeset	398 cidr->u.in.mask = 0;
2202 2300ab9b069e ) refactor ngx_ptocidr() Igor Sysoev <igor@sysoev.ru>* parents: 2200 diff changeset	399
2537 a472d954c534 prepare ngx_ptocidr() for IPv6 Igor Sysoev <igor@sysoev.ru> parents: 2517 diff changeset	400 if (cidr->u.in.addr == 0) {
2202 2300ab9b069e ) refactor ngx_ptocidr() Igor Sysoev <igor@sysoev.ru>* parents: 2200 diff changeset	401 return NGX_OK;
2300ab9b069e ) refactor ngx_ptocidr() Igor Sysoev <igor@sysoev.ru>* parents: 2200 diff changeset	402 }
2300ab9b069e ) refactor ngx_ptocidr() Igor Sysoev <igor@sysoev.ru>* parents: 2200 diff changeset	403
2300ab9b069e ) refactor ngx_ptocidr() Igor Sysoev <igor@sysoev.ru>* parents: 2200 diff changeset	404 return NGX_DONE;
368 15c84a40e87d nginx-0.0.7-2004-06-24-20:07:04 import Igor Sysoev <igor@sysoev.ru> parents: 340 diff changeset	405 }
15c84a40e87d nginx-0.0.7-2004-06-24-20:07:04 import Igor Sysoev <igor@sysoev.ru> parents: 340 diff changeset	406
2537 a472d954c534 prepare ngx_ptocidr() for IPv6 Igor Sysoev <igor@sysoev.ru> parents: 2517 diff changeset	407 cidr->u.in.mask = htonl((ngx_uint_t) (0 - (1 << (32 - shift))));
368 15c84a40e87d nginx-0.0.7-2004-06-24-20:07:04 import Igor Sysoev <igor@sysoev.ru> parents: 340 diff changeset	408
2537 a472d954c534 prepare ngx_ptocidr() for IPv6 Igor Sysoev <igor@sysoev.ru> parents: 2517 diff changeset	409 if (cidr->u.in.addr == (cidr->u.in.addr & cidr->u.in.mask)) {
1380 b590a528fd41 ignore meaningless bits in CIDR and warn about them Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	410 return NGX_OK;
b590a528fd41 ignore meaningless bits in CIDR and warn about them Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	411 }
b590a528fd41 ignore meaningless bits in CIDR and warn about them Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	412
2537 a472d954c534 prepare ngx_ptocidr() for IPv6 Igor Sysoev <igor@sysoev.ru> parents: 2517 diff changeset	413 cidr->u.in.addr &= cidr->u.in.mask;
1380 b590a528fd41 ignore meaningless bits in CIDR and warn about them Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	414
b590a528fd41 ignore meaningless bits in CIDR and warn about them Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	415 return NGX_DONE;
340 0bf903191ceb nginx-0.0.3-2004-05-25-19:28:46 import Igor Sysoev <igor@sysoev.ru> parents: 291 diff changeset	416 }
425 bd39260a1383 nginx-0.0.10-2004-09-14-19:55:24 import Igor Sysoev <igor@sysoev.ru> parents: 404 diff changeset	417
bd39260a1383 nginx-0.0.10-2004-09-14-19:55:24 import Igor Sysoev <igor@sysoev.ru> parents: 404 diff changeset	418
3272 98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3270 diff changeset	419 ngx_int_t
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3270 diff changeset	420 ngx_parse_addr(ngx_pool_t pool, ngx_addr_t addr, u_char *text, size_t len)
3270 7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	421 {
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	422 in_addr_t inaddr;
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	423 ngx_uint_t family;
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	424 struct sockaddr_in *sin;
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	425 #if (NGX_HAVE_INET6)
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	426 struct in6_addr inaddr6;
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	427 struct sockaddr_in6 *sin6;
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	428 #endif
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	429
3272 98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3270 diff changeset	430 inaddr = ngx_inet_addr(text, len);
3270 7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	431
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	432 if (inaddr != INADDR_NONE) {
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	433 family = AF_INET;
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	434 len = sizeof(struct sockaddr_in);
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	435
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	436 #if (NGX_HAVE_INET6)
3272 98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3270 diff changeset	437 } else if (ngx_inet6_addr(text, len, inaddr6.s6_addr) == NGX_OK) {
3270 7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	438 family = AF_INET6;
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	439 len = sizeof(struct sockaddr_in6);
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	440
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	441 #endif
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	442 } else {
3272 98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3270 diff changeset	443 return NGX_DECLINED;
3270 7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	444 }
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	445
3272 98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3270 diff changeset	446 addr->sockaddr = ngx_pcalloc(pool, len);
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3270 diff changeset	447 if (addr->sockaddr == NULL) {
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3270 diff changeset	448 return NGX_ERROR;
3270 7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	449 }
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	450
3272 98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3270 diff changeset	451 addr->sockaddr->sa_family = (u_char) family;
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3270 diff changeset	452 addr->socklen = len;
3270 7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	453
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	454 switch (family) {
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	455
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	456 #if (NGX_HAVE_INET6)
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	457 case AF_INET6:
3272 98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3270 diff changeset	458 sin6 = (struct sockaddr_in6 *) addr->sockaddr;
3270 7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	459 ngx_memcpy(sin6->sin6_addr.s6_addr, inaddr6.s6_addr, 16);
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	460 break;
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	461 #endif
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	462
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	463 default: /* AF_INET */
3272 98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3270 diff changeset	464 sin = (struct sockaddr_in *) addr->sockaddr;
3270 7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	465 sin->sin_addr.s_addr = inaddr;
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	466 break;
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	467 }
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	468
3272 98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3270 diff changeset	469 return NGX_OK;
3270 7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	470 }
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	471
7d1a04259e3f ngx_parse_addr() Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	472
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	473 ngx_int_t
1559 fe11e2a3946d use pool instead of ngx_conf_t Igor Sysoev <igor@sysoev.ru> parents: 1380 diff changeset	474 ngx_parse_url(ngx_pool_t pool, ngx_url_t u)
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	475 {
2200 fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	476 u_char *p;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	477
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	478 p = u->url.data;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	479
1107 db7c468c447d ngx_strcasecmp()/ngx_strncasecmp() Igor Sysoev <igor@sysoev.ru> parents: 906 diff changeset	480 if (ngx_strncasecmp(p, (u_char *) "unix:", 5) == 0) {
2200 fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	481 return ngx_parse_unix_domain_url(pool, u);
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	482 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	483
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	484 if ((p[0] == ':' \|\| p[0] == '/') && !u->listen) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	485 u->err = "invalid host";
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	486 return NGX_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	487 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	488
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	489 if (p[0] == '[') {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	490 return ngx_parse_inet6_url(pool, u);
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	491 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	492
2200 fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	493 return ngx_parse_inet_url(pool, u);
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	494 }
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	495
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	496
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	497 static ngx_int_t
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	498 ngx_parse_unix_domain_url(ngx_pool_t pool, ngx_url_t u)
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	499 {
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	500 #if (NGX_HAVE_UNIX_DOMAIN)
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	501 u_char path, uri, *last;
2200 fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	502 size_t len;
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	503 struct sockaddr_un *saun;
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	504
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	505 len = u->url.len;
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	506 path = u->url.data;
2200 fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	507
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	508 path += 5;
2200 fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	509 len -= 5;
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	510
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	511 if (u->uri_part) {
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	512
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	513 last = path + len;
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	514 uri = ngx_strlchr(path, last, ':');
2200 fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	515
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	516 if (uri) {
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	517 len = uri - path;
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	518 uri++;
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	519 u->uri.len = last - uri;
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	520 u->uri.data = uri;
2200 fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	521 }
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	522 }
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	523
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	524 if (len == 0) {
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	525 u->err = "no path in the unix domain socket";
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	526 return NGX_ERROR;
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	527 }
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	528
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	529 u->host.len = len++;
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	530 u->host.data = path;
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	531
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	532 if (len > sizeof(saun->sun_path)) {
2200 fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	533 u->err = "too long path in the unix domain socket";
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	534 return NGX_ERROR;
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	535 }
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	536
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	537 u->socklen = sizeof(struct sockaddr_un);
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	538 saun = (struct sockaddr_un *) &u->sockaddr;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	539 saun->sun_family = AF_UNIX;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	540 (void) ngx_cpystrn((u_char *) saun->sun_path, path, len);
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	541
3269 f0d596e84634 rename ngx_peer_addr_t to ngx_addr_t Igor Sysoev <igor@sysoev.ru> parents: 3268 diff changeset	542 u->addrs = ngx_pcalloc(pool, sizeof(ngx_addr_t));
2200 fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	543 if (u->addrs == NULL) {
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	544 return NGX_ERROR;
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	545 }
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	546
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	547 saun = ngx_pcalloc(pool, sizeof(struct sockaddr_un));
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	548 if (saun == NULL) {
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	549 return NGX_ERROR;
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	550 }
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	551
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	552 u->family = AF_UNIX;
2200 fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	553 u->naddrs = 1;
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	554
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	555 saun->sun_family = AF_UNIX;
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	556 (void) ngx_cpystrn((u_char *) saun->sun_path, path, len);
2200 fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	557
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	558 u->addrs[0].sockaddr = (struct sockaddr *) saun;
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	559 u->addrs[0].socklen = sizeof(struct sockaddr_un);
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	560 u->addrs[0].name.len = len + 4;
2200 fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	561 u->addrs[0].name.data = u->url.data;
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	562
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	563 return NGX_OK;
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	564
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	565 #else
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	566
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	567 u->err = "the unix domain sockets are not supported on this platform";
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	568
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	569 return NGX_ERROR;
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	570
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	571 #endif
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	572 }
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	573
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	574
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	575 static ngx_int_t
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	576 ngx_parse_inet_url(ngx_pool_t pool, ngx_url_t u)
fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	577 {
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	578 u_char p, host, port, last, uri, args;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	579 size_t len;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	580 ngx_int_t n;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	581 struct hostent *h;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	582 struct sockaddr_in *sin;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	583
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	584 u->socklen = sizeof(struct sockaddr_in);
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	585 sin = (struct sockaddr_in *) &u->sockaddr;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	586 sin->sin_family = AF_INET;
2200 fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	587
2206 6ea36910aa57 fix bugs introduced in r2204 Igor Sysoev <igor@sysoev.ru> parents: 2203 diff changeset	588 u->family = AF_INET;
6ea36910aa57 fix bugs introduced in r2204 Igor Sysoev <igor@sysoev.ru> parents: 2203 diff changeset	589
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	590 host = u->url.data;
2200 fd15c193572d split ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 2198 diff changeset	591
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	592 last = host + u->url.len;
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 892 diff changeset	593
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	594 port = ngx_strlchr(host, last, ':');
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	595
2283 231b52f8adc0 fix case when URL has no port, but has ":" in URI part, Igor Sysoev <igor@sysoev.ru> parents: 2206 diff changeset	596 uri = ngx_strlchr(host, last, '/');
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	597
2284 c3035feb6638 fix case proxy_pass URL is evaluted to http://host?args Igor Sysoev <igor@sysoev.ru> parents: 2283 diff changeset	598 args = ngx_strlchr(host, last, '?');
c3035feb6638 fix case proxy_pass URL is evaluted to http://host?args Igor Sysoev <igor@sysoev.ru> parents: 2283 diff changeset	599
c3035feb6638 fix case proxy_pass URL is evaluted to http://host?args Igor Sysoev <igor@sysoev.ru> parents: 2283 diff changeset	600 if (args) {
c3035feb6638 fix case proxy_pass URL is evaluted to http://host?args Igor Sysoev <igor@sysoev.ru> parents: 2283 diff changeset	601 if (uri == NULL) {
c3035feb6638 fix case proxy_pass URL is evaluted to http://host?args Igor Sysoev <igor@sysoev.ru> parents: 2283 diff changeset	602 uri = args;
c3035feb6638 fix case proxy_pass URL is evaluted to http://host?args Igor Sysoev <igor@sysoev.ru> parents: 2283 diff changeset	603
c3035feb6638 fix case proxy_pass URL is evaluted to http://host?args Igor Sysoev <igor@sysoev.ru> parents: 2283 diff changeset	604 } else if (args < uri) {
c3035feb6638 fix case proxy_pass URL is evaluted to http://host?args Igor Sysoev <igor@sysoev.ru> parents: 2283 diff changeset	605 uri = args;
c3035feb6638 fix case proxy_pass URL is evaluted to http://host?args Igor Sysoev <igor@sysoev.ru> parents: 2283 diff changeset	606 }
c3035feb6638 fix case proxy_pass URL is evaluted to http://host?args Igor Sysoev <igor@sysoev.ru> parents: 2283 diff changeset	607 }
c3035feb6638 fix case proxy_pass URL is evaluted to http://host?args Igor Sysoev <igor@sysoev.ru> parents: 2283 diff changeset	608
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	609 if (uri) {
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	610 if (u->listen \|\| !u->uri_part) {
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	611 u->err = "invalid host";
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	612 return NGX_ERROR;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	613 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	614
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	615 u->uri.len = last - uri;
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	616 u->uri.data = uri;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	617
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	618 last = uri;
2283 231b52f8adc0 fix case when URL has no port, but has ":" in URI part, Igor Sysoev <igor@sysoev.ru> parents: 2206 diff changeset	619
231b52f8adc0 fix case when URL has no port, but has ":" in URI part, Igor Sysoev <igor@sysoev.ru> parents: 2206 diff changeset	620 if (uri < port) {
231b52f8adc0 fix case when URL has no port, but has ":" in URI part, Igor Sysoev <igor@sysoev.ru> parents: 2206 diff changeset	621 port = NULL;
2301 148c2e840c2b style fix: remove trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 2284 diff changeset	622 }
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	623 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	624
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	625 if (port) {
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	626 port++;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	627
2206 6ea36910aa57 fix bugs introduced in r2204 Igor Sysoev <igor@sysoev.ru> parents: 2203 diff changeset	628 len = last - port;
6ea36910aa57 fix bugs introduced in r2204 Igor Sysoev <igor@sysoev.ru> parents: 2203 diff changeset	629
6ea36910aa57 fix bugs introduced in r2204 Igor Sysoev <igor@sysoev.ru> parents: 2203 diff changeset	630 if (len == 0) {
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	631 u->err = "invalid port";
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	632 return NGX_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	633 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	634
2206 6ea36910aa57 fix bugs introduced in r2204 Igor Sysoev <igor@sysoev.ru> parents: 2203 diff changeset	635 n = ngx_atoi(port, len);
6ea36910aa57 fix bugs introduced in r2204 Igor Sysoev <igor@sysoev.ru> parents: 2203 diff changeset	636
6ea36910aa57 fix bugs introduced in r2204 Igor Sysoev <igor@sysoev.ru> parents: 2203 diff changeset	637 if (n < 1 \|\| n > 65536) {
6ea36910aa57 fix bugs introduced in r2204 Igor Sysoev <igor@sysoev.ru> parents: 2203 diff changeset	638 u->err = "invalid port";
6ea36910aa57 fix bugs introduced in r2204 Igor Sysoev <igor@sysoev.ru> parents: 2203 diff changeset	639 return NGX_ERROR;
6ea36910aa57 fix bugs introduced in r2204 Igor Sysoev <igor@sysoev.ru> parents: 2203 diff changeset	640 }
6ea36910aa57 fix bugs introduced in r2204 Igor Sysoev <igor@sysoev.ru> parents: 2203 diff changeset	641
6ea36910aa57 fix bugs introduced in r2204 Igor Sysoev <igor@sysoev.ru> parents: 2203 diff changeset	642 u->port = (in_port_t) n;
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	643 sin->sin_port = htons((in_port_t) n);
2206 6ea36910aa57 fix bugs introduced in r2204 Igor Sysoev <igor@sysoev.ru> parents: 2203 diff changeset	644
6ea36910aa57 fix bugs introduced in r2204 Igor Sysoev <igor@sysoev.ru> parents: 2203 diff changeset	645 u->port_text.len = len;
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	646 u->port_text.data = port;
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	647
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	648 last = port - 1;
1671 8075179cae21 ngx_parse_url() saves port text, this allows to use it in proxy host header Igor Sysoev <igor@sysoev.ru> parents: 1647 diff changeset	649
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	650 } else {
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	651 if (uri == NULL) {
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	652
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	653 if (u->listen) {
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	654
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	655 /* test value as port only */
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	656
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	657 n = ngx_atoi(host, last - host);
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	658
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	659 if (n != NGX_ERROR) {
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	660
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	661 if (n < 1 \|\| n > 65536) {
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	662 u->err = "invalid port";
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	663 return NGX_ERROR;
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	664 }
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	665
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	666 u->port = (in_port_t) n;
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	667 sin->sin_port = htons((in_port_t) n);
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	668
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	669 u->port_text.len = last - host;
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	670 u->port_text.data = host;
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	671
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	672 u->wildcard = 1;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	673
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	674 return NGX_OK;
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	675 }
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	676 }
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	677 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	678
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	679 u->no_port = 1;
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	680 }
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	681
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	682 len = last - host;
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	683
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	684 if (len == 0) {
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	685 u->err = "no host";
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	686 return NGX_ERROR;
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	687 }
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	688
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	689 if (len == 1 && host == '') {
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	690 len = 0;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	691 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	692
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	693 u->host.len = len;
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	694 u->host.data = host;
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	695
2206 6ea36910aa57 fix bugs introduced in r2204 Igor Sysoev <igor@sysoev.ru> parents: 2203 diff changeset	696 if (u->no_resolve) {
6ea36910aa57 fix bugs introduced in r2204 Igor Sysoev <igor@sysoev.ru> parents: 2203 diff changeset	697 return NGX_OK;
6ea36910aa57 fix bugs introduced in r2204 Igor Sysoev <igor@sysoev.ru> parents: 2203 diff changeset	698 }
6ea36910aa57 fix bugs introduced in r2204 Igor Sysoev <igor@sysoev.ru> parents: 2203 diff changeset	699
3267 fb4f7605505f replace inet_addr() with ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 3266 diff changeset	700 if (len) {
fb4f7605505f replace inet_addr() with ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 3266 diff changeset	701 sin->sin_addr.s_addr = ngx_inet_addr(host, len);
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	702
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	703 if (sin->sin_addr.s_addr == INADDR_NONE) {
3267 fb4f7605505f replace inet_addr() with ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 3266 diff changeset	704 p = ngx_alloc(++len, pool->log);
fb4f7605505f replace inet_addr() with ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 3266 diff changeset	705 if (p == NULL) {
fb4f7605505f replace inet_addr() with ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 3266 diff changeset	706 return NGX_ERROR;
fb4f7605505f replace inet_addr() with ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 3266 diff changeset	707 }
fb4f7605505f replace inet_addr() with ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 3266 diff changeset	708
fb4f7605505f replace inet_addr() with ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 3266 diff changeset	709 (void) ngx_cpystrn(p, host, len);
fb4f7605505f replace inet_addr() with ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 3266 diff changeset	710
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	711 h = gethostbyname((const char *) p);
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	712
3267 fb4f7605505f replace inet_addr() with ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 3266 diff changeset	713 ngx_free(p);
fb4f7605505f replace inet_addr() with ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 3266 diff changeset	714
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	715 if (h == NULL \|\| h->h_addr_list[0] == NULL) {
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	716 ngx_free(p);
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	717 u->err = "host not found";
804 472cd9768ac2 now the "listen" directives use ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 712 diff changeset	718 return NGX_ERROR;
472cd9768ac2 now the "listen" directives use ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 712 diff changeset	719 }
472cd9768ac2 now the "listen" directives use ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 712 diff changeset	720
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	721 sin->sin_addr.s_addr = (in_addr_t ) (h->h_addr_list[0]);
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	722 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	723
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	724 if (sin->sin_addr.s_addr == INADDR_ANY) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	725 u->wildcard = 1;
804 472cd9768ac2 now the "listen" directives use ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 712 diff changeset	726 }
472cd9768ac2 now the "listen" directives use ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 712 diff changeset	727
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	728 } else {
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	729 sin->sin_addr.s_addr = INADDR_ANY;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	730 u->wildcard = 1;
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	731 }
804 472cd9768ac2 now the "listen" directives use ngx_parse_url() Igor Sysoev <igor@sysoev.ru> parents: 712 diff changeset	732
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 892 diff changeset	733 if (u->no_port) {
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 892 diff changeset	734 u->port = u->default_port;
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	735 sin->sin_port = htons(u->default_port);
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 892 diff changeset	736 }
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 892 diff changeset	737
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	738 if (u->listen) {
8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2202 diff changeset	739 return NGX_OK;
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 892 diff changeset	740 }
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 892 diff changeset	741
1559 fe11e2a3946d use pool instead of ngx_conf_t Igor Sysoev <igor@sysoev.ru> parents: 1380 diff changeset	742 if (ngx_inet_resolve_host(pool, u) != NGX_OK) {
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	743 return NGX_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	744 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	745
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	746 return NGX_OK;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	747 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	748
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	749
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	750 static ngx_int_t
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	751 ngx_parse_inet6_url(ngx_pool_t pool, ngx_url_t u)
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	752 {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	753 #if (NGX_HAVE_INET6)
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	754 u_char p, host, port, last, *uri;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	755 size_t len;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	756 ngx_int_t n;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	757 struct sockaddr_in6 *sin6;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	758
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	759 u->socklen = sizeof(struct sockaddr_in6);
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	760 sin6 = (struct sockaddr_in6 *) &u->sockaddr;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	761 sin6->sin6_family = AF_INET6;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	762
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	763 host = u->url.data + 1;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	764
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	765 last = u->url.data + u->url.len;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	766
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	767 p = ngx_strlchr(host, last, ']');
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	768
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	769 if (p == NULL) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	770 u->err = "invalid host";
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	771 return NGX_ERROR;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	772 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	773
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	774 if (last - p) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	775
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	776 port = p + 1;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	777
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	778 uri = ngx_strlchr(port, last, '/');
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	779
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	780 if (uri) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	781 if (u->listen \|\| !u->uri_part) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	782 u->err = "invalid host";
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	783 return NGX_ERROR;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	784 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	785
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	786 u->uri.len = last - uri;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	787 u->uri.data = uri;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	788 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	789
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	790 if (*port == ':') {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	791 port++;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	792
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	793 len = last - port;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	794
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	795 if (len == 0) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	796 u->err = "invalid port";
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	797 return NGX_ERROR;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	798 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	799
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	800 n = ngx_atoi(port, len);
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	801
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	802 if (n < 1 \|\| n > 65536) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	803 u->err = "invalid port";
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	804 return NGX_ERROR;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	805 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	806
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	807 u->port = (in_port_t) n;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	808 sin6->sin6_port = htons((in_port_t) n);
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	809
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	810 u->port_text.len = len;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	811 u->port_text.data = port;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	812
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	813 } else {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	814 u->no_port = 1;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	815 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	816 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	817
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	818 len = p - host;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	819
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	820 if (len == 0) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	821 u->err = "no host";
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	822 return NGX_ERROR;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	823 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	824
3266 798141791ad3 use ngx_inet6_addr() Igor Sysoev <igor@sysoev.ru> parents: 3265 diff changeset	825 u->host.len = len;
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	826 u->host.data = host;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	827
3268 c6a40c815d45 use sin6_addr.s6_addr instead of "(u_char ) & .sin6_addr" Igor Sysoev <igor@sysoev.ru>* parents: 3267 diff changeset	828 if (ngx_inet6_addr(host, len, sin6->sin6_addr.s6_addr) != NGX_OK) {
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	829 u->err = "invalid IPv6 address";
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	830 return NGX_ERROR;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	831 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	832
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	833 if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	834 u->wildcard = 1;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	835 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	836
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	837 u->family = AF_INET6;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	838
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	839 if (u->no_resolve) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	840 return NGX_OK;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	841 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	842
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	843 if (u->no_port) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	844 u->port = u->default_port;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	845 sin6->sin6_port = htons(u->default_port);
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	846 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	847
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	848 return NGX_OK;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	849
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	850 #else
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	851
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	852 u->err = "the INET6 sockets are not supported on this platform";
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	853
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	854 return NGX_ERROR;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	855
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	856 #endif
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	857 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	858
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	859
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	860 ngx_int_t
1559 fe11e2a3946d use pool instead of ngx_conf_t Igor Sysoev <igor@sysoev.ru> parents: 1380 diff changeset	861 ngx_inet_resolve_host(ngx_pool_t pool, ngx_url_t u)
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	862 {
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 892 diff changeset	863 u_char p, host;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	864 size_t len;
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	865 in_port_t port;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	866 in_addr_t in_addr;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	867 ngx_uint_t i;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	868 struct hostent *h;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	869 struct sockaddr_in *sin;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	870
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	871 /* AF_INET only */
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	872
2517 095f28fc0c4a fix upstream port, introduced in r2513 Igor Sysoev <igor@sysoev.ru> parents: 2512 diff changeset	873 port = htons(u->port);
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	874
3267 fb4f7605505f replace inet_addr() with ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 3266 diff changeset	875 in_addr = ngx_inet_addr(u->host.data, u->host.len);
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	876
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	877 if (in_addr == INADDR_NONE) {
3267 fb4f7605505f replace inet_addr() with ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 3266 diff changeset	878 host = ngx_alloc(u->host.len + 1, pool->log);
fb4f7605505f replace inet_addr() with ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 3266 diff changeset	879 if (host == NULL) {
fb4f7605505f replace inet_addr() with ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 3266 diff changeset	880 return NGX_ERROR;
fb4f7605505f replace inet_addr() with ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 3266 diff changeset	881 }
fb4f7605505f replace inet_addr() with ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 3266 diff changeset	882
fb4f7605505f replace inet_addr() with ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 3266 diff changeset	883 (void) ngx_cpystrn(host, u->host.data, u->host.len + 1);
fb4f7605505f replace inet_addr() with ngx_inet_addr() Igor Sysoev <igor@sysoev.ru> parents: 3266 diff changeset	884
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	885 h = gethostbyname((char *) host);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	886
1559 fe11e2a3946d use pool instead of ngx_conf_t Igor Sysoev <igor@sysoev.ru> parents: 1380 diff changeset	887 ngx_free(host);
fe11e2a3946d use pool instead of ngx_conf_t Igor Sysoev <igor@sysoev.ru> parents: 1380 diff changeset	888
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	889 if (h == NULL \|\| h->h_addr_list[0] == NULL) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	890 u->err = "host not found";
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	891 return NGX_ERROR;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	892 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	893
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	894 if (u->one_addr == 0) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	895 for (i = 0; h->h_addr_list[i] != NULL; i++) { /* void */ }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	896
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	897 } else {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	898 i = 1;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	899 }
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	900
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	901 /* MP: ngx_shared_palloc() */
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	902
3269 f0d596e84634 rename ngx_peer_addr_t to ngx_addr_t Igor Sysoev <igor@sysoev.ru> parents: 3268 diff changeset	903 u->addrs = ngx_pcalloc(pool, i * sizeof(ngx_addr_t));
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	904 if (u->addrs == NULL) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	905 return NGX_ERROR;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	906 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	907
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	908 u->naddrs = i;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	909
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	910 for (i = 0; h->h_addr_list[i] != NULL; i++) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	911
1559 fe11e2a3946d use pool instead of ngx_conf_t Igor Sysoev <igor@sysoev.ru> parents: 1380 diff changeset	912 sin = ngx_pcalloc(pool, sizeof(struct sockaddr_in));
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	913 if (sin == NULL) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	914 return NGX_ERROR;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	915 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	916
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	917 sin->sin_family = AF_INET;
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	918 sin->sin_port = port;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	919 sin->sin_addr.s_addr = (in_addr_t ) (h->h_addr_list[i]);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	920
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	921 u->addrs[i].sockaddr = (struct sockaddr *) sin;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	922 u->addrs[i].socklen = sizeof(struct sockaddr_in);
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	923
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	924 len = NGX_INET_ADDRSTRLEN + sizeof(":65535") - 1;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	925
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1862 diff changeset	926 p = ngx_pnalloc(pool, len);
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 892 diff changeset	927 if (p == NULL) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	928 return NGX_ERROR;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	929 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	930
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	931 len = ngx_sock_ntop((struct sockaddr *) sin, p, len, 1);
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	932
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	933 u->addrs[i].name.len = len;
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 892 diff changeset	934 u->addrs[i].name.data = p;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	935 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	936
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	937 } else {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	938
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	939 /* MP: ngx_shared_palloc() */
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	940
3269 f0d596e84634 rename ngx_peer_addr_t to ngx_addr_t Igor Sysoev <igor@sysoev.ru> parents: 3268 diff changeset	941 u->addrs = ngx_pcalloc(pool, sizeof(ngx_addr_t));
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	942 if (u->addrs == NULL) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	943 return NGX_ERROR;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	944 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	945
1559 fe11e2a3946d use pool instead of ngx_conf_t Igor Sysoev <igor@sysoev.ru> parents: 1380 diff changeset	946 sin = ngx_pcalloc(pool, sizeof(struct sockaddr_in));
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	947 if (sin == NULL) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	948 return NGX_ERROR;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	949 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	950
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	951 u->naddrs = 1;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	952
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	953 sin->sin_family = AF_INET;
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	954 sin->sin_port = port;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	955 sin->sin_addr.s_addr = in_addr;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	956
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	957 u->addrs[0].sockaddr = (struct sockaddr *) sin;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	958 u->addrs[0].socklen = sizeof(struct sockaddr_in);
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	959
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	960 p = ngx_pnalloc(pool, u->host.len + sizeof(":65535") - 1);
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 892 diff changeset	961 if (p == NULL) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	962 return NGX_ERROR;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	963 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	964
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	965 u->addrs[0].name.len = ngx_sprintf(p, "%V:%d",
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2301 diff changeset	966 &u->host, ntohs(port)) - p;
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 892 diff changeset	967 u->addrs[0].name.data = p;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	968 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	969
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 808 diff changeset	970 return NGX_OK;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 631 diff changeset	971 }

Mercurial > hg > nginx

annotate src/core/ngx_inet.c @ 3272:98f49b2bcae8