nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Shorten hidden service port config parsing; fix bug 174

Browse Source 
svn:r4725
This commit is contained in:
Nick Mathewson 2005-08-06 21:35:04 +00:00
parent b9a7482c02
commit 999b7951c3
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/or/rendservice.c
View File

@ -137,51 +137,55 @@ add_service(rend_service_t *service)
static rend_service_port_config_t * static rend_service_port_config_t *
parse_port_config(const char *string) parse_port_config(const char *string)
{ {
smartlist_t *sl;
int virtport; int virtport;
int realport; int realport;
uint16_t p; uint16_t p;
uint32_t addr; uint32_t addr;
char *endptr; const char *addrport;
rend_service_port_config_t *result; rend_service_port_config_t *result = NULL;
virtport = (int) strtol(string, &endptr, 10); sl = smartlist_create();
if (endptr == string) { smartlist_split_string(sl, string, " ", SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
log_fn(LOG_WARN, "Missing port in hidden service port configuration"); if (smartlist_len(sl) < 1 || smartlist_len(sl) > 2) {
return NULL; log_fn(LOG_WARN, "Bad syntax in hidden service port configuration");
goto err;
} }
virtport = atoi(smartlist_get(sl,0));
if (virtport < 1 || virtport > 65535) { if (virtport < 1 || virtport > 65535) {
log_fn(LOG_WARN, "Port out of range in hidden service port configuration"); log_fn(LOG_WARN, "Missing or invalid port in hidden service port configuration");
return NULL; goto err;
} }
string = endptr + strspn(endptr, " \t");
if (!*string) { if (smartlist_len(sl) == 1) {
/* No addr:port part; use default. */ /* No addr:port part; use default. */
realport = virtport; realport = virtport;
addr = 0x7F000001u; /* 127.0.0.1 */ addr = 0x7F000001u; /* 127.0.0.1 */
} else if (strchr(string, ':') || strchr(string, '.')) {
if (parse_addr_port(string, NULL, &addr, &p)<0) {
log_fn(LOG_WARN,"Unparseable address in hidden service port configuration");
return NULL;
}
realport = p?p:virtport;
} else { } else {
/* No addr:port, no addr -- must be port. */ addrport = smartlist_get(sl,1);
realport = strtol(string, &endptr, 10); if (strchr(addrport, ':') || strchr(addrport, '.')) {
if (*endptr) { if (parse_addr_port(addrport, NULL, &addr, &p)<0) {
log_fn(LOG_WARN, "Unparseable or missing port in hidden service port configuration."); log_fn(LOG_WARN,"Unparseable address in hidden service port configuration");
return NULL; goto err;
}
realport = p?p:virtport;
} else {
/* No addr:port, no addr -- must be port. */
realport = atoi(addrport);
if (realport < 1 || realport > 65535)
goto err;
addr = 0x7F000001u; /* Default to 127.0.0.1 */
} }
if (realport < 1 || realport > 65535) {
log_fn(LOG_WARN, "Port out of range");
return NULL;
}
addr = 0x7F000001u; /* Default to 127.0.0.1 */
} }
result = tor_malloc(sizeof(rend_service_port_config_t)); result = tor_malloc(sizeof(rend_service_port_config_t));
result->virtual_port = virtport; result->virtual_port = virtport;
result->real_port = realport; result->real_port = realport;
result->real_address = addr; result->real_address = addr;
err:
SMARTLIST_FOREACH(sl, char *, c, tor_free(c));
smartlist_free(sl);
return result; return result;
} }