fix nohere on pc92

[spider.git] / perl / DXProtHandle.pm

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index c65ebc6d6f40a4fbca6e96268086ef7705a4d452..e961b02b82231cefe4e7ec6dbed02e4f32723a5e 100644 (file)
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -491,7 +491,7 @@ sub handle_16
        }
        if (@rout) {
                $self->route_pc16($origin, $line, $parent, @rout);
-               $self->route_pc92a($main::mycall, undef, $parent, @rout);
+               $self->route_pc92a($main::mycall, undef, $parent, @rout) if $self->{state} eq 'normal';
        }
 }
                
@@ -736,6 +736,20 @@ sub handle_19
        }
 }
                
+sub send_delayed_pc92
+{
+       my $self = shift;
+       
+       # send out delayed PC92 config for this node if it is external
+       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);
+               } 
+       }
+}
+
 # send local configuration
 sub handle_20
 {
@@ -747,6 +761,7 @@ sub handle_20
        $self->send(pc22());
        $self->state('normal');
        $self->{lastping} = 0;
+       $self->send_delayed_pc92;
 }
                
 # delete a cluster from the list
@@ -818,14 +833,7 @@ sub handle_22
        $self->state('normal');
        $self->{lastping} = 0;
 
-       # send out delayed PC92 config for this node if it is external
-       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_pc92a($main::mycall, undef, $node, @rout);
-               } 
-       }
+       $self->send_delayed_pc92
 }
                                
 # WWV info
@@ -1274,7 +1282,7 @@ sub _decode_pc92_call
        my $icall = shift;
        my @part = split /:/, $icall;
        my ($flag, $call) = unpack "A A*", $part[0];
-       return () unless $flag && $flag ge '0' && $flag le '7';
+       return () unless defined $flag && $flag ge '0' && $flag le '7';
        return () unless $call && is_callsign($call);
        my $is_node = $flag & 4;
        my $is_extnode = $flag & 2;