From 3f555d995ea6de6763360c371dbd2fd6ffa34c63 Mon Sep 17 00:00:00 2001
From: Tom Early <n7tae@tearly.net>
Date: Wed, 9 Jan 2019 13:40:11 -0700
Subject: [PATCH] more changes for config

---
 QnetConfigure.cpp |  3 +--
 defaults          | 12 ++++++------
 qnadmin           |  9 ++++++---
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/QnetConfigure.cpp b/QnetConfigure.cpp
index 2d5cbd6..200e388 100644
--- a/QnetConfigure.cpp
+++ b/QnetConfigure.cpp
@@ -45,7 +45,7 @@ bool CQnetConfigure::ReadConfigFile(const char *configfile, std::map<std::string
 	FILE *fp = fopen(configfile, "r");
 	if (fp) {
 		char line[128];
-		if (fgets(line, 128, fp)) {
+		while (fgets(line, 128, fp)) {
 			char *key = strtok(line, "=");
 			key = Trim(key);
 			if (strlen(key) && '#' != *key) {
@@ -56,7 +56,6 @@ bool CQnetConfigure::ReadConfigFile(const char *configfile, std::map<std::string
 				else
 					val = strtok(val2, "# \t");
 				amap[key] = val;
-printf("%s=%s\n", key, val);
 			}
 		}
 		fclose(fp);
diff --git a/defaults b/defaults
index 6a1c212..0986329 100644
--- a/defaults
+++ b/defaults
@@ -94,12 +94,12 @@ module_x_frequency=0       # if you specify here, this frequency will show up on
 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_gate2modem0='gate2modema'         # Unix Sockets between a modem and the gateway
-module_x_gate2modem1='gate2modemb'
-module_x_gate2modem2='gate2modemc'
-module_x_modem2gate0='modem2gatea'
-module_x_modem2gate1='modem2gateb'
-module_x_modem2gate2='modem2gatec'
+module_x_gate2modema='gate2modema'         # Unix Sockets between a modem and the gateway
+module_x_gate2modemb='gate2modemb'
+module_x_gate2modemc='gate2modemc'
+module_x_modem2gatea='modem2gatea'
+module_x_modem2gateb='modem2gateb'
+module_x_modem2gatec='modem2gatec'
 
 ##########################################################################################################################
 #
diff --git a/qnadmin b/qnadmin
index f3b6a25..ae0b212 100755
--- a/qnadmin
+++ b/qnadmin
@@ -198,10 +198,11 @@ while [[ "$ans" != q* ]]; do
 	echo
 	if [[ "$ActiveGate" == "inactive" ]] || [[ "$ActiveLink" == "inactive" ]]; then
 		echo "i  : Install configured system"
-		echo "u  : Uninstall System"
-		echo "d  : Install DTMF"
+		echo "u  : Uninstall configured System"
+		echo "D  : Install DTMF"
+		echo "U  : Uninstall DTMF"
 	fi
-	echo "c  : Clean (remove temporary files and locally build executibles)"
+	echo "c  : Clean (remove temporary files and locally build executables)"
 	echo
 	read -p "q  to quit. Command: " ans
 
@@ -212,6 +213,8 @@ while [[ "$ans" != q* ]]; do
 		InstallSystem un
 	elif [[ "$ans" == d* ]]; then
 		sudo make installdtmf
+	elif [[ "$ans" == U* ]]; then
+		sudo make uninstalldtmf
 	elif [[ "$ans" == c* ]]; then
 		make clean
 	fi