use Time::HiRes qw(gettimeofday tv_interval);
-use vars qw(@ISA %ping);
+use vars qw(@ISA %ping $ping_ttl);
@ISA = qw(Thingy);
my $id;
+$ping_ttl = 300; # default ping ttl
+
sub gen_Aranea
{
my $thing = shift;
unless ($thing->{Aranea}) {
- $thing->{Aranea} = Aranea::genmsg($thing, qw(id out));
+ $thing->{Aranea} = Aranea::genmsg($thing, qw(id out o));
}
return $thing->{Aranea};
}
# {user} as well as a true user and also it may not
# have originated here.
- my $from = $thing->{user} if Route::Node::get($thing->{user});
- $from ||= $thing->{origin};
- my $to = $thing->{touser} if Route::Node::get($thing->{touser});
- $to ||= $thing->{group};
-
+ my ($from, $to);
+ if ($thing->{out}) {
+ $from = $thing->{o};
+ $from ||= $thing->{user} unless Route::User::get($thing->{user});
+ $from ||= $thing->{origin};
+ $to = $thing->{touser} unless Route::User::get($thing->{touser});
+ $to ||= $thing->{group};
+ } else {
+ $from ||= $thing->{user} unless Route::User::get($thing->{user});
+ $from ||= $thing->{origin};
+ $to = $thing->{o};
+ $to ||= $thing->{touser} unless Route::User::get($thing->{touser});
+ $to ||= $thing->{group};
+ }
$thing->{DXProt} = DXProt::pc51($to, $from, $thing->{out});
}
return $thing->{DXProt};
my $thing = shift;
my $dxchan = shift;
my $buf;
-
+ if ($dxchan->{call} eq $thing->{touser}) {
+ $buf = $dxchan->msg('pingi', ($thing->{user} || $thing->{origin}), $thing->{ft}, $thing->{fave});
+ }
return $buf;
}
+# called with the dxchan, line and the split out arguments
sub from_DXProt
{
- my $thing = ref $_[0] ? shift : $_[0]->SUPER::new();
-
- while (@_) {
- my $k = shift;
- $thing->{$k} = shift;
- }
+ my $thing = ref $_[0] ? shift : $_[0]->SUPER::new(origin=>$main::mycall);
+ my $dxchan = shift;
+ $thing->{DXProt} = shift;
+ shift; # PC51
+ $thing->{group} = shift; # to call
+ my $from = shift;
+ $thing->{out} = shift; # 1 = ping, 0 = pong;
+ $thing->{user} = $dxchan->{call};
+ $thing->{o} = $from unless $from eq $dxchan->{call};
+ $thing->remember if $thing->{out} && $thing->{group} ne $main::mycall;
return $thing;
}
my $repthing = $thing->new_reply;
$repthing->{out} = 0;
$repthing->{id} = $thing->{id};
+ $repthing->{o} = $thing->{o} if $thing->{o};
$repthing->send($dxchan) if $repthing;
} else {
# it's a reply, look in the ping list for this one
- my $ref = $ping{$thing->{id}} if exists $thing->{id};
- $ref ||= $thing->find;
+ my $ref;
+ $ref = $ping{$thing->{id}} if exists $thing->{id};
+ $ref = find(($thing->{user}||$thing->{origin}), ($thing->{touser}||$thing->{group})) unless $ref;
if ($ref) {
- my $t = tv_interval($thing->{t}, [ gettimeofday ]);
- if (my $dxc = DXChannel::get($thing->{user} || $thing->{origin})) {
+ my $t = tv_interval($ref->{t}, [ gettimeofday ]);
+ my $tochan = DXChannel::get($ref->{touser} || $ref->{group});
+ if ($tochan) {
+ my $nopings = $tochan->user->nopings || $DXProt::obscount;
+ push @{$tochan->{pingtime}}, $t;
+ shift @{$tochan->{pingtime}} if @{$tochan->{pingtime}} > 6;
- my $tochan = DXChannel::get($thing->{touser} || $thing->{group});
+ # cope with a missed ping, this means you must set the pingint large enough
+ if ($t > $tochan->{pingint} && $t < 2 * $tochan->{pingint} ) {
+ $t -= $tochan->{pingint};
+ }
- if ($dxc->is_user) {
- my $s = sprintf "%.2f", $t;
- my $ave = sprintf "%.2f", $tochan ? ($tochan->{pingave} || $t) : $t;
- $dxc->send($dxc->msg('pingi', ($thing->{touser} || $thing->{group}), $s, $ave))
- } elsif ($dxc->is_node) {
- if ($tochan ) {
- my $nopings = $tochan->user->nopings || $DXProt::obscount;
- push @{$tochan->{pingtime}}, $t;
- shift @{$tochan->{pingtime}} if @{$tochan->{pingtime}} > 6;
-
- # cope with a missed ping, this means you must set the pingint large enough
- if ($t > $tochan->{pingint} && $t < 2 * $tochan->{pingint} ) {
- $t -= $tochan->{pingint};
- }
-
- # calc smoothed RTT a la TCP
- if (@{$tochan->{pingtime}} == 1) {
- $tochan->{pingave} = $t;
- } else {
- $tochan->{pingave} = $tochan->{pingave} + (($t - $tochan->{pingave}) / 6);
- }
- $tochan->{nopings} = $nopings; # pump up the timer
- }
+ # calc smoothed RTT a la TCP
+ if (@{$tochan->{pingtime}} == 1) {
+ $tochan->{pingave} = $t;
+ } else {
+ $tochan->{pingave} = $tochan->{pingave} + (($t - $tochan->{pingave}) / 6);
}
+ $tochan->{nopings} = $nopings; # pump up the timer
+ }
+ if (my $dxc = DXChannel::get($ref->{user} || $ref->{origin})) {
+ $thing->{ft} = sprintf "%.2f", $t;
+ $thing->{fave} = sprintf "%.2f", $tochan ? ($tochan->{pingave} || $t) : $t;
+ $thing->send($dxc);
}
+ delete $ping{$ref->{id}};
}
}
} else {
sub find
{
- my $call = shift;
+ my $to = shift;
+ my $from = shift;
+ my $user = shift;
+
foreach my $thing (values %ping) {
- if (($thing->{user} || $thing->{origin}) eq $call) {
- return $thing;
+ if ($thing->{origin} eq $from && $thing->{group} eq $to) {
+ if ($user) {
+ return if $thing->{user} && $thing->{user} eq $user;
+ } else {
+ return $thing;
+ }
}
}
return undef;
projects / spider.git / blobdiff