use DXLog;
use Spot;
use DXProtout;
+use DXDebug;
+use Local;
+
use Carp;
use strict;
-use vars qw($me $pc11_max_age $pc11_dup_age %dup $last_hour %pings %rcmds %nodehops);
+use vars qw($me $pc11_max_age $pc11_dup_age $pc23_dup_age %spotdup %wwvdup $last_hour %pings %rcmds %nodehops);
$me = undef; # the channel id for this cluster
$pc11_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc11
-$pc11_dup_age = 24*3600; # the maximum time to keep the dup list for
-%dup = (); # the pc11 and 26 dup hash
+$pc11_dup_age = 24*3600; # the maximum time to keep the spot dup list for
+$pc23_dup_age = 24*3600; # the maximum time to keep the wwv dup list for
+%spotdup = (); # the pc11 and 26 dup hash
+%wwvdup = (); # the pc23 and 27 dup hash
$last_hour = time; # last time I did an hourly periodic update
%pings = (); # outstanding ping requests outbound
%rcmds = (); # outstanding rcmd requests outbound
do "$main::data/hop_table.pl" if -e "$main::data/hop_table.pl";
confess $@ if $@;
# $me->{sort} = 'M'; # M for me
+
+ # now prime the spot duplicates file with today's and yesterday's data
+ my @today = Julian::unixtoj(time);
+ my @spots = Spot::readfile(@today);
+ @today = Julian::sub(@today, 1);
+ push @spots, Spot::readfile(@today);
+ for (@spots) {
+ my $dupkey = "$_->[0]$_->[1]$_->[2]$_->[3]$_->[4]";
+ $spotdup{$dupkey} = $_->[2];
+ }
+
+ # now prime the wwv duplicates file with just this month's data
+ my @wwv = Geomag::readfile(time);
+ for (@wwv) {
+ my $dupkey = "$_->[1].$_->[2]$_->[3]$_->[4]";
+ $wwvdup{$dupkey} = $_->[1];
+ }
+
}
#
return unless $pcno;
return if $pcno < 10 || $pcno > 51;
+ # local processing 1
+ my $pcr;
+ eval {
+ $pcr = Local::pcprot($self, $pcno, @field);
+ };
+ dbg('local', "Local::pcprot error $@") if $@;
+ return if $pcr;
+
SWITCH: {
if ($pcno == 10) { # incoming talk
# convert the date to a unix date
my $d = cltounix($field[3], $field[4]);
- return if !$d || ($pcno == 11 && $d < $main::systime - $pc11_max_age); # bang out (and don't pass on) if date is invalid or the spot is too old
-
+ # bang out (and don't pass on) if date is invalid or the spot is too old
+ if (!$d || ($pcno == 11 && $d < $main::systime - $pc11_max_age)) {
+ dbg('chan', "Spot ignored, invalid date or too old\n");
+ return;
+ }
+
# strip off the leading & trailing spaces from the comment
my $text = unpad($field[5]);
$spotter =~ s/-\d+$//o; # strip off the ssid from the spotter
# do some de-duping
- my $dupkey = "$field[1]$field[2]$d$text$field[6]";
- return if $dup{$dupkey};
- $dup{$dupkey} = $d;
+ my $freq = $field[1] - 0;
+ my $dupkey = "$freq$field[2]$d$text$spotter";
+ if ($spotdup{$dupkey}) {
+ dbg('chan', "Duplicate Spot ignored\n");
+ return;
+ }
+
+ $spotdup{$dupkey} = $d;
- my $spot = Spot::add($field[1], $field[2], $d, $text, $spotter);
+ my $spot = Spot::add($freq, $field[2], $d, $text, $spotter, $field[7]);
+ # local processing
+ my $r;
+ eval {
+ $r = Local::spot1($self, $freq, $field[2], $d, $text, $spotter, $field[7]);
+ };
+ dbg('local', "Local::spot1 error $@") if $@;
+ return if $r;
+
# send orf to the users
if ($spot && $pcno == 11) {
my $buf = Spot::formatb($field[1], $field[2], $d, $text, $spotter);
broadcast_users("$buf\a\a");
}
+
+ # DON'T be silly and send on PC26s!
+ return if $pcno == 26;
last SWITCH;
}
if ($pcno == 16) { # add a user
my $node = DXCluster->get_exact($field[1]);
last SWITCH if !$node; # ignore if havn't seen a PC19 for this one yet
+ last SWITCH unless $node->isa('DXNode');
my $i;
for ($i = 2; $i < $#field; $i++) {
- my ($call, $confmode, $here) = $field[$i] =~ /^(\S+) (-) (\d)/o;
- next if length $call < 3;
+ my ($call, $confmode, $here) = $field[$i] =~ /^(\S+) (\S) (\d)/o;
+ next if length $call < 3 || length $call > 8;
next if !$confmode;
$call = uc $call;
next if DXCluster->get_exact($call); # we already have this (loop?)
$self->send_local_config();
$self->send(pc20());
$self->state('init');
- last SWITCH;
+ return; # we don't pass these on
}
if ($pcno == 19) { # incoming cluster list
}
if ($pcno == 23 || $pcno == 27) { # WWV info
- Geomag::update(@field[1..$#field]);
+ # do some de-duping
+ my $d = cltounix($field[1], sprintf("%02d18Z", $field[2]));
+ my $sfi = unpad($field[3]);
+ my $k = unpad($field[4]);
+ my $i = unpad($field[5]);
+ my $dupkey = "$d.$sfi$k$i";
+ if ($wwvdup{$dupkey}) {
+ dbg('chan', "Dup WWV Spot ignored\n");
+ return;
+ }
+
+ $wwvdup{$dupkey} = $d;
+ Geomag::update($field[1], $field[2], $sfi, $k, $i, @field[6..$#field]);
+
+ my $r;
+ eval {
+ $r = Local::wwv2($self, $field[1], $field[2], $sfi, $k, $i, @field[6..$#field]);
+ };
+ dbg('local', "Local::wwv2 error $@") if $@;
+ return if $r;
+
+ # DON'T be silly and send on PC27s!
+ return if $pcno == 27;
+
last SWITCH;
}
last SWITCH;
}
- if ($pcno == 25) {
- last SWITCH;
+ if ($pcno == 25) { # merge request
+ unless ($field[1] eq $main::mycall) {
+ dbg('chan', "merge request to $field[1] from $field[2] ignored");
+ return;
+ }
+
+ Log('DXProt', "Merge request for $field[3] spots and $field[4] WWV from $field[1]");
+
+ # spots
+ if ($field[3] > 0) {
+ my @in = reverse Spot::search(1, undef, undef, 0, $field[3]-1);
+ my $in;
+ foreach $in (@in) {
+ $self->send(pc26(@{$in}[0..4], $in->[7]));
+ }
+ }
+
+ # wwv
+ if ($field[4] > 0) {
+ my @in = reverse Geomag::search(0, $field[4], time, 1);
+ my $in;
+ foreach $in (@in) {
+ $self->send(pc27(@{$in}));
+ }
+ }
+ return;
}
if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42 || $pcno == 49) { # mail/file handling
my $cutoff;
if ($main::systime - 3600 > $last_hour) {
$cutoff = $main::systime - $pc11_dup_age;
- while (($key, $val) = each %dup) {
- delete $dup{$key} if $val < $cutoff;
+ while (($key, $val) = each %spotdup) {
+ delete $spotdup{$key} if $val < $cutoff;
+ }
+ $cutoff = $main::systime - $pc23_dup_age;
+ while (($key, $val) = each %wwvdup) {
+ delete $wwvdup{$key} if $val < $cutoff;
}
$last_hour = $main::systime;
}
my $node;
foreach $node (@gonenodes) {
- next if $node->call eq $call;
- broadcast_ak1a(pc21($node->call, 'Gone'), $self) unless $self->{isolate}; # done like this 'cos DXNodes don't have a pc21 method
+ next if $node->call eq $call;
+ broadcast_ak1a(pc21($node->call, 'Gone') , $self) unless $self->{isolate};
$node->del();
}
my @s = $me->pc19(@nodes);
for (@s) {
my $routeit = adjust_hops($self, $_);
- $self->send($_) if $routeit;
+ $self->send($routeit) if $routeit;
}
# get all the users connected on the above nodes and send them out
my @s = pc16($n, @users);
for (@s) {
my $routeit = adjust_hops($self, $_);
- $self->send($_) if $routeit;
+ $self->send($routeit) if $routeit;
}
}
}
if ($dxchan) {
my $routeit = adjust_hops($dxchan, $line); # adjust its hop count by node name
if ($routeit) {
- $dxchan->send($line) if $dxchan;
+ $dxchan->send($routeit) if $dxchan;
}
}
}
# send it if it isn't the except list and isn't isolated and still has a hop count
foreach $dxchan (@dxchan) {
next if grep $dxchan == $_, @except;
- my $routeit = adjust_hops($dxchan, $s); # adjust its hop count by node name
- $dxchan->send($s) unless $dxchan->{isolate} || !$routeit;
+ my $routeit = adjust_hops($dxchan, $s); # adjust its hop count by node name
+ $dxchan->send($routeit) unless $dxchan->{isolate} || !$routeit;
}
}
sub adjust_hops
{
my $self = shift;
+ my $s = shift;
my $call = $self->{call};
my $hops;
- if (($hops) = $_[0] =~ /\^H(\d+)\^~?$/o) {
- my ($pcno) = $_[0] =~ /^PC(\d\d)/o;
- confess "$call called adjust_hops with '$_[0]'" unless $pcno;
+ if (($hops) = $s =~ /\^H(\d+)\^~?$/o) {
+ my ($pcno) = $s =~ /^PC(\d\d)/o;
+ confess "$call called adjust_hops with '$s'" unless $pcno;
my $ref = $nodehops{$call} if %nodehops;
if ($ref) {
my $newhops = $ref->{$pcno};
- return 0 if defined $newhops && $newhops == 0;
+ return "" if defined $newhops && $newhops == 0;
$newhops = $ref->{default} unless $newhops;
- return 0 if defined $newhops && $newhops == 0;
+ return "" if defined $newhops && $newhops == 0;
$newhops = $hops if !$newhops;
- $_[0] =~ s/\^H(\d+)(\^~?)$/\^H$newhops$2/ if $newhops;
+ $s =~ s/\^H(\d+)(\^~?)$/\^H$newhops$2/ if $newhops;
} else {
# simply decrement it
$hops--;
- return 0 if !$hops;
- $_[0] =~ s/\^H(\d+)(\^~?)$/\^H$hops$2/ if $hops;
+ return "" if !$hops;
+ $s =~ s/\^H(\d+)(\^~?)$/\^H$hops$2/ if $hops;
}
}
- return 1;
+ return $s;
}
#
projects / spider.git / blobdiff