X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=b3a7cfcdd120033bfc17a1d8c2bbd40a61cd3e15;hb=2e3638e69f84390b8e911093aa71a7c9382dfc0f;hp=81cde0bf09151adbaae4f0f44c7befbe918bb08e;hpb=7109670a3a50576caa435e9ee85b1aa0de15b69b;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 81cde0bf..b3a7cfcd 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -644,8 +644,8 @@ sub check_add_node
 		$user->lockout(1);
 		$user->homenode($call);
 		$user->node($call);
+		$user->sort('A');
 	}
-	$user->sort('A') unless $user->is_node;
 	return $user;
 }
 
@@ -699,7 +699,7 @@ sub handle_19
 		next unless $ver && $ver =~ /^\d+$/;
 		next if $ver < 5000;	# only works with version 5 software
 		next if length $call < 3; # min 3 letter callsigns
-		next if $call eq $main::mycall;
+		next if $call eq $main::mycall || $call eq $main::myalias;
 
 		# check that this PC19 isn't trying to alter the wrong dxchan
 		$h = 0;
@@ -840,7 +840,7 @@ sub handle_21
 
 	my @rout;
 
-	if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me!
+	if ($call ne $main::mycall && $call ne $main::myalias) { # don't allow malicious buggers to disconnect me!
 		my $node = Route::Node::get($call);
 		if ($node) {
 
@@ -851,7 +851,7 @@ sub handle_21
 
 			my $dxchan = DXChannel::get($call);
 			if ($dxchan && $dxchan != $self) {
-				dbg("PCPROT: PC21 from $self->{call} trying to alter locally connected $call, ignored!") if isdbg('chanerr');
+				dbg("PCPROT: PC21 from $self->{call} trying to alter locally connected $call, ignored!") if isdbg('chan');
 				return;
 			}
 
@@ -863,7 +863,7 @@ sub handle_21
 			push @rout, $call if $dxchan && @rout == 0;
 		}
 	} else {
-		dbg("PCPROT: I WILL _NOT_ be disconnected!") if isdbg('chanerr');
+		dbg("PCPROT: I WILL _NOT_ be disconnected!") if isdbg('chan');
 		return;
 	}
 
@@ -995,7 +995,7 @@ sub handle_25
 		return;
 	}
 	if ($_[2] eq $main::mycall) {
-		dbg("PCPROT: Trying to merge to myself, ignored") if isdbg('chanerr');
+		dbg("PCPROT: Trying to merge to myself, ignored") if isdbg('chan');
 		return;
 	}
 
@@ -1137,6 +1137,16 @@ sub handle_41
 		return;
 	}
 
+	if ($call eq $main::mycall || $call eq $main::myalias) {
+		dbg "DXPROT: PC41 trying to update $call from outside via $origin, ignored";
+		return;
+	}
+	my $chan = DXChannel::get($call);
+	if ($chan) {
+		dbg "DXPROT: PC41 trying to update online $call from outside via $origin, ignored";
+		return;
+	}
+
 	# add this station to the user database, if required
 	my $user = DXUser::get_current($call);
 	$user = DXUser->new($call) unless $user;
@@ -1144,9 +1154,6 @@ sub handle_41
 	if ($sort == 1) {
 		if (($val =~ /spotter/i || $val =~ /self/i) && $user->name && $user->name ne $val) {
 			dbg("PCPROT: invalid name") if isdbg('chanerr');
-			if ($main::mycall eq 'GB7DJK' || $main::mycall eq 'GB7BAA' || $main::mycall eq 'WR3D') {
-				DXChannel::broadcast_nodes(pc41($_[1], 1, $user->name)); # send it to everyone including me
-			}
 			return;
 		}
 		$user->name($val);
@@ -1255,6 +1262,10 @@ sub handle_51
 	my $from = $_[2];
 	my $flag = $_[3];
 
+	if ($to eq $main::myalias) {
+		dbg("DXPROT: Ping addressed to \$myalias ($main::myalias), ignored") if isdbg('chan');
+		return;
+	}
 
 	# is it for us?
 	if ($to eq $main::mycall) {
@@ -1409,32 +1420,40 @@ sub _add_thingy
 	my ($call, $is_node, $is_extnode, $here, $version, $build, $ip) = @$s;
 	my @rout;
 
+	# remove spurious IPV6 prefix on IPV4 addresses
+	$ip =~ s/^::ffff:// if $ip;
+	
 	if ($call) {
 		my $ncall = $parent->call;
-		if ($is_node) {
-			dbg("ROUTE: added node $call to $ncall") if isdbg('routelow');
-			@rout = $parent->add($call, $version, Route::here($here), $ip);
-			my $r = Route::Node::get($call);
-			$r->PC92C_dxchan($dxchan->call, $hops) if $r;
-			if ($ip) {
-				$r->ip($ip);
-				Log('DXProt', "PC92A $call -> $ip on $ncall");
+		if ($ncall ne $call) {
+			if ($is_node) {
+				dbg("ROUTE: added node $call to $ncall") if isdbg('routelow');
+				@rout = $parent->add($call, $version, Route::here($here), $ip);
+				my $r = Route::Node::get($call);
+				$r->PC92C_dxchan($dxchan->call, $hops) if $r;
+				if ($ip) {
+					$r->ip($ip);
+					Log('DXProt', "PC92A $call -> $ip on $ncall");
+				}
+			} else {
+				dbg("ROUTE: added user $call to $ncall") if isdbg('routelow');
+				@rout = $parent->add_user($call, Route::here($here), $ip);
+				$dxchan->tell_buddies('loginb', $call, $ncall) if $dxchan;
+				my $r = Route::User::get($call);
+				if ($ip) {
+					$r->ip($ip);
+					Log('DXProt', "PC92A $call -> $ip on $ncall");
+				}
 			}
-		} else {
-			dbg("ROUTE: added user $call to $ncall") if isdbg('routelow');
-			@rout = $parent->add_user($call, Route::here($here), $ip);
-			$dxchan->tell_buddies('loginb', $call, $ncall) if $dxchan;
-			my $r = Route::User::get($call);
-			if ($ip) {
-				$r->ip($ip);
-				Log('DXProt', "PC92A $call -> $ip on $ncall");
+			if ($pc92_slug_changes && $parent == $main::routeroot) {
+				$things_add{$call} = Route::get($call);
+				delete $things_del{$call};
 			}
-		}
-		if ($pc92_slug_changes && $parent == $main::routeroot) {
-			$things_add{$call} = Route::get($call);
-			delete $things_del{$call};
+		} else {
+			dbg("DXProt::add_thingy: Trying to add parent $call to itself $ncall, ignored");
 		}
 	}
+	
 	return @rout;
 }
 
@@ -1595,7 +1614,11 @@ sub pc92_handle_first_slot
 	my ($call, $is_node, $is_extnode, $here, $version, $build) = @$slot;
 	if ($call && $is_node) {
 		if ($call eq $main::mycall) {
-			dbg("PCPROT: $call looped back onto $main::mycall, ignored") if isdbg('chanerr');
+			dbg("PCPROT: $call looped back onto \$main::mycall ($main::mycall), ignored") if isdbg('chan');
+			return;
+		}
+		if ($call eq $main::myalias) {
+			dbg("PCPROT: $call looped back onto \$main::myalias ($main::myalias), ignored") if isdbg('chan');
 			return;
 		}
 		# this is only accepted from my "self".
@@ -1655,21 +1678,26 @@ sub handle_92
 #	}
 
 	if ($pcall eq $main::mycall) {
-		dbg("PCPROT: looped back, ignored") if isdbg('chanerr');
+		dbg("PCPROT: looped back, ignored") if isdbg('chan');
+		return;
+	}
+
+	if ($pcall eq $main::myalias) {
+		dbg("PCPROT: looped back to \$myalias ($main::myalias), misconfiguration ignored") if isdbg('chan');
 		return;
 	}
 
 	if ($pcall eq $self->{call} && $self->{state} eq 'init') {
 		if ($self->{isolate}) {
-			dbg("PC9x received, but $pcall is isolated, ignored");
+			dbg("DXPROT: PC9x received, but $pcall is isolated, ignored");
 			return;
 		} elsif (!$self->user->wantpc9x) {
-			dbg("PC9x explicitly switched off on $pcall, ignored");
+			dbg("DXPROT: PC9x explicitly switched off on $pcall, ignored");
 			return;
 		} else {
 			$self->state('init92');
 			$self->{do_pc9x} = 1;
-			dbg("Do pc9x set on $pcall");
+			dbg("DXPROT: Do pc9x set on $pcall");
 		}
 	}
 	unless ($self->{do_pc9x}) {