use Carp;
use strict;
-use vars qw($me $pc11_max_age $pc11_dup_age %dup $last_hour);
+use vars qw($me $pc11_max_age $pc11_dup_age %dup $last_hour %pings %rcmds);
$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
$last_hour = time; # last time I did an hourly periodic update
+%pings = (); # outstanding ping requests outbound
+%rcmds = (); # outstanding rcmd requests outbound
sub init
{
my $user = DXUser->get($main::mycall);
+ $DXProt::myprot_version += $main::version*100;
$me = DXProt->new($main::mycall, undef, $user);
+ $me->{here} = 1;
# $me->{sort} = 'M'; # M for me
}
$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;
}
$self->state('init');
$self->pc50_t(time);
+
Log('DXProt', "$call connected");
}
# yes, it is
my $text = unpad($field[3]);
+ Log('talk', $call, $field[1], $field[6], $text);
+ $call = $main::myalias if $call eq $main::mycall;
my $ref = DXChannel->get($call);
$ref->send("$call de $field[1]: $text") if $ref;
- Log('talk', $call, $field[1], $field[6], $text);
} else {
route($field[2], $line); # relay it on its way
}
my @list;
if ($field[4] eq '*') { # sysops
- $target = "Sysops";
+ $target = "SYSOP";
@list = map { $_->priv >= 5 ? $_ : () } get_all_users();
} elsif ($field[4] gt ' ') { # speciality list handling
my ($name) = split /\./, $field[4];
last SWITCH if !$node; # ignore if havn't seen a PC19 for this one yet
my $i;
+
for ($i = 2; $i < $#field; $i++) {
my ($call, $confmode, $here) = $field[$i] =~ /^(\S+) (-) (\d)/o;
next if length $call < 3;
$call =~ s/-\d+$//o; # remove ssid for users
my $user = DXUser->get_current($call);
$user = DXUser->new($call) if !$user;
- $user->node($node->call);
$user->homenode($node->call) if !$user->homenode;
+ $user->node($node->call);
+ $user->lastin($main::systime);
$user->put;
}
if (!$user) {
$user = DXUser->new($call);
$user->sort('A');
- $user->node($call);
+ $user->priv(1); # I have relented and defaulted nodes
+ $self->{priv} = 1; # to user RCMDs allowed
$user->homenode($call);
- $user->put;
+ $user->node($call);
}
+ $user->lastin($main::systime);
+ $user->put;
}
# queue up any messages
- DXMsg::queue_msg() if $self->state eq 'normal';
+ DXMsg::queue_msg() if $self->state eq 'normal';
last SWITCH;
}
}
if ($pcno == 22) {
- last SWITCH;
+ $self->state('normal');
+
+ # queue mail
+ DXMsg::queue_msg();
+ return;
}
if ($pcno == 23 || $pcno == 27) { # WWV info
last SWITCH;
}
- if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42) { # mail/file handling
+ if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42 || $pcno == 49) { # mail/file handling
DXMsg::process($self, $line);
return;
}
if ($field[1] eq $main::mycall) {
my $ref = DXUser->get_current($field[2]);
Log('rcmd', 'in', $ref->{priv}, $field[2], $field[3]);
- 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 @in = (DXCommandmode::run_cmd($self, $field[3]));
- for (@in) {
- s/\s*$//og;
- $self->send(pc35($main::mycall, $field[2], "$main::mycall:$_"));
- Log('rcmd', 'out', $field[2], $_);
+ unless ($field[3] =~ /rcmd/i) { # 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 @in = (DXCommandmode::run_cmd($self, $field[3]));
+ for (@in) {
+ s/\s*$//og;
+ $self->send(pc35($main::mycall, $field[2], "$main::mycall:$_"));
+ Log('rcmd', 'out', $field[2], $_);
+ }
+ delete $self->{remotecmd};
}
- delete $self->{remotecmd};
+ } else {
+ $self->send(pc35($main::mycall, $field[2], "$main::mycall:Tut tut tut...!"));
}
} else {
route($field[1], $line);
if ($pcno == 35) { # remote command replies
if ($field[1] eq $main::mycall) {
- my $s = DXChannel::get($main::myalias);
- my @ref = grep { $_->pc34to eq $field[2] } DXChannel::get_all(); # people that have rcmded someone
- push @ref, $s if $s;
-
- foreach (@ref) {
- $_->send($field[3]);
+ my $s = $rcmds{$field[2]};
+ if ($s) {
+ my $dxchan = DXChannel->get($s->{call});
+ $dxchan->send($field[3]) if $dxchan;
+ delete $rcmds{$field[2]} if !$dxchan;
}
} else {
route($field[1], $line);
} elsif ($field[2] == 2) {
$user->qth($field[3]);
} elsif ($field[2] == 3) {
- my ($latd, $latm, $latl, $longd, $longm, $longl) = split /\s+/, $field[3];
- $longd += ($longm/60);
- $longd = 0-$longd if (uc $longl) eq 'W';
- $user->long($longd);
- $latd += ($latm/60);
- $latd = 0-$latd if (uc $latl) eq 'S';
- $user->lat($latd);
+ my ($lat, $long) = DXBearing::stoll($field[3]);
+ $user->lat($lat);
+ $user->long($long);
} elsif ($field[2] == 4) {
$user->homenode($field[3]);
}
if ($pcno == 48) {
last SWITCH;
}
- if ($pcno == 49) {
- last SWITCH;
- }
if ($pcno == 50) { # keep alive/user list
my $ref = DXCluster->get_exact($field[1]);
# is it for us?
if ($field[1] eq $main::mycall) {
my $flag = $field[3];
- $flag ^= 1;
- $self->send($self->pc51($field[2], $field[1], $flag));
+ if ($flag == 1) {
+ $self->send(pc51($field[2], $field[1], '0'));
+ } else {
+ # it's a reply, look in the ping list for this one
+ my $ref = $pings{$field[2]};
+ if ($ref) {
+ my $r = shift @$ref;
+ my $dxchan = DXChannel->get($r->{call});
+ $dxchan->send($dxchan->msg('pingi', $field[2], atime($main::systime), $main::systime - $r->{t})) if $dxchan;
+ }
+ }
+
} else {
# route down an appropriate thingy
route($field[1], $line);
# REBROADCAST!!!!
#
- my $hops;
- if (($hops) = $line =~ /H(\d+)\^\~?$/o) {
+ my $hops;
+ if (!$self->{isolate} && (($hops) = $line =~ /H(\d+)\^\~?$/o)) {
my $newhops = $hops - 1;
if ($newhops > 0) {
$line =~ s/\^H$hops(\^\~?)$/\^H$newhops$1/; # change the hop count
sub finish
{
my $self = shift;
- my $ref = DXCluster->get_exact($self->call);
+ my $call = $self->call;
+ my $ref = DXCluster->get_exact($call);
# unbusy and stop and outgoing mail
- my $mref = DXMsg::get_busy($self->call);
+ my $mref = DXMsg::get_busy($call);
$mref->stop_msg($self) if $mref;
# broadcast to all other nodes that all the nodes connected to via me are gone
my $node;
foreach $node (@gonenodes) {
- next if $node->call eq $self->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}; # done like this 'cos DXNodes don't have a pc21 method
$node->del();
}
+
+ # remove outstanding pings
+ delete $pings{$call};
# now broadcast to all other ak1a nodes that I have gone
- broadcast_ak1a(pc21($self->call, 'Gone.'), $self);
- Log('DXProt', $self->call . " Disconnected");
+ broadcast_ak1a(pc21($call, 'Gone.'), $self);
+
+ Log('DXProt', $call . " Disconnected");
$ref->del() if $ref;
}
{
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;
+ 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;
+ }
$self->send($me->pc19(@nodes));
# get all the users connected on the above nodes and send them out
foreach $chan (@chan) {
next if grep $chan == $_, @except;
- $chan->send($s); # send it if it isn't the except list
+ $chan->send($s) unless $chan->{isolate}; # send it if it isn't the except list
}
}
foreach $chan (@chan) {
next if grep $chan == $_, @except;
- $chan->send($s); # send it if it isn't the except list
+ $s =~ s/\a//og if !$chan->{beep};
+ $chan->send($s); # send it if it isn't the except list or hasn't a passout flag
}
}
$s =~ s/^\s+|\s+$//;
return $s;
}
+
+# add a ping request to the ping queues
+sub addping
+{
+ my ($from, $to) = @_;
+ my $ref = $pings{$to};
+ $ref = $pings{$to} = [] if !$ref;
+ my $r = {};
+ $r->{call} = $from;
+ $r->{t} = $main::systime;
+ route($to, pc51($to, $main::mycall, 1));
+ push @$ref, $r;
+}
+
+# add a rcmd request to the rcmd queues
+sub addrcmd
+{
+ my ($from, $to, $cmd) = @_;
+ my $r = {};
+ $r->{call} = $from;
+ $r->{t} = $main::systime;
+ $r->{cmd} = $cmd;
+ route($to, pc34($main::mycall, $to, $cmd));
+ $rcmds{$to} = $r;
+}
1;
__END__