X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=14e7766de48c8a675330d4c75007434b517eede3;hb=b7512d7880245203710b640c2def9a102f069983;hp=c5d4bf4e756a77516b12080000f0bd14e7b37a63;hpb=ca46fb0822f3998466ffbe4c669271ee2af86859;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index c5d4bf4e..14e7766d 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -171,13 +171,13 @@ sub handle_11
 	# convert the date to a unix date
 	my $d = cltounix($_[3], $_[4]);
 	# bang out (and don't pass on) if date is invalid or the spot is too old (or too young)
-	if (!$d || ($pcno == 11 && ($d < $main::systime - $pc11_max_age || $d > $main::systime + 900))) {
+	if (!$d || (($pcno == 11 || $pcno == 61) && ($d < $main::systime - $pc11_max_age || $d > $main::systime + 900))) {
 		dbg("PCPROT: Spot ignored, invalid date or out of range ($_[3] $_[4])\n") if isdbg('chanerr');
 		return;
 	}
 
 	# is it 'baddx'
-	if ($baddx->in($_[2]) || BadWords::check($_[2]) || $_[2] =~ /COCK/) {
+	if ($baddx->in($_[2]) || BadWords::check($_[2])) {
 		dbg("PCPROT: Bad DX spot, ignored") if isdbg('chanerr');
 		return;
 	}
@@ -197,7 +197,7 @@ sub handle_11
 		}
 	}
 
-	my @spot = Spot::prepare($_[1], $_[2], $d, $_[5], $nossid, $_[7]);
+	my @spot = Spot::prepare($_[1], $_[2], $d, $_[5], $nossid, $_[7], $_[8]);
 	# global spot filtering on INPUT
 	if ($self->{inspotsfilter}) {
 		my ($filter, $hops) = $self->{inspotsfilter}->it(@spot);
@@ -321,6 +321,12 @@ sub handle_12
 		return;
 	}
 
+	# ignore PC12s from origins that use PCxx protocol
+	my $oref = Route::get($origin);
+	if ($oref->do_pc9x) {
+		dbg("PCPROT: PC12 rxed from PC9x node, ignored") if isdbg('chanerr');
+		return;
+	}
 
 	my $dxchan;
 
@@ -1987,8 +1993,8 @@ sub handle_93
 		$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';
 	} elsif (!is_callsign($to) && $text =~ /^#\d+ /) {
-		# chat messages to non-pc9x nodes
-		$self->send_chat(1, pc12($from, $text, undef, $to, undef, $pcall), $from, '*', $text, $to, $pcall, '0');
+		# chat messages really only locally connected users
+		$self->send_chat(1, $line, $from, '*', $text, $to, $pcall, '0');
 	}
 
 	# broadcast this chat sentence everywhere unless it is targetted to 'LOCAL'