The following commit has been merged in the master branch: commit 59b559c4138d006beabf79e8f97767e99726dce7 Author: Marek Lindner lindner_marek@yahoo.de Date: Sat Mar 17 12:18:04 2012 +0800

batctl: tcpdump - display new not_best_hop_flag when parsing OGMs

Signed-off-by: Marek Lindner lindner_marek@yahoo.de

diff --git a/tcpdump.c b/tcpdump.c index 771e4f0..72c9cf1 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -331,10 +331,11 @@ static void dump_batman_iv_ogm(unsigned char *packet_buff, ssize_t buff_len, int printf("BAT %s: ", get_name_by_macaddr((struct ether_addr *)batman_ogm_packet->orig, read_opt));

- printf("OGM IV via neigh %s, seq %u, tq %3d, ttvn %d, ttcrc %hu, ttl %2d, v %d, flags [%c%c%c%c], length %zu\n", + printf("OGM IV via neigh %s, seq %u, tq %3d, ttvn %d, ttcrc %hu, ttl %2d, v %d, flags [%c%c%c%c%c], length %zu\n", get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt), ntohl(batman_ogm_packet->seqno), batman_ogm_packet->tq, batman_ogm_packet->ttvn, ntohs(batman_ogm_packet->tt_crc), batman_ogm_packet->header.ttl, batman_ogm_packet->header.version, + (batman_ogm_packet->flags & NOT_BEST_NEXT_HOP ? 'N' : '.'), (batman_ogm_packet->flags & DIRECTLINK ? 'D' : '.'), (batman_ogm_packet->flags & VIS_SERVER ? 'V' : '.'), (batman_ogm_packet->flags & PRIMARIES_FIRST_HOP ? 'F' : '.'),