Author: marek Date: 2010-01-10 05:00:09 +0100 (Sun, 10 Jan 2010) New Revision: 1549

Modified: branches/batctl-0.2.x/tcpdump.c branches/batctl-0.2.x/tcpdump.h Log: batctl: tcpdump - add vlan support

This patch let's the tcpdump component decompose & display vlan (802.1Q) packets.

Modified: branches/batctl-0.2.x/tcpdump.c =================================================================== --- branches/batctl-0.2.x/tcpdump.c 2010-01-10 03:56:08 UTC (rev 1548) +++ branches/batctl-0.2.x/tcpdump.c 2010-01-10 04:00:09 UTC (rev 1549) @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: * * Andreas Langer a.langer@q-dsl.de @@ -221,6 +221,34 @@ } }

+void dump_vlan(unsigned char *packet_buff, ssize_t buff_len, int time_printed) +{ + struct vlanhdr *vlanhdr; + + vlanhdr = (struct vlanhdr *)packet_buff; + LEN_CHECK((size_t)buff_len, sizeof(struct vlanhdr), "VLAN"); + + if (!time_printed) + print_time(); + + vlanhdr->vid = ntohs(vlanhdr->vid); + printf("vlan %u, p %u, ", vlanhdr->vid, vlanhdr->vid >> 12); + + switch (ntohs(vlanhdr->ether_type)) { + case ETH_P_ARP: + dump_arp(packet_buff + sizeof(struct vlanhdr), + buff_len - sizeof(struct vlanhdr), 1); + break; + case ETH_P_IP: + dump_ip(packet_buff + sizeof(struct vlanhdr), + buff_len - sizeof(struct vlanhdr), 1); + break; + default: + printf(" unknown payload ether type: 0x%04x\n", ntohs(vlanhdr->ether_type)); + break; + } +} + void dump_batman_ogm(unsigned char *packet_buff, ssize_t buff_len, int read_opt) { struct ether_header *ether_header; @@ -320,8 +348,12 @@ dump_ip(packet_buff + (2 * sizeof(struct ether_header)) + sizeof(struct unicast_packet), buff_len - (2 * sizeof(struct ether_header)) - sizeof(struct unicast_packet), 1); break; + case ETH_P_8021Q: + dump_vlan(packet_buff + (2 * sizeof(struct ether_header)) + sizeof(struct unicast_packet), + buff_len - (2 * sizeof(struct ether_header)) - sizeof(struct unicast_packet), 1); + break; default: - printf(" unknown payload ether type: %hu\n", ntohs(ether_header->ether_type)); + printf(" unknown payload ether type: 0x%04x\n", ntohs(ether_header->ether_type)); break; } } @@ -358,8 +390,12 @@ dump_ip(packet_buff + (2 * sizeof(struct ether_header)) + sizeof(struct bcast_packet), buff_len - (2 * sizeof(struct ether_header)) - sizeof(struct bcast_packet), 1); break; + case ETH_P_8021Q: + dump_vlan(packet_buff + (2 * sizeof(struct ether_header)) + sizeof(struct bcast_packet), + buff_len - (2 * sizeof(struct ether_header)) - sizeof(struct bcast_packet), 1); + break; default: - printf(" unknown payload ether type: %hu\n", ntohs(ether_header->ether_type)); + printf(" unknown payload ether type: 0x%04x\n", ntohs(ether_header->ether_type)); break; } } @@ -510,6 +546,11 @@ dump_ip(packet_buff + sizeof(struct ether_header), read_len - sizeof(struct ether_header), 0); break; + case ETH_P_8021Q: + if (dump_level & DUMP_TYPE_NONBAT) + dump_vlan(packet_buff + sizeof(struct ether_header), + read_len - sizeof(struct ether_header), 0); + break; case ETH_P_BATMAN: batman_packet = (struct batman_packet *)(packet_buff + sizeof(struct ether_header));

@@ -538,7 +579,7 @@

break; default: - printf("Warning - packet contains unknown ether type: %hu\n", ether_type); + printf("Warning - packet contains unknown ether type: 0x%04x\n", ether_type); break; }

Modified: branches/batctl-0.2.x/tcpdump.h =================================================================== --- branches/batctl-0.2.x/tcpdump.h 2010-01-10 03:56:08 UTC (rev 1548) +++ branches/batctl-0.2.x/tcpdump.h 2010-01-10 04:00:09 UTC (rev 1549) @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: * * Andreas Langer a.langer@q-dsl.de, Marek Lindner lindner_marek@yahoo.de @@ -37,4 +37,9 @@ struct sockaddr_ll addr; };

+struct vlanhdr { + unsigned short vid; + u_int16_t ether_type; +} __attribute__ ((packed)); + int tcpdump(int argc, char **argv);