fix init list and add pc92a/d to pc16/17 handlers

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 6ff479c1b61d9afee3b732b6687ce56bc29cb7be..1da81e95b2c98a6b9ca2bdac3a41a13186d7823f 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -769,11 +769,25 @@ sub send_pc92_config
        my $node;
 
        dbg('DXProt::send_pc92_config') if isdbg('trace');
-       
-       my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all();
-       my @localnodes = map { my $r = Route::get($_->{call}); $r ? $r : () } @dxchan if @dxchan;
+
+       # send 'my' configuration for all users and pc92 capable nodes
+       my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && $_->{do_pc92} } DXChannel::get_all();
+       my @localnodes = map { my $r = Route::get($_->{call}); $r ? $r : () } @dxchan;
        $self->send_route_pc92($main::mycall, \&pc92c, scalar @localnodes, @localnodes);
-}
+
+       # send the configuration of all the 'external' nodes that don't handle PC92
+       # out with the 'external' marker on the first node.
+       @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && !$_->{do_pc92} } DXChannel::get_all_nodes();
+       @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
+       foreach $node (@localnodes) {
+               if ($node) {
+                       my @rout = map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users;
+                       $self->send_route_pc92($main::mycall, \&pc92c, 1, $node, @rout) if @rout;
+               } else {
+                       dbg("sent a null value") if isdbg('chanerr');
+               }
+       }
+} 
 
 #
 # route a message down an appropriate interface for a callsign
@@ -1146,7 +1160,7 @@ sub broadcast_route_pc9x
                $line = &$generate(@_);
        } 
 
-       $line =~ /\^H(\d+)\^$/;
+       $line =~ /\^H(\d+)\^\~?$/;
        unless ($1 > 0 && $self->{isolate}) {
                foreach $dxchan (@dxchan) {
                        next if $dxchan == $self;