try to sort out PC16 so that local connections override and update remote

[spider.git] / perl / DXProtHandle.pm

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 65aeeefa08c68aec890e81a3dcde9a94224abaf1..9d287df45133b1e3925e26d01a40b6c69a907a61 100644 (file)
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -423,6 +423,10 @@ sub handle_16
        my $h;
        $h = 1 if DXChannel::get($ncall);
        RouteDB::update($ncall, $self->{call}, $h);
+       if ($h && $self->{call} ne $ncall) {
+               dbg("PCPROT: trying to update a local node, ignored") if isdbg('chanerr');
+               return;
+       }
 
        if (eph_dup($line)) {
                dbg("PCPROT: dup PC16 detected") if isdbg('chanerr');
@@ -764,7 +768,7 @@ sub handle_19
        # but remember there will only be one (pair) these because any extras will be
        # thrown away.
        if (@rout) {
-               $self->route_pc21($self->{call}, $line, @rout);
+#              $self->route_pc21($self->{call}, $line, @rout);
                $self->route_pc19($self->{call}, $line, @rout);
        }
        if (@pc92out) {
@@ -776,13 +780,14 @@ sub send_delayed_pc92
 {
        my $self = shift;
        
-       # send out delayed PC92 config for this node if it is external
+       # send out new PC92 config to everyone else 
+       my $line = gen_my_pc92_config($main::me);
+       $self->broadcast_route_pc9x($main::mycall, undef, $line, 0);
+
+       # if this is an external node then send out the external config
        unless ($self->{do_pc92}) {
-               my $node = Route::Node::get($self->{call});
-               if ($node) {
-                       my @rout = map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users;
-                       $self->route_pc92c($main::mycall, undef, $node, @rout);
-               } 
+               $line = gen_my_pc92_config(Route::Node::get($self->{call}));
+               $self->broadcast_route_pc9x($main::mycall, undef, $line, 0);
        }
 }
 
@@ -879,17 +884,17 @@ sub handle_22
        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;
+       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;
+               }
        }
-
-       $self->state('normal');
        $self->{lastping} = 0;
-
-       $self->send_delayed_pc92
+       $self->state('normal');
+       $self->send_delayed_pc92;
 }
                                
 # WWV info