add DXCIDR, fix version no tracking

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 289498ce27afdfdf1e9ff66cf3228f2c805784a1..b6e959e7ddc23b5dcc8109347ff5552fd00d3af0 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -33,6 +33,7 @@ use Route;
 use Route::Node;
 use Script;
 use DXProtHandle;
+use DXCIDR;
 
 use strict;
 
@@ -65,7 +66,7 @@ $badnode = new DXHash "badnode";
 $last10 = $last_pc50 = time;
 $ann_to_talk = 1;
 $eph_restime = 60;
-$eph_info_restime = 60*60;
+$eph_info_restime = 18*60*60;
 $eph_pc15_restime = 6*60;
 $eph_pc34_restime = 30;
 $pingint = 5*60;
@@ -134,7 +135,7 @@ $pc92_find_timeout = 30;            # maximum time to wait for a reply
  undef,
  undef,
  undef,                                                        # pc60
- undef,
+ [ qw(i f m d t m c c a h) ],          # pc61
  undef,
  undef,
  undef,
@@ -205,6 +206,8 @@ sub check
                        return $i unless $_[$i] =~ /^[012]\d[012345]\dZ$/;
                } elsif ($act eq 'l') {
                        return $i unless $_[$i] =~ /^[A-Z]$/;
+               } elsif ($act eq 'a') {
+                       return $i unless is_ipaddr($_[$i]);
                }
        }
        return 0;
@@ -244,8 +247,9 @@ sub init
        $main::me->{pingave} = 0;
        $main::me->{registered} = 1;
        $main::me->{version} = $main::version;
-       $main::me->{build} = "$main::subversion.$main::build";
+       $main::me->{build} = $main::build;
        $main::me->{do_pc9x} = 1;
+       $main::me->{hostname} = $main::clusteraddr;
        $main::me->update_pc92_next($pc92_short_update_period);
        $main::me->update_pc92_keepalive;
 }
@@ -286,7 +290,9 @@ sub start
        # log it
        my $host = $self->{conn}->peerhost;
        $host ||= "AGW Port #$self->{conn}->{agwport}" if exists $self->{conn}->{agwport};
+       $host ||= $host if is_ipaddr($host);
        $host ||= "unknown";
+       $self->{hostname} = $host;
 
        Log('DXProt', "$call connected from $host");
 
@@ -428,9 +434,9 @@ sub normal
        my $sub = "handle_$pcno";
 
        if ($self->can($sub)) {
-               $self->$sub($pcno, $line, $origin, @field);
+               $self->$sub($pcno, $line, $origin, \@field);
        } else {
-               $self->handle_default($pcno, $line, $origin, @field);
+               $self->handle_default($pcno, $line, $origin, \@field);
        }
 }
 
@@ -544,14 +550,22 @@ sub send_dx_spot
        my $line = shift;
        my @dxchan = DXChannel::get_all();
        my $dxchan;
+       my $pc11;
 
        # send it if it isn't the except list and isn't isolated and still has a hop count
        # taking into account filtering and so on
        foreach $dxchan (@dxchan) {
                next if $dxchan == $main::me;
                next if $dxchan == $self && $self->is_node;
-               next if $line =~ /PC61/ && !$dxchan->is_spider && !$dxchan->is_user;
-               $dxchan->dx_spot($line, $self->{isolate}, @_, $self->{call});
+               if ($line =~ /PC61/ && !($dxchan->is_spider || $dxchan->is_user)) {
+                       unless ($pc11) {
+                               my @f = split /\^/, $line;
+                               $pc11 = join '^', 'PC11', @f[1..7,9];
+                       }
+                       $dxchan->dx_spot($pc11, $self->{isolate}, @_, $self->{call});
+               } else {
+                       $dxchan->dx_spot($line, $self->{isolate}, @_, $self->{call});
+               }
        }
 }
 
@@ -785,20 +799,15 @@ sub send_chat
        # send it if it isn't the except list and isn't isolated and still has a hop count
        # taking into account filtering and so on
        foreach $dxchan (@dxchan) {
-               my $is_ak1a = $dxchan->is_ak1a;
-
                if ($dxchan->is_node) {
                        next if $dxchan == $main::me;
                        next if $dxchan == $self;
-                       next if $from_pc9x && $dxchan->{do_pc9x};
-                       next unless $dxchan->is_spider || $is_ak1a;
+                       next if $from_pc9x && $dxchan->do_pc9x;
+                       next unless $dxchan->is_spider && $dxchan->do_pc9x;
                        next if $target eq 'LOCAL';
-                       if (!$ak1a_line && $is_ak1a) {
-                               $ak1a_line = pc12($_[0], $text, $_[1], "$target.LST");
-                       }
                }
 
-               $dxchan->chat($is_ak1a ? $ak1a_line : $line, $self->{isolate}, $target, $_[1],
+               $dxchan->chat($line, $self->{isolate}, $target, $_[1],
                                          $text, @_, $self->{call}, @a[0..2], @b[0..2]);
        }
 }
@@ -950,7 +959,8 @@ sub broadcast_pc92_update
 
        my $nref = Route::Node::get($call);
        unless ($nref) {
-               dbg("ERROR: broadcast_pc92_update - Route::Node $call disappeared");
+               cluck("ERROR: broadcast_pc92_update - Route::Node $call disappeared");
+               $self->update_pc92_next;
                return;
        }
        my $l = $nref->last_PC92C(gen_my_pc92_config($nref));
@@ -968,7 +978,8 @@ sub broadcast_pc92_keepalive
 
        my $nref = Route::Node::get($call);
        unless ($nref) {
-               dbg("ERROR: broadcast_pc92_keepalive - Route::Node $call disappeared");
+               cluck("ERROR: broadcast_pc92_keepalive - Route::Node $call disappeared");
+               $self->update_pc92_keepalive;
                return;
        }
        my $l = pc92k($nref);
@@ -1106,9 +1117,19 @@ sub process_rcmd
        my ($self, $tonode, $fromnode, $user, $cmd) = @_;
        if ($tonode eq $main::mycall) {
                my $ref = DXUser::get_current($fromnode);
+               unless ($ref && UNIVERSAL::isa($ref, 'DXUser')) {
+                       dbg("DXProt process_rcmd: user $fromnode isn't a reference (check user_asc and tell G1TLH)"); 
+                       $self->send_rcmd_reply($main::mycall, $fromnode, $user, "sorry...!");
+                       return;
+               }
                my $cref = Route::Node::get($fromnode);
+               unless ($cref && UNIVERSAL::isa($cref, 'Route')) {
+                       dbg("DXProt process_rcmd: Route $fromnode isn't a reference (tell G1TLH)"); 
+                       $self->send_rcmd_reply($main::mycall, $fromnode, $user, "sorry...!");
+                       return;
+               }
                Log('rcmd', 'in', ($ref->{priv}||0), $fromnode, $cmd);
-               if ($cmd !~ /^\s*rcmd/i && $cref && $ref && $ref->homenode && $cref->call eq $ref->homenode) { # not allowed to relay RCMDS!
+               if ($cmd !~ /^\s*rcmd/i && $ref->homenode && $cref->call eq $ref->homenode) { # not allowed to relay RCMDS!
                        if ($ref->{priv}) {             # you have to have SOME privilege, the commands have further filtering
                                $self->{remotecmd} = 1; # for the benefit of any command that needs to know
                                my $oldpriv = $self->{priv};