pre 1.13 release
[spider.git] / perl / DXProt.pm
index 58dfd4973877731827c87d9695274917f0b3f13c..655da52b20ba2e45e1870593036854c74c9e6923 100644 (file)
@@ -24,18 +24,27 @@ use DXProtout;
 use Carp;
 
 use strict;
-use vars qw($me $pc11_max_age $pc11_dup_age %dup $last_hour);
+use vars qw($me $pc11_max_age $pc11_dup_age %dup $last_hour %pings %rcmds %nodehops);
 
 $me = undef;                                   # the channel id for this cluster
 $pc11_max_age = 1*3600;                        # the maximum age for an incoming 'real-time' pc11
 $pc11_dup_age = 24*3600;               # the maximum time to keep the dup list for
 %dup = ();                                             # the pc11 and 26 dup hash 
 $last_hour = time;                             # last time I did an hourly periodic update
+%pings = ();                    # outstanding ping requests outbound
+%rcmds = ();                    # outstanding rcmd requests outbound
+%nodehops = ();                 # node specific hop control
+
 
 sub init
 {
        my $user = DXUser->get($main::mycall);
-       $me = DXProt->new($main::mycall, undef, $user); 
+       $DXProt::myprot_version += $main::version*100;
+       $me = DXProt->new($main::mycall, 0, $user); 
+       $me->{here} = 1;
+       $me->{state} = "indifferent";
+       do "$main::data/hop_table.pl" if -e "$main::data/hop_table.pl";
+       confess $@ if $@;
        #  $me->{sort} = 'M';    # M for me
 }
 
@@ -46,7 +55,7 @@ sub init
 sub new 
 {
        my $self = DXChannel::alloc(@_);
-       $self->{sort} = 'A';            # in absence of how to find out what sort of an object I am
+       $self->{'sort'} = 'A';          # in absence of how to find out what sort of an object I am
        return $self;
 }
 
@@ -64,6 +73,7 @@ sub start
        $self->{outbound} = $sort eq 'O';
        $self->{priv} = $user->priv;
        $self->{lang} = $user->lang;
+       $self->{isolate} = $user->{isolate};
        $self->{consort} = $line;       # save the connection type
        $self->{here} = 1;
        
@@ -77,6 +87,7 @@ sub start
        }
        $self->state('init');
        $self->pc50_t(time);
+
        Log('DXProt', "$call connected");
 }
 
@@ -93,6 +104,7 @@ sub normal
        
        # process PC frames
        my ($pcno) = $field[0] =~ /^PC(\d\d)/; # just get the number
+       return unless $pcno;
        return if $pcno < 10 || $pcno > 51;
        
  SWITCH: {
@@ -104,9 +116,10 @@ sub normal
                                
                                # yes, it is
                                my $text = unpad($field[3]);
+                               Log('talk', $call, $field[1], $field[6], $text);
+                               $call = $main::myalias if $call eq $main::mycall;
                                my $ref = DXChannel->get($call);
                                $ref->send("$call de $field[1]: $text") if $ref;
-                               Log('talk', $call, $field[1], $field[6], $text);
                        } else {
                                route($field[2], $line); # relay it on its way
                        }
@@ -156,7 +169,7 @@ sub normal
                                my @list;
                                
                                if ($field[4] eq '*') { # sysops
-                                       $target = "Sysops";
+                                       $target = "SYSOP";
                                        @list = map { $_->priv >= 5 ? $_ : () } get_all_users();
                                } elsif ($field[4] gt ' ') { # speciality list handling
                                        my ($name) = split /\./, $field[4]; 
@@ -200,6 +213,7 @@ sub normal
                        last SWITCH if !$node; # ignore if havn't seen a PC19 for this one yet
                        my $i;
                        
+                       
                        for ($i = 2; $i < $#field; $i++) {
                                my ($call, $confmode, $here) = $field[$i] =~ /^(\S+) (-) (\d)/o;
                                next if length $call < 3;
@@ -214,8 +228,9 @@ sub normal
                                $call =~ s/-\d+$//o;        # remove ssid for users
                                my $user = DXUser->get_current($call);
                                $user = DXUser->new($call) if !$user;
-                               $user->node($node->call);
                                $user->homenode($node->call) if !$user->homenode;
+                               $user->node($node->call);
+                               $user->lastin($main::systime);
                                $user->put;
                        }
                        
@@ -263,14 +278,17 @@ sub normal
                                if (!$user) {
                                        $user = DXUser->new($call);
                                        $user->sort('A');
-                                       $user->node($call);
+                                       $user->priv(1);                   # I have relented and defaulted nodes
+                                       $self->{priv} = 1;                # to user RCMDs allowed
                                        $user->homenode($call);
-                                       $user->put;
+                                       $user->node($call);
                                }
+                               $user->lastin($main::systime);
+                               $user->put;
                        }
                        
                        # queue up any messages
-                       DXMsg::queue_msg() if $self->state eq 'normal';     
+                       DXMsg::queue_msg(0) if $self->state eq 'normal';
                        last SWITCH;
                }
                
@@ -280,7 +298,7 @@ sub normal
                        $self->state('normal');
                        
                        # queue mail
-                       DXMsg::queue_msg();
+                       DXMsg::queue_msg(0);
                        return;
                }
                
@@ -294,7 +312,11 @@ sub normal
                }
                
                if ($pcno == 22) {
-                       last SWITCH;
+                       $self->state('normal');
+                       
+                       # queue mail
+                       DXMsg::queue_msg(0);
+                       return;
                }
                
                if ($pcno == 23 || $pcno == 27) { # WWV info
@@ -313,7 +335,7 @@ sub normal
                        last SWITCH;
                }
                
-               if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42) { # mail/file handling
+               if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42 || $pcno == 49) { # mail/file handling
                        DXMsg::process($self, $line);
                        return;
                }
@@ -322,15 +344,19 @@ sub normal
                        if ($field[1] eq $main::mycall) {
                                my $ref = DXUser->get_current($field[2]);
                                Log('rcmd', 'in', $ref->{priv}, $field[2], $field[3]);
-                               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 @in = (DXCommandmode::run_cmd($self, $field[3]));
-                                       for (@in) {
-                                               s/\s*$//og;
-                                               $self->send(pc35($main::mycall, $field[2], "$main::mycall:$_"));
-                                               Log('rcmd', 'out', $field[2], $_);
+                               unless ($field[3] =~ /rcmd/i) {    # 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 @in = (DXCommandmode::run_cmd($self, $field[3]));
+                                               for (@in) {
+                                                       s/\s*$//og;
+                                                       $self->send(pc35($main::mycall, $field[2], "$main::mycall:$_"));
+                                                       Log('rcmd', 'out', $field[2], $_);
+                                               }
+                                               delete $self->{remotecmd};
                                        }
-                                       delete $self->{remotecmd};
+                               } else {
+                                       $self->send(pc35($main::mycall, $field[2], "$main::mycall:Tut tut tut...!"));
                                }
                        } else {
                                route($field[1], $line);
@@ -340,12 +366,11 @@ sub normal
                
                if ($pcno == 35) {              # remote command replies
                        if ($field[1] eq $main::mycall) {
-                               my $s = DXChannel::get($main::myalias); 
-                               my @ref = grep { $_->pc34to eq $field[2] } DXChannel::get_all(); # people that have rcmded someone
-                               push @ref, $s if $s;
-                               
-                               foreach (@ref) {
-                                       $_->send($field[3]);
+                               my $s = $rcmds{$field[2]};
+                               if ($s) {
+                                       my $dxchan = DXChannel->get($s->{call});
+                                       $dxchan->send($field[3]) if $dxchan;
+                                       delete $rcmds{$field[2]} if !$dxchan;
                                }
                        } else {
                                route($field[1], $line);
@@ -381,13 +406,9 @@ sub normal
                        } elsif ($field[2] == 2) {
                                $user->qth($field[3]);
                        } elsif ($field[2] == 3) {
-                               my ($latd, $latm, $latl, $longd, $longm, $longl) = split /\s+/, $field[3];
-                               $longd += ($longm/60);
-                               $longd = 0-$longd if (uc $longl) eq 'W'; 
-                               $user->long($longd);
-                               $latd += ($latm/60);
-                               $latd = 0-$latd if (uc $latl) eq 'S';
-                               $user->lat($latd);
+                               my ($lat, $long) = DXBearing::stoll($field[3]);
+                               $user->lat($lat);
+                               $user->long($long);
                        } elsif ($field[2] == 4) {
                                $user->homenode($field[3]);
                        }
@@ -412,9 +433,6 @@ sub normal
                if ($pcno == 48) {
                        last SWITCH;
                }
-               if ($pcno == 49) {
-                       last SWITCH;
-               }
                
                if ($pcno == 50) {              # keep alive/user list
                        my $ref = DXCluster->get_exact($field[1]);
@@ -427,8 +445,18 @@ sub normal
                        # is it for us?
                        if ($field[1] eq $main::mycall) {
                                my $flag = $field[3];
-                               $flag ^= 1;
-                               $self->send($self->pc51($field[2], $field[1], $flag));
+                               if ($flag == 1) {
+                                       $self->send(pc51($field[2], $field[1], '0'));
+                               } else {
+                                       # it's a reply, look in the ping list for this one
+                                       my $ref = $pings{$field[2]};
+                                       if ($ref) {
+                                               my $r = shift @$ref;
+                                               my $dxchan = DXChannel->get($r->{call});
+                                               $dxchan->send($dxchan->msg('pingi', $field[2], atime($main::systime), $main::systime - $r->{t})) if $dxchan;
+                                       }
+                               }
+                               
                        } else {
                                # route down an appropriate thingy
                                route($field[1], $line);
@@ -445,13 +473,8 @@ sub normal
         #        REBROADCAST!!!!
         #
         
-        my $hops;
-       if (($hops) = $line =~ /H(\d+)\^\~?$/o) {
-               my $newhops = $hops - 1;
-               if ($newhops > 0) {
-                       $line =~ s/\^H$hops(\^\~?)$/\^H$newhops$1/;     # change the hop count
-                       broadcast_ak1a($line, $self); # send it to everyone but me
-               }
+       if (!$self->{isolate}) {
+               broadcast_ak1a($line, $self); # send it to everyone but me
        }
 }
 
@@ -462,16 +485,17 @@ sub normal
 sub process
 {
        my $t = time;
-       my @chan = DXChannel->get_all();
-       my $chan;
+       my @dxchan = DXChannel->get_all();
+       my $dxchan;
        
-       foreach $chan (@chan) {
-               next if !$chan->is_ak1a();
+       foreach $dxchan (@dxchan) {
+               next unless $dxchan->is_ak1a();
+               next if $dxchan == $me;
                
                # send a pc50 out on this channel
-               if ($t >= $chan->pc50_t + $DXProt::pc50_interval) {
-                       $chan->send(pc50());
-                       $chan->pc50_t($t);
+               if ($t >= $dxchan->pc50_t + $DXProt::pc50_interval) {
+                       $dxchan->send(pc50());
+                       $dxchan->pc50_t($t);
                }
        }
        
@@ -493,10 +517,11 @@ sub process
 sub finish
 {
        my $self = shift;
-       my $ref = DXCluster->get_exact($self->call);
+       my $call = $self->call;
+       my $ref = DXCluster->get_exact($call);
        
        # unbusy and stop and outgoing mail
-       my $mref = DXMsg::get_busy($self->call);
+       my $mref = DXMsg::get_busy($call);
        $mref->stop_msg($self) if $mref;
        
        # broadcast to all other nodes that all the nodes connected to via me are gone
@@ -504,14 +529,18 @@ sub finish
        my $node;
        
        foreach $node (@gonenodes) {
-               next if $node->call eq $self->call; 
-               broadcast_ak1a(pc21($node->call, 'Gone'), $self); # done like this 'cos DXNodes don't have a pc21 method
+               next if $node->call eq $call; 
+               broadcast_ak1a(pc21($node->call, 'Gone'), $self) unless $self->{isolate}; # done like this 'cos DXNodes don't have a pc21 method
                $node->del();
        }
+
+       # remove outstanding pings
+       delete $pings{$call};
        
        # now broadcast to all other ak1a nodes that I have gone
-       broadcast_ak1a(pc21($self->call, 'Gone.'), $self);
-       Log('DXProt', $self->call . " Disconnected");
+       broadcast_ak1a(pc21($call, 'Gone.'), $self);
+       
+       Log('DXProt', $call . " Disconnected");
        $ref->del() if $ref;
 }
 
@@ -523,18 +552,31 @@ sub send_local_config
 {
        my $self = shift;
        my $n;
+       my @nodes;
        
        # send our nodes
-       my @nodes = DXNode::get_all();
-       
-       # create a list of all the nodes that are not connected to this connection
-       @nodes = grep { $_->dxchan != $self } @nodes;
-       $self->send($me->pc19(@nodes));
+       if ($self->{isolate}) {
+               @nodes = (DXCluster->get_exact($main::mycall));
+       } else {
+               # create a list of all the nodes that are not connected to this connection
+               @nodes = DXNode::get_all();
+               @nodes = grep { $_->dxchan != $self } @nodes;
+       }
+
+       my @s = $me->pc19(@nodes);
+       for (@s) {
+               my $routeit = adjust_hops($self, $_);
+               $self->send($_) if $routeit;
+       }
        
        # get all the users connected on the above nodes and send them out
        foreach $n (@nodes) {
                my @users = values %{$n->list};
-               $self->send(DXProt::pc16($n, @users));
+               my @s = pc16($n, @users);
+               for (@s) {
+                       my $routeit = adjust_hops($self, $_);
+                       $self->send($_) if $routeit;
+               }
        }
 }
 
@@ -550,14 +592,11 @@ sub route
        if ($cl) {
                my $hops;
                my $dxchan = $cl->{dxchan};
-               if (($hops) = $line =~ /H(\d+)\^\~?$/o) {
-                       my $newhops = $hops - 1;
-                       if ($newhops > 0) {
-                               $line =~ s/\^H$hops(\^\~?)$/\^H$newhops$1/;     # change the hop count
+               if ($dxchan) {
+                       my $routeit = adjust_hops($dxchan, $line);   # adjust its hop count by node name
+                       if ($routeit) {
                                $dxchan->send($line) if $dxchan;
                        }
-               } else {
-                       $dxchan->send($line) if $dxchan; # for them wot don't have Hops
                }
        }
 }
@@ -567,12 +606,14 @@ sub broadcast_ak1a
 {
        my $s = shift;                          # the line to be rebroadcast
        my @except = @_;                        # to all channels EXCEPT these (dxchannel refs)
-       my @chan = get_all_ak1a();
-       my $chan;
+       my @dxchan = get_all_ak1a();
+       my $dxchan;
        
-       foreach $chan (@chan) {
-               next if grep $chan == $_, @except;
-               $chan->send($s);                # send it if it isn't the except list
+       # send it if it isn't the except list and isn't isolated and still has a hop count
+       foreach $dxchan (@dxchan) {
+               next if grep $dxchan == $_, @except;
+               my $routeit = adjust_hops($dxchan, $s);      # adjust its hop count by node name       
+               $dxchan->send($s) unless $dxchan->{isolate} || !$routeit; 
        }
 }
 
@@ -581,12 +622,13 @@ sub broadcast_users
 {
        my $s = shift;                          # the line to be rebroadcast
        my @except = @_;                        # to all channels EXCEPT these (dxchannel refs)
-       my @chan = get_all_users();
-       my $chan;
+       my @dxchan = get_all_users();
+       my $dxchan;
        
-       foreach $chan (@chan) {
-               next if grep $chan == $_, @except;
-               $chan->send($s);                # send it if it isn't the except list
+       foreach $dxchan (@dxchan) {
+               next if grep $dxchan == $_, @except;
+               $s =~ s/\a//og if !$dxchan->{beep};
+               $dxchan->send($s);              # send it if it isn't the except list or hasn't a passout flag
        }
 }
 
@@ -594,10 +636,10 @@ sub broadcast_users
 sub broadcast_list
 {
        my $s = shift;
-       my $chan;
+       my $dxchan;
        
-       foreach $chan (@_) {
-               $chan->send($s);                # send it 
+       foreach $dxchan (@_) {
+               $dxchan->send($s);              # send it 
        }
 }
 
@@ -651,6 +693,50 @@ sub get_hops
        return "H$hops";       
 }
 
+# 
+# adjust the hop count on a per node basis using the user loadable 
+# hop table if available or else decrement an existing one
+#
+
+sub adjust_hops
+{
+       my $self = shift;
+       my $call = $self->{call};
+       my $hops;
+       
+       if (($hops) = $_[0] =~ /\^H(\d+)\^~?$/o) {
+               my ($pcno) = $_[0] =~ /^PC(\d\d)/o;
+               confess "$call called adjust_hops with '$_[0]'" unless $pcno;
+               my $ref = $nodehops{$call} if %nodehops;
+               if ($ref) {
+                       my $newhops = $ref->{$pcno};
+                       return 0 if defined $newhops && $newhops == 0;
+                       $newhops = $ref->{default} unless $newhops;
+                       return 0 if defined $newhops && $newhops == 0;
+                       $newhops = $hops if !$newhops;
+                       $_[0] =~ s/\^H(\d+)(\^~?)$/\^H$newhops$2/ if $newhops;
+               } else {
+                       # simply decrement it
+                       $hops--;
+                       return 0 if !$hops;
+                       $_[0] =~ s/\^H(\d+)(\^~?)$/\^H$hops$2/ if $hops;
+               }
+       }
+       return 1;
+}
+
+# 
+# load hop tables
+#
+sub load_hops
+{
+       my $self = shift;
+       return $self->msg('lh1') unless -e "$main::data/hop_table.pl";
+       do "$main::data/hop_table.pl";
+       return $@ if $@;
+       return 0;
+}
+
 # remove leading and trailing spaces from an input string
 sub unpad
 {
@@ -658,5 +744,30 @@ sub unpad
        $s =~ s/^\s+|\s+$//;
        return $s;
 }
+
+# add a ping request to the ping queues
+sub addping
+{
+       my ($from, $to) = @_;
+       my $ref = $pings{$to};
+       $ref = $pings{$to} = [] if !$ref;
+       my $r = {};
+       $r->{call} = $from;
+       $r->{t} = $main::systime;
+       route($to, pc51($to, $main::mycall, 1));
+       push @$ref, $r;
+}
+
+# add a rcmd request to the rcmd queues
+sub addrcmd
+{
+       my ($from, $to, $cmd) = @_;
+       my $r = {};
+       $r->{call} = $from;
+       $r->{t} = $main::systime;
+       $r->{cmd} = $cmd;
+       route($to, pc34($main::mycall, $to, $cmd));
+       $rcmds{$to} = $r;
+}
 1;
 __END__