B.A.T.M.A.N

b.a.t.m.a.n@lists.open-mesh.org

15 participants
4308 discussions

Re: [B.A.T.M.A.N.] [PATCH] Re: batman-adv: Correct rcu refcounting for gw_node
by jay.busch 02 Feb '11

02 Feb '11

Sent from my HTC PURE™, a Windows® phone from AT&T -----Original Message----- From: Marek Lindner <lindner_marek(a)yahoo.de> Sent: Wednesday, February 02, 2011 2:49 PM To: The list for a Better Approach To Mobile Ad-hoc Networking <b.a.t.m.a.n(a)lists.open-mesh.org> Subject: Re: [B.A.T.M.A.N.] [PATCH] Re: batman-adv: Correct rcu refcounting for gw_node On Wednesday 02 February 2011 18:37:18 Linus Lüssing wrote: > So after some more discussions with Marek and Sven, it looks like we > have to use the rcu protected macros rcu_dereference() and > rcu_assign_pointer() for the bat_priv->curr_gw and curr_gw->orig_node. > > Changes here also include moving the kref_get() from unicast_send_skb() > into gw_get_selected(). The orig_node could have been freed already at > the time the kref_get() was called in unicast_send_skb(). I'd suggest you make a standalone patch because the patches address different problems. Thanks, Marek

1 0

[B.A.T.M.A.N.] [PATCH] batctl: add raw wifi packet decapsulation support
by Marek Lindner 01 Feb '11

01 Feb '11

Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- batctl/tcpdump.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++- batctl/tcpdump.h | 49 +++++++++++++++++++++++++ 2 files changed, 152 insertions(+), 1 deletions(-) diff --git a/batctl/tcpdump.c b/batctl/tcpdump.c index 4bff970..bdf81bc 100644 --- a/batctl/tcpdump.c +++ b/batctl/tcpdump.c @@ -29,6 +29,7 @@ #include <sys/time.h> #include <arpa/inet.h> #include <net/if.h> +#include <net/if_arp.h> #include <netinet/in.h> #include <netinet/ip.h> #include <netinet/tcp.h> @@ -458,6 +459,75 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read } } +static void parse_wifi_hdr(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) +{ + struct ether_header *eth_hdr; + struct ieee80211_hdr *wifi_hdr; + unsigned char *shost, *dhost; + uint16_t fc; + int hdr_len; + + if (buff_len <= (ssize_t)PRISM_HEADER_LEN) + return; + + buff_len -= PRISM_HEADER_LEN; + packet_buff += PRISM_HEADER_LEN; + + /* we assume a minimum size of 38 bytes + * (802.11 data frame + LLC) + * before we calculate the real size */ + if (buff_len <= 38) + return; + + wifi_hdr = (struct ieee80211_hdr *)packet_buff; + fc = wifi_hdr->frame_control; + + /* not carrying payload */ + if ((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA) + return; + + /* encrypted packet */ + if (fc & IEEE80211_FCTL_PROTECTED) + return; + + shost = wifi_hdr->addr2; + if (fc & IEEE80211_FCTL_FROMDS) + shost = wifi_hdr->addr3; + else if (fc & IEEE80211_FCTL_TODS) + shost = wifi_hdr->addr4; + + dhost = wifi_hdr->addr1; + if (fc & IEEE80211_FCTL_TODS) + dhost = wifi_hdr->addr3; + + hdr_len = 24; + if ((fc & IEEE80211_FCTL_FROMDS) && (fc & IEEE80211_FCTL_TODS)) + hdr_len = 30; + + if (fc & IEEE80211_STYPE_QOS_DATA) + hdr_len += 2; + + /* LLC */ + hdr_len += 8; + hdr_len -= sizeof(struct ether_header); + + if (buff_len <= hdr_len) + return; + + buff_len -= hdr_len; + packet_buff += hdr_len; + + eth_hdr = (struct ether_header *)packet_buff; + memmove(eth_hdr->ether_shost, shost, ETH_ALEN); + memmove(eth_hdr->ether_dhost, dhost, ETH_ALEN); + + /* printf("parse_wifi_hdr(): ether_type: 0x%04x\n", ntohs(eth_hdr->ether_type)); + printf("parse_wifi_hdr(): shost: %s\n", ether_ntoa_long((struct ether_addr *)eth_hdr->ether_shost)); + printf("parse_wifi_hdr(): dhost: %s\n", ether_ntoa_long((struct ether_addr *)eth_hdr->ether_dhost)); */ + + parse_eth_hdr(packet_buff, buff_len, read_opt, time_printed); +} + int tcpdump(int argc, char **argv) { struct ifreq req; @@ -526,6 +596,27 @@ int tcpdump(int argc, char **argv) memset(&req, 0, sizeof (struct ifreq)); strncpy(req.ifr_name, dump_if->dev, IFNAMSIZ); + res = ioctl(dump_if->raw_sock, SIOCGIFHWADDR, &req); + if (res < 0) { + printf("Error - can't create raw socket (SIOCGIFHWADDR): %s\n", strerror(errno)); + close(dump_if->raw_sock); + goto out; + } + + dump_if->hw_type = req.ifr_hwaddr.sa_family; + + switch (dump_if->hw_type) { + case ARPHRD_ETHER: + case ARPHRD_IEEE80211_PRISM: + break; + default: + printf("Error - interface '%s' is of unknown type: %i\n", dump_if->dev, dump_if->hw_type); + goto out; + } + + memset(&req, 0, sizeof (struct ifreq)); + strncpy(req.ifr_name, dump_if->dev, IFNAMSIZ); + res = ioctl(dump_if->raw_sock, SIOCGIFINDEX, &req); if (res < 0) { @@ -588,7 +679,18 @@ int tcpdump(int argc, char **argv) continue; } - parse_eth_hdr(packet_buff, read_len, read_opt, 0); + switch (dump_if->hw_type) { + case ARPHRD_ETHER: + parse_eth_hdr(packet_buff, read_len, read_opt, 0); + break; + case ARPHRD_IEEE80211_PRISM: + parse_wifi_hdr(packet_buff, read_len, read_opt, 0); + break; + default: + /* should not happen */ + break; + } + fflush(stdout); } diff --git a/batctl/tcpdump.h b/batctl/tcpdump.h index f98d63f..f4276dc 100644 --- a/batctl/tcpdump.h +++ b/batctl/tcpdump.h @@ -23,6 +23,10 @@ #include <netpacket/packet.h> #include "list-batman.h" +#ifndef ARPHRD_IEEE80211_PRISM +#define ARPHRD_IEEE80211_PRISM 802 +#endif + #define DUMP_TYPE_BATOGM 1 #define DUMP_TYPE_BATICMP 2 #define DUMP_TYPE_BATUCAST 4 @@ -31,11 +35,21 @@ #define DUMP_TYPE_BATFRAG 32 #define DUMP_TYPE_NONBAT 64 +#define IEEE80211_FCTL_FTYPE 0x000c +#define IEEE80211_FCTL_TODS 0x0100 +#define IEEE80211_FCTL_FROMDS 0x0200 +#define IEEE80211_FCTL_PROTECTED 0x4000 + +#define IEEE80211_FTYPE_DATA 0x0008 + +#define IEEE80211_STYPE_QOS_DATA 0x0080 + struct dump_if { struct list_head list; char *dev; int32_t raw_sock; struct sockaddr_ll addr; + int32_t hw_type; }; struct vlanhdr { @@ -43,4 +57,39 @@ struct vlanhdr { u_int16_t ether_type; } __attribute__ ((packed)); +struct ieee80211_hdr { + u_int16_t frame_control; + u_int16_t duration_id; + u_int8_t addr1[6]; + u_int8_t addr2[6]; + u_int8_t addr3[6]; + u_int16_t seq_ctrl; + u_int8_t addr4[6]; +} __attribute__ ((packed)); + +struct prism_item { + u_int32_t did; + u_int16_t status; + u_int16_t len; + u_int32_t data; +}; + +struct prism_header { + u_int32_t msgcode; + u_int32_t msglen; + u_int8_t devname[16]; + struct prism_item hosttime; + struct prism_item mactime; + struct prism_item channel; + struct prism_item rssi; + struct prism_item sq; + struct prism_item signal; + struct prism_item noise; + struct prism_item rate; + struct prism_item istx; + struct prism_item frmlen; +}; + +#define PRISM_HEADER_LEN sizeof(struct prism_header) + int tcpdump(int argc, char **argv); -- 1.7.2.3

3 8

[B.A.T.M.A.N.] pull request: batman-adv 2011-01-29
by Sven Eckelmann 30 Jan '11

30 Jan '11

Hi, I would like to propose following changes for net-2.6.git/2.6.38 which fixes some bugs in the fragmentation and vis code. There are also some minor cleanup patches available. If you don't want to merge those cleanup patches then please look bellow the first diffstat for an alternative way to get only the bugfixes. thanks, Sven The following changes since commit aa0adb1a85e159cf57f0e11282bc6c9e3606a5f3: batman-adv: Use "__attribute__" shortcut macros (2011-01-16 03:25:19 +0100) are available in the git repository at: git://git.open-mesh.org/ecsv/linux-merge.git batman-adv/merge Linus Lüssing (1): batman-adv: Fix kernel panic when fetching vis data on a vis server Simon Wunderlich (1): batman-adv: remove unused parameters Sven Eckelmann (11): batman-adv: Create roughly equal sized fragments batman-adv: Calculate correct size for merged packets batman-adv: Remove vis info on hashing errors batman-adv: Remove vis info element in free_info batman-adv: Make vis info stack traversal threadsafe batman-adv: Remove dangling declaration of hash_remove_element batman-adv: Remove unused definitions batman-adv: Remove declaration of batman_skb_recv batman-adv: Remove unused variables batman-adv: Update copyright years batman-adv: Merge README of v2011.0.0 release Documentation/networking/batman-adv.txt | 16 ++++++++-------- net/batman-adv/Makefile | 2 +- net/batman-adv/aggregation.c | 2 +- net/batman-adv/aggregation.h | 2 +- net/batman-adv/bat_debugfs.c | 6 ++---- net/batman-adv/bat_debugfs.h | 2 +- net/batman-adv/bat_sysfs.c | 2 +- net/batman-adv/bat_sysfs.h | 2 +- net/batman-adv/bitarray.c | 2 +- net/batman-adv/bitarray.h | 2 +- net/batman-adv/gateway_client.c | 2 +- net/batman-adv/gateway_client.h | 2 +- net/batman-adv/gateway_common.c | 2 +- net/batman-adv/gateway_common.h | 2 +- net/batman-adv/hard-interface.c | 13 ++++++++++--- net/batman-adv/hard-interface.h | 6 +----- net/batman-adv/hash.c | 2 +- net/batman-adv/hash.h | 7 +------ net/batman-adv/icmp_socket.c | 2 +- net/batman-adv/icmp_socket.h | 2 +- net/batman-adv/main.c | 2 +- net/batman-adv/main.h | 17 +---------------- net/batman-adv/originator.c | 4 ++-- net/batman-adv/originator.h | 2 +- net/batman-adv/packet.h | 3 ++- net/batman-adv/ring_buffer.c | 2 +- net/batman-adv/ring_buffer.h | 2 +- net/batman-adv/routing.c | 26 ++++++++------------------ net/batman-adv/routing.h | 5 ++--- net/batman-adv/send.c | 6 +++--- net/batman-adv/send.h | 2 +- net/batman-adv/soft-interface.c | 2 +- net/batman-adv/soft-interface.h | 2 +- net/batman-adv/translation-table.c | 2 +- net/batman-adv/translation-table.h | 2 +- net/batman-adv/types.h | 2 +- net/batman-adv/unicast.c | 15 ++++++++++----- net/batman-adv/unicast.h | 25 ++++++++++++++++++++++++- net/batman-adv/vis.c | 16 +++++++++------- net/batman-adv/vis.h | 2 +- 40 files changed, 109 insertions(+), 108 deletions(-) If you don't want to merge those cleanup patches, please merge only the bugfixes. They can be found in the branch batman-adv/merge-bugfixonly. The following changes since commit aa0adb1a85e159cf57f0e11282bc6c9e3606a5f3: batman-adv: Use "__attribute__" shortcut macros (2011-01-16 03:25:19 +0100) are available in the git repository at: git://git.open-mesh.org/ecsv/linux-merge.git batman-adv/merge-bugfixonly Linus Lüssing (1): batman-adv: Fix kernel panic when fetching vis data on a vis server Sven Eckelmann (5): batman-adv: Create roughly equal sized fragments batman-adv: Calculate correct size for merged packets batman-adv: Remove vis info on hashing errors batman-adv: Remove vis info element in free_info batman-adv: Make vis info stack traversal threadsafe net/batman-adv/packet.h | 1 + net/batman-adv/routing.c | 2 +- net/batman-adv/unicast.c | 13 +++++++++---- net/batman-adv/unicast.h | 23 +++++++++++++++++++++++ net/batman-adv/vis.c | 14 ++++++++------ 5 files changed, 42 insertions(+), 11 deletions(-)

2 16

[B.A.T.M.A.N.] B.A.T.M.A.N.-Advanced Multicast Optimizations, v2
by Linus Lüssing 30 Jan '11

30 Jan '11

Hi everyone, Here's the next series of patches which should address the comments I got for the first one. Thanks for all the feedback! Changelog: * rebasing to commit [65e0869478bce153a799c0e774a117ba5fc78025], using new orig_hash methods * putting seqno before ttl, 4 byte aligning mcast_packet [01/20] * adapted compat.h to not use custom lock macros, instead only one macro for netif_addr_lock_bh() in case of older kernel versions * merged spinlock-irqsave-to-bh commit into previous commits [20/20] * moved mcast_may_optimize() to soft-interface.c [18/20], removed inlining (won't optimize much anyway...) * purge_mcast_forw_table, splitted list operations into separate functions [12/20] * use batman_if refcounting to reduce the time of rcu-locking [13/20] * do not create nexthop entry if according batman_if is NULL [13/20] * route_mcast_packet, split into separat functions [13/20] * fix typo "seperate" [13/20] * fix typo "i.g." [08/20] * COMPAT_VERSION to 14 [01/20] * use rcu-locking+refcounting for orig_node, remove orig_hash_lock [07/20], [17/20] * made checkpatch-clean * use __packed instead of __attribute_((packed)) [01/20] * change tracker_packet_for_each_dest macro [07/20]: make a "break" in this macro to behave like usual, export parts from macro into own functions TODO: * directly prepare mcast-tracker-packet in sk_buff * only create methods / variables in patches that need them * update mcast-doc * upload updated mcast-doc to wiki maybe TODO? * use hlist instead of list for mcast-table? * use rcu-locking / refcounting for mcast_forw_table? Cheers, Linus

3 27

[B.A.T.M.A.N.] B.A.T.M.A.N.-Advanced Multicast Optimizations, v3
by Linus Lüssing 30 Jan '11

30 Jan '11

Hi everyone, here's the third iteration of the multicast patches which is mainly some bugfixing, smaller but also slightly larger restructuring. Thanks for the feedback again! Cheers, Linus = Changelog v3 = * rebasing to commit [8bb3d9422707a7814ac804acbc00569dd017288c] * 4B-aligning for 'struct mcast_entry', adding __packed attribute [01/19] * converted mcast_forw_table and subsequent lists to hlists [10/19], [11/19], [12/19], [13/19] * splitted mcast_forw_table_seq_print_text into several functions [11/19] * shorter rcu-locking when printing to sysfs, only in seq_print_if_entry [11/19] * add missing spin_lock initilization [10/19] * fix logic for break_flag in tracker_packet_for_each() macro [07/19] * compat.h, should be "#define MC_LIST struct netdev_hw_addr" instead [03/19] * adding mcast duplicate check seqno lock [17/19] * fixed rcu-locking in route_mcast_tracker_packet(), in fact, using refcounting there now [07/19] * restructuring route_mcast_tracker_packet(), merging two loops * also delete dest from tracker packet if unknown originator in zero_tracker_packet() [07/19] * compactify check-code in zero_tracker_packet() [07/19] * don't use index i like nexthop_tracker_packets[i] in skb sending loop in route_mcast_tracker_packet(), it has the wrong base [07/19] * use hash_find() instead of own orig_node look-up in zero_tracker_packt() and add_router_of_dest() [07/19] * reserve dest_entries on heap instead of stack, >4k is too much for the stack [07/19] * rename dest_entries_list to dest_entries_buckets, trying to clarify its purpose [07/19] * add comment for find_mca_match() [07/19] * move comments for zero_tracker_packet() and shrink_tracker_packet() to the correct patches [10/19] * remove wrong comment for sync_orig() (duplicate of sync_table()) [10/19] * remove variable name defines for net_device multicast lists [03/19] * directly create & use SKBs for tracker_packets [07/19], [09/19] * moving stuff from mcast_proact_tracker_prepare() to build_tracker_packet_skb() [07/19] * only create methods / variables / defines / macros in patches that need them (this changed the BAT_MCAST/MCAST_TRACKER define numbers) -[01/19], -[03/19] * use rcu-locking for mcast_forw_table, +[18]

1 18

[B.A.T.M.A.N.] batman-adv 2011.0.0 released
by Marek Lindner 29 Jan '11

29 Jan '11

The B.A.T.M.A.N. team is excited to announce its latest release, 2011.0.0, mainly fulfilling popular feature requests but also delivering bug fixes and performance enhancements as well as modifications under the hood. As the kernel module always depends on the Linux kernel it was compiled against, it does not make sense to provide binaries on our website. As usual, you will find the signed tarballs in our download section: http://downloads.open-mesh.org/batman/releases/batman-adv-2011.0.0/ as well as prepackaged binaries in your distribution. Important changes ---------------- The "gateway support" coming with this release manipulates the DHCP request / reply behavior once activated. It is strongly suggested that you read our documentation before you make use of this feature to avoid surprises. Thanks ---------------- Thanks to all people sending in patches: * Andreas Langer <an.langer(a)gmx.de> * Jesper Juhl <jj(a)chaosbits.net> * Linus Lüssing <linus.luessing(a)web.de> * Marek Lindner <lindner_marek(a)yahoo.de> * Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> * Sven Eckelmann <sven(a)narfation.org> and to all those that supported us with good advice or rigorous testing: * David S. Miller <davem(a)davemloft.net> * Russell Senior <russell(a)personaltelco.net> * Tobias Klauser <tklauser(a)distanz.ch> batman-adv ---------------- This release brings the long awaited internet gateway support: Batman-adv nodes in a network can be declared 'gateways' with a certain bandwidth at their disposal. All clients learn about these gateways and can choose their preferred gateway based on link qualities / bandwidth. The decision is 'propagated' to the higher layers by manipulating the DHCP requests. Furthermore, batman-adv implements a bridge loop detection & avoidance that aim to allow multiple batman-adv nodes connected to the same LAN segment without provoking a loop. The initial layer2 fragmentation implementation that was included in the last releases was further enhanced. Batman-adv nodes forwarding other nodes' traffic inspect the to be transfered packets to automatically fragment the packet if the MTU of the outgoing interface does not allow a normal forward. Fragmented packets are reassembled whenever possible to keep the overhead as low as possible. Also new is the possibility to configure the hop penalty at runtime (via sysfs). The internally used hash implementation has been reimplemented after David Miller pointed out major deficiencies. These changes gave the batman-adv module a 10% speedup when forwarding payload traffic as these operations heavily make use of the hash code. The Linux kernel bit operation functions replaced the custom functions in batman-adv which are better debugged. The cleanup of the sysfs code greatly reduced the code size and makes this code more manageable. batctl ---------------- The support for the new gateway sysfs API was among the biggest changes for this release. It allows to easily turn the gateway mode on/off and displays all known gateways including their announced bandwidth. To monitor the bridge loop avoidance batctl offers a new parameter to display the the bridge neighbor table while highlighting the 'gateway to LAN'. The bisect component now can deal with the 32Bit sequence numbers in the OGMs and the bat-hosts parser became more robust while replacing MAC addresses with bat-host names. Happy routing, The B.A.T.M.A.N. team

1 0

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Merge batman-adv 2011.0.0
by Sven Eckelmann 29 Jan '11

29 Jan '11

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- batman-adv/CHANGELOG | 13 +++++++++++++ batman-adv/README | 15 ++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/batman-adv/CHANGELOG b/batman-adv/CHANGELOG index beff486..6265828 100644 --- a/batman-adv/CHANGELOG +++ b/batman-adv/CHANGELOG @@ -1,3 +1,16 @@ +batman-adv 2011.0.0: + +* support latest kernels (2.6.21 - 2.6.38) +* conversion of reference counting to kref +* allow merging and refragmentation of unicast packets during transfers +* add softif bridge loop detection +* make hop_penalty configurable through sysfs +* reimplement most of the batman-adv hash functionality +* support for optimized DHCP based gateway selection +* cleanup of the sysfs code + + -- Sat, 29 Jan 2011 20:08:05 +0100 + batman-adv 2010.2.0: * support latest kernels (2.6.21 - 2.6.37) diff --git a/batman-adv/README b/batman-adv/README index fb5b9ff..85e4518 100644 --- a/batman-adv/README +++ b/batman-adv/README @@ -1,4 +1,4 @@ -[state: 21-11-2010] +[state: 27-01-2011] BATMAN-ADV ---------- @@ -18,7 +18,7 @@ Batman advanced was implemented as a Linux kernel driver to re- duce the overhead to a minimum. It does not depend on any (other) network driver, and can be used on wifi as well as ethernet lan, vpn, etc ... (anything with ethernet-style layer 2). It compiles -against and should work with Linux 2.6.21 - 2.6.37. Supporting +against and should work with Linux 2.6.21 - 2.6.38. Supporting older versions is not planned, but it's probably easy to backport it. If you work on a backport, feel free to contact us. :-) @@ -83,15 +83,16 @@ All mesh wide settings can be found in batman's own interface folder: # ls /sys/class/net/bat0/mesh/ -# aggregated_ogms bonding fragmentation orig_interval -# vis_mode +# aggregated_ogms gw_bandwidth hop_penalty +# bonding gw_mode orig_interval +# fragmentation gw_sel_class vis_mode There is a special folder for debugging informations: # ls /sys/kernel/debug/batman_adv/bat0/ -# originators socket transtable_global transtable_local -# vis_data +# gateways socket transtable_global vis_data +# originators softif_neigh transtable_local Some of the files contain all sort of status information regard- @@ -250,7 +251,7 @@ CONTACT Please send us comments, experiences, questions, anything :) IRC: #batman on irc.freenode.org -Mailing-list: b.a.t.m.a.n(a)open-mesh.net (optional subscription +Mailing-list: b.a.t.m.a.n(a)open-mesh.org (optional subscription at https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n) You can also contact the Authors: -- 1.7.2.3

2 2

[B.A.T.M.A.N.] [PATCH 1/3] batman-adv: Remove vis info on hashing errors
by Sven Eckelmann 29 Jan '11

29 Jan '11

A newly created vis info object must be removed when it couldn't be added to the hash. The old_info which has to be replaced was already removed and isn't related to the hash anymore. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- batman-adv/vis.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/batman-adv/vis.c b/batman-adv/vis.c index 2cdf01c..9d2729c 100644 --- a/batman-adv/vis.c +++ b/batman-adv/vis.c @@ -446,7 +446,7 @@ static struct vis_info *add_packet(struct bat_priv *bat_priv, info); if (hash_added < 0) { /* did not work (for some reason) */ - kref_put(&old_info->refcount, free_info); + kref_put(&info->refcount, free_info); info = NULL; } -- 1.7.2.3

2 3

[B.A.T.M.A.N.] Dead code cleanup
by Sven Eckelmann 28 Jan '11

28 Jan '11

Hi, I started to go through the release todo and removed some dead code. Best regards, Sven

2 6

[B.A.T.M.A.N.] [PATCH] batctl: tcpdump - support LARGETAIL flag
by Marek Lindner 28 Jan '11

28 Jan '11

Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- batctl/tcpdump.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/batctl/tcpdump.c b/batctl/tcpdump.c index bdf81bc..09a7e16 100644 --- a/batctl/tcpdump.c +++ b/batctl/tcpdump.c @@ -385,10 +385,11 @@ static void dump_batman_frag(unsigned char *packet_buff, ssize_t buff_len, int r printf("BAT %s > ", get_name_by_macaddr((struct ether_addr *)unicast_frag_packet->orig, read_opt)); - printf("%s: FRAG, seq %hu, ttl %hhu, flags [%c], ", + printf("%s: FRAG, seq %hu, ttl %hhu, flags [%c%c], ", get_name_by_macaddr((struct ether_addr *)unicast_frag_packet->dest, read_opt), ntohs(unicast_frag_packet->seqno), unicast_frag_packet->ttl, - (unicast_frag_packet->flags & UNI_FRAG_HEAD ? 'H' : '.')); + (unicast_frag_packet->flags & UNI_FRAG_HEAD ? 'H' : '.'), + (unicast_frag_packet->flags & UNI_FRAG_LARGETAIL ? 'L' : '.')); if (unicast_frag_packet->flags & UNI_FRAG_HEAD) parse_eth_hdr(packet_buff + ETH_HLEN + sizeof(struct unicast_frag_packet), -- 1.7.2.3

1 1

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N