From: minima <minima>
Date: Thu, 13 Sep 2001 15:14:53 +0000 (+0000)
Subject: allow 't <call>' for swopping from announces as well
X-Git-Tag: R_1_48~24
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=428e91daacae4fddcabc7e6279c1fbd40edbbe91;p=spider.git

allow 't <call>' for swopping from announces as well
---

diff --git a/Changes b/Changes
index 07129219..29408d19 100644
--- a/Changes
+++ b/Changes
@@ -4,8 +4,9 @@
 data (eg at init time with large lists of node/users on fast links).
 3. fixed realtime input filter changing.
 4. added announce->talk conversion for routable calls when announces of the
-form 'to g1tlh hello' or 'g1tlh hello' appear. This also suppresses similar
-announces for users whose callsign is not the one in the announce.
+form 'to g1tlh hello', 't g1tlh hello'  or 'g1tlh hello' appear. 
+This also suppresses similar announces for users whose callsign is not the 
+one in the announce.
 11Sep01=======================================================================
 1. added IP address logging of connections
 10Sep01=======================================================================
diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 18367bdf..6986a41a 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -707,7 +707,7 @@ sub announce
 
 	if ($suppress_ann_to_talk) {
 		my ($to, $call) = $text =~ /^\s*([\w-]+)[\s:]+([\w-]+)/;
-		return if ($to && $call && ((uc $to eq 'TO' && is_callsign(uc $call)) || is_callsign($call = uc $to)));
+		return if ($to && $call && ((uc $to =~ /^TO?$/ && is_callsign(uc $call)) || is_callsign($call = uc $to)));
 	}	
 
 	if ($self->{annfilter}) {
diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 02e3d3a8..153618f9 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -522,7 +522,9 @@ sub normal
 				if ($ann_to_talk) {
 					my ($to, $call) = $field[3] =~ /^\s*([\w-]+)[\s:]+([\w-]+)/;
 					if ($to && $call) {
-						if ((uc $to eq 'TO' && is_callsign(uc $call)) || is_callsign($call = uc $to)) {
+						$to = uc $to;
+						$call = uc $call;
+						if (($to =~ /^TO?$/ && is_callsign($call)) || is_callsign($call = $to)) {
 							my $ref = Route::get($call);
 							if ($ref) {
 								my $dxchan = $ref->dxchan;