diff --git a/ConfigureBase.cpp b/ConfigureBase.cpp
new file mode 100644
index 0000000..7583bb2
--- /dev/null
+++ b/ConfigureBase.cpp
@@ -0,0 +1,244 @@
+/*
+ *   Copyright (C) 2019 by Thomas A. Early N7TAE
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <cstdio>
+#include <cstring>
+#include "ConfigureBase.h"
+
+CConfigureBase::CConfigureBase()
+{
+}
+
+CConfigureBase::~CConfigureBase()
+{
+	defaults.empty();
+}
+
+char *CConfigureBase::Trim(char *s)
+{
+	size_t len = strlen(s);
+	while (len && isspace(s[len-1]))
+		s[--len] = '\0';
+	while (*s && len && isspace(*s))
+		len = strlen(++s);
+	return s;
+}
+
+bool CConfigureBase::ReadConfigFile(const char *configfile, std::map<std::string, std::string> &amap)
+{
+	FILE *fp = fopen(configfile, "r");
+	if (fp) {
+		char line[128];
+		if (fgets(line, 128, fp)) {
+			char *key = strtok(line, "=");
+			key = Trim(key);
+			if (strlen(key) && '#' != *key) {
+				char *val = strtok(NULL, "\r\n");
+				char *val2 = Trim(val);
+				if ('\'' ==  *val2)
+					val = strtok(val2, "'");
+				else
+					val = strtok(val2, "# \t");
+				amap[key] = val;
+			}
+		}
+		fclose(fp);
+		return false;
+	}
+	fprintf(stderr, "could not open file %s\n", configfile);
+	return true;
+}
+
+bool CConfigureBase::Initialize(const char *file)
+{
+	std::string filename(CFG_DIR);
+	filename.append("/qndefaults");
+	if (ReadConfigFile(filename.c_str(), defaults))
+		return true;
+	return ReadConfigFile(file, cfg);
+}
+
+bool CConfigureBase::GetDefaultBool(const std::string &path, const std::string &mod, bool &dvalue)
+{
+	std::string value;
+	if (GetDefaultString(path, mod, value))
+		return true;	// No default value defined!
+	if ('0'==value.at(0) || 'f'==value.at(0) || 'F'==value.at(0))
+		dvalue = false;
+	else if ('1'==value.at(0) || 't'==value.at(0) || 'T'==value.at(0))
+		dvalue = true;
+	else {
+		fprintf(stderr, "%s=%s doesn't seem to be a boolean!\n", path.c_str(), value.c_str());
+		return true;
+	}
+	return false;
+}
+
+bool CConfigureBase::GetDefaultDouble(const std::string &path, const std::string &mod, double &dvalue)
+{
+	std::string value;
+	if (GetDefaultString(path, mod, value))
+		return true;	// No default value defined!
+	dvalue = std::stod(value);
+	return false;
+}
+
+bool CConfigureBase::GetDefaultInt(const std::string &path, const std::string &mod, int &dvalue)
+{
+	std::string value;
+	if (GetDefaultString(path, mod, value))
+		return true;	// No default value defined!
+	dvalue = std::stoi(value);
+	return false;
+}
+
+bool CConfigureBase::GetDefaultString(const std::string &path, const std::string &mod, std::string &dvalue)
+{
+	std::string search, search_again;
+	if (mod.empty()) {
+		search = path + "_d";	// there is no mod, so this is a simple search
+	} else {
+		search_again = mod;		// we're looking from a module value. We may have to look for non-generic module parameters
+		if (0==path.compare(0, 7, "module_") && ('a'==path.at(7) || 'b'==path.at(7) || 'c'==path.at(7)) && '_'==path.at(8)) {
+			// path begins with module_{a|b|c}_
+			if (0==mod.compare("dvrptr") || 0==mod.compare("dvap") || 0==mod.compare("mmdvm") || 0==mod.compare("itap")) {
+				// and the module is recognized
+				search = path;
+				search.replace(7, 1, 1, 'x');
+				search_again += path.substr(8);	// now the search_again path might look like dvap_frequency, for example.
+			} else {
+				fprintf(stderr, "Unrecognized module type = '%s'\n", mod.c_str());
+				return true;
+			}
+		} else {
+			fprintf(stderr, "%s looks like an ilformed request from module '%s'\n", path.c_str(), mod.c_str());
+			return true;
+		}
+	}
+	auto it = defaults.find(search);
+	if (defaults.end() == it) {
+		it = defaults.find(search_again);
+		if (defaults.end() == it) {
+			fprintf(stderr, "%s has no default value!\n", path.c_str());
+			return true;
+		}
+	}
+	dvalue = it->second;
+	return false;
+}
+
+bool CConfigureBase::GetValue(const std::string &path, const std::string &mod, bool &value)
+{
+	auto it = cfg.find(path);
+	if (cfg.end() == it) {
+		bool dvalue;
+		if (GetDefaultBool(path, mod, dvalue)) {
+			fprintf(stderr, "%s not found in either the cfg file or the defaults file!\n", path.c_str());
+			return true;
+		}
+		value = dvalue;	// found a value in the defaults
+	} else {	// found a value in the cfg file
+		char c = it->second.at(0);
+		if ('0'==c || 'f'==c || 'F'==c)
+			value = false;
+		else if ('1'==c || 't'==c || 'T'==c)
+			value = true;
+		else {
+			fprintf(stderr, "%s=%s doesn't seem to define a boolean\n", path.c_str(), it->second.c_str());
+			return true;
+		}
+	}
+	printf("%s = %s\n", path.c_str(), value ? "true" : "false");
+	return false;
+}
+
+bool CConfigureBase::GetValue(const std::string &path, const std::string &mod, double &value, const double min, const double max)
+{
+	auto it = cfg.find(path);
+	if (cfg.end() == it) {
+		double dvalue;
+		if (GetDefaultDouble(path, mod, dvalue)) {
+			fprintf(stderr, "%s not found in either the cfg file or the defaults file!\n", path.c_str());
+			return true;
+		}
+		if (dvalue < min || dvalue > max) {
+			fprintf(stderr, "Default value %s=%g is out of acceptable range\n", path.c_str(), value);
+			return true;
+		}
+		value = dvalue;
+	} else {
+		value = std::stod(it->second);
+		if (value < min || value > max) {
+			fprintf(stderr, "%s=%g is out of acceptable range\n", path.c_str(), value);
+			return true;
+		}
+	}
+	printf("%s = %g\n", path.c_str(), value);
+	return false;
+}
+
+bool CConfigureBase::GetValue(const std::string &path, const std::string &mod, int &value, const int min, const int max)
+{
+	auto it = cfg.find(path);
+	if (cfg.end() == it) {
+		int dvalue;
+		if (GetDefaultInt(path, mod, dvalue)) {
+			fprintf(stderr, "%s not found in either the cfg file or the defaults file\n", path.c_str());
+			return true;
+		}
+		if (dvalue < min || dvalue > max) {
+			fprintf(stderr, "Default value %s=%d is out of acceptable range\n", path.c_str(), value);
+			return true;
+		}
+		value = dvalue;
+	} else {
+		value = std::stoi(it->second);
+		if (value < min || value > max) {
+			fprintf(stderr, "%s=%s is out of acceptable range\n", path.c_str(), it->second.c_str());
+			return true;
+		}
+	}
+	printf("%s = %d\n", path.c_str(), value);
+	return false;
+}
+
+bool CConfigureBase::GetValue(const std::string &path, const std::string &mod, std::string &value, int min, int max)
+{
+	auto it = cfg.find(path);
+	if (cfg.end() != it) {
+		std::string dvalue;
+		if (GetDefaultString(path, mod, dvalue)) {
+			fprintf(stderr, "%s not found in either the cfg file for the defaults file\n", path.c_str());
+			return true;
+		}
+		int l = dvalue.length();
+		if (l<min || l>max) {
+			printf("Default value %s='%s' is wrong size\n", path.c_str(), value.c_str());
+			return true;
+		}
+	} else {
+		value = it->second;
+		int l = value.length();
+		if (l<min || l>max) {
+			printf("%s='%s' is wrong size\n", path.c_str(), value.c_str());
+			return true;
+		}
+	}
+	printf("%s = '%s'\n", path.c_str(), value.c_str());
+	return false;
+}
diff --git a/ConfigureBase.h b/ConfigureBase.h
new file mode 100644
index 0000000..50861f5
--- /dev/null
+++ b/ConfigureBase.h
@@ -0,0 +1,47 @@
+/*
+ *   Copyright (C) 2019 by Thomas A. Early N7TAE
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#pragma once
+
+#include <string>
+#include <map>
+
+class CConfigureBase {
+public:
+	CConfigureBase();
+	virtual ~CConfigureBase();
+	virtual bool ReadCfgFile() = 0;
+	bool Initialize(const char *configfile);
+
+protected:
+	std::map<std::string, std::string> cfg;
+
+	char *Trim(char *s);
+	bool ReadConfigFile(const char *file, std::map<std::string, std::string> &amap);
+    bool GetValue(const std::string &path, const std::string &mod, bool        &value);
+    bool GetValue(const std::string &path, const std::string &mod, double      &value, const double min, const double max);
+	bool GetValue(const std::string &path, const std::string &mod, int         &value, const int    min, const int    max);
+	bool GetValue(const std::string &path, const std::string &mod, std::string &value, const int    min, const int    max);
+private:
+	std::map<std::string, std::string> defaults;
+
+	bool GetDefaultBool  (const std::string &key, const std::string &mod, bool        &dval);
+    bool GetDefaultDouble(const std::string &key, const std::string &mod, double      &dval);
+    bool GetDefaultInt   (const std::string &key, const std::string &mod, int         &dval);
+    bool GetDefaultString(const std::string &key, const std::string &mod, std::string &dval);
+};
diff --git a/Makefile b/Makefile
index 40aca0f..76c8dc4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 by Thomas A. Early N7TAE
+# Copyright (c) 2018-2019 by Thomas A. Early N7TAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -42,18 +42,13 @@ MDV_PROGRAMS=qngateway qnlink qnremote qnvoice qnrelay
 DVP_PROGRAMS=qngateway qnlink qnremote qnvoice qndvap
 DVR_PROGRAMS=qngateway qnlink qnremote qnvoice qndvrptr
 TAP_PROGRAMS=qngateway qnlink qnremote qnvoice qnitap
-ICM_PROGRAMS=qnigateway qnlink qnremote qnvoice
 
 all    : $(ALL_PROGRAMS)
 mmdvm  : $(MDV_PROGRAMS)
 dvap   : $(DVP_PROGRAMS)
 dvrptr : $(DVR_PROGRAMS)
-icom   : $(ICM_PROGRAMS)
 itap   : $(TAP_PROGRAMS)
 
-qnigateway : $(IRCOBJS) QnetIcomGateway.o aprs.o
-	g++ $(CPPFLAGS) -o qnigateway QnetIcomGateway.o aprs.o $(IRCOBJS) $(LDFLAGS) -pthread
-
 qngateway : $(IRCOBJS) QnetGateway.o aprs.o UnixDgramSocket.o
 	g++ $(CPPFLAGS) -o qngateway QnetGateway.o aprs.o UnixDgramSocket.o $(IRCOBJS) $(LDFLAGS) -pthread
 
@@ -72,8 +67,8 @@ qndvap : QnetDVAP.o DVAPDongle.o Random.o $(DSTROBJS) UnixDgramSocket.o
 qndvrptr : QnetDVRPTR.o $(DSTROBJS) Random.o UnixDgramSocket.o
 	g++ $(CPPFLAGS) -o qndvrptr QnetDVRPTR.o Random.o UnixDgramSocket.o $(DSTROBJS) $(LDFLAGS)
 
-qnremote : QnetRemote.o Random.o
-	g++ $(CPPFLAGS) -o qnremote QnetRemote.o Random.o $(LDFLAGS)
+qnremote : QnetRemote.o Random.o UnixDgramSocket.o ConfigureBase.o
+	g++ $(CPPFLAGS) -o qnremote QnetRemote.o Random.o UnixDgramSocket.o ConfigureBase.o $(LDFLAGS)
 
 qnvoice : QnetVoice.o Random.o
 	g++ $(CPPFLAGS) -o qnvoice QnetVoice.o Random.o $(LDFLAGS)
diff --git a/QnetIcomGateway.cpp b/QnetIcomGateway.cpp
deleted file mode 100644
index 9ab4941..0000000
--- a/QnetIcomGateway.cpp
+++ /dev/null
@@ -1,2984 +0,0 @@
-/*
- *   Copyright (C) 2010 by Scott Lawson KI4LKF
- *   Copyright (C) 2017-2018 by Thomas Early N7TAE
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/* by KI4LKF, N7TAE */
-/*
-   QnetGateway is a dstar G2 gateway, using irc routing
-       adapted from the OpenG2 G2 gateway
-   Version 2.61 or higher will use ONLY the irc mechanism of routing
-     and it will NOT use any local Postgres databases or any TRUST(s)
-*/
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <signal.h>
-#include <errno.h>
-#include <math.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <regex.h>
-
-#include <future>
-#include <exception>
-#include <string>
-#include <thread>
-#include <chrono>
-#include <map>
-
-#include "IRCDDB.h"
-#include "IRCutils.h"
-#include "versions.h"
-#include "QnetIcomGateway.h"
-
-
-extern void dstar_dv_init();
-extern int dstar_dv_decode(const unsigned char *d, int data[3]);
-
-static std::atomic<bool> keep_running(true);
-static std::atomic<unsigned short> G2_COUNTER_OUT(0);
-static unsigned short OLD_REPLY_SEQ = 0;
-static unsigned short NEW_REPLY_SEQ = 0;
-
-/* signal catching function */
-static void sigCatch(int signum)
-{
-	/* do NOT do any serious work here */
-	if ((signum == SIGTERM) || (signum == SIGINT))
-		keep_running = false;
-
-	return;
-}
-
-void CQnetGateway::set_dest_rptr(int mod_ndx, char *dest_rptr)
-{
-	FILE *statusfp = fopen(status_file.c_str(), "r");
-	if (statusfp) {
-		setvbuf(statusfp, (char *)NULL, _IOLBF, 0);
-
-		char statusbuf[1024];
-		while (fgets(statusbuf, 1020, statusfp) != NULL) {
-			char *p = strchr(statusbuf, '\r');
-			if (p)
-				*p = '\0';
-			p = strchr(statusbuf, '\n');
-			if (p)
-				*p = '\0';
-
-			const char *delim = ",";
-			char *saveptr = NULL;
-			char *status_local_mod = strtok_r(statusbuf, delim, &saveptr);
-			char *status_remote_stm = strtok_r(NULL, delim, &saveptr);
-			char *status_remote_mod = strtok_r(NULL, delim, &saveptr);
-
-			if (!status_local_mod || !status_remote_stm || !status_remote_mod)
-				continue;
-
-			if ( ((*status_local_mod == 'A') && (mod_ndx == 0))  ||
-			     ((*status_local_mod == 'B') && (mod_ndx == 1))  ||
-			     ((*status_local_mod == 'C') && (mod_ndx == 2)) ) {
-				strncpy(dest_rptr, status_remote_stm, CALL_SIZE);
-				dest_rptr[7] = *status_remote_mod;
-				dest_rptr[CALL_SIZE] = '\0';
-				break;
-			}
-		}
-		fclose(statusfp);
-	}
-	return;
-}
-
-/* compute checksum */
-void CQnetGateway::calcPFCS(unsigned char *packet, int len)
-{
-	const unsigned short crc_tabccitt[256] = {
-		0x0000,0x1189,0x2312,0x329b,0x4624,0x57ad,0x6536,0x74bf,0x8c48,0x9dc1,0xaf5a,0xbed3,0xca6c,0xdbe5,0xe97e,0xf8f7,
-		0x1081,0x0108,0x3393,0x221a,0x56a5,0x472c,0x75b7,0x643e,0x9cc9,0x8d40,0xbfdb,0xae52,0xdaed,0xcb64,0xf9ff,0xe876,
-		0x2102,0x308b,0x0210,0x1399,0x6726,0x76af,0x4434,0x55bd,0xad4a,0xbcc3,0x8e58,0x9fd1,0xeb6e,0xfae7,0xc87c,0xd9f5,
-		0x3183,0x200a,0x1291,0x0318,0x77a7,0x662e,0x54b5,0x453c,0xbdcb,0xac42,0x9ed9,0x8f50,0xfbef,0xea66,0xd8fd,0xc974,
-		0x4204,0x538d,0x6116,0x709f,0x0420,0x15a9,0x2732,0x36bb,0xce4c,0xdfc5,0xed5e,0xfcd7,0x8868,0x99e1,0xab7a,0xbaf3,
-		0x5285,0x430c,0x7197,0x601e,0x14a1,0x0528,0x37b3,0x263a,0xdecd,0xcf44,0xfddf,0xec56,0x98e9,0x8960,0xbbfb,0xaa72,
-		0x6306,0x728f,0x4014,0x519d,0x2522,0x34ab,0x0630,0x17b9,0xef4e,0xfec7,0xcc5c,0xddd5,0xa96a,0xb8e3,0x8a78,0x9bf1,
-		0x7387,0x620e,0x5095,0x411c,0x35a3,0x242a,0x16b1,0x0738,0xffcf,0xee46,0xdcdd,0xcd54,0xb9eb,0xa862,0x9af9,0x8b70,
-		0x8408,0x9581,0xa71a,0xb693,0xc22c,0xd3a5,0xe13e,0xf0b7,0x0840,0x19c9,0x2b52,0x3adb,0x4e64,0x5fed,0x6d76,0x7cff,
-		0x9489,0x8500,0xb79b,0xa612,0xd2ad,0xc324,0xf1bf,0xe036,0x18c1,0x0948,0x3bd3,0x2a5a,0x5ee5,0x4f6c,0x7df7,0x6c7e,
-		0xa50a,0xb483,0x8618,0x9791,0xe32e,0xf2a7,0xc03c,0xd1b5,0x2942,0x38cb,0x0a50,0x1bd9,0x6f66,0x7eef,0x4c74,0x5dfd,
-		0xb58b,0xa402,0x9699,0x8710,0xf3af,0xe226,0xd0bd,0xc134,0x39c3,0x284a,0x1ad1,0x0b58,0x7fe7,0x6e6e,0x5cf5,0x4d7c,
-		0xc60c,0xd785,0xe51e,0xf497,0x8028,0x91a1,0xa33a,0xb2b3,0x4a44,0x5bcd,0x6956,0x78df,0x0c60,0x1de9,0x2f72,0x3efb,
-		0xd68d,0xc704,0xf59f,0xe416,0x90a9,0x8120,0xb3bb,0xa232,0x5ac5,0x4b4c,0x79d7,0x685e,0x1ce1,0x0d68,0x3ff3,0x2e7a,
-		0xe70e,0xf687,0xc41c,0xd595,0xa12a,0xb0a3,0x8238,0x93b1,0x6b46,0x7acf,0x4854,0x59dd,0x2d62,0x3ceb,0x0e70,0x1ff9,
-		0xf78f,0xe606,0xd49d,0xc514,0xb1ab,0xa022,0x92b9,0x8330,0x7bc7,0x6a4e,0x58d5,0x495c,0x3de3,0x2c6a,0x1ef1,0x0f78
-	};
-	unsigned short crc_dstar_ffff = 0xffff;
-	short int low, high;
-	unsigned short tmp;
-
-	switch (len) {
-		case 56:
-			low = 15;
-			high = 54;
-			break;
-		case 58:
-			low = 17;
-			high = 56;
-			break;
-		default:
-			return;
-	}
-
-	for (unsigned short int i = low; i < high ; i++) {
-		unsigned short short_c = 0x00ff & (unsigned short)packet[i];
-		tmp = (crc_dstar_ffff & 0x00ff) ^ short_c;
-		crc_dstar_ffff = (crc_dstar_ffff >> 8) ^ crc_tabccitt[tmp];
-	}
-	crc_dstar_ffff =  ~crc_dstar_ffff;
-	tmp = crc_dstar_ffff;
-
-	if (len == 56) {
-		packet[54] = (unsigned char)(crc_dstar_ffff & 0xff);
-		packet[55] = (unsigned char)((tmp >> 8) & 0xff);
-	} else {
-		packet[56] = (unsigned char)(crc_dstar_ffff & 0xff);
-		packet[57] = (unsigned char)((tmp >> 8) & 0xff);
-	}
-
-	return;
-}
-
-bool CQnetGateway::get_value(const Config &cfg, const std::string path, int &value, int min, int max, int default_value)
-{
-	if (cfg.lookupValue(path, value)) {
-		if (value < min || value > max)
-			value = default_value;
-	} else
-		value = default_value;
-	printf("%s = [%d]\n", path.c_str(), value);
-	return true;
-}
-
-bool CQnetGateway::get_value(const Config &cfg, const std::string path, double &value, double min, double max, double default_value)
-{
-	if (cfg.lookupValue(path, value)) {
-		if (value < min || value > max)
-			value = default_value;
-	} else
-		value = default_value;
-	printf("%s = [%lg]\n", path.c_str(), value);
-	return true;
-}
-
-bool CQnetGateway::get_value(const Config &cfg, const std::string path, bool &value, bool default_value)
-{
-	if (! cfg.lookupValue(path, value))
-		value = default_value;
-	printf("%s = [%s]\n", path.c_str(), value ? "true" : "false");
-	return true;
-}
-
-bool CQnetGateway::get_value(const Config &cfg, const std::string path, std::string &value, int min, int max, const char *default_value)
-{
-	if (cfg.lookupValue(path, value)) {
-		int l = value.length();
-		if (l<min || l>max) {
-			printf("%s is invalid\n", path.c_str());
-			return false;
-		}
-	} else
-		value = default_value;
-	printf("%s = [%s]\n", path.c_str(), value.c_str());
-	return true;
-}
-
-/* process configuration file */
-bool CQnetGateway::read_config(char *cfgFile)
-{
-	Config cfg;
-
-	printf("Reading file %s\n", cfgFile);
-	// Read the file. If there is an error, report it and exit.
-	try {
-		cfg.readFile(cfgFile);
-	} catch(const FileIOException &fioex) {
-		printf("Can't read %s\n", cfgFile);
-		return true;
-	} catch(const ParseException &pex) {
-		printf("Parse error at %s:%d - %s\n", pex.getFile(), pex.getLine(), pex.getError());
-		return true;
-	}
-	// ircddb
-	std::string path("ircddb.");
-	if (! get_value(cfg, path+"login", owner, 3, CALL_SIZE-2, "UNDEFINED"))
-		return true;
-	if (0 == owner.compare("UNDEFINED")) {
-		fprintf(stderr, "You must specify your lisensed callsign in ircddb.login\n");
-		return true;
-	}
-	OWNER = owner;
-	ToLower(owner);
-	ToUpper(OWNER);
-	printf("OWNER=[%s]\n", OWNER.c_str());
-	OWNER.resize(CALL_SIZE, ' ');
-
-	if (! get_value(cfg, path+"host", ircddb.ip, 3, MAXHOSTNAMELEN, "rr.openquad.net"))
-		return true;
-
-	get_value(cfg, path+"port", ircddb.port, 1000, 65535, 9007);
-
-	if(! get_value(cfg, path+"password", irc_pass, 0, 512, "1111111111111111"))
-		return true;
-
-	// modules
-	bool is_icom = false;
-	bool is_not_icom = false;
-	for (short int m=0; m<3; m++) {
-		std::string path = "module.";
-		path += m + 'a';
-		path += '.';
-		std::string type;
-		if (cfg.lookupValue(std::string(path+".type").c_str(), type)) {
-			printf("%s = [%s]\n", std::string(path+"type").c_str(), type.c_str());
-			rptr.mod[m].defined = true;
-			if (0 == type.compare("icom")) {
-				rptr.mod[m].package_version = ICOM_VERSION;
-				is_icom = true;
-			} else if (0 == type.compare("dvap")) {
-				rptr.mod[m].package_version = DVAP_VERSION;
-				is_not_icom = true;
-			} else if (0 == type.compare("dvrptr")) {
-				rptr.mod[m].package_version = DVRPTR_VERSION;
-				is_not_icom = true;
-			} else if (0 == type.compare("mmdvm")) {
-				rptr.mod[m].package_version = MMDVM_VERSION;
-				is_not_icom = true;
-			} else if (0 == type.compare("itap")) {
-				rptr.mod[m].package_version = ITAP_VERSION;
-				is_not_icom = true;
-			} else {
-				printf("module type '%s' is invalid\n", type.c_str());
-				return true;
-			}
-			if (is_icom && is_not_icom) {
-				printf("cannot define both icom and non-icom modules\n");
-				return true;
-			}
-
-			if (! get_value(cfg, std::string(path+"ip").c_str(), rptr.mod[m].portip.ip, 7, IP_SIZE, is_icom ? "172.16.0.1" : "127.0.0.1"))
-				return true;
-			get_value(cfg, std::string(path+"port").c_str(), rptr.mod[m].portip.port, 16000, 65535, is_icom ? 20000 : 19998+m);
-			get_value(cfg, std::string(path+"frequency").c_str(), rptr.mod[m].frequency, 0.0, 1.0e12, 0.0);
-			get_value(cfg, std::string(path+"offset").c_str(), rptr.mod[m].offset, -1.0e12, 1.0e12, 0.0);
-			get_value(cfg, std::string(path+"range").c_str(), rptr.mod[m].range, 0.0, 1609344.0, 0.0);
-			get_value(cfg, std::string(path+"agl").c_str(), rptr.mod[m].agl, 0.0, 1000.0, 0.0);
-			get_value(cfg, std::string(path+"latitude").c_str(), rptr.mod[m].latitude, -90.0, 90.0, 0.0);
-			get_value(cfg, std::string(path+"longitude").c_str(), rptr.mod[m].longitude, -180.0, 180.0, 0.0);
-			if (! cfg.lookupValue(path+"desc1", rptr.mod[m].desc1))
-				rptr.mod[m].desc1 = "";
-			if (! cfg.lookupValue(path+"desc2", rptr.mod[m].desc2))
-				rptr.mod[m].desc2 = "";
-			if (! get_value(cfg, std::string(path+"url").c_str(), rptr.mod[m].url, 0, 80, "github.com/n7tae/QnetGateway"))
-				return true;
-			// truncate strings
-			if (rptr.mod[m].desc1.length() > 20)
-				rptr.mod[m].desc1.resize(20);
-			if (rptr.mod[m].desc2.length() > 20)
-				rptr.mod[m].desc2.resize(20);
-			// make the long description for the log
-			if (rptr.mod[m].desc1.length())
-				rptr.mod[m].desc = rptr.mod[m].desc1 + ' ';
-			rptr.mod[m].desc += rptr.mod[m].desc2;
-		} else
-			rptr.mod[m].defined = false;
-	}
-	if (! is_icom && ! is_not_icom) {
-		printf("No modules defined!\n");
-		return true;
-	} else if (is_icom) { // make sure all ICOM modules have the same IP and port number
-		std::string addr;
-		int port;
-		for (int i=0; i<3; i++) {
-			if (rptr.mod[i].defined) {
-				if (addr.size()) {
-					if (addr.compare(rptr.mod[i].portip.ip) || port!=rptr.mod[i].portip.port) {
-						printf("all defined ICOM modules must have the same IP and port number!\n");
-						return true;
-					}
-				} else {
-					addr = rptr.mod[i].portip.ip;
-					port = rptr.mod[i].portip.port;
-				}
-			}
-		}
-		for (int i=0; i<3; i++) {
-			if (! rptr.mod[i].defined) {
-				rptr.mod[i].portip.ip = addr;
-				rptr.mod[i].portip.port = port;
-			}
-		}
-	}
-
-	// gateway
-	path = "gateway.";
-	if (! get_value(cfg, path+"local_irc_ip", local_irc_ip, 7, IP_SIZE, "0.0.0.0"))
-		return true;
-
-	if (! get_value(cfg, path+"external.ip", g2_external.ip, 7, IP_SIZE, "0.0.0.0"))
-		return true;
-
-	get_value(cfg, path+"external.port", g2_external.port, 1024, 65535, 40000);
-
-	if (! get_value(cfg, path+"internal.ip", g2_internal.ip, 7, IP_SIZE, "172.16.0.20"))
-		return true;
-
-	get_value(cfg, path+"internal.port", g2_internal.port, 16000, 65535, 20000);
-
-	get_value(cfg, path+"regen_header", bool_regen_header, true);
-
-	get_value(cfg, path+"aprs_send", bool_send_aprs, true);
-
-	get_value(cfg, path+"send_qrgs_maps", bool_send_qrgs, true);
-
-	// APRS
-	path = "aprs.";
-	if (! get_value(cfg, path+"host", rptr.aprs.ip, 7, MAXHOSTNAMELEN, "rotate.aprs.net"))
-		return true;
-
-	get_value(cfg, path+"port", rptr.aprs.port, 10000, 65535, 14580);
-
-	get_value(cfg, path+"interval", rptr.aprs_interval, 40, 1000, 40);
-
-	if (! get_value(cfg, path+"filter", rptr.aprs_filter, 0, 512, ""))
-		return true;
-
-	// log
-	path = "log.";
-	get_value(cfg, path+"qso", bool_qso_details, false);
-
-	get_value(cfg, path+"irc", bool_irc_debug, false);
-
-	get_value(cfg, path+"dtmf", bool_dtmf_debug, false);
-	if (! get_value(cfg, "link.outgoing_ip", g2_link.ip, 7, IP_SIZE, "127.0.0.1"))
-		return true;
-
-	// file
-	path = "file.";
-	if (! get_value(cfg, path+"echotest", echotest_dir, 2, FILENAME_MAX, "/tmp"))
-		return true;
-
-	if (! get_value(cfg, path+"dtmf",  dtmf_dir, 2,FILENAME_MAX, "/tmp"))
-		return true;
-
-	if (! get_value(cfg, path+"status", status_file, 2, FILENAME_MAX, "/usr/local/etc/RPTR_STATUS.txt"))
-		return true;
-
-	if (! get_value(cfg, path+"qnvoicefile", qnvoicefile, 2, FILENAME_MAX, "/tmp/qnvoice.txt"))
-		return true;
-
-	// link
-	path = "link.";
-	get_value(cfg, path+"port", g2_link.port, 16000, 65535, 18997);
-
-	if (! get_value(cfg, path+"ip", g2_link.ip, 7, 15, "127.0.0.1"))
-		return true;
-
-	// timing
-	path = "timing.play.";
-	get_value(cfg, path+"wait", play_wait, 1, 10, 1);
-
-	get_value(cfg, path+"delay", play_delay, 9, 25, 19);
-
-	path = "timing.timeout.";
-	get_value(cfg, path+"echo", echotest_rec_timeout, 1, 10, 1);
-
-	get_value(cfg, path+"voicemail", voicemail_rec_timeout, 1, 10, 1);
-
-	get_value(cfg, path+"remote_g2", from_remote_g2_timeout, 1, 10, 2);
-
-	get_value(cfg, path+"local_rptr", from_local_rptr_timeout, 1, 10, 1);
-
-	return false;
-}
-
-// Create ports
-int CQnetGateway::open_port(const SPORTIP &pip)
-{
-	struct sockaddr_in sin;
-
-	int sock = socket(PF_INET, SOCK_DGRAM, 0);
-	if (0 > sock) {
-		printf("Failed to create socket on %s:%d, errno=%d, %s\n", pip.ip.c_str(), pip.port, errno, strerror(errno));
-		return -1;
-	}
-	fcntl(sock, F_SETFL, O_NONBLOCK);
-
-	memset(&sin, 0, sizeof(struct sockaddr_in));
-	sin.sin_family = AF_INET;
-	sin.sin_port = htons(pip.port);
-	sin.sin_addr.s_addr = inet_addr(pip.ip.c_str());
-
-	int reuse = 1;
-	if (::setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&reuse, sizeof(reuse)) == -1) {
-		printf("Cannot set the UDP socket (port %u) option, err: %d, %s\n", pip.port, errno, strerror(errno));
-		return -1;
-	}
-
-	if (bind(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in)) != 0) {
-		printf("Failed to bind %s:%d, errno=%d, %s\n", pip.ip.c_str(), pip.port, errno, strerror(errno));
-		close(sock);
-		return -1;
-	}
-
-	return sock;
-}
-
-/* receive data from the irc server and save it */
-void CQnetGateway::GetIRCDataThread()
-{
-	std::string user, rptr, gateway, ipaddr;
-	DSTAR_PROTOCOL proto;
-	IRCDDB_RESPONSE_TYPE type;
-	struct sigaction act;
-	short last_status = 0;
-
-	act.sa_handler = sigCatch;
-	sigemptyset(&act.sa_mask);
-	act.sa_flags = SA_RESTART;
-	if (sigaction(SIGTERM, &act, 0) != 0) {
-		printf("GetIRCDataThread: sigaction-TERM failed, error=%d\n", errno);
-		keep_running = false;
-		return;
-	}
-	if (sigaction(SIGINT, &act, 0) != 0) {
-		printf("GetIRCDataThread: sigaction-INT failed, error=%d\n", errno);
-		keep_running = false;
-		return;
-	}
-	if (sigaction(SIGPIPE, &act, 0) != 0) {
-		printf("GetIRCDataThread: sigaction-PIPE failed, error=%d\n", errno);
-		keep_running = false;
-		return;
-	}
-
-	short threshold = 0;
-	bool not_announced[3];
-	for (int i=0; i<3; i++)
-		not_announced[i] = this->rptr.mod[i].defined;	// announce to all modules that are defined!
-	bool is_quadnet = (0 == ircddb.ip.compare("rr.openquad.net"));
-	while (keep_running) {
-		int rc = ii->getConnectionState();
-		if (rc > 5 && rc < 8 && is_quadnet) {
-			char ch = '\0';
-			if (not_announced[0])
-				ch = 'A';
-			else if (not_announced[1])
-				ch = 'B';
-			else if (not_announced[2])
-				ch = 'C';
-			if (ch) {
-				// we need to announce, but can we?
-				struct stat sbuf;
-				if (stat(qnvoicefile.c_str(), &sbuf)) {
-					// yes, there is no qnvoicefile, so create it
-					FILE *fp = fopen(qnvoicefile.c_str(), "w");
-					if (fp) {
-						fprintf(fp, "%c_connected2network.dat_WELCOME_TO_QUADNET", ch);
-						fclose(fp);
-						not_announced[ch - 'A'] = false;
-					} else
-						fprintf(stderr, "could not open %s\n", qnvoicefile.c_str());
-				}
-			}
-		}
-		threshold++;
-		if (threshold >= 100) {
-			if ((rc == 0) || (rc == 10)) {
-				if (last_status != 0) {
-					printf("irc status=%d, probable disconnect...\n", rc);
-					last_status = 0;
-				}
-			} else if (rc == 7) {
-				if (last_status != 2) {
-					printf("irc status=%d, probable connect...\n", rc);
-					last_status = 2;
-				}
-			} else {
-				if (last_status != 1) {
-					printf("irc status=%d, probable connect...\n", rc);
-					last_status = 1;
-				}
-			}
-			threshold = 0;
-		}
-
-		while (((type = ii->getMessageType()) != IDRT_NONE) && keep_running) {
-			if (type == IDRT_USER) {
-				ii->receiveUser(user, rptr, gateway, ipaddr);
-				if (!user.empty()) {
-					if (!rptr.empty() && !gateway.empty() && !ipaddr.empty()) {
-						if (bool_irc_debug)
-							printf("C-u:%s,%s,%s,%s\n", user.c_str(), rptr.c_str(), gateway.c_str(), ipaddr.c_str());
-
-						pthread_mutex_lock(&irc_data_mutex);
-
-						user2rptr_map[user] = rptr;
-						rptr2gwy_map[rptr] = gateway;
-						gwy2ip_map[gateway] = ipaddr;
-
-						pthread_mutex_unlock(&irc_data_mutex);
-
-						// printf("%d users, %d repeaters, %d gateways\n",  user2rptr_map.size(), rptr2gwy_map.size(), gwy2ip_map.size());
-
-					}
-				}
-			} else if (type == IDRT_REPEATER) {
-				ii->receiveRepeater(rptr, gateway, ipaddr, proto);
-				if (!rptr.empty()) {
-					if (!gateway.empty() && !ipaddr.empty()) {
-						if (bool_irc_debug)
-							printf("C-r:%s,%s,%s\n", rptr.c_str(), gateway.c_str(), ipaddr.c_str());
-
-						pthread_mutex_lock(&irc_data_mutex);
-
-						rptr2gwy_map[rptr] = gateway;
-						gwy2ip_map[gateway] = ipaddr;
-
-						pthread_mutex_unlock(&irc_data_mutex);
-
-						// printf("%d repeaters, %d gateways\n", rptr2gwy_map.size(), gwy2ip_map.size());
-
-					}
-				}
-			} else if (type == IDRT_GATEWAY) {
-				ii->receiveGateway(gateway, ipaddr, proto);
-				if (!gateway.empty() && !ipaddr.empty()) {
-					if (bool_irc_debug)
-						printf("C-g:%s,%s\n", gateway.c_str(),ipaddr.c_str());
-
-					pthread_mutex_lock(&irc_data_mutex);
-
-					gwy2ip_map[gateway] = ipaddr;
-
-					pthread_mutex_unlock(&irc_data_mutex);
-
-					// printf("%d gateways\n", gwy2ip_map.size());
-
-				}
-			}
-		}
-		std::this_thread::sleep_for(std::chrono::milliseconds(500));
-	}
-	printf("GetIRCDataThread exiting...\n");
-	return;
-}
-
-/* return codes: 0=OK(found it), 1=TRY AGAIN, 2=FAILED(bad data) */
-int CQnetGateway::get_yrcall_rptr_from_cache(char *call, char *arearp_cs, char *zonerp_cs, char *mod, char *ip, char RoU)
-{
-	char temp[CALL_SIZE + 1];
-
-	memset(arearp_cs, ' ', CALL_SIZE);
-	arearp_cs[CALL_SIZE] = '\0';
-	memset(zonerp_cs, ' ', CALL_SIZE);
-	zonerp_cs[CALL_SIZE] = '\0';
-	*mod = ' ';
-
-	/* find the user in the CACHE */
-	if (RoU == 'U') {
-		auto user_pos = user2rptr_map.find(call);
-		if (user_pos != user2rptr_map.end()) {
-			memcpy(arearp_cs, user_pos->second.c_str(), 7);
-			*mod = user_pos->second.c_str()[7];
-		} else
-			return 1;
-	} else if (RoU == 'R') {
-		memcpy(arearp_cs, call, 7);
-		*mod = call[7];
-	} else {
-		printf("Invalid specification %c for RoU\n", RoU);
-		return 2;
-	}
-
-	if (*mod == 'G') {
-		printf("Invalid module %c\n", *mod);
-		return 2;
-	}
-
-	memcpy(temp, arearp_cs, 7);
-	temp[7] = *mod;
-	temp[CALL_SIZE] = '\0';
-
-	auto rptr_pos = rptr2gwy_map.find(temp);
-	if (rptr_pos != rptr2gwy_map.end()) {
-		memcpy(zonerp_cs, rptr_pos->second.c_str(), CALL_SIZE);
-		zonerp_cs[CALL_SIZE] = '\0';
-
-		auto gwy_pos = gwy2ip_map.find(zonerp_cs);
-		if (gwy_pos != gwy2ip_map.end()) {
-			strncpy(ip, gwy_pos->second.c_str(), IP_SIZE);
-			ip[IP_SIZE] = '\0';
-			return 0;
-		} else {
-			/* printf("Could not find IP for Gateway %s\n", zonerp_cs); */
-			return 1;
-		}
-	} else {
-		/* printf("Could not find Gateway for repeater %s\n", temp); */
-		return 1;
-	}
-
-	return 2;
-}
-
-bool CQnetGateway::get_yrcall_rptr(char *call, char *arearp_cs, char *zonerp_cs, char *mod, char *ip, char RoU)
-{
-	pthread_mutex_lock(&irc_data_mutex);
-	int rc = get_yrcall_rptr_from_cache(call, arearp_cs, zonerp_cs, mod, ip, RoU);
-	pthread_mutex_unlock(&irc_data_mutex);
-	if (rc == 0)
-		return true;
-	else if (rc == 2)
-		return false;
-
-	/* at this point, the data is not in cache */
-	/* report the irc status */
-	int status = ii->getConnectionState();
-	// printf("irc status=%d\n", status);
-	if (status != 7) {
-		printf("Remote irc database not ready, irc status is not 7, try again\n");
-		return false;
-	}
-
-	/* request data from irc server */
-	if (RoU == 'U') {
-		printf("User [%s] not in local cache, try again\n", call);
-		/*** YRCALL=KJ4NHFBL ***/
-		if (((call[6] == 'A') || (call[6] == 'B') || (call[6] == 'C')) && (call[7] == 'L'))
-			printf("If this was a gateway link request, that is ok\n");
-
-		if (!ii->findUser(call)) {
-			printf("findUser(%s): Network error\n", call);
-			return false;
-		}
-	} else if (RoU == 'R') {
-		printf("Repeater [%s] not in local cache, try again\n", call);
-		if (!ii->findRepeater(call)) {
-			printf("findRepeater(%s): Network error\n", call);
-			return false;
-		}
-	}
-
-	return false;
-}
-
-bool CQnetGateway::Flag_is_ok(unsigned char flag)
-{
-	//      normal          break          emr          emr+break
-	return 0x00U==flag || 0x08U==flag || 0x20U==flag || 0x28U==flag;
-}
-
-void CQnetGateway::ProcessTimeouts()
-{
-	for (int i=0; i<3; i++) {
-		time_t t_now;
-		/* echotest recording timed out? */
-		if (recd[i].last_time != 0) {
-			time(&t_now);
-			if ((t_now - recd[i].last_time) > echotest_rec_timeout) {
-				printf("Inactivity on echotest recording mod %d, removing stream id=%04x\n", i, recd[i].streamid);
-
-				recd[i].streamid = 0;
-				recd[i].last_time = 0;
-				close(recd[i].fd);
-				recd[i].fd = -1;
-				// printf("Closed echotest audio file:[%s]\n", recd[i].file);
-
-				/* START: echotest thread setup */
-				try {
-					std::async(std::launch::async, &CQnetGateway::PlayFileThread, this, std::ref(recd[i]));
-				} catch (const std::exception &e) {
-					printf("Failed to start echotest thread. Exception: %s\n", e.what());
-					// when the echotest thread runs, it deletes the file,
-					// Because the echotest thread did NOT start, we delete the file here
-					unlink(recd[i].file);
-				}
-				/* END: echotest thread setup */
-			}
-		}
-
-		/* voicemail recording timed out? */
-		if (vm[i].last_time != 0) {
-			time(&t_now);
-			if ((t_now - vm[i].last_time) > voicemail_rec_timeout) {
-				printf("Inactivity on voicemail recording mod %d, removing stream id=%04x\n", i, vm[i].streamid);
-
-				vm[i].streamid = 0;
-				vm[i].last_time = 0;
-				close(vm[i].fd);
-				vm[i].fd = -1;
-				// printf("Closed voicemail audio file:[%s]\n", vm[i].file);
-			}
-		}
-
-		// any stream going to local repeater timed out?
-		if (toRptr[i].last_time != 0) {
-			time(&t_now);
-			//   The stream can be from a cross-band, or from a remote system,
-			//   so we could use either FROM_LOCAL_RPTR_TIMEOUT or FROM_REMOTE_G2_TIMEOUT
-			//   but FROM_REMOTE_G2_TIMEOUT makes more sense, probably is a bigger number
-			if ((t_now - toRptr[i].last_time) > from_remote_g2_timeout) {
-				printf("Inactivity to local rptr mod index %d, removing stream id %04x\n", i, toRptr[i].streamid);
-
-				// Send end_of_audio to local repeater.
-				// Let the repeater re-initialize
-				end_of_audio.counter = G2_COUNTER_OUT++;
-				if (i == 0)
-					end_of_audio.vpkt.snd_term_id = 0x03;
-				else if (i == 1)
-					end_of_audio.vpkt.snd_term_id = 0x01;
-				else
-					end_of_audio.vpkt.snd_term_id = 0x02;
-				end_of_audio.vpkt.streamid = toRptr[i].streamid;
-				end_of_audio.vpkt.ctrl = toRptr[i].sequence | 0x40;
-
-				for (int j=0; j<2; j++)
-					sendto(srv_sock, end_of_audio.pkt_id, 29, 0, (struct sockaddr *)&toRptr[i].band_addr, sizeof(struct sockaddr_in));
-
-
-				toRptr[i].streamid = 0;
-				toRptr[i].adr = 0;
-				toRptr[i].last_time = 0;
-			}
-		}
-
-		/* any stream coming from local repeater timed out ? */
-		if (band_txt[i].last_time != 0) {
-			time(&t_now);
-			if ((t_now - band_txt[i].last_time) > from_local_rptr_timeout) {
-				/* This local stream never went to a remote system, so trace the timeout */
-				if (to_remote_g2[i].toDst4.sin_addr.s_addr == 0)
-					printf("Inactivity from local rptr band %d, removing stream id %04x\n", i, band_txt[i].streamID);
-
-				band_txt[i].streamID = 0;
-				band_txt[i].flags[0] = band_txt[i].flags[1] = band_txt[i].flags[2] = 0x0;
-				band_txt[i].lh_mycall[0] = '\0';
-				band_txt[i].lh_sfx[0] = '\0';
-				band_txt[i].lh_yrcall[0] = '\0';
-				band_txt[i].lh_rpt1[0] = '\0';
-				band_txt[i].lh_rpt2[0] = '\0';
-
-				band_txt[i].last_time = 0;
-
-				band_txt[i].txt[0] = '\0';
-				band_txt[i].txt_cnt = 0;
-
-				band_txt[i].dest_rptr[0] = '\0';
-
-				band_txt[i].num_dv_frames = 0;
-				band_txt[i].num_dv_silent_frames = 0;
-				band_txt[i].num_bit_errors = 0;
-			}
-		}
-
-		/* any stream from local repeater to a remote gateway timed out ? */
-		if (to_remote_g2[i].toDst4.sin_addr.s_addr != 0) {
-			time(&t_now);
-			if ((t_now - to_remote_g2[i].last_time) > from_local_rptr_timeout) {
-				printf("Inactivity from local rptr mod %d, removing stream id %04x\n", i, to_remote_g2[i].streamid);
-
-				memset(&(to_remote_g2[i].toDst4),0,sizeof(struct sockaddr_in));
-				to_remote_g2[i].streamid = 0;
-				to_remote_g2[i].last_time = 0;
-			}
-		}
-	}
-}
-
-// new_group is true if we are processing the first voice packet of a 2-voice packet pair. The high order nibble of the first byte of
-// this first packet specifed the type of slow data that is being sent.
-// the to_print is an integer that counts down how many 2-voice-frame pairs remain to be processed.
-// ABC_grp means that we are processing a 20-character message.
-// C_seen means that we are processing the last 2-voice-frame packet on a 20 character message.
-void CQnetGateway::ProcessSlowData(unsigned char *data, unsigned short sid)
-{
-	/* extract 20-byte RADIO ID */
-	if ((data[0] != 0x55) || (data[1] != 0x2d) || (data[2] != 0x16)) {
-
-		// first, unscramble
-		unsigned char c1 = data[0] ^ 0x70u;
-		unsigned char c2 = data[1] ^ 0x4fu;
-		unsigned char c3 = data[2] ^ 0x93u;
-
-		for (int i=0; i<3; i++) {
-			if (band_txt[i].streamID == sid) {
-				if (new_group[i]) {
-					header_type = c1 & 0xf0;
-
-					//                 header                   squelch
-					if ((header_type == 0x50) || (header_type == 0xc0)) {
-						new_group[i] = false;
-						to_print[i] = 0;
-						ABC_grp[i] = false;
-					}
-					else if (header_type == 0x30) { /* GPS or GPS id or APRS */
-						new_group[i] = false;
-						to_print[i] = c1 & 0x0f;
-						ABC_grp[i] = false;
-						if (to_print[i] > 5)
-							to_print[i] = 5;
-						else if (to_print[i] < 1)
-							to_print[i] = 1;
-
-						if ((to_print[i] > 1) && (to_print[i] <= 5)) {
-							/* something went wrong? all bets are off */
-							if (band_txt[i].temp_line_cnt > 200) {
-								printf("Reached the limit in the OLD gps mode\n");
-								band_txt[i].temp_line[0] = '\0';
-								band_txt[i].temp_line_cnt = 0;
-							}
-
-							/* fresh GPS string, re-initialize */
-							if ((to_print[i] == 5) && (c2 == '$')) {
-								band_txt[i].temp_line[0] = '\0';
-								band_txt[i].temp_line_cnt = 0;
-							}
-
-							/* do not copy CR, NL */
-							if ((c2 != '\r') && (c2 != '\n')) {
-								band_txt[i].temp_line[band_txt[i].temp_line_cnt] = c2;
-								band_txt[i].temp_line_cnt++;
-							}
-							if ((c3 != '\r') && (c3 != '\n')) {
-								band_txt[i].temp_line[band_txt[i].temp_line_cnt] = c3;
-								band_txt[i].temp_line_cnt++;
-							}
-
-							if ((c2 == '\r') || (c3 == '\r')) {
-								if (memcmp(band_txt[i].temp_line, "$GPRMC", 6) == 0) {
-									memcpy(band_txt[i].gprmc, band_txt[i].temp_line, band_txt[i].temp_line_cnt);
-									band_txt[i].gprmc[band_txt[i].temp_line_cnt] = '\0';
-								} else if (band_txt[i].temp_line[0] != '$') {
-									memcpy(band_txt[i].gpid, band_txt[i].temp_line, band_txt[i].temp_line_cnt);
-									band_txt[i].gpid[band_txt[i].temp_line_cnt] = '\0';
-									if (bool_send_aprs && !band_txt[i].is_gps_sent)
-										gps_send(i);
-								}
-								band_txt[i].temp_line[0] = '\0';
-								band_txt[i].temp_line_cnt = 0;
-							} else if ((c2 == '\n') || (c3 == '\n')) {
-								band_txt[i].temp_line[0] = '\0';
-								band_txt[i].temp_line_cnt = 0;
-							}
-							to_print[i] -= 2;
-						} else {
-							/* something went wrong? all bets are off */
-							if (band_txt[i].temp_line_cnt > 200) {
-								printf("Reached the limit in the OLD gps mode\n");
-								band_txt[i].temp_line[0] = '\0';
-								band_txt[i].temp_line_cnt = 0;
-							}
-
-							/* do not copy CR, NL */
-							if ((c2 != '\r') && (c2 != '\n')) {
-								band_txt[i].temp_line[band_txt[i].temp_line_cnt] = c2;
-								band_txt[i].temp_line_cnt++;
-							}
-
-							if (c2 == '\r') {
-								if (memcmp(band_txt[i].temp_line, "$GPRMC", 6) == 0) {
-									memcpy(band_txt[i].gprmc, band_txt[i].temp_line, band_txt[i].temp_line_cnt);
-									band_txt[i].gprmc[band_txt[i].temp_line_cnt] = '\0';
-								} else if (band_txt[i].temp_line[0] != '$') {
-									memcpy(band_txt[i].gpid, band_txt[i].temp_line, band_txt[i].temp_line_cnt);
-									band_txt[i].gpid[band_txt[i].temp_line_cnt] = '\0';
-									if (bool_send_aprs && !band_txt[i].is_gps_sent)
-										gps_send(i);
-								}
-								band_txt[i].temp_line[0] = '\0';
-								band_txt[i].temp_line_cnt = 0;
-							} else if (c2 == '\n') {
-								band_txt[i].temp_line[0] = '\0';
-								band_txt[i].temp_line_cnt = 0;
-							}
-							to_print[i] --;
-						}
-					}
-					else if (header_type == 0x40) { /* ABC text */
-						new_group[i] = false;
-						to_print[i] = 3;
-						ABC_grp[i] = true;
-						C_seen[i] = ((c1 & 0x0f) == 0x03) ? true : false;
-
-						band_txt[i].txt[band_txt[i].txt_cnt] = c2;
-						band_txt[i].txt_cnt++;
-
-						band_txt[i].txt[band_txt[i].txt_cnt] = c3;
-						band_txt[i].txt_cnt++;
-
-						/* We should NOT see any more text,
-						   if we already processed text,
-						   so blank out the codes. */
-						if (band_txt[i].sent_key_on_msg) {
-							data[0] = 0x70;
-							data[1] = 0x4f;
-							data[2] = 0x93;
-						}
-
-						if (band_txt[i].txt_cnt >= 20) {
-							band_txt[i].txt[band_txt[i].txt_cnt] = '\0';
-							band_txt[i].txt_cnt = 0;
-						}
-					}
-					else {	// header type is not header, squelch, gps or message
-						new_group[i] = false;
-						to_print[i] = 0;
-						ABC_grp[i] = false;
-					}
-				}
-				else { // not a new_group, this is the second of a two-voice-frame pair
-					if (! band_txt[i].sent_key_on_msg && vPacketCount > 100) {
-						// 100 voice packets received and still no 20-char message!
-						/*** if YRCALL is CQCQCQ, set dest_rptr ***/
-						band_txt[i].txt[0] = '\0';
-						if (memcmp(band_txt[i].lh_yrcall, "CQCQCQ", 6) == 0) {
-							set_dest_rptr(i, band_txt[i].dest_rptr);
-							if (memcmp(band_txt[i].dest_rptr, "REF", 3) == 0)
-								band_txt[i].dest_rptr[0] = '\0';
-						}
-						// we have the 20-character message, send it to the server...
-						ii->sendHeardWithTXMsg(band_txt[i].lh_mycall, band_txt[i].lh_sfx, (strstr(band_txt[i].lh_yrcall,"REF") == NULL)?band_txt[i].lh_yrcall:"CQCQCQ  ", band_txt[i].lh_rpt1, band_txt[i].lh_rpt2, band_txt[i].flags[0], band_txt[i].flags[1], band_txt[i].flags[2], band_txt[i].dest_rptr, band_txt[i].txt);
-						band_txt[i].sent_key_on_msg = true;
-					}
-					if (to_print[i] == 3) {
-						if (ABC_grp[i]) {
-							band_txt[i].txt[band_txt[i].txt_cnt] = c1;
-							band_txt[i].txt_cnt++;
-
-							band_txt[i].txt[band_txt[i].txt_cnt] = c2;
-							band_txt[i].txt_cnt++;
-
-							band_txt[i].txt[band_txt[i].txt_cnt] = c3;
-							band_txt[i].txt_cnt++;
-
-							/* We should NOT see any more text,
-							   if we already processed text,
-							   so blank out the codes. */
-							if (band_txt[i].sent_key_on_msg) {
-								data[0] = 0x70;
-								data[1] = 0x4f;
-								data[2] = 0x93;
-							}
-
-							if ((band_txt[i].txt_cnt >= 20) || C_seen[i]) {
-								band_txt[i].txt[band_txt[i].txt_cnt] = '\0';
-								if ( ! band_txt[i].sent_key_on_msg) {
-									/*** if YRCALL is CQCQCQ, set dest_rptr ***/
-									if (memcmp(band_txt[i].lh_yrcall, "CQCQCQ", 6) == 0) {
-										set_dest_rptr(i, band_txt[i].dest_rptr);
-										if (memcmp(band_txt[i].dest_rptr, "REF", 3) == 0)
-											band_txt[i].dest_rptr[0] = '\0';
-									}
-									// we have the 20-character message, send it to the server...
-									ii->sendHeardWithTXMsg(band_txt[i].lh_mycall, band_txt[i].lh_sfx, (strstr(band_txt[i].lh_yrcall,"REF") == NULL)?band_txt[i].lh_yrcall:"CQCQCQ  ", band_txt[i].lh_rpt1, band_txt[i].lh_rpt2, band_txt[i].flags[0], band_txt[i].flags[1], band_txt[i].flags[2], band_txt[i].dest_rptr, band_txt[i].txt);
-									band_txt[i].sent_key_on_msg = true;
-								}
-								band_txt[i].txt_cnt = 0;
-							}
-							if (C_seen[i])
-								C_seen[i] = false;
-						} else {
-							/* something went wrong? all bets are off */
-							if (band_txt[i].temp_line_cnt > 200) {
-								printf("Reached the limit in the OLD gps mode\n");
-								band_txt[i].temp_line[0] = '\0';
-								band_txt[i].temp_line_cnt = 0;
-							}
-
-							/* do not copy carrige return or newline */
-							if ((c1 != '\r') && (c1 != '\n')) {
-								band_txt[i].temp_line[band_txt[i].temp_line_cnt] = c1;
-								band_txt[i].temp_line_cnt++;
-							}
-							if ((c2 != '\r') && (c2 != '\n')) {
-								band_txt[i].temp_line[band_txt[i].temp_line_cnt] = c2;
-								band_txt[i].temp_line_cnt++;
-							}
-							if ((c3 != '\r') && (c3 != '\n')) {
-								band_txt[i].temp_line[band_txt[i].temp_line_cnt] = c3;
-								band_txt[i].temp_line_cnt++;
-							}
-
-							if ( (c1 == '\r') || (c2 == '\r') || (c3 == '\r') ) {
-								if (memcmp(band_txt[i].temp_line, "$GPRMC", 6) == 0) {
-									memcpy(band_txt[i].gprmc, band_txt[i].temp_line, band_txt[i].temp_line_cnt);
-									band_txt[i].gprmc[band_txt[i].temp_line_cnt] = '\0';
-								} else if (band_txt[i].temp_line[0] != '$') {
-									memcpy(band_txt[i].gpid, band_txt[i].temp_line, band_txt[i].temp_line_cnt);
-									band_txt[i].gpid[band_txt[i].temp_line_cnt] = '\0';
-									if (bool_send_aprs && !band_txt[i].is_gps_sent)
-										gps_send(i);
-								}
-								band_txt[i].temp_line[0] = '\0';
-								band_txt[i].temp_line_cnt = 0;
-							}
-							else if ((c1 == '\n') || (c2 == '\n') ||(c3 == '\n')) {
-								band_txt[i].temp_line[0] = '\0';
-								band_txt[i].temp_line_cnt = 0;
-							}
-						}
-					} else if (to_print[i] == 2) {
-						/* something went wrong? all bets are off */
-						if (band_txt[i].temp_line_cnt > 200) {
-							printf("Reached the limit in the OLD gps mode\n");
-							band_txt[i].temp_line[0] = '\0';
-							band_txt[i].temp_line_cnt = 0;
-						}
-
-						/* do not copy CR, NL */
-						if ((c1 != '\r') && (c1 != '\n')) {
-							band_txt[i].temp_line[band_txt[i].temp_line_cnt] = c1;
-							band_txt[i].temp_line_cnt++;
-						}
-						if ((c2 != '\r') && (c2 != '\n')) {
-							band_txt[i].temp_line[band_txt[i].temp_line_cnt] = c2;
-							band_txt[i].temp_line_cnt++;
-						}
-
-						if ((c1 == '\r') || (c2 == '\r')) {
-							if (memcmp(band_txt[i].temp_line, "$GPRMC", 6) == 0) {
-								memcpy(band_txt[i].gprmc, band_txt[i].temp_line, band_txt[i].temp_line_cnt);
-								band_txt[i].gprmc[band_txt[i].temp_line_cnt] = '\0';
-							} else if (band_txt[i].temp_line[0] != '$') {
-								memcpy(band_txt[i].gpid, band_txt[i].temp_line, band_txt[i].temp_line_cnt);
-								band_txt[i].gpid[band_txt[i].temp_line_cnt] = '\0';
-								if (bool_send_aprs && !band_txt[i].is_gps_sent)
-									gps_send(i);
-							}
-							band_txt[i].temp_line[0] = '\0';
-							band_txt[i].temp_line_cnt = 0;
-						} else if ((c1 == '\n') || (c2  == '\n')) {
-							band_txt[i].temp_line[0] = '\0';
-							band_txt[i].temp_line_cnt = 0;
-						}
-					} else if (to_print[i] == 1) {
-						/* something went wrong? all bets are off */
-						if (band_txt[i].temp_line_cnt > 200) {
-							printf("Reached the limit in the OLD gps mode\n");
-							band_txt[i].temp_line[0] = '\0';
-							band_txt[i].temp_line_cnt = 0;
-						}
-
-						/* do not copy CR, NL */
-						if ((c1 != '\r') && (c1 != '\n')) {
-							band_txt[i].temp_line[band_txt[i].temp_line_cnt] = c1;
-							band_txt[i].temp_line_cnt++;
-						}
-
-						if (c1 == '\r') {
-							if (memcmp(band_txt[i].temp_line, "$GPRMC", 6) == 0) {
-								memcpy(band_txt[i].gprmc, band_txt[i].temp_line, band_txt[i].temp_line_cnt);
-								band_txt[i].gprmc[band_txt[i].temp_line_cnt] = '\0';
-							} else if (band_txt[i].temp_line[0] != '$') {
-								memcpy(band_txt[i].gpid, band_txt[i].temp_line, band_txt[i].temp_line_cnt);
-								band_txt[i].gpid[band_txt[i].temp_line_cnt] = '\0';
-								if (bool_send_aprs && !band_txt[i].is_gps_sent)
-									gps_send(i);
-							}
-							band_txt[i].temp_line[0] = '\0';
-							band_txt[i].temp_line_cnt = 0;
-						} else if (c1 == '\n') {
-							band_txt[i].temp_line[0] = '\0';
-							band_txt[i].temp_line_cnt = 0;
-						}
-					}
-					new_group[i] = true;
-					to_print[i] = 0;
-					ABC_grp[i] = false;
-				}
-				break;
-			}
-		}
-	}
-}
-
-/* run the main loop for QnetGateway */
-void CQnetGateway::Process()
-{
-	// dtmf stuff
-	int dtmf_buf_count[3] = {0, 0, 0};
-	char dtmf_buf[3][MAX_DTMF_BUF + 1] = { {""}, {""}, {""} };
-	int dtmf_last_frame[3] = { 0, 0, 0 };
-	unsigned int dtmf_counter[3] = { 0, 0, 0 };
-
-	dstar_dv_init();
-
-	int max_nfds = 0;
-	if (g2_sock > max_nfds)
-		max_nfds = g2_sock;
-	if (srv_sock > max_nfds)
-		max_nfds = srv_sock;
-	printf("g2=%d, srv=%d, MAX+1=%d\n", g2_sock, srv_sock, max_nfds + 1);
-
-	std::future<void> aprs_future, irc_data_future;
-	if (bool_send_aprs) {	// start the beacon thread
-		try {
-			aprs_future = std::async(std::launch::async, &CQnetGateway::APRSBeaconThread, this);
-		} catch (const std::exception &e) {
-			printf("Failed to start the APRSBeaconThread. Exception: %s\n", e.what());
-		}
-		if (aprs_future.valid())
-			printf("APRS beacon thread started\n");
-	}
-
-	try {	// start the IRC read thread
-		irc_data_future = std::async(std::launch::async, &CQnetGateway::GetIRCDataThread, this);
-	} catch (const std::exception &e) {
-		printf("Failed to start GetIRCDataThread. Exception: %s\n", e.what());
-		keep_running = false;
-	}
-	if (keep_running)
-		printf("get_irc_data thread started\n");
-
-	ii->kickWatchdog(IRCDDB_VERSION);
-
-	// send INIT to Icom Stack
-	unsigned char buf[500];
-	memset(buf, 0, 10);
-	memcpy(buf, "INIT", 4);
-	buf[6] = 0x73U;
-	// we can use the module a band_addr for INIT
-	sendto(srv_sock, buf, 10, 0, (struct sockaddr *)&toRptr[0].band_addr, sizeof(struct sockaddr_in));
-	printf("Waiting for ICOM controller...\n");
-
-	// get the acknowledgement from the ICOM Stack
-	while (keep_running) {
-		socklen_t fromlength = sizeof(struct sockaddr_in);
-		int recvlen = recvfrom(srv_sock, buf, 500, 0, (struct sockaddr *)&fromRptr, &fromlength);
-		if (10==recvlen && 0==memcmp(buf, "INIT", 4) && 0x72U==buf[6] && 0x0U==buf[7]) {
-			OLD_REPLY_SEQ = 256U * buf[4] + buf[5];
-			NEW_REPLY_SEQ = OLD_REPLY_SEQ + 1;
-			G2_COUNTER_OUT = NEW_REPLY_SEQ;
-			unsigned int ui = G2_COUNTER_OUT;
-			printf("SYNC: old=%u, new=%u out=%u\n", OLD_REPLY_SEQ, NEW_REPLY_SEQ, ui);
-			break;
-		}
-		std::this_thread::sleep_for(std::chrono::milliseconds(100));
-	}
-	printf("Detected ICOM controller!\n");
-
-	while (keep_running) {
-		ProcessTimeouts();
-
-		// wait 20 ms max
-		fd_set fdset;
-		FD_ZERO(&fdset);
-		FD_SET(g2_sock, &fdset);
-		FD_SET(srv_sock, &fdset);
-		struct timeval tv;
-		tv.tv_sec = 0;
-		tv.tv_usec = 20000; // 20 ms
-		(void)select(max_nfds + 1, &fdset, 0, 0, &tv);
-
-		// process packets coming from remote G2
-		if (FD_ISSET(g2_sock, &fdset)) {
-			SDSVT g2buf;
-			socklen_t fromlen = sizeof(struct sockaddr_in);
-			int g2buflen = recvfrom(g2_sock, g2buf.title, 56, 0, (struct sockaddr *)&fromDst4, &fromlen);
-
-			// save incoming port for mobile systems
-			if (portmap.end() == portmap.find(fromDst4.sin_addr.s_addr)) {
-				printf("New g2 contact at %s on port %u\n", inet_ntoa(fromDst4.sin_addr), ntohs(fromDst4.sin_port));
-				portmap[fromDst4.sin_addr.s_addr] = ntohs(fromDst4.sin_port);
-			} else {
-				if (ntohs(fromDst4.sin_port) != portmap[fromDst4.sin_addr.s_addr]) {
-					printf("New g2 port from %s is now %u, it was %u\n", inet_ntoa(fromDst4.sin_addr), ntohs(fromDst4.sin_port), portmap[fromDst4.sin_addr.s_addr]);
-					portmap[fromDst4.sin_addr.s_addr] = ntohs(fromDst4.sin_port);
-				}
-			}
-
-			if ( (g2buflen==56 || g2buflen==27) && 0==memcmp(g2buf.title, "DSVT", 4) && (g2buf.config==0x10 || g2buf.config==0x20) && g2buf.id==0x20) {
-				if (g2buflen == 56) {
-
-					// Find out the local repeater module IP/port to send the data to
-					int i = g2buf.hdr.rpt1[7] - 'A';
-
-					/* valid repeater module? */
-					if (i>=0 && i<3) {
-						// toRptr[i] is active if a remote system is talking to it or
-						// toRptr[i] is receiving data from a cross-band
-						if (0==toRptr[i].last_time && 0==band_txt[i].last_time && (Flag_is_ok(g2buf.hdr.flag[0]) || 0x01U==g2buf.hdr.flag[0] || 0x40U==g2buf.hdr.flag[0])) {
-							if (bool_qso_details)
-								printf("id=%04x G2 start, ur=%.8s r1=%.8s r2=%.8s my=%.8s/%.4s IP=%s:%u\n", ntohs(g2buf.streamid), g2buf.hdr.urcall, g2buf.hdr.rpt1, g2buf.hdr.rpt2, g2buf.hdr.mycall, g2buf.hdr.sfx, inet_ntoa(fromDst4.sin_addr), ntohs(fromDst4.sin_port));
-
-							memcpy(rptrbuf.pkt_id, "DSTR", 4);
-							rptrbuf.counter = htons(G2_COUNTER_OUT++);	// bump the counter
-							rptrbuf.flag[0] = 0x73;
-							rptrbuf.flag[1] = 0x12;
-							rptrbuf.flag[2] = 0x00;
-							rptrbuf.remaining = 0x30;
-							rptrbuf.vpkt.icm_id = 0x20;
-							//memcpy(&rptrbuf.vpkt.dst_rptr_id, g2buf.flagb, 47);
-							rptrbuf.vpkt.dst_rptr_id = g2buf.flagb[0];
-							rptrbuf.vpkt.snd_rptr_id = g2buf.flagb[1];
-							rptrbuf.vpkt.snd_term_id = g2buf.flagb[2];
-							rptrbuf.vpkt.streamid    = g2buf.streamid;
-							rptrbuf.vpkt.ctrl        = g2buf.ctrl;
-							memcpy(rptrbuf.vpkt.hdr.flag, g2buf.hdr.flag,   3);
-							memcpy(rptrbuf.vpkt.hdr.r1,   g2buf.hdr.rpt2,   8);
-							memcpy(rptrbuf.vpkt.hdr.r2,   g2buf.hdr.rpt1,   8);
-							memcpy(rptrbuf.vpkt.hdr.ur,   g2buf.hdr.urcall, 8);
-							memcpy(rptrbuf.vpkt.hdr.my,   g2buf.hdr.mycall, 8);
-							memcpy(rptrbuf.vpkt.hdr.nm,   g2buf.hdr.sfx,    4);
-							memcpy(rptrbuf.vpkt.hdr.pfcs, g2buf.hdr.pfcs,   2);
-
-							sendto(srv_sock, rptrbuf.pkt_id, 58, 0, (struct sockaddr *)&toRptr[i].band_addr, sizeof(struct sockaddr_in));
-
-							/* save the header */
-							memcpy(toRptr[i].saved_hdr, rptrbuf.pkt_id, 58);
-							toRptr[i].saved_adr = fromDst4.sin_addr.s_addr;
-
-							/* This is the active streamid */
-							toRptr[i].streamid = g2buf.streamid;
-							toRptr[i].adr = fromDst4.sin_addr.s_addr;
-
-							/* time it, in case stream times out */
-							time(&toRptr[i].last_time);
-
-							toRptr[i].sequence = rptrbuf.vpkt.ctrl;
-						}
-					}
-				} else {	// g2buflen == 27
-					if (bool_qso_details && g2buf.ctrl & 0x40)
-						printf("id=%04x END G2\n", ntohs(g2buf.streamid));
-
-					/* find out which repeater module to send the data to */
-					int i;
-					for (i=0; i<3; i++) {
-						/* streamid match ? */
-						if (toRptr[i].streamid==g2buf.streamid && toRptr[i].adr==fromDst4.sin_addr.s_addr) {
-							memcpy(rptrbuf.pkt_id, "DSTR", 4);
-							rptrbuf.counter = htons(G2_COUNTER_OUT++);
-							rptrbuf.flag[0] = 0x73;
-							rptrbuf.flag[1] = 0x12;
-							rptrbuf.flag[2] = 0x00;
-							rptrbuf.remaining= 0x13;
-							rptrbuf.vpkt.icm_id = 0x20;
-							memcpy(&rptrbuf.vpkt.dst_rptr_id, g2buf.flagb, 18);
-
-							sendto(srv_sock, rptrbuf.pkt_id, 29, 0, (struct sockaddr *)&toRptr[i].band_addr, sizeof(struct sockaddr_in));
-
-							/* timeit */
-							time(&toRptr[i].last_time);
-
-							toRptr[i].sequence = rptrbuf.vpkt.ctrl;
-
-							/* End of stream ? */
-							if (g2buf.ctrl & 0x40) {
-								/* clear the saved header */
-								memset(toRptr[i].saved_hdr, 0, sizeof(toRptr[i].saved_hdr));
-								toRptr[i].saved_adr = 0;
-
-								toRptr[i].last_time = 0;
-								toRptr[i].streamid = 0;
-								toRptr[i].adr = 0;
-							}
-							break;
-						}
-					}
-
-					/* no match ? */
-					if ((i == 3) && bool_regen_header) {
-						/* check if this a continuation of audio that timed out */
-
-						if (g2buf.ctrl & 0x40)
-							;  /* we do not care about end-of-QSO */
-						else {
-							/* for which repeater this stream has timed out ?  */
-							for (i = 0; i < 3; i++) {
-								/* match saved stream ? */
-								if (0==memcmp(toRptr[i].saved_hdr + 14, &g2buf.streamid, 2) && toRptr[i].saved_adr==fromDst4.sin_addr.s_addr) {
-									/* repeater module is inactive ?  */
-									if (toRptr[i].last_time==0 && band_txt[i].last_time==0) {
-										printf("Re-generating header for streamID=%04x\n", g2buf.streamid);
-
-										toRptr[i].saved_hdr[4] = (unsigned char)((G2_COUNTER_OUT >> 8) & 0xff);
-										toRptr[i].saved_hdr[5] = (unsigned char)(G2_COUNTER_OUT++ & 0xff);
-
-										/* re-generate/send the header */
-										sendto(srv_sock, toRptr[i].saved_hdr, 58, 0, (struct sockaddr *)&toRptr[i].band_addr, sizeof(struct sockaddr_in));
-
-										/* send this audio packet to repeater */
-										memcpy(rptrbuf.pkt_id, "DSTR", 4);
-										rptrbuf.counter = htons(G2_COUNTER_OUT++);
-										rptrbuf.flag[0] = 0x73;
-										rptrbuf.flag[1] = 0x12;
-										rptrbuf.flag[2] = 0x00;
-										rptrbuf.remaining = 0x13;
-										rptrbuf.vpkt.icm_id = 0x20;
-										memcpy(&rptrbuf.vpkt.dst_rptr_id, g2buf.flagb, 18);
-
-										sendto(srv_sock, rptrbuf.pkt_id, 29, 0, (struct sockaddr *)&toRptr[i].band_addr, sizeof(struct sockaddr_in));
-
-										/* make sure that any more audio arriving will be accepted */
-										toRptr[i].streamid = g2buf.streamid;
-										toRptr[i].adr = fromDst4.sin_addr.s_addr;
-
-										/* time it, in case stream times out */
-										time(&toRptr[i].last_time);
-
-										toRptr[i].sequence = rptrbuf.vpkt.ctrl;
-
-									}
-									break;
-								}
-							}
-						}
-					}
-				}
-			}
-			FD_CLR (g2_sock,&fdset);
-		}
-
-		// process packets coming from local repeater modules
-		if (FD_ISSET(srv_sock, &fdset)) {
-			char temp_radio_user[CALL_SIZE + 1];
-			char temp_mod;
-
-			char arearp_cs[CALL_SIZE + 1];
-			char zonerp_cs[CALL_SIZE + 1];
-			char ip[IP_SIZE + 1];
-
-			char tempfile[FILENAME_MAX + 1];
-
-			SDSVT g2buf;
-
-			socklen_t fromlen = sizeof(struct sockaddr_in);
-			int recvlen = recvfrom(srv_sock, rptrbuf.pkt_id, 58,  0, (struct sockaddr *)&fromRptr, &fromlen);
-
-			if (0 == memcmp(rptrbuf.pkt_id, "DSTR", 4)) {
-				/////////////////////////////////////////////////////////////////////
-				// some ICOM handshaking...
-				if (10==recvlen && 0x72==rptrbuf.flag[0]) {	// ACK from rptr
-					NEW_REPLY_SEQ = ntohs(rptrbuf.counter);
-					if (NEW_REPLY_SEQ == OLD_REPLY_SEQ) {
-						G2_COUNTER_OUT = NEW_REPLY_SEQ;
-						OLD_REPLY_SEQ = NEW_REPLY_SEQ - 1;
-					} else
-						OLD_REPLY_SEQ = NEW_REPLY_SEQ;
-				} else if (0x73U==rptrbuf.flag[0] && (0x21U==rptrbuf.flag[1] || 0x11U==rptrbuf.flag[1] || 0x0U==rptrbuf.flag[1])) {
-					rptrbuf.flag[0] = 0x72U;
-					memset(rptrbuf.flag+1, 0x0U, 3);
-					sendto(srv_sock, rptrbuf.pkt_id, 10, 0, (struct sockaddr *)&toRptr[0].band_addr, sizeof(struct sockaddr_in));
-				// end of ICOM handshaking
-				/////////////////////////////////////////////////////////////////////
-				} else if ( (recvlen==58 || recvlen==29 || recvlen==32) && rptrbuf.flag[0]==0x73 && rptrbuf.flag[1]==0x12 && rptrbuf.flag[2]==0x0 && rptrbuf.vpkt.icm_id==0x20 && (rptrbuf.remaining==0x30 || rptrbuf.remaining==0x13 || rptrbuf.remaining==0x16) ) {
-					SDSTR reply;
-					memcpy(reply.pkt_id, "DSTR", 4);
-					reply.counter = rptrbuf.counter;
-					reply.flag[0] = 0x72U;
-					memset(reply.flag+1, 0, 3);
-					sendto(srv_sock, reply.pkt_id, 10, 0, (struct sockaddr *)&toRptr[0].band_addr, sizeof(struct sockaddr_in));
-					if (recvlen == 58) {
-						vPacketCount = 0U;
-						if (bool_qso_details)
-							printf("id=%04x cntr=%04x start RPTR ur=%.8s r1=%.8s r2=%.8s my=%.8s/%.4s ip=%s\n", ntohs(rptrbuf.vpkt.streamid), ntohs(rptrbuf.counter), rptrbuf.vpkt.hdr.ur, rptrbuf.vpkt.hdr.r1, rptrbuf.vpkt.hdr.r2, rptrbuf.vpkt.hdr.my, rptrbuf.vpkt.hdr.nm, inet_ntoa(fromRptr.sin_addr));
-
-						if (0==memcmp(rptrbuf.vpkt.hdr.r1, OWNER.c_str(), 7) &&	Flag_is_ok(rptrbuf.vpkt.hdr.flag[0])) {
-
-							int i = rptrbuf.vpkt.hdr.r1[7] - 'A';
-
-							if (i>=0  && i<3) {
-								if (bool_dtmf_debug)
-									printf("resetting dtmf[%d] (got a header)\n", i);
-								dtmf_last_frame[i] = 0;
-								dtmf_counter[i] = 0;
-								memset(dtmf_buf[i], 0, sizeof(dtmf_buf[i]));
-								dtmf_buf_count[i] = 0;
-
-								/* Initialize the LAST HEARD data for the band */
-
-								band_txt[i].streamID = rptrbuf.vpkt.streamid;
-
-								memcpy(band_txt[i].flags, rptrbuf.vpkt.hdr.flag, 3);
-
-								memcpy(band_txt[i].lh_mycall, rptrbuf.vpkt.hdr.my, 8);
-								band_txt[i].lh_mycall[8] = '\0';
-
-								memcpy(band_txt[i].lh_sfx, rptrbuf.vpkt.hdr.nm, 4);
-								band_txt[i].lh_sfx[4] = '\0';
-
-								memcpy(band_txt[i].lh_yrcall, rptrbuf.vpkt.hdr.ur, 8);
-								band_txt[i].lh_yrcall[8] = '\0';
-
-								memcpy(band_txt[i].lh_rpt1, rptrbuf.vpkt.hdr.r1, 8);
-								band_txt[i].lh_rpt1[8] = '\0';
-
-								memcpy(band_txt[i].lh_rpt2, rptrbuf.vpkt.hdr.r2, 8);
-								band_txt[i].lh_rpt2[8] = '\0';
-
-								time(&band_txt[i].last_time);
-
-								band_txt[i].txt[0] = '\0';
-								band_txt[i].txt_cnt = 0;
-								band_txt[i].sent_key_on_msg = false;
-
-								band_txt[i].dest_rptr[0] = '\0';
-
-								/* try to process GPS mode: GPRMC and ID */
-								band_txt[i].temp_line[0] = '\0';
-								band_txt[i].temp_line_cnt = 0;
-								band_txt[i].gprmc[0] = '\0';
-								band_txt[i].gpid[0] = '\0';
-								band_txt[i].is_gps_sent = false;
-								// band_txt[i].gps_last_time = 0; DO NOT reset it
-
-								new_group[i] = true;
-								to_print[i] = 0;
-								ABC_grp[i] = false;
-
-								band_txt[i].num_dv_frames = 0;
-								band_txt[i].num_dv_silent_frames = 0;
-								band_txt[i].num_bit_errors = 0;
-
-								/* select the band for aprs processing, and lock on the stream ID */
-								if (bool_send_aprs)
-									aprs->SelectBand(i, ntohs(rptrbuf.vpkt.streamid));
-							}
-						}
-
-						/* Is MYCALL valid ? */
-						memset(temp_radio_user, ' ', 8);
-						memcpy(temp_radio_user, rptrbuf.vpkt.hdr.my, 8);
-						temp_radio_user[8] = '\0';
-
-						int mycall_valid = regexec(&preg, temp_radio_user, 0, NULL, 0);
-
-						if (mycall_valid == REG_NOERROR)
-							; // printf("MYCALL [%s] passed IRC expression validation\n", temp_radio_user);
-						else {
-							if (mycall_valid == REG_NOMATCH)
-								printf("MYCALL [%s] failed IRC expression validation\n", temp_radio_user);
-							else
-								printf("Failed to validate MYCALL [%s], regexec error=%d\n", temp_radio_user, mycall_valid);
-						}
-
-						/* send data qnlink */
-						if (mycall_valid == REG_NOERROR)
-							sendto(srv_sock, rptrbuf.pkt_id, recvlen, 0, (struct sockaddr *)&plug, sizeof(struct sockaddr_in));
-
-						if ( mycall_valid==REG_NOERROR &&
-								memcmp(rptrbuf.vpkt.hdr.ur, "XRF", 3) &&	// not a reflector
-								memcmp(rptrbuf.vpkt.hdr.ur, "REF", 3) &&
-								memcmp(rptrbuf.vpkt.hdr.ur, "DCS", 3) &&
-								rptrbuf.vpkt.hdr.ur[0]!=' ' && 				// must have something
-								memcmp(rptrbuf.vpkt.hdr.ur, "CQCQCQ", 6) )	// urcall is NOT CQCQCQ
-						{
-							if ( rptrbuf.vpkt.hdr.ur[0]=='/' &&										// repeater routing!
-									0==memcmp(rptrbuf.vpkt.hdr.r1, OWNER.c_str(), 7) &&				// rpt1 this repeater
-									(rptrbuf.vpkt.hdr.r1[7]>='A' && rptrbuf.vpkt.hdr.r1[7]<='C') &&	// with a valid module
-									0==memcmp(rptrbuf.vpkt.hdr.r2, OWNER.c_str(), 7) && 			// rpt2 is this repeater
-									rptrbuf.vpkt.hdr.r2[7]=='G' &&									// local Gateway
-									Flag_is_ok(rptrbuf.vpkt.hdr.flag[0]) )
-							{
-								if (memcmp(rptrbuf.vpkt.hdr.ur+1, OWNER.c_str(), 6)) {	// the value after the slash is NOT this repeater
-									int i = rptrbuf.vpkt.hdr.r1[7] - 'A';
-
-									if (i>=0 && i<3) {
-										/* one radio user on a repeater module at a time */
-										if (to_remote_g2[i].toDst4.sin_addr.s_addr == 0) {
-											/* YRCALL=/repeater + mod */
-											/* YRCALL=/KJ4NHFB */
-
-											memset(temp_radio_user, ' ', 8);
-											memcpy(temp_radio_user, rptrbuf.vpkt.hdr.ur+1, 6);
-											temp_radio_user[6] = ' ';
-											temp_radio_user[7] = rptrbuf.vpkt.hdr.ur[7];
-											if (temp_radio_user[7] == ' ')
-												temp_radio_user[7] = 'A';
-											temp_radio_user[CALL_SIZE] = '\0';
-
-											bool result = get_yrcall_rptr(temp_radio_user, arearp_cs, zonerp_cs, &temp_mod, ip, 'R');
-											if (result) { /* it is a repeater */
-												uint32_t address;
-												/* set the destination */
-												to_remote_g2[i].streamid = rptrbuf.vpkt.streamid;
-												memset(&to_remote_g2[i].toDst4, 0, sizeof(struct sockaddr_in));
-												to_remote_g2[i].toDst4.sin_family = AF_INET;
-												to_remote_g2[i].toDst4.sin_addr.s_addr = address = inet_addr(ip);
-												// if the address is in the portmap, we'll use that saved port instead of the default port
-												auto theAddress = portmap.find(address);
-												to_remote_g2[i].toDst4.sin_port = htons((theAddress==portmap.end()) ? g2_external.port : theAddress->second);
-
-												memcpy(g2buf.title, "DSVT", 4);
-												g2buf.config = 0x10;
-												g2buf.flaga[0] = g2buf.flaga[1] = g2buf.flaga[2] = 0x00;
-												g2buf.id =  rptrbuf.vpkt.icm_id;
-												g2buf.flagb[0] = rptrbuf.vpkt.dst_rptr_id;
-												g2buf.flagb[1] = rptrbuf.vpkt.snd_rptr_id;
-												g2buf.flagb[2] = rptrbuf.vpkt.snd_term_id;
-												g2buf.streamid = rptrbuf.vpkt.streamid;
-												g2buf.ctrl = rptrbuf.vpkt.ctrl;
-												memcpy(g2buf.hdr.flag, rptrbuf.vpkt.hdr.flag, 3);
-												/* set rpt1 */
-												memset(g2buf.hdr.rpt1, ' ', 8);
-												memcpy(g2buf.hdr.rpt1, arearp_cs, strlen(arearp_cs));
-												g2buf.hdr.rpt1[7] = temp_mod;
-												/* set rpt2 */
-												memset(g2buf.hdr.rpt2, ' ', 8);
-												memcpy(g2buf.hdr.rpt2, zonerp_cs, strlen(zonerp_cs));
-												g2buf.hdr.rpt2[7] = 'G';
-												/* set yrcall, can NOT let it be slash and repeater + module */
-												memcpy(g2buf.hdr.urcall, "CQCQCQ  ", 8);
-												memcpy(g2buf.hdr.mycall, rptrbuf.vpkt.hdr.my, 8);
-												memcpy(g2buf.hdr.sfx, rptrbuf.vpkt.hdr.nm, 4);
-
-												/* set PFCS */
-												calcPFCS(g2buf.title, 56);
-
-												// The remote repeater has been set, lets fill in the dest_rptr
-												// so that later we can send that to the LIVE web site
-												memcpy(band_txt[i].dest_rptr, g2buf.hdr.rpt1, 8);
-												band_txt[i].dest_rptr[CALL_SIZE] = '\0';
-
-												// send to remote gateway
-												for (int j=0; j<5; j++)
-													sendto(g2_sock, g2buf.title, 56, 0, (struct sockaddr *)&(to_remote_g2[i].toDst4), sizeof(struct sockaddr_in));
-
-												printf("id=%04x Routing to IP=%s:%u ur=%.8s r1=%.8s r2=%.8s my=%.8s/%.4s\n",
-												ntohs(g2buf.streamid), inet_ntoa(to_remote_g2[i].toDst4.sin_addr), ntohs(to_remote_g2[i].toDst4.sin_port),
-												g2buf.hdr.urcall, g2buf.hdr.rpt1, g2buf.hdr.rpt2, g2buf.hdr.mycall, g2buf.hdr.sfx);
-
-												time(&(to_remote_g2[i].last_time));
-											}
-										}
-									}
-								}
-							}
-							else if (memcmp(rptrbuf.vpkt.hdr.ur, OWNER.c_str(), 7) &&				// urcall is not this repeater
-									0==memcmp(rptrbuf.vpkt.hdr.r1, OWNER.c_str(), 7) &&				// rpt1 is this repeater
-									(rptrbuf.vpkt.hdr.r1[7]>='A'&& rptrbuf.vpkt.hdr.r1[7]<='C') &&	// mod is A,B,C
-									0==memcmp(rptrbuf.vpkt.hdr.r2, OWNER.c_str(), 7) &&				// rpt2 is this repeater
-									rptrbuf.vpkt.hdr.r2[7]=='G' &&									// local Gateway
-									Flag_is_ok(rptrbuf.vpkt.hdr.flag[0])) {
-
-
-								memset(temp_radio_user, ' ', 8);
-								memcpy(temp_radio_user, rptrbuf.vpkt.hdr.ur, 8);
-								temp_radio_user[8] = '\0';
-								bool result = get_yrcall_rptr(temp_radio_user, arearp_cs, zonerp_cs, &temp_mod, ip, 'U');
-								if (result) {
-									/* destination is a remote system */
-									if (memcmp(zonerp_cs, OWNER.c_str(), 7) != 0) {
-										int i = rptrbuf.vpkt.hdr.r1[7] - 'A';
-
-										if (i>=0 && i<3) {
-											/* one radio user on a repeater module at a time */
-											if (to_remote_g2[i].toDst4.sin_addr.s_addr == 0) {
-												uint32_t address;
-												/* set the destination */
-												to_remote_g2[i].streamid = rptrbuf.vpkt.streamid;
-												memset(&to_remote_g2[i].toDst4, 0, sizeof(struct sockaddr_in));
-												to_remote_g2[i].toDst4.sin_family = AF_INET;
-												to_remote_g2[i].toDst4.sin_addr.s_addr = address = inet_addr(ip);
-												// if the address is in the portmap, we'll use that port instead of the default
-												auto theAddress = portmap.find(address);
-												to_remote_g2[i].toDst4.sin_port = htons((theAddress==portmap.end())? g2_external.port : theAddress->second);
-
-												memcpy(g2buf.title, "DSVT", 4);
-												g2buf.config = 0x10;
-												g2buf.flaga[0] = g2buf.flaga[1] = g2buf.flaga[2] = 0x00;
-												g2buf.id = rptrbuf.vpkt.icm_id;
-												g2buf.flagb[0] = rptrbuf.vpkt.dst_rptr_id;
-												g2buf.flagb[1] = rptrbuf.vpkt.snd_rptr_id;
-												g2buf.flagb[2] = rptrbuf.vpkt.snd_term_id;
-												g2buf.streamid = rptrbuf.vpkt.streamid;
-												g2buf.ctrl = rptrbuf.vpkt.ctrl;
-												memcpy(g2buf.hdr.flag, rptrbuf.vpkt.hdr.flag, 3);
-												/* set rpt1 */
-												memset(g2buf.hdr.rpt1, ' ', 8);
-												memcpy(g2buf.hdr.rpt1, arearp_cs, strlen(arearp_cs));
-												g2buf.hdr.rpt1[7] = temp_mod;
-												/* set rpt2 */
-												memset(g2buf.hdr.rpt2, ' ', 8);
-												memcpy(g2buf.hdr.rpt2, zonerp_cs, strlen(zonerp_cs));
-												g2buf.hdr.rpt2[7] = 'G';
-												/* set PFCS */
-												memcpy(g2buf.hdr.urcall, rptrbuf.vpkt.hdr.ur, 8);
-												memcpy(g2buf.hdr.mycall, rptrbuf.vpkt.hdr.my, 8);
-												memcpy(g2buf.hdr.sfx, rptrbuf.vpkt.hdr.nm, 4);
-												calcPFCS(g2buf.title, 56);
-
-
-												// The remote repeater has been set, lets fill in the dest_rptr
-												// so that later we can send that to the LIVE web site
-												memcpy(band_txt[i].dest_rptr, g2buf.hdr.rpt1, 8);
-												band_txt[i].dest_rptr[CALL_SIZE] = '\0';
-
-												/* send to remote gateway */
-												for (int j=0; j<5; j++)
-													sendto(g2_sock, g2buf.title, 56, 0, (struct sockaddr *)&(to_remote_g2[i].toDst4), sizeof(struct sockaddr_in));
-
-												printf("Routing to IP=%s:%u id=%04x my=%.8s/%.4s ur=%.8s rpt1=%.8s rpt2=%.8s\n", inet_ntoa(to_remote_g2[i].toDst4.sin_addr), ntohs(to_remote_g2[i].toDst4.sin_port), ntohs(g2buf.streamid), g2buf.hdr.mycall, g2buf.hdr.sfx, g2buf.hdr.urcall, g2buf.hdr.rpt1, g2buf.hdr.rpt2);
-
-												time(&(to_remote_g2[i].last_time));
-											}
-										}
-									}
-									else
-									{
-										int i = rptrbuf.vpkt.hdr.r1[7] - 'A';
-
-										if (i>=0 && i<3) {
-											/* the user we are trying to contact is on our gateway */
-											/* make sure they are on a different module */
-											if (temp_mod != rptrbuf.vpkt.hdr.r1[7]) {
-												/*
-												   The remote repeater has been set, lets fill in the dest_rptr
-												   so that later we can send that to the LIVE web site
-												*/
-												memcpy(band_txt[i].dest_rptr, rptrbuf.vpkt.hdr.r2, 8);
-												band_txt[i].dest_rptr[7] = temp_mod;
-												band_txt[i].dest_rptr[8] = '\0';
-
-												i = temp_mod - 'A';
-
-												/* valid destination repeater module? */
-												if (i>=0 && i<3) {
-													/*
-													   toRptr[i] :    receiving from a remote system or cross-band
-													   band_txt[i] :  local RF is talking.
-													*/
-													if ((toRptr[i].last_time == 0) && (band_txt[i].last_time == 0)) {
-														printf("CALLmode cross-banding from mod %c to %c\n",  rptrbuf.vpkt.hdr.r1[7], temp_mod);
-
-														rptrbuf.vpkt.hdr.r2[7] = temp_mod;
-														rptrbuf.vpkt.hdr.r1[7] = 'G';
-														calcPFCS(rptrbuf.pkt_id, 58);
-
-														sendto(srv_sock, rptrbuf.pkt_id, 58, 0, (struct sockaddr *)&toRptr[i].band_addr, sizeof(struct sockaddr_in));
-
-														/* This is the active streamid */
-														toRptr[i].streamid = rptrbuf.vpkt.streamid;
-														toRptr[i].adr = fromRptr.sin_addr.s_addr;
-
-														/* time it, in case stream times out */
-														time(&toRptr[i].last_time);
-
-														/* bump the G2 counter */
-														G2_COUNTER_OUT++;
-
-														toRptr[i].sequence = rptrbuf.vpkt.ctrl;
-													}
-												}
-											}
-											else
-												printf("icom rule: no routing from %.8s to %s%c\n", rptrbuf.vpkt.hdr.r1, arearp_cs, temp_mod);
-										}
-									}
-								}
-								else
-								{
-									if ('L' != rptrbuf.vpkt.hdr.ur[7]) // as long as this doesn't look like a linking command
-										playNotInCache = true; // we need to wait until user's transmission is over
-								}
-							}
-						}
-						else if (0 == memcmp(rptrbuf.vpkt.hdr.ur, "      C0", 8)) {
-							int i = rptrbuf.vpkt.hdr.r1[7] - 'A';
-
-							if (i>=0 && i<3) {
-								/* voicemail file is closed */
-								if ((vm[i].fd == -1) && (vm[i].file[0] != '\0')) {
-									unlink(vm[i].file);
-									printf("removed voicemail file: %s\n", vm[i].file);
-									vm[i].file[0] = '\0';
-								} else
-									printf("No voicemail to clear or still recording\n");
-							}
-						}
-						else if (0 == memcmp(rptrbuf.vpkt.hdr.ur, "      R0", 8)) {
-							int i = rptrbuf.vpkt.hdr.r1[7] - 'A';
-
-							if (i>=0 && i<3) {
-								/* voicemail file is closed */
-								if ((vm[i].fd == -1) && (vm[i].file[0] != '\0')) {
-									snprintf(vm[i].message, 21, "VOICEMAIL ON MOD %c  ", 'A'+i);
-									try {
-										std::async(std::launch::async, &CQnetGateway::PlayFileThread, this, std::ref(vm[i]));
-									} catch (const std::exception &e) {
-										printf("Failed to start voicemail playback. Exception: %s\n", e.what());
-									}
-								} else
-									printf("No voicemail to recall or still recording\n");
-							}
-						}
-						else if (0 == memcmp(rptrbuf.vpkt.hdr.ur, "      S0", 8)) {
-							int i = rptrbuf.vpkt.hdr.r1[7] - 'A';
-
-							if (i>=0 && i<3) {
-								if (vm[i].fd >= 0)
-									printf("Already recording for voicemail on mod %d\n", i);
-								else {
-									memset(tempfile, '\0', sizeof(tempfile));
-									snprintf(tempfile, FILENAME_MAX, "%s/%c_%s", echotest_dir.c_str(), rptrbuf.vpkt.hdr. r1[7], "voicemail.dat");
-
-									vm[i].fd = open(tempfile, O_CREAT | O_WRONLY | O_TRUNC | O_APPEND, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-									if (vm[i].fd < 0)
-										printf("Failed to create file %s for voicemail\n", tempfile);
-									else {
-										strcpy(vm[i].file, tempfile);
-										printf("Recording mod %c for voicemail into file:[%s]\n", rptrbuf.vpkt.hdr.r1[7], vm[i].file);
-
-										time(&vm[i].last_time);
-										vm[i].streamid = rptrbuf.vpkt.streamid;
-
-										memcpy(recbuf.title, "DSVT", 4);
-										recbuf.config = 0x10;
-										recbuf.flaga[0] = recbuf.flaga[1] = recbuf.flaga[2] = 0;
-										recbuf.id =  rptrbuf.vpkt.icm_id;
-										recbuf.flagb[0] = rptrbuf.vpkt.dst_rptr_id;
-										recbuf.flagb[1] = rptrbuf.vpkt.snd_rptr_id;
-										recbuf.flagb[2] = rptrbuf.vpkt.snd_term_id;
-										memcpy(&recbuf.streamid, &rptrbuf.vpkt.streamid, 44);
-										memset(recbuf.hdr.rpt1, ' ', 8);
-										memcpy(recbuf.hdr.rpt1, OWNER.c_str(), OWNER.size());
-										recbuf.hdr.rpt1[7] = rptrbuf.vpkt.hdr.r1[7];
-										memset(recbuf.hdr.rpt2, ' ', 8);
-										memcpy(recbuf.hdr.rpt2,  OWNER.c_str(), OWNER.size());
-										recbuf.hdr.rpt2[7] = 'G';
-										memcpy(recbuf.hdr.urcall, "CQCQCQ  ", 8);
-
-										calcPFCS(recbuf.title, 56);
-
-										memcpy(vm[i].header.title, recbuf.title, 56);
-									}
-								}
-							}
-						}
-						else if (0 == memcmp(rptrbuf.vpkt.hdr.ur, "       E", 8)) {
-							int i = rptrbuf.vpkt.hdr.r1[7] - 'A';
-
-							if (i>=0 && i<3) {
-								if (recd[i].fd >= 0)
-									printf("Already recording for echotest on mod %d\n", i);
-								else {
-									memset(tempfile, '\0', sizeof(tempfile));
-									snprintf(tempfile, FILENAME_MAX, "%s/%c_%s", echotest_dir.c_str(), rptrbuf.vpkt.hdr.r1[7], "echotest.dat");
-
-									recd[i].fd = open(tempfile, O_CREAT | O_WRONLY | O_EXCL | O_TRUNC | O_APPEND, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-									if (recd[i].fd < 0)
-										printf("Failed to create file %s for echotest\n", tempfile);
-									else {
-										strcpy(recd[i].file, tempfile);
-										printf("Recording mod %c for echotest into file:[%s]\n", rptrbuf.vpkt.hdr.r1[7], recd[i].file);
-										snprintf(recd[i].message, 21, "ECHO ON MODULE %c    ", 'A' + i);
-										time(&recd[i].last_time);
-										recd[i].streamid = rptrbuf.vpkt.streamid;
-
-										memcpy(recbuf.title, "DSVT", 4);
-										recbuf.config = 0x10;
-										recbuf.id =  rptrbuf.vpkt.icm_id;
-										recbuf.flaga[0] = recbuf.flaga[1] = recbuf.flaga[2] = 0;
-										recbuf.flagb[0] = rptrbuf.vpkt.dst_rptr_id;
-										recbuf.flagb[1] = rptrbuf.vpkt.snd_rptr_id;
-										recbuf.flagb[2] = rptrbuf.vpkt.snd_term_id;
-										memcpy(&recbuf.streamid, &rptrbuf.vpkt.streamid, 44);
-										memset(recbuf.hdr.rpt1, ' ', 8);
-										memcpy(recbuf.hdr.rpt1, OWNER.c_str(), OWNER.length());
-										recbuf.hdr.rpt1[7] = rptrbuf.vpkt.hdr.r1[7];
-										memset(recbuf.hdr.rpt2, ' ', 8);
-										memcpy(recbuf.hdr.rpt2,  OWNER.c_str(), OWNER.length());
-										recbuf.hdr.rpt2[7] = 'G';
-										memcpy(recbuf.hdr.urcall, "CQCQCQ  ", 8);
-
-										calcPFCS(recbuf.title, 56);
-
-										memcpy(recd[i].header.title, recbuf.title, 56);
-									}
-								}
-							}
-						/* check for cross-banding */
-						}
-						else if ( 0==memcmp(rptrbuf.vpkt.hdr.ur, "CQCQCQ", 6) &&		// yrcall is CQCQCQ
-									0==memcmp(rptrbuf.vpkt.hdr.r2, OWNER.c_str(), 7) &&	// rpt1 is this repeater
-									0==memcmp(rptrbuf.vpkt.hdr.r1, OWNER.c_str(), 7) &&	// rpt2 is this repeater
-								(rptrbuf.vpkt.hdr.r1[7]>='A' && rptrbuf.vpkt.hdr.r1[7]<='C') &&	// mod of rpt1 is A,B,C
-								(rptrbuf.vpkt.hdr.r2[7]>='A' && rptrbuf.vpkt.hdr.r2[7]<='C') &&	// !!! usually G on rpt2, but we see A,B,C with
-								rptrbuf.vpkt.hdr.r2[7]!=rptrbuf.vpkt.hdr.r1[7] ) {				// cross-banding? make sure NOT the same
-							int i = rptrbuf.vpkt.hdr.r1[7] - 'A';
-
-							if (i>=0 && i<3) {
-								// The remote repeater has been set, lets fill in the dest_rptr
-								// so that later we can send that to the LIVE web site
-								memcpy(band_txt[i].dest_rptr, rptrbuf.vpkt.hdr.r2, 8);
-								band_txt[i].dest_rptr[8] = '\0';
-							}
-
-							i = rptrbuf.vpkt.hdr.r2[7] - 'A';
-
-							// valid destination repeater module?
-							if (i>=0 && i<3) {
-								// toRptr[i] :    receiving from a remote system or cross-band
-								// band_txt[i] :  local RF is talking.
-								if ((toRptr[i].last_time == 0) && (band_txt[i].last_time == 0)) {
-									printf("ZONEmode cross-banding from mod %c to %c\n",  rptrbuf.vpkt.hdr.r1[7], rptrbuf.vpkt.hdr.r2[7]);
-
-									rptrbuf.vpkt.hdr.r1[7] = 'G';
-									calcPFCS(rptrbuf.pkt_id, 58);
-
-									sendto(srv_sock, rptrbuf.pkt_id, 58, 0, (struct sockaddr *)&toRptr[i].band_addr, sizeof(struct sockaddr_in));
-
-									/* This is the active streamid */
-									toRptr[i].streamid = rptrbuf.vpkt.streamid;
-									toRptr[i].adr = fromRptr.sin_addr.s_addr;
-
-									/* time it, in case stream times out */
-									time(&toRptr[i].last_time);
-
-									/* bump the G2 counter */
-									G2_COUNTER_OUT++;
-
-									toRptr[i].sequence = rptrbuf.vpkt.ctrl;
-								}
-							}
-						}
-					}
-					else
-					{	// recvlen is 29 or 32
-						for (int i=0; i<3; i++) {
-							if (band_txt[i].streamID == rptrbuf.vpkt.streamid) {
-								time(&band_txt[i].last_time);
-
-								if (rptrbuf.vpkt.ctrl & 0x40) {	// end of voice data
-									if (dtmf_buf_count[i] > 0) {
-										dtmf_file = dtmf_dir;
-										dtmf_file.push_back('/');
-										dtmf_file.push_back('A'+i);
-										dtmf_file += "_mod_DTMF_NOTIFY";
-										if (bool_dtmf_debug)
-											printf("Saving dtmfs=[%s] into file: [%s]\n", dtmf_buf[i], dtmf_file.c_str());
-										FILE *dtmf_fp = fopen(dtmf_file.c_str(), "w");
-										if (dtmf_fp) {
-											fprintf(dtmf_fp, "%s\n%s", dtmf_buf[i], band_txt[i].lh_mycall);
-											fclose(dtmf_fp);
-										} else
-											printf("Failed to create dtmf file %s\n", dtmf_file.c_str());
-
-
-										if (bool_dtmf_debug)
-											printf("resetting dtmf[%d] (printed dtmf code %s from %s)\n", i, dtmf_buf[i], band_txt[i].lh_mycall);
-										memset(dtmf_buf[i], 0, sizeof(dtmf_buf[i]));
-										dtmf_buf_count[i] = 0;
-										dtmf_counter[i] = 0;
-										dtmf_last_frame[i] = 0;
-									}
-									if (! band_txt[i].sent_key_on_msg) {
-										band_txt[i].txt[0] = '\0';
-										if (memcmp(band_txt[i].lh_yrcall, "CQCQCQ", 6) == 0) {
-											set_dest_rptr(i, band_txt[i].dest_rptr);
-											if (memcmp(band_txt[i].dest_rptr, "REF", 3) == 0)
-												band_txt[i].dest_rptr[0] = '\0';
-										}
-										// we have the 20-character message, send it to the server...
-										ii->sendHeardWithTXMsg(band_txt[i].lh_mycall, band_txt[i].lh_sfx, (strstr(band_txt[i].lh_yrcall,"REF") == NULL)?band_txt[i].lh_yrcall:"CQCQCQ  ", band_txt[i].lh_rpt1, band_txt[i].lh_rpt2, band_txt[i].flags[0], band_txt[i].flags[1], band_txt[i].flags[2], band_txt[i].dest_rptr, band_txt[i].txt);
-										band_txt[i].sent_key_on_msg = true;
-									}
-									// send the "key off" message, this will end up in the openquad.net Last Heard webpage.
-									ii->sendHeardWithTXStats(band_txt[i].lh_mycall, band_txt[i].lh_sfx, band_txt[i].lh_yrcall, band_txt[i].lh_rpt1, band_txt[i].lh_rpt2, band_txt[i].flags[0], band_txt[i].flags[1], band_txt[i].flags[2], band_txt[i].num_dv_frames, band_txt[i].num_dv_silent_frames, band_txt[i].num_bit_errors);
-
-									if (playNotInCache) {
-										// Not in cache, please try again!
-										FILE *fp = fopen(qnvoicefile.c_str(), "w");
-										if (fp) {
-											fprintf(fp, "%c_notincache.dat_NOT_IN_CACHE\n", band_txt[i].lh_rpt1[7]);
-											fclose(fp);
-										}
-										playNotInCache = false;
-									}
-
-									band_txt[i].streamID = 0;
-									band_txt[i].flags[0] = band_txt[i].flags[1] = band_txt[i].flags[2] = 0;
-									band_txt[i].lh_mycall[0] = '\0';
-									band_txt[i].lh_sfx[0] = '\0';
-									band_txt[i].lh_yrcall[0] = '\0';
-									band_txt[i].lh_rpt1[0] = '\0';
-									band_txt[i].lh_rpt2[0] = '\0';
-
-									band_txt[i].last_time = 0;
-
-									band_txt[i].txt[0] = '\0';
-									band_txt[i].txt_cnt = 0;
-
-									band_txt[i].dest_rptr[0] = '\0';
-
-									band_txt[i].num_dv_frames = 0;
-									band_txt[i].num_dv_silent_frames = 0;
-									band_txt[i].num_bit_errors = 0;
-								}
-								else
-								{	// not the end of the voice stream
-									int ber_data[3];
-									int ber_errs = dstar_dv_decode(rptrbuf.vpkt.vasd.voice, ber_data);
-									if (ber_data[0] == 0xf85)
-										band_txt[i].num_dv_silent_frames++;
-									band_txt[i].num_bit_errors += ber_errs;
-									band_txt[i].num_dv_frames++;
-
-									if ((ber_data[0] & 0x0ffc) == 0xfc0) {
-										dtmf_digit = (ber_data[0] & 0x03) | ((ber_data[2] & 0x60) >> 3);
-										if (dtmf_counter[i] > 0) {
-											if (dtmf_last_frame[i] != dtmf_digit)
-												dtmf_counter[i] = 0;
-										}
-										dtmf_last_frame[i] = dtmf_digit;
-										dtmf_counter[i]++;
-
-										if ((dtmf_counter[i] == 5) && (dtmf_digit >= 0) && (dtmf_digit <= 15)) {
-											if (dtmf_buf_count[i] < MAX_DTMF_BUF) {
-												const char *dtmf_chars = "147*2580369#ABCD";
-												dtmf_buf[i][ dtmf_buf_count[i] ] = dtmf_chars[dtmf_digit];
-												dtmf_buf_count[i]++;
-											}
-										}
-										const unsigned char silence[9] = { 0x9E, 0x8D, 0x32, 0x88, 0x26, 0x1A, 0x3F, 0x61, 0xE8 };
-										if (recvlen == 29)
-											memcpy(rptrbuf.vpkt.vasd.voice, silence, 9);
-										else
-											memcpy(rptrbuf.vpkt.vasd1.voice, silence, 9);
-									} else
-										dtmf_counter[i] = 0;
-								}
-								break;
-							}
-						}
-						vPacketCount++;
-						if (recvlen == 29)	// process the slow data from every voice packet
-							ProcessSlowData(rptrbuf.vpkt.vasd.text,  rptrbuf.vpkt.streamid);
-						else
-							ProcessSlowData(rptrbuf.vpkt.vasd1.text, rptrbuf.vpkt.streamid);
-
-						/* send data to qnlink */
-						sendto(srv_sock, rptrbuf.pkt_id, recvlen, 0, (struct sockaddr *)&plug, sizeof(struct sockaddr_in));
-
-						/* aprs processing */
-						if (bool_send_aprs)
-							//                             streamID               seq                audio+text
-							aprs->ProcessText(ntohs(rptrbuf.vpkt.streamid), rptrbuf.vpkt.ctrl, rptrbuf.vpkt.vasd.voice);
-
-						for (int i=0; i<3; i++) {
-							/* find out if data must go to the remote G2 */
-							if (to_remote_g2[i].streamid == rptrbuf.vpkt.streamid) {
-								memcpy(g2buf.title, "DSVT", 4);
-								g2buf.config = 0x20;
-								g2buf.flaga[0] = g2buf.flaga[1] = g2buf.flaga[2] = 0;
-								memcpy(&g2buf.id, &rptrbuf.vpkt.icm_id, 7);
-								if (recvlen == 29)
-									memcpy(g2buf.vasd.voice, rptrbuf.vpkt.vasd.voice, 12);
-								else
-									memcpy(g2buf.vasd.voice, rptrbuf.vpkt.vasd1.voice, 12);
-
-								uint32_t address = to_remote_g2[i].toDst4.sin_addr.s_addr;
-								// if the address is in the portmap, we'll use that port instead of the default
-								auto theAddress = portmap.find(address);
-								to_remote_g2[i].toDst4.sin_port = htons((theAddress==portmap.end())? g2_external.port : theAddress->second);
-								sendto(g2_sock, g2buf.title, 27, 0, (struct sockaddr *)&(to_remote_g2[i].toDst4), sizeof(struct sockaddr_in));
-
-								time(&(to_remote_g2[i].last_time));
-
-								/* Is this the end-of-stream */
-								if (rptrbuf.vpkt.ctrl & 0x40) {
-									memset(&to_remote_g2[i].toDst4,0,sizeof(struct sockaddr_in));
-									to_remote_g2[i].streamid = 0;
-									to_remote_g2[i].last_time = 0;
-								}
-								break;
-							}
-							else if (recd[i].fd>=0 && recd[i].streamid==rptrbuf.vpkt.streamid) {	// Is the data to be recorded for echotest
-								time(&recd[i].last_time);
-
-								//memcpy(recbuf.title, "DSVT", 4);
-								//recbuf.config = 0x20;
-								//recbuf.id = rptrbuf.vpkt.icm_id;
-								//recbuf.flaga[0] = recbuf.flaga[1] = recbuf.flaga[20] = 0;
-								//recbuf.flagb[0] = rptrbuf.vpkt.dst_rptr_id;
-								//recbuf.flagb[1] = rptrbuf.vpkt.snd_rptr_id;
-								//recbuf.flagb[2] = rptrbuf.vpkt.snd_term_id;
-								//memcpy(&recbuf.streamid, &rptrbuf.vpkt.streamid, 3);
-								if (recvlen == 29)
-									//memcpy(recbuf.vasd.voice, rptrbuf.vpkt.vasd.voice, 12);
-									(void)write(recd[i].fd, rptrbuf.vpkt.vasd.voice, 9);
-								else
-									//memcpy(recbuf.vasd.voice, rptrbuf.vpkt.vasd1.voice, 12);
-									(void)write(recd[i].fd, rptrbuf.vpkt.vasd1.voice, 9);
-
-								//rec_len = 27;
-								//(void)write(recd[i].fd, &rec_len, 2);
-								//(void)write(recd[i].fd, &recbuf, rec_len);
-
-								if ((rptrbuf.vpkt.ctrl & 0x40) != 0) {
-									recd[i].streamid = 0;
-									recd[i].last_time = 0;
-									close(recd[i].fd);
-									recd[i].fd = -1;
-									// printf("Closed echotest audio file:[%s]\n", recd[i].file);
-
-									/* we are in echotest mode, so play it back */
-									try {
-										std::async(std::launch::async, &CQnetGateway::PlayFileThread, this, std::ref(recd[i]));
-									} catch (const std::exception &e) {
-										printf("failed to start PlayFileThread. Exception: %s\n", e.what());
-										//   When the echotest thread runs, it deletes the file,
-										//   Because the echotest thread did NOT start, we delete the file here
-										unlink(recd[i].file);
-									}
-								}
-								break;
-							}
-							else if ((vm[i].fd >= 0) && (vm[i].streamid==rptrbuf.vpkt.streamid)) {	// Is the data to be recorded for voicemail
-								time(&vm[i].last_time);
-
-								//memcpy(recbuf.title, "DSVT", 4);
-								//recbuf.config = 0x20;
-								//recbuf.flaga[0] = recbuf.flaga[1] = recbuf.flaga[2] = 0;
-								//recbuf.id = rptrbuf.vpkt.icm_id;
-								//recbuf.flagb[0] = rptrbuf.vpkt.dst_rptr_id;
-								//recbuf.flagb[1] = rptrbuf.vpkt.snd_rptr_id;
-								//recbuf.flagb[2] = rptrbuf.vpkt.snd_term_id;
-								//memcpy(&recbuf.streamid, &rptrbuf.vpkt.streamid, 3);
-								if (recvlen == 29)
-									//memcpy(recbuf.vasd.voice, rptrbuf.vpkt.vasd.voice, 12);
-									(void)write(vm[i].fd, rptrbuf.vpkt.vasd.voice, 9);
-								else
-									//memcpy(recbuf.vasd.voice, rptrbuf.vpkt.vasd1.voice, 12);
-									(void)write(vm[i].fd, rptrbuf.vpkt.vasd1.voice, 9);
-
-								//rec_len = 27;
-								//(void)write(vm[i].fd, &rec_len, 2);
-								//(void)write(vm[i].fd, &recbuf, rec_len);
-
-								if ((rptrbuf.vpkt.ctrl & 0x40) != 0) {
-									vm[i].streamid = 0;
-									vm[i].last_time = 0;
-									close(vm[i].fd);
-									vm[i].fd = -1;
-									// printf("Closed voicemail audio file:[%s]\n", vm[i].file);
-								}
-								break;
-							}
-							else if ((toRptr[i].streamid==rptrbuf.vpkt.streamid) && (toRptr[i].adr == fromRptr.sin_addr.s_addr)) {	// or maybe this is cross-banding data
-								sendto(srv_sock, rptrbuf.pkt_id, 29, 0, (struct sockaddr *)&toRptr[i].band_addr, sizeof(struct sockaddr_in));
-
-								/* timeit */
-								time(&toRptr[i].last_time);
-
-								/* bump G2 counter */
-								G2_COUNTER_OUT++;
-
-								toRptr[i].sequence = rptrbuf.vpkt.ctrl;
-
-								/* End of stream ? */
-								if (rptrbuf.vpkt.ctrl & 0x40) {
-									toRptr[i].last_time = 0;
-									toRptr[i].streamid = 0;
-									toRptr[i].adr = 0;
-								}
-								break;
-							}
-						}
-
-						if (bool_qso_details && rptrbuf.vpkt.ctrl&0x40)
-							printf("id=%04x cntr=%04x END RPTR\n", ntohs(rptrbuf.vpkt.streamid), ntohs(rptrbuf.counter));
-					}
-				}
-			}
-			FD_CLR (srv_sock,&fdset);
-		}
-	}
-
-	// thread clean-up
-	if (bool_send_aprs) {
-		if (aprs_future.valid())
-			aprs_future.get();
-	}
-	irc_data_future.get();
-	return;
-}
-
-void CQnetGateway::compute_aprs_hash()
-{
-	short hash = 0x73e2;
-	char rptr_sign[CALL_SIZE + 1];
-
-	strcpy(rptr_sign, OWNER.c_str());
-	char *p = strchr(rptr_sign, ' ');
-	if (!p) {
-		printf("Failed to build repeater callsign for aprs hash\n");
-		return;
-	}
-	*p = '\0';
-	p = rptr_sign;
-	short int len = strlen(rptr_sign);
-
-	for (short int i=0; i < len; i+=2) {
-		hash ^= (*p++) << 8;
-		hash ^= (*p++);
-	}
-	printf("aprs hash code=[%d] for %s\n", hash, OWNER.c_str());
-	rptr.aprs_hash = hash;
-
-	return;
-}
-
-void CQnetGateway::APRSBeaconThread()
-{
-	char snd_buf[512];
-	char rcv_buf[512];
-	time_t tnow = 0;
-
-	struct sigaction act;
-
-	/*
-	   Every 20 seconds, the remote APRS host sends a KEEPALIVE packet-comment
-	   on the TCP/APRS port.
-	   If we have not received any KEEPALIVE packet-comment after 5 minutes
-	   we must assume that the remote APRS host is down or disappeared
-	   or has dropped the connection. In these cases, we must re-connect.
-	   There are 3 keepalive packets in one minute, or every 20 seconds.
-	   In 5 minutes, we should have received a total of 15 keepalive packets.
-	*/
-	short THRESHOLD_COUNTDOWN = 15;
-
-	act.sa_handler = sigCatch;
-	sigemptyset(&act.sa_mask);
-	act.sa_flags = SA_RESTART;
-	if (sigaction(SIGTERM, &act, 0) != 0) {
-		printf("APRSBeaconThread: sigaction-TERM failed, error=%d\n", errno);
-		return;
-	}
-	if (sigaction(SIGINT, &act, 0) != 0) {
-		printf("APRSBeaconThread: sigaction-INT failed, error=%d\n", errno);
-		return;
-	}
-	if (sigaction(SIGPIPE, &act, 0) != 0) {
-		printf("APRSBeaconThread: sigaction-PIPE failed, error=%d\n", errno);
-		return;
-	}
-
-	time_t last_keepalive_time;
-	time(&last_keepalive_time);
-
-	time_t last_beacon_time = 0;
-	/* This thread is also saying to the APRS_HOST that we are ALIVE */
-	while (keep_running) {
-		if (aprs->GetSock() == -1) {
-			aprs->Open(OWNER);
-			if (aprs->GetSock() == -1)
-				sleep(1);
-			else
-				THRESHOLD_COUNTDOWN = 15;
-		}
-
-		time(&tnow);
-		if ((tnow - last_beacon_time) > (rptr.aprs_interval * 60)) {
-			for (short int i=0; i<3; i++) {
-				if (rptr.mod[i].desc[0] != '\0') {
-					float tmp_lat = fabs(rptr.mod[i].latitude);
-					float tmp_lon = fabs(rptr.mod[i].longitude);
-					float lat = floor(tmp_lat);
-					float lon = floor(tmp_lon);
-					lat = (tmp_lat - lat) * 60.0F + lat  * 100.0F;
-					lon = (tmp_lon - lon) * 60.0F + lon  * 100.0F;
-
-					char lat_s[15], lon_s[15];
-					if (lat >= 1000.0F)
-						sprintf(lat_s, "%.2f", lat);
-					else if (lat >= 100.0F)
-						sprintf(lat_s, "0%.2f", lat);
-					else if (lat >= 10.0F)
-						sprintf(lat_s, "00%.2f", lat);
-					else
-						sprintf(lat_s, "000%.2f", lat);
-
-					if (lon >= 10000.0F)
-						sprintf(lon_s, "%.2f", lon);
-					else if (lon >= 1000.0F)
-						sprintf(lon_s, "0%.2f", lon);
-					else if (lon >= 100.0F)
-						sprintf(lon_s, "00%.2f", lon);
-					else if (lon >= 10.0F)
-						sprintf(lon_s, "000%.2f", lon);
-					else
-						sprintf(lon_s, "0000%.2f", lon);
-
-					/* send to aprs */
-					sprintf(snd_buf, "%s>APJI23,TCPIP*,qAC,%sS:!%s%cD%s%c&RNG%04u %s %s",
-					        rptr.mod[i].call.c_str(),  rptr.mod[i].call.c_str(),
-					        lat_s,  (rptr.mod[i].latitude < 0.0)  ? 'S' : 'N',
-					        lon_s,  (rptr.mod[i].longitude < 0.0) ? 'W' : 'E',
-					        (unsigned int)rptr.mod[i].range, rptr.mod[i].band.c_str(), rptr.mod[i].desc.c_str());
-
-					// printf("APRS Beacon =[%s]\n", snd_buf);
-					strcat(snd_buf, "\r\n");
-
-					while (keep_running) {
-						if (aprs->GetSock() == -1) {
-							aprs->Open(OWNER);
-							if (aprs->GetSock() == -1)
-								sleep(1);
-							else
-								THRESHOLD_COUNTDOWN = 15;
-						} else {
-							int rc = aprs->WriteSock(snd_buf, strlen(snd_buf));
-							if (rc < 0) {
-								if ((errno == EPIPE) ||
-								        (errno == ECONNRESET) ||
-								        (errno == ETIMEDOUT) ||
-								        (errno == ECONNABORTED) ||
-								        (errno == ESHUTDOWN) ||
-								        (errno == EHOSTUNREACH) ||
-								        (errno == ENETRESET) ||
-								        (errno == ENETDOWN) ||
-								        (errno == ENETUNREACH) ||
-								        (errno == EHOSTDOWN) ||
-								        (errno == ENOTCONN)) {
-									printf("send_aprs_beacon: APRS_HOST closed connection,error=%d\n",errno);
-									close(aprs->GetSock());
-									aprs->SetSock( -1 );
-								} else if (errno == EWOULDBLOCK) {
-									std::this_thread::sleep_for(std::chrono::milliseconds(100));
-								} else {
-									/* Cant do nothing about it */
-									printf("send_aprs_beacon failed, error=%d\n", errno);
-									break;
-								}
-							} else {
-								// printf("APRS beacon sent\n");
-								break;
-							}
-						}
-						int rc = recv(aprs->GetSock(), rcv_buf, sizeof(rcv_buf), 0);
-						if (rc > 0)
-							THRESHOLD_COUNTDOWN = 15;
-					}
-				}
-				int rc = recv(aprs->GetSock(), rcv_buf, sizeof(rcv_buf), 0);
-				if (rc > 0)
-					THRESHOLD_COUNTDOWN = 15;
-			}
-			time(&last_beacon_time);
-		}
-		/*
-		   Are we still receiving from APRS host ?
-		*/
-		int rc = recv(aprs->GetSock(), rcv_buf, sizeof(rcv_buf), 0);
-		if (rc < 0) {
-			if ((errno == EPIPE) ||
-			        (errno == ECONNRESET) ||
-			        (errno == ETIMEDOUT) ||
-			        (errno == ECONNABORTED) ||
-			        (errno == ESHUTDOWN) ||
-			        (errno == EHOSTUNREACH) ||
-			        (errno == ENETRESET) ||
-			        (errno == ENETDOWN) ||
-			        (errno == ENETUNREACH) ||
-			        (errno == EHOSTDOWN) ||
-			        (errno == ENOTCONN)) {
-				printf("send_aprs_beacon: recv error: APRS_HOST closed connection,error=%d\n",errno);
-				close(aprs->GetSock());
-				aprs->SetSock( -1 );
-			}
-		} else if (rc == 0) {
-			printf("send_aprs_beacon: recv: APRS shutdown\n");
-			close(aprs->GetSock());
-			aprs->SetSock( -1 );
-		} else
-			THRESHOLD_COUNTDOWN = 15;
-
-		std::this_thread::sleep_for(std::chrono::milliseconds(100));
-
-		/* 20 seconds passed already ? */
-		time(&tnow);
-		if ((tnow - last_keepalive_time) > 20) {
-			/* we should be receving keepalive packets ONLY if the connection is alive */
-			if (aprs->GetSock() >= 0) {
-				if (THRESHOLD_COUNTDOWN > 0)
-					THRESHOLD_COUNTDOWN--;
-
-				if (THRESHOLD_COUNTDOWN == 0) {
-					printf("APRS host keepalive timeout\n");
-					close(aprs->GetSock());
-					aprs->SetSock( -1 );
-				}
-			}
-			/* reset timer */
-			time(&last_keepalive_time);
-		}
-	}
-	printf("APRS beacon thread exiting...\n");
-	return;
-}
-
-void CQnetGateway::PlayFileThread(SECHO &edata)
-{
-	SDSTR dstr;
-	const unsigned char sdsilence[3] = { 0x16U, 0x29U, 0xF5U };
-	const unsigned char sdsync[3] = { 0x55U, 0x2DU, 0x16U };
-
-	struct sigaction act;
-	act.sa_handler = sigCatch;
-	sigemptyset(&act.sa_mask);
-	act.sa_flags = SA_RESTART;
-	if (sigaction(SIGTERM, &act, 0) != 0) {
-		printf("sigaction-TERM failed, error=%d\n", errno);
-		return;
-	}
-	if (sigaction(SIGINT, &act, 0) != 0) {
-		printf("sigaction-INT failed, error=%d\n", errno);
-		return;
-	}
-	if (sigaction(SIGPIPE, &act, 0) != 0) {
-		printf("sigaction-PIPE failed, error=%d\n", errno);
-		return;
-	}
-
-	printf("File to playback:[%s]\n", edata.file);
-
-	struct stat sbuf;
-	if (stat(edata.file, &sbuf)) {
-		fprintf(stderr, "Can't stat %s\n", edata.file);
-		return;
-	}
-
-	if (sbuf.st_size % 9)
-		printf("Warning %s file size is %ld (not a multiple of 9)!\n", edata.file, sbuf.st_size);
-	int ambeblocks = (int)sbuf.st_size / 9;
-
-	FILE *fp = fopen(edata.file, "rb");
-	if (!fp) {
-		fprintf(stderr, "Failed to open file %s\n", edata.file);
-		return;
-	}
-
-	int mod = edata.header.hdr.rpt1[7] - 'A';
-	if (mod<0 || mod>2) {
-		fprintf(stderr, "unknown module suffix '%s'\n", edata.header.hdr.rpt1);
-		return;
-	}
-
-	sleep(play_wait);
-
-	// reformat the header and send it
-	memcpy(dstr.pkt_id, "DSTR", 4);
-	dstr.counter = htons(G2_COUNTER_OUT++);
-	dstr.flag[0] = 0x73;
-	dstr.flag[1] = 0x12;
-	dstr.flag[2] = 0x00;
-	dstr.remaining = 0x30;
-	dstr.vpkt.icm_id = 0x20;
-	dstr.vpkt.dst_rptr_id = edata.header.flagb[0];
-	dstr.vpkt.snd_rptr_id = edata.header.flagb[1];
-	dstr.vpkt.snd_term_id = edata.header.flagb[2];
-	dstr.vpkt.streamid    = edata.header.streamid;
-	dstr.vpkt.ctrl        = 0x80u;
-	memcpy(dstr.vpkt.hdr.flag, edata.header.hdr.flag,   3);
-	memcpy(dstr.vpkt.hdr.r1,   edata.header.hdr.rpt1,   8);
-	memcpy(dstr.vpkt.hdr.r2,   edata.header.hdr.rpt2,   8);
-	memcpy(dstr.vpkt.hdr.ur,   "CQCQCQ  ",              8);
-	memcpy(dstr.vpkt.hdr.my,   edata.header.hdr.mycall, 8);
-	memcpy(dstr.vpkt.hdr.nm,   edata.header.hdr.sfx,    4);
-	calcPFCS(dstr.pkt_id, 58);
-
-	sendto(srv_sock, dstr.pkt_id, 58, 0, (struct sockaddr *)&toRptr[mod].band_addr, sizeof(struct sockaddr_in));
-
-	dstr.remaining = 0x13U;
-
-	for (int i=0; i<ambeblocks; i++) {
-
-		int nread = fread(dstr.vpkt.vasd.voice, 9, 1, fp);
-		if (nread == 1) {
-			dstr.counter = htons(G2_COUNTER_OUT++);
-			dstr.vpkt.ctrl = (unsigned char)(i % 21);
-			if (0x0U == dstr.vpkt.ctrl) {
-				memcpy(dstr.vpkt.vasd.text, sdsync, 3);
-			} else {
-				switch (i) {
-					case 1:
-						dstr.vpkt.vasd.text[0] = '@' ^ 0x70;
-						dstr.vpkt.vasd.text[1] = edata.message[0] ^ 0x4f;
-						dstr.vpkt.vasd.text[2] = edata.message[1] ^ 0x93;
-						break;
-					case 2:
-						dstr.vpkt.vasd.text[0] = edata.message[2] ^ 0x70;
-						dstr.vpkt.vasd.text[1] = edata.message[3] ^ 0x4f;
-						dstr.vpkt.vasd.text[2] = edata.message[4] ^ 0x93;
-						break;
-					case 3:
-						dstr.vpkt.vasd.text[0] = 'A' ^ 0x70;
-						dstr.vpkt.vasd.text[1] = edata.message[5] ^ 0x4f;
-						dstr.vpkt.vasd.text[2] = edata.message[6] ^ 0x93;
-						break;
-					case 4:
-						dstr.vpkt.vasd.text[0] = edata.message[7] ^ 0x70;
-						dstr.vpkt.vasd.text[1] = edata.message[8] ^ 0x4f;
-						dstr.vpkt.vasd.text[2] = edata.message[9] ^ 0x93;
-						break;
-					case 5:
-						dstr.vpkt.vasd.text[0] = 'B' ^ 0x70;
-						dstr.vpkt.vasd.text[1] = edata.message[10] ^ 0x4f;
-						dstr.vpkt.vasd.text[2] = edata.message[11] ^ 0x93;
-						break;
-					case 6:
-						dstr.vpkt.vasd.text[0] = edata.message[12] ^ 0x70;
-						dstr.vpkt.vasd.text[1] = edata.message[13] ^ 0x4f;
-						dstr.vpkt.vasd.text[2] = edata.message[14] ^ 0x93;
-						break;
-					case 7:
-						dstr.vpkt.vasd.text[0] = 'C' ^ 0x70;
-						dstr.vpkt.vasd.text[1] = edata.message[15] ^ 0x4f;
-						dstr.vpkt.vasd.text[2] = edata.message[16] ^ 0x93;
-						break;
-					case 8:
-						dstr.vpkt.vasd.text[0] = edata.message[17] ^ 0x70;
-						dstr.vpkt.vasd.text[1] = edata.message[18] ^ 0x4f;
-						dstr.vpkt.vasd.text[2] = edata.message[19] ^ 0x93;
-						break;
-					default:
-						memcpy(dstr.vpkt.vasd.text, sdsilence, 3);
-						break;
-				}
-			}
-			if (i+1 == ambeblocks)
-				dstr.vpkt.ctrl |= 0x40U;
-
-			sendto(srv_sock, dstr.pkt_id, 29, 0, (struct sockaddr *)&toRptr[mod].band_addr, sizeof(struct sockaddr_in));
-
-			std::this_thread::sleep_for(std::chrono::milliseconds(play_delay));
-		}
-	}
-	fclose(fp);
-	printf("Finished playing\n");
-	// if it's an echo file, delete it!
-	if (strstr(edata.file, "echotest.dat")) {
-		unlink(edata.file);
-		edata.file[0] = edata.message[0] = '\0';
-	}
-	return;
-}
-
-void CQnetGateway::qrgs_and_maps()
-{
-	for (int i=0; i<3; i++) {
-		std::string rptrcall = OWNER;
-		rptrcall.resize(CALL_SIZE-1);
-		rptrcall += i + 'A';
-		if (rptr.mod[i].latitude || rptr.mod[i].longitude || rptr.mod[i].desc1.length() || rptr.mod[i].url.length())
-			ii->rptrQTH(rptrcall, rptr.mod[i].latitude, rptr.mod[i].longitude, rptr.mod[i].desc1, rptr.mod[i].desc2, rptr.mod[i].url, rptr.mod[i].package_version);
-		if (rptr.mod[i].frequency)
-			ii->rptrQRG(rptrcall, rptr.mod[i].frequency, rptr.mod[i].offset, rptr.mod[i].range, rptr.mod[i].agl);
-	}
-
-	return;
-}
-
-int CQnetGateway::Init(char *cfgfile)
-{
-	short int i;
-	struct sigaction act;
-
-	setvbuf(stdout, (char *)NULL, _IOLBF, 0);
-
-
-	/* Used to validate MYCALL input */
-	int rc = regcomp(&preg, "^(([1-9][A-Z])|([A-Z][0-9])|([A-Z][A-Z][0-9]))[0-9A-Z]*[A-Z][ ]*[ A-RT-Z]$", REG_EXTENDED | REG_NOSUB);
-	if (rc != REG_NOERROR) {
-		printf("The IRC regular expression is NOT valid\n");
-		return 1;
-	}
-
-	act.sa_handler = sigCatch;
-	sigemptyset(&act.sa_mask);
-	act.sa_flags = SA_RESTART;
-	if (sigaction(SIGTERM, &act, 0) != 0) {
-		printf("sigaction-TERM failed, error=%d\n", errno);
-		return 1;
-	}
-	if (sigaction(SIGINT, &act, 0) != 0) {
-		printf("sigaction-INT failed, error=%d\n", errno);
-		return 1;
-	}
-	if (sigaction(SIGPIPE, &act, 0) != 0) {
-		printf("sigaction-PIPE failed, error=%d\n", errno);
-		return 1;
-	}
-
-	for (i = 0; i < 3; i++)
-		memset(&band_txt[0], 0, sizeof(SBANDTXT));
-
-	/* process configuration file */
-	if ( read_config(cfgfile) ) {
-		printf("Failed to process config file %s\n", cfgfile);
-		return 1;
-	}
-
-	playNotInCache = false;
-
-	/* build the repeater callsigns for aprs */
-	rptr.mod[0].call = OWNER;
-	for (i=OWNER.length(); i; i--)
-		if (! isspace(OWNER[i-1]))
-			break;
-	rptr.mod[0].call.resize(i);
-
-	rptr.mod[1].call = rptr.mod[0].call;
-	rptr.mod[2].call = rptr.mod[0].call;
-	rptr.mod[0].call += "-A";
-	rptr.mod[1].call += "-B";
-	rptr.mod[2].call += "-C";
-	rptr.mod[0].band = "23cm";
-	rptr.mod[1].band = "70cm";
-	rptr.mod[2].band = "2m";
-	printf("Repeater callsigns: [%s] [%s] [%s]\n", rptr.mod[0].call.c_str(), rptr.mod[1].call.c_str(), rptr.mod[2].call.c_str());
-
-	for (i = 0; i < 3; i++) {
-		//rptr.mod[i].frequency = rptr.mod[i].offset = rptr.mod[i].latitude = rptr.mod[i].longitude = rptr.mod[i].agl = rptr.mod[i].range = 0.0;
-		band_txt[i].streamID = 0;
-		band_txt[i].flags[0] = band_txt[i].flags[1] = band_txt[i].flags[2] = 0;
-		band_txt[i].lh_mycall[0] = '\0';
-		band_txt[i].lh_sfx[0] = '\0';
-		band_txt[i].lh_yrcall[0] = '\0';
-		band_txt[i].lh_rpt1[0] = '\0';
-		band_txt[i].lh_rpt2[0] = '\0';
-
-		band_txt[i].last_time = 0;
-
-		band_txt[i].txt[0] = '\0';
-		band_txt[i].txt_cnt = 0;
-		band_txt[i].sent_key_on_msg = false;
-
-		band_txt[i].dest_rptr[0] = '\0';
-
-		band_txt[i].temp_line[0] = '\0';
-		band_txt[i].temp_line_cnt = 0;
-		band_txt[i].gprmc[0] = '\0';
-		band_txt[i].gpid[0] = '\0';
-		band_txt[i].is_gps_sent = false;
-		band_txt[i].gps_last_time = 0;
-
-		band_txt[i].num_dv_frames = 0;
-		band_txt[i].num_dv_silent_frames = 0;
-		band_txt[i].num_bit_errors = 0;
-
-	}
-
-	if (bool_send_aprs) {
-		aprs = new CAPRS(&rptr);
-		if (aprs)
-			aprs->Init();
-		else {
-			printf("aprs class init failed!\nAPRS will be turned off");
-			bool_send_aprs = false;
-		}
-	}
-	compute_aprs_hash();
-
-	ii = new CIRCDDB(ircddb.ip, ircddb.port, owner, irc_pass, IRCDDB_VERSION, local_irc_ip);
-	bool ok = ii->open();
-	if (!ok) {
-		printf("irc open failed\n");
-		return 1;
-	}
-
-	rc = ii->getConnectionState();
-	printf("Waiting for irc connection status of 2\n");
-	i = 0;
-	while (rc < 2) {
-		printf("irc status=%d\n", rc);
-		if (rc < 2) {
-			i++;
-			sleep(5);
-		} else
-			break;
-
-		if (!keep_running)
-			break;
-
-		if (i > 5) {
-			printf("We can not wait any longer...\n");
-			break;
-		}
-		rc = ii->getConnectionState();
-	}
-
-	/* udp port 40000 must open first */
-	g2_sock = open_port(g2_external);
-	if (0 > g2_sock) {
-		printf("Can't open %s:%d\n", g2_external.ip.c_str(), g2_external.port);
-		return 1;
-	}
-
-	// Open G2 INTERNAL:
-	// default non-icom 127.0.0.1:19000
-	// default icom     172.16.0.20:20000
-	srv_sock = open_port(g2_internal);
-	if (0 > srv_sock) {
-		printf("Can't open %s:%d\n", g2_internal.ip.c_str(), g2_internal.port);
-		return 1;
-	}
-
-	for (i = 0; i < 3; i++) {
-		// recording for echotest on local repeater modules
-		recd[i].last_time = 0;
-		recd[i].streamid = 0;
-		recd[i].fd = -1;
-		memset(recd[i].file, 0, sizeof(recd[i].file));
-
-		// recording for voicemail on local repeater modules
-		vm[i].last_time = 0;
-		vm[i].streamid = 0;
-		vm[i].fd = -1;
-		memset(vm[i].file, 0, sizeof(vm[i].file));
-
-		snprintf(vm[i].file, FILENAME_MAX, "%s/%c_%s", echotest_dir.c_str(), 'A'+i, "voicemail.dat");
-
-		if (access(vm[i].file, F_OK) != 0)
-			memset(vm[i].file, 0, sizeof(vm[i].file));
-		else
-			printf("Loaded voicemail file: %s for mod %d\n", vm[i].file, i);
-
-		// the repeater modules run on these ports
-		memset(&toRptr[i],0,sizeof(toRptr[i]));
-
-		memset(toRptr[i].saved_hdr, 0, sizeof(toRptr[i].saved_hdr));
-		toRptr[i].saved_adr = 0;
-
-		toRptr[i].streamid = 0;
-		toRptr[i].adr = 0;
-
-		toRptr[i].band_addr.sin_family = AF_INET;
-		toRptr[i].band_addr.sin_addr.s_addr = inet_addr(rptr.mod[i].portip.ip.c_str());
-		toRptr[i].band_addr.sin_port = htons(rptr.mod[i].portip.port);
-
-		toRptr[i].last_time = 0;
-		toRptr[i].G2_COUNTER = 0;
-
-		toRptr[i].sequence = 0x0;
-	}
-
-	/*
-	   Initialize the end_of_audio that will be sent to the local repeater
-	   when audio from remote G2 has timed out
-	*/
-	memcpy(end_of_audio.pkt_id, "DSTR", 4);
-	end_of_audio.flag[0] = 0x73;
-	end_of_audio.flag[1] = 0x12;
-	end_of_audio.flag[2] = 0x00;
-	end_of_audio.remaining = 0x13;
-	end_of_audio.vpkt.icm_id = 0x20;
-	end_of_audio.vpkt.dst_rptr_id = 0x00;
-	end_of_audio.vpkt.snd_rptr_id = 0x01;
-	memset(end_of_audio.vpkt.vasd.voice, '\0', 9);
-	end_of_audio.vpkt.vasd.text[0] = 0x70;
-	end_of_audio.vpkt.vasd.text[1] = 0x4f;
-	end_of_audio.vpkt.vasd.text[2] = 0x93;
-
-	/* to remote systems */
-	for (i = 0; i < 3; i++) {
-		memset(&to_remote_g2[i].toDst4, 0, sizeof(struct sockaddr_in));
-		to_remote_g2[i].streamid = 0;
-		to_remote_g2[i].last_time = 0;
-	}
-
-	/* where to send packets to qnlink */
-	memset(&plug, 0, sizeof(struct sockaddr_in));
-	plug.sin_family = AF_INET;
-	plug.sin_port = htons(g2_link.port);
-	plug.sin_addr.s_addr = inet_addr(g2_link.ip.c_str());
-
-	printf("QnetGateway...entering processing loop\n");
-
-	if (bool_send_qrgs)
-		qrgs_and_maps();
-	return 0;
-}
-
-CQnetGateway::CQnetGateway()
-{
-}
-
-CQnetGateway::~CQnetGateway()
-{
-	if (srv_sock != -1) {
-		close(srv_sock);
-		printf("Closed G2_INTERNAL_PORT\n");
-	}
-
-	if (g2_sock != -1) {
-		close(g2_sock);
-		printf("Closed G2_EXTERNAL_PORT\n");
-	}
-
-	if (bool_send_aprs) {
-		if (aprs->GetSock() != -1) {
-			close(aprs->GetSock());
-			printf("Closed APRS\n");
-		}
-		delete aprs;
-	}
-
-	for (int i=0; i<3; i++) {
-		recd[i].last_time = 0;
-		recd[i].streamid = 0;
-		if (recd[i].fd >= 0) {
-			close(recd[i].fd);
-			unlink(recd[i].file);
-		}
-	}
-
-	ii->close();
-	delete ii;
-
-	printf("QnetGateway exiting\n");
-}
-
-bool CQnetGateway::validate_csum(SBANDTXT &bt, bool is_gps)
-{
-	const char *name = is_gps ? "GPS" : "GPRMC";
-	char *s = is_gps ? bt.gpid : bt.gprmc;
-	char *p = strrchr(s, '*');
-	if (!p) {
-		// BAD news, something went wrong
-		printf("Missing asterisk before checksum in %s\n", name);
-		bt.gprmc[0] = bt.gpid[0] = '\0';
-		return true;
-	} else {
-		*p = '\0';
-		// verify csum in GPRMC
-		bool ok = verify_gps_csum(s + 1, p + 1);
-		if (!ok) {
-			printf("csum in %s not good\n", name);
-			bt.gprmc[0] = bt.gpid[0] = '\0';
-			return true;
-		}
-	}
-	return false;
-}
-
-void CQnetGateway::gps_send(short int rptr_idx)
-{
-	time_t tnow = 0;
-	static char old_mycall[CALL_SIZE + 1] = { "        " };
-
-	if ((rptr_idx < 0) || (rptr_idx > 2)) {
-		printf("ERROR in gps_send: rptr_idx %d is invalid\n", rptr_idx);
-		return;
-	}
-
-	if (band_txt[rptr_idx].gprmc[0] == '\0') {
-		band_txt[rptr_idx].gpid[0] = '\0';
-		printf("missing GPS ID\n");
-		return;
-	}
-	if (band_txt[rptr_idx].gpid[0] == '\0') {
-		band_txt[rptr_idx].gprmc[0] = '\0';
-		printf("Missing GPSRMC\n");
-		return;
-	}
-	if (memcmp(band_txt[rptr_idx].gpid, band_txt[rptr_idx].lh_mycall, CALL_SIZE) != 0) {
-		printf("MYCALL [%s] does not match first 8 characters of GPS ID [%.8s]\n", band_txt[rptr_idx].lh_mycall, band_txt[rptr_idx].gpid);
-		band_txt[rptr_idx].gprmc[0] = '\0';
-		band_txt[rptr_idx].gpid[0] = '\0';
-		return;
-	}
-
-	/* if new station, reset last time */
-	if (strcmp(old_mycall, band_txt[rptr_idx].lh_mycall) != 0) {
-		strcpy(old_mycall, band_txt[rptr_idx].lh_mycall);
-		band_txt[rptr_idx].gps_last_time = 0;
-	}
-
-	/* do NOT process often */
-	time(&tnow);
-	if ((tnow - band_txt[rptr_idx].gps_last_time) < 31)
-		return;
-
-	printf("GPRMC=[%s]\n", band_txt[rptr_idx].gprmc);
-	printf("GPS id=[%s]\n",band_txt[rptr_idx].gpid);
-
-	if (validate_csum(band_txt[rptr_idx], false))	// || validate_csum(band_txt[rptr_idx], true))
-		return;
-
-	/* now convert GPS into APRS and send it */
-	build_aprs_from_gps_and_send(rptr_idx);
-
-	band_txt[rptr_idx].is_gps_sent = true;
-	time(&(band_txt[rptr_idx].gps_last_time));
-	return;
-}
-
-void CQnetGateway::build_aprs_from_gps_and_send(short int rptr_idx)
-{
-	char buf[512];
-	const char *delim = ",";
-
-	char *saveptr = NULL;
-
-	/*** dont care about the rest */
-
-	strcpy(buf, band_txt[rptr_idx].lh_mycall);
-	char *p = strchr(buf, ' ');
-	if (p) {
-		if (band_txt[rptr_idx].lh_mycall[7] != ' ') {
-			*p = '-';
-			*(p + 1) = band_txt[rptr_idx].lh_mycall[7];
-			*(p + 2) = '>';
-			*(p + 3) = '\0';
-		} else {
-			*p = '>';
-			*(p + 1) = '\0';
-		}
-	} else
-		strcat(buf, ">");
-
-	strcat(buf, "APDPRS,DSTAR*,qAR,");
-	strcat(buf, rptr.mod[rptr_idx].call.c_str());
-	strcat(buf, ":!");
-
-	//GPRMC =
-	strtok_r(band_txt[rptr_idx].gprmc, delim, &saveptr);
-	//time_utc =
-	strtok_r(NULL, delim, &saveptr);
-	//nav =
-	strtok_r(NULL, delim, &saveptr);
-	char *lat_str = strtok_r(NULL, delim, &saveptr);
-	char *lat_NS = strtok_r(NULL, delim, &saveptr);
-	char *lon_str = strtok_r(NULL, delim, &saveptr);
-	char *lon_EW = strtok_r(NULL, delim, &saveptr);
-
-	if (lat_str && lat_NS) {
-		if ((*lat_NS != 'N') && (*lat_NS != 'S')) {
-			printf("Invalid North or South indicator in latitude\n");
-			return;
-		}
-		if (strlen(lat_str) > 9) {
-			printf("Invalid latitude\n");
-			return;
-		}
-		if (lat_str[4] != '.') {
-			printf("Invalid latitude\n");
-			return;
-		}
-		lat_str[7] = '\0';
-		strcat(buf, lat_str);
-		strcat(buf, lat_NS);
-	} else {
-		printf("Invalid latitude\n");
-		return;
-	}
-	/* secondary table */
-	strcat(buf, "/");
-
-	if (lon_str && lon_EW) {
-		if ((*lon_EW != 'E') && (*lon_EW != 'W')) {
-			printf("Invalid East or West indicator in longitude\n");
-			return;
-		}
-		if (strlen(lon_str) > 10) {
-			printf("Invalid longitude\n");
-			return;
-		}
-		if (lon_str[5] != '.') {
-			printf("Invalid longitude\n");
-			return;
-		}
-		lon_str[8] = '\0';
-		strcat(buf, lon_str);
-		strcat(buf, lon_EW);
-	} else {
-		printf("Invalid longitude\n");
-		return;
-	}
-
-	/* Just this symbolcode only */
-	strcat(buf, "/");
-	strncat(buf, band_txt[rptr_idx].gpid + 13, 32);
-
-	// printf("Built APRS from old GPS mode=[%s]\n", buf);
-	strcat(buf, "\r\n");
-
-	if (-1 == aprs->WriteSock(buf, strlen(buf))) {
-		if ((errno == EPIPE) || (errno == ECONNRESET) || (errno == ETIMEDOUT) || (errno == ECONNABORTED) ||
-		    (errno == ESHUTDOWN) || (errno == EHOSTUNREACH) || (errno == ENETRESET) || (errno == ENETDOWN) ||
-		    (errno == ENETUNREACH) || (errno == EHOSTDOWN) || (errno == ENOTCONN)) {
-			printf("build_aprs_from_gps_and_send: APRS_HOST closed connection, error=%d\n", errno);
-			close(aprs->GetSock());
-			aprs->SetSock( -1 );
-		} else
-			printf("build_aprs_from_gps_and_send: send error=%d\n", errno);
-	}
-	return;
-}
-
-bool CQnetGateway::verify_gps_csum(char *gps_text, char *csum_text)
-{
-	short computed_csum = 0;
-	char computed_csum_text[16];
-
-	short int len = strlen(gps_text);
-	for (short int i=0; i<len; i++) {
-		char c = gps_text[i];
-		if (computed_csum == 0)
-			computed_csum = (char)c;
-		else
-			computed_csum = computed_csum ^ ((char)c);
-	}
-	sprintf(computed_csum_text, "%02X", computed_csum);
-	// printf("computed_csum_text=[%s]\n", computed_csum_text);
-
-	char *p = strchr(csum_text, ' ');
-	if (p)
-		*p = '\0';
-
-	if (strcmp(computed_csum_text, csum_text) == 0)
-		return true;
-	else
-		return false;
-}
-
-int main(int argc, char **argv)
-{
-	printf("VERSION %s\n", IRCDDB_VERSION);
-	if (argc != 2) {
-		printf("usage: %s qn.cfg\n", argv[0]);
-		return 1;
-	}
-	CQnetGateway QnetGateway;
-	if (QnetGateway.Init(argv[1]))
-		return 1;
-	QnetGateway.Process();
-	printf("Leaving processing loop...\n");
-}
diff --git a/QnetIcomGateway.h b/QnetIcomGateway.h
deleted file mode 100644
index 8d4bd2a..0000000
--- a/QnetIcomGateway.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- *   Copyright (C) 2018 by Thomas Early N7TAE
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <libconfig.h++>
-#include "QnetTypeDefs.h"
-#include "SEcho.h"
-
-#include "aprs.h"
-
-using namespace libconfig;
-
-#define IP_SIZE 15
-#define MAXHOSTNAMELEN 64
-#define CALL_SIZE 8
-#define MAX_DTMF_BUF 32
-
-typedef struct to_remote_g2_tag {
-	unsigned short streamid;
-	struct sockaddr_in toDst4;
-	time_t last_time;
-} STOREMOTEG2;
-
-typedef struct torepeater_tag {
-	// help with header re-generation
-	unsigned char saved_hdr[58]; // repeater format
-	uint32_t saved_adr;
-
-	unsigned short streamid;
-	uint32_t adr;
-	struct sockaddr_in band_addr;
-	time_t last_time;
-	std::atomic<unsigned short> G2_COUNTER;
-	unsigned char sequence;
-} STOREPEATER;
-
-typedef struct band_txt_tag {
-	unsigned short streamID;
-	unsigned char flags[3];
-	char lh_mycall[CALL_SIZE + 1];
-	char lh_sfx[5];
-	char lh_yrcall[CALL_SIZE + 1];
-	char lh_rpt1[CALL_SIZE + 1];
-	char lh_rpt2[CALL_SIZE + 1];
-	time_t last_time;
-	char txt[64];   // Only 20 are used
-	unsigned short txt_cnt;
-	bool sent_key_on_msg;
-
-	char dest_rptr[CALL_SIZE + 1];
-
-	// try to process GPS mode: GPRMC and ID
-	char temp_line[256];
-	unsigned short temp_line_cnt;
-	char gprmc[256];
-	char gpid[256];
-	bool is_gps_sent;
-	time_t gps_last_time;
-
-	int num_dv_frames;
-	int num_dv_silent_frames;
-	int num_bit_errors;
-} SBANDTXT;
-
-class CQnetGateway {
-public:
-	CQnetGateway();
-	~CQnetGateway();
-	void Process();
-	int Init(char *cfgfile);
-
-private:
-	// text stuff
-	bool new_group[3] = { true, true, true };
-	unsigned char header_type = 0;
-	short to_print[3] = { 0, 0, 0 };
-	bool ABC_grp[3] = { false, false, false };
-	bool C_seen[3] = { false, false, false };
-
-	SPORTIP g2_internal, g2_external, g2_link, ircddb;
-
-	std::string OWNER, owner, local_irc_ip, status_file, dtmf_dir, dtmf_file, echotest_dir, irc_pass, qnvoicefile;
-
-	bool bool_send_qrgs, bool_irc_debug, bool_dtmf_debug, bool_regen_header, bool_qso_details, bool_send_aprs, playNotInCache;
-
-	int play_wait, play_delay, echotest_rec_timeout, voicemail_rec_timeout, from_remote_g2_timeout, from_local_rptr_timeout, dtmf_digit;
-
-	unsigned int vPacketCount;
-
-	std::map <uint32_t, uint16_t> portmap;
-
-	// data needed for aprs login and aprs beacon
-	// RPTR defined in aprs.h
-	SRPTR rptr;
-
-	// local repeater modules being recorded
-	// This is for echotest and voicemail
-	SECHO recd[3], vm[3];
-	SDSVT recbuf; // 56 or 27, max is 56
-
-	// the streamids going to remote Gateways from each local module
-	STOREMOTEG2 to_remote_g2[3]; // 0=A, 1=B, 2=C
-
-	// input from remote G2 gateway
-	int g2_sock = -1;
-	struct sockaddr_in fromDst4;
-
-	// Incoming data from remote systems
-	// must be fed into our local repeater modules.
-	STOREPEATER toRptr[3]; // 0=A, 1=B, 2=C
-
-	// input from our own local repeater modules
-	int srv_sock = -1;
-	SDSTR rptrbuf; // 58 or 29 or 32, max is 58
-	struct sockaddr_in fromRptr;
-
-	SDSTR end_of_audio;
-
-	// send packets to g2_link
-	struct sockaddr_in plug;
-
-	// for talking with the irc server
-	CIRCDDB *ii;
-	// for handling APRS stuff
-	CAPRS *aprs;
-
-	// text coming from local repeater bands
-	SBANDTXT band_txt[3]; // 0=A, 1=B, 2=C
-
-	/* Used to validate MYCALL input */
-	regex_t preg;
-
-	// CACHE used to cache users, repeaters,
-	// gateways, IP numbers coming from the irc server
-
-	std::map<std::string, std::string> user2rptr_map, rptr2gwy_map, gwy2ip_map;
-
-	pthread_mutex_t irc_data_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-	int open_port(const SPORTIP &pip);
-	void calcPFCS(unsigned char *packet, int len);
-	void GetIRCDataThread();
-	int get_yrcall_rptr_from_cache(char *call, char *arearp_cs, char *zonerp_cs, char *mod, char *ip, char RoU);
-	bool get_yrcall_rptr(char *call, char *arearp_cs, char *zonerp_cs, char *mod, char *ip, char RoU);
-	void PlayFileThread(SECHO &edata);
-	void compute_aprs_hash();
-	void APRSBeaconThread();
-	void ProcessTimeouts();
-	void ProcessSlowData(unsigned char *data, unsigned short sid);
-	bool Flag_is_ok(unsigned char flag);
-
-	// read configuration file
-	bool read_config(char *);
-	bool get_value(const Config &cfg, const std::string path, int &value, int min, int max, int default_value);
-	bool get_value(const Config &cfg, const std::string path, double &value, double min, double max, double default_value);
-	bool get_value(const Config &cfg, const std::string path, bool &value, bool default_value);
-	bool get_value(const Config &cfg, const std::string path, std::string &value, int min, int max, const char *default_value);
-
-/* aprs functions, borrowed from my retired IRLP node 4201 */
-	void gps_send(short int rptr_idx);
-	bool verify_gps_csum(char *gps_text, char *csum_text);
-	void build_aprs_from_gps_and_send(short int rptr_idx);
-
-	void qrgs_and_maps();
-
-	void set_dest_rptr(int mod_ndx, char *dest_rptr);
-	bool validate_csum(SBANDTXT &bt, bool is_gps);
-};
diff --git a/QnetRemote.cpp b/QnetRemote.cpp
index 6eb6436..8f94cac 100644
--- a/QnetRemote.cpp
+++ b/QnetRemote.cpp
@@ -1,6 +1,6 @@
 /*
  *   Copyright (C) 2010 by Scott Lawson KI4LKF
- *   Copyright (C) 2018 by Thomas A. Early N7TAE
+ *   Copyright (C) 2018-2019 by Thomas A. Early N7TAE
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -32,25 +32,20 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <time.h>
-#include <libconfig.h++>
 #include <string>
 
 #include "QnetTypeDefs.h"
 #include "Random.h"
+#include "ConfigureBase.h"
+#include "UnixDgramSocket.h"
 
-using namespace libconfig;
-
-#define VERSION "v1.0"
-
-int sockDst = -1;
-struct sockaddr_in toDst;
+#define VERSION "v2.0"
 
+char module;
 time_t tNow = 0;
 short streamid_raw = 0;
-bool isdefined[3] = { false, false, false };
-std::string REPEATER, IP_ADDRESS;
-int PORT, PLAY_WAIT, PLAY_DELAY;
-bool is_icom = false;
+std::string REPEATER;
+int PLAY_WAIT, PLAY_DELAY;
 
 unsigned char silence[9] = { 0x9E, 0x8D, 0x32, 0x88, 0x26, 0x1A, 0x3F, 0x61, 0xE8 };
 
@@ -74,9 +69,37 @@ unsigned short crc_tabccitt[256] = {
 	0xf78f,0xe606,0xd49d,0xc514,0xb1ab,0xa022,0x92b9,0x8330,0x7bc7,0x6a4e,0x58d5,0x495c,0x3de3,0x2c6a,0x1ef1,0x0f78
 };
 
-void calcPFCS(unsigned char rawbytes[58])
+class CConfigure : public CConfigureBase
 {
+public:
+	bool ReadCfgFile()
+	{
+		const std::string estr;
+		std::string type;
+		std::string path = "module_";
+		path.append(1, module);
+		if (GetValue(path, estr, type, 1, 16)) {
+			fprintf(stderr, "%s not found!\n", path.c_str());
+			return true;
+		}
+		if (type.compare("dvap") && type.compare("dvrptr") && type.compare("mmdvm") && type.compare("itap")) {
+			fprintf(stderr, "module type '%s is invalid!\n", type.c_str());
+			return true;
+		}
+		if (GetValue(path+"_callsign", type, REPEATER, 3, 6)) {
+			if (GetValue("ircddb.login", estr, REPEATER, 3, 6)) {
+				fprintf(stderr, "no Callsign for the repeater was found!\n");
+				return true;
+			}
+		}
+		GetValue("timing_play_wait", estr, PLAY_WAIT, 1,10);
+		GetValue("timing_play_delay", estr, PLAY_DELAY, 15, 25);
+		return false;
+	}
+};
 
+void calcPFCS(unsigned char rawbytes[58])
+{
 	unsigned short crc_dstar_ffff = 0xffff;
 	unsigned short tmp, short_c;
 	short int i;
@@ -94,135 +117,6 @@ void calcPFCS(unsigned char rawbytes[58])
 	return;
 }
 
-bool dst_open(const char *ip, const int port)
-{
-	int reuse = 1;
-
-	sockDst = socket(PF_INET,SOCK_DGRAM,0);
-	if (sockDst == -1) {
-		printf("Failed to create DSTAR socket\n");
-		return true;
-	}
-	if (setsockopt(sockDst,SOL_SOCKET,SO_REUSEADDR, (char *)&reuse, sizeof(reuse)) == -1) {
-		close(sockDst);
-		sockDst = -1;
-		printf("setsockopt DSTAR REUSE failed\n");
-		return true;
-	}
-	memset(&toDst,0,sizeof(struct sockaddr_in));
-	toDst.sin_family = AF_INET;
-	toDst.sin_port = htons(port);
-	toDst.sin_addr.s_addr = inet_addr(ip);
-
-	fcntl(sockDst,F_SETFL,O_NONBLOCK);
-	return false;
-}
-
-void dst_close()
-{
-	if (sockDst != -1) {
-		close(sockDst);
-		sockDst = -1;
-	}
-	return;
-}
-
-bool get_value(const Config &cfg, const char *path, int &value, int min, int max, int default_value)
-{
-	if (cfg.lookupValue(path, value)) {
-		if (value < min || value > max)
-			value = default_value;
-	} else
-		value = default_value;
-	printf("%s = [%d]\n", path, value);
-	return true;
-}
-
-bool get_value(const Config &cfg, const char *path, double &value, double min, double max, double default_value)
-{
-	if (cfg.lookupValue(path, value)) {
-		if (value < min || value > max)
-			value = default_value;
-	} else
-		value = default_value;
-	printf("%s = [%lg]\n", path, value);
-	return true;
-}
-
-bool get_value(const Config &cfg, const char *path, bool &value, bool default_value)
-{
-	if (! cfg.lookupValue(path, value))
-		value = default_value;
-	printf("%s = [%s]\n", path, value ? "true" : "false");
-	return true;
-}
-
-bool get_value(const Config &cfg, const char *path, std::string &value, int min, int max, const char *default_value)
-{
-	if (cfg.lookupValue(path, value)) {
-		int l = value.length();
-		if (l<min || l>max) {
-			printf("%s is invalid\n", path);
-			return false;
-		}
-	} else
-		value = default_value;
-	printf("%s = [%s]\n", path, value.c_str());
-	return true;
-}
-
-/* process configuration file */
-bool read_config(const char *cfgFile)
-{
-	Config cfg;
-
-	printf("Reading file %s\n", cfgFile);
-	// Read the file. If there is an error, report it and exit.
-	try {
-		cfg.readFile(cfgFile);
-	} catch(const FileIOException &fioex) {
-		printf("Can't read %s\n", cfgFile);
-		return true;
-	} catch(const ParseException &pex) {
-		printf("Parse error at %s:%d - %s\n", pex.getFile(), pex.getLine(), pex.getError());
-		return true;
-	}
-
-	if (! get_value(cfg, "ircddb.login", REPEATER, 3, 6, "UNDEFINED"))
-		return true;
-	REPEATER.resize(6, ' ');
-	printf("REPEATER=[%s]\n", REPEATER.c_str());
-
-	for (short int m=0; m<3; m++) {
-		std::string path = "module.";
-		path += m + 'a';
-		std::string type;
-		if (cfg.lookupValue(std::string(path+".type").c_str(), type)) {
-			if (type.compare("dvap") && type.compare("dvrptr") && type.compare("mmdvm") && type.compare("icom") && type.compare("itap")) {
-				printf("module type '%s' is invalid\n", type.c_str());
-				return true;
-			}
-			is_icom = type.compare("icom") ? false : true;
-			isdefined[m] = true;
-		}
-	}
-	if (false==isdefined[0] && false==isdefined[1] && false==isdefined[2]) {
-		printf("No repeaters defined!\n");
-		return true;
-	}
-
-	if (! get_value(cfg, "gateway.internal.ip", IP_ADDRESS, 7, 15, is_icom ? "172.16.0.20" : "127.0.0.1"))
-		return true;
-
-	get_value(cfg, "gateway.internal.port", PORT, 16000, 65535, is_icom ? 20000 : 19000);
-
-	get_value(cfg, "timing.play.wait", PLAY_WAIT, 1, 10, 1);
-
-	get_value(cfg, "timing.play.delay", PLAY_DELAY, 9, 25, 19);
-
-	return false;
-}
-
 void ToUpper(std::string &str)
 {
 	for (unsigned int i=0; i<str.size(); i++)
@@ -235,18 +129,43 @@ int main(int argc, char *argv[])
 	unsigned short G2_COUNTER = 0;
 
 	if (argc != 4) {
-		printf("Usage: %s <module> <mycall> <yourcall>\n", argv[0]);
-		printf("Example: %s c n7tae xrf757al\n", argv[0]);
-		printf("Where...\n");
-		printf("        c is the local repeater module\n");
-		printf("        n7tae is the value of mycall\n");
-		printf("        xrf757al is the value of yourcall, in this case this is a Link command\n\n");
+		fprintf(stderr, "Usage: %s <module> <mycall> <yourcall>\n", argv[0]);
+		fprintf(stderr, "Example: %s c n7tae xrf757al\n", argv[0]);
+		fprintf(stderr, "Where...\n");
+		fprintf(stderr, "        c is the local repeater module\n");
+		fprintf(stderr, "        n7tae is the value of mycall\n");
+		fprintf(stderr, "        xrf757al is the value of yourcall, in this case this is a Link command\n\n");
 		return 0;
 	}
 
+	switch (argv[1][0]) {
+		case '0':
+		case 'a':
+		case 'A':
+			module = 'A';
+			break;
+		case '1':
+		case 'b':
+		case 'B':
+			module = 'B';
+			break;
+		case '2':
+		case 'c':
+		case 'C':
+			module = 'C';
+			break;
+		default:
+			fprintf(stderr, "module must be 0, a, A, 1, b, B, 2, c or C, not %s\n", argv[1]);
+			return 1;
+	}
+
 	std::string cfgfile(CFG_DIR);
 	cfgfile += "/qn.cfg";
-	if (read_config(cfgfile.c_str()))
+	CConfigure config;
+	if (config.Initialize(cfgfile.c_str()))
+		return 1;
+
+	if (config.ReadCfgFile())
 		return 1;
 
 	if (REPEATER.size() > 6) {
@@ -255,14 +174,6 @@ int main(int argc, char *argv[])
 	}
 	ToUpper(REPEATER);
 
-	char module = argv[1][0];
-	if (islower(module))
-		module = toupper(module);
-	if ((module != 'A') && (module != 'B') && (module != 'C')) {
-		printf("module must be one of A B C\n");
-		return 1;
-	}
-
 	if (strlen(argv[2]) > 8) {
 		printf("MYCALL can not be more than 8 characters, %s is invalid\n", argv[2]);
 		return 1;
@@ -287,8 +198,10 @@ int main(int argc, char *argv[])
 
 	time(&tNow);
 	CRandom Random;
-
-	if (dst_open(IP_ADDRESS.c_str(), PORT))
+	CUnixDgramWriter ToGateway;
+	std::string togateway("modem2gate");
+	togateway.append(1, module-'A'+'0');
+	if (ToGateway.Open(togateway.c_str()))
 		return 1;
 
 	SDSTR pkt;
@@ -328,10 +241,10 @@ int main(int argc, char *argv[])
 
 	calcPFCS(pkt.pkt_id);
 	// send the header
-	int sent = sendto(sockDst, pkt.pkt_id, 58, 0, (struct sockaddr *)&toDst, sizeof(toDst));
+	int sent = ToGateway.Write(pkt.pkt_id, 58);
 	if (sent != 58) {
 		printf("%s: ERROR: Couldn't send header!\n", argv[0]);
-		dst_close();
+		ToGateway.Close();
 		return 1;
 	}
 
@@ -400,13 +313,13 @@ int main(int argc, char *argv[])
 				break;
 		}
 
-		sent = sendto(sockDst,pkt.pkt_id, 29, 0, (struct sockaddr *)&toDst, sizeof(toDst));
+		sent = ToGateway.Write(pkt.pkt_id, 29);
 		if (sent != 29) {
 			printf("%s: ERROR: could not send voice packet %d\n", argv[0], i);
-			dst_close();
+			ToGateway.Close();
 			return 1;
 		}
 	}
-	dst_close();
+	ToGateway.Close();
 	return 0;
 }
diff --git a/UnixDgramSocket.cpp b/UnixDgramSocket.cpp
index 799a29b..ca22754 100644
--- a/UnixDgramSocket.cpp
+++ b/UnixDgramSocket.cpp
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2018 by Thomas Early N7TAE
+ *   Copyright (C) 2019 by Thomas Early N7TAE
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/UnixDgramSocket.h b/UnixDgramSocket.h
index 6a79a6f..7242955 100644
--- a/UnixDgramSocket.h
+++ b/UnixDgramSocket.h
@@ -1,6 +1,6 @@
 #pragma once
 /*
- *   Copyright (C) 2018 by Thomas Early N7TAE
+ *   Copyright (C) 2019 by Thomas Early N7TAE
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/defaults b/defaults
new file mode 100644
index 0000000..6847e00
--- /dev/null
+++ b/defaults
@@ -0,0 +1,166 @@
+#
+# Copyright (c) 2019 by Thomas A. Early N7TAE
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#########################################################################################################################
+#                                                                                                                       #
+#                                        QnetGateway Default Parameter Values                                           #
+#                                                                                                                       #
+#########################################################################################################################
+# What follows need to also be valid bash shell variable definitions, therefore:
+#     No white space on either side of the equal sign (=)
+#     String values should be quoted if they contain any special chars, including white space
+#     If a string value is a simple word, it doesn't need to be quoted
+#     Use the single quote (') for quoting strings, not the double quote(")
+#     Comments can come after a key=value definition, introduced by a pound-sign (#)
+
+##########################################################################################################################
+#
+# IRCDDB - You MUST use a legal callsign for logging into any IRC network
+#
+ircddb_login_d=''                 # login callsign for the ircDDB network
+ircddb_host_d='rr.openquad.net'   # other irc networks include group1-irc.ircddb.net
+ircddb_port_d=9007                # not a good idea to change!
+ircddb_password_d='1111111111111' # not needed for rr.openquad.net
+
+##########################################################################################################################
+#
+# GATEWAY
+#
+gateway_regen_header_d=true       # regenerate headers from incoming data
+gateway_send_qrgs_maps_d=true     # send frequency, offset, coordinates and url to irc-server
+gateway_external_ip_d='0.0.0.0'   # this means accept a connection from any source
+gateway_external_port_d=40000     # don't change
+
+##########################################################################################################################
+#
+# APRS - for tracking users and also this repeater.
+#
+aprs_enable_d=true            # send info to APRS
+aprs_host_d='rotate.aprs.net' # the APRS network server
+aprs_port_d=14580             # and port
+aprs_interval_d=40            # keep-alive in minutes
+aprs_filter_d=''              # advanced feature
+
+##########################################################################################################################
+#
+# LINK - controls the behaviour of QnetLink (qnlink)
+#
+link_admin_d=''              # these comma-separated list of users can execute scripts, block dongles, reload the gwys.txt
+link_link_unlink_d=''        # if defined, comma-separated list of users that can link and unlink a repeater
+#link_no_link_unlink_d=''    # if defined, comma-separated list of users that cannot link or unlink, it's a blacklist
+                             # if the blacklist is defined (even if it's empty), the link_unlink will not be read
+link_incoming_ip_d='0.0.0.0' # incoming ip address of qnlink, '0.0.0.0' means accepts any connection.
+link_ref_port_d=20001        # port for REF linking, don't change
+link_xrf_port_d=30001        # port for XRF linking, don't change
+link_dcs_port_d=30051        # port for DCS linking, don't change
+link_announce_d=true         # do link, unlink, etc. announcements
+link_acknowledge_d=true      # send text acknowledgment on key-up
+link_max_dongles_d=5         # maximum number of linked hot-spots
+
+##########################################################################################################################
+#
+# GENERIC MODULE - These will be defined for any and all defined modules
+#
+module_x_link_at_start=''  # For example, set to 'REF001CL' to link module to 1-charlie when the module starts.
+module_x_inactivity=0      # if no activity for this many minutes unlink reflector. Zero means no timer.
+module_x_callsign=''       # if you operate in a 'restriction mode', use your personal callsign. Usually leave this empty.
+module_x_packet_wait=25    # how many milliseconds to wait on packets in a voicestream
+module_x_acknowledge=false # Do you want an ACK back?
+module_x_ack_delay=250     # millisecond delay before acknowledgement
+module_x_frequency=0       # if you specify here, this frequency will show up on the QuadNet USER GATEWAYS webpage
+module_x_offset=0          # usually the duplex tx-rx offset, but for dvap, it's a frequency tweak
+module_x_range=0           # the range of this repeater, in meters 1609.344 meters is 1.0 miles
+module_x_agl=0             # the height above ground level for this repeater's antenna
+module_x_latitude=0        # you can leave this unspecified for a mobile rig
+module_x_longitude=0       # like the latitude
+module_x_desc1=''          # maximum of 20 characters, most special symbols are not allowed
+module_x_desc2=''          # just like desc1
+module_x_url='github.com/n7tae/g2_ircddb'  # 80 characters max
+
+##########################################################################################################################
+#
+# DVAP - Special parameters when: module.x='dvap'
+#
+dvap_power=10                 # TX power level: -12 to 10, 10 is maximum power
+dvap_squelch=-100             # RX Squelch: -128 to -45, -100 to -80 usually works best
+dvap_serial_number='APXXXXXX' # The serial number of your DVAP is visible through the bottom of the case
+
+##########################################################################################################################
+#
+# MMDVM - Special parameters when: module_x='mmdvm'
+#
+mmdvm_internal_ip='0.0.0.0' # where MMDVMHost will find the QnetRelay program
+mmdvm_gateway_port=20010    # which port will QnetRelay be sending on
+mmdvm_local_port=20011      # which port will MMDVMHost be sending on
+
+##########################################################################################################################
+#
+# DVRPTR - Special parameters when: module_x='dvrptr'
+#
+# if you don't know what your DVRPTR serial number is, look in the log file after running qndvrptr
+dvrptr_serial_number='00.00.00.00' # the DVRPTR serial number
+dvrptr_rf_on='RFON'    # put this in YRCALL to disable the channel
+dvrptr_rf_off='RFOFF'  # put this in YRCALL to enable the channel
+dvrptr_rf_rx_level=80  # see the DVRPTR V1 manual
+dvrptr_duplex=false    # set to true if the module is duplex
+dvrptr_tx_delay=250    # milliseconds to allow for switching from rx to tx
+dvrptr_rqst_count=10   # number of 2-sec intervals before the an unresponsive system is killed
+dvrptr_inverse_rx=true # if you're not hearing anything, try false
+dvrptr_inverse_tx=true # if you're not being heard, try false
+
+##########################################################################################################################
+#
+# LOGGING - Control extra logging - useful for debugging
+#
+log_qso_d=false   # QSO info goes into the log
+log_irc_d=false   # IRC debug info
+log_dtmf_d=false  # DTMF debug info
+
+##########################################################################################################################
+#
+# DPLUS - Control of dplus (trust system) linking to repeaters and REF reflectors
+#
+# The following settings do not affect your ability to use dplus linking to XRF or XLX reflectors!
+# You must be registered on the DPlus system, see www.dstargateway.org, otherwise authorization will fail,
+# even if QnetLink reports a successful authorization.
+dplus_ref_login_d=''        # for logging into REF reflectors, if undefined or empty, ircddb_login will be used
+dplus_authorize_d=false     # set to true if you want to use the closed-source DPlus reflectors and/or repeaters
+dplus_use_reflectors_d=true # set to false if you are not going to link to DPlus reflectors
+dplus_use_repeaters_d=true  # set to false if you are not going to link to DPlus repeaters
+# any gateways in your gwys.txt file will override any reflectors or repeaters that DPlus authorization returns.
+
+##########################################################################################################################
+#
+# FILE - where important QnetGateway files and directories are found.
+#
+file_status_d='/usr/local/etc/rptr_status' # where repeater status info is passed between services
+file_dtmf_d='/tmp'                         # where DTMF is decoded
+file_echotest_d='/tmp'                     # echo dat files will end up here
+file_qnvoicefile_d='/tmp/qnvoice.txt'      # where qnvoice will create the play command
+file_gwys_d='/usr/local/etc/gwys.txt'      # where the list of gateways and reflectors (with ports) is.
+file_announce_dir_d='/usr/local/etc'       # where the *.dat files are for the verbal link, unlink, etc. announcements
+
+##########################################################################################################################
+#
+# TIMINGS - for controlling how to deal with timing issues
+#
+# most users will not have to override any of these default values
+timing_timeout_echo_d=1       # seconds before we assume echo has timed out
+timing_timeout_voicemail_d=1  # seconds before we assume voicemail has timed out
+timing_timeout_remote_g2_d=2  # after this many seconds with no packets, we assume the tx is closed
+timing_timeout_local_rptr_d=1 # local repeater timeout, in seconds
+timing_play_wait_d=1          # seconds before echo or voicemail playback occurs, between 1 and 10
+timing_play_delay_d=19        # microseconds between frames playback, if echo sounds bad, adjust this up or down 1 or 2 ms
diff --git a/qn.everything.cfg b/qn.everything.cfg
index 40d75cf..df3306f 100644
--- a/qn.everything.cfg
+++ b/qn.everything.cfg
@@ -10,19 +10,12 @@ ircddb = {
 gateway = {
 #	regen_header = true        # regenerate headers from incoming data
 #	send_qrgs_maps = true      # send frequecy, offset, cooridinates and url to irc-server
-#	local_irc_ip = "0.0.0.0"   # 0.0.0.0 means accept any incoming connections
 #	aprs_send = true           # send info to aprs
-#	ip = "127.0.0.1"           # where the gateway is running
 
     external = {
 #		ip = "0.0.0.0"
 #		port = 40000
 	}
-
-	internal = {
-#		ip = "0.0.0.0"
-#		port = 19000
-	}
 }
 
 module = {
@@ -34,8 +27,6 @@ module = {
           # 70 cm modules will use "b"
           #  2  M module will use "c"
 		type = "mmdvm"
-#		ip = "127.0.0.1"
-#		port = 19998       # default for mod a, you usually don't need to specify this
 #		frequency = 0      # if you specify here, this frequency will show up on the QuadNet USER GATEWAYS webpage
 #		offset = 0
 #		range = 0          # the range of this repeater, in meters 1609.344 meters is 1.0 miles
@@ -116,9 +107,6 @@ module = {
 		# If you don't know what it is, run the program and look in the log file!
 #		serial_number = "00.00.00.00"
 
-#		internal_ip = "0.0.0.0" # the dvrptr address, usually leave this alone
-#		port = 19999            # module defaults: A=20000, B=19999, C=19998
-
 		# Some settings for your DVRPTR modem (see DVRPTR V1 manual for more info).
 #		rf_rx_level = 80
 
@@ -227,15 +215,6 @@ module = {
 
 		# the url of your repeater, 80 chars max
 #		url = "github.com/n7tae/QnetGateway"
-
-		# where other g2 programs find this repeater software
-#		ip = "127.0.0.1"   # where is the device running? must be a "dotted number"
-
-		# the internal ip of this program, "0.0.0.0" is usually best
-#		internal_ip = "0.0.0.0"
-
-		# port number default: A:19998 B:19999 C:20000
-#		port = 20000       # default for mod C
 	}
 }
 
@@ -243,6 +222,7 @@ module = {
 mmdvm = {
 #	these need to be the same as they are in your MMDVM.ini file (in the [D-Star Network] section
 # 	If you change them there, then change them here!
+#   internal_ip = "0.0.0.0"
 #	gateway_port = 20010
 #	local_port = 20011
 }
@@ -271,8 +251,6 @@ link = {
 #   no_link_unlink = [ "CALL7", "CALL8", "CALL9" ] # if defined, these users cannot link or unlink, it's a blacklist
 												   # if the blacklist is defined (even if it's empty), the link_unlink will not be read
 #	incoming_ip = "0.0.0.0"     # incoming ip address, "0.0.0.0" means accepts all connections.
-#	ip = "127.0.0.1"   # where g2_link is running
-#	port = 18997       # port for communications to g2_link
 #	ref_port = 20001   # port for REF linking, don't change
 #	xrf_port = 30001   # port for XRF linking, don't change
 #	dcs_port = 30051   # port for DCS linking, don't change