X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=8c62e392f3e33046bd99b417c3d2f10f7b7d92fc;hb=f8017bac9afdb84424fb70b135ed00522d3907d9;hp=d7d9270711ef782d9b00a87b99cf368e44774e9e;hpb=bb1b68be1deece59bebde138392b34aac8dfe87e;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index d7d92707..8c62e392 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -36,6 +36,9 @@ use DXCIDR;
 
 use strict;
 use warnings qw(all);
+no warnings qw(uninitialized);
+
+
 
 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
@@ -46,7 +49,7 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim
 			$eph_pc15_restime $pc9x_past_age $pc9x_dupe_age
 			$pc10_dupe_age $pc92_slug_changes $last_pc92_slug
 			$pc92Ain $pc92Cin $pc92Din $pc92Kin $pc9x_time_tolerance
-			$pc92filterdef $senderverify
+			$pc92filterdef $senderverify $pc11_dwell_time $pc11_extract_route
 		   );
 
 $pc9x_dupe_age = 60;			# catch loops of circular (usually) D records
@@ -59,6 +62,8 @@ $pc9x_time_tolerance;           # thing a node might send - once an hour and we
                                 # this is actually the partition between "yesterday" and "today" but old.
 $senderverify = 0;				# 1 - check for forged PC11 or PC61.
                                 # 2 - if forged, dump them.
+$pc11_dwell_time = 2;			# number of seconds to wait for a PC61 to come to substitute the PC11
+$pc11_extract_route = 1;		# generate missing  user route entry and IP address from passing PC61s
 
 
 $pc92filterdef = bless ([
@@ -107,7 +112,7 @@ sub handle_10
 		return;
 	}
 
-	# if this is a 'bad spotter' user then ignore it
+
 	my $nossid = $from;
 	$nossid =~ s/-\d+$//;
 	if ($badspotter->in($nossid)) {
@@ -139,9 +144,11 @@ sub handle_10
 	$main::me->normal(pc93($to, $from, $via, $pc->[3], $pc->[6]));
 }
 
-my $last;
-my $pc11_saved;
-my $pc11_saved_time;
+my %pc11_saved;					# delayed PC11s
+my $pc11_rx;					# no of pc11 rxed
+my $pc61_rx;					# no of pc61 rxed
+my $pc11_to_61;					# no of 'better' pc61, that replaced stored waiting pc11
+my $rpc11_to_61;				# no of pc11s 'promoted' to pc61 by IP captured in routing table
 
 # DX Spot handling
 sub handle_11
@@ -161,7 +168,7 @@ sub handle_11
 		}
 	}
 
-	dbg("INPUT PC$pcno $line origin $origin recurse: $recurse") if isdbg("pc11") || isdbg("pc61"); 
+	dbg("INPUT $self->{call}: $line origin $origin recurse: $recurse") if isdbg("pc11") || isdbg("pc61"); 
 
 #	my ($hops) = $pc->[8] =~ /^H(\d+)/;
 
@@ -186,27 +193,6 @@ sub handle_11
 		return;
 	}
 
-	# 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($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)) {
-			dbg($line) if isdbg('nologchan');
-			dbg("PCProt: $ip in badip list, 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)
@@ -223,7 +209,7 @@ sub handle_11
 		return;
 	}
 
-	# do some de-duping
+	# is it claiming to be BUST(ed)
 	$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*$/) {
@@ -232,9 +218,35 @@ sub handle_11
 		return;
 	}
 	
+	my $nossid = $pc->[6];
+    $nossid =~ s/-\d+$//;
 
 	my @spot = Spot::prepare($pc->[1], $pc->[2], $d, $pc->[5], $nossid, $pc->[7], $pc->[8]);
 
+	#   $f0 = frequency
+	#   $f1 = call
+	#   $f2 = date in unix format
+	#   $f3 = comment
+	#   $f4 = spotter
+	#   $f5 = spotted dxcc country
+	#   $f6 = spotter dxcc country
+	#   $f7 = origin
+	#   $f8 = spotted itu
+	#   $f9 = spotted cq zone
+	#   $f10 = spotter itu
+	#   $f11 = spotter cq zone
+	#   $f12 = spotted us state
+	#   $f13 = spotter us state
+	#   $f14 = ip address
+
+
+	# is this is a 'bad spotter' or an unknown user then ignore it. 
+	if ($badspotter->in($nossid)) {
+		dbg($line) if isdbg('nologchan');
+		dbg("PCPROT: Bad Spotter $pc->[6], dropped");
+		return;
+	}
+
 	# global spot filtering on INPUT
 	if ($self->{inspotsfilter}) {
 		my ($filter, $hops) = $self->{inspotsfilter}->it(@spot);
@@ -244,64 +256,114 @@ sub handle_11
 		}
 	}
 
+
 	# this is where we decide to delay PC11s in the hope that a PC61 will be along soon.
 	
 	my $key = join '|', @spot[0..2,4,7]; # not including text
+
 	unless ($recurse) {
 		if ($pcno == 61) {
-			if ($pc11_saved) {
-				if ($key eq $pc11_saved->[0]) {
-					dbg("saved PC11 spot $key dumped, better pc61 received") if isdbg("pc11");
-					undef $pc11_saved;
+			if (Spot::dup_find(@spot[0..4,7])) {
+				dbg("DUPE $pc->[0] $self->{call}: key: $key dumped") if isdbg('pc11');
+				return;
+			} else {
+				++$pc61_rx;
+			}
+
+			# as we have a route to a user, if it does not exist, create and link if (and only if) the node exists as well
+			if ($pc->[8]) {
+				my $new = $pc->[8];
+				# $new =~ s/,/:/g;
+				my $r = Route::User::get($pc->[6]);
+				unless ($r) {
+					my $rn = Route::Node::get($pc->[7]) || Route::Node->new($pc->[7]);
+					$rn->add_user($pc->[6], 0, $pc->[8]);
+					$r = Route::User::get($pc->[6]);
+				}
+				if ($r) {
+					if ($r->ip ne $pc->[8]) {
+						my $old = $r->ip;
+						$r->ip($new);
+						dbg("ROUTE ALTER IP node: $pc->[7] user: $pc->[6] old IP: '$old'-> new IP: '$new'") if isdbg('pc11');
+					} else {
+						dbg("ROUTE NEW IP node: $pc->[7] user: $pc->[6] IP: '$new'") if isdbg('pc11');
+					}
+				} else {
+					dbg("ROUTE ADD Failed for node $pc->[7] user $pc->[6]") if isdbg('pc11');
 				}
-			} 
+			}
+
+			if ($pc11_saved{$key}) {
+				++$pc11_to_61;
+				my $percent = $pc11_rx ? $pc11_to_61 * 100 / $pc11_rx : 0;
+				dbg(sprintf("PROMOTED BETTER $self->{call}: $pc->[0] $key, using pc61, WAITING pc11 DUMPED: $pc61_rx pc11: $pc11_rx better pc61: $pc11_to_61 (%0.1f%%)", $percent)) if isdbg("pc11");
+				delete $pc11_saved{$key};
+			}
 		}
 		if ($pcno == 11) {
-			if ($pc11_saved) {
-				if ($key eq $pc11_saved->[0]) {
-					dbg("saved PC11 spot $key, dupe pc11 received and dumped") if isdbg("pc11");
-					return;		# because it's a dup
-				}
+
+			if (Spot::dup_find(@spot[0..4,7])) {
+				dbg("DUPE $pc->[0] $self->{call}: key: $key dumped") if isdbg('pc11');
+				return;
+			} else {
+				++$pc11_rx;
+			}
+
+			if ($pc11_saved{$key}) {
+				dbg("DUPE $pc->[0] $self->{call } key: $key is saved, ignored") if isdbg("pc11");
+				return;		# because it's a dup
 			}
 
 			# can we promote this to a PC61?
 			my $r = Route::User::get($spot[4]); # find spotter
-			if ($r && $r->ip) {	                # do we have an ip addres
-				$pcno = 61;						# now turn this into a PC61
-				$spot[14] = $r->ip;
-				dbg("PC11 spot $key promoted to pc61 ip $spot[14]") if isdbg("pc11");
-				undef $pc11_saved;
-			}
-		}
 
-		if ($pc11_saved && $key ne $pc11_saved) {
-			dbg("saved PC11 spot $pc11_saved->[0] ne new key $key, recursing") if isdbg("pc11");
-			shift @$pc11_saved;	# saved key
-			my $self = shift @$pc11_saved;
-			my @saved = @$pc11_saved;
-			undef $pc11_saved;
-			$self->handle_11(@saved, 1);
-		}
+			if ($r && $r->ip) {	                # do we have an ip address
+				$pcno = 61;
+				$pc->[0] = 'PC61';
+				my $hops = $pc->[8];
+				$pc->[8] = $spot[14] = $r->ip;
+				++$rpc11_to_61;
+				my $percent = $pc11_rx ? $rpc11_to_61 * 100 / $pc11_rx : 0;
+				dbg(sprintf("PROMOTED ROUTE $self->{call}: pc11 $key PROMOTED to pc61 with IP $spot[14] pc61: $pc61_rx pc11: $pc11_rx route->pc61 $rpc11_to_61 (%0.1f%%)", $percent)) if isdbg("pc11");
+				$line = join '^', @$pc, $hops, '~';
+				dbg("CHANGED saved key: $key PC11 line to $line") if isdbg('pc11');
+				delete $pc11_saved{$key};
+			}
 
-		# if we are still a PC11, save it for a better offer
-		if ($pcno == 11) {
-			$pc11_saved = [$key, $self, $pcno, $line, $origin, $pc];
-			$pc11_saved_time = $main::systime;
-			dbg("saved new PC11 spot $key for a better offer") if isdbg("pc11");
-			return;
-		} else {
-			dbg("PC61 spot $key passed onward") if isdbg("pc11");
+			# if it is STILL (despite all efforts to change it) a PC11
+			# save it and wait - it will be called from pc11_process
+			if ($pcno == 11) {
+				$pc11_saved{$key} = [$main::systime, $self, $pcno, $line, $origin, $pc];
+				dbg("WAITING $self->{call}: NEW $pc->[0] spot $key waiting for a better offer") if isdbg("pc11");
+				return;
+			}
 		}
 	}
 
+
 	
 	# this goes after the input filtering, but before the add
 	# so that if it is input filtered, it isn't added to the dup
 	# list. This allows it to come in from a "legitimate" source
 	if (Spot::dup(@spot[0..4,7])) {
-		dbg("PCPROT: Duplicate Spot $pc->[0] $key ignored\n") if isdbg('chanerr') || isdbg('dupespot');
+		dbg("PCPROT: Duplicate Spot  $self->{call}: $pc->[0] $key ignored\n") if isdbg('chanerr') || isdbg('dupespot') || isdbg('pc11');
 		return;
 	}
+
+	dbg("PROCESSING $self->{call}: $pc->[0] key: $key") if isdbg('pc11');
+	
+	# we check IP addresses for PC61 - this will also dedupe PC11 copies
+	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: PC61 $ip in badip list, dropped");
+			return;
+		}
+	}
+
 	
 	# here we verify the spotter is currently connected to the node it says it is one. AKA email sender verify
 	# but without the explicit probe to the node. We are relying on "historical" information, but it very likely
@@ -323,14 +385,14 @@ 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
+	# 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])) {
@@ -341,9 +403,6 @@ sub handle_11
 		}
 	}
 
-	# 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,
 	
 	# add it
 	Spot::add(@spot);
@@ -428,21 +487,57 @@ sub handle_11
 
 	# send out the filtered spots
 	send_dx_spot($self, $line, @spot) if @spot;
+
+	# cancel any recursion as we have now processed it
+	my $count =  $pc11_to_61+$rpc11_to_61;
+	my $percent = ($pc11_rx + $pc61_rx) ? ($pc11_rx * 100) / ($pc11_rx + $pc61_rx) : 0;
+	my $pc11_61 = $pc11_rx ? ($count * 100) / $pc11_rx : 0;
+	my $data = "$self->{call} $pc->[0] key: $key";
+	my $stats = sprintf "pc11: $pc11_rx pc61: $pc61_rx pc11%%: %0.1f%% pc11->pc61: $count(%0.1f%%)", $percent, $pc11_61;
+	if ($recurse) {
+		if ($pc11_saved{$key}) {
+			dbg("END RECURSED $data removed and finished $stats") if isdbg('pc11');
+			delete $pc11_saved{$key};
+		} else {
+			dbg("END RECURSED $data finished $stats") if isdbg('pc11'); 
+		}
+		$recurse = 0;
+	} else {
+		dbg("END NORMAL $data finished $stats") if isdbg('pc11');
+	}
 }
 
 # used to kick outstanding PC11 if required
 sub pc11_process
 {
-	if ($pc11_saved && $main::systime > $pc11_saved_time) {
-		dbg("saved PC11 spot $pc11_saved->[0] timed out waiting, recursing") if isdbg("pc11");
-		shift @$pc11_saved;	# saved key
-		my $self = shift @$pc11_saved;
-		my @saved = @$pc11_saved;
-		undef $pc11_saved;
-		$self->handle_11(@saved, 1);
+	foreach my $key (keys %pc11_saved) {
+		my $r = $pc11_saved{$key};
+		if ($main::systime > $r->[0] + $pc11_dwell_time) {
+			dbg("RECURSE PC11 spot $key timed out waiting, resend") if isdbg("pc11");
+			my $self = $r->[1];
+			delete $pc11_saved{$key};
+			$self->handle_11(@$r[2..5], 1);
+		}
 	}
 }
 
+# return the pc11 / pc61 / promotions data
+sub get_pc11_61_stats
+{
+	my $promotions =  $pc11_to_61+$rpc11_to_61;
+	my $percent = ($pc11_rx + $pc61_rx) ? ($pc11_rx * 100) / ($pc11_rx + $pc61_rx) : 0;
+	my $pc11_61p = $pc11_rx ? ($promotions * 100) / $pc11_rx : 0;
+	return {
+			pc11_rx => $pc11_rx+0,
+			pc61_rx => $pc61_rx+0,
+			pc11_to_61 => $pc11_to_61+0,
+			rpc11_to_61 => $rpc11_to_61+0,
+			promotions => $promotions+0,
+			pc11_percent => $percent+0,
+			promotions_percent => $pc11_61p+0,
+		   };
+}
+
 # announces
 sub handle_12
 {
@@ -756,17 +851,20 @@ sub handle_18
 	$self->state('init');
 
 	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 ($software, $version) = $pc->[1] =~ /(DXSpider|CC\s*Cluster)\s+Version: (\d+(?:\.\d+)?)/i) {
+		$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);
-		dbg("$self->{call} = DXSpider version $version build $build");
+		$build += 0;
+		$self->{build} = $build;
+		$self->user->build($build);
+		$parent->build($build);
+		dbg("$self->{call} = $software version $version build $build");
 		unless ($self->is_spider) {
 			dbg("Change U " . $self->user->sort . " C $self->{sort} -> S");
 			$self->user->sort('S');
@@ -774,6 +872,20 @@ sub handle_18
 			$self->sort('S');
 		}
 #		$self->{handle_xml}++ if DXXml::available() && $pc->[1] =~ /\bxml/;
+	} elsif (my ($software, $version, $build) = $pc->[1] =~ /(AR-Cluster)\s+Version:\s+(\d+\.\d+).?(\d+\.\d+)?/) {
+		dbg("$self->{call} = $software version $version build $build");
+		$self->{version} = $version;
+		$self->user->version($version);
+		$parent->version($version);
+		$self->{build} = $build;
+		$self->user->build($build);
+		$parent->build($build);
+		unless ($self->is_arcluster) {
+			dbg("Change U " . $self->user->sort . " C $self->{sort} -> R");
+			$self->user->sort('R');
+			$self->user->put;
+			$self->sort('R');
+		}
 	} else {
 		dbg("$self->{call} = Unknown software ($pc->[1] $pc->[2])");
 		$self->version(50.0);
@@ -781,7 +893,7 @@ sub handle_18
 		$self->user->version($self->version);
 	}
 
-	if ($pc->[1] =~ /\bpc9x/) {
+	if ($pc->[1] =~ /CC\*Cluster/i || $pc->[1] =~ /\bpc9x/i) {
 		if ($self->{isolate}) {
 			dbg("$self->{call} pc9x recognised, but node is isolated, using old protocol");
 		} elsif (!$self->user->wantpc9x) {
@@ -982,7 +1094,7 @@ sub handle_20
 	my $origin = shift;
 	my $pc = shift;
 
-	if ($self->{do_pc9x} && $self->{state} ne 'init92') {
+	if ($self->{do_pc9x} && $self->{state} ne 'init92' && $self->{state} ne 'normal') {
 		$self->send("Reseting to oldstyle routing because login call not sent in any pc92");
 		$self->{do_pc9x} = 0;
 	}
@@ -1076,7 +1188,7 @@ sub handle_22
 	my $pc = shift;
 
 	if ($self->{do_pc9x}) {
-		if ($self->{state} ne 'init92') {
+		if ($self->{state} ne 'init92' && $self->{state} ne 'normal') {
 			$self->send("Reseting to oldstyle routing because login call not sent in any pc92");
 			$self->{do_pc9x} = 0;
 		}
@@ -1691,12 +1803,12 @@ sub _add_thingy
 					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);
+						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 v: $version b: $build sort ($old) downgraded to " . $user->sort);
 						}
 					}
 				}
@@ -2053,23 +2165,23 @@ sub handle_92
 			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');
+			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)");
+					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)");
+					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");
+					dbg("PCPROT: PC92 K node $call updated - marked as PC92 K user");
 					$user->K(1);
 					++$changed;
 				}