X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=8347dd0e35617964f906ae6f864aad18f9a9902a;hb=eb631a639a657f071f4711f6f4f5c585ab6364c6;hp=ba958cfad0418bad5deac0c279c5ea9f5c620527;hpb=98b0984d0ab735a1ae2d96e36728c7e334cf5fd7;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index ba958cfa..8347dd0e 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -33,6 +33,7 @@ use DXHash; use Route; use Route::Node; use Script; +use Investigate; use strict; @@ -43,8 +44,8 @@ $main::build += $VERSION; $main::branch += $BRANCH; use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restime $eph_pc34_restime - $last_hour $last10 %eph %pings %rcmds $ann_to_talk - $pingint $obscount %pc19list $chatdupeage + $last_hour $last10 %eph %pings %rcmds $ann_to_talk $pc19_version + $pingint $obscount %pc19list $chatdupeage $investigation_int %nodehops $baddx $badspotter $badnode $censorpc $rspfcheck $allowzero $decode_dk0wcy $send_opernam @checklist); @@ -71,6 +72,9 @@ $eph_pc34_restime = 30; $pingint = 5*60; $obscount = 2; $chatdupeage = 20 * 60 * 60; +$investigation_int = 7*86400; # time between checks to see if we can see this node +$pc19_version = 5466; # the visible version no for outgoing PC19s generated from pc59 + @checklist = ( @@ -229,7 +233,7 @@ sub new my $uref = Route::Node::get($call) || Route::Node->new($call); $uref->here(1); $uref->conf(0); - $uref->version(5000); + $uref->version($pc19_version); $main::routeroot->link_node($uref, $self); return $self; } @@ -708,6 +712,9 @@ sub handle_16 # do we believe this call? unless ($ncall eq $self->{call} || $self->is_believed($ncall)) { + if (my $ivp = Investigate::get($ncall, $self->{call})) { + $ivp->store_pcxx($pcno,$line,$origin,@_); + } dbg("PCPROT: We don't believe $ncall on $self->{call}"); return; } @@ -788,6 +795,9 @@ sub handle_17 # do we believe this call? unless ($ncall eq $self->{call} || $self->is_believed($ncall)) { + if (my $ivp = Investigate::get($ncall, $self->{call})) { + $ivp->store_pcxx($pcno,$line,$origin,@_); + } dbg("PCPROT: We don't believe $ncall on $self->{call}"); return; } @@ -909,14 +919,6 @@ sub handle_19 next if length $call < 3; # min 3 letter callsigns next if $call eq $main::mycall; - # do we believe this call? - unless ($call eq $self->{call} || $self->is_believed($call)) { - dbg("PCPROT: We don't believe $call on $self->{call}"); - next; - } - - eph_del_regex("^PC(?:21\\^$call|17\\^[^\\^]+\\^$call)"); - # add this station to the user database, if required (don't remove SSID from nodes) my $user = DXUser->get_current($call); if (!$user) { @@ -928,7 +930,24 @@ sub handle_19 $user->node($call); } $user->wantroutepc19(1) unless defined $user->wantroutepc19; + $user->lastin($main::systime) unless DXChannel->get($call); + $user->put; + # do we believe this call? + unless ($call eq $self->{call} || $self->is_believed($call)) { + my $pt = $user->lastping || 0; + if ($pt+$investigation_int < $main::systime && !Investigate::get($call, $self->{call})) { + my $ivp = Investigate->new($call, $self->{call}); + $ivp->version($ver); + $ivp->here($here); + $ivp->store_pcxx($pcno,$line,$origin,'PC19',$here,$call,$conf,$ver,$_[-1]); + } + dbg("PCPROT: We don't believe $call on $self->{call}"); + next; + } + + eph_del_regex("^PC(?:21\\^$call|17\\^[^\\^]+\\^$call)"); + my $r = Route::Node::get($call) || Route::Node->new($call); $r->here($here); $r->conf($conf); @@ -943,14 +962,11 @@ sub handle_19 # 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($call) if $mref; - - $user->lastin($main::systime) unless DXChannel->get($call); - $user->put; } # route out new nodes to legacy nodes $self->route_pc19($origin, $line, @new) if @new; - $self->route_pc59('A', 0, $self->{call}, @rout) if @rout; + $self->route_pc59('A', hexstamp(), $self->{call}, @rout) if @rout; } # send local configuration @@ -978,6 +994,9 @@ sub handle_21 return if $call eq $main::mycall; # don't allow malicious buggers to disconnect me (or ignore loops)! unless ($call eq $self->{call} || $self->is_believed($call)) { + if (my $ivp = Investigate::get($call, $self->{call})) { + $ivp->store_pcxx($pcno,$line,$origin,@_); + } dbg("PCPROT: We don't believe $call on $self->{call}"); return; } @@ -1008,11 +1027,11 @@ sub handle_21 # input filter it return unless $self->in_filter_route($node); push @rout, $node; - push @new, $node->link_node($parent, $self); + push @new, $parent->remove_route($node, $self); } $self->route_pc21($origin, $line, @new) if @new; - $self->route_pc59('D', 0, $self->{call}, @rout) if @rout; + $self->route_pc59('D', hexstamp(), $self->{call}, @rout) if @rout; # get rid of orphaned nodes; $_->delete for @new; @@ -1403,7 +1422,21 @@ sub handle_51 } else { $tochan->{pingave} = $tochan->{pingave} + (($t - $tochan->{pingave}) / 6); } + my $rref = Route::Node::get($tochan->{call}); + $rref->pingtime($tochan->{pingave}) if $rref; $tochan->{nopings} = $nopings; # pump up the timer + if (my $ivp = Investigate::get($from, $self->{call})) { + $ivp->handle_ping; + } + } elsif (my $rref = Route::Node::get($r->{call})) { + if (defined $rref->pingtime) { + $rref->pingtime($rref->pingtime + (($t - $rref->pingtime) / 6)); + } else { + $rref->pingtime($t); + } + if (my $ivp = Investigate::get($from, $self->{call})) { + $ivp->handle_ping; + } } } } @@ -1532,7 +1565,7 @@ sub handle_59 my $new = $node->link_node($ref, $self); push @addnode, $new if $new; } elsif ($ref->isa('Route::User')) { - push @adduser, $node->del_user($ref); + push @adduser, $node->add_user($ref); } } } @@ -1566,6 +1599,7 @@ sub handle_59 push @au, $r unless grep $r->call eq $_, $node->users; } } + push @addnode, $node if $self->{state} =~ /^init/; push @delnode, $node->unlink_node($_, $self) for @dn; push @deluser, $node->del_user($_) for @du; push @addnode, $node->link_node($_, $self) for @an; @@ -1574,8 +1608,8 @@ sub handle_59 $self->route_pc21($origin, $line, @delnode) if @delnode; $self->route_pc19($origin, $line, @addnode) if @addnode; - $self->route_pc17($origin, $line, @deluser) if @deluser; - $self->route_pc16($origin, $line, @adduser) if @adduser; + $self->route_pc17($origin, $line, $node, @deluser) if @deluser; + $self->route_pc16($origin, $line, $node, @adduser) if @adduser; $self->route_pc59($sort, $hextime, $ncall, @refs) if @refs; $_->delete for @delnode, @deluser; @@ -1677,6 +1711,8 @@ sub handle_default # This is called from inside the main cluster processing loop and is used # for despatching commands that are doing some long processing job # +# It is called once per second +# sub process { my $t = time; @@ -1710,6 +1746,8 @@ sub process } } + Investigate::process(); + # every ten seconds if ($t - $last10 >= 10) { # clean out ephemera @@ -2150,14 +2188,23 @@ sub load_hops # add a ping request to the ping queues sub addping { - my ($from, $to) = @_; + my ($from, $to, $via) = @_; my $ref = $pings{$to} || []; my $r = {}; $r->{call} = $from; $r->{t} = [ gettimeofday ]; - route(undef, $to, pc51($to, $main::mycall, 1)); + if ($via && (my $dxchan = DXChannel->get($via))) { + $dxchan->send(pc51($to, $main::mycall, 1)); + } else { + route(undef, $to, pc51($to, $main::mycall, 1)); + } push @$ref, $r; $pings{$to} = $ref; + my $u = DXUser->get_current($to); + if ($u) { + $u->lastping($main::systime); + $u->put; + } } sub process_rcmd @@ -2293,7 +2340,7 @@ sub disconnect # broadcast to all other nodes that all the nodes connected to via me are gone unless ($pc39flag && $pc39flag == 2) { $self->route_pc21($main::mycall, undef, @rout) if @rout; - $self->route_pc59('D', 0, $main::mycall, $node); + $self->route_pc59('D', hexstamp(), $main::mycall, $node); } # delete all the unwanted nodes