diff mbox

batctl: retrieve compat version from version field in case of parameter problem

Message ID 1320010073-29681-1-git-send-email-lindner_marek@yahoo.de (mailing list archive)
State Accepted, archived
Commit cd1a5e22e37e7aafc967db4a8a9c079948eb931d
Headers

Commit Message

Marek Lindner Oct. 30, 2011, 9:27 p.m. UTC 
  Reported-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
---
 ping.c       |    4 ++--
 traceroute.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Comments

Marek Lindner Nov. 2, 2011, 12:19 a.m. UTC | #1 
On Sunday, October 30, 2011 22:27:53 Marek Lindner wrote:
> Reported-by: Sven Eckelmann <sven@narfation.org>
> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
> ---
>  ping.c       |    4 ++--
>  traceroute.c |    4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)

Applied in revision f37d6d6.

Regards,
Marek
diff mbox

Patch

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);