From: Dirk Koopman <djk@tobit.co.uk>
Date: Mon, 25 Oct 2010 09:42:08 +0000 (+0100)
Subject: Drop PC12 from pc9x nodes, increase ann dup age.
X-Git-Tag: 1.56~23
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=2110beabbe4a0c22fbab1ce4f68bec6b94db0ae4;p=spider.git

Drop PC12 from pc9x nodes, increase ann dup age.

Assume that PC12s coming from pc9x nodes are coming via some other
route and have been converted.

Increase the default announce dup age from 5 to 18 hrs.
---

diff --git a/Changes b/Changes
index 8680fcb6..0fc2e474 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,7 @@
+25Oct10=======================================================================
+1. Drop PC12s purporting to originate at nodes that do PC9x (suggestion from
+Lee VE1CC).
+2. Increase default dup age for announces from 5 -> 18 hours.
 23Oct10=======================================================================
 1. add dbexport command to allow the export of ak1a style databases to a
 file.
diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm
index f6b4653d..6d477264 100644
--- a/perl/AnnTalk.pm
+++ b/perl/AnnTalk.pm
@@ -18,7 +18,7 @@ use DXVars;
 use vars qw(%dup $duplth $dupage $filterdef);
 
 $duplth = 30;					# the length of text to use in the deduping
-$dupage = 5*3600;				# the length of time to hold ann dups
+$dupage = 18*3600;				# the length of time to hold ann dups
 $filterdef = bless ([
 			  # tag, sort, field, priv, special parser 
 			  ['by', 'c', 0],
diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 43e5670c..213e9b40 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -321,6 +321,12 @@ sub handle_12
 		return;
 	}
 
+	# ignore PC12s from origins that use PCxx protocol
+	my $oref = Route::get($origin);
+	if ($oref->do_pc9x) {
+		dbg("PCPROT: PC12 rxed from PC9x node, ignored") if isdbg('chanerr');
+		return;
+	}
 
 	my $dxchan;
 
diff --git a/perl/Version.pm b/perl/Version.pm
index a8d910ce..e361a26f 100644
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,7 +11,7 @@ use vars qw($version $subversion $build $gitversion);
 
 $version = '1.55';
 $subversion = '0';
-$build = '76';
-$gitversion = '75987f0';
+$build = '77';
+$gitversion = '7d74331';
 
 1;