X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=6f240200263758baaeb4b87a2b202fb35fdfa12e;hb=d0b21f21559a63d84086b549bb7570e2e16b75cd;hp=60040e4d525b527732abc578e0724462868e1325;hpb=7dd07d0e32e95c4dc1ada18c92d3b5cce5c4d128;p=spider.git diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index 60040e4d..6f240200 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -49,7 +49,7 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim $eph_pc15_restime $pc9x_past_age $pc9x_dupe_age $pc10_dupe_age $pc92_slug_changes $last_pc92_slug $pc92Ain $pc92Cin $pc92Din $pc92Kin $pc9x_time_tolerance - $pc92filterdef $senderverify $pc11_dwell_time $pc11_extract_route $pc92_ad_enabled $pc92c_ipaddr_enable + $pc92filterdef $senderverify $pc11_dwell_time $pc61_extract_route $pc92_ad_enabled $pc92c_ipaddr_enabled ); $pc9x_dupe_age = 60; # catch loops of circular (usually) D records @@ -63,7 +63,7 @@ $pc9x_time_tolerance; # thing a node might send - once an hour and we $senderverify = 0; # 1 - check for forged PC11 or PC61. # 2 - if forged, dump them. $pc11_dwell_time = 2; # number of seconds to wait for a PC61 to come to substitute the PC11 -$pc11_extract_route = 1; # generate missing user route entry and IP address from passing PC61s +$pc61_extract_route = 0; # generate missing user route entry and IP address from passing PC61s $pc92filterdef = bless ([ @@ -259,13 +259,15 @@ sub handle_11 } } - # Populate the routing table - $self->populate_routing_table($pc->[7], $pc->[6], $pc->[8]); - my $r = Route::User::get($pc->[6]); + my $rug = Route::User::get($pc->[6]); if ($pcno == 61) { unless ($pc->[8] && is_ipaddr($pc->[8])) { - dbg("PCPROT: ROUTE $self->{call} NO IP ADDRESS in '$line'!"); + LogDbg('err', "PCPROT: ROUTE $self->{call} NO IP ADDRESS in '$line'!"); + return; } + if ($pc61_extract_route) { + $self->populate_routing_table($pc->[7], $pc->[6], $pc->[8]); + } } # this is where we decide to delay PC11s in the hope that a PC61 will be along soon. @@ -316,11 +318,11 @@ sub handle_11 # If we have an ip address we can promote by route - if ($r && $r->ip) { + if ($rug && $rug->ip) { $pcno = 61; $pc->[0] = 'PC61'; my $hops = $pc->[8]; - $pc->[8] = $spot[14] = $r->ip; + $pc->[8] = $spot[14] = $rug->ip; ++$rpc11_to_61; my $percent = $pc11_rx ? $rpc11_to_61 * 100 / $pc11_rx : 0; dbg(sprintf("PROMOTED $self->{call}: ROUTE pc11 $key PROMOTED to pc61 with IP $spot[14] pc61: $pc61_rx pc11: $pc11_rx route->pc61 $rpc11_to_61 (%0.1f%%)", $percent)) if isdbg("pc11"); @@ -382,23 +384,29 @@ sub handle_11 # # As for spots generated from non-PC92 nodes, we'll see after about do_pc9x3h20m... # - if ($senderverify) { + if ($senderverify || isdbg('suspicious')) { + my $sv = $senderverify; + $sv += 2 if isdbg('suspicious'); my $nroute = Route::Node::get($pc->[7]); - my $uroute = Route::Node::get($pc->[6]); my $local = DXChannel::get($pc->[7]); - + my $uref = DXUser::get_current($pc->[7]); + my $s = ''; + my $ip = $pcno == 61 ? $pc->[8] : ''; + if ($nroute && ($nroute->last_PC92C || ($local && !$local->do_pc9x))) { - my $s = ''; - my $ip = $pcno == 61 ? $pc->[8] : ''; # $s .= "User $pc->[6] not logged in, " unless $uroute; $s .= "User $pc->[6] not on node $pc->[7], " unless $nroute->is_user($pc->[6]); # $s .= "Node $pc->[7] at '$ip' not on Node's IP " . $nroute->ip if $ip && $nroute && $nroute->ip && $nroute->ip ne $ip; - if ($s) { - my $action = $senderverify > 1 ? ", DUMPED" : ''; - $s =~ s/, $//; - dbg("PCPROT: Suspicious Spot $pc->[2] on $pc->[1] by $pc->[6]($ip)\@$pc->[7] $s$action"); - return unless $senderverify < 2; - } + } + # check for ip addresses on spots from non-pc9x nodes - if they have it's likely done by DXSpider nodes + #if ($ip && ($nroute && !$nroute->do_pc9x || $uref && $uref->is_spider)) { + # $s .= "PC$pcno has spurious ipaddr '$ip' from non-pc9x node $pc->[7]"; + #} + if ($s) { + my $action = $sv > 1 ? ", DUMPED" : ''; + $s =~ s/, $//; + dbg("PCPROT: Bad Spot $pc->[2] on $pc->[1] by $pc->[6]($ip)\@$pc->[7] $s$action"); + return unless $sv < 2; } } @@ -733,23 +741,23 @@ sub handle_16 $conf = $conf eq '*'; # reject this if we think it is a node already - my $r = Route::Node::get($call); - my $u = DXUser::get_current($call) unless $r; - if ($r || ($u && $u->is_node)) { + my $rng = Route::Node::get($call); + my $u = DXUser::get_current($call) unless $rng; + if ($rng || ($u && $u->is_node)) { dbg("PCPROT: $call is a node") if isdbg('chanerr'); next; } - $r = Route::User::get($call); + my $rug = Route::User::get($call); my $flags = Route::here($here)|Route::conf($conf); - if ($r) { - my $au = $r->addparent($parent); - if ($r->flags != $flags) { - $r->flags($flags); - $au = $r; + if ($rug) { + my $au = $rug->addparent($parent); + if ($rug->flags != $flags) { + $rug->flags($flags); + $au = $rug; } - push @rout, $r if $h && $au; + push @rout, $rug if $h && $au; } else { my @ans = $parent->add_user($call, $flags); push @rout, @ans if $h && @ans; @@ -863,9 +871,11 @@ sub handle_18 $self->state('init'); my $parent = Route::Node::get($self->{call}); - + + my ($software, $version, $build) = (undef, 0, 0); + # record the type and version offered - if (my ($software, $version) = $pc->[1] =~ /(DXSpider|CC\s*Cluster)\s+Version: (\d+(?:\.\d+)?)/i) { + if (($software, $version) = $pc->[1] =~ /(DXSpider|CC\s*Cluster)\s+Version: (\d+(?:\.\d+)?)/i) { $version += 0; $version += 53 if $version < 6; $self->{version} = $version; @@ -885,7 +895,7 @@ sub handle_18 $self->sort('S'); } # $self->{handle_xml}++ if DXXml::available() && $pc->[1] =~ /\bxml/; - } elsif (my ($software, $version, $build) = $pc->[1] =~ /(AR-Cluster)\s+Version:\s+(\d+\.\d+).?(\d+\.\d+)?/) { + } elsif (($software, $version, $build) = $pc->[1] =~ /(AR-Cluster)\s+Version:\s+(\d+\.\d+).?(\d+\.\d+)?/) { dbg("$self->{call} = $software version $version build $build"); $self->{version} = $version; $self->user->version($version); @@ -943,7 +953,7 @@ sub check_add_user $user->node($homenode); $user->priv(0); } - $user->lastin($main::systime); # this make it last longer than just this invocation + $user->lastin($main::systime); # this makes it last longer than just this invocation $user->put; # just to make sure it gets written away!!! dbg("DXProt: PC92 new user record for $call created"); } @@ -1030,6 +1040,12 @@ sub handle_19 next; } + if ($call eq $main::myalias) { + LogDbg('err', "ROUTE: $call eq \$myalias from $self->{call}, ignored!!!"); + dbgprintring(3) if isdbg('nologchan'); + next; + } + my $user = check_add_user($call, 'A'); # if (eph_dup($genline)) { @@ -1805,7 +1821,12 @@ sub _add_thingy $user->del if $user; $call = $normcall; # this is safe because a route add will ignore duplicates } - + + if ($call eq $main::myalias && $is_node) { + LogDbg('err', "ROUTE: $call eq \$myalias from $ncall - downgraded to user!!!"); + dbgprintring(3) if isdbg('nologchan'); + $is_node = 0; + } if ($is_node) { dbg("ROUTE: added node $call to $ncall") if isdbg('routelow'); $user = check_add_user($call, 'A'); @@ -2247,7 +2268,9 @@ sub handle_92 dbg("PCPROT: $self->{call} : type $sort $_->[0] refers to me, ignored") if isdbg('route'); next; } - if ($_->[0] eq $main::myalias && $_->[1] || $_->[0] eq $main::mycall && $_->[1] == 0) { + + my $isnode = ($_->[1] | $_->[2]); + if (($_->[0] eq $main::myalias && $isnode) || ($_->[0] eq $main::mycall && !$isnode)) { LogDbg('err',"PCPROT: $self->{call} : type $sort $_->[0] trying to change type to " . $_->[1]?"Node":"User" . ", ignored"); next; } @@ -2321,8 +2344,11 @@ sub handle_92 $self->route_pc16($pcall, undef, $parent, @pc16) if @pc16; } - # broadcast it if we get here - $self->broadcast_route_pc9x($pcall, undef, $line, 0) unless !$pc92_ad_enabled && ($sort eq 'A' || $sort eq 'D'); + # broadcast it if we get here (but not if it's an A or D record and pc92_ad_enabled isn't set; + if ($sort eq 'A' || $sort eq 'D') { + return unless $pc92_ad_enabled; + } + $self->broadcast_route_pc9x($pcall, undef, $line, 0); } # get all the routes for a thing, bearing in mind that the thing (e.g. a user) @@ -2432,7 +2458,7 @@ sub handle_93 } } - $self->populate_routing_table($onode, $from, $ipaddr); + $self->populate_routing_table($onode, $from, $ipaddr) if $pc61_extract_route; # if it is routeable then then treat it like a talk my $ref = Route::get($to); @@ -2512,6 +2538,7 @@ sub handle_default } } +# does what it says on the tin.. sub populate_routing_table { my ($self, $node, $user, $ip) = @_;