X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=0a1c83ddbce0278dbac19abfa5fc76d4678096c0;hb=e83b70ecab022dbbeac0b56f67ed2e4bed609e86;hp=3d3894d105fcc1e38349b0ad478badf6f27de1d0;hpb=de987b900c04d852acec5e1af9a4326b16533253;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 3d3894d1..0a1c83dd 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -25,29 +25,21 @@ use DXDebug; use Filter; use Local; use DXDb; +use AnnTalk; +use Geomag; +use WCY; use Time::HiRes qw(gettimeofday tv_interval); -use Carp; - 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); $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 = 27; # 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 @@ -68,22 +60,13 @@ sub init confess $@ if $@; # $me->{sort} = 'M'; # M for me - # now prime the spot duplicates file with today's and yesterday's data + # now prime the spot and wwv duplicates file with data my @today = Julian::unixtoj(time); - my @spots = Spot::readfile(@today); - @today = Julian::sub(@today, 1); - push @spots, Spot::readfile(@today); - for (@spots) { - my $dupkey = "$_->[0]$_->[1]$_->[2]$_->[3]$_->[4]"; - $spotdup{$dupkey} = $_->[2]; + for (Spot::readfile(@today), Spot::readfile(Julian::sub(@today, 1))) { + Spot::dup(@{$_}[0..3]); } - - # now prime the wwv duplicates file with just this month's data - my @wwv = Geomag::readfile(time); - for (@wwv) { - my $duptext = substr $_->[3], 0, $pc11duptext; - my $dupkey = "$_->[1].$_->[2]$duptext$_->[4]"; - $wwvdup{$dupkey} = $_->[1]; + for (Geomag::readfile(time)) { + Geomag::dup(@{$_}[1..5]); } # load the baddx file @@ -98,7 +81,6 @@ sub init 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; } @@ -123,6 +105,7 @@ sub start # 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 @@ -173,7 +156,7 @@ sub normal # 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) { @@ -232,24 +215,6 @@ sub normal return; } - # strip off the leading & trailing spaces from the comment - 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 $duptext = substr $text, 0, $pc11duptext; - 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"); @@ -257,12 +222,19 @@ sub normal } # 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"); + if ($field[2] =~ /(?:^\s*$|[a-z])/ || $field[6] =~ /(?:^\s*$|[a-z])/ || $field[7] =~ /(?:^\s*$|[a-z])/) { + dbg('chan', "Spot contains lower case callsigns or blanks, rejected"); return; } - my @spot = Spot::add($freq, $field[2], $d, $text, $spotter, $field[7]); + # 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($field[1], $field[2], $d, $field[5], $field[6], $field[7]); # # @spot at this point contains:- @@ -271,6 +243,20 @@ sub normal # 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; + if (!DXBearing::is_qra) { + my $lat = $user->lat; + my $long = $user->long; + if (defined $lat && defined $long) { + $user->qra(DXBearing::lltoqra($lat, $long)); + $user->put; + } + } + } + # local processing my $r; eval { @@ -289,13 +275,11 @@ sub normal 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}) { + $field[3] =~ s/^\s+//; # remove leading blanks + if (AnnTalk::dup($field[1], $field[2], $field[3])) { dbg('chan', "Duplicate Announce ignored\n"); return; } - $anndup{$dupkey} = $main::systime; if ($field[2] eq '*' || $field[2] eq $main::mycall) { @@ -310,13 +294,6 @@ sub normal # 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); } @@ -533,17 +510,15 @@ sub normal 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); @@ -635,7 +610,12 @@ sub normal $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; } @@ -649,7 +629,12 @@ sub normal delete $rcmds{$field[2]} 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; } @@ -683,6 +668,8 @@ sub normal my ($lat, $long) = DXBearing::stoll($field[3]); $user->lat($lat); $user->long($long); + my $qra = $user->qra || DXBearing::lltoqra($lat, $long); + $qra = DXBearing::lltoqra($lat, $long) unless DXBearing::is_qra($qra); } elsif ($field[2] == 4) { $user->homenode($field[3]); } @@ -728,7 +715,7 @@ sub normal 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; @@ -749,15 +736,102 @@ sub normal } 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[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[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[3])); + } + } + 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 { + 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[3])); + } + } + 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 @@ -775,7 +849,7 @@ sub process 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 @@ -800,18 +874,9 @@ sub process 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; } } @@ -823,11 +888,9 @@ sub finish { 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; @@ -879,7 +942,7 @@ sub send_dx_spot next unless $filter; } - if ($dxchan->is_ak1a) { + if ($dxchan->is_node) { next if $dxchan == $self; if ($hops) { $routeit = $line; @@ -918,11 +981,11 @@ sub send_wwv_spot 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; @@ -949,6 +1012,49 @@ sub send_wwv_spot } } +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 'convers') { + $dxchan->send($buf); + } else { + $dxchan->delay($buf); + } + } + } +} + # send an announce sub send_announce { @@ -985,7 +1091,7 @@ sub send_announce ($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; @@ -1150,6 +1256,7 @@ sub broadcast_list } 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}; @@ -1220,13 +1327,6 @@ sub load_hops 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 @@ -1244,13 +1344,32 @@ 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; } 1; __END__