From e707f3680e679cdfcf8ff21b15e42ec273189f31 Mon Sep 17 00:00:00 2001
From: hibby <d@vehibberd.com>
Date: Sat, 20 Jan 2018 11:59:47 +0000
Subject: [PATCH] New upstream version 2.8.1

---
 CHANGES.3 | 11 +++++++++++
 node.h    |  4 ++--
 router.c  | 13 ++++++++++---
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/CHANGES.3 b/CHANGES.3
index ef54a78..b31c8d1 100644
--- a/CHANGES.3
+++ b/CHANGES.3
@@ -299,6 +299,7 @@ While working on new node W1WCG, I noticed some code clean up in node.c
 There's still a lot more to do especially with ANSI.
 
 15/06/2017 - v2.8
+
 In gateway.c I cleaned up the do_ping routing slightly. I was going to add
 a default timer but instead decided to let the user hit enter for their own
 "timer" of sorts. Users are also now instructed on the node to hit enter
@@ -333,6 +334,16 @@ does with the exception of how it handles dynamic clients. Other than
 that, it does appear to tunnel through your ISP filters as amprnet
 does which is a plus.
 
+12/07/2017 v2.8.1
+Spotted and fixed an issue in the D command within router.c that I somehow
+introduced in regards to columns not equalling a full 4x4. Locally it didn't
+show but remotely it did. When one ran a D command and there were less than
+4 columns a carriage return/new line was not sent making the user's screen
+look "stuck" when in fact it was not. Fixed!.. before bugs were reported :)
+Note: this *only* affected an incoming NetRom connection.
+
+Changed this file and node.h to reflect 2.8.1.
+
 ----------- Note on SystemD --------
 In uronode.socket, you'll notice the line:
 ListenStream=0.0.0.0:3694
diff --git a/node.h b/node.h
index 0a1e645..f03f442 100644
--- a/node.h
+++ b/node.h
@@ -1,5 +1,5 @@
-#define VERSION                "URONode v2.8"
-#define COMPILING	       "November 23, 2017"
+#define VERSION                "URONode v2.8.1"
+#define COMPILING	       "December 7, 2017"
 
 #define STATE_IDLE	0
 #define STATE_TRYING	1
diff --git a/router.c b/router.c
index ccc522c..ea36d28 100644
--- a/router.c
+++ b/router.c
@@ -202,10 +202,17 @@ int do_dest(int argc, char **argv)
     }
     for (p=fdst;p!=NULL;p=p->next) {
       sprintf(ssid, "%d-%d", p->ssida, p->sside);
-      axio_printf(NodeIo,"%-7s %-5s %4ld%s",p->dest_call,ssid,p->rtt,(++i % 4) ? "  " : "\n");
+      axio_printf(NodeIo,"%-7s %-5s %4ld%c",p->dest_call,ssid,p->rtt,(++i % 4) ? ' ' : '\n');
     }
-    if ((i % 4) != 0) axio_printf(NodeIo,""); 
-    free_flex_dst(fdst);
+    if ((User.ul_type == AF_NETROM) && (i % 4) == 0) {
+          node_msg("");
+        }
+    if ((User.ul_type == AF_NETROM) && (i % 4) != 0) { 
+	  node_msg(""); 
+	} else
+    if ((User.ul_type != AF_NETROM) && (i % 4) == 0) {
+	}
+	free_flex_dst(fdst);
 //    if (User.ul_type == AF_NETROM) {
 //      node_msg("");
 //    }