projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix chat problem introdcued last update
[spider.git]
/
perl
/
DXProtHandle.pm
diff --git
a/perl/DXProtHandle.pm
b/perl/DXProtHandle.pm
index c5d4bf4e756a77516b12080000f0bd14e7b37a63..213e9b4008053d0d7eeb2efdfb1838f2f3c7730e 100644
(file)
--- 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)
# 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'
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;
}
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);
# global spot filtering on INPUT
if ($self->{inspotsfilter}) {
my ($filter, $hops) = $self->{inspotsfilter}->it(@spot);
@@
-321,6
+321,12
@@
sub handle_12
return;
}
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;
my $dxchan;