X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=c4344339f16131424117c3e1d36f6f6f9fbe5af4;hb=1935ba236a7ef4999bceb00b6faf28038f3b052e;hp=0beabcf224b11d3697bfe76f4d86bab5aa1d1a22;hpb=c480ac94da7dbd5762fcd15aa556c874d223e14e;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 0beabcf2..c4344339 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -49,11 +49,11 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim
 
 $pc9x_dupe_age = 60;			# catch loops of circular (usually) D records
 $pc10_dupe_age = 45;			# just something to catch duplicate PC10->PC93 conversions
-$pc92_slug_changes = 60*5;		# slug any changes going outward for this long
+$pc92_slug_changes = 60*1;		# slug any changes going outward for this long
 $last_pc92_slug = 0;			# the last time we sent out any delayed add or del PC92s
 $pc9x_time_tolerance = 15*60;	# the time on a pc9x is allowed to be out by this amount
 $pc9x_past_age = (122*60)+		# maximum age in the past of a px9x (a config record might be the only
-	$pc9x_time_tolerance;		# thing a node might send - once an hour and we allow an extra hour for luck)
+$pc9x_time_tolerance;           # thing a node might send - once an hour and we allow an extra hour for luck)
                                 # this is actually the partition between "yesterday" and "today" but old.
 
 $pc92filterdef = bless ([
@@ -65,6 +65,10 @@ $pc92filterdef = bless ([
 			  ['zone', 'nz', 3],
 			 ], 'Filter::Cmd');
 
+our %pc11q;
+# this is a place to park an incoming PC11 in the sure and certain hope that
+# a PC61 will be along soon. This has the side benefit that it will delay a
+# a PC11 for one second - assuming that it is not removed by a PC61 version
 
 # incoming talk commands
 sub handle_10
@@ -125,6 +129,8 @@ sub handle_10
 	$main::me->normal(pc93($to, $from, $via, $pc->[3], $pc->[6]));
 }
 
+my $last;
+
 # DX Spot handling
 sub handle_11
 {
@@ -204,6 +210,7 @@ sub handle_11
 	}
 
 	my @spot = Spot::prepare($pc->[1], $pc->[2], $d, $pc->[5], $nossid, $pc->[7], $pc->[8]);
+
 	# global spot filtering on INPUT
 	if ($self->{inspotsfilter}) {
 		my ($filter, $hops) = $self->{inspotsfilter}->it(@spot);
@@ -213,22 +220,72 @@ 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,
+	my $key = join '|', @spot[0..2,4,7];
+	if (0) {
+	
+	if ($pc->[0] eq 'PC11') {
+		my $r = [$main::systime, $key, \@spot, $line, $origin, $pc];
+		if (!$last) {
+			$last = [$main::systime, $key, \@spot, $line, $origin, $pc];
+			dbg("PC11: $origin -> $key stored") if isdbg('pc11');
+			return;
+		} elsif ($key eq $last->[1]) { # same as last one
+			dbg("PC11: $origin -> $key dupe dropped") if isdbg('pc11');
+			return;
+		} else {
+			# it's a different PC11, kick the stored one onward and store this one instead,
+			dbg("PC11: PC11 new $origin -> $key stored, $last->[4] -> $last->[1] passed onward") if isdbg('pc11');
+			@spot = @{$last->[2]};
+			$line = $last->[3];
+			$origin = $last->[4];
+			$pc = $last->[5];
+			$last = $r;
+		}
+	} elsif ($pc->[0] eq 'PC61') {
+		if ($last) {
+			if ($last->[1] eq $key) {
+				# dump $last and proceed with the PC61
+				dbg("PC11: $origin -> $key dropped in favour of PC61") if isdbg('pc11');
+				undef $last;
+			} else {
+				# it's a different spot send out stored pc11
+				dbg("PC11: last $last->[4] -> $last->[1] different PC61 $origin -> $key, send PC11 first ") if isdbg('pc11');
+				$last->[1] = 'new pc61';
+				handle_11($self, 11, $last->[3], $last->[4], $last->[5]);
+				undef $last;
+				dbg("PC11: now process PC61 $origin -> $key") if isdbg('pc11');
+			}
+		}
+	} else {
+		dbg("PC11: Unexpected line '$line' in bagging area (expecting PC61, PC11), ignored");
+		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,5])) {
-		dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr');
+		dbg("PCPROT: Duplicate Spot $pc->[0] $key ignored\n") if isdbg('chanerr') || isdbg('dupespot');
 		return;
 	}
-
+	
 	# add it
 	Spot::add(@spot);
 
+	my $ip = '';
+	$ip ||= $spot[14] if exists $spot[14];
 	if (isdbg('progress')) {
-		my $ip = '';
-		$ip = sprintf "($spot[14])" if $spot[14]; 
-		my $s = sprintf "SPOT: $spot[1] on $spot[0] \@ %s by $spot[4]$ip\@$spot[7]", cldatetime($spot[2]);
-		$s .= " '$spot[3]'" if $spot[3];
+		my $sip = $ip ? sprintf "($ip)" : '' unless $ip =~ m|[\(\)\*]|;
+		$sip ||= '';
+		my $d = ztime($spot[2]);
+		my $s = "SPOT: $spot[1] on $spot[0] \@ $d by $spot[4]$sip\@$spot[7]";
+		$s .= $spot[3] ? " '$spot[3]'" : q{ ''};
+		$s .=  " route: $origin";
 		dbg($s);
 	}
 	
@@ -268,8 +325,8 @@ sub handle_11
 				} else {
 					route(undef, $to, pc34($main::mycall, $to, $cmd));
 				}
-				if ($to ne $pc->[7]) {
-					$to = $pc->[7];
+				if ($to ne $origin) {
+					$to = $origin;
 					$node = Route::Node::get($to);
 					if ($node) {
 						$dxchan = $node->dxchan;
@@ -302,6 +359,12 @@ sub handle_11
 	send_dx_spot($self, $line, @spot) if @spot;
 }
 
+# used to kick outstanding PC11 if required
+sub pc11_process
+{
+
+}
+
 # announces
 sub handle_12
 {
@@ -620,7 +683,7 @@ sub handle_18
 		$self->{build} = 0 + $build;
 		$self->user->build(0 + $build);
 		$parent->build(0 + $build);
-		dbg("DXSpider version $version build $build");
+		dbg("$self->{call} = DXSpider version $version build $build");
 		unless ($self->is_spider) {
 			dbg("Change U " . $self->user->sort . " C $self->{sort} -> S");
 			$self->user->sort('S');
@@ -629,7 +692,7 @@ sub handle_18
 		}
 #		$self->{handle_xml}++ if DXXml::available() && $pc->[1] =~ /\bxml/;
 	} else {
-		dbg("Unknown software");
+		dbg("$self->{call} = Unknown software ($pc->[1] $pc->[2])");
 		$self->version(50.0);
 		$self->version($pc->[2] / 100) if $pc->[2] && $pc->[2] =~ /^\d+$/;
 		$self->user->version($self->version);
@@ -637,12 +700,12 @@ sub handle_18
 
 	if ($pc->[1] =~ /\bpc9x/) {
 		if ($self->{isolate}) {
-			dbg("pc9x recognised, but $self->{call} is isolated, using old protocol");
+			dbg("$self->{call} pc9x recognised, but node is isolated, using old protocol");
 		} elsif (!$self->user->wantpc9x) {
-			dbg("pc9x explicitly switched off on $self->{call}, using old protocol");
+			dbg("$self->{call} pc9x explicitly switched off, using old protocol");
 		} else {
 			$self->{do_pc9x} = 1;
-			dbg("Do px9x set on $self->{call}");
+			dbg("$self->{call} Set do PC9x");
 		}
 	}
 
@@ -659,13 +722,15 @@ sub check_add_node
 
 	# add this station to the user database, if required (don't remove SSID from nodes)
 	my $user = DXUser::get_current($call);
-	if (!$user) {
+	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('A');
+		$user->lastin($main::systime); # this make it last longer than just this invocation
+		$user->put;				# just to make sure it gets written away!!!
 	}
 	return $user;
 }
@@ -969,7 +1034,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');
+	dbg("WWV: <$pc->[2]>, sfi=$sfi k=$k info=$i '$pc->[6]' $pc->[7]\@$pc->[8] $r route: $origin") if isdbg('progress');
 
 	if (defined &Local::wwv) {
 		my $rep;
@@ -1373,7 +1438,7 @@ sub handle_73
 	}
 
 	my $wcy = WCY::update($d, @$pc[2..12]);
-	dbg("WCY: " . join ', ', @$pc[2..12]) if isdbg('progress');
+	dbg("WCY: <$pc->[2]> K=$pc->[5] expK=$pc->[6] A=$pc->[4] R=$pc->[7] SFI=$pc->[3] SA=$pc->[8] GMF=$pc->[9] Au=$pc->[10] $pc->[11]\@$pc->[12] route: $origin") if isdbg('progress');
 
 	if (defined &Local::wcy) {
 		my $rep;
@@ -1429,7 +1494,7 @@ sub _decode_pc92_call
 	my $is_extnode = $flag & 2;
 	my $here = $flag & 1;
 	my $ip	= $part[3];
-	$ip ||= $part[1] if $part[1] && ($part[1] =~ /^(?:\d+\.)+/ || $part[1] =~ /^(?:(?:[abcdef\d]+)?,)+/);
+	$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);
 }
@@ -1478,32 +1543,41 @@ sub _add_thingy
 	my ($call, $is_node, $is_extnode, $here, $version, $build, $ip) = @$s;
 	my @rout;
 
+	# remove spurious IPV6 prefix on IPV4 addresses
+	$ip =~ s/^::ffff:// if $ip;
+	
 	if ($call) {
 		my $ncall = $parent->call;
-		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->PC92C_dxchan($dxchan->call, $hops) if $r;
-			if ($ip) {
-				$r->ip($ip);
-				Log('DXProt', "PC92A $call -> $ip on $ncall");
+		if ($ncall ne $call) {
+			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->PC92C_dxchan($dxchan->call, $hops) if $r;
+				if ($ip) {
+					$r->ip($ip);
+					Log('DXProt', "PC92A $call -> $ip on $ncall");
+				}
+			} 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");
+				}
 			}
-		} 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");
+			if ($pc92_slug_changes && $parent == $main::routeroot) {
+				$things_add{$call} = Route::get($call);
+				delete $things_del{$call};
 			}
-		}
-		if ($pc92_slug_changes && $parent == $main::routeroot) {
-			$things_add{$call} = Route::get($call);
-			delete $things_del{$call};
+		} else {
+			dbgprintring(10) if isdbg('nologchan');
+			dbg("DXProt::add_thingy: Trying to add parent $call to itself $ncall, ignored");
 		}
 	}
+	
 	return @rout;
 }
 
@@ -2016,7 +2090,7 @@ sub handle_93
 
 	if (isdbg('progress')) {
 		my $vs = $via ne '*' ? " via $via" : ''; 
-		my $s = "ANNTALK: $from\@$onode$vs -> $to '$text'";
+		my $s = "ANNTALK: $from\@$onode$vs -> $to '$text' route: $origin";
 		dbg($s);
 	}