use Carp;
use strict;
-use vars qw($me $pc11_max_age $pc11_dup_age %dup $last_hour %pings %rcmds);
+use vars qw($me $pc11_max_age $pc11_dup_age %dup $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
$last_hour = time; # last time I did an hourly periodic update
%pings = (); # outstanding ping requests outbound
%rcmds = (); # outstanding rcmd requests outbound
+%nodehops = (); # node specific hop control
+
sub init
{
my $user = DXUser->get($main::mycall);
- $me = DXProt->new($main::mycall, undef, $user);
+ $DXProt::myprot_version += $main::version*100;
+ $me = DXProt->new($main::mycall, 0, $user);
$me->{here} = 1;
+ $me->{state} = "indifferent";
+ do "$main::data/hop_table.pl" if -e "$main::data/hop_table.pl";
+ confess $@ if $@;
# $me->{sort} = 'M'; # M for me
}
sub new
{
my $self = DXChannel::alloc(@_);
- $self->{sort} = 'A'; # in absence of how to find out what sort of an object I am
+ $self->{'sort'} = 'A'; # in absence of how to find out what sort of an object I am
return $self;
}
$self->{outbound} = $sort eq 'O';
$self->{priv} = $user->priv;
$self->{lang} = $user->lang;
+ $self->{isolate} = $user->{isolate};
$self->{consort} = $line; # save the connection type
$self->{here} = 1;
# process PC frames
my ($pcno) = $field[0] =~ /^PC(\d\d)/; # just get the number
+ return unless $pcno;
return if $pcno < 10 || $pcno > 51;
SWITCH: {
# 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");
+ return;
+ }
+
# strip off the leading & trailing spaces from the comment
my $text = unpad($field[5]);
# do some de-duping
my $dupkey = "$field[1]$field[2]$d$text$field[6]";
- return if $dup{$dupkey};
+ if ($dup{$dupkey}) {
+ dbg('chan', "Duplicate Spot ignored");
+ return;
+ }
+
$dup{$dupkey} = $d;
my $spot = Spot::add($field[1], $field[2], $d, $text, $spotter);
$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
}
# queue up any messages
- DXMsg::queue_msg() if $self->state eq 'normal';
+ DXMsg::queue_msg(0) if $self->state eq 'normal';
last SWITCH;
}
$self->state('normal');
# queue mail
- DXMsg::queue_msg();
+ DXMsg::queue_msg(0);
return;
}
$self->state('normal');
# queue mail
- DXMsg::queue_msg();
+ DXMsg::queue_msg(0);
return;
}
# REBROADCAST!!!!
#
- my $hops;
- if (($hops) = $line =~ /H(\d+)\^\~?$/o) {
- my $newhops = $hops - 1;
- if ($newhops > 0) {
- $line =~ s/\^H$hops(\^\~?)$/\^H$newhops$1/; # change the hop count
- broadcast_ak1a($line, $self); # send it to everyone but me
- }
+ if (!$self->{isolate}) {
+ broadcast_ak1a($line, $self); # send it to everyone but me
}
}
sub process
{
my $t = time;
- my @chan = DXChannel->get_all();
- my $chan;
+ my @dxchan = DXChannel->get_all();
+ my $dxchan;
- foreach $chan (@chan) {
- next if !$chan->is_ak1a();
+ foreach $dxchan (@dxchan) {
+ next unless $dxchan->is_ak1a();
+ next if $dxchan == $me;
# send a pc50 out on this channel
- if ($t >= $chan->pc50_t + $DXProt::pc50_interval) {
- $chan->send(pc50());
- $chan->pc50_t($t);
+ if ($t >= $dxchan->pc50_t + $DXProt::pc50_interval) {
+ $dxchan->send(pc50());
+ $dxchan->pc50_t($t);
}
}
my $node;
foreach $node (@gonenodes) {
- next if $node->call eq $call;
- broadcast_ak1a(pc21($node->call, 'Gone'), $self); # 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 $self = shift;
my $n;
+ my @nodes;
# send our nodes
- my @nodes = DXNode::get_all();
-
- # create a list of all the nodes that are not connected to this connection
- @nodes = grep { $_->dxchan != $self } @nodes;
- $self->send($me->pc19(@nodes));
+ if ($self->{isolate}) {
+ @nodes = (DXCluster->get_exact($main::mycall));
+ } else {
+ # create a list of all the nodes that are not connected to this connection
+ @nodes = DXNode::get_all();
+ @nodes = grep { $_->dxchan != $self } @nodes;
+ }
+
+ my @s = $me->pc19(@nodes);
+ for (@s) {
+ my $routeit = adjust_hops($self, $_);
+ $self->send($routeit) if $routeit;
+ }
# get all the users connected on the above nodes and send them out
foreach $n (@nodes) {
my @users = values %{$n->list};
- $self->send(DXProt::pc16($n, @users));
+ my @s = pc16($n, @users);
+ for (@s) {
+ my $routeit = adjust_hops($self, $_);
+ $self->send($routeit) if $routeit;
+ }
}
}
if ($cl) {
my $hops;
my $dxchan = $cl->{dxchan};
- if (($hops) = $line =~ /H(\d+)\^\~?$/o) {
- my $newhops = $hops - 1;
- if ($newhops > 0) {
- $line =~ s/\^H$hops(\^\~?)$/\^H$newhops$1/; # change the hop count
- $dxchan->send($line) if $dxchan;
+ if ($dxchan) {
+ my $routeit = adjust_hops($dxchan, $line); # adjust its hop count by node name
+ if ($routeit) {
+ $dxchan->send($routeit) if $dxchan;
}
- } else {
- $dxchan->send($line) if $dxchan; # for them wot don't have Hops
}
}
}
{
my $s = shift; # the line to be rebroadcast
my @except = @_; # to all channels EXCEPT these (dxchannel refs)
- my @chan = get_all_ak1a();
- my $chan;
+ my @dxchan = get_all_ak1a();
+ my $dxchan;
- foreach $chan (@chan) {
- next if grep $chan == $_, @except;
- $chan->send($s); # send it if it isn't the except list
+ # 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($routeit) unless $dxchan->{isolate} || !$routeit;
}
}
{
my $s = shift; # the line to be rebroadcast
my @except = @_; # to all channels EXCEPT these (dxchannel refs)
- my @chan = get_all_users();
- my $chan;
+ my @dxchan = get_all_users();
+ my $dxchan;
- foreach $chan (@chan) {
- next if grep $chan == $_, @except;
- $s =~ s/\a//og if !$chan->{beep};
- $chan->send($s); # send it if it isn't the except list
+ foreach $dxchan (@dxchan) {
+ next if grep $dxchan == $_, @except;
+ $s =~ s/\a//og if !$dxchan->{beep};
+ $dxchan->send($s); # send it if it isn't the except list or hasn't a passout flag
}
}
sub broadcast_list
{
my $s = shift;
- my $chan;
+ my $dxchan;
- foreach $chan (@_) {
- $chan->send($s); # send it
+ foreach $dxchan (@_) {
+ $dxchan->send($s); # send it
}
}
return "H$hops";
}
+#
+# adjust the hop count on a per node basis using the user loadable
+# hop table if available or else decrement an existing one
+#
+
+sub adjust_hops
+{
+ my $self = shift;
+ my $s = shift;
+ my $call = $self->{call};
+ my $hops;
+
+ 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 "" if defined $newhops && $newhops == 0;
+ $newhops = $ref->{default} unless $newhops;
+ return "" if defined $newhops && $newhops == 0;
+ $newhops = $hops if !$newhops;
+ $s =~ s/\^H(\d+)(\^~?)$/\^H$newhops$2/ if $newhops;
+ } else {
+ # simply decrement it
+ $hops--;
+ return "" if !$hops;
+ $s =~ s/\^H(\d+)(\^~?)$/\^H$hops$2/ if $hops;
+ }
+ }
+ return $s;
+}
+
+#
+# load hop tables
+#
+sub load_hops
+{
+ my $self = shift;
+ return $self->msg('lh1') unless -e "$main::data/hop_table.pl";
+ do "$main::data/hop_table.pl";
+ return $@ if $@;
+ return 0;
+}
+
# remove leading and trailing spaces from an input string
sub unpad
{
projects / spider.git / blobdiff