X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=6ba38a430c4579bde302d0719116cc7e777dec06;hb=ee55bc4f9cf0763f17c9698ab4c7d47a4e7008ce;hp=8730754bd8007a4abb7471562c0536d9f0293a5f;hpb=77087be665bd7acfd993524b9cdbdd57a578a107;p=spider.git diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index 8730754b..6ba38a43 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -32,8 +32,10 @@ use DXHash; use Route; use Route::Node; use Script; +use DXCIDR; use strict; +use warnings qw(all); 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 @@ -184,6 +186,16 @@ sub handle_11 return; } + # check IP addresses + if ($pc->[8] && is_ipaddr($pc->[8])) { + my $ip = $pc->[8]; + $ip =~ s/,/:/g; + $ip =~ s/^::ffff://; + if (DXCIDR::find($ip)) { + + } + } + # convert the date to a unix date my $d = cltounix($pc->[3], $pc->[4]); # bang out (and don't pass on) if date is invalid or the spot is too old (or too young) @@ -780,6 +792,7 @@ sub check_add_user } else { $user->homenode($homenode) if $homenode; $user->node($homenode); + $user->priv(0); } $user->lastin($main::systime); # this make it last longer than just this invocation $user->put; # just to make sure it gets written away!!! @@ -788,7 +801,7 @@ sub check_add_user # this is to fix a problem I introduced some build ago by using this function for users # whereas it was only being used for nodes. - if ($user->is_user && $user->lockout && $user->priv == 1) { + if ($user->is_user && $user->lockout && ($user->priv // 0) == 1) { $user->priv(0); $user->lockout(0); dbg("DXProt: PC92 user record for $call depriv'd and unlocked"); @@ -1555,18 +1568,27 @@ sub _decode_pc92_call my $is_node = $flag & 4; my $is_extnode = $flag & 2; my $here = $flag & 1; - my $ip; - $part[1] //= ''; - $part[2] //= ''; - $part[3] //= ''; - if ($part[1] =~ /[,.]/) { - $ip = $part[1]; - $part[1] = $part[2] = 0; - } elsif ($part[3] =~ /[,.]/) { - $ip = $part[3]; - } - $ip =~ s/,/:/g if $ip; - return ($call, $is_node, $is_extnode, $here, $part[1], $part[2], $ip); + my $version = $part[1] || 0; + my $build = $part[2] || 0; + my $ip = $part[3] || ''; + + # remember that, at this stage, IPV6 addresses have : replaced by , + if (length $version > 4 && $version =~ /[,\.][\da-f]{1,4}/i) { + $ip = $version; + $version = 0; + } + $version =~ s/\D//g; + $version = 0 unless $version && $version =~ /^[0-9]+$/; + $build =~ s/^0\.//; + $build =~ s/\D//g; + $build = 0 unless $build && $build =~ /^[0-9]+$/; + if ($ip) { + $ip =~ s/,/:/g; + $ip =~ s/^::ffff://i; + $ip = '' unless is_ipaddr($ip); + } + dbg("'$icall' = '" . join("', '", $call, $is_node, $is_extnode, $here, $version, $build, $ip) . "'") if isdbg('pc92'); + return ($call, $is_node, $is_extnode, $here, $version+0, $build+0, $ip); } # decode a pc92 call: flag call : version : build @@ -1597,6 +1619,7 @@ sub _encode_pc92_call $ip =~ s/:/,/g; $extra .= ':' . $ip; } + return "$flag$call$extra"; } @@ -1614,9 +1637,8 @@ sub _add_thingy my @rout; # remove spurious IPV6 prefix on IPV4 addresses - $ip =~ s/^::ffff:// if $ip; - $build //= 0; - $version //= 0; + $build ||= 0; + $version ||= 0; if ($call) { my $ncall = $parent->call; @@ -1641,19 +1663,22 @@ sub _add_thingy @rout = $parent->add($call, $version, Route::here($here), $ip); $r = Route::Node::get($call); $r->PC92C_dxchan($dxchan->call, $hops) if $r; - if ($version && $version =~ /\d+/) { + if ($version && is_numeric($version) && !$r->K && !$user->K) { my $old = $user->sort; if ($user->is_ak1a && (($version >= 5455 && $build > 0) || ($version >= 3000 && $version <= 3500)) ) { $user->sort('S'); dbg("PCProt::_add_thingy node $call v: $version b: $build sort ($old) updated to " . $user->sort); - } elsif ($user->is_spider && $version =~ /^\d+$/ && ($version < 3000 || ($version > 4000 && $version < 5455))) { - unless ($version == 5000 && $build == 0) { + } elsif ($user->is_spider && ($version < 3000 || ($version > 4000 && $version < 5455))) { + unless ($version > 0 && $build == 0) { $user->sort('A'); - $build //= 0; + $build ||= 0; dbg("PCProt::_add_thingy node $call v: $version b: $build sort ($old) downgraded to " . $user->sort); } } } + $r->version($user->version) if $user->version; + $r->build($user->build) if $user->build; + $r->K(1) if $user->K; } else { dbg("ROUTE: added user $call to $ncall") if isdbg('routelow'); $user = check_add_user($call, 'U', $parent->call); @@ -1874,7 +1899,7 @@ sub pc92_handle_first_slot } $parent->here(Route::here($here)); $parent->version($version || $pc19_version) if $version; - $build =~ s/^0\.//, $parent->build($build) if $build; + $parent->build($build) if $build; $parent->PC92C_dxchan($self->{call}, $hops) unless $self->{call} eq $parent->call; return ($parent, @radd); } @@ -1996,23 +2021,40 @@ sub handle_92 push @radd, $add if $add; $parent->reset_obs; my $call = $parent->call; - my $version = $ent[4] // 0; - my $build = $ent[5] // 0; + my $version = $ent[4] || 0; + my $build = $ent[5] || 0; $build =~ s/^0\.//; - my $oldbuild = $parent->build // 0; - $oldbuild =~ s/^0\.//; - my $oldversion = $parent->version // 0; + my $oldbuild = $parent->build || 0; + my $oldversion = $parent->version || 0; my $user = check_add_user($parent->call, 'S'); my $oldsort = $user->sort // ''; - if ($oldsort ne 'S' || $oldversion != $version || $build != $oldbuild) { - dbg("PCProt PC92 K node $call updated version: $version (was $oldversion) build: $build (was $oldbuild) sort: 'S' (was $oldsort)"); - $user->sort('S'); - $user->version($parent->version($version)); - $user->build($parent->build($build)); - $user->put; - } - dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('obscount'); + dbg("PCProt PC92 K v: $version ov: $oldversion b: $build ob: $oldbuild pk: " . ($parent->K || '0') . " uk: " . ($user->K || 0)) if isdbg('pc92k'); + + if (is_numeric($version) || is_numeric($build)) { + my $changed = 0; + if (($oldversion ne $version || $build ne $oldbuild)) { + dbg("PCProt PC92 K node $call updated version: $version (was $oldversion) build: $build (was $oldbuild)"); + $user->version($parent->version($version)); + $user->build($parent->build($build)); + ++$changed; + } + if ($oldsort ne 'S') { + dbg("PCProt PC92 K node $call updated sort: $sort (was $oldsort)"); + $user->sort('S'); + ++$changed; + } + unless ($user->K) { + dbg("PCProt PC92 K node $call updated - marked as PC92 K user"); + $user->K(1); + ++$changed; + } + $user->put if $changed; + $parent->K(1); # mark this as come in on a K + } else { + dbg("DXProt PC92 K version call $call: invalid version: '$version' or build: '$version', ignored"); + } + dbg("ROUTE: reset obscount on $call now " . $parent->obscount) if isdbg('obscount'); } } elsif ($sort eq 'A' || $sort eq 'D' || $sort eq 'C') {