extend the Web interface protocol further

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 494b4348d9e13077b3ecf1d93766c331e24b4cef..68dd099ee457564acb15ddd1c2232553987b4f25 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -174,6 +174,8 @@ $pc92_find_timeout = 30;            # maximum time to wait for a reply
 sub check
 {
        my $n = shift;
+       my $pc = shift;
+       
        $n -= 10;
        return 0 if $n < 0 || $n > @checklist;
        my $ref = $checklist[$n];
@@ -183,30 +185,30 @@ sub check
        for ($i = 1; $i < @$ref; $i++) {
                my ($blank, $act) = $$ref[$i] =~ /^(b?)(\w)$/;
                return 0 unless $act;
-               next if $blank eq 'b' && $_[$i] =~ /^[ \*]$/;
-               next if $blank eq '*' && $_[$i] =~ /^\*$/;
+               next if $blank eq 'b' && $pc->[$i] =~ /^[ \*]$/;
+               next if $blank eq '*' && $pc->[$i] =~ /^\*$/;
                if ($act eq 'c') {
-                       return $i unless is_callsign($_[$i]);
+                       return $i unless is_callsign($pc->[$i]);
                } elsif ($act eq 'i') {
                        ;                                       # do nothing
                } elsif ($act eq 'm') {
-                       return $i unless is_pctext($_[$i]);
+                       return $i unless is_pctext($pc->[$i]);
                } elsif ($act eq 'p') {
-                       return $i unless is_pcflag($_[$i]);
+                       return $i unless is_pcflag($pc->[$i]);
                } elsif ($act eq 'f') {
-                       return $i unless is_freq($_[$i]);
+                       return $i unless is_freq($pc->[$i]);
                } elsif ($act eq 'n') {
-                       return $i unless $_[$i] =~ /^[\d ]+$/;
+                       return $i unless $pc->[$i] =~ /^[\d ]+$/;
                } elsif ($act eq 'h') {
-                       return $i unless $_[$i] =~ /^H\d\d?$/;
+                       return $i unless $pc->[$i] =~ /^H\d\d?$/;
                } elsif ($act eq 'd') {
-                       return $i unless $_[$i] =~ /^\s*\d+-\w\w\w-[12][90]\d\d$/;
+                       return $i unless $pc->[$i] =~ /^\s*\d+-\w\w\w-[12][90]\d\d$/;
                } elsif ($act eq 't') {
-                       return $i unless $_[$i] =~ /^[012]\d[012345]\dZ$/;
+                       return $i unless $pc->[$i] =~ /^[012]\d[012345]\dZ$/;
                } elsif ($act eq 'l') {
-                       return $i unless $_[$i] =~ /^[A-Z]$/;
+                       return $i unless $pc->[$i] =~ /^[A-Z]$/;
                } elsif ($act eq 'a') {
-                       return $i unless is_ipaddr($_[$i]);
+                       return $i unless is_ipaddr($pc->[$i]);
                }
        }
        return 0;
@@ -230,7 +232,8 @@ sub update_pc92_keepalive
 
 sub init
 {
-       do "$main::data/hop_table.pl" if -e "$main::data/hop_table.pl";
+       my $fn = localdata("hop_table.pl");
+       do $fn if -e $fn;
        confess $@ if $@;
 
        my $user = DXUser::get($main::mycall);
@@ -246,7 +249,7 @@ 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->update_pc92_next($pc92_short_update_period);
        $main::me->update_pc92_keepalive;
@@ -289,6 +292,7 @@ sub start
        my $host = $self->{conn}->peerhost;
        $host ||= "AGW Port #$self->{conn}->{agwport}" if exists $self->{conn}->{agwport};
        $host ||= "unknown";
+       $self->{hostname} = $host if is_ipaddr($host);
 
        Log('DXProt', "$call connected from $host");
 
@@ -401,7 +405,7 @@ sub normal
        }
 
        # check for and dump bad protocol messages
-       my $n = check($pcno, @field);
+       my $n = check($pcno, \@field);
        if ($n) {
                dbg("PCPROT: bad field $n, dumped (" . parray($checklist[$pcno-10]) . ")") if isdbg('chanerr');
                return;
@@ -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};