bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make upstream works properly when IP/mask is specified

Browse Source 
closes #83
This commit is contained in:
kikuchan 2018-03-30 02:31:41 +09:00
parent 0aad2f5b92
commit 6264c048f8
1 changed files with 49 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/upstream.c
View File

@ -43,6 +43,45 @@ proxy_type_name(proxy_type type)
}
}
/**
* Parse and process a netmask format (IP/mask), otherwise treat as a domain
*/
static int upstream_handle_netmask_or_domain(struct upstream *up, const char *domain)
{
char *ptr;
char *domain_work;
domain_work = safestrdup (domain);
ptr = strchr (domain_work, '/');
if (ptr) {
struct in_addr addrstruct;
*ptr = '\0';
if (inet_aton (domain_work, &addrstruct) != 0) {
up->ip = ntohl (addrstruct.s_addr);
*ptr++ = '/';
if (strchr (ptr, '.')) {
if (inet_aton (ptr, &addrstruct) != 0)
up->mask =
ntohl (addrstruct.s_addr);
} else {
up->mask =
~((1 << (32 - atoi (ptr))) - 1);
}
} else {
return 0;
}
safefree (domain_work);
} else {
up->domain = domain_work;
}
return 1;
}
/**
* Construct an upstream struct from input data.
*/
@ -50,7 +89,6 @@ static struct upstream *upstream_build (const char *host, int port, const char *
const char *user, const char *pass,
proxy_type type)
{
char *ptr;
struct upstream *up;
up = (struct upstream *) safemalloc (sizeof (struct upstream));
@ -99,26 +137,10 @@ static struct upstream *upstream_build (const char *host, int port, const char *
goto fail;
}
ptr = strchr (domain, '/');
if (ptr) {
struct in_addr addrstruct;
*ptr = '\0';
if (inet_aton (domain, &addrstruct) != 0) {
up->ip = ntohl (addrstruct.s_addr);
*ptr++ = '/';
if (strchr (ptr, '.')) {
if (inet_aton (ptr, &addrstruct) != 0)
up->mask =
ntohl (addrstruct.s_addr);
} else {
up->mask =
~((1 << (32 - atoi (ptr))) - 1);
}
}
} else {
up->domain = safestrdup (domain);
if (!upstream_handle_netmask_or_domain(up, domain)) {
log_message (LOG_WARNING,
"Nonsense no-upstream rule: invalid domain");
goto fail;
}
log_message (LOG_INFO, "Added no-upstream for %s", domain);
@ -132,7 +154,12 @@ static struct upstream *upstream_build (const char *host, int port, const char *
up->host = safestrdup (host);
up->port = port;
up->domain = safestrdup (domain);
if (!upstream_handle_netmask_or_domain(up, domain)) {
log_message (LOG_WARNING,
"Nonsense upstream rule: invalid domain");
goto fail;
}
log_message (LOG_INFO, "Added upstream %s %s:%d for %s",
proxy_type_name(type), host, port, domain);