X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=88aef0db00395a2be049f12f8590be58d66c529d;hb=f155969d600561b9ef151a7ce2494a0c89aed033;hp=b8d563979b762f12e7e0ebf7db3ed37560a956aa;hpb=d49641602b7abfa832d6baaf18dc15969040083e;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index b8d56397..88aef0db 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -25,27 +25,22 @@ 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 - %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 -%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 @@ -66,21 +61,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 $dupkey = "$_->[1].$_->[2]$_->[3]$_->[4]"; - $wwvdup{$dupkey} = $_->[1]; + for (Geomag::readfile(time)) { + Geomag::dup(@{$_}[1..5]); } # load the baddx file @@ -95,7 +82,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; } @@ -127,23 +113,29 @@ sub start $self->send_now('E',"0"); # ping neighbour node stuff - $self->pingint($user->pingint || 3*60); - $self->nopings(3); - $self->pingtime([ ]); + my $ping = $user->pingint; + $ping = 5*60 unless defined $ping; + $self->{pingint} = $ping; + $self->{nopings} = $user->nopings || 2; + $self->{pingtime} = [ ]; + $self->{pingave} = 0; # send initialisation string unless ($self->{outbound}) { $self->send(pc38()) if DXNode->get_all(); $self->send(pc18()); - $self->lastping($main::systime); + $self->{lastping} = $main::systime; } else { # remove from outstanding connects queue @main::outstanding_connects = grep {$_->{call} ne $call} @main::outstanding_connects; - $self->lastping($main::systime + $self->pingint / 2); + $self->{lastping} = $main::systime + $self->pingint / 2; } $self->state('init'); $self->pc50_t(time); + # send info to all logged in thingies + $self->tell_login('loginn'); + Log('DXProt', "$call connected"); } @@ -164,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) { @@ -185,7 +177,7 @@ sub normal # 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, get_all_user_calls()) { + if ($call eq $main::mycall || grep $_ eq $call, DXChannel::get_all_user_calls()) { # yes, it is my $text = unpad($field[3]); @@ -223,23 +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 $dupkey = "$freq$field[2]$d$text$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"); @@ -252,7 +227,13 @@ sub normal return; } - my @spot = Spot::add($freq, $field[2], $d, $text, $spotter, $field[7]); + # do some de-duping + 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:- @@ -279,13 +260,10 @@ 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}) { + 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) { @@ -523,17 +501,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); @@ -625,7 +601,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; } @@ -639,7 +620,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; } @@ -651,7 +637,7 @@ sub normal } if ($pcno == 39) { # incoming disconnect - $self->disconnect(); + $self->disconnect(1); return; } @@ -682,7 +668,7 @@ sub normal if ($pcno == 43) { last SWITCH; } - if ($pcno == 37 || $pcno == 44 || $pcno == 45 || $pcno == 46 || $pcno == 47) { + if ($pcno == 37 || $pcno == 44 || $pcno == 45 || $pcno == 46 || $pcno == 47 || $pcno == 48) { DXDb::process($self, $line); return; } @@ -716,18 +702,18 @@ sub normal my $t = tv_interval($r->{t}, [ gettimeofday ]); if ($dxchan->is_user) { my $s = sprintf "%.2f", $t; - my $ave = sprintf "%.2f", $tochan ? ($tochan->pingave || $t) : $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(3); # pump up the timer - push @{$tochan->pingtime}, $t; - shift @{$tochan->pingtime} if @{$tochan->pingtime} > 6; + $tochan->{nopings} = 2; # pump up the timer + push @{$tochan->{pingtime}}, $t; + shift @{$tochan->{pingtime}} if @{$tochan->{pingtime}} > 6; my $st; - for (@{$tochan->pingtime}) { + for (@{$tochan->{pingtime}}) { $st += $_; } - $tochan->{pingave} = $st / @{$tochan->pingtime}; + $tochan->{pingave} = $st / @{$tochan->{pingtime}}; } } } @@ -739,15 +725,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 @@ -765,23 +838,23 @@ 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 if ($t >= $dxchan->pc50_t + $DXProt::pc50_interval) { - $dxchan->send(pc50()); + $dxchan->send(pc50(scalar DXChannel::get_all_users)); $dxchan->pc50_t($t); } # send a ping out on this channel - if ($t >= $dxchan->pingint + $dxchan->lastping) { - if ($dxchan->nopings <= 0) { + if ($dxchan->{pingint} && $t >= $dxchan->{pingint} + $dxchan->{lastping}) { + if ($dxchan->{nopings} <= 0) { $dxchan->disconnect; } else { addping($main::mycall, $dxchan->call); - $dxchan->nopings($dxchan->nopings - 1); - $dxchan->lastping($t); + $dxchan->{nopings} -= 1; + $dxchan->{lastping} = $t; } } } @@ -790,18 +863,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; } } @@ -813,10 +877,11 @@ sub finish { my $self = shift; my $call = $self->call; + my $nopc39 = shift; my $ref = DXCluster->get_exact($call); - $self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op"))); - + $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; @@ -836,7 +901,13 @@ sub finish # now broadcast to all other ak1a nodes that I have gone broadcast_ak1a(pc21($call, 'Gone.'), $self) unless $self->{isolate}; - + + # I was the last node visited + $self->user->node($main::mycall); + + # send info to all logged in thingies + $self->tell_login('logoutn'); + Log('DXProt', $call . " Disconnected"); $ref->del() if $ref; } @@ -862,7 +933,7 @@ sub send_dx_spot next unless $filter; } - if ($dxchan->is_ak1a) { + if ($dxchan->is_node) { next if $dxchan == $self; if ($hops) { $routeit = $line; @@ -901,11 +972,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; @@ -932,6 +1003,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 { @@ -968,7 +1082,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; @@ -1068,7 +1182,7 @@ sub broadcast_ak1a { my $s = shift; # the line to be rebroadcast my @except = @_; # to all channels EXCEPT these (dxchannel refs) - my @dxchan = get_all_ak1a(); + my @dxchan = DXChannel::get_all_ak1a(); my $dxchan; # send it if it isn't the except list and isn't isolated and still has a hop count @@ -1085,7 +1199,7 @@ sub broadcast_all_ak1a { my $s = shift; # the line to be rebroadcast my @except = @_; # to all channels EXCEPT these (dxchannel refs) - my @dxchan = get_all_ak1a(); + my @dxchan = DXChannel::get_all_ak1a(); my $dxchan; # send it if it isn't the except list and isn't isolated and still has a hop count @@ -1104,7 +1218,7 @@ sub broadcast_users my $sort = shift; # the type of transmission my $fref = shift; # a reference to an object to filter on my @except = @_; # to all channels EXCEPT these (dxchannel refs) - my @dxchan = get_all_users(); + my @dxchan = DXChannel::get_all_users(); my $dxchan; my @out; @@ -1133,6 +1247,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}; @@ -1145,43 +1260,6 @@ sub broadcast_list } } -# -# gimme all the ak1a nodes -# -sub get_all_ak1a -{ - my @list = DXChannel->get_all(); - my $ref; - my @out; - foreach $ref (@list) { - push @out, $ref if $ref->is_ak1a; - } - return @out; -} - -# return a list of all users -sub get_all_users -{ - my @list = DXChannel->get_all(); - my $ref; - my @out; - foreach $ref (@list) { - push @out, $ref if $ref->is_user; - } - return @out; -} - -# return a list of all user callsigns -sub get_all_user_calls -{ - my @list = DXChannel->get_all(); - my $ref; - my @out; - foreach $ref (@list) { - push @out, $ref->call if $ref->is_user; - } - return @out; -} # # obtain the hops from the list for this callsign and pc no @@ -1240,13 +1318,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 @@ -1264,13 +1335,20 @@ 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)); + } } 1; __END__