make sure that pc92 C records are sent on init with last received time

[spider.git] / perl / DXProtHandle.pm

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 903a2fd60869b6b89bc7c8a7e8dc2ebd30aa748b..5d7aee9a73cfe519c95a080dc5d128d725959b15 100644 (file)
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -44,6 +44,7 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim
                        $investigation_int $pc19_version $myprot_version
                        %nodehops $baddx $badspotter $badnode $censorpc $rspfcheck
                        $allowzero $decode_dk0wcy $send_opernam @checklist
+                       $eph_pc15_restime
                   );
        
 # incoming talk commands
@@ -375,6 +376,22 @@ sub handle_12
                $self->route($_[2], $line);
        }
 }
+
+sub handle_15
+{
+       my $self = shift;
+       my $pcno = shift;
+       my $line = shift;
+       my $origin = shift;
+
+       if (eph_dup($line, $eph_pc15_restime)) {
+               dbg("PCPROT: Ephemeral dup, dropped") if isdbg('chanerr');
+       } else {
+               unless ($self->{isolate}) {
+                       DXChannel::broadcast_nodes($line, $self) if $line =~ /\^H\d+\^?~?$/; # send it to everyone but me
+               }
+       }
+}
                
 # incoming user                
 sub handle_16
@@ -715,7 +732,7 @@ sub handle_19
        if (@rout) {
                $self->route_pc21($self->{call}, $line, @rout);
                $self->route_pc19($self->{call}, $line, @rout);
-               $self->route_pc92a($main::mycall, $line, $parent, @rout);
+               $self->route_pc92a($main::mycall, $line, $main::routeroot, @rout);
        }
 }
                
@@ -787,7 +804,7 @@ sub handle_21
 
        if (@rout) {
                $self->route_pc21($origin, $line, @rout);
-               $self->route_pc92d($main::mycall, $line, $parent, @rout);
+               $self->route_pc92d($main::mycall, $line, $main::routeroot, @rout);
        }
 }
                
@@ -1333,7 +1350,7 @@ sub handle_92
        my $t = $_[2];
        my $sort = $_[3];
        
-       my @ent = grep {$_ && /^[0-7]/} @_[4 .. -1];
+       my @ent = grep {$_ && /^[0-7]/} @_[4 .. $#_];
        
        if ($pcall eq $main::mycall) {
                dbg("PCPROT: looped back, ignored") if isdbg('chanerr');
@@ -1354,7 +1371,7 @@ sub handle_92
 
        if (@ent) {
                my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($ent[0]);
-               if ($call && $is_node && $call eq $main::mycall) {
+               if ($call && $is_node && $call eq $pcall) {
                        $parent->here(Route::here($here));
                        $parent->version($version) if $version;
                        $parent->build($build) if $build;
@@ -1376,14 +1393,13 @@ sub handle_92
        
        if ($sort eq 'A') {
                for (@ent) {
-                       push @radd, add_thingy($parent, $_);
+                       push @radd, _add_thingy($parent, $_);
                }
        } elsif ($sort eq 'D') {
                for (@ent) {
                        push @rdel, _del_thingy($parent, $_);
                }
        } elsif ($sort eq 'C') {
-               my $i;
                my (@nodes, @users);
                for (@ent) {
                        my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_);
@@ -1394,7 +1410,7 @@ sub handle_92
                                        push @users, $call;
                                }
                        } else {
-                               dbg("DXPROT: pc92 call entry '$_[$i]' not decoded, ignored") if isdbg('chanerr'); 
+                               dbg("DXPROT: pc92 call entry '$_' not decoded, ignored") if isdbg('chanerr'); 
                        }
                }
 
@@ -1403,8 +1419,8 @@ sub handle_92
                for (@ent) {
                        my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_);
                        if ($call) {
-                               push @radd,_add_thingy($parent, $_[$i]) if grep $call eq $_, (@$nnodes, @$nusers);
-                               push @rdel,_del_thingy($parent, $_[$i]) if grep $call eq $_, (@$dnodes, @$dusers);
+                               push @radd,_add_thingy($parent, $_) if grep $call eq $_, (@$nnodes, @$nusers);
+                               push @rdel,_del_thingy($parent, $_) if grep $call eq $_, (@$dnodes, @$dusers);
                        }
                }
        } else {
@@ -1412,12 +1428,16 @@ sub handle_92
                return;
        }
 
-       $self->broadcast_route_pc9x($origin, undef, $line, 0);
+       $self->broadcast_route_pc9x($pcall, undef, $line, 0);
        foreach my $r (@rdel) {
+               next unless $r;
+               
                $self->route_pc21($pcall, undef, $r) if $r->isa('Route::Node');
                $self->route_pc17($pcall, undef, $parent, $r) if $r->isa('Route::User');
        }
        foreach my $r (@radd) {
+               next unless $r;
+
                $self->route_pc19($pcall, undef, $r) if $r->isa('Route::Node');
                $self->route_pc16($pcall, undef, $parent, $r) if $r->isa('Route::User');
        }