X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=6b7d1b949bf363a5c640e2405fef3d38e0e95fec;hb=6e1e3dbb021d95286ba02e27ac96d53abdbb3823;hp=15f92c477e8aaf6d5cb2919aecd456d42c876177;hpb=7ab16be46aa296e9fba7b063c074bb020a9eb462;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 15f92c47..6b7d1b94 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -30,11 +30,12 @@ use Geomag; use WCY; use Time::HiRes qw(gettimeofday tv_interval); use BadWords; +use DXHash; use strict; use vars qw($me $pc11_max_age $pc23_max_age $last_hour %pings %rcmds - %nodehops @baddx $baddxfn $censorpc + %nodehops $baddx $badspotter $badnode $censorpc $allowzero $decode_dk0wcy $send_opernam @checklist); $me = undef; # the channel id for this cluster @@ -45,10 +46,11 @@ $last_hour = time; # last time I did an hourly periodic update %pings = (); # outstanding ping requests outbound %rcmds = (); # outstanding rcmd requests outbound %nodehops = (); # node specific hop control -@baddx = (); # list of illegal spotted callsigns -$censorpc = 0; # Do a BadWords::check on text fields and reject things - -$baddxfn = "$main::data/baddx.pl"; +$censorpc = 1; # Do a BadWords::check on text fields and reject things + # loads of 'bad things' +$baddx = new DXHash "baddx"; +$badspotter = new DXHash "badspotter"; +$badnode = new DXHash "badnode"; @checklist = ( @@ -177,10 +179,6 @@ sub init do "$main::data/hop_table.pl" if -e "$main::data/hop_table.pl"; confess $@ if $@; $me->{sort} = 'S'; # S for spider - - # load the baddx file - do "$baddxfn" if -e "$baddxfn"; - print "$@\n" if $@; } # @@ -238,13 +236,10 @@ sub start # send initialisation string unless ($self->{outbound}) { -# $self->send(pc38()) if DXNode->get_all(); $self->send(pc18()); $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); @@ -332,8 +327,14 @@ sub normal } # if this is a 'nodx' node then ignore it - if (grep $field[7] =~ /^$_/, @DXProt::nodx_node) { - dbg('chan', "PCPROT: Bad DXNode, dropped"); + if ($badnode->in($field[7])) { + dbg('chan', "PCPROT: Bad Node, dropped"); + return; + } + + # if this is a 'bad spotter' user then ignore it + if ($badspotter->in($field[6])) { + dbg('chan', "PCPROT: Bad Spotter, dropped"); return; } @@ -346,13 +347,18 @@ sub normal } # is it 'baddx' - if (grep $field[2] eq $_, @baddx) { + if ($baddx->in($field[2])) { dbg('chan', "PCPROT: Bad DX spot, ignored"); return; } # do some de-duping $field[5] =~ s/^\s+//; # take any leading blanks off + $field[2] = unpad($field[2]); # take off leading and trailing blanks from spotted callsign + if ($field[2] =~ /BUST\w*$/) { + dbg('chan', "PCPROT: useless 'BUSTED' spot"); + return; + } if (Spot::dup($field[1], $field[2], $d, $field[5])) { dbg('chan', "PCPROT: Duplicate Spot ignored\n"); return; @@ -559,6 +565,8 @@ sub normal # queue up any messages (look for privates only) DXMsg::queue_msg(1) if $self->state eq 'normal'; +# broadcast_route($line, $self, $field[1]); +# return; last SWITCH; } @@ -592,17 +600,23 @@ sub normal dbg('chan', "PCPROT: $field[2] came in on wrong channel"); return; } - if (($dxchan = DXChannel->get($field[2])) && $dxchan != $self) { - dbg('chan', "PCPROT: $field[2] connected locally"); + if ($dxchan = DXChannel->get($field[1])) { + dbg('chan', "PCPROT: $field[1] connected locally"); return; } my $ref = DXCluster->get_exact($field[1]); if ($ref) { + if ($ref->mynode != $node) { + dbg('chan', "PCPROT: $field[1] came in from wrong node $field[2]"); + return; + } $ref->del; } else { dbg('chan', "PCPROT: $field[1] not known" ); return; } +# broadcast_route($line, $self, $field[2]); +# return; last SWITCH; } @@ -721,6 +735,8 @@ sub normal dbg('chan', "PCPROT: I WILL _NOT_ be disconnected!"); return; } +# broadcast_route($line, $self, $call); +# return; last SWITCH; } @@ -848,7 +864,7 @@ sub normal } else { my $ref = DXUser->get_current($field[1]); if ($ref && $ref->is_clx) { - route($field[1], pc84($field[2], $field[1], $field[2], $field[3])); + $self->route($field[1], pc84($field[2], $field[1], $field[2], $field[3])); } else { $self->route($field[1], $line); } @@ -871,7 +887,7 @@ sub normal } else { my $ref = DXUser->get_current($field[1]); if ($ref && $ref->is_clx) { - route($field[1], pc85($field[2], $field[1], $field[2], $field[3])); + $self->route($field[1], pc85($field[2], $field[1], $field[2], $field[3])); } else { $self->route($field[1], $line); } @@ -956,7 +972,7 @@ sub normal $dxchan->send($dxchan->msg('pingi', $field[2], $s, $ave)) } elsif ($dxchan->is_node) { if ($tochan) { - $tochan->{nopings} = 2; # pump up the timer + $tochan->{nopings} = $tochan->user->nopings || 2; # pump up the timer push @{$tochan->{pingtime}}, $t; shift @{$tochan->{pingtime}} if @{$tochan->{pingtime}} > 6; my $st; @@ -1040,7 +1056,7 @@ sub normal if ($ref && $ref->is_clx) { $self->route($field[1], $line); } else { - route($field[1], pc34($field[2], $field[1], $field[4])); + $self->route($field[1], pc34($field[2], $field[1], $field[4])); } } return; @@ -1068,7 +1084,7 @@ sub normal if ($ref && $ref->is_clx) { $self->route($field[1], $line); } else { - route($field[1], pc35($field[2], $field[1], $field[4])); + $self->route($field[1], pc35($field[2], $field[1], $field[4])); } } return; @@ -1134,46 +1150,43 @@ sub process # # finish up a pc context # -sub finish + +# +# some active measures +# +sub send_route { my $self = shift; - my $call = $self->call; - my $conn = shift; - my $ref = DXCluster->get_exact($call); - - # unbusy and stop and outgoing mail - my $mref = DXMsg::get_busy($call); - $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(); - my $node; - - foreach $node (@gonenodes) { - next if $node->call eq $call; - broadcast_ak1a(pc21($node->call, 'Gone') , $self) unless $self->{isolate}; - $node->del(); - } - - # remove outstanding pings - delete $pings{$call}; + my $line = shift; + my @dxchan = DXChannel::get_all_nodes(); + my $dxchan; - # 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'); + # 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); - Log('DXProt', $call . " Disconnected"); - $ref->del() if $ref; + if ($dxchan->{routefilter}) { + ($filter, $hops) = $dxchan->{routefilter}->it($self->{call}, @_); + next unless $filter; + } + 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}; + } + } } -# -# some active measures -# sub send_dx_spot { my $self = shift; @@ -1225,6 +1238,19 @@ sub send_wwv_spot my $line = shift; my @dxchan = DXChannel->get_all(); my $dxchan; + my ($wwv_dxcc, $wwv_itu, $wwv_cq, $org_dxcc, $org_itu, $org_cq) = (0..0); + my @dxcc = Prefix::extract($_[7]); + if (@dxcc > 0) { + $wwv_dxcc = $dxcc[1]->dxcc; + $wwv_itu = $dxcc[1]->itu; + $wwv_cq = $dxcc[1]->cq; + } + @dxcc = Prefix::extract($_[8]); + if (@dxcc > 0) { + $org_dxcc = $dxcc[1]->dxcc; + $org_itu = $dxcc[1]->itu; + $org_cq = $dxcc[1]->cq; + } # 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 @@ -1233,7 +1259,7 @@ sub send_wwv_spot my ($filter, $hops); if ($dxchan->{wwvfilter}) { - ($filter, $hops) = $dxchan->{wwvfilter}->it(@_, $self->{call} ); + ($filter, $hops) = $dxchan->{wwvfilter}->it(@_, $self->{call}, $wwv_dxcc, $wwv_itu, $wwv_cq, $org_dxcc, $org_itu, $org_cq); next unless $filter; } if ($dxchan->is_node) { @@ -1269,6 +1295,19 @@ sub send_wcy_spot my $line = shift; my @dxchan = DXChannel->get_all(); my $dxchan; + my ($wcy_dxcc, $wcy_itu, $wcy_cq, $org_dxcc, $org_itu, $org_cq) = (0..0); + my @dxcc = Prefix::extract($_[11]); + if (@dxcc > 0) { + $wcy_dxcc = $dxcc[1]->dxcc; + $wcy_itu = $dxcc[1]->itu; + $wcy_cq = $dxcc[1]->cq; + } + @dxcc = Prefix::extract($_[12]); + if (@dxcc > 0) { + $org_dxcc = $dxcc[1]->dxcc; + $org_itu = $dxcc[1]->itu; + $org_cq = $dxcc[1]->cq; + } # 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 @@ -1277,7 +1316,7 @@ sub send_wcy_spot my ($filter, $hops); if ($dxchan->{wcyfilter}) { - ($filter, $hops) = $dxchan->{wcyfilter}->it(@_, $self->{call} ); + ($filter, $hops) = $dxchan->{wcyfilter}->it(@_, $self->{call}, $wcy_dxcc, $wcy_itu, $wcy_cq, $org_dxcc, $org_itu, $org_cq); next unless $filter; } if ($dxchan->is_clx || $dxchan->is_spider || $dxchan->is_dxnet) { @@ -1332,6 +1371,21 @@ sub send_announce Log('ann', $target, $_[0], $text); + # obtain country codes etc + my ($ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq) = (0..0); + my @dxcc = Prefix::extract($_[0]); + if (@dxcc > 0) { + $ann_dxcc = $dxcc[1]->dxcc; + $ann_itu = $dxcc[1]->itu; + $ann_cq = $dxcc[1]->cq; + } + @dxcc = Prefix::extract($_[4]); + if (@dxcc > 0) { + $org_dxcc = $dxcc[1]->dxcc; + $org_itu = $dxcc[1]->itu; + $org_cq = $dxcc[1]->cq; + } + # 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) { @@ -1339,19 +1393,6 @@ sub send_announce my ($filter, $hops); if ($dxchan->{annfilter}) { - my ($ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq) = (0..0); - my @dxcc = Prefix::extract($_[0]); - if (@dxcc > 0) { - $ann_dxcc = $dxcc[1]->dxcc; - $ann_itu = $dxcc[1]->itu; - $ann_cq = $dxcc[1]->cq; - } - @dxcc = Prefix::extract($_[4]); - if (@dxcc > 0) { - $org_dxcc = $dxcc[1]->dxcc; - $org_itu = $dxcc[1]->itu; - $org_cq = $dxcc[1]->cq; - } ($filter, $hops) = $dxchan->{annfilter}->it(@_, $self->{call}, $ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq); next unless $filter; } @@ -1447,12 +1488,20 @@ sub route unless ($dxchan) { my $cl = DXCluster->get_exact($call); $dxchan = $cl->dxchan if $cl; + if (ref $dxchan) { + if (ref $self && $dxchan eq $self) { + dbg('chan', "PCPROT: Trying to route back to source, dropped"); + return; + } + } } if ($dxchan) { my $routeit = adjust_hops($dxchan, $line); # adjust its hop count by node name if ($routeit) { $dxchan->send($routeit); } + } else { + dbg('chan', "PCPROT: No route available, dropped"); } } @@ -1468,6 +1517,8 @@ sub broadcast_ak1a # send it if it isn't the except list and isn't isolated and still has a hop count foreach $dxchan (@dxchan) { next if grep $dxchan == $_, @except; + next if $dxchan == $me; + my $routeit = adjust_hops($dxchan, $s); # adjust its hop count by node name $dxchan->send($routeit) unless $dxchan->{isolate} || !$routeit; } @@ -1485,6 +1536,8 @@ sub broadcast_all_ak1a # send it if it isn't the except list and isn't isolated and still has a hop count foreach $dxchan (@dxchan) { next if grep $dxchan == $_, @except; + next if $dxchan == $me; + my $routeit = adjust_hops($dxchan, $s); # adjust its hop count by node name $dxchan->send($routeit); } @@ -1519,6 +1572,7 @@ sub broadcast_list foreach $dxchan (@_) { my $filter = 1; + next if $dxchan == $me; if ($sort eq 'dx') { next unless $dxchan->{dx}; @@ -1635,11 +1689,48 @@ sub disconnect { my $self = shift; my $nopc39 = shift; + my $call = $self->call; - if ($self->{conn} && !$nopc39) { + unless ($nopc39) { $self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op"))); } + # unbusy and stop and outgoing mail + my $mref = DXMsg::get_busy($call); + $mref->stop_msg($call) if $mref; + + # create a list of all the nodes that have gone and delete them from the table + my @nodes; + foreach my $node (grep { $_->dxchan == $self } DXNode::get_all) { + next if $node->dxchancall eq $call; + next if $node->call eq $main::mycall; + push @nodes, $node->call; + $node->del; + } + + # broadcast to all other nodes that all the nodes connected to via me are gone + unless ($self->{isolate}) { + push @nodes, $call; + for (@nodes) { + broadcast_ak1a(pc21($_, 'Gone.'), $self); + } + } + + # remove this node from the tables + my $node = DXCluster->get_exact($call); + $node->del if $node; + + # remove outstanding pings + delete $pings{$call}; + + # 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"); + $self->SUPER::disconnect; }