hamradio/spider
1
0
Fork 0
mirror of git://scm.dxcluster.org/scm/spider synced 2024-09-21 07:47:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

added announce deduping and filtering

Browse Source 
changed dup connect semantics
This commit is contained in:
djk 1999-05-18 21:28:01 +00:00
parent 80a2dd317e
commit 28ad9d9ee8
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changes
View File

@ -1,3 +1,5 @@
18May99=======================================================================
1. Added announce dup checking.
08May99=======================================================================
1. Added a bit more checking to the rcmd thing to make more sure that this
rcmd isn't coming from an imposter. Not possible to prevent everything

26
perl/DXProt.pm
View File

@ -30,14 +30,17 @@ use Carp;
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
@ -235,6 +238,21 @@ sub normal
}
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) {
@ -646,6 +664,10 @@ sub process
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;
}
}

9
perl/cluster.pl
View File

@ -107,13 +107,14 @@ sub rec
my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
# is there one already connected to me ?
if ($dxchan = DXChannel->get($call)) {
disconnect($dxchan);
sleep(1);
my $user = DXUser->get($call);
if (DXChannel->get($call)) {
my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
already_conn($conn, $call, $mess);
return;
}
# is there one already connected elsewhere in the cluster (and not a cluster)
my $user = DXUser->get($call);
if ($user) {
if (($user->sort eq 'A' || $call eq $myalias) && !DXCluster->get_exact($call)) {
;