From 57d13e046f528b4035881678d4b68f7c4335d024 Mon Sep 17 00:00:00 2001
From: Tom Early <n7tae@tearly.net>
Date: Sun, 27 Jan 2019 14:14:32 -0700
Subject: [PATCH] better Run()?

---
 QnetITAP.cpp | 50 +++++++++++++++++++++++++++++---------------------
 QnetITAP.h   |  3 +--
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/QnetITAP.cpp b/QnetITAP.cpp
index 07efd32..d0472e6 100644
--- a/QnetITAP.cpp
+++ b/QnetITAP.cpp
@@ -247,10 +247,9 @@ void CQnetITAP::Run(const char *cfgfile)
 		// there is something to read!
 		unsigned char buf[100];
 		ssize_t len;
-		REPLY_TYPE rt = RT_NOTHING;
 
 		if (FD_ISSET(serfd, &readfds)) {
-			rt = GetITAPData(buf);
+			REPLY_TYPE rt = GetITAPData(buf);
 
 			if (rt == RT_ERROR)
 				break;
@@ -258,16 +257,6 @@ void CQnetITAP::Run(const char *cfgfile)
 			if (rt == RT_TIMEOUT)
 				continue;
 
-		} else if (FD_ISSET(ug2m, &readfds)) {
-			len = Gate2Modem.Read(buf, 100);
-
-			if (len < 0) {
-				printf("ERROR: Run: recvfrom(gsock) returned error %d, %s\n", errno, strerror(errno));
-				break;
-			}
-		}
-
-		if (rt != RT_NOTHING) {
 			lastdata = std::chrono::steady_clock::now();
 			//printf("read %d bytes from ITAP\n", (int)buf[0]);
 			if (RT_DATA==rt || RT_HEADER==rt) {
@@ -275,12 +264,18 @@ void CQnetITAP::Run(const char *cfgfile)
 					break;
 			} else {
 				switch (rt) {
-					//case RT_HEADER_ACK:
-					//	printf("DEBUG: Run: got header acknowledgement\n");
-					//	break;
-					//case RT_DATA_ACK:
-					//	printf("DEBUG: Run: got data   acknowledgement\n");
-					//	break;
+					case RT_HEADER_ACK:
+						printf("HEADER_ACK");
+						for (int i=0; i<int(buf[0]) && i<100; i++)
+							printf(" %02X", buf[i]);
+						printf("\n");
+						break;
+					case RT_DATA_ACK:
+						printf("DATA_ACK");
+						for (int i=0; i<int(buf[0]) && i<100; i++)
+							printf(" %02X", buf[i]);
+						printf("\n");
+						break;
 					case RT_PONG:
 						if (! is_alive) {
 							printf("Icom Radio is connected.\n");
@@ -291,10 +286,23 @@ void CQnetITAP::Run(const char *cfgfile)
 						break;
 				}
 			}
-		} else if (0 == ::memcmp(buf, "DSTR", 4)) {
-			//printf("read %d bytes from QnetGateway\n", (int)len);
-			if (ProcessGateway(len, buf))
+			FD_CLR(serfd, &readfds);
+		}
+
+		if (FD_ISSET(ug2m, &readfds)) {
+			len = Gate2Modem.Read(buf, 100);
+
+			if (len < 0) {
+				printf("ERROR: Run: recvfrom(gsock) returned error %d, %s\n", errno, strerror(errno));
 				break;
+			}
+
+			if (0 == memcmp(buf, "DSTR", 4)) {
+				//printf("read %d bytes from QnetGateway\n", (int)len);
+				if (ProcessGateway(len, buf))
+					break;
+			}
+			FD_CLR(ug2m, &readfds);
 		}
 	}
 
diff --git a/QnetITAP.h b/QnetITAP.h
index f60f8fd..0bb7961 100644
--- a/QnetITAP.h
+++ b/QnetITAP.h
@@ -36,8 +36,7 @@ enum REPLY_TYPE {
 	RT_DATA,
 	RT_HEADER_ACK,
 	RT_DATA_ACK,
-	RT_PONG,
-	RT_NOTHING
+	RT_PONG
 };
 
 // Icom Terminal and Access Point Mode data structure