X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=a6abadc83ab1384936093c0954f11fce13a19f9d;hb=4fe4a738fd4f10f57951d1ce9915389174c0921f;hp=41c38f1aea9fd62a850934ee882fccd79fadc265;hpb=9d7e25628dc86c6bec2e0eba47e772f95c0c76db;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 41c38f1a..a6abadc8 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -235,6 +235,14 @@ sub new
 	# add this node to the table, the values get filled in later
 	my $pkg = shift;
 	my $call = shift;
+
+	# if we have an entry already, then send a PC21 to all connect
+	# old style connections, because we are about to get the real deal
+	if (my $ref = Route::Node::get($call)) {
+		dbg("ROUTE: $call is already in the routing table, deleting") if isdbg('route');
+		my @rout = $ref->delete;
+		$self->route_pc21($main::mycall, undef, @rout) if @rout;
+	}
 	$main::routeroot->add($call, '5000', Route::here(1)) if $call ne $main::mycall;
 
 	return $self;
@@ -349,7 +357,7 @@ sub normal
 	
 	# process PC frames, this will fail unless the frame starts PCnn
 	my ($pcno) = $field[0] =~ /^PC(\d\d)/; # just get the number
-	unless (defined $pcno && $pcno >= 10 && $pcno <= 99) {
+	unless (defined $pcno && $pcno >= 10 && $pcno <= 89) { # reject PC9x messages
 		dbg("PCPROT: unknown protocol") if isdbg('chanerr');
 		return;
 	}
@@ -739,7 +747,11 @@ sub handle_16
 	}
 	# is it me?
 	if ($ncall eq $main::mycall) {
-		dbg("PCPROT: trying to alter config on this node from outside!") if isdbg('chanerr');
+		dbg("PCPROT: trying to alter my config from outside!") if isdbg('chanerr');
+		return;
+	}
+	if (DXChannel::get($ncall) && $ncall ne $self->{call}) {
+		dbg("PCPROT: trying to alter locally connected $ncall from $self->{call}, ignored") if isdbg('chanerr');
 		return;
 	}