From: Dirk Koopman <djk@tobit.co.uk>
Date: Mon, 10 Sep 2007 20:10:52 +0000 (+0100)
Subject: use just one lastid for all pc9x sentences
X-Git-Tag: 1.55~78
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=fee8c4eabda49d4c7440ce1075ea49dcd9c2e825;p=spider.git

use just one lastid for all pc9x sentences

This should work fine and will cure the dupe/lost talk problem
---

diff --git a/Changes b/Changes
index c53ee140..cda62977 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,7 @@
+10Sep07=======================================================================
+1. Remove warnings for EINPROGRESS etc for Windows perl 5.8.
+2. Try to see if using just one lastid is viable in all situations. If it is
+then this will cure the talk problem.
 20Aug07=======================================================================
 1. add cty.dat + wpxloc.raw changes for CTY-1706.
 31Jul07=======================================================================
diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 10a5fe72..9e0f5ec4 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -1433,7 +1433,7 @@ sub check_pc9x_t
 		# the id on it is completely unreliable. Besides, only commands
 		# originating on this box will go through this code...
 		if ($parent->call ne $main::mycall) {
-			my $lastid = $parent->lastid->{$pc} || 0;
+			my $lastid = $parent->lastid || 0;
 			if ($t < $lastid) {
 				if ($t+86400-$lastid > $pc9x_past_age) {
 					dbg("PCPROT: dup id on $t <= $lastid, ignored") if isdbg('chanerr');
@@ -1453,7 +1453,7 @@ sub check_pc9x_t
 	} elsif ($create) {
 		$parent = Route::Node->new($call);
 	}
-	$parent->lastid->{$pc} = $t if $parent;
+	$parent->lastid($t) if $parent;
 
 	return $parent;
 }
diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index d2105f8f..c1fcc543 100644
--- a/perl/Route/Node.pm
+++ b/perl/Route/Node.pm
@@ -286,7 +286,7 @@ sub new
 	$self->{flags} = shift || Route::here(1);
 	$self->{users} = [];
 	$self->{nodes} = [];
-	$self->{lastid} = {};
+	$self->{lastid} = 0;
 	$self->{PC92C_dxchan} = '';
 	$self->reset_obs;			# by definition
 
diff --git a/perl/Version.pm b/perl/Version.pm
index 73432133..67b77d78 100644
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,6 +11,6 @@ use vars qw($version $subversion $build);
 
 $version = '1.54';
 $subversion = '0';
-$build = '136';
+$build = '137';
 
 1;