X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=a6668a36db0daeef1752d86b796d4dcaf7d82e18;hb=61a666ccf108505f0cec2e5c682fde019fc3a051;hp=fcff6240ae5291158dccf1dd14380d43b726ef5c;hpb=dc0193176be801c10a342dd7a2b2263cf0059c88;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index fcff6240..a6668a36 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -32,8 +32,10 @@ use DXHash;
 use Route;
 use Route::Node;
 use Script;
+use DXCIDR;
 
 use strict;
+use warnings qw(all);
 
 use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restime $eph_pc34_restime
 			$last_hour $last10 %eph  %pings %rcmds $ann_to_talk
@@ -91,7 +93,9 @@ sub handle_10
 	if ($censorpc) {
 		my @bad;
 		if (@bad = BadWords::check($pc->[3])) {
-			dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
+			my $bw = join ', ', @bad; 
+			dbg($line) if isdbg('nologchan');
+			dbg("PCPROT: Badwords: '$bw', dropped");
 			return;
 		}
 	}
@@ -108,7 +112,8 @@ sub handle_10
 
 	# if this is a 'nodx' node then ignore it
 	if ($badnode->in($pc->[6]) || ($via && $badnode->in($via))) {
-		dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr');
+		dbg($line) if isdbg('nologchan');
+		dbg("PCPROT: Bad Node, dropped");
 		return;
 	}
 
@@ -116,7 +121,8 @@ sub handle_10
 	my $nossid = $from;
 	$nossid =~ s/-\d+$//;
 	if ($badspotter->in($nossid)) {
-		dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
+		dbg($line) if isdbg('nologchan');
+		dbg("PCPROT: Bad Spotter, dropped");
 		return;
 	}
 
@@ -161,18 +167,21 @@ sub handle_11
 	# is the spotted callsign blank? This should really be trapped earlier but it
 	# could break other protocol sentences. Also check for lower case characters.
 	if ($pc->[2] =~ /^\s*$/) {
-		dbg("PCPROT: blank callsign, dropped") if isdbg('chanerr');
+		dbg($line) if isdbg('nologchan');
+		dbg("PCPROT: blank callsign, dropped");
 		return;
 	}
 	if ($pc->[2] =~ /[a-z]/) {
-		dbg("PCPROT: lowercase characters, dropped") if isdbg('chanerr');
+		dbg($line) if isdbg('nologchan');
+		dbg("PCPROT: lowercase characters, dropped");
 		return;
 	}
 
 
 	# if this is a 'nodx' node then ignore it
 	if ($badnode->in($pc->[7])) {
-		dbg("PCPROT: Bad Node $pc->[7], dropped") if isdbg('chanerr');
+		dbg($line) if isdbg('nologchan');
+		dbg("PCPROT: Bad Node $pc->[7], dropped");
 		return;
 	}
 
@@ -180,21 +189,34 @@ sub handle_11
 	my $nossid = $pc->[6];
 	$nossid =~ s/-\d+$//;
 	if ($badspotter->in($nossid)) {
-		dbg("PCPROT: Bad Spotter $pc->[6], dropped") if isdbg('chanerr');
+		dbg($line) if isdbg('nologchan');
+		dbg("PCPROT: Bad Spotter $pc->[6], dropped");
 		return;
 	}
 
+	# check IP addresses
+	if ($pc->[8] && is_ipaddr($pc->[8])) {
+		my $ip = $pc->[8];
+		$ip =~ s/,/:/g;
+		$ip =~ s/^::ffff://;
+		if (DXCIDR::find($ip)) {
+			
+		}
+	}
+
 	# convert the date to a unix date
 	my $d = cltounix($pc->[3], $pc->[4]);
 	# bang out (and don't pass on) if date is invalid or the spot is too old (or too young)
 	if (!$d || (($pcno == 11 || $pcno == 61) && ($d < $main::systime - $pc11_max_age || $d > $main::systime + 900))) {
-		dbg("PCPROT: Spot ignored, invalid date or out of range ($pc->[3] $pc->[4])\n") if isdbg('chanerr');
+		dbg("PCPROT: Spot ignored, invalid date or out of range ($pc->[3] $pc->[4])\n");
 		return;
 	}
 
 	# is it 'baddx'
-	if ($baddx->in($pc->[2]) || BadWords::check($pc->[2])) {
-		dbg("PCPROT: Bad DX spot, ignored") if isdbg('chanerr');
+	if ($baddx->in($pc->[2]) || (my @bad = BadWords::check($pc->[2]))) {
+		my $bw = join ', ', @bad;
+		$bw = qq{ '$bw'} if $bw;
+		dbg("PCPROT: Bad DX spot$bw, ignored");
 		return;
 	}
 
@@ -208,7 +230,9 @@ sub handle_11
 	if ($censorpc) {
 		my @bad;
 		if (@bad = BadWords::check($pc->[5])) {
-			dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
+			my $bw = join ', ', @bad;
+			dbg($line) if isdbg('nologchan');
+			dbg("PCPROT: Badwords: '$bw', dropped");
 			return;
 		}
 	}
@@ -427,14 +451,17 @@ sub handle_12
 	if ($censorpc) {
 		my @bad;
 		if (@bad = BadWords::check($pc->[3])) {
-			dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
+			my $bw = join ', ', @bad;
+			dbg($line) if isdbg('nologchan');
+			dbg("PCPROT: Badwords: '$bw', dropped");
 			return;
 		}
 	}
 
 	# if this is a 'nodx' node then ignore it
 	if ($badnode->in($pc->[5])) {
-		dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr');
+		dbg($line) if isdbg('nologchan');
+		dbg("PCPROT: Bad Node, dropped");
 		return;
 	}
 
@@ -442,7 +469,8 @@ sub handle_12
 	my $nossid = $pc->[1];
 	$nossid =~ s/-\d+$//;
 	if ($badspotter->in($nossid)) {
-		dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
+		dbg($line) if isdbg('nologchan');
+		dbg("PCPROT: Bad Spotter, dropped");
 		return;
 	}
 
@@ -763,23 +791,37 @@ sub handle_18
 	$self->send(pc20());
 }
 
-sub check_add_node
+sub check_add_user
 {
 	my $call = shift;
 	my $type = shift;
-	
+	my $homenode = shift;
 
 	# add this station to the user database, if required (don't remove SSID from nodes)
 	my $user = DXUser::get_current($call);
 	unless ($user) {
 		$user = DXUser->new($call);
-		$user->priv(1);		# I have relented and defaulted nodes
-		$user->lockout(1);
-		$user->homenode($call);
-		$user->node($call);
-		$user->sort($type || 'A');
+		$user->sort($type || 'U');
+		if ($user->is_node) {
+			$user->priv(1);		# I have relented and defaulted nodes
+			$user->lockout(1) if $user->is_node;
+		} else {
+			$user->homenode($homenode) if $homenode;
+			$user->node($homenode);
+			$user->priv(0);
+		}
 		$user->lastin($main::systime); # this make it last longer than just this invocation
 		$user->put;				# just to make sure it gets written away!!!
+		dbg("DXProt: PC92 new user record for $call created");
+	}
+
+	# this is to fix a problem I introduced some build ago by using this function for users
+	# whereas it was only being used for nodes.
+	if ($user->is_user && $user->lockout && ($user->priv // 0) == 1) {
+		$user->priv(0);
+		$user->lockout(0);
+		dbg("DXProt: PC92 user record for $call depriv'd and unlocked");
+		$user->put;
 	}
 	return $user;
 }
@@ -855,7 +897,7 @@ sub handle_19
 			next;
 		}
 
-		my $user = check_add_node($call);
+		my $user = check_add_user($call, 'A');
 
 #		if (eph_dup($genline)) {
 #			dbg("PCPROT: dup PC19 for $call detected") if isdbg('chanerr');
@@ -1542,10 +1584,27 @@ sub _decode_pc92_call
 	my $is_node = $flag & 4;
 	my $is_extnode = $flag & 2;
 	my $here = $flag & 1;
-	my $ip	= $part[3];
-	$ip ||= $part[1] if $part[1] && $part[1] !~ /^\d+$/ && ($part[1] =~ /^(?:\d+\.)+/ || $part[1] =~ /^(?:(?:[abcdef\d]+)?,)+/);
-	$ip =~ s/,/:/g if $ip;
-	return ($call, $is_node, $is_extnode, $here, $part[1], $part[2], $ip);
+	my $version = $part[1] || 0;
+	my $build = $part[2] || 0;
+	my $ip = $part[3] || '';
+
+	# remember that, at this stage, IPV6 addresses have : replaced by ,
+	if (length $version > 4 && $version =~ /[,\.][\da-f]{1,4}/i) {
+		$ip = $version;
+		$version = 0;
+	}
+	$version =~ s/\D//g;
+	$version = 0 unless $version && $version =~ /^[0-9]+$/;
+	$build =~ s/^0\.//;
+	$build =~ s/\D//g;
+	$build = 0 unless $build &&  $build =~ /^[0-9]+$/;
+	if ($ip) {
+        $ip =~ s/,/:/g;
+        $ip =~ s/^::ffff://i;
+		$ip = '' unless is_ipaddr($ip);
+    }
+	dbg("'$icall' = '" . join("', '", $call, $is_node, $is_extnode, $here, $version, $build, $ip) . "'") if isdbg('pc92');
+	return ($call, $is_node, $is_extnode, $here, $version+0, $build+0, $ip);
 }
 
 # decode a pc92 call: flag call : version : build
@@ -1576,6 +1635,7 @@ sub _encode_pc92_call
 		$ip =~ s/:/,/g;
 		$extra .= ':' . $ip;
 	}
+
 	return "$flag$call$extra";
 }
 
@@ -1593,48 +1653,58 @@ sub _add_thingy
 	my @rout;
 
 	# remove spurious IPV6 prefix on IPV4 addresses
-	$ip =~ s/^::ffff:// if $ip;
-	
+	$build ||= 0;
+	$version ||= 0;
+
 	if ($call) {
 		my $ncall = $parent->call;
 		if ($ncall ne $call) {
 			my $user;
-			unless (DXChannel::get($call)) { # i.e. external entity - create an user entry for it - ALL entities will appear in ALL user files from now on.
+			my $r;
+
+			# normalise call, delete any unnormalised calls in the users file.
+			# then ignore this thingy
+			my $normcall = normalise_call($call);
+			if ($normcall ne $call) {
+				next if DXChannel::get($call);
 				$user = DXUser::get($call);
-				unless ($user) {
-					$user = DXUser->new($call);
-					dbg("PCProt::_add_thingy new user $call") if isdbg('route');
-				}
+				dbg("DXProt::_add_thingy call $call normalised to $normcall, deleting spurious user $call");
+				$user->del if $user;
+			    $call = $normcall; # this is safe because a route add will ignore duplicates
 			}
+			
 			if ($is_node) {
 				dbg("ROUTE: added node $call to $ncall") if isdbg('routelow');
+				$user = check_add_user($call, 'A');
 				@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 ($user && $user->sort eq 'U') {
-					if (defined $version) {
-						if ($version >= 5455 && $build > 0 || $version >= 3000 ) {
-							$user->sort('S');
-						} else {
+				if ($version && is_numeric($version) && !$r->K && !$user->K) {
+					my $old = $user->sort;
+					if ($user->is_ak1a && (($version >= 5455 &&  $build > 0) || ($version >= 3000 && $version <= 3500)) ) {
+						$user->sort('S');
+						dbg("PCProt::_add_thingy node $call v: $version b: $build sort ($old) updated to " . $user->sort);
+					} elsif ($user->is_spider && ($version < 3000 || ($version > 4000 && $version < 5455))) {
+						unless ($version > 0  && $build == 0) {
 							$user->sort('A');
+							$build ||= 0;
+							dbg("PCProt::_add_thingy node $call v: $version b: $build sort ($old) downgraded to " . $user->sort);
 						}
-						dbg("PCProt::_add_thingy node $call sort updated " . $user->sort) if isdbg('route');
 					}
 				}
+				$r->version($user->version) if $user->version;
+				$r->build($user->build) if $user->build;
+				$r->K(1) if $user->K;
 			} else {
 				dbg("ROUTE: added user $call to $ncall") if isdbg('routelow');
-				my $user = check_add_node($call, 'U');
+				$user = check_add_user($call, 'U', $parent->call);
 				@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 ($ip) {
+				$r->ip($ip);
+				Log('DXProt', "PC92A $call -> $ip on $ncall");
 			}
 			if ($pc92_slug_changes && $parent == $main::routeroot) {
 				$things_add{$call} = Route::get($call);
@@ -1845,7 +1915,7 @@ sub pc92_handle_first_slot
 	}
 	$parent->here(Route::here($here));
 	$parent->version($version || $pc19_version) if $version;
-	$parent->build($build) if $build;
+    $parent->build($build) if $build;
 	$parent->PC92C_dxchan($self->{call}, $hops) unless $self->{call} eq $parent->call;
 	return ($parent, @radd);
 }
@@ -1963,16 +2033,44 @@ sub handle_92
 
 			($parent, $add) = $self->pc92_handle_first_slot(\@ent, $parent, $t, $hops);
 			return unless $parent; # dupe
-
+			
 			push @radd, $add if $add;
 			$parent->reset_obs;
-			$parent->version($ent[4]) if $ent[4];
-			if ($ent[5]) {
-				$ent[5] =~ s/^0.//;
-				$parent->build($ent[5]);
+			my $call = $parent->call;
+			my $version = $ent[4] || 0;
+			my $build = $ent[5] ||  0;
+			$build =~ s/^0\.//;
+			my $oldbuild = $parent->build || 0;
+			my $oldversion = $parent->version || 0;
+			my $user = check_add_user($parent->call, 'S');
+			my $oldsort = $user->sort // '';
+
+			dbg("PCProt PC92 K v: $version ov: $oldversion b: $build ob: $oldbuild pk: " . ($parent->K || '0') . " uk: " . ($user->K || 0)) if isdbg('pc92k');
+				
+			if (is_numeric($version) || is_numeric($build)) {
+				my $changed = 0;
+				if (($oldversion ne $version || $build ne $oldbuild)) {
+					dbg("PCProt PC92 K node $call updated version: $version (was $oldversion) build: $build (was $oldbuild)");
+					$user->version($parent->version($version));
+					$user->build($parent->build($build));
+					++$changed;
+				}
+				if ($oldsort ne 'S') {
+					dbg("PCProt PC92 K node $call updated sort: $sort (was $oldsort)");
+					$user->sort('S');
+					++$changed;
+				}
+				unless ($user->K) {
+					dbg("PCProt PC92 K node $call updated - marked as PC92 K user");
+					$user->K(1);
+					++$changed;
+				}
+				$user->put if $changed;
+				$parent->K(1); # mark this as come in on a K
+			} else {
+				dbg("DXProt PC92 K version call $call: invalid version: '$version' or build: '$version', ignored");
 			}
-
-			dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('obscount');
+			dbg("ROUTE: reset obscount on $call now " . $parent->obscount) if isdbg('obscount');
 		}
 	} elsif ($sort eq 'A' || $sort eq 'D' || $sort eq 'C') {
 
@@ -2013,11 +2111,11 @@ sub handle_92
 			my $dxc;
 			next unless $_ && @$_;
 			if ($_->[0] eq $main::mycall) {
-				LogDbg('err', "PCPROT: $self->{call} : type $sort $_->[0] refers to me, ignored");
+				dbg("PCPROT: $self->{call} : type $sort $_->[0] refers to me, ignored") if isdbg('route');
 				next;
 			}
 			if ($_->[0] eq $main::myalias && $_->[1] || $_->[0] eq $main::mycall && $_->[1] == 0) {
-				LogDbg('err',"PCPROT: $self->{call} : type $sort $_->[0] changing type to " . $_->[1]?"Node":"User" . ", ignored");
+				LogDbg('err',"PCPROT: $self->{call} : type $sort $_->[0] trying to change type to " . $_->[1]?"Node":"User" . ", ignored");
 				next;
 			}
 			
@@ -2175,7 +2273,9 @@ sub handle_93
 	if ($censorpc) {
 		my @bad;
 		if (@bad = BadWords::check($text)) {
-			dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
+			my $bw = join ', ', @bad;
+			dbg($line) if isdbg('nologchan');
+			dbg("PCPROT: Badwords: '$bw', dropped");
 			return;
 		}
 	}
@@ -2184,7 +2284,8 @@ sub handle_93
 	my $nossid = $from;
 	$nossid =~ s/-\d+$//;
 	if ($badspotter->in($nossid)) {
-		dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
+		dbg($line) if isdbg('nologchan');
+		dbg("PCPROT: Bad Spotter, dropped");
 		return;
 	}