X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=e2e8e983998a75f2b137a313f9b043af65714a25;hb=c3505bcfc922cd712bad2c20b3479cf8d1dc54fe;hp=06649f67afb9d64a5d7d85f7bb8c35d0c461a87a;hpb=9392cc93cca60220a2c8e390e716cddc2807f177;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 06649f67..e2e8e983 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1998-2006 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 package DXProt;
@@ -41,13 +41,17 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim
 			$last_hour $last10 %eph  %pings %rcmds $ann_to_talk
 			$pingint $obscount %pc19list $chatdupeage $chatimportfn
 			$investigation_int $pc19_version $myprot_version
-			%nodehops $baddx $badspotter $badnode $censorpc $rspfcheck
+			%nodehops $baddx $badspotter $badnode $censorpc
 			$allowzero $decode_dk0wcy $send_opernam @checklist
 			$eph_pc15_restime $pc9x_past_age $pc9x_future_age
+			$pc10_dupe_age
 		   );
 
-$pc9x_past_age = 15*60;			# maximum age in the past of a px9x
+$pc9x_past_age = 62*60;			# maximum age in the past of a px9x (a config record might be the only
+								# thing a node might send - once an hour)
 $pc9x_future_age = 5*60;		# maximum age in the future ditto
+$pc10_dupe_age = 45;			# just something to catch duplicate PC10->PC93 conversions
+
 
 # incoming talk commands
 sub handle_10
@@ -57,8 +61,10 @@ sub handle_10
 	my $line = shift;
 	my $origin = shift;
 
-	# rsfp check
-	return if $rspfcheck and !$self->rspfcheck(0, $_[6], $_[1]);
+	# this is to catch loops caused by bad software ...
+	if (eph_dup($line, $pc10_dupe_age)) {
+		return;
+	}
 
 	# will we allow it at all?
 	if ($censorpc) {
@@ -105,8 +111,8 @@ sub handle_10
 	RouteDB::update($_[6], $self->{call});
 #	RouteDB::update($to, $_[6]);
 
-	# convert this to a PC93 and process it as such
-	$self->normal(pc93($to, $from, $via, $_[3], $_[6]));
+	# convert this to a PC93, coming from mycall with origin set and process it as such
+	$main::me->normal(pc93($to, $from, $via, $_[3], $_[6]));
 }
 
 # DX Spot handling
@@ -125,9 +131,6 @@ sub handle_11
 		}
 	}
 
-	# rsfp check
-	#			return if $rspfcheck and !$self->rspfcheck(1, $_[7], $_[6]);
-
 	# 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 ($_[2] =~ /^\s*$/) {
@@ -285,8 +288,6 @@ sub handle_12
 	my $line = shift;
 	my $origin = shift;
 
-	#			return if $rspfcheck and !$self->rspfcheck(1, $_[5], $_[1]);
-
 	# announce duplicate checking
 	$_[3] =~ s/^\s+//;			# remove leading blanks
 
@@ -359,7 +360,7 @@ sub handle_15
 	my $origin = shift;
 
 	if (eph_dup($line, $eph_pc15_restime)) {
-		dbg("PCPROT: Ephemeral dup, dropped") if isdbg('chanerr');
+		return;
 	} else {
 		unless ($self->{isolate}) {
 			DXChannel::broadcast_nodes($line, $self) if $line =~ /\^H\d+\^?~?$/; # send it to everyone but me
@@ -401,7 +402,6 @@ sub handle_16
 	}
 
 	if (eph_dup($line)) {
-		dbg("PCPROT: dup PC16 detected") if isdbg('chanerr');
 		return;
 	}
 
@@ -461,18 +461,17 @@ sub handle_16
 			push @rout, @ans if $h && @ans;
 		}
 
-		# send info to all logged in thingies
-		$self->tell_login('loginu', "$ncall: $call") if DXUser->get_current($ncall)->is_local_node;
-		$self->tell_buddies('loginb', $call, $ncall);
-
 		# add this station to the user database, if required
-#		$call =~ s/-\d+$//o;	# remove ssid for users
-		my $user = DXUser->get_current($call);
-		$user = DXUser->new($call) if !$user;
+		my $user = DXUser->get_current($ncall);
+		$user = DXUser->new($call) unless $user;
 		$user->homenode($parent->call) if !$user->homenode;
 		$user->node($parent->call);
 		$user->lastin($main::systime) unless DXChannel::get($call);
 		$user->put;
+
+		# send info to all logged in thingies
+		$self->tell_login('loginu', "$ncall: $call") if $user->is_local_node;
+		$self->tell_buddies('loginb', $call, $ncall);
 	}
 	if (@rout) {
 		$self->route_pc16($origin, $line, $parent, @rout) if @rout;
@@ -540,11 +539,11 @@ sub handle_17
 	$parent->del_user($uref);
 
 	# send info to all logged in thingies
-	$self->tell_login('logoutu', "$ncall: $ucall") if DXUser->get_current($ncall)->is_local_node;
+	my $user = DXUser->get_current($ncall);
+	$self->tell_login('logoutu', "$ncall: $ucall") if $user && $user->is_local_node;
 	$self->tell_buddies('logoutb', $ucall, $ncall);
 
 	if (eph_dup($line)) {
-		dbg("PCPROT: dup PC17 detected") if isdbg('chanerr');
 		return;
 	}
 
@@ -582,7 +581,9 @@ sub handle_18
 #		$self->{handle_xml}++ if DXXml::available() && $_[1] =~ /\bxml/;
 		if ($_[1] =~ /\bpc9x/) {
 			if ($self->{isolate}) {
-				dbg("pc9x recognised, but is isolated, using old protocol");
+				dbg("pc9x recognised, but $self->{call} is isolated, using old protocol");
+			} elsif (!$self->user->wantpc9x) {
+				dbg("pc9x explicitly switched off on $self->{call}, using old protocol");
 			} else {
 				$self->{do_pc9x} = 1;
 				dbg("Do px9x set on $self->{call}");
@@ -830,7 +831,6 @@ sub handle_21
 	}
 
 	if (eph_dup($line)) {
-		dbg("PCPROT: dup PC21 detected") if isdbg('chanerr');
 		return;
 	}
 
@@ -875,10 +875,6 @@ sub handle_23
 		}
 	}
 
-	# only do a rspf check on PC23 (not 27)
-	if ($pcno == 23) {
-		return if $rspfcheck and !$self->rspfcheck(1, $_[8], $_[7])
-	}
 
 	# do some de-duping
 	my $d = cltounix($_[1], sprintf("%02d18Z", $_[2]));
@@ -938,7 +934,6 @@ sub handle_24
 	return unless $nref || $uref; # if we don't know where they are, it's pointless sending it on
 
 	if (eph_dup($line)) {
-		dbg("PCPROT: Dup PC24 ignored\n") if isdbg('chanerr');
 		return;
 	}
 
@@ -1019,7 +1014,7 @@ sub handle_34
 	my $line = shift;
 	my $origin = shift;
 	if (eph_dup($line, $eph_pc34_restime)) {
-		dbg("PCPROT: dupe PC34, ignored") if isdbg('chanerr');
+		return;
 	} else {
 		$self->process_rcmd($_[1], $_[2], $_[2], $_[3]);
 	}
@@ -1092,7 +1087,6 @@ sub handle_41
 
 	my $l = "PC41^$call^$sort";
 	if (eph_dup($l, $eph_info_restime)) {
-		dbg("PCPROT: dup PC41, ignored") if isdbg('chanerr');
 		return;
 	}
 
@@ -1173,7 +1167,6 @@ sub handle_49
 	my $origin = shift;
 
 	if (eph_dup($line)) {
-		dbg("PCPROT: Dup PC49 ignored\n") if isdbg('chanerr');
 		return;
 	}
 
@@ -1232,7 +1225,6 @@ sub handle_51
 		RouteDB::update($from, $self->{call});
 
 		if (eph_dup($line)) {
-			dbg("PCPROT: dup PC51 detected") if isdbg('chanerr');
 			return;
 		}
 		# route down an appropriate thingy
@@ -1420,14 +1412,19 @@ sub check_pc9x_t
 		if ($parent->call ne $main::mycall) {
 			my $lastid = $parent->lastid->{$pc} || 0;
 			if ($t < $lastid) {
-				if ($lastid-86400+$t > $pc9x_past_age) {
-					dbg("PCPROT: dup id on $t <= $lastid (midnight rollover), ignored") if isdbg('chanerr');
+				if ($t+86400-$lastid > $pc9x_past_age) {
+					dbg("PCPROT: dup id on $t <= $lastid, ignored") if isdbg('chanerr');
 					return;
 				}
-			}
-			if ($lastid >= $t) {
-				dbg("PCPROT: dup id on $call $lastid >= $t, ignored") if isdbg('chanerr');
+			} elsif ($t == $lastid) {
+				dbg("PCPROT: dup id on $t == $lastid, ignored") if isdbg('chanerr');
 				return;
+			} else {
+				# $t > $lastid, check that the timestamp offered isn't too far away from 'now'
+				if ($t+$main::systime_daystart-$main::systime > $pc9x_future_age ) {
+					dbg("PCPROT: id $t too far in the future, ignored") if isdbg('chanerr');
+					return;
+				}
 			}
 		}
 	} elsif ($create) {
@@ -1462,9 +1459,17 @@ sub handle_92
 	}
 
 	if ($pcall eq $self->{call} && $self->{state} eq 'init') {
-		$self->state('init92');
-		$self->{do_pc9x} = 1;
-		dbg("Do pc9x set on $pcall");
+		if ($self->{isolate}) {
+			dbg("PC9x received, but $pcall is isolated, ignored");
+			return;
+		} elsif (!$self->user->wantpc9x) {
+			dbg("PC9x explicitly switched off on $pcall, ignored");
+			return;
+		} else {
+			$self->state('init92');
+			$self->{do_pc9x} = 1;
+			dbg("Do pc9x set on $pcall");
+		}
 	}
 	unless ($self->{do_pc9x}) {
 		dbg("PCPROT: PC9x come in from non-PC9x node, ignored") if isdbg('chanerr');
@@ -1544,17 +1549,24 @@ sub handle_92
 						dbg("PCPROT: $call looped back onto $main::mycall, ignored") if isdbg('chanerr');
 						return;
 					}
+					# this is only accepted from my "self".
+					# this also kills configs from PC92 nodes with external PC19 nodes that are also
+					# locally connected. Local nodes always take precedence.
+					if (DXChannel::get($call) && $call ne $self->{call}) {
+						dbg("PCPROT: locally connected node $call from other another node $self->{call}, ignored") if isdbg('chanerr');
+						return;
+					}
 					if ($is_extnode) {
-						# this is only accepted from my "self"
-						if (DXChannel::get($call) && $call ne $self->{call}) {
-							dbg("PCPROT: locally connected node config for $call from other another node $self->{call}, ignored") if isdbg('chanerr');
-							return;
-						}
 						# reparent to external node (note that we must have received a 'C' or 'A' record
 						# from the true parent node for this external before we get one for the this node
 						unless ($parent = Route::Node::get($call)) {
-							dbg("PCPROT: no previous C or A for this external node received, ignored") if isdbg('chanerr');
-							return;
+							if ($is_extnode && $oparent) {
+								@radd =  _add_thingy($oparent, $ent[0]);
+								$parent = $radd[0];
+							} else {
+								dbg("PCPROT: no previous C or A for this external node received, ignored") if isdbg('chanerr');
+								return;
+							}
 						}
 						$parent = check_pc9x_t($call, $t, 92) || return;
 						$parent->via_pc92(1);
@@ -1594,10 +1606,12 @@ sub handle_92
 
 			# we only reset obscounts on config records
 			$oparent->reset_obs;
-			dbg("ROUTE: reset obscount on $pcall now " . $oparent->obscount) if isdbg('route');
+			$oparent->PC92C_dxchan($self->{call}) unless $self->{call} eq $oparent->call;
+			dbg("ROUTE: reset obscount on $pcall now " . $oparent->obscount) if isdbg('obscount');
 			if ($oparent != $parent) {
 				$parent->reset_obs;
-				dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('route');
+				$parent->PC92C_dxchan($self->{call}) unless $self->{call} eq $parent->call;
+				dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('obscount');
 			}
 
 			#
@@ -1670,6 +1684,13 @@ sub handle_93
 		dbg("PCPROT: invalid callsign string '$_[1]', ignored") if isdbg('chanerr');
 		return;
 	}
+
+	# remember that we are converting PC10->PC93
+	unless ($self->{do_pc9x}) {
+		dbg("PCPROT: PC9x come in from non-PC9x node, ignored") if isdbg('chanerr');
+		return;
+	}
+
 	my $t = $_[2];
 	my $parent = check_pc9x_t($pcall, $t, 93, 1) || return;
 
@@ -1680,6 +1701,11 @@ sub handle_93
 	my $onode = $_[7];
 	$onode = $pcall if @_ <= 8;
 
+	# this is catch loops caused by bad software ...
+	if (eph_dup("PC93|$from|$text|$onode", $pc10_dupe_age)) {
+		return;
+	}
+
 	# will we allow it at all?
 	if ($censorpc) {
 		my @bad;
@@ -1689,11 +1715,6 @@ sub handle_93
 		}
 	}
 
-	# this is catch loops caused by bad software ...
-	if (eph_dup("PC93|$from|$text|$onode")) {
-		return;
-	}
-
 	# if this is a 'bad spotter' user then ignore it
 	my $nossid = $from;
 	$nossid =~ s/-\d+$//;
@@ -1707,9 +1728,16 @@ sub handle_93
 		my $dxchan;
 		$dxchan = DXChannel::get($main::myalias) if $to eq $main::mycall;
 		$dxchan = DXChannel::get($to) unless $dxchan;
-		if ($dxchan && $dxchan->is_user) {
-			$dxchan->talk($from, $to, $via, $text, $onode);
-			return;
+		# check it...
+		if ($dxchan) {
+			if (ref $dxchan && $dxchan->isa('DXChannel')) {
+				if ($dxchan->is_user) {
+					$dxchan->talk($from, $to, $via, $text, $onode);
+					return;
+				}
+			} else {
+				dbg("ERROR: $to -> $dxchan is not a DXChannel! (local talk)");
+			}
 		}
 
 		# convert to PC10 talks where appropriate
@@ -1717,14 +1745,17 @@ sub handle_93
 		if ($ref) {
 			# just go for the "best" one for now (rather than broadcast)
 			$dxchan = $ref->dxchan;
-#			my @dxchan = $ref->alldxchan;
-#			for $dxchan (@dxchan) {
+
+			# check it...
+			if (ref $dxchan && $dxchan->isa('DXChannel')) {
 				if ($dxchan->{do_pc9x}) {
 					$dxchan->send($line);
 				} else {
 					$dxchan->talk($from, $to, $via, $text, $onode);
 				}
-#			}
+			} else {
+				dbg("ERROR: $to -> $dxchan is not a DXChannel! (convert to pc10)");
+			}
 			return;
 		}
 
@@ -1735,7 +1766,7 @@ sub handle_93
 		my $wx = uc $to eq 'WX' ? '1' : '0';
 		my $local = $via eq 'LOCAL' ? '*' : $via;
 
-		$self->send_announce(1, pc12($from, $text, $local, $via, $sysop, $wx, $pcall), $from, $local, $text, $sysop, $pcall, $wx, $via eq 'LOCAL' ? $via : undef);
+		$self->send_announce(1, pc12($from, $text, $local, $sysop, $wx, $pcall), $from, $local, $text, $sysop, $pcall, $wx, $via eq 'LOCAL' ? $via : undef);
 		return if $via eq 'LOCAL';
 	} else {
 		# chat messages to non-pc9x nodes
@@ -1759,9 +1790,7 @@ sub handle_default
 	my $line = shift;
 	my $origin = shift;
 
-	if (eph_dup($line)) {
-		dbg("PCPROT: Ephemeral dup, dropped") if isdbg('chanerr');
-	} else {
+	unless (eph_dup($line)) {
 		if ($pcno >= 90) {
 			my $pcall = $_[1];
 			unless (is_callsign($pcall)) {