$line++;
chomp $l;
next if $l =~ /^\s*#/o or $l =~ /^\s*$/o;
- my ($min, $hour, $mday, $month, $wday, $cmd) = $l =~ /^\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.+)$/o;
+ my ($min, $hour, $mday, $month, $wday, $cmd) = $l =~ /^\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.+)$/;
next unless defined $min;
my $ref = bless {};
my $err = '';
# handle '*' values
if ($val eq '*') {
$ref->{$sort} = 0;
- return;
+ return '';
}
# handle comma delimited values
}
$ref->{$sort} = \@req;
- return;
+ return '';
}
# process the cronjobs
last if $pkg =~ /Mojo/;
# say "*** in dbgtrace $i after mojo";
$_isdbg = 'trace';
- dbg("Stack ($i): $pkg::$subr in $fn line: $l");
+ dbg("Stack ($i): ${pkg}::$subr in $fn line: $l");
}
$_isdbg = '';
}
%pc92_find $pc92_find_timeout $pc92_short_update_period
$next_pc92_obs_timeout $pc92_slug_changes $last_pc92_slug
$pc92_extnode_update_period $pc50_interval
- $pc92_keepalive_period
+ $pc92_keepalive_period $senderverify
);
$pc11_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc11
$pc92_keepalive_period = 1*60*60; # frequency of PC92 K (keepalive) records
%pc92_find = (); # outstanding pc92 find operations
$pc92_find_timeout = 30; # maximum time to wait for a reply
+$senderverify = 1; # 1 = check spotter is on node it says it is and check ip address if available
+ # 2 = do 1 and dump if check
@checklist =
$eph_pc15_restime $pc9x_past_age $pc9x_dupe_age
$pc10_dupe_age $pc92_slug_changes $last_pc92_slug
$pc92Ain $pc92Cin $pc92Din $pc92Kin $pc9x_time_tolerance
- $pc92filterdef
+ $pc92filterdef $senderverify
);
$pc9x_dupe_age = 60; # catch loops of circular (usually) D records
$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.
+ # 2 - if forged, dump them.
+
$pc92filterdef = bless ([
# tag, sort, field, priv, special parser
dbg("PCPROT: Bad Spotter $pc->[6], dropped") if isdbg('chanerr');
return;
}
-# unless (is_ipaddr($pc->[8]) || DXUser::get_current($pc->[6])) {
-# dbg("PCPROT: Unknown Spotter $pc->[6], dropped") if isdbg('chanerr');
-# return;
-# }
# convert the date to a unix date
my $d = cltounix($pc->[3], $pc->[4]);
return;
}
}
+
my @spot = Spot::prepare($pc->[1], $pc->[2], $d, $pc->[5], $nossid, $pc->[7], $pc->[8]);
}
}
- # 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,
- my $key = join '|', @spot[0..2,4,7];
- if (0) {
-
- if ($pc->[0] eq 'PC11') {
- my $r = [$main::systime, $key, \@spot, $line, $origin, $pc];
- if (!$last) {
- $last = [$main::systime, $key, \@spot, $line, $origin, $pc];
- dbg("PC11: $origin -> $key stored") if isdbg('pc11');
- return;
- } elsif ($key eq $last->[1]) { # same as last one
- dbg("PC11: $origin -> $key dupe dropped") if isdbg('pc11');
- return;
- } else {
- # it's a different PC11, kick the stored one onward and store this one instead,
- dbg("PC11: PC11 new $origin -> $key stored, $last->[4] -> $last->[1] passed onward") if isdbg('pc11');
- @spot = @{$last->[2]};
- $line = $last->[3];
- $origin = $last->[4];
- $pc = $last->[5];
- $last = $r;
- }
- } elsif ($pc->[0] eq 'PC61') {
- if ($last) {
- if ($last->[1] eq $key) {
- # dump $last and proceed with the PC61
- dbg("PC11: $origin -> $key dropped in favour of PC61") if isdbg('pc11');
- undef $last;
- } else {
- # it's a different spot send out stored pc11
- dbg("PC11: last $last->[4] -> $last->[1] different PC61 $origin -> $key, send PC11 first ") if isdbg('pc11');
- $last->[1] = 'new pc61';
- handle_11($self, 11, $last->[3], $last->[4], $last->[5]);
- undef $last;
- dbg("PC11: now process PC61 $origin -> $key") if isdbg('pc11');
- }
- }
- } else {
- dbg("PC11: Unexpected line '$line' in bagging area (expecting PC61, PC11), ignored");
- return;
- }
-
-}
-
# 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 (Spot::dup(@spot[0..4,5])) {
+ if (my $key = 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.
+ #
+ # As for spots generated from non-PC92 nodes, we'll see after about do_pc9x3h20m...
+ #
+ if ($senderverify) {
+ my $nroute = Route::Node::get($pc->[7]);
+ my $uroute = Route::Node::get($pc->[6]);
+ my $local = DXChannel::get($pc->[7]);
+
+ if ($nroute && ($nroute->last_PC92C || ($local && !$local->do_pc9x))) {
+ my $s = '';
+ my $ip = $pcno == 61 ? $pc->[8] : '';
+# $s .= "User $pc->[6] not logged in, " unless $uroute;
+ $s .= "User $pc->[6] not on node $pc->[7], " unless $nroute->is_user($pc->[6]);
+# $s .= "Node $pc->[7] at '$ip' not on Node's IP " . $nroute->ip if $ip && $nroute && $nroute->ip && $nroute->ip ne $ip;
+ 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");
+ return unless $senderverify < 2;
+ }
+ }
+ }
+
+ # 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,
# add it
Spot::add(@spot);
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.
+ $user = DXUser::get($call);
+ unless ($user) {
+ $user = DXUser->new($call);
+ dbg("PCProt::_add_thingy new user $call");
+ }
+ }
if ($is_node) {
dbg("ROUTE: added node $call to $ncall") if isdbg('routelow');
@rout = $parent->add($call, $version, Route::here($here), $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 {
+ $user->sort('A');
+ }
+ dbg("PCProt::_add_thingy node $call sort updated " . $user->sort15);
+ }
+ }
} else {
dbg("ROUTE: added user $call to $ncall") if isdbg('routelow');
my $user = check_add_node($call, 'U');
$things_add{$call} = Route::get($call);
delete $things_del{$call};
}
- } else {
+ $user->close($main::systime, $ip) if $user; # this just updates lastseen and the connlist list containing the IP address
+ } else {
dbgprintring(10) if isdbg('nologchan');
dbg("DXProt::add_thingy: Trying to add parent $call to itself $ncall, ignored");
}
push @radd, $add if $add;
$parent->reset_obs;
$parent->version($ent[4]) if $ent[4];
- $parent->build($ent[5]) if $ent[5];
+ if ($ent[5]) {
+ $ent[5] =~ s/^0.//;
+ $parent->build($ent[5]);
+ }
dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('obscount');
}
--- /dev/null
+#
+# Polled Timer handling
+#
+# This uses callbacks. BE CAREFUL!!!!
+#
+#
+#
+# Copyright (c) 2001 Dirk Koopman G1TLH
+#
+
+package DXTimer;
+
+use Mojo::IOLoop;
+
+use vars qw(@timerchain $notimers $lasttime);
+use DXDebug;
+
+@timerchain = ();
+$notimers = 0;
+
+$lasttime = 0;
+
+sub new
+{
+ my ($pkg, $time, $proc, $recur) = @_;
+ my $obj = ref($pkg);
+ my $class = $obj || $pkg;
+ my $self = bless { t=>$time + $main::systime, proc=>$proc }, $class;
+ $self->{interval} = $time if $recur;
+ push @timerchain, $self;
+ $notimers = @timerchain;
+ dbg("Timer created (notimers: $notimers)") if isdbg('connll');
+ return $self;
+}
+
+sub del
+{
+ my $self = shift;
+ delete $self->{proc};
+ @timerchain = grep {$_ != $self} @timerchain;
+ $notimers = @timerchain;
+ dbg("Timer deleted (notimers: $notimers)") if isdbg('connll');
+}
+
+sub handler
+{
+ my $now = $main::systime;
+
+ return unless $now != $lasttime;
+
+ # handle things on the timer chain
+ my $t;
+ foreach $t (@timerchain) {
+ if ($now >= $t->{t}) {
+ &{$t->{proc}}();
+ $t->{t} = $now + $t->{interval} if exists $t->{interval};
+ }
+ }
+
+ $lasttime = $now;
+}
+
+sub DESTROY
+{
+ dbg("timer destroyed ($DXTimer::notimers)") if isdbg('connll');
+}
+1;
$b->{$call} = shift if @_;
return $b->{$call};
}
+
+sub registered
+{
+ my $self = shift;
+ if (exists $self->{registered}) {
+ return $self->{registered} || 0;
+ }
+ return ''; # to stop undef warnings
+}
+
1;
__END__
use File::Copy;
use Data::Dumper;
use Time::HiRes qw(gettimeofday tv_interval);
+use Text::Wrap;
use strict;
# format a prompt with its current value and return it with its privilege
sub promptf
{
- my ($line, $value) = @_;
+ my ($line, $value, $promptl) = @_;
my ($priv, $prompt, $action) = split ',', $line;
# if there is an action treat it as a subroutine and replace $value
} elsif (ref $value) {
$value = dd($value);
}
- $prompt = sprintf "%15s: %s", $prompt, $value;
+ $promptl ||= 15;
+ $prompt = sprintf "%${promptl}s: %s", $prompt, $value;
return ($priv, $prompt);
}
sub parray
{
my $ref = shift;
- return ref $ref ? join(', ', @{$ref}) : $ref;
+ return ref $ref ? join(', ', sort @{$ref}) : $ref;
}
# take the arg as an array reference and print as a list of pairs
my $ref = shift;
my $out;
- while (my ($k,$v) = each %$ref) {
- $out .= "${k}=>$v, ";
+ while (my $k = sort keys %$ref) {
+ $out .= "${k}=>$ref->{$k}, ";
}
- chop $out; # remove last space
- chop $out; # remove last comma
+ $out =~ s/, $// if $out;
return $out;
}
my @fields = $ref->fields;
my $field;
my $width = $self->width - 1;
+ my $promptl = 0;
$width ||= 80;
+ # find the maximum length of the prompt
+ foreach $field (@fields) {
+ if (defined $ref->{$field}) {
+ my (undef, $prompt, undef) = split ',', $ref->field_prompt($field);
+ $promptl = length $prompt if length $prompt > $promptl;
+ }
+ }
+
+ # now do print
foreach $field (sort {_sort_fields($ref, $a, $b)} @fields) {
if (defined $ref->{$field}) {
- my ($priv, $ans) = promptf($ref->field_prompt($field), $ref->{$field});
+ my ($priv, $ans) = promptf($ref->field_prompt($field), $ref->{$field}, $promptl);
my @tmp;
if (length $ans > $width) {
+ $Text::Wrap::columns = $width-2;
my ($p, $a) = split /: /, $ans, 2;
- my $l = (length $p) + 2;
- my $al = ($width - 1) - $l;
- my $bit;
- while (length $a > $al ) {
- ($bit, $a) = unpack "A$al A*", $a;
- push @tmp, "$p: $bit";
- $p = ' ' x ($l - 2);
- }
- push @tmp, "$p: $a" if length $a;
+ @tmp = split/\n/, Text::Wrap::wrap("$p: ", (' ' x $promptl) . ': ', $a);
} else {
push @tmp, $ans;
}
[A-Z]{1,8} # callsign letters (required)
(?:-(?:\d{1,2}))? # - nn possibly (eg G8BPQ-8)
(?:/[0-9A-Z]{1,7})? # / another prefix, callsign or special label (including /MM, /P as well as /EURO or /LGT) possibly
- $!x;
+ (?:/(?:AM?|MM?|P))? # finally /A /AM /M /MM /P
+ $!xo;
- # longest callign allowed is 1X11/1Y11XXXXX-11/XXXXXXX
+ # longest callign allowed is 1X11/1Y11XXXXX-11/XXXXXXX/MM
}
sub is_prefix
use DXVars;
use DXUtil;
use DXDebug;
+use DXTimer;
+
use IO::File;
use IO::Socket;
use IPC::Open3;
dbg("connect $conn->{cnum}: timeout set to $val") if isdbg('connect');
$conn->{timeout}->del if $conn->{timeout};
$conn->{timeval} = $val;
- $conn->{timeout} = Timer->new($val, sub{ &_timedout($conn) });
+ $conn->{timeout} = DXTimer->new($val, sub{ &_timedout($conn) });
}
use DXVars;
use DXUtil;
use DXDebug;
+use DXTimer;
+
use IO::File;
use IO::Socket;
use IPC::Open3;
dbg("connect $conn->{cnum}: timeout set to $val") if isdbg('connect');
$conn->{timeout}->del if $conn->{timeout};
$conn->{timeval} = $val;
- $conn->{timeout} = Timer->new($val, sub{ &_timedout($conn) });
+ $conn->{timeout} = DXTimer->new($val, sub{ &_timedout($conn) });
}
sub _dolineend
use Mojo::IOLoop::Stream;
use DXDebug;
-use Timer;
+use DXTimer;
use vars qw($now %conns $noconns $cnum $total_in $total_out $total_lines_in $total_lines_out $connect_timeout $disc_waittime);
return @out;
}
+# is a user on this node
+sub is_user
+{
+ my $self = shift;
+ my $call = shift;
+ return scalar grep {$_ eq $call} @{$self->{users}};
+}
+
sub usercount
{
my $self = shift;
return $self->_dellist('parent', @_);
}
-
-
#
# generic AUTOLOAD for accessors
#
# enter the spot for dup checking and return true if it is already a dup
sub dup
{
- my ($freq, $call, $d, $text, $by, $cty) = @_;
+ my ($freq, $call, $d, $text, $by, $node) = @_;
# dump if too old
return 2 if $d < $main::systime - $dupage;
chomp $text;
$text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
$text = uc unpad($text);
- if ($cty && $text && length $text <= 4) {
- unless ($text =~ /^C?Q/ || $text =~ /^[\d\W]+$/) {
- my @try = Prefix::cty_data($text);
- $text = "" if $cty == $try[0];
- }
- }
my $otext = $text;
# $text = Encode::encode("iso-8859-1", $text) if $main::can_encode && Encode::is_utf8($text, 1);
$text =~ s/^\+\w+\s*//; # remove leading LoTW callsign
$text =~ s/\s{2,}[\dA-Z]?[A-Z]\d?$// if length $text > 24;
$text =~ s/[\W\x00-\x2F\x7B-\xFF]//g; # tautology, just to make quite sure!
$text = substr($text, 0, $duplth) if length $text > $duplth;
- my $ldupkey = "X$freq|$call|$by|$text";
+ my $ldupkey = "X$|$call|$by|$node|$freq|$d||$text";
my $t = DXDupe::find($ldupkey);
- return 1 if $t && $t - $main::systime > 0;
+ return $ldupkey if $t && $t - $main::systime > 0;
+
DXDupe::add($ldupkey, $main::systime+$dupage);
$otext = substr($otext, 0, $duplth) if length $otext > $duplth;
$otext =~ s/\s+$//;
return 1 if $t && $t - $main::systime > 0;
DXDupe::add($ldupkey, $main::systime+$dupage);
}
- return 0;
+ return undef;
}
sub listdups
+++ /dev/null
-#
-# Polled Timer handling
-#
-# This uses callbacks. BE CAREFUL!!!!
-#
-#
-#
-# Copyright (c) 2001 Dirk Koopman G1TLH
-#
-
-package Timer;
-
-use Mojo::IOLoop;
-
-use vars qw(@timerchain $notimers $lasttime);
-use DXDebug;
-
-@timerchain = ();
-$notimers = 0;
-
-$lasttime = 0;
-
-sub new
-{
- my ($pkg, $time, $proc, $recur) = @_;
- my $obj = ref($pkg);
- my $class = $obj || $pkg;
- my $self = bless { t=>$time + $main::systime, proc=>$proc }, $class;
- $self->{interval} = $time if $recur;
- push @timerchain, $self;
- $notimers = @timerchain;
- dbg("Timer created (notimers: $notimers)") if isdbg('connll');
- return $self;
-}
-
-sub del
-{
- my $self = shift;
- delete $self->{proc};
- @timerchain = grep {$_ != $self} @timerchain;
- $notimers = @timerchain;
- dbg("Timer deleted (notimers: $notimers)") if isdbg('connll');
-}
-
-sub handler
-{
- my $now = $main::systime;
-
- return unless $now != $lasttime;
-
- # handle things on the timer chain
- my $t;
- foreach $t (@timerchain) {
- if ($now >= $t->{t}) {
- &{$t->{proc}}();
- $t->{t} = $now + $t->{interval} if exists $t->{interval};
- }
- }
-
- $lasttime = $now;
-}
-
-sub DESTROY
-{
- dbg("timer destroyed ($Timer::notimers)") if isdbg('connll');
-}
-1;
use BBS;
use WCY;
use BadWords;
-use Timer;
+use DXTimer;
use Route;
use Route::Node;
use Route::User;
DXCron::process(); # do cron jobs
RBN::process();
- Timer::handler();
+ DXTimer::handler();
DXLog::flushall();
}
--- /dev/null
+#!/bin/bash
+. ~/perl5/perlbrew/etc/bashrc
+cd /spider/perl
+git reset --hard
+git pull
+~/perl5/perlbrew/perls/perl-5.32.1/bin/perl -w cluster.pl > /dev/null
+
projects / spider.git / commitdiff