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 c53ee1407c4ec9779d17b67b87813359948df213..cda629770e61c9a1159a454384bc663e6e13a214 100644 (file)
--- 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 10a5fe726c4fad8336505ebee7ee272c1df060f8..9e0f5ec4adb111ccf81f159a6368049cce558926 100644 (file)
--- 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 d2105f8f6b6bcf57aea77391344f243c7af3681e..c1fcc5435f05d33505d1f2df3d3045dc6c30b7b9 100644 (file)
--- 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 734321331d8c4d01f99fd0f5b7f87f17fb0463ba..67b77d78285b11415d40106f7b14c6526f4e9d42 100644 (file)
--- 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;