X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=6c18a83052329dcddf29c42d149e38fd94d1e898;hb=2c57e5577630b2cc49fe831ff5cf3b49b9629567;hp=71cef0e220d81071f5ddf931973020cb301a1b49;hpb=f52bf428cfd46825c2e2fcd3a0ba55097bbe7bd6;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 71cef0e2..6c18a830 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -42,7 +42,7 @@ $BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
-use vars qw($pc11_max_age $pc23_max_age $last_pc50
+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
 			%nodehops $baddx $badspotter $badnode $censorpc $rspfcheck
 			$allowzero $decode_dk0wcy $send_opernam @checklist);
@@ -62,6 +62,9 @@ $badnode = new DXHash "badnode";
 $last10 = $last_pc50 = time;
 $ann_to_talk = 1;
 $rspfcheck = 1;
+$eph_restime = 180;
+$eph_info_restime = 60*60;
+$eph_pc34_restime = 30;
 
 @checklist = 
 (
@@ -208,7 +211,7 @@ sub new
 	# add this node to the table, the values get filled in later
 	my $pkg = shift;
 	my $call = shift;
-	$main::routeroot->add($call, '0000', Route::here(1)) if $call ne $main::mycall;
+	$main::routeroot->add($call, '5000', Route::here(1)) if $call ne $main::mycall;
 
 	return $self;
 }
@@ -238,6 +241,9 @@ sub start
 	$self->{here} = 1;
 	$self->{width} = 80;
 
+	# sort out registration
+	$self->{registered} = 1;
+
 	# get the output filters
 	$self->{spotsfilter} = Filter::read_in('spots', $call, 0) || Filter::read_in('spots', 'node_default', 0);
 	$self->{wwvfilter} = Filter::read_in('wwv', $call, 0) || Filter::read_in('wwv', 'node_default', 0);
@@ -256,6 +262,7 @@ sub start
 	# set unbuffered and no echo
 	$self->send_now('B',"0");
 	$self->send_now('E',"0");
+	$self->conn->echo(0) if $self->conn->can('echo');
 	
 	# ping neighbour node stuff
 	my $ping = $user->pingint;
@@ -392,7 +399,7 @@ sub normal
 			}
 			
 			# rsfp check
-			return if $rspfcheck and !$self->rspfcheck(1, $field[7], $field[6]);
+#			return if $rspfcheck and !$self->rspfcheck(1, $field[7], $field[6]);
 
 			# if this is a 'nodx' node then ignore it
 			if ($badnode->in($field[7])) {
@@ -427,10 +434,6 @@ sub normal
 				dbg("PCPROT: useless 'BUSTED' spot") if isdbg('chanerr');
 				return;
 			}
-			if (Spot::dup($field[1], $field[2], $d, $field[5])) {
-				dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr');
-				return;
-			}
 			if ($censorpc) {
 				my @bad;
 				if (@bad = BadWords::check($field[5])) {
@@ -439,6 +442,7 @@ sub normal
 				}
 			}
 
+
 			my @spot = Spot::prepare($field[1], $field[2], $d, $field[5], $field[6], $field[7]);
 			# global spot filtering on INPUT
 			if ($self->{inspotsfilter}) {
@@ -448,7 +452,15 @@ sub normal
 					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($field[1], $field[2], $d, $field[5])) {
+				dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr');
+				return;
+			}
+
 			# add it 
 			Spot::add(@spot);
 
@@ -524,14 +536,10 @@ sub normal
 		
 		if ($pcno == 12) {		# announces
 
-			return if $rspfcheck and !$self->rspfcheck(1, $field[5], $field[1]);
+#			return if $rspfcheck and !$self->rspfcheck(1, $field[5], $field[1]);
 
 			# announce duplicate checking
 			$field[3] =~ s/^\s+//;  # remove leading blanks
-			if (AnnTalk::dup($field[1], $field[2], $field[3])) {
-				dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
-				return;
-			}
 
 			if ($censorpc) {
 				my @bad;
@@ -692,9 +700,8 @@ sub normal
 			# input filter if required
 			return unless $self->in_filter_route($parent);
 			
-			my @rout = $parent->del_user($uref);
-
-			$self->route_pc17($parent, @rout) if @rout;
+			$parent->del_user($uref);
+			$self->route_pc17($parent, $uref);
 			return;
 		}
 		
@@ -739,11 +746,18 @@ sub normal
 				eph_del_regex("^PC(?:21\^$call|17\^[^\^]+\^$call)");
 				
 				# check for sane parameters
-				$ver = 5000 if $ver eq '0000';
+#				$ver = 5000 if $ver eq '0000';
 				next if $ver < 5000; # only works with version 5 software
 				next if length $call < 3; # min 3 letter callsigns
 				next if $call eq $main::mycall;
 
+				# check that this PC19 isn't trying to alter the wrong dxchan
+				my $dxchan = DXChannel->get($call);
+				if ($dxchan && $dxchan != $self) {
+					dbg("PCPROT: PC19 from $self->{call} trying to alter wrong locally connected $call, ignored!") if isdbg('chanerr');
+					return;
+				}
+
 				# update it if required
 				my $r = Route::Node::get($call);
 				my $flags = Route::here($here)|Route::conf($conf);
@@ -816,6 +830,14 @@ sub normal
 				return;
 			}
 
+			# if I get a PC21 from the same callsign as self then treat it
+			# as a PC39: I have gone away
+			if ($call eq $self->call) {
+				$self->disconnect(1);
+				eph_del_regex("^PC(?:1[679]|21).*$field[1]");
+				return;
+			}
+
 			eph_del_regex("^PC1[79].*$call");
 			
 			my @rout;
@@ -826,16 +848,11 @@ sub normal
 				return;
 			}
 			if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me!
-				if ($call eq $self->{call}) {
-					dbg("PCPROT: Trying to disconnect myself with PC21") if isdbg('chanerr');
-					return;
-				}
-
 				my $node = Route::Node::get($call);
 				if ($node) {
 
-					my $dxchan = $node->dxchan;
-					if ($dxchan && $dxchan ne $self) {
+					my $dxchan = DXChannel->get($call);
+					if ($dxchan && $dxchan != $self) {
 						dbg("PCPROT: PC21 from $self->{call} trying to alter locally connected $call, ignored!") if isdbg('chanerr');
 						return;
 					}
@@ -967,11 +984,16 @@ sub normal
 		}
 		
 		if ($pcno == 34 || $pcno == 36) { # remote commands (incoming)
-			$self->process_rcmd($field[1], $field[2], $field[2], $field[3]);
+			if (eph_dup($line, $eph_pc34_restime)) {
+				dbg("PCPROT: dupe") if isdbg('chanerr');
+			} else {
+				$self->process_rcmd($field[1], $field[2], $field[2], $field[3]);
+			}
 			return;
 		}
 		
 		if ($pcno == 35) {		# remote command replies
+			eph_del_regex("^PC35\^$field[2]\^$field[1]\^");
 			$self->process_rcmd_reply($field[1], $field[2], $field[1], $field[3]);
 			return;
 		}
@@ -995,6 +1017,11 @@ sub normal
 		if ($pcno == 41) {		# user info
 			my $call = $field[1];
 
+			if (eph_dup($line, $eph_info_restime)) {
+				dbg("PCPROT: dupe") if isdbg('chanerr');
+				return;
+			}
+			
 			# input filter if required
 #			my $ref = Route::get($call) || Route->new($call);
 #			return unless $self->in_filter_route($ref);
@@ -1025,11 +1052,11 @@ sub normal
 			} elsif ($field[2] == 4) {
 				$user->homenode($field[3]);
 			} elsif ($field[2] == 5) {
-				if (is_qra($field[3])) {
-					my ($lat, $long) = DXBearing::qratoll($field[3]);
+				if (is_qra(uc $field[3])) {
+					my ($lat, $long) = DXBearing::qratoll(uc $field[3]);
 					$user->lat($lat);
 					$user->long($long);
-					$user->qra($field[3]);
+					$user->qra(uc $field[3]);
 				} else {
 					dbg('PCPROT: not a valid QRA locator') if isdbg('chanerr');
 					return;
@@ -1038,9 +1065,13 @@ sub normal
 			$user->lastoper($main::systime);   # to cut down on excessive for/opers being generated
 			$user->put;
 
+			unless ($self->{isolate}) {
+				DXChannel::broadcast_nodes($line, $self); # send it to everyone but me
+			}
+
 #  perhaps this IS what we want after all
 #			$self->route_pc41($ref, $call, $field[2], $field[3], $field[4]);
-#			return;
+			return;
 		}
 
 		if ($pcno == 43) {
@@ -1148,7 +1179,7 @@ sub normal
 				return;
 			}
 			@field = map { unpad($_) } @field;
-			if (WCY::dup($d,@field[3..7])) {
+			if (WCY::dup($d)) {
 				dbg("PCPROT: Dup WCY Spot ignored\n") if isdbg('chanerr');
 				return;
 			}
@@ -1157,7 +1188,7 @@ sub normal
 
 			my $rep;
 			eval {
-				$rep = Local::wwv($self, @field[1..12]);
+				$rep = Local::wcy($self, @field[1..12]);
 			};
 			# dbg("Local::wcy error $@") if isdbg('local') if $@;
 			return if $rep;
@@ -1447,6 +1478,11 @@ sub send_announce
 		}
 	}
 
+	if (AnnTalk::dup($_[0], $_[1], $_[2])) {
+		dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
+		return;
+	}
+
 	Log('ann', $target, $_[0], $text);
 
 	# send it if it isn't the except list and isn't isolated and still has a hop count
@@ -1770,7 +1806,7 @@ sub talk
 	
 	$line =~ s/\^/\\5E/g;			# remove any ^ characters
 	$self->send(DXProt::pc10($from, $to, $via, $line, $origin));
-	Log('talk', $self->call, $from, $via?$via:$main::mycall, $line) unless $origin && $origin ne $main::mycall;
+	Log('talk', $to, $from, $via?$via:$self->call, $line) unless $origin && $origin ne $main::mycall;
 }
 
 # send it if it isn't the except list and isn't isolated and still has a hop count
@@ -1892,12 +1928,13 @@ sub in_filter_route
 sub eph_dup
 {
 	my $s = shift;
+	my $t = shift || $eph_restime;
 	my $r;
 
 	# chop the end off
 	$s =~ s/\^H\d\d?\^?\~?$//;
 	$r = 1 if exists $eph{$s};    # pump up the dup if it keeps circulating
-	$eph{$s} = $main::systime;
+	$eph{$s} = $main::systime + $t;
 	return $r;
 }
 
@@ -1917,11 +1954,26 @@ sub eph_clean
 	my ($key, $val);
 	
 	while (($key, $val) = each %eph) {
-		if ($main::systime - $val > 180) {
+		if ($main::systime >= $val) {
 			delete $eph{$key};
 		}
 	}
 }
 
+sub eph_list
+{
+	my ($key, $val);
+	my @out;
+
+	while (($key, $val) = each %eph) {
+		push @out, $key, $val;
+	}
+	return @out;
+}
+
+sub run_cmd
+{
+	goto &DXCommandmode::run_cmd;
+}
 1;
 __END__