From: Dirk Koopman <djk@tobit.co.uk>
Date: Sat, 9 May 2020 16:45:05 +0000 (+0100)
Subject: add incoming route/channel for progress dbg
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=7de4da6653c38eb165afbea74a4a9b64f3541214;p=spider.git

add incoming route/channel for progress dbg
---

diff --git a/Changes b/Changes
index 207ce7c8..b3e8d4fd 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,7 @@
+09May20=======================================================================
+1. Show the route by which this PCxx came in progress debugging reports. In
+   some other words: the spot/wwv/wcy/ann message arrived first from this 
+   connection. 
 08May20=======================================================================
 1. Tidy up routing table
 2. Add new argument to show/version (ALL or list of regexes) that allow you
diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index cd6a7518..e268d0f9 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -231,7 +231,8 @@ sub handle_11
 		$sip ||= '';
 		my $d = ztime($spot[2]);
 		my $s = "SPOT: $spot[1] on $spot[0] \@ $d by $spot[4]$sip\@$spot[7]";
-		$s .= " '$spot[3]'" if $spot[3];
+		$s .= $spot[3] ? " '$spot[3]'" : q{ ''};
+		$s .=  " route: $origin";
 		dbg($s);
 	}
 	
@@ -972,7 +973,7 @@ sub handle_23
 
 	# note this only takes the first one it gets
 	Geomag::update($d, $pc->[2], $sfi, $k, $i, @$pc[6..8], $r);
-	dbg("WWV: $d $pc->[2], sfi:$sfi k:$k info:$i $pc->[6] $pc->[7] $pc->[8] $r") if isdbg('progress');
+	dbg("WWV: $d $pc->[2], sfi:$sfi k:$k info:$i $pc->[6] $pc->[7] $pc->[8] $r route: $origin") if isdbg('progress');
 
 	if (defined &Local::wwv) {
 		my $rep;
@@ -1376,7 +1377,7 @@ sub handle_73
 	}
 
 	my $wcy = WCY::update($d, @$pc[2..12]);
-	dbg("WCY: " . join ', ', @$pc[2..12]) if isdbg('progress');
+	dbg("WCY: " . join(', ', @$pc[2..12]) . " route: $origin") if isdbg('progress');
 
 	if (defined &Local::wcy) {
 		my $rep;
@@ -2022,7 +2023,7 @@ sub handle_93
 
 	if (isdbg('progress')) {
 		my $vs = $via ne '*' ? " via $via" : ''; 
-		my $s = "ANNTALK: $from\@$onode$vs -> $to '$text'";
+		my $s = "ANNTALK: $from\@$onode$vs -> $to '$text' route: $origin";
 		dbg($s);
 	}