force PC39 on ak1a disconnects

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index c14c9bbefdc64879402412bac78f826e2a6ff374..b4ff5f655f4701be2edcb151be015d5233b6c6cb 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -130,14 +130,15 @@ sub start
        if (!$self->{outbound}) {
                $self->send(pc38()) if DXNode->get_all();
                $self->send(pc18());
+               # remove from outstanding connects queue
+               @main::outstanding_connects = grep {$_->{call} ne $call} @main::outstanding_connects;
        }
        $self->state('init');
        $self->pc50_t(time);
        $self->pingint($user->pingint || 3*60);
        $self->nopings(3);
        $self->lastping($main::systime);
-       $self->pingtime(0);
-       $self->pingrec(0);
+       $self->pingtime([ ]);
 
        Log('DXProt', "$call connected");
 }
@@ -703,6 +704,7 @@ sub normal
                                        # it's a reply, look in the ping list for this one
                                        my $ref = $pings{$field[2]};
                                        if ($ref) {
+                                               my $tochan =  DXChannel->get($field[2]);
                                                while (@$ref) {
                                                        my $r = shift @$ref;
                                                        my $dxchan = DXChannel->get($r->{call});
@@ -710,14 +712,18 @@ sub normal
                                                        my $t = tv_interval($r->{t}, [ gettimeofday ]);
                                                        if ($dxchan->is_user) {
                                                                my $s = sprintf "%.2f", $t; 
-                                                               $dxchan->send($dxchan->msg('pingi', $field[2], $s))
+                                                               my $ave = sprintf "%.2f", $tochan ? ($tochan->pingave || $t) : $t;
+                                                               $dxchan->send($dxchan->msg('pingi', $field[2], $s, $ave))
                                                        } elsif ($dxchan->is_ak1a) {
-                                                               my $tochan =  DXChannel->get($field[2]);
                                                                if ($tochan) {
                                                                        $tochan->nopings(3); # pump up the timer
-                                                                       $tochan->{pingtime} += $t;
-                                                                       $tochan->{pingrec} += 1;
-                                                                       $tochan->{pingave} = $tochan->{pingtime} / $tochan->{pingrec};
+                                                                       push @{$tochan->pingtime}, $t;
+                                                                       shift @{$tochan->pingtime} if @{$tochan->pingtime} > 10;
+                                                                       my $st;
+                                                                       for (@{$tochan->pingtime}) {
+                                                                               $st += $_;
+                                                                       }
+                                                                       $tochan->{pingave} = $st / @{$tochan->pingtime};
                                                                }
                                                        } 
                                                }
@@ -805,6 +811,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;