X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=a28d36f5992a060608258656165a90be943d1f2e;hb=fe322eb02369fded6defe0f3fa7ae6530496ef9c;hp=4bdb307fe49b589c5bd367fae12d66f4afceb552;hpb=d99e357e5203c7742b57c51b7c2dd103c1836c01;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 4bdb307f..a28d36f5 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -28,16 +28,19 @@ use Local; use Carp; use strict; -use vars qw($me $pc11_max_age $pc11_dup_age $pc23_dup_age - %spotdup %wwvdup $last_hour %pings %rcmds +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); + %anndup $allowzero $pc12_dup_lth $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 = 24*3600; # the maximum time to keep the spot dup list for $pc23_dup_age = 24*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_age = 12*3600; # the maximum time to keep the ann dup list for +$pc12_dup_lth = 72; # 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 @@ -149,7 +152,13 @@ sub normal my ($pcno) = $field[0] =~ /^PC(\d\d)/; # just get the number return unless $pcno; return if $pcno < 10 || $pcno > 51; - + + # 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"); + return; + } + # local processing 1 my $pcr; eval { @@ -178,6 +187,14 @@ sub normal } if ($pcno == 11 || $pcno == 26) { # dx spot + + # route 'foreign' pc26s + if ($pcno == 26) { + if ($field[7] ne $main::mycall) { + route($field[7], $line); + return; + } + } # if this is a 'nodx' node then ignore it last SWITCH if grep $field[7] =~ /^$_/, @DXProt::nodx_node; @@ -195,7 +212,7 @@ sub normal # store it away my $spotter = $field[6]; - $spotter =~ s/-\d+$//o; # strip off the ssid from the spotter + $spotter =~ s/-[\@\d]+$//o; # strip off the ssid from the spotter # do some de-duping my $freq = $field[1] - 0; @@ -212,6 +229,12 @@ sub normal 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"); + return; + } my @spot = Spot::add($freq, $field[2], $d, $text, $spotter, $field[7]); @@ -239,8 +262,8 @@ sub normal } if ($pcno == 12) { # announces - # announce duplicate checking - my $text = uc unpad($field[3]); + # announce duplicate checking + my $text = substr(uc unpad($field[3]), 0, $pc12_dup_lth); my $dupkey = $field[1].$field[2].$text.$field[4].$field[6]; if ($anndup{$dupkey}) { dbg('chan', "Duplicate Announce ignored\n"); @@ -248,7 +271,7 @@ sub normal } $anndup{$dupkey} = $main::systime; - # global ann filtering + # global ann filtering on INPUT my ($filter, $hops) = Filter::it($self->{annfilter}, @field[1..6], $self->{call} ) if $self->{annfilter}; if ($self->{annfilter} && !$filter) { dbg('chan', "Rejected by filter"); @@ -284,6 +307,12 @@ sub normal } Log('ann', $target, $field[1], $text); + 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); + } + return if $field[2] eq $main::mycall; # it's routed to me } else { route($field[2], $line); @@ -305,10 +334,15 @@ sub normal if ($pcno == 16) { # add a user my $node = DXCluster->get_exact($field[1]); - last SWITCH if !$node; # ignore if havn't seen a PC19 for this one yet - last SWITCH unless $node->isa('DXNode'); + return unless $node; # ignore if havn't seen a PC19 for this one yet + return unless $node->isa('DXNode'); if ($node->dxchan != $self) { - dbg('chan', "LOOP: come in on wrong channel"); + dbg('chan', "LOOP: $field[1] came in on wrong channel"); + return; + } + my $dxchan; + if (($dxchan = DXChannel->get($field[1])) && $dxchan != $self) { + dbg('chan', "LOOP: $field[1] connected locally"); return; } my $i; @@ -341,9 +375,15 @@ sub normal if ($pcno == 17) { # remove a user my $node = DXCluster->get_exact($field[2]); - last SWITCH unless $node->isa('DXNode'); + return unless $node; + return unless $node->isa('DXNode'); if ($node->dxchan != $self) { - dbg('chan', "LOOP: come in on wrong channel"); + dbg('chan', "LOOP: $field[2] came in on wrong channel"); + return; + } + my $dxchan; + if (($dxchan = DXChannel->get($field[2])) && $dxchan != $self) { + dbg('chan', "LOOP: $field[2] connected locally"); return; } my $ref = DXCluster->get_exact($field[1]); @@ -352,36 +392,57 @@ sub normal } if ($pcno == 18) { # link request + $self->state('init'); + + # first clear out any nodes on this dxchannel + my @gonenodes = map { $_->dxchan == $self ? $_ : () } DXNode::get_all(); + foreach my $node (@gonenodes) { + next if $node->dxchan == $DXProt::me; + broadcast_ak1a(pc21($node->call, 'Gone, re-init') , $self) unless $self->{isolate}; + $node->del(); + } $self->send_local_config(); $self->send(pc20()); - $self->state('init'); return; # we don't pass these on } if ($pcno == 19) { # incoming cluster list my $i; + my $newline = "PC19^"; for ($i = 1; $i < $#field-1; $i += 4) { my $here = $field[$i]; my $call = uc $field[$i+1]; - my $confmode = $field[$i+2] eq '*'; + my $confmode = $field[$i+2]; my $ver = $field[$i+3]; + + $ver = 5400 if !$ver && $allowzero; # now check the call over - my $node = DXCluster->get_exact($call); # we already have this - if ($node && $node->dxchan != $self) { - dbg('chan', "LOOP: come in on wrong channel"); - return; + my $node = DXCluster->get_exact($call); + if ($node) { + my $dxchan; + if (($dxchan = DXChannel->get($call)) && $dxchan != $self) { + dbg('chan', "LOOP: $call connected locally"); + } + if ($node->dxchan != $self) { + dbg('chan', "LOOP: $call come in on wrong channel"); + next; + } + dbg('chan', "already have $call"); + next; } - next if $node; # check for sane parameters next if $ver < 5000; # only works with version 5 software next if length $call < 3; # min 3 letter callsigns + + # add it to the nodes table and outgoing line + $newline .= "$here^$call^$confmode^$ver^"; DXNode->new($self, $call, $confmode, $here, $ver); # unbusy and stop and outgoing mail (ie if somehow we receive another PC19 without a disconnect) my $mref = DXMsg::get_busy($call); - $mref->stop_msg($self) if $mref; + $mref->stop_msg($call) if $mref; # add this station to the user database, if required (don't remove SSID from nodes) my $user = DXUser->get_current($call); @@ -397,8 +458,11 @@ sub normal $user->put; } - # queue up any messages - DXMsg::queue_msg(0) if $self->state eq 'normal'; + return if $newline eq "PC19^"; + + # add hop count + $newline .= get_hops(19) . "^"; + $line = $newline; last SWITCH; } @@ -406,10 +470,6 @@ sub normal $self->send_local_config(); $self->send(pc22()); $self->state('normal'); - - # queue mail - DXMsg::queue_msg(0); - return; } @@ -419,7 +479,12 @@ sub normal my $node = DXCluster->get_exact($call); if ($node) { if ($node->dxchan != $self) { - dbg('chan', "LOOP: come in on wrong channel"); + dbg('chan', "LOOP: $call come in on wrong channel"); + return; + } + my $dxchan; + if (($dxchan = DXChannel->get($call)) && $dxchan != $self) { + dbg('chan', "LOOP: $call connected locally"); return; } $node->del(); @@ -433,45 +498,52 @@ sub normal if ($pcno == 22) { $self->state('normal'); - - # queue mail - DXMsg::queue_msg(0); return; } - + if ($pcno == 23 || $pcno == 27) { # WWV info + + # route 'foreign' pc27s + if ($pcno == 27) { + if ($field[8] ne $main::mycall) { + route($field[8], $line); + return; + } + } + # do some de-duping my $d = cltounix($field[1], sprintf("%02d18Z", $field[2])); my $sfi = unpad($field[3]); my $k = unpad($field[4]); my $i = unpad($field[5]); + my $r = $field[6] =~ /R=(\d+)/ || 0; my $dupkey = "$d.$sfi$k$i"; if ($wwvdup{$dupkey}) { dbg('chan', "Dup WWV Spot ignored\n"); return; } - if ($d > $main::systime + 900 || $field[2] < 0 || $field[2] > 23) { + if (($pcno == 23 && $d < $main::systime - $pc23_max_age) || $d > $main::systime + 900 || $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 - my $wwv = Geomag::update($d, $field[2], $sfi, $k, $i, @field[6..$#field]); + my $wwv = Geomag::update($d, $field[2], $sfi, $k, $i, @field[6..8], $r); - my $r; + my $rep; eval { - $r = Local::wwv($self, $field[1], $field[2], $sfi, $k, $i, @field[6..$#field]); + $rep = Local::wwv($self, $field[1], $field[2], $sfi, $k, $i, @field[6..8], $r); }; # dbg('local', "Local::wwv2 error $@") if $@; - return if $r; + return if $rep; # DON'T be silly and send on PC27s! return if $pcno == 27; - # broadcast to the eager users - broadcast_users("WWV de $field[7] <$field[2]>: SFI=$sfi, A=$k, K=$i, $field[6]", 'wwv', $wwv ); - last SWITCH; + # broadcast to the eager world + send_wwv_spot($self, $line, $d, $field[2], $sfi, $k, $i, @field[6..8]); + return; } if ($pcno == 24) { # set here status @@ -486,15 +558,19 @@ sub normal route($field[1], $line); return; } + if ($field[2] eq $main::mycall) { + dbg('chan', "Trying to merge to myself, ignored"); + return; + } Log('DXProt', "Merge request for $field[3] spots and $field[4] WWV from $field[1]"); # spots if ($field[3] > 0) { - my @in = reverse Spot::search(1, undef, undef, 0, $field[3]-1); + my @in = reverse Spot::search(1, undef, undef, 0, $field[3]); my $in; foreach $in (@in) { - $self->send(pc26(@{$in}[0..4], $in->[7])); + $self->send(pc26(@{$in}[0..4], $field[2])); } } @@ -503,14 +579,18 @@ sub normal my @in = reverse Geomag::search(0, $field[4], time, 1); my $in; foreach $in (@in) { - $self->send(pc27(@{$in})); + $self->send(pc27(@{$in}[0..5], $field[2])); } } return; } - + if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42 || $pcno == 49) { # mail/file handling - DXMsg::process($self, $line); + if ($pcno == 49 || $field[1] eq $main::mycall) { + DXMsg::process($self, $line); + } else { + route($field[1], $line); + } return; } @@ -558,10 +638,8 @@ sub normal return; } - if ($pcno == 37) { - last SWITCH; - } - + # for pc 37 see 44 onwards + if ($pcno == 38) { # node connected list from neighbour return; } @@ -598,25 +676,22 @@ sub normal if ($pcno == 43) { last SWITCH; } - if ($pcno == 44) { - last SWITCH; - } - if ($pcno == 45) { - last SWITCH; - } - if ($pcno == 46) { - last SWITCH; - } - if ($pcno == 47) { - last SWITCH; - } - if ($pcno == 48) { - last SWITCH; + if ($pcno == 37 || $pcno == 44 || $pcno == 45 || $pcno == 46 || $pcno == 47) { + if ($field[1] eq $main::mycall) { + ; + } else { + route($field[1], $line); + } + return; } if ($pcno == 50) { # keep alive/user list - my $ref = DXCluster->get_exact($field[1]); - $ref->update_users($field[2]) if $ref; + my $node = DXCluster->get_exact($field[1]); + if ($node) { + return unless $node->isa('DXNode'); + return unless $node->dxchan == $self; + $node->update_users($field[2]); + } last SWITCH; } @@ -710,7 +785,7 @@ sub finish # unbusy and stop and outgoing mail my $mref = DXMsg::get_busy($call); - $mref->stop_msg($self) if $mref; + $mref->stop_msg($call) if $mref; # broadcast to all other nodes that all the nodes connected to via me are gone my @gonenodes = map { $_->dxchan == $self ? $_ : () } DXNode::get_all(); @@ -726,7 +801,7 @@ sub finish delete $pings{$call}; # now broadcast to all other ak1a nodes that I have gone - broadcast_ak1a(pc21($call, 'Gone.'), $self); + broadcast_ak1a(pc21($call, 'Gone.'), $self) unless $self->{isolate}; Log('DXProt', $call . " Disconnected"); $ref->del() if $ref; @@ -746,7 +821,13 @@ sub send_dx_spot # taking into account filtering and so on foreach $dxchan (@dxchan) { my $routeit; - my ($filter, $hops) = Filter::it($dxchan->{spotfilter}, @_, $self->{call} ) if $dxchan->{spotfilter}; + my ($filter, $hops); + + if ($dxchan->{spotfilter}) { + ($filter, $hops) = Filter::it($dxchan->{spotfilter}, @_, $self->{call} ); + next unless $filter; + } + if ($dxchan->is_ak1a) { next if $dxchan == $self; if ($hops) { @@ -774,6 +855,45 @@ sub send_dx_spot } } +sub send_wwv_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) = Filter::it($dxchan->{wwvfilter}, @_, $self->{call} ) if $dxchan->{wwvfilter}; + if ($dxchan->is_ak1a) { + 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->{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') { + $dxchan->send($buf) if !$hops || ($hops && $filter); + } else { + $dxchan->delay($buf) if !$hops || ($hops && $filter); + } + } + } +} + sub send_local_config { my $self = shift; @@ -963,7 +1083,7 @@ sub get_all_user_calls sub get_hops { - my ($pcno) = @_; + my $pcno = shift; my $hops = $DXProt::hopcount{$pcno}; $hops = $DXProt::def_hopcount if !$hops; return "H$hops";