$pc9x_dupe_age = 60; # catch loops of circular (usually) D records
$pc10_dupe_age = 45; # just something to catch duplicate PC10->PC93 conversions
-$pc92_slug_changes = 60; # slug any changes going outward for this long
+$pc92_slug_changes = 60*5; # slug any changes going outward for this long
$last_pc92_slug = 0; # the last time we sent out any delayed add or del PC92s
$pc9x_time_tolerance = 15*60; # the time on a pc9x is allowed to be out by this amount
$pc9x_past_age = (122*60)+ # maximum age in the past of a px9x (a config record might be the only
# 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;
}
}
}
- 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);
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 @rout;
if ($call) {
+ my $ncall = $parent->call;
if ($is_node) {
- dbg("ROUTE: added node $call to " . $parent->call) if isdbg('routelow');
+ dbg("ROUTE: added node $call to $ncall") if isdbg('routelow');
@rout = $parent->add($call, $version, Route::here($here), $ip);
my $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");
+ }
} else {
- dbg("ROUTE: added user $call to " . $parent->call) if isdbg('routelow');
+ dbg("ROUTE: added user $call to $ncall") if isdbg('routelow');
@rout = $parent->add_user($call, Route::here($here), $ip);
- $dxchan->tell_buddies('loginb', $call, $parent->call) if $dxchan;
+ $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");
+ }
}
if ($pc92_slug_changes && $parent == $main::routeroot) {
$things_add{$call} = Route::get($call);
$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'