B.A.T.M.A.N May 2016

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

29 participants
110 discussions

[B.A.T.M.A.N.] mesh losing internal Ilayer3 connectivity
by Karl Auer 20 May '16

20 May '16

My apologies up front for a newbie question in this apparently very technical list. If there is a more appropriate list or forum please direct me to it. I'm running batman-adv (Chaos Calmer, r47065) on OpenWRT on the GL -AR150 platform. It all works swimmingly, except that sometimes, for no apparent reason, layer 3 connectivity across the mesh (inside it) is lost. All nodes are still up and running and I can log into them via their APs or their LAN interfaces. batctl on any node still sees all the other nodes, and batctl can ping them by MAC address. Each node still has its layer3 address and can ping it locally. The arp data for the other nodes is correct (at least in my two-node test system). I don't seem to be able to delete arp entries. But no node can ping any other node by IP address. Restarting networking on any or even all nodes doesn't help - all that helps is rebooting everything. As long as my mesh is six nodes on a table, rebooting everything is an option. Once deployed - not so much :-) It's possible to engineer this failure in a two-node mesh by just restarting networking a few times quickly. So I'm wondering a) if this is a known issue b) if this is an obvious symptom of some stuff-up on my part, c) if there's a quick fix :-) and d) failing all of the above whether there is some way out of the situation without having to reboot every time. The mesh has one node configured as a gateway, connected to an upstream, and running DHCP on the bat interface. The other nodes are configured as gateway clients and have nothing connected on their LAN or WAN ports. All nodes have a static address on the bat0 interface, all have a static route to the gateway's (inside) IP address. All have an AP on the same radio as the mesh, with an RFC1918 network on it masqueraded into the mesh. And mostly, it works :-) Yours hopefully, K. -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Karl Auer (kauer(a)biplane.com.au) http://www.biplane.com.au/kauer http://twitter.com/kauer389 GPG fingerprint: E00D 64ED 9C6A 8605 21E0 0ED0 EE64 2BEE CBCB C38B Old fingerprint: 3C41 82BE A9E7 99A1 B931 5AE7 7638 0147 2C3C 2AC4

4 4

[B.A.T.M.A.N.] pull request: batman-adv 20160518
by Antonio Quartulli 19 May '16

19 May '16

Hi David, these are the fixes that couldn't make it for linux-4.6 rebased on top of net-next. They were all supposed to be applied on 4.6, therefore it would be nice if you could queue them for inclusion in the 4.6.1 stable release. Please pull or let me know of any problem! I also have a question: I have another bugfix that should only be applied to 4.6 and not to 4.7/net-next - should I directly send it to stable(a)vger.kernel.org ? Thanks a lot, Antonio The following changes since commit 917fa5353da05e8a0045b8acacba8d50400d5b12: Revert "phy dp83867: Fix compilation with CONFIG_OF_MDIO=m" (2016-05-17 14:49:55 -0400) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem for you to fetch changes up to ebe24cea95ab969f76f2922032f6c390fdc816f2: batman-adv: initialize ELP orig address on secondary interfaces (2016-05-18 11:49:44 +0800) ---------------------------------------------------------------- During the Wireless Battle Mesh v9 in Porto (PT) at the beginning of May, we managed to uncover and fix some important bugs in our new B.A.T.M.A.N. V algorithm. These are the fixes we came up with together with others that I collected in the past weeks: - avoid potential crash due to NULL pointer dereference in B.A.T.M.A.N. V routine when a neigh_ifinfo object is not found, by Sven Eckelmann - avoid use-after-free of skb when counting outgoing bytes, by Florian Westphal - fix neigh_ifinfo object reference counting imbalance when using B.A.T.M.A.N. V, by Sven Eckelmann. Such imbalance may lead to the impossibility of releasing the related netdev object on shutdown - avoid invalid memory access in case of error while allocating bcast_own_sum when a new hard-interface is added, by Sven Eckelmann - ensure originator address is updated in OMG/ELP packet content upon primary interface address change, by Antonio Quartulli - fix integer overflow when computing TQ metric (B.A.T.M.A.N. IV), by Sven Eckelmann - avoid race condition while adding new neigh_node which would result in having two objects mapping to the same physical neighbour, by Linus Lüssing - ensure originator address is initialized in ELP packet content on secondary interfaces, by Marek Lindner ---------------------------------------------------------------- Antonio Quartulli (1): batman-adv: make sure ELP/OGM orig MAC is updated on address change Florian Westphal (1): batman-adv: fix skb deref after free Linus Lüssing (1): batman-adv: Avoid duplicate neigh_node additions Marek Lindner (1): batman-adv: initialize ELP orig address on secondary interfaces Sven Eckelmann (4): batman-adv: Avoid nullptr derefence in batadv_v_neigh_is_sob batman-adv: Fix refcnt leak in batadv_v_neigh_* batman-adv: Fix unexpected free of bcast_own on add_if error batman-adv: Fix integer overflow in batadv_iv_ogm_calc_tq net/batman-adv/bat_iv_ogm.c | 9 +++---- net/batman-adv/bat_v.c | 66 +++++++++++++++++++++++++++++++++++++++------ net/batman-adv/bat_v_elp.c | 31 ++++++++++++++------- net/batman-adv/bat_v_elp.h | 2 ++ net/batman-adv/originator.c | 6 +++-- net/batman-adv/routing.c | 4 ++- 6 files changed, 93 insertions(+), 25 deletions(-)

3 10

[B.A.T.M.A.N.] [PATCH v9 0/3] batman-adv: throughput meter
by Sven Eckelmann 18 May '16

18 May '16

Hi, Antonio was kind enough to provide some feedback about the patchset. I have taken his suggestion and integrated all of them in the patchset. batman-adv: * rebase on top of current master+"batman-adv: Include main.h in all files"+ "batman-adv: Keep includes ordered by filename" * adjust BATADV_DBG_TP_METER to bit 7 to avoid conflicts with mcast * Renamed BATADV_TP_SIGINT to BATADV_TP_REASON_CANCEL * Renamed batadv_tp_meter_reason enumerals to BATADV_TP_REASON* * Remove unrelated patch chunk in batadv_iv_ogm_orig_add_if * Re-add accidentally removed empty line from batadv_recv_my_icmp_packet * define BATADV_TP_PLEN via BATADV_TP_PACKET_LEN (increases it to 1476) * fixed whitespace problems in compat code * remove double "a" in kerneldoc for batadv_tp_meter_reason batctl: * rebase on top of current master * added include guards to tp_meter.h * imported newest batman_adv.h and packet.h from batman-adv * move iw/genl.c functions into own file "genl.c" * adjust result handling based on new BATADV_TP_REASON_* names The patchset lost one patch because it was merged in the meantime. Kind regards, Sven

3 6

[B.A.T.M.A.N.] [PATCH v7 00/11] netns and netlink support
by Andrew Lunn 17 May '16

17 May '16

This patchset completes netns support, by disabling debugfs entries when not in the default name space, and correctly handling interface stack loops when the parent is in a different name space. It additionally adds netlink support for most of the information found in debugfs, and is netns awaire. Note: BLA is untested, so best assume it is broken... v7: Fix compat.h get_link_net() - Thanks Sven Move originator.h in netlink.c to the correct place. Andrew Lunn (5): batman-adv: Handle parent interfaces in a different netns batman-adv: Suppress debugfs entries for netns's batman-adv: add B.A.T.M.A.N. Dump gateways via netlink batman-adv: add B.A.T.M.A.N. Dump BLA claims via netlink batman-adv: Indicate netlink socket can be used with netns. Matthias Schiffer (6): batman-adv: netlink: add routing_algo query batman-adv: netlink: hardif query batman-adv: netlink: add translation table query batman-adv: netlink: add originator and neighbor table queries batman-adv: add B.A.T.M.A.N. IV bat_{orig, neigh}_dump implementations batman-adv: add B.A.T.M.A.N. V bat_{orig, neigh}_dump implementations compat-include/linux/netlink.h | 45 ++++ compat.h | 7 + include/uapi/linux/batman_adv.h | 94 ++++++++ net/batman-adv/bat_iv_ogm.c | 359 +++++++++++++++++++++++++++++++ net/batman-adv/bat_v.c | 337 +++++++++++++++++++++++++++++ net/batman-adv/bridge_loop_avoidance.c | 166 +++++++++++++++ net/batman-adv/bridge_loop_avoidance.h | 10 +- net/batman-adv/debugfs.c | 18 ++ net/batman-adv/gateway_client.c | 148 +++++++++++++ net/batman-adv/gateway_client.h | 2 + net/batman-adv/hard-interface.c | 50 ++++- net/batman-adv/main.c | 66 ++++++ net/batman-adv/main.h | 2 + net/batman-adv/netlink.c | 201 ++++++++++++++++- net/batman-adv/netlink.h | 10 + net/batman-adv/originator.c | 160 ++++++++++++++ net/batman-adv/originator.h | 4 + net/batman-adv/packet.h | 36 ---- net/batman-adv/translation-table.c | 379 +++++++++++++++++++++++++++++++++ net/batman-adv/translation-table.h | 4 + net/batman-adv/types.h | 9 + 21 files changed, 2059 insertions(+), 48 deletions(-) create mode 100644 compat-include/linux/netlink.h -- 2.8.0.rc3

1 11

[B.A.T.M.A.N.] [PATCH v5 00/11] netns and netlink support
by Andrew Lunn 17 May '16

17 May '16

This patchset completes netns support, by disabling debugfs entries when not in the default name space, and correctly handling interface stack loops when the parent is in a different name space. It additionally adds netlink support for most of the information found in debugfs, and is netns aware. Note: BLA is still untested, so best assume it is broken... v5: * Rebase on top of master which now has basic netlink support * Complete all the kerneldoc cut/paste work requested by Sven. v4: * Fix the batctl o -i <ifname> use case by actually performing the filtering on the outgoing interface v3: * Fix the compat with older kernels. It now at least compiles with 3.18.32. I've not booted it though. * Add missing kerneldoc v2: All changes requested by Sven: * Added lots of missing includes and structure forward declarations * Add two kernel doc comments * Fixed an obvious bug in BLA, but it is probably still broken... * Merged in the compat code Sven suggested. Only compile tested with 4.5.0 Andrew Lunn (5): batman-adv: Handle parent interfaces in a different netns batman-adv: Suppress debugfs entries for netns's batman-adv: add B.A.T.M.A.N. Dump gateways via netlink batman-adv: add B.A.T.M.A.N. Dump BLA claims via netlink batman-adv: Indicate netlink socket can be used with netns. Matthias Schiffer (6): batman-adv: netlink: add routing_algo query batman-adv: netlink: hardif query batman-adv: netlink: add translation table query batman-adv: netlink: add originator and neighbor table queries batman-adv: add B.A.T.M.A.N. IV bat_{orig, neigh}_dump implementations batman-adv: add B.A.T.M.A.N. V bat_{orig, neigh}_dump implementations compat-include/linux/netlink.h | 45 ++++ compat.h | 7 + include/uapi/linux/batman_adv.h | 91 ++++++++ net/batman-adv/bat_iv_ogm.c | 361 +++++++++++++++++++++++++++++++ net/batman-adv/bat_v.c | 337 +++++++++++++++++++++++++++++ net/batman-adv/bridge_loop_avoidance.c | 166 +++++++++++++++ net/batman-adv/bridge_loop_avoidance.h | 10 +- net/batman-adv/debugfs.c | 18 ++ net/batman-adv/gateway_client.c | 148 +++++++++++++ net/batman-adv/gateway_client.h | 2 + net/batman-adv/hard-interface.c | 50 ++++- net/batman-adv/main.c | 66 ++++++ net/batman-adv/main.h | 2 + net/batman-adv/netlink.c | 200 ++++++++++++++++- net/batman-adv/netlink.h | 10 + net/batman-adv/originator.c | 160 ++++++++++++++ net/batman-adv/originator.h | 4 + net/batman-adv/packet.h | 36 ---- net/batman-adv/translation-table.c | 379 +++++++++++++++++++++++++++++++++ net/batman-adv/translation-table.h | 4 + net/batman-adv/types.h | 9 + 21 files changed, 2057 insertions(+), 48 deletions(-) create mode 100644 compat-include/linux/netlink.h -- 2.8.0.rc3

2 16

[B.A.T.M.A.N.] [PATCH v6 00/11] netns and netlink support
by Andrew Lunn 17 May '16

17 May '16

This patchset completes netns support, by disabling debugfs entries when not in the default name space, and correctly handling interface stack loops when the parent is in a different name space. It additionally adds netlink support for most of the information found in debugfs, and is netns aware. Note: BLA is still untested, so best assume it is broken... v6: * Add missing kernel doc for local/global transtable and bla claims * No change to code indentation. I consider it a false positive. The code is more readable the way it is, checkpatch is happy, and it does not violate anything in CodingStyle, as far as i can see. v5: * Rebase on top of master which now has basic netlink support * Complete all the kerneldoc cut/paste work requested by Sven. v4: * Fix the batctl o -i <ifname> use case by actually performing the filtering on the outgoing interface v3: * Fix the compat with older kernels. It now at least compiles with 3.18.32. I've not booted it though. * Add missing kerneldoc v2: All changes requested by Sven: * Added lots of missing includes and structure forward declarations * Add two kernel doc comments * Fixed an obvious bug in BLA, but it is probably still broken... * Merged in the compat code Sven suggested. Only compile tested with 4.5.0 Andrew Lunn (5): batman-adv: Handle parent interfaces in a different netns batman-adv: Suppress debugfs entries for netns's batman-adv: add B.A.T.M.A.N. Dump gateways via netlink batman-adv: add B.A.T.M.A.N. Dump BLA claims via netlink batman-adv: Indicate netlink socket can be used with netns. Matthias Schiffer (6): batman-adv: netlink: add routing_algo query batman-adv: netlink: hardif query batman-adv: netlink: add translation table query batman-adv: netlink: add originator and neighbor table queries batman-adv: add B.A.T.M.A.N. IV bat_{orig, neigh}_dump implementations batman-adv: add B.A.T.M.A.N. V bat_{orig, neigh}_dump implementations compat-include/linux/netlink.h | 45 ++++ compat.h | 7 + include/uapi/linux/batman_adv.h | 91 ++++++++ net/batman-adv/bat_iv_ogm.c | 361 +++++++++++++++++++++++++++++++ net/batman-adv/bat_v.c | 337 +++++++++++++++++++++++++++++ net/batman-adv/bridge_loop_avoidance.c | 166 +++++++++++++++ net/batman-adv/bridge_loop_avoidance.h | 10 +- net/batman-adv/debugfs.c | 18 ++ net/batman-adv/gateway_client.c | 148 +++++++++++++ net/batman-adv/gateway_client.h | 2 + net/batman-adv/hard-interface.c | 50 ++++- net/batman-adv/main.c | 66 ++++++ net/batman-adv/main.h | 2 + net/batman-adv/netlink.c | 200 ++++++++++++++++- net/batman-adv/netlink.h | 10 + net/batman-adv/originator.c | 160 ++++++++++++++ net/batman-adv/originator.h | 4 + net/batman-adv/packet.h | 36 ---- net/batman-adv/translation-table.c | 379 +++++++++++++++++++++++++++++++++ net/batman-adv/translation-table.h | 4 + net/batman-adv/types.h | 9 + 21 files changed, 2057 insertions(+), 48 deletions(-) create mode 100644 compat-include/linux/netlink.h -- 2.8.0.rc3

2 17

[B.A.T.M.A.N.] [PATCH v2] batman-adv: B.A.T.M.A.N. V - implement hard-iface init function
by Antonio Quartulli 17 May '16

17 May '16

Some fields in the hard-interface data structure are specific to the B.A.T.M.A.N. V protocol and have to be initialized only when such protocol is compiled in. Instead of having a #ifdef block in the middle of the hard-interface.c code it is better to have an algorithm private function that hides the precompiler logic in its own header file (like other functions). Fixes: ffd2f27908e5 ("batman-adv: Only init ELP tweaking options when BATMAN_V is enabled") Signed-off-by: Antonio Quartulli <a(a)unstable.cc> --- Changes from v1: - move bat_algo.h include line to the right location net/batman-adv/bat_algo.h | 5 +++++ net/batman-adv/bat_v.c | 14 ++++++++++++++ net/batman-adv/hard-interface.c | 10 ++-------- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/net/batman-adv/bat_algo.h b/net/batman-adv/bat_algo.h index b727762..3654296 100644 --- a/net/batman-adv/bat_algo.h +++ b/net/batman-adv/bat_algo.h @@ -25,6 +25,7 @@ int batadv_iv_init(void); #ifdef CONFIG_BATMAN_ADV_BATMAN_V int batadv_v_init(void); +void batadv_v_hardif_init(struct batadv_hard_iface *hardif); int batadv_v_mesh_init(struct batadv_priv *bat_priv); void batadv_v_mesh_free(struct batadv_priv *bat_priv); @@ -35,6 +36,10 @@ static inline int batadv_v_init(void) return 0; } +static inline void batadv_v_hardif_init(struct batadv_hard_iface *hardif) +{ +} + static inline int batadv_v_mesh_init(struct batadv_priv *bat_priv) { return 0; diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index b9c2850..fb2d29d 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -333,6 +333,20 @@ static struct batadv_algo_ops batadv_batman_v __read_mostly = { }; /** + * batadv_v_hardif_init - initialize the algorithm specific fields in the + * hard-interface object + * @hard_iface: the hard-interface to initialize + */ +void batadv_v_hardif_init(struct batadv_hard_iface *hard_iface) +{ + /* enable link throughput auto-detection by setting the throughput + * override to zero + */ + atomic_set(&hard_iface->bat_v.throughput_override, 0); + atomic_set(&hard_iface->bat_v.elp_interval, 500); +} + +/** * batadv_v_mesh_init - initialize the B.A.T.M.A.N. V private resources for a * mesh * @bat_priv: the object representing the mesh interface to initialise diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index a8cda76..3696929 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -37,6 +37,7 @@ #include <linux/spinlock.h> #include <linux/workqueue.h> +#include "bat_algo.h" #include "bridge_loop_avoidance.h" #include "debugfs.h" #include "distributed-arp-table.h" @@ -683,14 +684,7 @@ batadv_hardif_add_interface(struct net_device *net_dev) if (batadv_is_wifi_netdev(net_dev)) hard_iface->num_bcasts = BATADV_NUM_BCASTS_WIRELESS; -#ifdef CONFIG_BATMAN_ADV_BATMAN_V - /* enable link throughput auto-detection by setting the throughput - * override to zero - */ - atomic_set(&hard_iface->bat_v.throughput_override, 0); - - atomic_set(&hard_iface->bat_v.elp_interval, 500); -#endif + batadv_v_hardif_init(hard_iface); /* extra reference for return */ kref_init(&hard_iface->refcount); -- 2.8.2

2 2

[B.A.T.M.A.N.] [PATCH v8 0/4] batman-adv: throughput meter
by Sven Eckelmann 17 May '16

17 May '16

Hi, Marek applied some of the netlink patches to get the initial support for a netlink family in the kernel. He also started to merge some of the batctl patches. These were removed from this patchset. Antonio also suggested that all *_IFNAME attributes should be limited to IFNAMSIZ in userspace. This was adjusted in the policy table of patch "batctl: Add attributes/command for BATADV_CMD_GET_MESH_INFO" Also some conflicts with the current masters of batctl/batman-adv were fixed. Kind regards, Sven

3 6

[B.A.T.M.A.N.] [PATCHv5 1/2] batctl: adding multicast debug level
by Linus Lüssing 17 May '16

17 May '16

From: Linus Lüssing <linus.luessing(a)web.de> This patch adds the multicast debug level to check for own multicast flag changes for instance. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- Changes in v5: * none Changes in v4: * rebase to current master (no conflicts) Changes in v3: * none Changes in v2: * added a sentence about 'mcast' log level to manpage README | 1 + man/batctl.8 | 6 +++--- sys.c | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/README b/README index f87c551..b5de8a6 100644 --- a/README +++ b/README @@ -390,6 +390,7 @@ $ batctl loglevel [ ] messages related to bridge loop avoidance (bla) [ ] messages related to arp snooping and distributed arp table (dat) [ ] messages related to network coding (nc) +[ ] messages related to multicast (mcast) batctl nc_nodes =============== diff --git a/man/batctl.8 b/man/batctl.8 index e804a08..f8955d0 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -98,9 +98,9 @@ level. Level 'none' disables all verbose logging. Level 'batman' enables message Level 'routes' enables messages related to routes being added / changed / deleted. Level 'tt' enables messages related to translation table operations. Level 'bla' enables messages related to the bridge loop avoidance. Level 'dat' enables messages related to ARP snooping and the Distributed Arp Table. Level 'nc' enables messages related to network coding. -Level 'all' enables all messages. The messages are sent to the batman-adv debug log. Use \fBbatctl log\fP to retrieve it. -Make sure to have debugging output enabled when compiling the module otherwise the output as well as the loglevel options -won't be available. +Level 'mcast' enables messages related to multicast optimizations. Level 'all' enables all messages. The messages +are sent to the batman-adv debug log. Use \fBbatctl log\fP to retrieve it. Make sure to have debugging output enabled +when compiling the module otherwise the output as well as the loglevel options won't be available. .br .IP "\fBlog\fP|\fBl\fP [\fB\-n\fP]\fP" batctl will read the batman-adv debug log which has to be compiled into the kernel module. If "\-n" is given batctl will not diff --git a/sys.c b/sys.c index afa8533..ca837f6 100644 --- a/sys.c +++ b/sys.c @@ -277,6 +277,7 @@ static void log_level_usage(void) fprintf(stderr, " \t bla Messages related to bridge loop avoidance\n"); fprintf(stderr, " \t dat Messages related to arp snooping and distributed arp table\n"); fprintf(stderr, " \t nc Messages related to network coding\n"); + fprintf(stderr, " \t mcast Messages related to multicast\n"); } int handle_loglevel(char *mesh_iface, int argc, char **argv) @@ -321,6 +322,8 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) log_level |= BIT(4); else if (strcmp(argv[i], "nc") == 0) log_level |= BIT(5); + else if (strcmp(argv[i], "mcast") == 0) + log_level |= BIT(6); else { log_level_usage(); goto out; @@ -354,6 +357,8 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) "messages related to arp snooping and distributed arp table", "dat"); printf("[%c] %s (%s)\n", (log_level & BIT(5)) ? 'x' : ' ', "messages related to network coding", "nc"); + printf("[%c] %s (%s)\n", (log_level & BIT(6)) ? 'x' : ' ', + "messages related to multicast", "mcast"); out: free(path_buff); -- 1.7.10.4

2 4

[B.A.T.M.A.N.] [PATCHv4 1/2] batctl: adding multicast debug level
by Linus Lüssing 17 May '16

17 May '16

From: Linus Lüssing <linus.luessing(a)web.de> This patch adds the multicast debug level to check for own multicast flag changes for instance. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- Changes in v4: * rebase to current master (no conflicts) Changes in v3: * none Changes in v2: * added a sentence about 'mcast' log level to manpage README | 1 + man/batctl.8 | 6 +++--- sys.c | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/README b/README index f87c551..b5de8a6 100644 --- a/README +++ b/README @@ -390,6 +390,7 @@ $ batctl loglevel [ ] messages related to bridge loop avoidance (bla) [ ] messages related to arp snooping and distributed arp table (dat) [ ] messages related to network coding (nc) +[ ] messages related to multicast (mcast) batctl nc_nodes =============== diff --git a/man/batctl.8 b/man/batctl.8 index e804a08..f8955d0 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -98,9 +98,9 @@ level. Level 'none' disables all verbose logging. Level 'batman' enables message Level 'routes' enables messages related to routes being added / changed / deleted. Level 'tt' enables messages related to translation table operations. Level 'bla' enables messages related to the bridge loop avoidance. Level 'dat' enables messages related to ARP snooping and the Distributed Arp Table. Level 'nc' enables messages related to network coding. -Level 'all' enables all messages. The messages are sent to the batman-adv debug log. Use \fBbatctl log\fP to retrieve it. -Make sure to have debugging output enabled when compiling the module otherwise the output as well as the loglevel options -won't be available. +Level 'mcast' enables messages related to multicast optimizations. Level 'all' enables all messages. The messages +are sent to the batman-adv debug log. Use \fBbatctl log\fP to retrieve it. Make sure to have debugging output enabled +when compiling the module otherwise the output as well as the loglevel options won't be available. .br .IP "\fBlog\fP|\fBl\fP [\fB\-n\fP]\fP" batctl will read the batman-adv debug log which has to be compiled into the kernel module. If "\-n" is given batctl will not diff --git a/sys.c b/sys.c index afa8533..ca837f6 100644 --- a/sys.c +++ b/sys.c @@ -277,6 +277,7 @@ static void log_level_usage(void) fprintf(stderr, " \t bla Messages related to bridge loop avoidance\n"); fprintf(stderr, " \t dat Messages related to arp snooping and distributed arp table\n"); fprintf(stderr, " \t nc Messages related to network coding\n"); + fprintf(stderr, " \t mcast Messages related to multicast\n"); } int handle_loglevel(char *mesh_iface, int argc, char **argv) @@ -321,6 +322,8 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) log_level |= BIT(4); else if (strcmp(argv[i], "nc") == 0) log_level |= BIT(5); + else if (strcmp(argv[i], "mcast") == 0) + log_level |= BIT(6); else { log_level_usage(); goto out; @@ -354,6 +357,8 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) "messages related to arp snooping and distributed arp table", "dat"); printf("[%c] %s (%s)\n", (log_level & BIT(5)) ? 'x' : ' ', "messages related to network coding", "nc"); + printf("[%c] %s (%s)\n", (log_level & BIT(6)) ? 'x' : ' ', + "messages related to multicast", "mcast"); out: free(path_buff); -- 1.7.10.4

3 3

← Newer
1
2
3
4
5
6
7
8
...
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N May 2016