use strict;
use vars qw($me $pc11_max_age $pc11_dup_age $pc23_dup_age
%spotdup %wwvdup $last_hour %pings %rcmds
- %nodehops @baddx $baddxfn);
+ %nodehops @baddx $baddxfn $pc12_dup_age
+ %anndup);
$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 spot dup list for
$pc23_dup_age = 24*3600; # the maximum time to keep the wwv dup list for
+$pc12_dup_age = 24*3600; # the maximum time to keep the ann dup list for
%spotdup = (); # the pc11 and 26 dup hash
-%wwvdup = (); # the pc23 and 27 dup hash
+%wwvdup = (); # the pc23 and 27 dup hash
+%anndup = (); # the PC12 dup hash
$last_hour = time; # last time I did an hourly periodic update
%pings = (); # outstanding ping requests outbound
%rcmds = (); # outstanding rcmd requests outbound
$self->{wwvfilter} = Filter::read_in('wwv', $call);
$self->{annfilter} = Filter::read_in('ann', $call);
- # set unbuffered
+ # set unbuffered and no echo
$self->send_now('B',"0");
+ $self->send_now('E',"0");
# send initialisation string
if (!$self->{outbound}) {
}
if ($pcno == 12) { # announces
+ # announce duplicate checking
+ my $text = uc unpad($field[3]);
+ my $dupkey = $field[1].$field[2].$text.$field[4].$field[6];
+ if ($anndup{$dupkey}) {
+ dbg('chan', "Duplicate Announce ignored\n");
+ return;
+ }
+ $anndup{$dupkey} = $main::systime;
+
+ # global ann filtering
+ my ($filter, $hops) = Filter::it($self->{annfilter}, @field[1..6], $self->{call} ) if $self->{annfilter};
+ if ($self->{annfilter} && !$filter) {
+ dbg('chan', "Rejected by filter");
+ return;
+ }
if ($field[2] eq '*' || $field[2] eq $main::mycall) {
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');
+ if ($node->dxchan != $self) {
+ dbg('chan', "LOOP: come in on wrong channel");
+ return;
+ }
my $i;
$user = DXUser->new($call) if !$user;
$user->homenode($node->call) if !$user->homenode;
$user->node($node->call);
- $user->lastin($main::systime);
+ $user->lastin($main::systime) unless DXChannel->get($call);
$user->put;
}
}
if ($pcno == 17) { # remove a user
-
+ my $node = DXCluster->get_exact($field[2]);
+ last SWITCH unless $node->isa('DXNode');
+ if ($node->dxchan != $self) {
+ dbg('chan', "LOOP: come in on wrong channel");
+ return;
+ }
my $ref = DXCluster->get_exact($field[1]);
$ref->del() if $ref;
last SWITCH;
my $ver = $field[$i+3];
# now check the call over
- next if DXCluster->get_exact($call); # we already have this
+ my $node = DXCluster->get_exact($call); # we already have this
+ if ($node && $node->dxchan != $self) {
+ dbg('chan', "LOOP: come in on wrong channel");
+ return;
+ }
+ next if $node;
# check for sane parameters
next if $ver < 5000; # only works with version 5 software
$user->homenode($call);
$user->node($call);
}
- $user->lastin($main::systime);
+ $user->lastin($main::systime) unless DXChannel->get($call);
$user->put;
}
if ($pcno == 21) { # delete a cluster from the list
my $call = uc $field[1];
if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me!
- my $ref = DXCluster->get_exact($call);
- $ref->del() if $ref;
+ my $node = DXCluster->get_exact($call);
+ if ($node) {
+ if ($node->dxchan != $self) {
+ dbg('chan', "LOOP: come in on wrong channel");
+ return;
+ }
+ $node->del();
+ } else {
+ dbg('chan', "$call not in table, dropped");
+ return;
+ }
}
last SWITCH;
}
}
if ($pcno == 25) { # merge request
- unless ($field[1] eq $main::mycall) {
- dbg('chan', "merge request to $field[1] from $field[2] ignored");
+ if ($field[1] ne $main::mycall) {
+ route($field[1], $line);
return;
}
unless ($field[3] =~ /rcmd/i || !$cref || !$ref || $cref->mynode->call ne $ref->homenode) { # not allowed to relay RCMDS!
if ($ref->{priv}) { # you have to have SOME privilege, the commands have further filtering
$self->{remotecmd} = 1; # for the benefit of any command that needs to know
+ my $oldpriv = $self->{priv};
+ $self->{priv} = $ref->{priv}; # assume the user's privilege level
my @in = (DXCommandmode::run_cmd($self, $field[3]));
+ $self->{priv} = $oldpriv;
for (@in) {
s/\s*$//og;
$self->send(pc35($main::mycall, $field[2], "$main::mycall:$_"));
while (($key, $val) = each %wwvdup) {
delete $wwvdup{$key} if $val < $cutoff;
}
+ $cutoff = $main::systime - $pc12_dup_age;
+ while (($key, $val) = each %anndup) {
+ delete $anndup{$key} if $val < $cutoff;
+ }
$last_hour = $main::systime;
}
}
$dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate};
}
- } elsif ($dxchan->is_user) {
+ } elsif ($dxchan->is_user && $dxchan->{dx}) {
my $buf = Spot::formatb($_[0], $_[1], $_[2], $_[3], $_[4]);
- $buf .= "\a\a" if $dxchan->beep;
- $dxchan->send($buf) if !$hops || ($hops && $filter);
+ $buf .= "\a\a" if $dxchan->{beep};
+ if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
+ $dxchan->send($buf) if !$hops || ($hops && $filter);
+ } else {
+ $dxchan->delay($buf) if !$hops || ($hops && $filter);
+ }
}
}
}
projects / spider.git / blobdiff