X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=bc753c3d784e6b053a5d67d147a8807d7ef6f855;hb=64d7fcd04e89143f23455c5aae3cc4e410700870;hp=ea41c08317e98bb1477d7ecaa6213b01c7bc7140;hpb=fb9c2ab04977b4e685b0eca3b2a2d04a77f65f4b;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index ea41c083..bc753c3d 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -823,13 +823,13 @@ sub send_local_config
 		my $node;
 		my @rawintcalls = map { $_->nodes } @localnodes if @localnodes;
 		my @intcalls;
-		for $node (@rawintcalls) {
-			push @intcalls, $node unless grep $node eq $_, @intcalls;
+		foreach $node (@rawintcalls) {
+			push @intcalls, $node if grep $_ && $node != $_, @intcalls;
 		}
 		my $ref = Route::Node::get($self->{call});
 		my @rnodes = $ref->nodes;
-		for $node (@intcalls) {
-			push @remotenodes, Route::Node::get($node) unless grep $node eq $_, @rnodes, @remotenodes;
+		foreach $node (@intcalls) {
+			push @remotenodes, Route::Node::get($node) if grep $_ && $node != $_, @rnodes, @remotenodes;
 		}
 		$self->send_route($main::mycall, \&pc19, scalar(@remotenodes), @remotenodes);
 	}
@@ -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, @_);
 		}
 	}