public inbox for b.a.t.m.a.n@lists.open-mesh.org
 help / color / mirror / Atom feed
* [B.A.T.M.A.N.] [PATCH] batctl: retrieve compat version from version field in case of parameter problem
@ 2011-10-30 21:27 Marek Lindner
  2011-11-02  0:19 ` Marek Lindner
  0 siblings, 1 reply; 2+ messages in thread
From: Marek Lindner @ 2011-10-30 21:27 UTC (permalink / raw)
  To: b.a.t.m.a.n; +Cc: Marek Lindner

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

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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [B.A.T.M.A.N.] [PATCH] batctl: retrieve compat version from version field in case of parameter problem
  2011-10-30 21:27 [B.A.T.M.A.N.] [PATCH] batctl: retrieve compat version from version field in case of parameter problem Marek Lindner
@ 2011-11-02  0:19 ` Marek Lindner
  0 siblings, 0 replies; 2+ messages in thread
From: Marek Lindner @ 2011-11-02  0:19 UTC (permalink / raw)
  To: The list for a Better Approach To Mobile Ad-hoc Networking

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-11-02  0:19 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-30 21:27 [B.A.T.M.A.N.] [PATCH] batctl: retrieve compat version from version field in case of parameter problem Marek Lindner
2011-11-02  0:19 ` Marek Lindner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox