use Route;
use Route::Node;
use Script;
+use DXCIDR;
use strict;
+use warnings qw(all);
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
$pc9x_past_age = (122*60)+ # maximum age in the past of a px9x (a config record might be the only
$pc9x_time_tolerance; # thing a node might send - once an hour and we allow an extra hour for luck)
# this is actually the partition between "yesterday" and "today" but old.
-$senderverify = 1; # 1 - check for forged PC11 or PC61.
+$senderverify = 0; # 1 - check for forged PC11 or PC61.
# 2 - if forged, dump them.
return;
}
- # will we allow it at all?
- if ($censorpc) {
- my @bad;
- if (@bad = BadWords::check($pc->[3])) {
- dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
- return;
- }
- }
# is it for me or one of mine?
my ($from, $to, $via, $call, $dxchan);
# if this is a 'nodx' node then ignore it
if ($badnode->in($pc->[6]) || ($via && $badnode->in($via))) {
- dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr');
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Bad Node, dropped");
return;
}
my $nossid = $from;
$nossid =~ s/-\d+$//;
if ($badspotter->in($nossid)) {
- dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Bad Spotter, dropped");
return;
}
return;
}
}
+
+ # will we allow it at all?
+ if ($censorpc) {
+ my @bad;
+ if (@bad = BadWords::check($pc->[3])) {
+ my $bw = join ', ', @bad;
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Badwords: '$bw', dropped");
+ return;
+ }
+ }
# convert this to a PC93, coming from mycall with origin set and process it as such
$main::me->normal(pc93($to, $from, $via, $pc->[3], $pc->[6]));
}
my $last;
+my $pc11_saved;
+my $pc11_saved_time;
# DX Spot handling
sub handle_11
my $line = shift;
my $origin = shift;
my $pc = shift;
+ my $recurse = shift || 0;
# route 'foreign' pc26s
if ($pcno == 26) {
}
}
+ dbg("INPUT PC$pcno $line origin $origin recurse: $recurse") if isdbg("pc11") || isdbg("pc61");
+
# my ($hops) = $pc->[8] =~ /^H(\d+)/;
# 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 ($pc->[2] =~ /^\s*$/) {
- dbg("PCPROT: blank callsign, dropped") if isdbg('chanerr');
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: blank callsign, dropped");
return;
}
if ($pc->[2] =~ /[a-z]/) {
- dbg("PCPROT: lowercase characters, dropped") if isdbg('chanerr');
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: lowercase characters, dropped");
return;
}
# if this is a 'nodx' node then ignore it
if ($badnode->in($pc->[7])) {
- dbg("PCPROT: Bad Node $pc->[7], dropped") if isdbg('chanerr');
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Bad Node $pc->[7], dropped");
return;
}
my $nossid = $pc->[6];
$nossid =~ s/-\d+$//;
if ($badspotter->in($nossid)) {
- dbg("PCPROT: Bad Spotter $pc->[6], dropped") if isdbg('chanerr');
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Bad Spotter $pc->[6], dropped");
return;
}
+
# convert the date to a unix date
my $d = cltounix($pc->[3], $pc->[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 || $pcno == 61) && ($d < $main::systime - $pc11_max_age || $d > $main::systime + 900))) {
- dbg("PCPROT: Spot ignored, invalid date or out of range ($pc->[3] $pc->[4])\n") if isdbg('chanerr');
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Spot ignored, invalid date or out of range ($pc->[3] $pc->[4])\n");
return;
}
# is it 'baddx'
- if ($baddx->in($pc->[2]) || BadWords::check($pc->[2])) {
- dbg("PCPROT: Bad DX spot, ignored") if isdbg('chanerr');
+ if ($baddx->in($pc->[2])) {
+ dbg("PCPROT: Bad DX spot '$pc->[2]', ignored");
+ dbg($line) if isdbg('nologchan');
return;
}
$pc->[5] =~ s/^\s+//; # take any leading blanks off
$pc->[2] = unpad($pc->[2]); # take off leading and trailing blanks from spotted callsign
if ($pc->[2] =~ /BUST\w*$/) {
+ dbg($line) if isdbg('nologchan');
dbg("PCPROT: useless 'BUSTED' spot") if isdbg('chanerr');
return;
}
- if ($censorpc) {
- my @bad;
- if (@bad = BadWords::check($pc->[5])) {
- dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
- return;
- }
- }
my @spot = Spot::prepare($pc->[1], $pc->[2], $d, $pc->[5], $nossid, $pc->[7], $pc->[8]);
+ # check IP addresses
+ if (@$pc > 8 && is_ipaddr($pc->[8])) {
+ my $ip = $pc->[8];
+ $ip =~ s/,/:/g;
+ $ip =~ s/^::ffff://;
+ if (DXCIDR::find($ip)) {
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: $ip in badip list, dropped");
+ # sneakily put it into the dup list to prevent following PC11s also getting through :-)
+ Spot::dup(@spot[0..4,7]);
+ return;
+ }
+ }
+
# global spot filtering on INPUT
if ($self->{inspotsfilter}) {
my ($filter, $hops) = $self->{inspotsfilter}->it(@spot);
}
}
+ # this is where we decide to delay PC11s in the hope that a PC61 will be along soon.
+
+ my $key = join '|', @spot[0..2,4,7]; # not including text
+ unless ($recurse) {
+ if ($pcno == 61) {
+ if ($pc11_saved) {
+ if ($key eq $pc11_saved->[0]) {
+ dbg("saved PC11 spot $key dumped, better pc61 received") if isdbg("pc11");
+ undef $pc11_saved;
+ }
+ }
+ }
+ if ($pcno == 11) {
+ if ($pc11_saved) {
+ if ($key eq $pc11_saved->[0]) {
+ dbg("saved PC11 spot $key, dupe pc11 received and dumped") if isdbg("pc11");
+ return; # because it's a dup
+ }
+ }
+
+ # can we promote this to a PC61?
+ my $r = Route::User::get($spot[4]); # find spotter
+ if ($r && $r->ip) { # do we have an ip addres
+ $pcno = 61; # now turn this into a PC61
+ $spot[14] = $r->ip;
+ dbg("PC11 spot $key promoted to pc61 ip $spot[14]") if isdbg("pc11");
+ undef $pc11_saved;
+ }
+ }
+
+ if ($pc11_saved && $key ne $pc11_saved) {
+ dbg("saved PC11 spot $pc11_saved->[0] ne new key $key, recursing") if isdbg("pc11");
+ shift @$pc11_saved; # saved key
+ my $self = shift @$pc11_saved;
+ my @saved = @$pc11_saved;
+ undef $pc11_saved;
+ $self->handle_11(@saved, 1);
+ }
+
+ # if we are still a PC11, save it for a better offer
+ if ($pcno == 11) {
+ $pc11_saved = [$key, $self, $pcno, $line, $origin, $pc];
+ $pc11_saved_time = $main::systime;
+ dbg("saved new PC11 spot $key for a better offer") if isdbg("pc11");
+ return;
+ } else {
+ dbg("PC61 spot $key passed onward") if isdbg("pc11");
+ }
+ }
+
+
# 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 (my $key = Spot::dup(@spot[0..4,7])) {
+ if (Spot::dup(@spot[0..4,7])) {
dbg("PCPROT: Duplicate Spot $pc->[0] $key ignored\n") if isdbg('chanerr') || isdbg('dupespot');
return;
}
-
+
# here we verify the spotter is currently connected to the node it says it is one. AKA email sender verify
# but without the explicit probe to the node. We are relying on "historical" information, but it very likely
# to be current once we have seen the first PC92C from that node.
if ($s) {
my $action = $senderverify > 1 ? ", DUMPED" : '';
$s =~ s/, $//;
- dbg("PCProt: Suspicious Spot $pc->[2] on $pc->[1] by $pc->[6]($ip)\@$pc->[7] $s$action");
+ dbg("PCPROT: Suspicious Spot $pc->[2] on $pc->[1] by $pc->[6]($ip)\@$pc->[7] $s$action");
return unless $senderverify < 2;
}
}
}
+# we until here to do any censorship to try and reduce the amount of noise that repeated copies
+# from other connected nodes cause
+ if ($censorpc) {
+ my @bad;
+ if (@bad = BadWords::check($pc->[5])) {
+ my $bw = join ', ', @bad;
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Badwords: '$bw', dropped");
+ return;
+ }
+ }
+
# If is a new PC11, store it, releasing the one that is there (if any),
# if a PC61 comes along then dump the stored PC11
# If there is a different PC11 stored, release that one and store this PC11 instead,
# used to kick outstanding PC11 if required
sub pc11_process
{
-
+ if ($pc11_saved && $main::systime > $pc11_saved_time) {
+ dbg("saved PC11 spot $pc11_saved->[0] timed out waiting, recursing") if isdbg("pc11");
+ shift @$pc11_saved; # saved key
+ my $self = shift @$pc11_saved;
+ my @saved = @$pc11_saved;
+ undef $pc11_saved;
+ $self->handle_11(@saved, 1);
+ }
}
# announces
# announce duplicate checking
$pc->[3] =~ s/^\s+//; # remove leading blanks
- if ($censorpc) {
- my @bad;
- if (@bad = BadWords::check($pc->[3])) {
- dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
- return;
- }
- }
-
# if this is a 'nodx' node then ignore it
if ($badnode->in($pc->[5])) {
- dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr');
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Bad Node, dropped");
return;
}
my $nossid = $pc->[1];
$nossid =~ s/-\d+$//;
if ($badspotter->in($nossid)) {
- dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Bad Spotter, dropped");
return;
}
return;
}
+ if ($censorpc) {
+ my @bad;
+ if (@bad = BadWords::check($pc->[3])) {
+ my $bw = join ', ', @bad;
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Badwords: '$bw', dropped");
+ return;
+ }
+ }
+
+
my $dxchan;
if ((($dxchan = DXChannel::get($pc->[2])) && $dxchan->is_user) || $pc->[4] =~ /^[\#\w.]+$/){
my $parent = Route::Node::get($self->{call});
# record the type and version offered
- if (my ($version) = $pc->[1] =~ /DXSpider Version: (\d+\.\d+)/) {
- $self->{version} = 53 + $version;
- $self->user->version(53 + $version);
- $parent->version(0 + $version);
+ if (my ($version) = $pc->[1] =~ /(?:DXSpider|CC\s*Cluster)\s+Version: (\d+(?:\.\d+))/) {
+ $version += 0;
+ $version += 53 if $version < 6;
+ $self->{version} = $version;
+ $self->user->version($version);
+ $parent->version($version);
my ($build) = $pc->[1] =~ /Build: (\d+(?:\.\d+)?)/;
- $self->{build} = 0 + $build;
- $self->user->build(0 + $build);
- $parent->build(0 + $build);
+ $build += 0;
+ $self->{build} = $build;
+ $self->user->build($build);
+ $parent->build($build);
dbg("$self->{call} = DXSpider version $version build $build");
unless ($self->is_spider) {
dbg("Change U " . $self->user->sort . " C $self->{sort} -> S");
$self->send(pc20());
}
-sub check_add_node
+sub check_add_user
{
my $call = shift;
my $type = shift;
-
+ my $homenode = shift;
# add this station to the user database, if required (don't remove SSID from nodes)
my $user = DXUser::get_current($call);
unless ($user) {
$user = DXUser->new($call);
- $user->priv(1); # I have relented and defaulted nodes
- $user->lockout(1);
- $user->homenode($call);
- $user->node($call);
- $user->sort($type || 'A');
+ $user->sort($type || 'U');
+ if ($user->is_node) {
+ $user->priv(1); # I have relented and defaulted nodes
+ $user->lockout(1) if $user->is_node;
+ } else {
+ $user->homenode($homenode) if $homenode;
+ $user->node($homenode);
+ $user->priv(0);
+ }
$user->lastin($main::systime); # this make it last longer than just this invocation
$user->put; # just to make sure it gets written away!!!
+ dbg("DXProt: PC92 new user record for $call created");
+ }
+
+ # this is to fix a problem I introduced some build ago by using this function for users
+ # whereas it was only being used for nodes.
+ if ($user->is_user && $user->lockout && ($user->priv // 0) == 1) {
+ $user->priv(0);
+ $user->lockout(0);
+ dbg("DXProt: PC92 user record for $call depriv'd and unlocked");
+ $user->put;
}
return $user;
}
next;
}
- my $user = check_add_node($call);
+ my $user = check_add_user($call, 'A');
# if (eph_dup($genline)) {
# dbg("PCPROT: dup PC19 for $call detected") if isdbg('chanerr');
my $is_node = $flag & 4;
my $is_extnode = $flag & 2;
my $here = $flag & 1;
- my $ip = $part[3];
- $ip ||= $part[1] if $part[1] && $part[1] !~ /^\d+$/ && ($part[1] =~ /^(?:\d+\.)+/ || $part[1] =~ /^(?:(?:[abcdef\d]+)?,)+/);
- $ip =~ s/,/:/g if $ip;
- return ($call, $is_node, $is_extnode, $here, $part[1], $part[2], $ip);
+ my $version = $part[1] || 0;
+ my $build = $part[2] || 0;
+ my $ip = $part[3] || '';
+
+ # remember that, at this stage, IPV6 addresses have : replaced by ,
+ if (length $version > 4 && $version =~ /[,\.][\da-f]{1,4}/i) {
+ $ip = $version;
+ $version = 0;
+ }
+ $version =~ s/\D//g;
+ $version = 0 unless $version && $version =~ /^[0-9]+$/;
+ $build =~ s/^0\.//;
+ $build =~ s/\D//g;
+ $build = 0 unless $build && $build =~ /^[0-9]+$/;
+ if ($ip) {
+ $ip =~ s/,/:/g;
+ $ip =~ s/^::ffff://i;
+ $ip = '' unless is_ipaddr($ip);
+ }
+ dbg("'$icall' = '" . join("', '", $call, $is_node, $is_extnode, $here, $version, $build, $ip) . "'") if isdbg('pc92');
+ return ($call, $is_node, $is_extnode, $here, $version+0, $build+0, $ip);
}
# decode a pc92 call: flag call : version : build
$ip =~ s/:/,/g;
$extra .= ':' . $ip;
}
+
return "$flag$call$extra";
}
my @rout;
# remove spurious IPV6 prefix on IPV4 addresses
- $ip =~ s/^::ffff:// if $ip;
-
+ $build ||= 0;
+ $version ||= 0;
+
if ($call) {
my $ncall = $parent->call;
if ($ncall ne $call) {
my $user;
- unless (DXChannel::get($call)) { # i.e. external entity - create an user entry for it - ALL entities will appear in ALL user files from now on.
+ my $r;
+
+ # normalise call, delete any unnormalised calls in the users file.
+ # then ignore this thingy
+ my $normcall = normalise_call($call);
+ if ($normcall ne $call) {
+ next if DXChannel::get($call);
$user = DXUser::get($call);
- unless ($user) {
- $user = DXUser->new($call);
- dbg("PCProt::_add_thingy new user $call");
- }
+ dbg("DXProt::_add_thingy call $call normalised to $normcall, deleting spurious user $call");
+ $user->del if $user;
+ $call = $normcall; # this is safe because a route add will ignore duplicates
}
+
if ($is_node) {
dbg("ROUTE: added node $call to $ncall") if isdbg('routelow');
+ $user = check_add_user($call, 'A');
@rout = $parent->add($call, $version, Route::here($here), $ip);
- my $r = Route::Node::get($call);
+ $r = Route::Node::get($call);
$r->PC92C_dxchan($dxchan->call, $hops) if $r;
- if ($ip) {
- $r->ip($ip);
- Log('DXProt', "PC92A $call -> $ip on $ncall");
- }
- if ($user && $user->sort eq 'U') {
- if (defined $version) {
- if ($version >= 5455 && $build > 0 || $version >= 3000 ) {
- $user->sort('S');
- } else {
+ if ($version && is_numeric($version) && !$r->K && !$user->K) {
+ my $old = $user->sort;
+ if ($user->is_ak1a && (($version >= 5455 && $build > 0) || ($version >= 3000 && $version <= 3500)) ) {
+ $user->sort('S');
+ dbg("PCPROT::_add_thingy node $call v: $version b: $build sort ($old) updated to " . $user->sort);
+ } elsif ($user->is_spider && ($version < 3000 || ($version > 4000 && $version < 5455))) {
+ unless ($version > 0 && $build == 0) {
$user->sort('A');
+ $build ||= 0;
+ dbg("PCPROT::_add_thingy node $call v: $version b: $build sort ($old) downgraded to " . $user->sort);
}
- dbg("PCProt::_add_thingy node $call sort updated " . $user->sort15);
}
}
+ $r->version($user->version) if $user->version;
+ $r->build($user->build) if $user->build;
+ $r->K(1) if $user->K;
} else {
dbg("ROUTE: added user $call to $ncall") if isdbg('routelow');
- my $user = check_add_node($call, 'U');
+ $user = check_add_user($call, 'U', $parent->call);
@rout = $parent->add_user($call, Route::here($here), $ip);
$dxchan->tell_buddies('loginb', $call, $ncall) if $dxchan;
- my $r = Route::User::get($call);
- if ($ip) {
- $r->ip($ip);
- Log('DXProt', "PC92A $call -> $ip on $ncall");
- }
+ $r = Route::User::get($call);
+ }
+ if ($ip) {
+ $r->ip($ip);
+ Log('DXProt', "PC92A $call -> $ip on $ncall");
}
if ($pc92_slug_changes && $parent == $main::routeroot) {
$things_add{$call} = Route::get($call);
my ($call, $is_node, $is_extnode, $here, $version, $build) = @$slot;
if ($call && $is_node) {
if ($call eq $main::mycall) {
- dbg("PCPROT: $call looped back onto \$main::mycall ($main::mycall), ignored") if isdbg('chan');
+ LogDbg('err', "PCPROT: $self->{call} : $call looped back onto \$main::mycall ($main::mycall), ignored");
return;
}
if ($call eq $main::myalias) {
- dbg("PCPROT: $call looped back onto \$main::myalias ($main::myalias), ignored") if isdbg('chan');
+ LogDbg('err', "PCPROT: $self->{call} : $call looped back onto \$main::myalias ($main::myalias), ignored");
return;
}
# this is only accepted from my "self".
}
$parent->here(Route::here($here));
$parent->version($version || $pc19_version) if $version;
- $parent->build($build) if $build;
+ $parent->build($build) if $build;
$parent->PC92C_dxchan($self->{call}, $hops) unless $self->{call} eq $parent->call;
return ($parent, @radd);
}
# }
if ($pcall eq $main::mycall) {
- dbg("PCPROT: looped back, ignored") if isdbg('chan');
+ LogDbg('err', "PCPROT: looped back, ignored");
return;
}
if ($pcall eq $main::myalias) {
- dbg("PCPROT: looped back to \$myalias ($main::myalias), misconfiguration ignored") if isdbg('chan');
+ LogDbg('err', "PCPROT: looped back to \$myalias ($main::myalias), misconfiguration ignored");
return;
}
if (@dxchan) {
$_->send($line) for @dxchan;
} else {
- dbg("PCPROT: no return route, ignored") if isdbg('chanerr')
+ dbg("PCPROT: $self->{call} : type R no return route, ignored") if isdbg('chanerr') || isdbg('route');
}
} else {
- dbg("PCPROT: no return route, ignored") if isdbg('chanerr')
+ dbg("PCPROT: $self->{call} : type R no return route, ignored") if isdbg('chanerr') || isdbg('route');
}
}
return;
($parent, $add) = $self->pc92_handle_first_slot(\@ent, $parent, $t, $hops);
return unless $parent; # dupe
-
+
push @radd, $add if $add;
$parent->reset_obs;
- $parent->version($ent[4]) if $ent[4];
- if ($ent[5]) {
- $ent[5] =~ s/^0.//;
- $parent->build($ent[5]);
+ my $call = $parent->call;
+ my $version = $ent[4] || 0;
+ my $build = $ent[5] || 0;
+ $build =~ s/^0\.//;
+ my $oldbuild = $parent->build || 0;
+ my $oldversion = $parent->version || 0;
+ my $user = check_add_user($parent->call, 'S');
+ my $oldsort = $user->sort // '';
+
+ dbg("PCPROT: PC92 K v: $version ov: $oldversion b: $build ob: $oldbuild pk: " . ($parent->K || '0') . " uk: " . ($user->K || 0)) if isdbg('pc92k');
+
+ if (is_numeric($version) || is_numeric($build)) {
+ my $changed = 0;
+ if (($oldversion ne $version || $build ne $oldbuild)) {
+ dbg("PCPROT: PC92 K node $call updated version: $version (was $oldversion) build: $build (was $oldbuild)");
+ $user->version($parent->version($version));
+ $user->build($parent->build($build));
+ ++$changed;
+ }
+ if ($oldsort ne 'S') {
+ dbg("PCPROT: PC92 K node $call updated sort: $sort (was $oldsort)");
+ $user->sort('S');
+ ++$changed;
+ }
+ unless ($user->K) {
+ dbg("PCPROT: PC92 K node $call updated - marked as PC92 K user");
+ $user->K(1);
+ ++$changed;
+ }
+ $user->put if $changed;
+ $parent->K(1); # mark this as come in on a K
+ } else {
+ dbg("DXProt PC92 K version call $call: invalid version: '$version' or build: '$version', ignored");
}
-
- dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('obscount');
+ dbg("ROUTE: reset obscount on $call now " . $parent->obscount) if isdbg('obscount');
}
} elsif ($sort eq 'A' || $sort eq 'D' || $sort eq 'C') {
my $dxc;
next unless $_ && @$_;
if ($_->[0] eq $main::mycall) {
- dbg("PCPROT: $_->[0] refers to me, ignored") if isdbg('chanerr');
+ dbg("PCPROT: $self->{call} : type $sort $_->[0] refers to me, ignored") if isdbg('route');
+ next;
+ }
+ if ($_->[0] eq $main::myalias && $_->[1] || $_->[0] eq $main::mycall && $_->[1] == 0) {
+ LogDbg('err',"PCPROT: $self->{call} : type $sort $_->[0] trying to change type to " . $_->[1]?"Node":"User" . ", ignored");
next;
}
+
push @nent, $_;
}
push @users, $r->[0];
}
} else {
- dbg("PCPROT: pc92 call entry '$_' not decoded, ignored") if isdbg('chanerr');
+ dbg("PCPROT: $self->{call} : pc92 call entry '$_' not decoded, ignored") if isdbg('chanerr') || isdbg('route');
}
}
my $s = "ANNTALK: $from\@$onode$vs -> $to '$text' route: $origin";
dbg($s);
}
-
- # will we allow it at all?
- if ($censorpc) {
- my @bad;
- if (@bad = BadWords::check($text)) {
- dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
- return;
- }
- }
# if this is a 'bad spotter' user then ignore it
my $nossid = $from;
$nossid =~ s/-\d+$//;
if ($badspotter->in($nossid)) {
- dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Bad Spotter, dropped");
return;
}
return;
}
+ # will we allow it at all?
+ if ($censorpc) {
+ my @bad;
+ if (@bad = BadWords::check($text)) {
+ my $bw = join ', ', @bad;
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Badwords: '$bw', dropped");
+ return;
+ }
+ }
+
# if it is routeable then then treat it like a talk
my $ref = Route::get($to);
if ($ref) {
projects / spider.git / blobdiff