tAdd ipv6-, tcp- and proxy-mode to config.def.h - ratox - FIFO based tox client
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit 318a23146680384cd2012c1dd4151bdcb2f4f430
DIR parent bd272e9943127ed846c9496bee2469d247a7fe18
HTML Author: FRIGN <dev@frign.de>
Date: Tue, 23 Dec 2014 23:17:21 +0100
Add ipv6-, tcp- and proxy-mode to config.def.h
There's no reason to prevent the user from setting this stuff at
compile time.
Diffstat:
M config.def.h | 11 +++++++----
M ratox.c | 17 +++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
---
DIR diff --git a/config.def.h b/config.def.h
t@@ -9,11 +9,14 @@
/* Maximum number of simultaneous calls */
#define MAXCALLS 8
-static char *savefile = ".ratox.tox";
-static int encryptsavefile = 0;
+static char *savefile = ".ratox.tox";
+static int encryptsavefile = 0;
-static char proxyaddr[] = "localhost";
-static uint16_t proxyport = 8080;
+static int ipv6 = 0;
+static int tcp = 0;
+static int proxy = 0;
+static char proxyaddr[] = "localhost";
+static uint16_t proxyport = 8080;
static struct node nodes[] = {
{
DIR diff --git a/ratox.c b/ratox.c
t@@ -173,10 +173,6 @@ static ToxAv *toxav;
static ToxAvCSettings toxavconfig;
static int framesize;
-static int ipv6;
-static int tcpflag;
-static int proxyflag;
-
static uint8_t *passphrase;
static uint32_t pplen;
t@@ -1187,10 +1183,10 @@ static int
toxinit(void)
{
toxopt.ipv6enabled = ipv6;
- toxopt.udp_disabled = tcpflag;
- if (proxyflag) {
- tcpflag = 1;
- toxopt.udp_disabled = tcpflag;
+ toxopt.udp_disabled = tcp;
+ if (proxy) {
+ tcp = 1;
+ toxopt.udp_disabled = tcp;
logmsg("Net > Forcing TCP mode\n");
snprintf(toxopt.proxy_address, sizeof(toxopt.proxy_address),
"%s", proxyaddr);
t@@ -1961,6 +1957,7 @@ main(int argc, char *argv[])
{
ARGBEGIN {
case '4':
+ ipv6 = 0;
break;
case '6':
ipv6 = 1;
t@@ -1972,10 +1969,10 @@ main(int argc, char *argv[])
encryptsavefile = 0;
break;
case 't':
- tcpflag = 1;
+ tcp = 1;
break;
case 'p':
- proxyflag = 1;
+ proxy = 1;
break;
default:
usage();