From patchwork Sun Oct 30 21:27:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 1326 Return-Path: Received: from nm2.bullet.mail.ukl.yahoo.com (nm2.bullet.mail.ukl.yahoo.com [217.146.183.219]) by open-mesh.org (Postfix) with SMTP id 1265260066D for ; Sun, 30 Oct 2011 22:28:03 +0100 (CET) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@yahoo.de; dkim-adsp=none Received: from [217.146.183.184] by nm2.bullet.mail.ukl.yahoo.com with NNFMP; 30 Oct 2011 21:28:02 -0000 Received: from [77.238.184.56] by tm15.bullet.mail.ukl.yahoo.com with NNFMP; 30 Oct 2011 21:28:02 -0000 Received: from [127.0.0.1] by smtp125.mail.ukl.yahoo.com with NNFMP; 30 Oct 2011 21:28:02 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1320010082; bh=DWacj5FUJI1wAFg6ePzzSdywHbp27weKRMAgDn3Py7Y=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer; b=wpi1pb4RWxUFQFbRFHgoJdLlcQ0+QY6pRdwxeyb0KNQ8LvUE/BqPZaPOuF2g0n1agML2NG49erJI+MTSFlUZ4yJrAqUncbJK8uWp4Lept1q9gdZ+Y7hptFNkC7dEqxSfvh6+2hCnhI9ISeCV9XbvY0rSop3UrXn8Jv0zRRtYIbQ= X-Yahoo-Newman-Id: 905466.42583.bm@smtp125.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: K9tWsoAVM1mVVVvPQNOEhF_IKYK7q6smOd.eG771SRK3FNw C64S7yNyvoOqV.807triH8.VivNk6bH36r9AaWtL4anUkwEPL_LzOyCKcNHQ RGVf0lmGOExltgb_1pWLxRL75v1eCI0DnsbJcrJakgSE3.FTXVVRqqBNgaB1 0qRKDUhywaI1lqNacOqqJWo2l_ZWiFup3Q02phJ1WjeeAf8clbqayxGzdz6S mfZIzFRU9pdyRqsktkw7qpLHaq40ArI6FAO_lt2pV9KTD_CR6HQ1hg1yCL_k ctNlAXMApcmWhCO5p8mcq_EbQy2iHnthyIMAwE6JwhE7snfat7IxzEZz7hG5 l5S1.kP8VYn83TJq6eDrztyAwZN7GRholhiMZUF44uYcfeaqG X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@78.46.248.235 with plain) by smtp125.mail.ukl.yahoo.com with SMTP; 30 Oct 2011 21:28:01 +0000 GMT From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Sun, 30 Oct 2011 22:27:53 +0100 Message-Id: <1320010073-29681-1-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.5.4 Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH] batctl: retrieve compat version from version field in case of parameter problem X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.13 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: Sun, 30 Oct 2011 21:28:03 -0000 Reported-by: Sven Eckelmann Signed-off-by: Marek Lindner --- ping.c | 4 ++-- traceroute.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ping.c b/ping.c index 1003ab1..91b733a 100644 --- a/ping.c +++ b/ping.c @@ -283,8 +283,8 @@ int ping(char *mesh_iface, int argc, char **argv) break; case PARAMETER_PROBLEM: printf("Error - the batman adv kernel module version (%d) differs from ours (%d)\n", - icmp_packet_in.ttl, COMPAT_VERSION); - printf("Please make sure to compatible versions!\n"); + icmp_packet_in.version, COMPAT_VERSION); + printf("Please make sure to use compatible versions!\n"); goto out; default: printf("Unknown message type %d len %zd received\n", icmp_packet_in.msg_type, read_len); diff --git a/traceroute.c b/traceroute.c index ea43331..d120311 100644 --- a/traceroute.c +++ b/traceroute.c @@ -188,8 +188,8 @@ int traceroute(char *mesh_iface, int argc, char **argv) goto out; case PARAMETER_PROBLEM: printf("Error - the batman adv kernel module version (%d) differs from ours (%d)\n", - icmp_packet_in.ttl, COMPAT_VERSION); - printf("Please make sure to compatible versions!\n"); + icmp_packet_in.version, COMPAT_VERSION); + printf("Please make sure to use compatible versions!\n"); goto out; default: printf("Unknown message type %d len %zd received\n", icmp_packet_in.msg_type, read_len);