X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=6dc13795deccd8ff99c2c8530e961536155baec9;hb=f18ba64dd93bbf7c47e6b5143bfc99af817888e8;hp=4e55b9402c534a512a530362d26f380c9c2218b8;hpb=16b98fc9cae1d4fb357aad17850a2aa1a601b053;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 4e55b940..6dc13795 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -158,17 +158,21 @@ sub handle_11
 
 	# if this is a 'nodx' node then ignore it
 	if ($badnode->in($pc->[7])) {
-		dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr');
+		dbg("PCPROT: Bad Node $pc->[7], dropped") if isdbg('chanerr');
 		return;
 	}
 
-	# if this is a 'bad spotter' user then ignore it
+	# if this is a 'bad spotter' or an unknown user then ignore it. BUT if it's got an IP address then allow it through
 	my $nossid = $pc->[6];
 	$nossid =~ s/-\d+$//;
 	if ($badspotter->in($nossid)) {
-		dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
+		dbg("PCPROT: Bad Spotter $pc->[6], dropped") if isdbg('chanerr');
 		return;
 	}
+#	unless (is_ipaddr($pc->[8]) || DXUser::get_current($pc->[6])) {
+#		dbg("PCPROT: Unknown Spotter $pc->[6], dropped") if isdbg('chanerr');
+#		return;
+#	}
 
 	# convert the date to a unix date
 	my $d = cltounix($pc->[3], $pc->[4]);
@@ -218,8 +222,33 @@ sub handle_11
 	}
 
 	# add it
+	$spot[14] =~ s/^::ffff:// if exists $spot[14];	# remove rubbish ipv4 addresses dressed up as ipv6
 	Spot::add(@spot);
 
+	# create a spotter if doesn't exit and there is an ip available and in anycase remember the IP address
+	my $user = DXUser::get_current($spot[4]);
+	$user = DXUser->new($spot[4]) unless $user;	
+	my $r = Route::get($spot[4]);
+	my $ip = $spot[14] if exists $spot[14];
+	my $implied = '';
+	if ($ip) {
+		$ip =~ s/[\(\)\*]+//g; 	# strip these off :-)
+		$user->ip($spot[7], $ip);
+		$user->put;
+		$r->ip($spot[7], $ip) if $r;
+	} else {
+		$ip ||= $r->ip($spot[7]) if $r;
+		$ip ||= $user->ip($spot[7]);
+		$implied = '*' if $ip;
+	}
+	
+	if (isdbg('progress')) {
+		my $sip = $ip ? sprintf "($ip$implied)" : '';
+		my $s = sprintf "SPOT: $spot[1] on $spot[0] \@ %s by $spot[4]$sip\@$spot[7]", cldatetime($spot[2]);
+		$s .= " '$spot[3]'" if $spot[3];
+		dbg($s);
+	}
+	
 	#
 	# @spot at this point contains:-
 	# freq, spotted call, time, text, spotter, spotted cc, spotters cc, orig node
@@ -227,8 +256,8 @@ sub handle_11
 	# you should be able to route on any of these
 	#
 
+	
 	# fix up qra locators of known users
-	my $user = DXUser::get_current($spot[4]);
 	if ($user) {
 		my $qra = $user->qra;
 		unless ($qra && is_qra($qra)) {
@@ -653,8 +682,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;
 }
 
@@ -709,7 +738,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;
@@ -853,7 +882,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) {
 
@@ -864,7 +893,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;
 			}
 
@@ -876,7 +905,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;
 	}
 
@@ -957,6 +986,7 @@ sub handle_23
 
 	# note this only takes the first one it gets
 	Geomag::update($d, $pc->[2], $sfi, $k, $i, @$pc[6..8], $r);
+	dbg("WWV: $d $pc->[2], sfi:$sfi k:$k info:$i $pc->[6] $pc->[7] $pc->[8] $r") if isdbg('progress');
 
 	if (defined &Local::wwv) {
 		my $rep;
@@ -1014,7 +1044,7 @@ sub handle_25
 		return;
 	}
 	if ($pc->[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;
 	}
 
@@ -1169,7 +1199,7 @@ sub handle_41
 		return;
 	}
 
-	if ($call eq $main::mycall && $call eq $main::myalias) {
+	if ($call eq $main::mycall || $call eq $main::myalias) {
 		dbg "DXPROT: PC41 trying to update $call from outside via $origin, ignored";
 		return;
 	}
@@ -1298,6 +1328,10 @@ sub handle_51
 	my $from = $pc->[2];
 	my $flag = $pc->[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) {
@@ -1356,6 +1390,7 @@ sub handle_73
 	}
 
 	my $wcy = WCY::update($d, @$pc[2..12]);
+	dbg("WCY: " . join ', ', @$pc[2..12]) if isdbg('progress');
 
 	if (defined &Local::wcy) {
 		my $rep;
@@ -1462,25 +1497,45 @@ sub _add_thingy
 
 	if ($call) {
 		my $ncall = $parent->call;
+		my $user = DXUser::get_current($call);
+		my $r;
+		my $newuser = !$user;
+		$user = DXUser->new($call) unless $user;
+		$user->homenode($parent->call) unless $user->homenode;
+		$user->node($parent->call);
+		$user->lastin($main::systime) unless DXChannel::get($ncall);
 		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 = 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 ($newuser) {
+				$user->sort('S') unless $user->sort;
+				$user->priv(1) unless exists $user->{priv};
+				$user->lockout(1) unless exists $user->{lookout} || $main::me->call eq $call || DXChannel::get($call) || Msg::get($call);
 			}
 		} 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");
+			$r = Route::User::get($call);
+			if ($newuser) {
+				$user->sort('U') unless $user->sort;
 			}
 		}
+		$ip ||= $user->ip($ncall);
+		if ($ip) {
+			$ip =~ s/^::ffff://; #  remove ipv6 stuff from the front of an ipv4 address
+			$user->ip($ncall, $ip);
+			$r->ip($ncall, $ip);
+			my $s = "PC92A $call -> $ip on $ncall";
+			Log('DXProt', $s);
+			dbg($s) if isdbg('routelow');
+		}
+		$user->put;
+
+		# create a node user if required
+
 		if ($pc92_slug_changes && $parent == $main::routeroot) {
 			$things_add{$call} = Route::get($call);
 			delete $things_del{$call};
@@ -1646,7 +1701,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".
@@ -1707,21 +1766,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}) {
@@ -1987,6 +2051,12 @@ sub handle_93
 		return;
 	}
 
+	if (isdbg('progress')) {
+		my $vs = $via ne '*' ? " via $via" : ''; 
+		my $s = "ANNTALK: $from\@$onode$vs -> $to '$text'";
+		dbg($s);
+	}
+	
 	# will we allow it at all?
 	if ($censorpc) {
 		my @bad;