X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=0fce7f25704c67b98c3f939cf90ccd3e9bf455b8;hb=42032b193f4411c08979c2cd8d1f39818d5de235;hp=f03a610327cdccf0c77e361ce6c77868ff70b99e;hpb=0a92a4608d715cd9cd7eec3c120da651fbb4da5b;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index f03a6103..0fce7f25 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -31,6 +31,8 @@ use WCY; use Time::HiRes qw(gettimeofday tv_interval); use BadWords; use DXHash; +use Route; +use Route::Node; use strict; use vars qw($me $pc11_max_age $pc23_max_age @@ -46,7 +48,7 @@ $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 -$censorpc = 0; # Do a BadWords::check on text fields and reject things +$censorpc = 1; # Do a BadWords::check on text fields and reject things # loads of 'bad things' $baddx = new DXHash "baddx"; $badspotter = new DXHash "badspotter"; @@ -179,6 +181,8 @@ sub init do "$main::data/hop_table.pl" if -e "$main::data/hop_table.pl"; confess $@ if $@; $me->{sort} = 'S'; # S for spider + $me->{priv} = 9; +# $Route::Node::me->adddxchan($me); } # @@ -236,20 +240,18 @@ 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); + $self->{pc50_t} = $main::systime; # send info to all logged in thingies $self->tell_login('loginn'); + $main::routeroot->add($call); Log('DXProt', "$call connected"); } @@ -336,7 +338,7 @@ sub normal } # if this is a 'bad spotter' user then ignore it - if ($badspotter->in($field[7])) { + if ($badspotter->in($field[6])) { dbg('chan', "PCPROT: Bad Spotter, dropped"); return; } @@ -357,6 +359,11 @@ sub normal # 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; @@ -368,8 +375,19 @@ sub normal return; } } + + my @spot = Spot::prepare($field[1], $field[2], $d, $field[5], $field[6], $field[7]); + # global spot filtering on INPUT + if ($self->{inspotsfilter}) { + my ($filter, $hops) = $self->{inspotsfilter}->it(@spot); + unless ($filter) { + dbg('chan', "PCPROT: Rejected by filter"); + return; + } + } - my @spot = Spot::add($field[1], $field[2], $d, $field[5], $field[6], $field[7]); + # add it + Spot::add(@spot); # # @spot at this point contains:- @@ -498,16 +516,9 @@ sub normal } if ($pcno == 16) { # add a user - my $node = DXCluster->get_exact($field[1]); + + # general checks my $dxchan; - if (!$node && ($dxchan = DXChannel->get($field[1]))) { - # add it to the node table if it isn't present and it's - # connected locally - $node = DXNode->new($dxchan, $field[1], 0, 1, 5400); - dbg('chan', "PCPROT: $field[1] no PC19 yet, autovivified as node"); -# broadcast_ak1a(pc19($dxchan, $node), $dxchan, $self) unless $dxchan->{isolate}; - - } if ($field[1] eq $main::mycall || $field[2] eq $main::mycall) { dbg('chan', "PCPROT: trying to alter config on this node from outside!"); return; @@ -516,66 +527,78 @@ sub normal dbg('chan', "PCPROT: trying to connect sysop from outside!"); return; } + if (($dxchan = DXChannel->get($field[1])) && $dxchan != $self) { + dbg('chan', "PCPROT: $field[1] connected locally"); + return; + } + + my $node = DXCluster->get_exact($field[1]); unless ($node) { dbg('chan', "PCPROT: Node $field[1] not in config"); return; } + my $pref = Route::Node::get($field[1]); + unless ($pref) { + dbg('chan', "PCPROT: Route::Node $field[1] not in config"); + return; + } + my $wrong; unless ($node->isa('DXNode')) { dbg('chan', "PCPROT: $field[1] is not a node"); - return; + $wrong = 1; } if ($node->dxchan != $self) { dbg('chan', "PCPROT: $field[1] came in on wrong channel"); - return; - } - if (($dxchan = DXChannel->get($field[1])) && $dxchan != $self) { - dbg('chan', "PCPROT: $field[1] connected locally"); - return; + $wrong = 1; } my $i; - + my @rout; for ($i = 2; $i < $#field; $i++) { my ($call, $confmode, $here) = $field[$i] =~ /^(\S+) (\S) (\d)/o; next unless $call && $confmode && defined $here && is_callsign($call); - my $ref = DXCluster->get_exact($call); - if ($ref) { - if ($ref->isa('DXNode')) { - dbg('chan', "PCPROT: $call is a node"); + $confmode = $confmode eq '*'; + + push @rout, $pref->add_user($call, Route::here($here)|Route::conf($confmode)); + + unless ($wrong) { + my $ref = DXCluster->get_exact($call); + if ($ref) { + if ($ref->isa('DXNode')) { + dbg('chan', "PCPROT: $call is a node"); + next; + } + my $rcall = $ref->mynode->call; + dbg('chan', "PCPROT: already have $call on $rcall"); next; } - my $rcall = $ref->mynode->call; - dbg('chan', "PCPROT: already have $call on $rcall"); - next; + + DXNodeuser->new($self, $node, $call, $confmode, $here); + + # add this station to the user database, if required + $call =~ s/-\d+$//o; # remove ssid for users + my $user = DXUser->get_current($call); + $user = DXUser->new($call) if !$user; + $user->homenode($node->call) if !$user->homenode; + $user->node($node->call); + $user->lastin($main::systime) unless DXChannel->get($call); + $user->put; } - - $confmode = $confmode eq '*'; - DXNodeuser->new($self, $node, $call, $confmode, $here); - - # add this station to the user database, if required - $call =~ s/-\d+$//o; # remove ssid for users - my $user = DXUser->get_current($call); - $user = DXUser->new($call) if !$user; - $user->homenode($node->call) if !$user->homenode; - $user->node($node->call); - $user->lastin($main::systime) unless DXChannel->get($call); - $user->put; } + + dbg('route', "B/C PC16 on $field[1] for: " . join(',', map{$_->call} @rout)) if @rout; + + # all these 'wrong' is just while we are swopping over to the Route stuff + return if $wrong; # 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; } if ($pcno == 17) { # remove a user - my $node = DXCluster->get_exact($field[2]); my $dxchan; - if (!$node && ($dxchan = DXChannel->get($field[2]))) { - # add it to the node table if it isn't present and it's - # connected locally - $node = DXNode->new($dxchan, $field[2], 0, 1, 5400); - dbg('chan', "PCPROT: $field[2] no PC19 yet, autovivified as node"); -# broadcast_ak1a(pc19($dxchan, $node), $dxchan, $self) unless $dxchan->{isolate}; - } if ($field[1] eq $main::mycall || $field[2] eq $main::mycall) { dbg('chan', "PCPROT: trying to alter config on this node from outside!"); return; @@ -584,6 +607,20 @@ sub normal dbg('chan', "PCPROT: trying to disconnect sysop from outside!"); return; } + if ($dxchan = DXChannel->get($field[1])) { + dbg('chan', "PCPROT: $field[1] connected locally"); + return; + } + + my $pref = Route::Node::get($field[2]); + unless ($pref) { + dbg('chan', "PCPROT: Route::Node $field[2] not in config"); + return; + } + $pref->del_user($field[1]); + dbg('route', "B/C PC17 on $field[2] for: $field[1]"); + + my $node = DXCluster->get_exact($field[2]); unless ($node) { dbg('chan', "PCPROT: Node $field[2] not in config"); return; @@ -596,17 +633,19 @@ 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"); - 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; } @@ -628,34 +667,58 @@ sub normal if ($pcno == 19) { # incoming cluster list my $i; my $newline = "PC19^"; + + # new routing list + my @rout; + my $pref = Route::Node::get($self->{call}); + + # parse the PC19 for ($i = 1; $i < $#field-1; $i += 4) { my $here = $field[$i]; my $call = uc $field[$i+1]; my $confmode = $field[$i+2]; my $ver = $field[$i+3]; next unless defined $here && defined $confmode && is_callsign($call); + # check for sane parameters + $ver = 5000 if $ver eq '0000'; + next if $ver < 5000; # only works with version 5 software + next if length $call < 3; # min 3 letter callsigns - $ver = 5400 if !$ver && $allowzero; # now check the call over my $node = DXCluster->get_exact($call); if ($node) { my $dxchan; - if (($dxchan = DXChannel->get($call)) && $dxchan != $self) { + if ((my $dxchan = DXChannel->get($call)) && $dxchan != $self) { dbg('chan', "PCPROT: $call connected locally"); } if ($node->dxchan != $self) { dbg('chan', "PCPROT: $call come in on wrong channel"); next; } + + # add a route object + if ($call eq $pref->call && !$pref->version) { + $pref->version($ver); + $pref->flags(Route::here($here)|Route::conf($confmode)); + } else { + my $r = $pref->add($call, $ver, Route::here($here)|Route::conf($confmode)); + push @rout, $r if $r; + } + my $rcall = $node->mynode->call; dbg('chan', "PCPROT: already have $call on $rcall"); next; } - - # check for sane parameters - next if $ver < 5000; # only works with version 5 software - next if length $call < 3; # min 3 letter callsigns + + # add a route object + if ($call eq $pref->call && !$pref->version) { + $pref->version($ver); + $pref->flags(Route::here($here)|Route::conf($confmode)); + } else { + my $r = $pref->add($call, $ver, Route::here($here)|Route::conf($confmode)); + push @rout, $r if $r; + } # add it to the nodes table and outgoing line $newline .= "$here^$call^$confmode^$ver^"; @@ -678,6 +741,8 @@ sub normal $user->lastin($main::systime) unless DXChannel->get($call); $user->put; } + + dbg('route', "B/C PC19 for: " . join(',', map{$_->call} @rout)) if @rout; return if $newline eq "PC19^"; @@ -696,26 +761,36 @@ sub normal if ($pcno == 21) { # delete a cluster from the list my $call = uc $field[1]; + my @rout; + my $pref = Route::Node::get($call); + if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me! + if ($call eq $self->{call}) { + dbg('chan', "PCPROT: Trying to disconnect myself with PC21"); + return; + } + if (my $dxchan = DXChannel->get($call)) { + dbg('chan', "PCPROT: $call connected locally"); + return; + } + + # routing objects + if ($pref) { + push @rout, $pref->del_node($call); + } else { + dbg('chan', "PCPROT: Route::Node $call not in config"); + } + my $node = DXCluster->get_exact($call); if ($node) { unless ($node->isa('DXNode')) { dbg('chan', "PCPROT: $call is not a node"); return; } - if ($call eq $self->{call}) { - dbg('chan', "PCPROT: Trying to disconnect myself with PC21"); - return; - } if ($node->dxchan != $self) { dbg('chan', "PCPROT: $call come in on wrong channel"); return; } - my $dxchan; - if ($dxchan = DXChannel->get($call)) { - dbg('chan', "PCPROT: $call connected locally"); - return; - } $node->del(); } else { dbg('chan', "PCPROT: $call not in table, dropped"); @@ -725,6 +800,10 @@ sub normal dbg('chan', "PCPROT: I WILL _NOT_ be disconnected!"); return; } + dbg('route', "B/C PC21 for: " . join(',', (map{$_->call} @rout))) if @rout; + +# broadcast_route($line, $self, $call); +# return; last SWITCH; } @@ -1107,9 +1186,10 @@ sub process next if $dxchan == $me; # send a pc50 out on this channel - if ($t >= $dxchan->pc50_t + $DXProt::pc50_interval) { + $dxchan->{pc50_t} = $main::systime unless exists $dxchan->{pc50_t}; + if ($t >= $dxchan->{pc50_t} + $DXProt::pc50_interval) { $dxchan->send(pc50(scalar DXChannel::get_all_users)); - $dxchan->pc50_t($t); + $dxchan->{pc50_t} = $t; } # send a ping out on this channel @@ -1138,46 +1218,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; @@ -1508,6 +1585,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; } @@ -1525,6 +1604,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); } @@ -1559,6 +1640,7 @@ sub broadcast_list foreach $dxchan (@_) { my $filter = 1; + next if $dxchan == $me; if ($sort eq 'dx') { next unless $dxchan->{dx}; @@ -1674,12 +1756,57 @@ sub addrcmd sub disconnect { my $self = shift; - my $nopc39 = shift; + my $pc39flag = shift; + my $call = $self->call; - if ($self->{conn} && !$nopc39) { + unless ($pc39flag && $pc39flag == 1) { $self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op"))); } + # do routing stuff + my $pref = Route::Node::get($self->{call}); + my @rout = $pref->del_nodes if $pref; + push @rout, $main::routeroot->del_node($call); + dbg('route', "B/C PC21 (from PC39) for: " . join(',', (map{ $_->call } @rout))) if @rout; + + # 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 { $_->dxchancall eq $call } DXNode::get_all) { + next if $node->call 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 ($pc39flag && $pc39flag == 2) { + 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; }