The following commit has been merged in the master branch: commit cd1a5e22e37e7aafc967db4a8a9c079948eb931d Author: Marek Lindner lindner_marek@yahoo.de Date: Sun Oct 30 22:11:30 2011 +0100
batctl: retrieve compat version from version field in case of parameter problem
Reported-by: Sven Eckelmann sven@narfation.org Signed-off-by: Marek Lindner lindner_marek@yahoo.de
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);