try to make set/isolate more bombproof.

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 835d4424f7a2dbcf80607651bbf0a0d72e6f5c21..ec6f5b0400a6b309d0da0b398a5235260373b5cf 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -351,7 +351,7 @@ sub start
 sub sendinit
 {
        my $self = shift;
-       $self->send(pc18());
+       $self->send(pc18(($self->{isolate} || !$self->user->wantpc9x) ? "" : " pc9x"));
 }
 
 #
@@ -449,13 +449,6 @@ sub process
                        }
                }
 
-               # send out a PC92 config record if required
-               if ($main::systime >= $dxchan->{next_pc92_update}) {
-                       if ($dxchan->{call} eq $main::mycall || !$dxchan->{do_pc9x}) {
-                               $dxchan->send_pc92_update($dxchan->{call});
-                       }
-                       $dxchan->update_pc92_next($pc92_update_period);
-               }
        }
 
        Investigate::process();
@@ -474,6 +467,19 @@ sub process
                }
 
                $last10 = $t;
+
+               # send out config broadcasts
+               foreach $dxchan (@dxchan) {
+                       next unless $dxchan->is_node;
+
+                       # send out a PC92 config record if required for me and
+                       # all my non pc9x dependent nodes.
+                       if ($main::systime >= $dxchan->{next_pc92_update}) {
+                               if ($dxchan->{call} eq $main::mycall || !$dxchan->{do_pc9x}) {
+                                       $dxchan->broadcast_pc92_update($dxchan->{call});
+                               }
+                       }
+               }
        }
 
        if ($main::systime - 3600 > $last_hour) {
@@ -618,6 +624,7 @@ sub send_announce
        my $target = $_[6];
        my $to = 'To ';
        my $text = unpad($_[2]);
+       my $from = $_[0];
 
        if ($_[3] eq '*') {     # sysops
                $target = "SYSOP";
@@ -634,7 +641,7 @@ sub send_announce
 
 
        # obtain country codes etc
-       my @a = Prefix::cty_data($_[0]);
+       my @a = Prefix::cty_data($from);
        my @b = Prefix::cty_data($_[4]);
        if ($self->{inannfilter}) {
                my ($filter, $hops) =
@@ -647,12 +654,20 @@ sub send_announce
                }
        }
 
-       if (AnnTalk::dup($_[0], $_[1], $_[2])) {
-               dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
-               return;
+       if (AnnTalk::dup($from, $_[1], $_[2])) {
+               my $dxchan = DXChannel::get($from);
+               if ($dxchan && $dxchan->is_user) {
+                       if ($dxchan->priv < 5) {
+                               $dxchan->send($dxchan->msg('dup'));
+                               return;
+                       }
+               } else {
+                       dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
+                       return;
+               }
        }
 
-       Log('ann', $target, $_[0], $text);
+       Log('ann', $target, $from, $text);
 
        # send it if it isn't the except list and isn't isolated and still has a hop count
        # taking into account filtering and so on
@@ -686,6 +701,7 @@ sub send_chat
        my $target = $_[3];
        my $text = unpad($_[2]);
        my $ak1a_line;
+       my $from = $_[0];
 
        # munge the group and recast the line if required
        if ($target =~ s/\.LST$//) {
@@ -693,7 +709,7 @@ sub send_chat
        }
 
        # obtain country codes etc
-       my @a = Prefix::cty_data($_[0]);
+       my @a = Prefix::cty_data($from);
        my @b = Prefix::cty_data($_[4]);
        if ($self->{inannfilter}) {
                my ($filter, $hops) =
@@ -706,13 +722,21 @@ sub send_chat
                }
        }
 
-       if (AnnTalk::dup($_[0], $_[1], $_[2], $chatdupeage)) {
-               dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
-               return;
+       if (AnnTalk::dup($from, $target, $_[2], $chatdupeage)) {
+               my $dxchan = DXChannel::get($from);
+               if ($dxchan && $dxchan->is_user) {
+                       if ($dxchan->priv < 5) {
+                               $dxchan->send($dxchan->msg('dup'));
+                               return;
+                       }
+               } else {
+                       dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
+                       return;
+               }
        }
 
 
-       Log('chat', $target, $_[0], $text);
+       Log('chat', $target, $from, $text);
 
        # send it if it isn't the except list and isn't isolated and still has a hop count
        # taking into account filtering and so on
@@ -834,16 +858,6 @@ sub gen_my_pc92_config
        }
 }
 
-sub gen_pc92_update
-{
-       my $self = shift;
-
-       # send 'my' configuration for all channels
-       my $l = gen_my_pc92_config($main::routeroot);
-       return $l;
-}
-
-
 sub send_last_pc92_config
 {
        my $self = shift;
@@ -866,15 +880,17 @@ sub send_pc92_config
        $self->send($node->last_PC92C);
 }
 
-sub send_pc92_update
+sub broadcast_pc92_update
 {
        my $self = shift;
        my $call = shift;
 
-       dbg('DXProt::send_pc92_update') if isdbg('trace');
+       dbg('DXProt::broadcast_pc92_update') if isdbg('trace');
 
-       my $l = gen_my_pc92_config(Route::Node::get($call));
+       my $nref = Route::Node::get($call);
+       my $l = $nref->last_PC92C(gen_my_pc92_config($nref));
        $main::me->broadcast_route_pc9x($main::mycall, undef, $l, 0);
+       $self->update_pc92_next($pc92_update_period);
 }
 
 sub time_out_pc92_routes