From patchwork Sat Oct 30 15:00:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 505 Return-Path: Received: from mail.gmx.net (mailout-de.gmx.net [213.165.64.23]) by open-mesh.org (Postfix) with SMTP id E6CA51542FA for ; Sat, 30 Oct 2010 16:59:34 +0200 (CEST) Received: (qmail invoked by alias); 30 Oct 2010 14:59:33 -0000 Received: from unknown (EHLO sven-desktop.lazhur.ath.cx) [89.246.213.145] by mail.gmx.net (mp069) with SMTP; 30 Oct 2010 16:59:33 +0200 X-Authenticated: #15668376 X-Provags-ID: V01U2FsdGVkX1+57ssCeIS5Omu0MggO1bQIc2qD6c91d3+u6rqIbX zC2KsCoUav/bAI From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Sat, 30 Oct 2010 17:00:54 +0200 Message-Id: <1288450858-14753-2-git-send-email-sven.eckelmann@gmx.de> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1288450858-14753-1-git-send-email-sven.eckelmann@gmx.de> References: <1288450858-14753-1-git-send-email-sven.eckelmann@gmx.de> X-Y-GMX-Trusted: 0 Subject: [B.A.T.M.A.N.] [PATCH 2/6] batctl: Don't print uninitialised traceroute times X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Oct 2010 14:59:35 -0000 The time_delta array is only initialised when no error occurs or only the select fails. This means that we may print uninitialised or output from previous ttl levels. Signed-off-by: Sven Eckelmann --- batctl/traceroute.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/batctl/traceroute.c b/batctl/traceroute.c index 0dc796a..f80ca4d 100644 --- a/batctl/traceroute.c +++ b/batctl/traceroute.c @@ -135,6 +135,7 @@ int traceroute(char *mesh_iface, int argc, char **argv) for (i = 0; i < NUM_PACKETS; i++) { icmp_packet_out.seqno = htons(++seq_counter); + time_delta[i] = 0.0; if (write(trace_fd, (char *)&icmp_packet_out, sizeof(icmp_packet_out)) < 0) { printf("Error - can't write to batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); @@ -151,10 +152,8 @@ int traceroute(char *mesh_iface, int argc, char **argv) res = select(trace_fd + 1, &read_socket, NULL, NULL, &tv); - if (res <= 0) { - time_delta[i] = 0.0; + if (res <= 0) continue; - } read_len = read(trace_fd, (char *)&icmp_packet_in, sizeof(icmp_packet_in));