use DXDebug;
use DXUtil;
-
use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+
+main::mkver($VERSION = q$Revision$);
use vars qw (%list %valid $pingint $maxpingwait);
pcxx => '0,Stored PCProt,parray',
);
+my %via = ();
sub new
{
my $self = shift;
dbg("Investigate: ping received for $self->{call} via $self->{via}") if isdbg('investigate');
if ($self->{state} eq 'waitping') {
+ $via{$self->{via}} = 0; # cue up next ping on this interface
delete $list{"$self->{via},$self->{call}"};
my $user = DXUser->get_current($self->{via});
if ($user) {
$user->set_believe($self->{call});
$user->put;
}
- my $dxchan = DXChannel->get($self->{via});
+ my $dxchan = DXChannel::get($self->{via});
if ($dxchan) {
dbg("Investigate: sending PC19 for $self->{call}") if isdbg('investigate');
foreach my $pc (@{$self->{pcxx}}) {
{
while (my ($k, $v) = each %list) {
if ($v->{state} eq 'start') {
- if ($main::systime > $lastping+$pingint) {
+ my $via = $via{$v->{via}} || 0;
+ if ($main::systime > $via+$pingint) {
DXProt::addping($main::mycall, $v->{call}, $v->{via});
$v->{start} = $lastping = $main::systime;
dbg("Investigate: ping sent to $v->{call} via $v->{via}") if isdbg('investigate');
$v->chgstate('waitping');
+ $via{$v->{via}} = $main::systime;
}
} elsif ($v->{state} eq 'waitping') {
if ($main::systime > $v->{start} + $maxpingwait) {