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 fcc30cfe2255ce9b71cf9db3d935b8b50b413e6d..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,9 +780,15 @@ sub send_delayed_pc92
 {
        my $self = shift;
        
-       # send out delayed PC92 config for this node if it is external
-       my $line = $main::me->gen_my_pc92_config;
+       # 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}) {
+               $line = gen_my_pc92_config(Route::Node::get($self->{call}));
+               $self->broadcast_route_pc9x($main::mycall, undef, $line, 0);
+       }
 }
 
 # send local configuration
@@ -881,19 +891,10 @@ sub handle_22
                        $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;
        }
        $self->{lastping} = 0;
        $self->state('normal');
+       $self->send_delayed_pc92;
 }
                                
 # WWV info