X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=9921d8289d1ad5aed3e3753eae91f18f67fe3fab;hb=5c037bcf180b49dc72b557f4a9fa688a0394db4e;hp=82e906037c085ff42fb49f34e9b3f7db8565423d;hpb=f6abc902d49e13eeca3ff50f84a74f28a3aa3390;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 82e90603..9921d828 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -222,12 +222,28 @@ 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) {
+		$user->ip($ip), $user->put if !$user->ip || $user->ip ne $ip;
+		$r->ip($ip) if $r && !$r->ip;
+	} else {
+		$ip ||= $r->ip if $r;
+		$ip ||= $user->ip;
+		$implied = '*' if $ip;
+	}
+	
 	if (isdbg('progress')) {
-		my $s = sprintf "SPOT: $spot[1] on $spot[0] \@ %s by $spot[4]\@$spot[7]", cldatetime($spot[2]);
+		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];
-		$s .= " from ip $spot[14]" if $spot[14];
 		dbg($s);
 	}
 	
@@ -238,8 +254,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)) {
@@ -968,6 +984,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;
@@ -1371,6 +1388,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;
@@ -1477,25 +1495,44 @@ 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;
+		if ($ip) {
+			$user->ip($ip);
+			$r->ip($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};
@@ -2011,6 +2048,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;