$self->send_now('B',"0");
$self->send_now('E',"0");
+ # ping neighbour node stuff
+ $self->pingint($user->pingint || 3*60);
+ $self->nopings(3);
+ $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);
- $self->pingint($user->pingint || 3*60);
- $self->nopings(3);
- $self->lastping($main::systime);
- $self->pingtime(0);
- $self->pingrec(0);
Log('DXProt', "$call connected");
}
my $t = tv_interval($r->{t}, [ gettimeofday ]);
if ($dxchan->is_user) {
my $s = sprintf "%.2f", $t;
- my $ave = $tochan->pingave if $tochan;
+ 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
- $tochan->{pingtime} += $t;
- $tochan->{pingrec} += 1;
- $tochan->{pingave} = $tochan->{pingtime} / $tochan->{pingrec};
+ push @{$tochan->pingtime}, $t;
+ shift @{$tochan->pingtime} if @{$tochan->pingtime} > 6;
+ my $st;
+ for (@{$tochan->pingtime}) {
+ $st += $_;
+ }
+ $tochan->{pingave} = $st / @{$tochan->pingtime};
}
}
}
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;