Make set/isolate work in BOTH directions

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index ea41c08317e98bb1477d7ecaa6213b01c7bc7140..712b478539c79973e47895fdcfc17a98a97e5952 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -893,6 +893,10 @@ sub broadcast_pc92_update
        dbg("ROUTE: broadcast_pc92_update $call") if isdbg('obscount');
 
        my $nref = Route::Node::get($call);
+       unless ($nref) {
+               dbg("ERROR: broadcast_pc92_update - Route::Node $call disappeared");
+               return;
+       }
        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);
@@ -1234,6 +1238,12 @@ sub send_route
        for (; @_ && $no; $no--) {
                my $r = shift;
 
+               # don't send messages with $self's call in back to them
+               if ($r->call eq $self->{call}) {
+                       dbg("PCPROT: trying to send $self->{call} back itself") if isdbg('chanerr');
+                       next;
+               }
+
                if (!$self->{isolate} && $self->{routefilter}) {
                        $filter = undef;
                        if ($r) {
@@ -1310,8 +1320,9 @@ sub broadcast_route_nopc9x
                        next if $origin eq $dxchan->{call};     # don't route some from this call back again.
                        next unless $dxchan->isa('DXProt');
                        next if $dxchan->{do_pc9x};
-                       next if ($generate == \&pc16 || $generate==\&pc17) && !$dxchan->user->wantsendpc16;
-
+                       if ($generate == \&pc16 || $generate==\&pc17) {
+                               next unless $dxchan->user->wantsendpc16;
+                       }
                        $dxchan->send_route($origin, $generate, @_);
                }
        }