aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2015-05-15 10:25:10 +0200
committerBjørn Mork <bjorn@mork.no>2015-05-15 10:25:10 +0200
commitbb2d4d31e2dab11025ae93ebcebc818c36a9747f (patch)
tree54325f33e2387225320f86c0c7511cf7e2a1ea9c
parent35294332b2e75151b4b614719ee6522e1afd8748 (diff)
ripe-atlas-fw: imported version 45604560
Signed-off-by: Bjørn Mork <bjorn@mork.no>
-rw-r--r--checksum2
-rw-r--r--eperd/ping.c15
2 files changed, 6 insertions, 11 deletions
diff --git a/checksum b/checksum
new file mode 100644
index 0000000..576cf08
--- /dev/null
+++ b/checksum
@@ -0,0 +1,2 @@
+SHA256 f98e46d69fe1f79d955bba73e78d1299193c1af56094a2b6f70802cd77af2730 ripe-atlas-fw-4550.tar.gz
+SHA512 c4c716a573897903759af66bef70c0fba9c2bf04961e1bd3725aca9dd49ff81fc3cd8bc7c3781082cbcb83b4c9229bf8f0b5b916c183a9b83d13e7a35437e99b ripe-atlas-fw-4550.tar.gz
diff --git a/eperd/ping.c b/eperd/ping.c
index 31d75c1..bf51019 100644
--- a/eperd/ping.c
+++ b/eperd/ping.c
@@ -548,9 +548,6 @@ static void ping_xmit(struct pingstate *host)
if (host->base->done)
host->base->done(host);
- /* Fake packet sent to kill timer */
- host->sentpkts++;
-
return;
}
@@ -631,6 +628,10 @@ static void ping_xmit(struct pingstate *host)
errno, 0, NULL,
host);
}
+
+
+ /* Add the timer to handle no reply condition in the given timeout */
+ evtimer_add(&host->ping_timer, &host->base->tv_interval);
}
@@ -652,11 +653,6 @@ static void noreply_callback(int __attribute((unused)) unused, const short __att
}
ping_xmit(host);
-
- if (host->sentpkts <= host->maxpkts)
- {
- evtimer_add(&host->ping_timer, &host->base->tv_interval);
- }
}
/*
@@ -1140,9 +1136,6 @@ static void ping_start2(void *state)
pingstate->cursize= pingstate->maxsize;
ping_xmit(pingstate);
-
- /* Add the timer to handle no reply condition in the given timeout */
- evtimer_add(&pingstate->ping_timer, &pingstate->base->tv_interval);
}
static void dns_cb(int result, struct evutil_addrinfo *res, void *ctx)