X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=875d2b6694314691dd9b219ae03401227870bfdd;hb=1051376242b71ce69f92a1e92b62240167af9ccd;hp=f4c932a81cfe35847ab354fa79c0a4b4b4174de9;hpb=b7a0598517688e82d2996a22a09aac67a911ba8f;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index f4c932a8..875d2b66 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -35,7 +35,7 @@ use Route::Node; use strict; use vars qw($me $pc11_max_age $pc23_max_age - $last_hour %pings %rcmds + $last_hour $last10 %eph %pings %rcmds %nodehops $baddx $badspotter $badnode $censorpc $allowzero $decode_dk0wcy $send_opernam @checklist); @@ -52,6 +52,7 @@ $censorpc = 1; # Do a BadWords::check on text fields and reject things $baddx = new DXHash "baddx"; $badspotter = new DXHash "badspotter"; $badnode = new DXHash "badnode"; +$last10 = time; @checklist = ( @@ -191,6 +192,12 @@ sub init sub new { my $self = DXChannel::alloc(@_); + + # add this node to the table, the values get filled in later + my $pkg = shift; + my $call = shift; + $main::routeroot->add($call, '0000', Route::here(1)) if $call ne $main::mycall; + return $self; } @@ -252,9 +259,6 @@ sub start # send info to all logged in thingies $self->tell_login('loginn'); - # add this node to the table, the values get filled in later - $main::routeroot->add($call); - Log('DXProt', "$call connected"); } @@ -526,24 +530,21 @@ sub normal # general checks my $dxchan; + my $ncall = $field[1]; my $newline = "PC16^"; - if ($field[1] eq $main::mycall || $field[2] eq $main::mycall) { + if ($ncall eq $main::mycall) { dbg('chan', "PCPROT: trying to alter config on this node from outside!"); return; } - if ($field[2] eq $main::myalias && DXChannel->get($field[1])) { - dbg('chan', "PCPROT: trying to connect sysop from outside!"); + $dxchan = DXChannel->get($ncall); + if ($dxchan && $dxchan ne $self) { + dbg('chan', "PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!"); return; } - if (($dxchan = DXChannel->get($field[1])) && $dxchan != $self) { - dbg('chan', "PCPROT: $field[1] connected locally"); - return; - } - - my $node = Route::Node::get($field[1]); - unless ($node) { - dbg('chan', "PCPROT: Node $field[1] not in config"); + my $parent = Route::Node::get($ncall); + unless ($parent) { + dbg('chan', "PCPROT: Node $ncall not in config"); return; } my $i; @@ -553,14 +554,22 @@ sub normal next unless $call && $conf && defined $here && is_callsign($call); $conf = $conf eq '*'; - push @rout, $node->add_user($call, Route::here($here)|Route::conf($conf)); + my $r = Route::User::get($call); + my $flags = Route::here($here)|Route::conf($conf); + + if ($r && $r->flags != $flags) { + $r->flags($flags); + push @rout, $r; + } elsif (!$r) { + push @rout, $parent->add_user($call, $flags); + } # 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->homenode($parent->call) if !$user->homenode; + $user->node($parent->call); $user->lastin($main::systime) unless DXChannel->get($call); $user->put; } @@ -569,34 +578,30 @@ sub normal # queue up any messages (look for privates only) DXMsg::queue_msg(1) if $self->state eq 'normal'; - dbg('route', "B/C PC16 on $field[1] for: " . join(',', map{$_->call} @rout)) if @rout; - $self->route_pc16($node, @rout) if @rout; + $self->route_pc16($parent, @rout) if @rout; return; } if ($pcno == 17) { # remove a user my $dxchan; - if ($field[1] eq $main::mycall || $field[2] eq $main::mycall) { + my $ncall = $field[2]; + my $ucall = $field[1]; + if ($ncall eq $main::mycall) { dbg('chan', "PCPROT: trying to alter config on this node from outside!"); return; } - if ($field[1] eq $main::myalias && DXChannel->get($field[1])) { - dbg('chan', "PCPROT: trying to disconnect sysop from outside!"); + $dxchan = DXChannel->get($ncall); + if ($dxchan && $dxchan ne $self) { + dbg('chan', "PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!"); return; } - if ($dxchan = DXChannel->get($field[1])) { - dbg('chan', "PCPROT: $field[1] connected locally"); + my $parent = Route::Node::get($ncall); + unless ($parent) { + dbg('chan', "PCPROT: Route::Node $ncall not in config"); return; } - - my $node = Route::Node::get($field[2]); - unless ($node) { - dbg('chan', "PCPROT: Route::Node $field[2] not in config"); - return; - } - my @rout = $node->del_user($field[1]); - dbg('route', "B/C PC17 on $field[2] for: $field[1]"); - $self->route_pc17($node, @rout) if @rout; + my @rout = $parent->del_user($ucall); + $self->route_pc17($parent, @rout) if @rout; return; } @@ -604,13 +609,13 @@ sub normal $self->state('init'); # first clear out any nodes on this dxchannel - my $node = Route::Node::get($self->{call}); + my $parent = Route::Node::get($self->{call}); my @rout; - for ($node->nodes) { + for ($parent->nodes) { my $r = Route::Node::get($_); push @rout, $r->del_node if $r; } - $self->route_pc21(@rout, $node); + $self->route_pc21(@rout, $parent); $self->send_local_config(); $self->send(pc20()); return; # we don't pass these on @@ -622,7 +627,7 @@ sub normal # new routing list my @rout; - my $node = Route::Node::get($self->{call}); + my $parent = Route::Node::get($self->{call}); # parse the PC19 for ($i = 1; $i < $#field-1; $i += 4) { @@ -637,13 +642,24 @@ sub normal next if length $call < 3; # min 3 letter callsigns # update it if required - if ($node->call eq $call && !$node->version) { - $node->version($ver); - $node->flags(Route::here($here)|Route::conf($conf)); - push @rout, $node; - } elsif ($node->call ne $call) { - my $r = $node->add($call, $ver, Route::here($here)|Route::conf($conf)); + my $r; + my $flags = Route::here($here)|Route::conf($conf); + if ($parent->call eq $call && ($parent->version ne $ver || $parent->flags != $flags)) { + $parent->version($ver); + $parent->flags($flags); + push @rout, $parent; + } elsif ($parent->call ne $call) { + next if $call eq $main::mycall || $call eq $self->{call}; + + my $r = $parent->add($call, $ver, Route::here($here)|Route::conf($conf)); push @rout, $r if $r; + } else { + $r = Route::Node::get($call); + if ($r && ($r->version ne $ver || $r->flags != $flags)) { + $r->version($ver); + $r->flags(Route::here($here)|Route::conf($conf)); + push @rout, $r; + } } # unbusy and stop and outgoing mail (ie if somehow we receive another PC19 without a disconnect) @@ -664,8 +680,6 @@ sub normal $user->put; } - dbg('route', "B/C PC19 for: " . join(',', map{$_->call} @rout)) if @rout; - $self->route_pc19(@rout) if @rout; return; } @@ -680,6 +694,11 @@ sub normal if ($pcno == 21) { # delete a cluster from the list my $call = uc $field[1]; my @rout; + my $parent = Route::Node::get($self->{call}); + unless ($parent) { + dbg('chan', "PCPROT: Route::Node $call not in config"); + return; + } my $node = Route::Node::get($call); if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me! @@ -689,17 +708,11 @@ sub normal } # routing objects - if ($node) { - push @rout, $node->del_node($call); - } else { - dbg('chan', "PCPROT: Route::Node $call not in config"); - } + push @rout, $node->del($parent) if $node; } else { dbg('chan', "PCPROT: I WILL _NOT_ be disconnected!"); return; } - dbg('route', "B/C PC21 for: " . join(',', (map{$_->call} @rout))) if @rout; - $self->route_pc21(@rout) if @rout; return; } @@ -759,7 +772,9 @@ sub normal $ref->here($field[2]) if $ref; $ref = Route::User::get($call); $ref->here($field[2]) if $ref; - last SWITCH; + + $self->route_pc24($ref, $field[3]) if $ref && !eph_dup($line); + return; } if ($pcno == 25) { # merge request @@ -878,8 +893,9 @@ sub normal if ($pcno == 41) { # user info # add this station to the user database, if required - my $user = DXUser->get_current($field[1]); - $user = DXUser->new($field[1]) if !$user; + my $call = $field[1]; + my $user = DXUser->get_current($call); + $user = DXUser->new($call) if !$user; if ($field[2] == 1) { $user->name($field[3]); @@ -895,7 +911,8 @@ sub normal } $user->lastoper($main::systime); # to cut down on excessive for/opers being generated $user->put; - last SWITCH; + my $ref = Route::get($call); + $self->route_pc41($ref, $field[2], $field[3], $field[4]) if $ref && !eph_dup($line); } if ($pcno == 43) { last SWITCH; @@ -906,26 +923,30 @@ sub normal } if ($pcno == 50) { # keep alive/user list - my $node = Route::Node::get($field[1]); + my $call = $field[1]; + my $node = Route::Node::get($call); if ($node) { return unless $node->call eq $self->{call}; $node->usercount($field[2]); + $self->route_pc50($node, $field[2], $field[3]) unless eph_dup($line); } - last SWITCH; + return; } if ($pcno == 51) { # incoming ping requests/answers + my $to = $field[1]; + my $from = $field[2]; + my $flag = $field[3]; # is it for us? - if ($field[1] eq $main::mycall) { - my $flag = $field[3]; + if ($to eq $main::mycall) { if ($flag == 1) { - $self->send(pc51($field[2], $field[1], '0')); + $self->send(pc51($from, $to, '0')); } else { # it's a reply, look in the ping list for this one - my $ref = $pings{$field[2]}; + my $ref = $pings{$from}; if ($ref) { - my $tochan = DXChannel->get($field[2]); + my $tochan = DXChannel->get($from); while (@$ref) { my $r = shift @$ref; my $dxchan = DXChannel->get($r->{call}); @@ -934,7 +955,7 @@ sub normal if ($dxchan->is_user) { my $s = sprintf "%.2f", $t; my $ave = sprintf "%.2f", $tochan ? ($tochan->{pingave} || $t) : $t; - $dxchan->send($dxchan->msg('pingi', $field[2], $s, $ave)) + $dxchan->send($dxchan->msg('pingi', $from, $s, $ave)) } elsif ($dxchan->is_node) { if ($tochan) { $tochan->{nopings} = $tochan->user->nopings || 2; # pump up the timer @@ -952,24 +973,26 @@ sub normal } } else { # route down an appropriate thingy - $self->route($field[1], $line); + $self->route($to, $line); } return; } if ($pcno == 75) { # dunno but route it - if ($field[1] ne $main::mycall) { - $self->route($field[1], $line); + my $call = $field[1]; + if ($call ne $main::mycall) { + $self->route($call, $line); } return; } if ($pcno == 73) { # WCY broadcasts + my $call = $field[1]; # do some de-duping - my $d = cltounix($field[1], sprintf("%02d18Z", $field[2])); + my $d = cltounix($call, 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', "PCPROT: WCY Date ($field[1] $field[2]) out of range"); + dbg('chan', "PCPROT: WCY Date ($call $field[2]) out of range"); return; } @field = map { unpad($_) } @field; @@ -993,7 +1016,8 @@ sub normal } if ($pcno == 84) { # remote commands (incoming) - if ($field[1] eq $main::mycall) { + my $call = $field[1]; + if ($call eq $main::mycall) { my $ref = DXUser->get_current($field[2]); my $cref = Route::Node::get($field[2]); Log('rcmd', 'in', $ref->{priv}, $field[2], $field[4]); @@ -1017,18 +1041,19 @@ sub normal $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]); + my $ref = DXUser->get_current($call); if ($ref && $ref->is_clx) { - $self->route($field[1], $line); + $self->route($call, $line); } else { - $self->route($field[1], pc34($field[2], $field[1], $field[4])); + $self->route($call, pc34($field[2], $call, $field[4])); } } return; } if ($pcno == 85) { # remote command replies - if ($field[1] eq $main::mycall) { + my $call = $field[1]; + if ($call eq $main::mycall) { my $dxchan = DXChannel->get($field[3]); if ($dxchan) { $dxchan->send($field[4]); @@ -1045,11 +1070,11 @@ sub normal } } } else { - my $ref = DXUser->get_current($field[1]); + my $ref = DXUser->get_current($call); if ($ref && $ref->is_clx) { - $self->route($field[1], $line); + $self->route($call, $line); } else { - $self->route($field[1], pc35($field[2], $field[1], $field[4])); + $self->route($call, pc35($field[2], $call, $field[4])); } } return; @@ -1063,9 +1088,13 @@ sub normal # 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 + + if (eph_dup($line)) { + dbg('chan', "PCPROT: Ephemeral dup, dropped"); + } else { + unless ($self->{isolate}) { + broadcast_ak1a($line, $self); # send it to everyone but me + } } } @@ -1086,7 +1115,9 @@ sub process # send a pc50 out on this channel $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)); + my $s = pc50($me, scalar DXChannel::get_all_users); + eph_dup($s); + $dxchan->send($s); $dxchan->{pc50_t} = $t; } @@ -1101,14 +1132,17 @@ sub process } } } + + # every ten seconds + if ($t - $last10 >= 10) { + # clean out ephemera + + eph_clean(); + + $last10 = $t; + } - my $key; - my $val; - my $cutoff; if ($main::systime - 3600 > $last_hour) { -# Spot::process; -# Geomag::process; -# AnnTalk::process; $last_hour = $main::systime; } } @@ -1370,27 +1404,33 @@ sub send_local_config my $self = shift; my $n; my @nodes; - my @localcalls; - my @remotecalls; - + my @localnodes; + my @remotenodes; + + dbg('trace', 'DXProt::send_local_config'); + # send our nodes if ($self->{isolate}) { - @localcalls = ( $main::mycall ); + @localnodes = ( $main::routeroot ); } else { # create a list of all the nodes that are not connected to this connection # and are not themselves isolated, this to make sure that isolated nodes # don't appear outside of this node - my @dxchan = grep { $_->call ne $main::mycall && $_->call ne $self->{call} && !$_->{isolate} } DXChannel::get_all_nodes(); - @localcalls = map { $_->{call} } @dxchan if @dxchan; - @remotecalls = map {my $r = Route::Node::get($_); $r ? $r->rnodes(@localcalls, $main::mycall, $self->{call}) : () } @localcalls if @localcalls; - unshift @localcalls, $main::mycall; + my @dxchan = grep { $_->call ne $main::mycall && $_->call ne $self->{call} } DXChannel::get_all_nodes(); + @localnodes = map { Route::Node::get($_->{call}) or die "connot find node $_->{call}" } @dxchan if @dxchan; + my @intcalls = map { $_->nodes } @localnodes if @localnodes; + my $ref = Route::Node::get($self->{call}); + my @rnodes = $ref->nodes; + for my $n (@intcalls) { + push @remotenodes, Route::Node::get($n) unless grep $n eq $_, @rnodes; + } + unshift @localnodes, $main::routeroot; } - @nodes = map {my $r = Route::Node::get($_); $r ? $r : ()} (@localcalls, @remotecalls); - send_route($self, \&pc19, scalar @nodes, @nodes); + send_route($self, \&pc19, scalar(@localnodes)+scalar(@remotenodes), @localnodes, @remotenodes); # get all the users connected on the above nodes and send them out - foreach $n (@nodes) { + foreach $n (@localnodes, @remotenodes) { send_route($self, \&pc16, 1, $n, map {my $r = Route::User::get($_); $r ? ($r) : ()} $n->users); } } @@ -1505,7 +1545,7 @@ sub broadcast_list ($filter) = $dxchan->{spotsfilter}->it(@{$fref}) if ref $fref; next unless $filter; } - next if $sort eq 'ann' && !$dxchan->{ann}; + next if $sort eq 'ann' && !$dxchan->{ann} && $s !~ /^To\s+LOCAL\s+de\s+(?:$main::myalias|$main::mycall)/i; next if $sort eq 'wwv' && !$dxchan->{wwv}; next if $sort eq 'wcy' && !$dxchan->{wcy}; next if $sort eq 'wx' && !$dxchan->{wx}; @@ -1623,10 +1663,12 @@ sub disconnect } # do routing stuff -# my $node = Route::Node::get($self->{call}); -# my @rout = $node->del_nodes if $node; - my @rout = $main::routeroot->del_node($call); - dbg('route', "B/C PC21 (from PC39) for: " . join(',', (map{ $_->call } @rout))) if @rout; + my $node = Route::Node::get($call); + my @rout; + if ($node) { + @rout = $node->del_nodes; # at the next level + @rout = $node->del($main::routeroot); + } # unbusy and stop and outgoing mail my $mref = DXMsg::get_busy($call); @@ -1678,8 +1720,12 @@ sub send_route if ($self->{routefilter}) { for (; @_ && $no; $no--) { my $r = shift; - ($filter, $hops) = $self->{routefilter}->it($self->{call}, $self->{dxcc}, $self->{itu}, $self->{cq}, $r->call, $r->dxcc, $r->itu, $r->cq); - push @rin, $r if $filter; + if ($r) { + ($filter, $hops) = $self->{routefilter}->it($self->{call}, $self->{dxcc}, $self->{itu}, $self->{cq}, $r->call, $r->dxcc, $r->itu, $r->cq); + push @rin, $r if $filter; + } else { + dbg('chan', "was sent a null value"); + } } } if (@rin) { @@ -1691,7 +1737,7 @@ sub send_route $routeit = adjust_hops($self, $line); # adjust its hop count by node name next unless $routeit; } - $self->send($routeit) unless $self->{isolate} || $self->{isolate}; + $self->send($routeit); } } } @@ -1735,5 +1781,47 @@ sub route_pc21 broadcast_route($self, \&pc21, scalar @_, @_); } +sub route_pc24 +{ + my $self = shift; + broadcast_route($self, \&pc24, 1, @_); +} + +sub route_pc41 +{ + my $self = shift; + broadcast_route($self, \&pc41, 1, @_); +} + +sub route_pc50 +{ + my $self = shift; + broadcast_route($self, \&pc50, 1, @_); +} + + + +sub eph_dup +{ + my $s = shift; + + # chop the end off + $s =~ s/\^H\d\d?\^?~?$//; + return 1 if exists $eph{$s}; + $eph{$s} = $main::systime; + return undef; +} + +sub eph_clean +{ + my ($key, $val); + + while (($key, $val) = each %eph) { + if ($main::systime - $val > 90) { + delete $eph{$key}; + } + } +} + 1; __END__