fiddle with pc20/22 some more

[spider.git] / perl / DXProtHandle.pm

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 7332d669d4d4fd5c10bfe73e0bb41785cba7bb40..a62c6bef77de07b90cbf6a41711cc6f58708e6e5 100644 (file)
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -776,13 +776,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,9 +880,6 @@ sub handle_22
        my $line = shift;
        my $origin = shift;
 
-       $self->state('normal');
-       $self->{lastping} = 0;
-
        if ($self->{do_pc92}) {
                if ($self->{state} ne 'init92') {
                        dbg("PCPROT: disconnecting because login call not sent in any pc92") if isdbg('chanerr');
@@ -889,17 +887,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