Blame mtr-now-waits-for-last-response.patch
|
Jan Görig |
261ddf |
From c196de71466b475192fb4c1910fbcaf91ba36ae7 Mon Sep 17 00:00:00 2001
|
|
Jan Görig |
261ddf |
From: Jan Gorig <jgorig@redhat.com>
|
|
Jan Görig |
261ddf |
Date: Tue, 26 Oct 2010 10:02:45 +0200
|
|
Jan Görig |
261ddf |
Subject: [PATCH 3/3] mtr now waits for last response
|
|
Jan Görig |
261ddf |
|
|
Jan Görig |
261ddf |
---
|
|
Jan Görig |
261ddf |
select.c | 6 ++++--
|
|
Jan Görig |
261ddf |
1 files changed, 4 insertions(+), 2 deletions(-)
|
|
Jan Görig |
261ddf |
|
|
Jan Görig |
261ddf |
diff --git a/select.c b/select.c
|
|
Jan Görig |
261ddf |
index a53017f..d8e460f 100644
|
|
Jan Görig |
261ddf |
--- a/select.c
|
|
Jan Görig |
261ddf |
+++ b/select.c
|
|
Jan Görig |
261ddf |
@@ -50,6 +50,7 @@ void select_loop(void) {
|
|
Jan Görig |
261ddf |
int dnsfd, netfd;
|
|
Jan Görig |
261ddf |
int NumPing = 0;
|
|
Jan Görig |
261ddf |
int paused = 0;
|
|
Jan Görig |
261ddf |
+ int quit = 0;
|
|
Jan Görig |
261ddf |
struct timeval lasttime, thistime, selecttime;
|
|
Jan Görig |
261ddf |
int dt;
|
|
Jan Görig |
261ddf |
int rv;
|
|
Jan Görig |
261ddf |
@@ -97,9 +98,10 @@ void select_loop(void) {
|
|
Jan Görig |
261ddf |
(thistime.tv_sec == lasttime.tv_sec + intervaltime.tv_sec &&
|
|
Jan Görig |
261ddf |
thistime.tv_usec >= lasttime.tv_usec + intervaltime.tv_usec)) {
|
|
Jan Görig |
261ddf |
lasttime = thistime;
|
|
Jan Görig |
261ddf |
+ if(quit == 1) return;
|
|
Jan Görig |
261ddf |
if(NumPing >= MaxPing && (!Interactive || ForceMaxPing))
|
|
Jan Görig |
261ddf |
- return;
|
|
Jan Görig |
261ddf |
- if (net_send_batch())
|
|
Jan Görig |
261ddf |
+ quit = 1;
|
|
Jan Görig |
261ddf |
+ else if (net_send_batch())
|
|
Jan Görig |
261ddf |
NumPing++;
|
|
Jan Görig |
261ddf |
}
|
|
Jan Görig |
261ddf |
|
|
Jan Görig |
261ddf |
--
|
|
Jan Görig |
261ddf |
1.7.3.1
|
|
Jan Görig |
261ddf |
|