X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=bd34278f6485310d5c928f410978c43813ae6f17;hb=19b253010e430d711fdf73c1176179f35d6d30a2;hp=f6e1e75dc86c0ff093348eb945ab2db35141e711;hpb=7b125939d7c1542f951286e03c28f9cddbfe4fce;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index f6e1e75d..bd34278f 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -208,7 +208,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 +238,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 +259,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 +396,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])) {
@@ -415,7 +419,7 @@ sub normal
 			}
 
 			# is it 'baddx'
-			if ($baddx->in($field[2]) || BadWords::check($field[2])) {
+			if ($baddx->in($field[2]) || BadWords::check($field[2]) || $field[2] =~ /COCK/) {
 				dbg("PCPROT: Bad DX spot, ignored") if isdbg('chanerr');
 				return;
 			}
@@ -427,10 +431,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])) {
@@ -449,6 +449,11 @@ sub normal
 				}
 			}
 			
+			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 +529,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;
@@ -739,7 +740,7 @@ 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;
@@ -1447,6 +1448,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 +1776,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