From 384067fc69a35126f6418ba219cadc925223c9b8 Mon Sep 17 00:00:00 2001 From: FRIGN Date: Tue, 6 Jan 2015 22:38:12 +0100 Subject: Implement proxy functionality as desired Now we support both HTTP and SOCKS5 proxies. While at it, get rid of the outdated usage string and just establish the fact we have a bloody manpage for explanations. --- config.def.h | 1 + ratox.1 | 2 +- ratox.c | 10 ++-------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/config.def.h b/config.def.h index 9dd605b..a1498f3 100644 --- a/config.def.h +++ b/config.def.h @@ -15,6 +15,7 @@ static int encryptsavefile = 0; static int ipv6 = 0; static int tcp = 0; static int proxy = 0; +static int proxytype = 2; /* 1 = HTTP, 2 = SOCKS5 */ static char proxyaddr[] = "localhost"; static uint16_t proxyport = 8080; diff --git a/ratox.1 b/ratox.1 index 0490bfa..ec40805 100644 --- a/ratox.1 +++ b/ratox.1 @@ -25,7 +25,7 @@ Enable/Disable save file encryption. Enable/Disable TCP mode. Avoiding UDP in tox implies certain security considerations. .It Fl P p -Enable/Disable TCP SOCKS5 proxy as specified in \fIconfig.h\fR. +Enable/Disable TCP HTTP/SOCKS5 proxy as specified in \fIconfig.h\fR. .It Ar savefile Path of the file to load a profile from or create a new one in. .El diff --git a/ratox.c b/ratox.c index cc06c4e..487000a 100644 --- a/ratox.c +++ b/ratox.c @@ -1191,7 +1191,7 @@ toxinit(void) snprintf(toxopt.proxy_address, sizeof(toxopt.proxy_address), "%s", proxyaddr); toxopt.proxy_port = proxyport; - toxopt.proxy_type = 1; + toxopt.proxy_type = proxytype; logmsg("Net > Using proxy %s:%hu\n", proxyaddr, proxyport); } @@ -1943,13 +1943,7 @@ shutdown(void) static void usage(void) { - eprintf("usage: %s [-4|-6] [-E|-e] [-tp] [savefile]\n" - " -4\tIPv4 only\n" - " -6\tIPv6 only\n" - " -E\tEnable save file encryption\n" - " -e\tDisable save file encryption\n" - " -t\tEnable TCP mode (UDP by default)\n" - " -p\tEnable TCP socks5 proxy\n", argv0); + eprintf("usage: %s [-4|-6] [-E|-e] [-T|-t] [-P|-p] [savefile]\n", argv0); } int -- cgit v1.2.3