added loginfo stuff
[spider.git] / perl / DXProt.pm
index ee8c4aa9ef4d03e97fdfe0894e431f036ccb912c..64727b8a7d993b3e9ba480ac1871ae780dcaf922 100644 (file)
@@ -24,6 +24,8 @@ use DXProtout;
 use DXDebug;
 use Filter;
 use Local;
+use DXDb;
+use Time::HiRes qw(gettimeofday tv_interval);
 
 use Carp;
 
@@ -37,10 +39,10 @@ $me = undef;                                        # the channel id for this cluster
 $decode_dk0wcy = undef;                        # if set use this callsign to decode announces from the EU WWV data beacon
 $pc11_max_age = 1*3600;                        # the maximum age for an incoming 'real-time' pc11
 $pc23_max_age = 1*3600;                        # the maximum age for an incoming 'real-time' pc23
-$pc11_dup_age = 24*3600;               # the maximum time to keep the spot dup list for
-$pc23_dup_age = 24*3600;               # the maximum time to keep the wwv dup list for
-$pc12_dup_age = 12*3600;               # the maximum time to keep the ann dup list for
-$pc12_dup_lth = 72;                            # the length of ANN text to save for deduping 
+$pc11_dup_age = 3*3600;                        # the maximum time to keep the spot dup list for
+$pc23_dup_age = 3*3600;                        # the maximum time to keep the wwv dup list for
+$pc12_dup_age = 24*3600;               # the maximum time to keep the ann dup list for
+$pc12_dup_lth = 60;                            # the length of ANN text to save for deduping 
 %spotdup = ();                             # the pc11 and 26 dup hash 
 %wwvdup = ();                              # the pc23 and 27 dup hash
 %anndup = ();                               # the PC12 dup hash
@@ -50,6 +52,7 @@ $last_hour = time;                            # last time I did an hourly periodic update
 %nodehops = ();                 # node specific hop control
 @baddx = ();                    # list of illegal spotted callsigns
 
+
 $baddxfn = "$main::data/baddx.pl";
 
 sub init
@@ -123,14 +126,29 @@ sub start
        $self->send_now('B',"0");
        $self->send_now('E',"0");
        
+       # ping neighbour node stuff
+       my $ping = $user->pingint;
+       $ping = 5*60 unless defined $ping;
+       $self->pingint($ping);
+       $self->nopings($user->nopings || 2);
+       $self->pingtime([ ]);
+
        # send initialisation string
-       if (!$self->{outbound}) {
+       unless ($self->{outbound}) {
                $self->send(pc38()) if DXNode->get_all();
                $self->send(pc18());
+               $self->lastping($main::systime);
+       } else {
+               # remove from outstanding connects queue
+               @main::outstanding_connects = grep {$_->{call} ne $call} @main::outstanding_connects;
+               $self->lastping($main::systime + $self->pingint / 2);
        }
        $self->state('init');
        $self->pc50_t(time);
 
+       # send info to all logged in thingies
+       $self->tell_login('loginn');
+
        Log('DXProt', "$call connected");
 }
 
@@ -181,7 +199,7 @@ sub normal
                                my $ref = DXChannel->get($call);
                                $ref->send("$call de $field[1]: $text") if $ref && $ref->{talk};
                        } else {
-                               route($field[2], $line); # relay it on its way
+                               $self->route($field[2], $line); # relay it on its way
                        }
                        return;
                }
@@ -191,7 +209,7 @@ sub normal
                        # route 'foreign' pc26s 
                        if ($pcno == 26) {
                                if ($field[7] ne $main::mycall) {
-                                       route($field[7], $line);
+                                       $self->route($field[7], $line);
                                        return;
                                }
                        }
@@ -267,7 +285,7 @@ sub normal
                if ($pcno == 12) {              # announces
                        # announce duplicate checking
                        my $text = substr(uc unpad($field[3]), 0, $pc12_dup_lth);
-                       my $dupkey = $field[1].$field[2].$text.$field[4].$field[6];
+                       my $dupkey = $field[1].$field[2].$text;
                        if ($anndup{$dupkey}) {
                                dbg('chan', "Duplicate Announce ignored\n");
                                return;
@@ -291,11 +309,11 @@ sub normal
                                if ($decode_dk0wcy && $field[1] eq $decode_dk0wcy) {
                                        my ($hour, $k, $next, $a, $r, $sfi, $alarm) = $field[3] =~ /^Aurora Beacon\s+(\d+)UTC,\s+Kiel\s+K=(\d+),.*ed\s+K=(\d+),\s+A=(\d+),\s+R=(\d+),\s+SFI=(\d+),.*larm:\s+(\w+)/;
                                        $alarm = ($alarm =~ /^Y/i) ? ', Aurora in DE' : ''; 
-                                       my $wwv = Geomag::update($main::systime, $hour, $sfi, $a, $k, "R=$r, Next K=$next$alarm", $decode_dk0wcy, $field[5], $r);
+                                       my $wwv = Geomag::update($main::systime, $hour, $sfi, $a, $k, "R=$r, Next K=$next$alarm", $decode_dk0wcy, $field[5], $r) if $sfi && $r;
                                }
                                
                        } else {
-                               route($field[2], $line);
+                               $self->route($field[2], $line);
                        }
                        
                        return;
@@ -313,20 +331,26 @@ sub normal
                
                if ($pcno == 16) {              # add a user
                        my $node = DXCluster->get_exact($field[1]); 
+                       my $dxchan;
+                       if (!$node && ($dxchan = DXChannel->get($field[1]))) {
+                               # add it to the node table if it isn't present and it's
+                               # connected locally
+                               $node = DXNode->new($dxchan, $field[1], 0, 1, 5400);
+                               broadcast_ak1a(pc19($dxchan, $node), $dxchan, $self) unless $dxchan->{isolate};
+                               
+                       }
                        return unless $node; # ignore if havn't seen a PC19 for this one yet
                        return unless $node->isa('DXNode');
                        if ($node->dxchan != $self) {
                                dbg('chan', "LOOP: $field[1] came in on wrong channel");
                                return;
                        }
-                       my $dxchan;
                        if (($dxchan = DXChannel->get($field[1])) && $dxchan != $self) {
                                dbg('chan', "LOOP: $field[1] connected locally");
                                return;
                        }
                        my $i;
-                       
-                       
+                                               
                        for ($i = 2; $i < $#field; $i++) {
                                my ($call, $confmode, $here) = $field[$i] =~ /^(\S+) (\S) (\d)/o;
                                next if !$call || length $call < 3 || length $call > 8;
@@ -354,13 +378,20 @@ sub normal
                
                if ($pcno == 17) {              # remove a user
                        my $node = DXCluster->get_exact($field[2]);
+                       my $dxchan;
+                       if (!$node && ($dxchan = DXChannel->get($field[2]))) {
+                               # add it to the node table if it isn't present and it's
+                               # connected locally
+                               $node = DXNode->new($dxchan, $field[2], 0, 1, 5400);
+                               broadcast_ak1a(pc19($dxchan, $node), $dxchan, $self) unless $dxchan->{isolate};
+                               return;
+                       }
                        return unless $node;
                        return unless $node->isa('DXNode');
                        if ($node->dxchan != $self) {
                                dbg('chan', "LOOP: $field[2] came in on wrong channel");
                                return;
                        }
-                       my $dxchan;
                        if (($dxchan = DXChannel->get($field[2])) && $dxchan != $self) {
                                dbg('chan', "LOOP: $field[2] connected locally");
                                return;
@@ -485,7 +516,7 @@ sub normal
                        # route 'foreign' pc27s 
                        if ($pcno == 27) {
                                if ($field[8] ne $main::mycall) {
-                                       route($field[8], $line);
+                                       $self->route($field[8], $line);
                                        return;
                                }
                        }
@@ -502,7 +533,7 @@ sub normal
                                dbg('chan', "Dup WWV Spot ignored\n");
                                return;
                        }
-                       if (($pcno == 23 && $d < $main::systime - $pc23_max_age) || $d > $main::systime + 900 || $field[2] < 0 || $field[2] > 23) {
+                       if (($pcno == 23 && $d < $main::systime - $pc23_max_age) || $d > $main::systime + 1500 || $field[2] < 0 || $field[2] > 23) {
                                dbg('chan', "WWV Date ($field[1] $field[2]) out of range");
                                return;
                        }
@@ -535,7 +566,7 @@ sub normal
                
                if ($pcno == 25) {      # merge request
                        if ($field[1] ne $main::mycall) {
-                               route($field[1], $line);
+                               $self->route($field[1], $line);
                                return;
                        }
                        if ($field[2] eq $main::mycall) {
@@ -569,7 +600,7 @@ sub normal
                        if ($pcno == 49 || $field[1] eq $main::mycall) {
                                DXMsg::process($self, $line);
                        } else {
-                               route($field[1], $line);
+                               $self->route($field[1], $line);
                        }
                        return;
                }
@@ -599,7 +630,7 @@ sub normal
                                        $self->send(pc35($main::mycall, $field[2], "$main::mycall:your attempt is logged, Tut tut tut...!"));
                                }
                        } else {
-                               route($field[1], $line);
+                               $self->route($field[1], $line);
                        }
                        return;
                }
@@ -613,7 +644,7 @@ sub normal
                                        delete $rcmds{$field[2]} if !$dxchan;
                                }
                        } else {
-                               route($field[1], $line);
+                               $self->route($field[1], $line);
                        }
                        return;
                }
@@ -657,11 +688,7 @@ sub normal
                        last SWITCH;
                }
                if ($pcno == 37 || $pcno == 44 || $pcno == 45 || $pcno == 46 || $pcno == 47) {
-                       if ($field[1] eq $main::mycall) {
-                               ;
-                       } else {
-                               route($field[1], $line);
-                       }
+                       DXDb::process($self, $line);
                        return;
                }
                
@@ -686,15 +713,34 @@ sub normal
                                        # 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;
+                                               my $tochan =  DXChannel->get($field[2]);
+                                               while (@$ref) {
+                                                       my $r = shift @$ref;
+                                                       my $dxchan = DXChannel->get($r->{call});
+                                                       next unless $dxchan;
+                                                       my $t = tv_interval($r->{t}, [ gettimeofday ]);
+                                                       if ($dxchan->is_user) {
+                                                               my $s = sprintf "%.2f", $t; 
+                                                               my $ave = sprintf "%.2f", $tochan ? ($tochan->pingave || $t) : $t;
+                                                               $dxchan->send($dxchan->msg('pingi', $field[2], $s, $ave))
+                                                       } elsif ($dxchan->is_ak1a) {
+                                                               if ($tochan) {
+                                                                       $tochan->nopings(3); # pump up the timer
+                                                                       push @{$tochan->pingtime}, $t;
+                                                                       shift @{$tochan->pingtime} if @{$tochan->pingtime} > 6;
+                                                                       my $st;
+                                                                       for (@{$tochan->pingtime}) {
+                                                                               $st += $_;
+                                                                       }
+                                                                       $tochan->{pingave} = $st / @{$tochan->pingtime};
+                                                               }
+                                                       } 
+                                               }
                                        }
                                }
-                               
                        } else {
                                # route down an appropriate thingy
-                               route($field[1], $line);
+                               $self->route($field[1], $line);
                        }
                        return;
                }
@@ -708,7 +754,7 @@ sub normal
         #        REBROADCAST!!!!
         #
         
-       if (!$self->{isolate}) {
+       unless ($self->{isolate}) {
                broadcast_ak1a($line, $self); # send it to everyone but me
        }
 }
@@ -731,6 +777,17 @@ sub process
                if ($t >= $dxchan->pc50_t + $DXProt::pc50_interval) {
                        $dxchan->send(pc50());
                        $dxchan->pc50_t($t);
+               } 
+
+               # send a ping out on this channel
+               if ($dxchan->pingint && $t >= $dxchan->pingint + $dxchan->lastping) {
+                       if ($dxchan->nopings <= 0) {
+                               $dxchan->disconnect;
+                       } else {
+                               addping($main::mycall, $dxchan->call);
+                               $dxchan->nopings($dxchan->nopings - 1);
+                               $dxchan->lastping($t);
+                       }
                }
        }
        
@@ -763,6 +820,8 @@ sub finish
        my $call = $self->call;
        my $ref = DXCluster->get_exact($call);
        
+       $self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op")));
+       
        # unbusy and stop and outgoing mail
        my $mref = DXMsg::get_busy($call);
        $mref->stop_msg($call) if $mref;
@@ -782,7 +841,10 @@ sub finish
        
        # now broadcast to all other ak1a nodes that I have gone
        broadcast_ak1a(pc21($call, 'Gone.'), $self) unless $self->{isolate};
-       
+
+       # send info to all logged in thingies
+       $self->tell_login('logoutn');
+
        Log('DXProt', $call . " Disconnected");
        $ref->del() if $ref;
 }
@@ -990,9 +1052,13 @@ sub send_local_config
 #
 sub route
 {
-       my ($call, $line) = @_;
+       my ($self, $call, $line) = @_;
        my $cl = DXCluster->get_exact($call);
-       if ($cl) {
+       if ($cl) {       # don't route it back down itself
+               if (ref $self && $call eq $self->{call}) {
+                       dbg('chan', "Trying to route back to source, dropped");
+                       return;
+               }
                my $hops;
                my $dxchan = $cl->{dxchan};
                if ($dxchan) {
@@ -1010,7 +1076,7 @@ sub broadcast_ak1a
 {
        my $s = shift;                          # the line to be rebroadcast
        my @except = @_;                        # to all channels EXCEPT these (dxchannel refs)
-       my @dxchan = get_all_ak1a();
+       my @dxchan = DXChannel::get_all_ak1a();
        my $dxchan;
        
        # send it if it isn't the except list and isn't isolated and still has a hop count
@@ -1027,7 +1093,7 @@ sub broadcast_all_ak1a
 {
        my $s = shift;                          # the line to be rebroadcast
        my @except = @_;                        # to all channels EXCEPT these (dxchannel refs)
-       my @dxchan = get_all_ak1a();
+       my @dxchan = DXChannel::get_all_ak1a();
        my $dxchan;
        
        # send it if it isn't the except list and isn't isolated and still has a hop count
@@ -1046,7 +1112,7 @@ sub broadcast_users
        my $sort = shift;           # the type of transmission
        my $fref = shift;           # a reference to an object to filter on
        my @except = @_;                        # to all channels EXCEPT these (dxchannel refs)
-       my @dxchan = get_all_users();
+       my @dxchan = DXChannel::get_all_users();
        my $dxchan;
        my @out;
        
@@ -1087,43 +1153,6 @@ sub broadcast_list
        }
 }
 
-#
-# gimme all the ak1a nodes
-#
-sub get_all_ak1a
-{
-       my @list = DXChannel->get_all();
-       my $ref;
-       my @out;
-       foreach $ref (@list) {
-               push @out, $ref if $ref->is_ak1a;
-       }
-       return @out;
-}
-
-# return a list of all users
-sub get_all_users
-{
-       my @list = DXChannel->get_all();
-       my $ref;
-       my @out;
-       foreach $ref (@list) {
-               push @out, $ref if $ref->is_user;
-       }
-       return @out;
-}
-
-# return a list of all user callsigns
-sub get_all_user_calls
-{
-       my @list = DXChannel->get_all();
-       my $ref;
-       my @out;
-       foreach $ref (@list) {
-               push @out, $ref->call if $ref->is_user;
-       }
-       return @out;
-}
 
 #
 # obtain the hops from the list for this callsign and pc no 
@@ -1194,13 +1223,13 @@ sub unpad
 sub addping
 {
        my ($from, $to) = @_;
-       my $ref = $pings{$to};
-       $ref = $pings{$to} = [] if !$ref;
+       my $ref = $pings{$to} || [];
        my $r = {};
        $r->{call} = $from;
-       $r->{t} = $main::systime;
-       route($to, pc51($to, $main::mycall, 1));
+       $r->{t} = [ gettimeofday ];
+       route(undef, $to, pc51($to, $main::mycall, 1));
        push @$ref, $r;
+       $pings{$to} = $ref;
 }
 
 # add a rcmd request to the rcmd queues
@@ -1211,7 +1240,7 @@ sub addrcmd
        $r->{call} = $from;
        $r->{t} = $main::systime;
        $r->{cmd} = $cmd;
-       route($to, pc34($main::mycall, $to, $cmd));
+       route(undef, $to, pc34($main::mycall, $to, $cmd));
        $rcmds{$to} = $r;
 }
 1;