restore talk "<call> not visible on cluster" message

[spider.git] / perl / DXProtHandle.pm

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index eacd9225d7ca197a9c0acf4b3accbd9968574d35..10a5fe726c4fad8336505ebee7ee272c1df060f8 100644 (file)
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -405,6 +405,12 @@ sub handle_16
                return;
        }
 
+       # isolate now means only accept stuff from this call only
+       if ($self->{isolate} && $ncall ne $self->{call}) {
+               dbg("PCPROT: $self->{call} isolated, $ncall ignored") if isdbg('chanerr');
+               return;
+       }
+
        my $parent = Route::Node::get($ncall);
 
        if ($parent) {
@@ -503,6 +509,12 @@ sub handle_17
                return;
        }
 
+       # isolate now means only accept stuff from this call only
+       if ($self->{isolate} && $ncall ne $self->{call}) {
+               dbg("PCPROT: $self->{call} isolated, $ncall ignored") if isdbg('chanerr');
+               return;
+       }
+
        RouteDB::delete($ncall, $self->{call});
 
        my $uref = Route::User::get($ucall);
@@ -684,6 +696,12 @@ sub handle_19
                        }
                }
 
+               # isolate now means only accept stuff from this call only
+               if ($self->{isolate} && $call ne $self->{call}) {
+                       dbg("PCPROT: $self->{call} isolated, $call ignored") if isdbg('chanerr');
+                       next;
+               }
+
                my $user = check_add_node($call);
 
 #              if (eph_dup($genline)) {
@@ -787,11 +805,16 @@ sub handle_21
        eph_del_regex("^PC1[679].*$call");
 
        # if I get a PC21 from the same callsign as self then ignore it
-       if ($call eq $self->call) {
+       if ($call eq $self->{call}) {
                dbg("PCPROT: self referencing PC21 from $self->{call}");
                return;
        }
 
+       # for the above reason and also because of the check for PC21s coming
+       # in for self->call from outside being ignored further down
+       # we don't need any isolation code here, because we will never
+       # act on a PC21 with self->call in it.
+
        RouteDB::delete($call, $self->{call});
 
        my $parent = Route::Node::get($self->{call});
@@ -1688,7 +1711,8 @@ sub handle_93
                return;
        }
 
-       # remember that we are converting PC10->PC93
+       # remember that we are converting PC10->PC93 and self will be $main::me if it
+       # comes from us
        unless ($self->{do_pc9x}) {
                dbg("PCPROT: PC9x come in from non-PC9x node, ignored") if isdbg('chanerr');
                return;
@@ -1697,11 +1721,11 @@ sub handle_93
        my $t = $_[2];
        my $parent = check_pc9x_t($pcall, $t, 93, 1) || return;
 
-       my $to = $_[3];
-       my $from = $_[4];
-       my $via = $_[5];
+       my $to = uc $_[3];
+       my $from = uc $_[4];
+       my $via = uc $_[5];
        my $text = $_[6];
-       my $onode = $_[7];
+       my $onode = uc $_[7];
        $onode = $pcall if @_ <= 8;
 
        # this is catch loops caused by bad software ...
@@ -1726,7 +1750,9 @@ sub handle_93
                return;
        }
 
-       if (is_callsign($to)) {
+       # if it is routeable then then treat it like a talk
+       my $ref = Route::get($to);
+       if ($ref) {
                # local talks
                my $dxchan;
                $dxchan = DXChannel::get($main::myalias) if $to eq $main::mycall;
@@ -1744,34 +1770,30 @@ sub handle_93
                }
 
                # convert to PC10 talks where appropriate
-               my $ref = Route::get($to);
-               if ($ref) {
-                       # just go for the "best" one for now (rather than broadcast)
-                       $dxchan = $ref->dxchan;
+               # just go for the "best" one for now (rather than broadcast)
+               $dxchan = $ref->dxchan;
 
-                       # check it...
-                       if (ref $dxchan && $dxchan->isa('DXChannel')) {
-                               if ($dxchan->{do_pc9x}) {
-                                       $dxchan->send($line);
-                               } else {
-                                       $dxchan->talk($from, $to, $via, $text, $onode);
-                               }
+               # check it...
+               if (ref $dxchan && $dxchan->isa('DXChannel')) {
+                       if ($dxchan->{do_pc9x}) {
+                               $dxchan->send($line);
                        } else {
-                               dbg("ERROR: $to -> $dxchan is not a DXChannel! (convert to pc10)");
+                               $dxchan->talk($from, $to, $via, $text, $onode);
                        }
-                       return;
+               } else {
+                       dbg("ERROR: $to -> $dxchan is not a DXChannel! (convert to pc10)");
                }
+               return;
 
-               # otherwise, drop through and allow it to be broadcast
-       } elsif ($to eq '*' || uc $to eq 'SYSOP' || uc $to eq 'WX') {
+       } elsif ($to eq '*' || $to eq 'SYSOP' || $to eq 'WX') {
                # announces
-               my $sysop = uc $to eq 'SYSOP' ? '*' : ' ';
-               my $wx = uc $to eq 'WX' ? '1' : '0';
+               my $sysop = $to eq 'SYSOP' ? '*' : ' ';
+               my $wx = $to eq 'WX' ? '1' : '0';
                my $local = $via eq 'LOCAL' ? '*' : $via;
 
                $self->send_announce(1, pc12($from, $text, $local, $sysop, $wx, $pcall), $from, $local, $text, $sysop, $pcall, $wx, $via eq 'LOCAL' ? $via : undef);
                return if $via eq 'LOCAL';
-       } else {
+       } elsif (!is_callsign($to) && $text =~ /^#\d+ /) {
                # chat messages to non-pc9x nodes
                $self->send_chat(1, pc12($from, $text, undef, $to, undef, $pcall), $from, '*', $text, $to, $pcall, '0');
        }