X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=f1972b094af888870e44470c1ca5458762eb4085;hb=fb14276aab794a877986dbc397ede66ea563c7fb;hp=23c17f0c34177c4913e07e73d86532de462e1a13;hpb=deb52e701a0db351d06eb6fe14872dc2fa7a51cb;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 23c17f0c..f1972b09 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -32,6 +32,7 @@ use DXHash;
 use Route;
 use Route::Node;
 use Script;
+use DXCIDR;
 
 use strict;
 use warnings qw(all);
@@ -88,14 +89,6 @@ sub handle_10
 		return;
 	}
 
-	# will we allow it at all?
-	if ($censorpc) {
-		my @bad;
-		if (@bad = BadWords::check($pc->[3])) {
-			dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
-			return;
-		}
-	}
 
 	# is it for me or one of mine?
 	my ($from, $to, $via, $call, $dxchan);
@@ -109,7 +102,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;
 	}
 
@@ -117,7 +111,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;
 	}
 
@@ -128,6 +123,17 @@ sub handle_10
 			return;
 		}
 	}
+	
+	# will we allow it at all?
+	if ($censorpc) {
+		my @bad;
+		if (@bad = BadWords::check($pc->[3])) {
+			my $bw = join ', ', @bad; 
+			dbg($line) if isdbg('nologchan');
+			dbg("PCPROT: Badwords: '$bw', dropped");
+			return;
+		}
+	}
 
 	# convert this to a PC93, coming from mycall with origin set and process it as such
 	$main::me->normal(pc93($to, $from, $via, $pc->[3], $pc->[6]));
@@ -155,25 +161,28 @@ sub handle_11
 		}
 	}
 
-	dbg("INPUT PC$pcno $line origin $origin recurse: $recurse") if isdbg("pc11"); 
+	dbg("INPUT PC$pcno $line origin $origin recurse: $recurse") if isdbg("pc11") || isdbg("pc61"); 
 
 #	my ($hops) = $pc->[8] =~ /^H(\d+)/;
 
 	# 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;
 	}
 
@@ -181,21 +190,25 @@ 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;
 	}
 
+
 	# 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($line) if isdbg('nologchan');
+		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])) {
+		dbg("PCPROT: Bad DX spot '$pc->[2]', ignored");
+		dbg($line) if isdbg('nologchan');
 		return;
 	}
 
@@ -203,20 +216,28 @@ sub handle_11
 	$pc->[5] =~ s/^\s+//;			# take any leading blanks off
 	$pc->[2] = unpad($pc->[2]);		# take off leading and trailing blanks from spotted callsign
 	if ($pc->[2] =~ /BUST\w*$/) {
+		dbg($line) if isdbg('nologchan');
 		dbg("PCPROT: useless 'BUSTED' spot") if isdbg('chanerr');
 		return;
 	}
-	if ($censorpc) {
-		my @bad;
-		if (@bad = BadWords::check($pc->[5])) {
-			dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
-			return;
-		}
-	}
 	
 
 	my @spot = Spot::prepare($pc->[1], $pc->[2], $d, $pc->[5], $nossid, $pc->[7], $pc->[8]);
 
+	# check IP addresses
+	if (@$pc > 8 && is_ipaddr($pc->[8])) {
+		my $ip = $pc->[8];
+		$ip =~ s/,/:/g;
+		$ip =~ s/^::ffff://;
+		if (DXCIDR::find($ip)) {
+			dbg($line) if isdbg('nologchan');
+			dbg("PCPROT: $ip in badip list, dropped");
+			# sneakily put it into the dup list to prevent following PC11s also getting through :-)
+			Spot::dup(@spot[0..4,7]);
+			return;
+		}
+	}
+
 	# global spot filtering on INPUT
 	if ($self->{inspotsfilter}) {
 		my ($filter, $hops) = $self->{inspotsfilter}->it(@spot);
@@ -305,12 +326,24 @@ sub handle_11
 			if ($s) {
 				my $action = $senderverify > 1 ? ", DUMPED" : '';
 				$s =~ s/, $//;
-				dbg("PCProt: Suspicious Spot $pc->[2] on $pc->[1] by $pc->[6]($ip)\@$pc->[7] $s$action");
+				dbg("PCPROT: Suspicious Spot $pc->[2] on $pc->[1] by $pc->[6]($ip)\@$pc->[7] $s$action");
 				return unless $senderverify < 2;
 			}
 		}
 	}
 
+# we until here to do any censorship to try and reduce the amount of noise that repeated copies
+# from other connected nodes cause
+	if ($censorpc) {
+		my @bad;
+		if (@bad = BadWords::check($pc->[5])) {
+			my $bw = join ', ', @bad;
+			dbg($line) if isdbg('nologchan');
+			dbg("PCPROT: Badwords: '$bw', dropped");
+			return;
+		}
+	}
+
 	# If is a new PC11, store it, releasing the one that is there (if any),
 	# if a PC61 comes along then dump the stored PC11
 	# If there is a different PC11 stored, release that one and store this PC11 instead,
@@ -425,17 +458,10 @@ sub handle_12
 	# announce duplicate checking
 	$pc->[3] =~ s/^\s+//;			# remove leading blanks
 
-	if ($censorpc) {
-		my @bad;
-		if (@bad = BadWords::check($pc->[3])) {
-			dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
-			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;
 	}
 
@@ -443,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;
 	}
 
@@ -454,6 +481,17 @@ sub handle_12
 		return;
 	}
 
+	if ($censorpc) {
+		my @bad;
+		if (@bad = BadWords::check($pc->[3])) {
+			my $bw = join ', ', @bad;
+			dbg($line) if isdbg('nologchan');
+			dbg("PCPROT: Badwords: '$bw', dropped");
+			return;
+		}
+	}
+
+
 	my $dxchan;
 
 	if ((($dxchan = DXChannel::get($pc->[2])) && $dxchan->is_user) || $pc->[4] =~ /^[\#\w.]+$/){
@@ -723,14 +761,17 @@ sub handle_18
 	my $parent = Route::Node::get($self->{call});
 
 	# record the type and version offered
-	if (my ($version) = $pc->[1] =~ /DXSpider Version: (\d+\.\d+)/) {
-		$self->{version} = 53 + $version;
-		$self->user->version(53 + $version);
-		$parent->version(0 + $version);
+	if (my ($version) = $pc->[1] =~ /(?:DXSpider|CC\s*Cluster)\s+Version: (\d+(?:\.\d+))/) {
+		$version += 0;
+		$version += 53 if $version < 6;
+		$self->{version} = $version;
+		$self->user->version($version);
+		$parent->version($version);
 		my ($build) = $pc->[1] =~ /Build: (\d+(?:\.\d+)?)/;
-		$self->{build} = 0 + $build;
-		$self->user->build(0 + $build);
-		$parent->build(0 + $build);
+		$build += 0;
+		$self->{build} = $build;
+		$self->user->build($build);
+		$parent->build($build);
 		dbg("$self->{call} = DXSpider version $version build $build");
 		unless ($self->is_spider) {
 			dbg("Change U " . $self->user->sort . " C $self->{sort} -> S");
@@ -1557,24 +1598,26 @@ sub _decode_pc92_call
 	my $is_node = $flag & 4;
 	my $is_extnode = $flag & 2;
 	my $here = $flag & 1;
-	my $ip;
 	my $version = $part[1] || 0;
 	my $build = $part[2] || 0;
 	my $ip = $part[3] || '';
-	
-	if ($version =~ /[,.]/) {
+
+	# 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 =~ s/\D//g;
+	$version = 0 unless $version && $version =~ /^[0-9]+$/;
 	$build =~ s/^0\.//;
-	$build =~ s/\D+//g;
+	$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');
-
+	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);
 }
 
@@ -1623,6 +1666,10 @@ sub _add_thingy
 	my ($call, $is_node, $is_extnode, $here, $version, $build, $ip) = @$s;
 	my @rout;
 
+	# remove spurious IPV6 prefix on IPV4 addresses
+	$build ||= 0;
+	$version ||= 0;
+
 	if ($call) {
 		my $ncall = $parent->call;
 		if ($ncall ne $call) {
@@ -1646,19 +1693,22 @@ sub _add_thingy
 				@rout = $parent->add($call, $version, Route::here($here), $ip);
 				$r = Route::Node::get($call);
 				$r->PC92C_dxchan($dxchan->call, $hops) if $r;
-				if ($version && $version =~ /^\d+$/) {
+				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 =~ /^\d+$/ && ($version < 3000 || ($version > 4000 && $version < 5455))) {
-						unless ($version == 5000 && $build == 0) {
+						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);
+							$build ||= 0;
+							dbg("PCPROT::_add_thingy node $call v: $version b: $build sort ($old) downgraded to " . $user->sort);
 						}
 					}
 				}
+				$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');
 				$user = check_add_user($call, 'U', $parent->call);
@@ -2003,22 +2053,38 @@ sub handle_92
 			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 // '';
-#			if ($version =~ /^\d+$/  && $oldversion =~ /^\d+$/) {
-				if ($oldsort ne 'S' || $oldversion != $version || $build != $oldbuild) {
-					dbg("PCProt PC92 K node $call updated version: $version (was $oldversion) build: $build (was $oldbuild) sort: 'S' (was $oldsort)");
-					$user->sort('S');
+
+			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));
-					$user->put;
+					++$changed;
 				}
-#			} else {
-#				dbg("DXProt PC92 K version strings new: '$version' old: '$oldversion'");
-#			}
-			dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('obscount');
+				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 $call now " . $parent->obscount) if isdbg('obscount');
 		}
 	} elsif ($sort eq 'A' || $sort eq 'D' || $sort eq 'C') {
 
@@ -2216,21 +2282,13 @@ sub handle_93
 		my $s = "ANNTALK: $from\@$onode$vs -> $to '$text' route: $origin";
 		dbg($s);
 	}
-	
-	# will we allow it at all?
-	if ($censorpc) {
-		my @bad;
-		if (@bad = BadWords::check($text)) {
-			dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
-			return;
-		}
-	}
 
 	# if this is a 'bad spotter' user then ignore it
 	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;
 	}
 
@@ -2240,6 +2298,17 @@ sub handle_93
 		return;
 	}
 
+	# will we allow it at all?
+	if ($censorpc) {
+		my @bad;
+		if (@bad = BadWords::check($text)) {
+			my $bw = join ', ', @bad;
+			dbg($line) if isdbg('nologchan');
+			dbg("PCPROT: Badwords: '$bw', dropped");
+			return;
+		}
+	}
+
 	# if it is routeable then then treat it like a talk
 	my $ref = Route::get($to);
 	if ($ref) {