X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=3720008a03eb75770b9f7578251d54e20bc57317;hb=1fae727d9da6945d99ccdcb79436eb579b47a3b7;hp=59e7ca07d7bf2ad89622a3c1096ae237d123cf65;hpb=3f93e02718a31f272434796e151cb3358a1fd7ed;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 59e7ca07..3720008a 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"); } @@ -550,7 +554,15 @@ sub normal next unless $call && $conf && defined $here && is_callsign($call); $conf = $conf eq '*'; - push @rout, $parent->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 @@ -566,7 +578,6 @@ 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 $ncall for: " . join(',', map{$_->call} @rout)) if @rout; $self->route_pc16($parent, @rout) if @rout; return; } @@ -574,6 +585,7 @@ sub normal if ($pcno == 17) { # remove a user my $dxchan; 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; @@ -588,8 +600,7 @@ sub normal dbg('chan', "PCPROT: Route::Node $ncall not in config"); return; } - my @rout = $parent->del_user($field[1]); - dbg('route', "B/C PC17 on $ncall for: $field[1]"); + my @rout = $parent->del_user($ucall); $self->route_pc17($parent, @rout) if @rout; return; } @@ -631,15 +642,24 @@ sub normal next if length $call < 3; # min 3 letter callsigns # update it if required - if ($parent->call eq $call && !$parent->version) { + 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(Route::here($here)|Route::conf($conf)); + $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) @@ -660,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; } @@ -677,6 +695,11 @@ sub normal 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! if ($call eq $self->{call}) { @@ -685,17 +708,11 @@ sub normal } # routing objects - if ($parent) { - push @rout, $parent->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; } @@ -755,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 @@ -874,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]); @@ -891,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; @@ -902,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}); @@ -930,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 @@ -948,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; @@ -989,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]); @@ -1013,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]); @@ -1041,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; @@ -1059,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 + } } } @@ -1082,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; } @@ -1097,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; } } @@ -1368,7 +1406,9 @@ sub send_local_config my @nodes; my @localnodes; my @remotenodes; - + + dbg('trace', 'DXProt::send_local_config'); + # send our nodes if ($self->{isolate}) { @localnodes = ( $main::routeroot ); @@ -1377,12 +1417,12 @@ sub send_local_config # 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} } DXChannel::get_all_nodes(); - @localnodes = map { Route::Node::get($_->{call}) } @dxchan if @dxchan; + @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) if grep $n ne $_, @rnodes; + push @remotenodes, Route::Node::get($n) unless grep $n eq $_, @rnodes; } unshift @localnodes, $main::routeroot; } @@ -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,10 @@ 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 = $node->del_nodes; # at the next level + + @rout = $node->del($main::routeroot) if $node; # unbusy and stop and outgoing mail my $mref = DXMsg::get_busy($call); @@ -1735,5 +1775,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__