diff options
| author | rofl0r <retnyg@gmx.net> | 2018-02-25 15:53:43 +0000 |
|---|---|---|
| committer | rofl0r <rofl0r@users.noreply.github.com> | 2018-02-25 23:52:23 +0000 |
| commit | 39132b978707fc284199b2b947af6c8c846cade8 (patch) | |
| tree | 664e9dd1f292b647116d987a78c875ab689435b3 /src/upstream.c | |
| parent | 86632a91eb65d6b3df7bcdaebef3e1ea4e3a568a (diff) | |
rename members of proxy_type enum to have a common prefix
and add a NONE member.
Diffstat (limited to 'src/upstream.c')
| -rw-r--r-- | src/upstream.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/upstream.c b/src/upstream.c index 03a6b8e..0c6b14e 100644 --- a/src/upstream.c +++ b/src/upstream.c @@ -35,9 +35,10 @@ const char * proxy_type_name(proxy_type type) { switch(type) { - case HTTP_TYPE: return "http"; - case SOCKS4_TYPE: return "socks4"; - case SOCKS5_TYPE: return "socks5"; + case PT_NONE: return "none"; + case PT_HTTP: return "http"; + case PT_SOCKS4: return "socks4"; + case PT_SOCKS5: return "socks5"; default: return "unknown"; } } @@ -63,7 +64,7 @@ static struct upstream *upstream_build (const char *host, int port, const char * up->host = up->domain = up->ua.user = up->pass = NULL; up->ip = up->mask = 0; if (user) { - if (type == HTTP_TYPE) { + if (type == PT_HTTP) { char b[BASE64ENC_BYTES((256+2)-1) + 1]; ssize_t ret; ret = basicauth_string(user, pass, b, sizeof b); |