From 2ba3237be67e28efc0cec56e2b5779c9e50ae496 Mon Sep 17 00:00:00 2001
From: Tom Early <n7tae@tearly.net>
Date: Thu, 26 Apr 2018 19:51:48 -0700
Subject: [PATCH] modem port, not gateway!

---
 QnetVoice.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/QnetVoice.cpp b/QnetVoice.cpp
index 93396fe..dde551d 100644
--- a/QnetVoice.cpp
+++ b/QnetVoice.cpp
@@ -46,7 +46,7 @@ struct sockaddr_in toDst;
 FILE *fp = NULL;
 time_t tNow = 0;
 short streamid_raw = 0;
-bool isdefined[3] = { false, false, false };
+int moduleport[3] = { 0, 0, 0 };
 std::string REPEATER, IP_ADDRESS;
 int PORT, PLAY_WAIT, PLAY_DELAY;
 
@@ -199,10 +199,10 @@ bool read_config(const char *cfgFile)
 				printf("module type '%s' is invalid\n", type.c_str());
 				return true;
 			}
-			isdefined[m] = true;
+			get_value(cfg, std::string(path+".port").c_str(), moduleport[m], 1000, 65535, 1998+m);
 		}
 	}
-	if (false==isdefined[0] && false==isdefined[1] && false==isdefined[2]) {
+	if (0==moduleport[0] && 0==moduleport[1] && 0==moduleport[2]) {
 		printf("No repeaters defined!\n");
 		return true;
 	}
@@ -210,8 +210,6 @@ bool read_config(const char *cfgFile)
 	if (! get_value(cfg, "gateway.internal.ip", IP_ADDRESS, 7, 15, "127.0.0.1"))
 		return true;
 
-	get_value(cfg, "gateway.internal.port", PORT, 16000, 65535, 19000);
-
 	get_value(cfg, "timing.play.wait", PLAY_WAIT, 1, 10, 2);
 
 	get_value(cfg, "timing.play.delay", PLAY_DELAY, 9, 25, 19);
@@ -264,6 +262,12 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
+	PORT = moduleport[module - 'A'];
+	if (0 == PORT) {
+		printf("module %c has no port defined!\n", module);
+		return 1;
+	}
+
 	if (strlen(argv[2]) > 8) {
 		printf("MYCALL can not be more than 8 characters, %s is invalid\n", argv[2]);
 		return 1;