add DXCIDR, fix version no tracking

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 494b4348d9e13077b3ecf1d93766c331e24b4cef..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;
 
@@ -246,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;
 }
@@ -288,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");
 
@@ -430,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);
        }
 }
 
@@ -955,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));
@@ -973,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);
@@ -1111,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};