X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=4b32a7150c35440747ed1d8a0c8e4c8d75f0b356;hb=3714fae559341e37d57848800fb70cee6e175971;hp=7a9e4ca15f108f0374fdcee54eb91d856082584b;hpb=43a8ee12581aa51eb93cd8958b429077f22df76d;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 7a9e4ca1..4b32a715 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -357,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;
 	}
@@ -929,25 +929,23 @@ sub handle_17
 	my $uref = Route::User::get($ucall);
 	unless ($uref) {
 		dbg("PCPROT: Route::User $ucall not in config") if isdbg('chanerr');
+		return;
 	}
 	my $parent = Route::Node::get($ncall);
 	unless ($parent) {
 		dbg("PCPROT: Route::Node $ncall not in config") if isdbg('chanerr');
+		return;
 	}			
 
-	$dxchan = $parent->dxchan if $parent;
+	$dxchan = DXChannel::get($ncall);
 	if ($dxchan && $dxchan ne $self) {
 		dbg("PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
 		return;
 	}
 
 	# input filter if required and then remove user if present
-	if ($parent) {
 #		return unless $self->in_filter_route($parent);	
-		$parent->del_user($uref) if $uref;
-	} else {
-		$parent = Route->new($ncall);  # throw away
-	}
+	$parent->del_user($uref);
 
 	# send info to all logged in thingies
 	$self->tell_login('logoutu', "$ncall: $ucall") if DXUser->get_current($ncall)->is_local_node;
@@ -958,7 +956,6 @@ sub handle_17
 		return;
 	}
 
-	$uref = Route->new($ucall) unless $uref; # throw away
 	$self->route_pc17($origin, $line, $parent, $uref);
 }
 		
@@ -1490,6 +1487,10 @@ sub handle_41
 	$user = DXUser->new($call) unless $user;
 			
 	if ($_[2] == 1) {
+		if (($_[3] =~ /spotter/i || $_[3] =~ /self/i) && $user->name && $user->name ne $_[3]) {
+			dbg("PCPROT: invalid name") if isdbg('chanerr');
+			return;
+		}
 		$user->name($_[3]);
 	} elsif ($_[2] == 2) {
 		$user->qth($_[3]);