add a pc92a on receipt of a PC22

[spider.git] / perl / DXProtHandle.pm

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index f0dd2760765f3fc6dc0e0a734d935681cd57504e..7332d669d4d4fd5c10bfe73e0bb41785cba7bb40 100644 (file)
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -793,6 +793,13 @@ sub handle_20
        my $pcno = shift;
        my $line = shift;
        my $origin = shift;
+
+       if ($self->{do_pc92} && $self->{state} ne 'init92') {
+               dbg("PCPROT: disconnecting because login call not sent in any pc92") if isdbg('chanerr');
+               $self->send("**** You logged in with $self->{call} but that is NOT your \$mycall");
+               $self->disconnect;
+               return;
+       }
        $self->send_local_config();
        $self->send(pc22());
        $self->state('normal');
@@ -871,10 +878,28 @@ sub handle_22
        my $pcno = shift;
        my $line = shift;
        my $origin = shift;
+
        $self->state('normal');
        $self->{lastping} = 0;
 
-       $self->send_delayed_pc92
+       if ($self->{do_pc92}) {
+               if ($self->{state} ne 'init92') {
+                       dbg("PCPROT: disconnecting because login call not sent in any pc92") if isdbg('chanerr');
+                       $self->send("**** You logged in with $self->{call} but that is NOT your \$mycall");
+                       $self->disconnect;
+                       return;
+               }
+               my $ref = Route::Node::get($self->{call});
+               if ($ref) {
+                       $main::me->route_pc92a($main::mycall, undef, $main::routeroot, $ref);
+               } else {
+                       dbg("PCPROT: disconnecting because pc92 for $self->{call} received") if isdbg('chanerr');
+                       $self->disconnect;
+                       return;
+               }
+       } else {
+               $self->send_delayed_pc92;
+       }
 }
                                
 # WWV info
@@ -1364,8 +1389,10 @@ sub _add_thingy
 
        if ($call) {
                if ($is_node) {
+                       dbg("ROUTE: added node $call to " . $parent->call) if isdbg('routelow');
                        @rout = $parent->add($call, $version, Route::here($here));
                } else {
+                       dbg("ROUTE: added user $call to " . $parent->call) if isdbg('routelow');
                        @rout = $parent->add_user($call, Route::here($here));
                }
        }
@@ -1381,9 +1408,11 @@ sub _del_thingy
        if ($call) {
                if ($is_node) {
                        my $nref = Route::Node::get($call);
+                       dbg("ROUTE: deleting node $call from " . $parent->call) if isdbg('routelow');
                        @rout = $nref->del($parent) if $nref;
                } else {
                        my $uref = Route::User::get($call);
+                       dbg("ROUTE: deleting user $call from " . $parent->call) if isdbg('routelow');
                        @rout = $parent->del_user($uref) if $uref;
                }
        }
@@ -1435,6 +1464,8 @@ sub handle_92
        my $line = shift;
        my $origin = shift;
 
+       my (@radd, @rdel);
+       
        $self->{do_pc92} ||= 1;
 
        my $pcall = $_[1];
@@ -1444,7 +1475,6 @@ sub handle_92
        }
        my $t = $_[2];
        my $sort = $_[3];
-       
        my @ent = map {[ _decode_pc92_call($_) ]} grep {$_ && /^[0-7]/} @_[4 .. $#_];
        
        if ($pcall eq $main::mycall) {
@@ -1452,14 +1482,16 @@ sub handle_92
                return;
        }
 
+       if ($pcall eq $self->{call} && $self->{state} eq 'init') {
+               $self->state('init92');
+       }
+
        my $parent = check_pc9x_t($pcall, $t, 92, 1) || return;
+       my $oparent = $parent;
        
        $parent->lastid->{92} = $t;
        $parent->do_pc92(1);
        $parent->via_pc92(1);
-       $parent->reset_obs;
-       dbg("ROUTE: reset obscount on $pcall now " . $parent->obscount) if isdbg('route');
-
 
        if (@ent) {
 
@@ -1485,8 +1517,6 @@ sub handle_92
                                }
                                $parent = check_pc9x_t($call, $t, 92) || return;
                                $parent->via_pc92(1);
-                               $parent->reset_obs;
-                               dbg("ROUTE: reset obscount on $pcall now " . $parent->obscount) if isdbg('route');
                        }
                } else {
                        dbg("PCPROT: must be mycall or external node as first entry, ignored") if isdbg('chanerr');
@@ -1509,8 +1539,6 @@ sub handle_92
                push @nent, $_;
        }
 
-       my (@radd, @rdel);
-       
        if ($sort eq 'A') {
                for (@nent) {
                        push @radd, _add_thingy($parent, $_);
@@ -1521,6 +1549,15 @@ sub handle_92
                }
        } elsif ($sort eq 'C') {
                my (@nodes, @users);
+
+               # we only reset obscounts on config records
+               $oparent->reset_obs;
+               dbg("ROUTE: reset obscount on $pcall now " . $oparent->obscount) if isdbg('route');
+               if ($oparent != $parent) {
+                       $parent->reset_obs;
+                       dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('route');
+               }
+
                foreach my $r (@nent) {
 #                      my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_);                     
                        if ($r->[0]) {
@@ -1536,13 +1573,20 @@ sub handle_92
 
                my ($dnodes, $dusers, $nnodes, $nusers) = $parent->calc_config_changes(\@nodes, \@users);
 
+               # add users here
                foreach my $r (@nent) {
                        my $call = $r->[0];
                        if ($call) {
                                push @radd,_add_thingy($parent, $r) if grep $call eq $_, (@$nnodes, @$nusers);
-                               push @rdel,_del_thingy($parent, $r) if grep $call eq $_, (@$dnodes, @$dusers);
                        }
                }
+               # del users here
+               foreach my $r (@$dnodes) {
+                       push @rdel,_del_thingy($parent, [$r, 1]);
+               }
+               foreach my $r (@$dusers) {
+                       push @rdel,_del_thingy($parent, [$r, 0]);
+               }
        } else {
                dbg("PCPROT: unknown action '$sort', ignored") if isdbg('chanerr');
                return;