From 318a23146680384cd2012c1dd4151bdcb2f4f430 Mon Sep 17 00:00:00 2001
From: FRIGN <dev@frign.de>
Date: Tue, 23 Dec 2014 23:17:21 +0100
Subject: 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.
---
 ratox.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'ratox.c')

diff --git a/ratox.c b/ratox.c
index 35ca4f0..7149ad9 100644
--- a/ratox.c
+++ b/ratox.c
@@ -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;
 
@@ -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);
@@ -1961,6 +1957,7 @@ main(int argc, char *argv[])
 {
 	ARGBEGIN {
 	case '4':
+		ipv6 = 0;
 		break;
 	case '6':
 		ipv6 = 1;
@@ -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();
-- 
cgit v1.2.3