nginx: src/core/ngx_inet.c comparison

comparison src/core/ngx_inet.c @ 2203:8e5bf1bc87e2

*) refactor ngx_parse_inet_url() *) refactor ngx_parse_unix_domain_url() *) delete unused ngx_url_t fields

author	Igor Sysoev <igor@sysoev.ru>
date	Tue, 26 Aug 2008 14:24:14 +0000
parents	2300ab9b069e
children	6ea36910aa57

comparison

equal deleted inserted replaced

-:2300ab9b069e
+:8e5bf1bc87e2
 static ngx_int_t
 ngx_parse_unix_domain_url(ngx_pool_t *pool, ngx_url_t *u)
 {
 #if (NGX_HAVE_UNIX_DOMAIN)
-u_char              *p;
+u_char              *path, *uri, *last;
 size_t               len;
-ngx_uint_t           i;
 struct sockaddr_un  *saun;
 len = u->url.len;
-p = u->url.data;
+path = u->url.data;
-p += 5;
+path += 5;
 len -= 5;
-u->uri.len = len;
-u->uri.data = p;
 if (u->uri_part) {
-for (i = 0; i < len; i++) {
+last = path + len;
-if (p[i] == ':') {
+uri = ngx_strlchr(path, last, ':');
-len = i;
+if (uri) {
-u->uri.len -= len + 1;
+len = uri - path;
-u->uri.data += len + 1;
+uri++;
+u->uri.len = last - uri;
-break;
+u->uri.data = uri;
-}
 }
 }
 if (len == 0) {
 u->err = "no path in the unix domain socket";
 return NGX_ERROR;
 }
-if (len + 1 > sizeof(saun->sun_path)) {
+u->host.len = len++;
+u->host.data = path;
+u->family = AF_UNIX;
+if (len > sizeof(saun->sun_path)) {
 u->err = "too long path in the unix domain socket";
 return NGX_ERROR;
 }
 u->addrs = ngx_pcalloc(pool, sizeof(ngx_peer_addr_t));
 }
 u->naddrs = 1;
 saun->sun_family = AF_UNIX;
-(void) ngx_cpystrn((u_char *) saun->sun_path, p, len + 1);
+(void) ngx_cpystrn((u_char *) saun->sun_path, path, len);
 u->addrs[0].sockaddr = (struct sockaddr *) saun;
 u->addrs[0].socklen = sizeof(struct sockaddr_un);
-u->addrs[0].name.len = len + 5;
+u->addrs[0].name.len = len + 4;
 u->addrs[0].name.data = u->url.data;
-u->host.len = len;
-u->host.data = p;
-u->unix_socket = 1;
 return NGX_OK;
 #else
 static ngx_int_t
 ngx_parse_inet_url(ngx_pool_t *pool, ngx_url_t *u)
 {
-u_char          *p, *host, *port_start;
+u_char          *p, *host, *port, *last, *uri;
-size_t           len, port_len;
+size_t           len;
-ngx_int_t        port;
+ngx_int_t        n;
-ngx_uint_t       i;
 struct hostent  *h;
-len = u->url.len;
+host = u->url.data;
-p = u->url.data;
+last = host + u->url.len;
-u->host.data = p;
+port = ngx_strlchr(host, last, ':');
-port_start = NULL;
-port_len = 0;
+uri = ngx_strlchr(port ? port : host, last, '/');
-for (i = 0; i < len; i++) {
+if (uri) {
+if (u->listen || !u->uri_part) {
-if (p[i] == ':') {
+u->err = "invalid host";
-port_start = &p[i + 1];
+return NGX_ERROR;
-u->host.len = i;
+}
-if (!u->uri_part) {
+u->uri.len = last - uri;
-port_len = len - (i + 1);
+u->uri.data = uri;
-break;
+last = uri;
+}
+if (port) {
+port++;
+if (last - port == 0) {
+u->err = "invalid port";
+return NGX_ERROR;
+}
+u->port_text.len = last - port;
+u->port_text.data = port;
+last = port - 1;
+} else {
+if (uri == NULL) {
+if (u->listen) {
+/* test value as port only */
+n = ngx_atoi(host, last - host);
+if (n != NGX_ERROR) {
+if (n < 1 || n > 65536) {
+u->err = "invalid port";
+return NGX_ERROR;
+}
+u->port = (in_port_t) n;
+u->port_text.len = last - host;
+u->port_text.data = host;
+return NGX_OK;
+}
 }
 }
-if (p[i] == '/') {
+u->no_port = 1;
-u->uri.len = len - i;
+}
-u->uri.data = &p[i];
+len = last - host;
-if (u->host.len == 0) {
-u->host.len = i;
+if (len == 0) {
-}
+u->err = "no host";
+return NGX_ERROR;
-if (port_start == NULL) {
+}
-u->no_port = 1;
-goto no_port;
+if (len == 1 && *host == '*') {
-}
+len = 0;
+}
-port_len = &p[i] - port_start;
+u->host.len = len;
-if (port_len == 0) {
+u->host.data = host;
-u->err = "invalid port";
+if (len++) {
+p = ngx_alloc(len, pool->log);
+if (p == NULL) {
+return NGX_ERROR;
+}
+(void) ngx_cpystrn(p, host, len);
+u->addr.in_addr = inet_addr((const char *) p);
+if (u->addr.in_addr == INADDR_NONE) {
+h = gethostbyname((const char *) p);
+if (h == NULL || h->h_addr_list[0] == NULL) {
+ngx_free(p);
+u->err = "host not found";
 return NGX_ERROR;
 }
-break;
+u->addr.in_addr = *(in_addr_t *) (h->h_addr_list[0]);
 }
-}
+ngx_free(p);
-if (port_start) {
+} else {
-if (port_len == 0) {
+u->addr.in_addr = INADDR_ANY;
-port_len = &p[i] - port_start;
+}
-if (port_len == 0) {
+if (u->port_text.len) {
-u->err = "invalid port";
-return NGX_ERROR;
+n = ngx_atoi(u->port_text.data, u->port_text.len);
-}
-}
+if (n < 1 || n > 65536) {
-port = ngx_atoi(port_start, port_len);
-if (port == NGX_ERROR || port < 1 || port > 65536) {
 u->err = "invalid port";
 return NGX_ERROR;
 }
-u->port_text.len = port_len;
+u->port = (in_port_t) n;
-u->port_text.data = port_start;
+}
-} else {
+u->family = AF_INET;
-port = ngx_atoi(p, len);
-if (port == NGX_ERROR) {
-u->host.len = len;
-u->no_port = 1;
-goto no_port;
-}
-u->wildcard = 1;
-}
-u->port = (in_port_t) port;
-no_port:
-if (u->listen) {
-if (u->port == 0) {
-if (u->default_port == 0) {
-u->err = "no port";
-return NGX_ERROR;
-}
-u->port = u->default_port;
-}
-if (u->host.len == 1 && u->host.data[0] == '*') {
-u->host.len = 0;
-}
-/* AF_INET only */
-if (u->host.len) {
-host = ngx_alloc(u->host.len + 1, pool->log);
-if (host == NULL) {
-return NGX_ERROR;
-}
-(void) ngx_cpystrn(host, u->host.data, u->host.len + 1);
-u->addr.in_addr = inet_addr((const char *) host);
-if (u->addr.in_addr == INADDR_NONE) {
-h = gethostbyname((const char *) host);
-if (h == NULL || h->h_addr_list[0] == NULL) {
-ngx_free(host);
-u->err = "host not found";
-return NGX_ERROR;
-}
-u->addr.in_addr = *(in_addr_t *) (h->h_addr_list[0]);
-}
-ngx_free(host);
-} else {
-u->addr.in_addr = INADDR_ANY;
-}
-return NGX_OK;
-}
-if (u->host.len == 0) {
-u->err = "no host";
-return NGX_ERROR;
-}
 if (u->no_resolve) {
 return NGX_OK;
 }
 if (u->no_port) {
 u->port = u->default_port;
 }
-if (u->port == 0) {
+if (u->listen) {
-u->err = "no port";
+return NGX_OK;
-return NGX_ERROR;
 }
 if (ngx_inet_resolve_host(pool, u) != NGX_OK) {
 return NGX_ERROR;
 }

Mercurial > hg > nginx

comparison src/core/ngx_inet.c @ 2203:8e5bf1bc87e2