use Filter;
use Local;
use DXDb;
+use AnnTalk;
+use Geomag;
+use WCY;
use Time::HiRes qw(gettimeofday tv_interval);
use strict;
-use vars qw($me $pc11_max_age $pc23_max_age $pc11_dup_age $pc23_dup_age
- %spotdup %wwvdup $last_hour %pings %rcmds $pc11duptext
- %nodehops @baddx $baddxfn $pc12_dup_age
- %anndup $allowzero $pc12_dup_lth $decode_dk0wcy);
+use vars qw($me $pc11_max_age $pc23_max_age
+ $last_hour %pings %rcmds
+ %nodehops @baddx $baddxfn
+ $allowzero $decode_dk0wcy $send_opernam @checklist);
$me = undef; # the channel id for this cluster
-$decode_dk0wcy = undef; # if set use this callsign to decode announces from the EU WWV data beacon
$pc11_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc11
$pc23_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc23
-$pc11_dup_age = 3*3600; # the maximum time to keep the spot dup list for
-$pc23_dup_age = 3*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
-$pc12_dup_lth = 60; # the length of ANN text to save for deduping
-$pc11duptext = 20; # maximum lth of the text field in PC11 to use for duduping
-
-%spotdup = (); # the pc11 and 26 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
$baddxfn = "$main::data/baddx.pl";
+@checklist =
+(
+ [ qw(c c m p bc c) ], # pc10
+ [ qw(f m d t m c c h) ], # pc11
+ [ qw(c bc m bp bm p h) ], # pc12
+ [ qw(c h) ], #
+ [ qw(c h) ], #
+ [ qw(c m h) ], #
+ undef , # pc16 has to be validated manually
+ [ qw(c c h) ], # pc17
+ [ qw(m n) ], # pc18
+ undef , # pc19 has to be validated manually
+ undef , # pc20 no validation
+ [ qw(c m h) ], # pc21
+ undef , # pc22 no validation
+ [ qw(d n n n n m c c h) ], # pc23
+ [ qw(c p h) ], # pc24
+ [ qw(c c n n) ], # pc25
+ [ qw(f m d t m c c bc) ], # pc26
+ [ qw(d n n n n m c c bc) ], # pc27
+ [ qw(c c c c d t p m bp n p bp bc) ], # pc28
+ [ qw(c c n m) ], # pc29
+ [ qw(c c n) ], # pc30
+ [ qw(c c n) ], # pc31
+ [ qw(c c n) ], # pc32
+ [ qw(c c n) ], # pc33
+ [ qw(c c m) ], # pc34
+ [ qw(c c m) ], # pc35
+ [ qw(c c m) ], # pc36
+ [ qw(c c n m) ], # pc37
+ undef, # pc38 not interested
+ [ qw(c m) ], # pc39
+ [ qw(c c m p n) ], # pc40
+ [ qw(c n m h) ], # pc41
+ [ qw(c c n) ], # pc42
+ undef, # pc43 don't handle it
+ [ qw(c c n m m c) ], # pc44
+ [ qw(c c n m) ], # pc45
+ [ qw(c c n) ], # pc46
+ undef, # pc47
+ undef, # pc48
+ [ qw(c m h) ], # pc49
+ [ qw(c n h) ], # pc50
+ [ qw(c c n) ], # pc51
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef, # pc60
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef, # pc70
+ undef,
+ undef,
+ [ qw(d n n n n n n m m m c c h) ], # pc73
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef, # pc80
+ undef,
+ undef,
+ undef,
+ [ qw(c c c m) ], # pc84
+ [ qw(c c c m) ], # pc85
+);
+
+# use the entry in the check list to check the field list presented
+# return OK if line NOT in check list (for now)
+sub check
+{
+ my $n = shift;
+ $n -= 10;
+ return 0 if $n < 0 || $n > @checklist;
+ my $ref = $checklist[$n];
+ return 0 unless ref $ref;
+
+ my $i;
+ shift; # not interested in the first field
+ for ($i = 0; $i < @$ref; $i++) {
+ my ($blank, $act) = $$ref[$i] =~ /^(b?)(\w)$/;
+ return 0 unless $act;
+ next if $blank && $_[$i] =~ /^[ \*]$/;
+ if ($act eq 'c') {
+ return $i+1 unless is_callsign($_[$i]);
+ } elsif ($act eq 'm') {
+ return $i+1 unless is_pctext($_[$i]);
+ } elsif ($act eq 'p') {
+ return $i+1 unless is_pcflag($_[$i]);
+ } elsif ($act eq 'f') {
+ return $i+1 unless is_freq($_[$i]);
+ } elsif ($act eq 'n') {
+ return $i+1 unless $_[$i] =~ /^[\d ]+$/;
+ } elsif ($act eq 'h') {
+ return $i+1 unless $_[$i] =~ /^H\d\d?$/;
+ } elsif ($act eq 'd') {
+ return $i+1 unless $_[$i] =~ /^\s*\d+-\w\w\w-[12][90]\d\d$/;
+ } elsif ($act eq 't') {
+ return $i+1 unless $_[$i] =~ /^[012]\d[012345]\dZ$/;
+ }
+ }
+ return 0;
+}
+
sub init
{
my $user = DXUser->get($main::mycall);
$me->{state} = "indifferent";
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 $duptext = length $_->[3] > $pc11duptext ? substr($_->[3], 0, $pc11duptext) : $_->[3] ;
- my $dupkey = "$_->[0]$_->[1]$_->[2]$duptext$_->[4]";
- $spotdup{$dupkey} = $_->[2];
- }
+ $me->{sort} = 'S'; # S for spider
- # 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];
- }
+ # now prime the spot and wwv duplicates file with data
+# my @today = Julian::unixtoj(time);
+# for (Spot::readfile(@today), Spot::readfile(Julian::sub(@today, 1))) {
+# Spot::dup(@{$_}[0..3]);
+# }
+# for (Geomag::readfile(time)) {
+# Geomag::dup(@{$_}[1..5]);
+# }
# load the baddx file
do "$baddxfn" if -e "$baddxfn";
sub new
{
my $self = DXChannel::alloc(@_);
- $self->{'sort'} = 'A'; # in absence of how to find out what sort of an object I am
return $self;
}
# remember type of connection
$self->{consort} = $line;
$self->{outbound} = $sort eq 'O';
- $self->{priv} = $user->priv;
- $self->{lang} = $user->lang;
+ $self->{priv} = $user->priv || 1; # other clusters can always be 'normal' users
+ $self->{lang} = $user->lang || 'en';
$self->{isolate} = $user->{isolate};
$self->{consort} = $line; # save the connection type
$self->{here} = 1;
# get the INPUT filters (these only pertain to Clusters)
$self->{inspotfilter} = Filter::read_in('spots', $call, 1);
$self->{inwwvfilter} = Filter::read_in('wwv', $call, 1);
+ $self->{inwcyfilter} = Filter::read_in('wcy', $call, 1);
$self->{inannfilter} = Filter::read_in('ann', $call, 1);
# set unbuffered and no echo
{
my ($self, $line) = @_;
my @field = split /\^/, $line;
+ return unless @field;
+
pop @field if $field[-1] eq '~';
# print join(',', @field), "\n";
# process PC frames
my ($pcno) = $field[0] =~ /^PC(\d\d)/; # just get the number
return unless $pcno;
- return if $pcno < 10 || $pcno > 51;
+ return if $pcno < 10 || $pcno > 99;
- # dump bad protocol messages unless it is a PC29
- if ($line =~ /\%[0-9A-F][0-9A-F]/o && $pcno != 29) {
- dbg('chan', "CORRUPT protocol message - dumped");
+ # check for and dump bad protocol messages
+ my $n = check($pcno, @field);
+ if ($n) {
+ dbg('chan', "bad field $n, dumped (" . parray($checklist[$pcno-10]) . ")");
return;
}
if ($pcno == 10) { # incoming talk
# is it for me or one of mine?
- my $call = ($field[5] gt ' ') ? $field[5] : $field[2];
- if ($call eq $main::mycall || grep $_ eq $call, DXChannel::get_all_user_calls()) {
-
- # 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 && $ref->{talk};
+ my ($to, $via, $call, $dxchan);
+ if ($field[5] gt ' ') {
+ $call = $via = $field[2];
+ $to = $field[5];
+ unless (is_callsign($to)) {
+ dbg('chan', "Corrupt talk, rejected");
+ return;
+ }
+ } else {
+ $call = $to = $field[2];
+ }
+ if ($dxchan = DXChannel->get($call)) {
+ $dxchan->talk($field[1], $to, $via, $field[3]);
} else {
$self->route($field[2], $line); # relay it on its way
}
return;
}
- # strip off the leading & trailing spaces from the comment
- my $duptext = length $field[5] > $pc11duptext ? substr($field[5], 0, $pc11duptext) : $field[5];
- my $text = unpad($field[5]);
-
- # store it away
- my $spotter = $field[6];
- $spotter =~ s/-[\@\d]+$//o; # strip off the ssid from the spotter
-
- # do some de-duping
- my $freq = $field[1] - 0;
- my $dupkey = "$freq$field[2]$d$duptext$spotter";
- if ($spotdup{$dupkey}) {
- dbg('chan', "Duplicate Spot ignored\n");
- return;
- }
-
- $spotdup{$dupkey} = $d;
-
# is it 'baddx'
if (grep $field[2] eq $_, @baddx) {
dbg('chan', "Bad DX spot, ignored");
return;
}
-
- # are any of the crucial fields invalid?
- if ($field[2] =~ /[a-z]/ || $field[6] =~ /[a-z]/ || $field[7] =~ /[a-z]/) {
- dbg('chan', "Spot contains lower case callsigns, rejected");
+
+ # do some de-duping
+ $field[5] =~ s/^\s+//; # take any leading blanks off
+ if (Spot::dup($field[1], $field[2], $d, $field[5])) {
+ dbg('chan', "Duplicate Spot ignored\n");
return;
}
- my @spot = Spot::add($freq, $field[2], $d, $text, $spotter, $field[7]);
+ my @spot = Spot::add($field[1], $field[2], $d, $field[5], $field[6], $field[7]);
#
# @spot at this point contains:-
# you should be able to route on any of these
#
+ # fix up qra locators of known users
+ my $user = DXUser->get_current($spot[4]);
+ if ($user) {
+ my $qra = $user->qra;
+ unless ($qra && DXBearing::is_qra($qra)) {
+ my $lat = $user->lat;
+ my $long = $user->long;
+ if (defined $lat && defined $long) {
+ $user->qra(DXBearing::lltoqra($lat, $long));
+ $user->put;
+ }
+ }
+
+ # send a remote command to a distant cluster if it is visible and there is no
+ # qra locator and we havn't done it for a month.
+
+ unless ($user->qra) {
+ my $node;
+ my $to = $user->homenode;
+ my $last = $user->lastoper || 0;
+ if ($send_opernam && $main::systime > $last + $DXUser::lastoperinterval && $to && ($node = DXCluster->get_exact($to)) ) {
+ my $cmd = "forward/opernam $spot[4]";
+ # send the rcmd but we aren't interested in the replies...
+ if ($node && $node->dxchan && $node->dxchan->is_clx) {
+ route(undef, $to, pc84($main::mycall, $to, $main::mycall, $cmd));
+ } else {
+ route(undef, $to, pc34($main::mycall, $to, $cmd));
+ }
+ if ($to ne $field[7]) {
+ $to = $field[7];
+ $node = DXCluster->get_exact($to);
+ if ($node && $node->dxchan && $node->dxchan->is_clx) {
+ route(undef, $to, pc84($main::mycall, $to, $main::mycall, $cmd));
+ } else {
+ route(undef, $to, pc34($main::mycall, $to, $cmd));
+ }
+ }
+ $user->lastoper($main::systime);
+ $user->put;
+ }
+ }
+ }
+
# local processing
my $r;
eval {
if ($pcno == 12) { # announces
# announce duplicate checking
- my $text = substr(uc unpad($field[3]), 0, $pc12_dup_lth);
- my $dupkey = $field[1].$field[2].$text;
- if ($anndup{$dupkey}) {
- dbg('chan', "Duplicate Announce ignored\n");
+ $field[3] =~ s/^\s+//; # remove leading blanks
+ if (AnnTalk::dup($field[1], $field[2], $field[3])) {
+ dbg('chan', "Duplicate Announce ignored");
return;
}
- $anndup{$dupkey} = $main::systime;
if ($field[2] eq '*' || $field[2] eq $main::mycall) {
# send it
$self->send_announce($line, @field[1..6]);
-
- if ($decode_dk0wcy && $field[1] eq $decode_dk0wcy) {
- my ($hour, $k, $next, $a, $r, $sfi, $alarm) = $field[3] =~ /^Aurora Beacon\s+(\d+)UTC,\s+Kiel\s+K=(\d+),.*ed\s+K=(\d+),\s+A=(\d+),\s+R=(\d+),\s+SFI=(\d+),.*larm:\s+(\w+)/;
- $alarm = ($alarm =~ /^Y/i) ? ', Aurora in DE' : '';
- my $wwv = Geomag::update($main::systime, $hour, $sfi, $a, $k, "R=$r, Next K=$next$alarm", $decode_dk0wcy, $field[5], $r) if $sfi && $r;
- }
-
} else {
$self->route($field[2], $line);
}
my $i = unpad($field[5]);
my ($r) = $field[6] =~ /R=(\d+)/;
$r = 0 unless $r;
- my $dupkey = "$d.$sfi$k$i";
- if ($wwvdup{$dupkey}) {
- dbg('chan', "Dup WWV Spot ignored\n");
- return;
- }
if (($pcno == 23 && $d < $main::systime - $pc23_max_age) || $d > $main::systime + 1500 || $field[2] < 0 || $field[2] > 23) {
dbg('chan', "WWV Date ($field[1] $field[2]) out of range");
return;
}
- $wwvdup{$dupkey} = $d;
- $field[6] =~ s/-\d+$//o; # remove spotter's ssid
+ if (Geomag::dup($d,$sfi,$k,$i,$field[6])) {
+ dbg('chan', "Dup WWV Spot ignored\n");
+ return;
+ }
+ $field[7] =~ s/-\d+$//o; # remove spotter's ssid
my $wwv = Geomag::update($d, $field[2], $sfi, $k, $i, @field[6..8], $r);
if ($pcno == 49 || $field[1] eq $main::mycall) {
DXMsg::process($self, $line);
} else {
- $self->route($field[1], $line);
+ $self->route($field[1], $line) unless $self->is_clx;
}
return;
}
my $ref = DXUser->get_current($field[2]);
my $cref = DXCluster->get($field[2]);
Log('rcmd', 'in', $ref->{priv}, $field[2], $field[3]);
- unless ($field[3] =~ /rcmd/i || !$cref || !$ref || $cref->mynode->call ne $ref->homenode) { # not allowed to relay RCMDS!
+ unless (!$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->send(pc35($main::mycall, $field[2], "$main::mycall:your attempt is logged, Tut tut tut...!"));
}
} else {
- $self->route($field[1], $line);
+ my $ref = DXUser->get_current($field[1]);
+ if ($ref && $ref->is_clx) {
+ route($field[1], pc84($field[2], $field[1], $field[2], $field[3]));
+ } else {
+ $self->route($field[1], $line);
+ }
}
return;
}
my $dxchan = DXChannel->get($s->{call});
$dxchan->send($field[3]) if $dxchan;
delete $rcmds{$field[2]} if !$dxchan;
+ } else {
+ # send unsolicited ones to the sysop
+ my $dxchan = DXChannel->get($main::myalias);
+ $dxchan->send($field[3]) if $dxchan;
}
} else {
- $self->route($field[1], $line);
+ my $ref = DXUser->get_current($field[1]);
+ if ($ref && $ref->is_clx) {
+ route($field[1], pc85($field[2], $field[1], $field[2], $field[3]));
+ } else {
+ $self->route($field[1], $line);
+ }
}
return;
}
my ($lat, $long) = DXBearing::stoll($field[3]);
$user->lat($lat);
$user->long($long);
+ $user->qra(DXBearing::lltoqra($lat, $long)) unless $user->qra && DXBearing::is_qra($user->qra);
} elsif ($field[2] == 4) {
$user->homenode($field[3]);
}
+ $user->lastoper($main::systime); # to cut down on excessive for/opers being generated
$user->put;
last SWITCH;
}
my $s = sprintf "%.2f", $t;
my $ave = sprintf "%.2f", $tochan ? ($tochan->{pingave} || $t) : $t;
$dxchan->send($dxchan->msg('pingi', $field[2], $s, $ave))
- } elsif ($dxchan->is_ak1a) {
+ } elsif ($dxchan->is_node) {
if ($tochan) {
$tochan->{nopings} = 2; # pump up the timer
push @{$tochan->{pingtime}}, $t;
}
return;
}
+
+ if ($pcno == 75) { # dunno but route it
+ if ($field[1] ne $main::mycall) {
+ $self->route($field[1], $line);
+ }
+ return;
+ }
+
+ if ($pcno == 73) { # WCY broadcasts
+
+ # do some de-duping
+ my $d = cltounix($field[1], sprintf("%02d18Z", $field[2]));
+ if (($pcno == 23 && $d < $main::systime - $pc23_max_age) || $d > $main::systime + 1500 || $field[2] < 0 || $field[2] > 23) {
+ dbg('chan', "WCY Date ($field[1] $field[2]) out of range");
+ return;
+ }
+ @field = map { unpad($_) } @field;
+ if (WCY::dup($d,@field[3..7])) {
+ dbg('chan', "Dup WCY Spot ignored\n");
+ return;
+ }
+
+ my $wcy = WCY::update($d, @field[2..12]);
+
+ my $rep;
+ eval {
+ $rep = Local::wwv($self, @field[1..12]);
+ };
+ # dbg('local', "Local::wcy error $@") if $@;
+ return if $rep;
+
+ # broadcast to the eager world
+ send_wcy_spot($self, $line, $d, @field[2..12]);
+ return;
+ }
+
+ if ($pcno == 84) { # remote commands (incoming)
+ if ($field[1] eq $main::mycall) {
+ my $ref = DXUser->get_current($field[2]);
+ my $cref = DXCluster->get($field[2]);
+ Log('rcmd', 'in', $ref->{priv}, $field[2], $field[4]);
+ unless ($field[4] =~ /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[4]));
+ $self->{priv} = $oldpriv;
+ for (@in) {
+ s/\s*$//og;
+ $self->send(pc85($main::mycall, $field[2], $field[3], "$main::mycall:$_"));
+ Log('rcmd', 'out', $field[2], $_);
+ }
+ delete $self->{remotecmd};
+ } else {
+ $self->send(pc85($main::mycall, $field[2], $field[3], "$main::mycall:sorry...!"));
+ }
+ } else {
+ $self->send(pc85($main::mycall, $field[2], $field[3],"$main::mycall:your attempt is logged, Tut tut tut...!"));
+ }
+ } else {
+ my $ref = DXUser->get_current($field[1]);
+ if ($ref && $ref->is_clx) {
+ $self->route($field[1], $line);
+ } else {
+ route($field[1], pc34($field[2], $field[1], $field[4]));
+ }
+ }
+ return;
+ }
+
+ if ($pcno == 85) { # remote command replies
+ if ($field[1] eq $main::mycall) {
+ my $dxchan = DXChannel->get($field[3]);
+ if ($dxchan) {
+ $dxchan->send($field[4]);
+ } else {
+ my $s = $rcmds{$field[2]};
+ if ($s) {
+ $dxchan = DXChannel->get($s->{call});
+ $dxchan->send($field[4]) if $dxchan;
+ delete $rcmds{$field[2]} if !$dxchan;
+ } else {
+ # send unsolicited ones to the sysop
+ my $dxchan = DXChannel->get($main::myalias);
+ $dxchan->send($field[4]) if $dxchan;
+ }
+ }
+ } else {
+ my $ref = DXUser->get_current($field[1]);
+ if ($ref && $ref->is_clx) {
+ $self->route($field[1], $line);
+ } else {
+ route($field[1], pc35($field[2], $field[1], $field[4]));
+ }
+ }
+ return;
+ }
}
- # if get here then rebroadcast the thing with its Hop count decremented (if
- # there is one). If it has a hop count and it decrements to zero then don't
- # rebroadcast it.
- #
- # NOTE - don't arrive here UNLESS YOU WANT this lump of protocol to be
- # REBROADCAST!!!!
- #
+ # if get here then rebroadcast the thing with its Hop count decremented (if
+ # there is one). If it has a hop count and it decrements to zero then don't
+ # rebroadcast it.
+ #
+ # NOTE - don't arrive here UNLESS YOU WANT this lump of protocol to be
+ # REBROADCAST!!!!
+ #
unless ($self->{isolate}) {
broadcast_ak1a($line, $self); # send it to everyone but me
my $dxchan;
foreach $dxchan (@dxchan) {
- next unless $dxchan->is_ak1a();
+ next unless $dxchan->is_node();
next if $dxchan == $me;
# send a pc50 out on this channel
my $val;
my $cutoff;
if ($main::systime - 3600 > $last_hour) {
- $cutoff = $main::systime - $pc11_dup_age;
- 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;
- }
- $cutoff = $main::systime - $pc12_dup_age;
- while (($key, $val) = each %anndup) {
- delete $anndup{$key} if $val < $cutoff;
- }
+# Spot::process;
+# Geomag::process;
+# AnnTalk::process;
$last_hour = $main::systime;
}
}
{
my $self = shift;
my $call = $self->call;
- my $nopc39 = shift;
+ my $conn = shift;
my $ref = DXCluster->get_exact($call);
- $self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op"))) unless $nopc39;
-
# unbusy and stop and outgoing mail
my $mref = DXMsg::get_busy($call);
$mref->stop_msg($call) if $mref;
next unless $filter;
}
- if ($dxchan->is_ak1a) {
+ if ($dxchan->is_node) {
next if $dxchan == $self;
if ($hops) {
$routeit = $line;
$dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate};
}
} elsif ($dxchan->is_user && $dxchan->{dx}) {
- my $buf = Spot::formatb($_[0], $_[1], $_[2], $_[3], $_[4]);
+ my $buf = Spot::formatb($dxchan->{user}->wantgrid, $_[0], $_[1], $_[2], $_[3], $_[4]);
$buf .= "\a\a" if $dxchan->{beep};
- if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
+ if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
$dxchan->send($buf);
} else {
$dxchan->delay($buf);
my $routeit;
my ($filter, $hops);
- if ($dxchan->{spotfilter}) {
+ if ($dxchan->{wwvfilter}) {
($filter, $hops) = Filter::it($dxchan->{wwvfilter}, @_, $self->{call} );
next unless $filter;
}
- if ($dxchan->is_ak1a) {
+ if ($dxchan->is_node) {
next if $dxchan == $self;
if ($hops) {
$routeit = $line;
} elsif ($dxchan->is_user && $dxchan->{wwv}) {
my $buf = "WWV de $_[6] <$_[1]>: SFI=$_[2], A=$_[3], K=$_[4], $_[5]";
$buf .= "\a\a" if $dxchan->{beep};
- if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
+ if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
+ $dxchan->send($buf);
+ } else {
+ $dxchan->delay($buf);
+ }
+ }
+ }
+}
+
+sub send_wcy_spot
+{
+ my $self = shift;
+ my $line = shift;
+ my @dxchan = DXChannel->get_all();
+ my $dxchan;
+
+ # send it if it isn't the except list and isn't isolated and still has a hop count
+ # taking into account filtering and so on
+ foreach $dxchan (@dxchan) {
+ my $routeit;
+ my ($filter, $hops);
+
+ if ($dxchan->{wcyfilter}) {
+ ($filter, $hops) = Filter::it($dxchan->{wcyfilter}, @_, $self->{call} );
+ next unless $filter;
+ }
+ if ($dxchan->is_clx || $dxchan->is_spider) {
+ next if $dxchan == $self;
+ if ($hops) {
+ $routeit = $line;
+ $routeit =~ s/\^H\d+\^\~$/\^H$hops\^\~/;
+ } else {
+ $routeit = adjust_hops($dxchan, $line); # adjust its hop count by node name
+ next unless $routeit;
+ }
+ if ($filter) {
+ $dxchan->send($routeit) if $routeit;
+ } else {
+ $dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate};
+ }
+ } elsif ($dxchan->is_user && $dxchan->{wcy}) {
+ my $buf = "WCY de $_[10] <$_[1]> : K=$_[4] expK=$_[5] A=$_[3] R=$_[6] SFI=$_[2] SA=$_[7] GMF=$_[8] Au=$_[9]";
+ $buf .= "\a\a" if $dxchan->{beep};
+ if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
$dxchan->send($buf);
} else {
$dxchan->delay($buf);
($filter, $hops) = Filter::it($dxchan->{annfilter}, @_, $self->{call} );
next unless $filter;
}
- if ($dxchan->is_ak1a && $_[1] ne $main::mycall) { # i.e not specifically routed to me
+ if ($dxchan->is_node && $_[1] ne $main::mycall) { # i.e not specifically routed to me
next if $dxchan == $self;
if ($hops) {
$routeit = $line;
$dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate};
}
- } elsif ($dxchan->is_user && $dxchan->{ann}) {
+ } elsif ($dxchan->is_user) {
+ unless ($dxchan->{ann}) {
+ next if $_[0] ne $main::myalias && $_[0] ne $main::mycall;
+ }
next if $target eq 'SYSOP' && $dxchan->{priv} < 5;
my $buf = "$to$target de $_[0]: $text";
$buf .= "\a\a" if $dxchan->{beep};
- if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
+ if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
$dxchan->send($buf);
} else {
$dxchan->delay($buf);
{
my $s = shift; # the line to be rebroadcast
my @except = @_; # to all channels EXCEPT these (dxchannel refs)
- my @dxchan = DXChannel::get_all_ak1a();
+ my @dxchan = DXChannel::get_all_nodes();
my $dxchan;
# send it if it isn't the except list and isn't isolated and still has a hop count
{
my $s = shift; # the line to be rebroadcast
my @except = @_; # to all channels EXCEPT these (dxchannel refs)
- my @dxchan = DXChannel::get_all_ak1a();
+ my @dxchan = DXChannel::get_all_nodes();
my $dxchan;
# send it if it isn't the except list and isn't isolated and still has a hop count
}
next if $sort eq 'ann' && !$dxchan->{ann};
next if $sort eq 'wwv' && !$dxchan->{wwv};
+ next if $sort eq 'wcy' && !$dxchan->{wcy};
next if $sort eq 'wx' && !$dxchan->{wx};
$s =~ s/\a//og unless $dxchan->{beep};
- if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
+ if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
$dxchan->send($s);
} else {
$dxchan->delay($s);
return 0;
}
-# remove leading and trailing spaces from an input string
-sub unpad
-{
- my $s = shift;
- $s =~ s/^\s+|\s+$//;
- return $s;
-}
# add a ping request to the ping queues
sub addping
# add a rcmd request to the rcmd queues
sub addrcmd
{
- my ($from, $to, $cmd) = @_;
+ my ($self, $to, $cmd) = @_;
+
my $r = {};
- $r->{call} = $from;
+ $r->{call} = $self->{call};
$r->{t} = $main::systime;
$r->{cmd} = $cmd;
- route(undef, $to, pc34($main::mycall, $to, $cmd));
$rcmds{$to} = $r;
+
+ my $ref = DXCluster->get_exact($to);
+ if ($ref && $ref->dxchan && $ref->dxchan->is_clx) {
+ route(undef, $to, pc84($main::mycall, $to, $self->{call}, $cmd));
+ } else {
+ route(undef, $to, pc34($main::mycall, $to, $cmd));
+ }
+}
+
+sub disconnect
+{
+ my $self = shift;
+ my $nopc39 = shift;
+
+ if ($self->{conn} && !$nopc39) {
+ $self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op")));
+ }
+
+ $self->SUPER::disconnect;
+}
+
+
+#
+# send a talk message to this thingy
+#
+sub talk
+{
+ my ($self, $from, $to, $via, $line) = @_;
+
+ $line =~ s/\^/\\5E/g; # remove any ^ characters
+ $self->send(DXProt::pc10($from, $to, $via, $line));
+ Log('talk', $self->call, $from, $via?$via:$main::mycall, $line);
}
1;
__END__