Repository : ssh://git@open-mesh.org/batctl

On branch : next

commit 02921f7519a296da09c2679ee0f3cc842b47c6cb Author: Antonio Quartulli ordex@autistici.org Date: Tue Apr 2 22:34:30 2013 +0200

batctl: tcpdump - print subtype for UNICAST4ADDR packets

Signed-off-by: Antonio Quartulli ordex@autistici.org Signed-off-by: Marek Lindner lindner_marek@yahoo.de

02921f7519a296da09c2679ee0f3cc842b47c6cb tcpdump.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tcpdump.c b/tcpdump.c index f69ac6f..b4cfec9 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -560,9 +560,10 @@ static void dump_batman_4addr(unsigned char *packet_buff, ssize_t buff_len, int printf("BAT %s > ", get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt));

- printf("%s: 4ADDR, ttvn %d, ttl %hhu, ", + printf("%s: 4ADDR, subtybe %hhu, ttvn %d, ttl %hhu, ", get_name_by_macaddr((struct ether_addr *)unicast_4addr_packet->u.dest, read_opt), - unicast_4addr_packet->u.ttvn, unicast_4addr_packet->u.header.ttl); + unicast_4addr_packet->subtype, unicast_4addr_packet->u.ttvn, + unicast_4addr_packet->u.header.ttl);

parse_eth_hdr(packet_buff + ETH_HLEN + sizeof(struct batadv_unicast_4addr_packet), buff_len - ETH_HLEN - sizeof(struct batadv_unicast_4addr_packet),