The following commit has been merged in the master branch: commit b7b948479ca2c12ad4f038c974ee20294005ddf1 Merge: 40cc39306c445e6d513b44949f1ee2ace21894d7 74e9b222da4641ee337c62727c58a18aea8754cf Author: Marek Lindner lindner_marek@yahoo.de Date: Sat Jun 30 14:25:27 2012 +0200

Merge branch 'next'

diff --combined ping.c index 9f64a8f,b6199c6..ce8f457 --- a/ping.c +++ b/ping.c @@@ -44,8 -44,8 +44,8 @@@ char is_aborted = 0

void ping_usage(void) { - printf("Usage: batctl ping [options] mac|bat-host \n"); - printf("options:\n"); + printf("Usage: batctl [options] ping [parameters] mac|bat-host \n"); + printf("parameters:\n"); printf(" \t -c ping packet count \n"); printf(" \t -h print this help\n"); printf(" \t -i interval in seconds\n"); @@@ -174,6 -174,8 +174,8 @@@ int ping(char *mesh_iface, int argc, ch icmp_packet_out.rr_cur = 1; memset(&icmp_packet_out.rr, 0, BATADV_RR_LEN * ETH_ALEN); memset(last_rr, 0, BATADV_RR_LEN * ETH_ALEN); + } else { + ((struct batadv_icmp_packet *)&icmp_packet_out)->reserved = 0; }

printf("PING %s (%s) %zu(%zu) bytes of data\n", dst_string, mac_string, diff --combined traceroute.c index c1aaad8,aae9fa7..75ff2b3 --- a/traceroute.c +++ b/traceroute.c @@@ -43,8 -43,8 +43,8 @@@

void traceroute_usage(void) { - printf("Usage: batctl traceroute [options] mac|bat-host \n"); - printf("options:\n"); + printf("Usage: batctl [options] traceroute [parameters] mac|bat-host \n"); + printf("parameters:\n"); printf(" \t -h print this help\n"); printf(" \t -n don't convert addresses to bat-host names\n"); } @@@ -125,6 -125,7 +125,7 @@@ int traceroute(char *mesh_iface, int ar icmp_packet_out.header.packet_type = BATADV_ICMP; icmp_packet_out.msg_type = BATADV_ECHO_REQUEST; icmp_packet_out.seqno = 0; + icmp_packet_out.reserved = 0;

printf("traceroute to %s (%s), %d hops max, %zu byte packets\n", dst_string, mac_string, TTL_MAX, sizeof(icmp_packet_out));