commits May 2016

commits@lists.open-mesh.org

1 participants
174 discussions

[linux-merge]linux integration; branch, merge/master, updated. v4.6-rc1-2637-g088a8c5
by postmaster＠open-mesh.org 18 May '16

18 May '16

The following commit has been merged in the merge/master branch: commit fc3e79d9ef2a1006f94e441d9613749cbbe7176a Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri May 6 22:27:09 2016 +0200 batman-adv: Fix double neigh_node_put in batadv_v_ogm_route_update The router is put down twice when it was non-NULL and either orig_ifinfo is NULL afterwards or batman-adv receives a packet with the same sequence number. This will end up in a use-after-free when the batadv_neigh_node is removed because the reference counter ended up too early at 0. Fixes: 667996ebeab4 ("batman-adv: OGMv2 - implement originators logic") Reported-by: Gui Iribarren <gui(a)altermundi.net> Tested-by: Antonio Quartulli <a(a)unstable.cc> Tested-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index d9bcbe6..91df28a 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -529,8 +529,10 @@ static void batadv_v_ogm_route_update(struct batadv_priv *bat_priv, goto out; } - if (router) + if (router) { batadv_neigh_node_put(router); + router = NULL; + } /* Update routes, and check if the OGM is from the best next hop */ batadv_v_ogm_orig_update(bat_priv, orig_node, neigh_node, ogm2, -- linux integration

1 0

[linux-merge]linux integration; branch, merge/master, updated. v4.6-rc1-2637-g088a8c5
by postmaster＠open-mesh.org 18 May '16

18 May '16

The following commit has been merged in the merge/master branch: commit 5d30b72c97660403ef1b7e50f71734e8774cb236 Author: Antonio Quartulli <a(a)unstable.cc> Date: Mon May 2 01:14:40 2016 +0800 batman-adv: make sure ELP/OGM orig MAC is updated on address change When the MAC address of the primary interface is changed, update the originator address in the ELP and OGM skb buffers as well in order to reflect the change. Reported-by: Marek Lindner <marek(a)neomailbox.ch> Signed-off-by: Antonio Quartulli <a(a)unstable.cc> diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 3ff8bd1..554ccd5 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -72,16 +72,27 @@ static void batadv_v_iface_disable(struct batadv_hard_iface *hard_iface) batadv_v_elp_iface_disable(hard_iface); } -static void batadv_v_iface_update_mac(struct batadv_hard_iface *hard_iface) -{ -} - static void batadv_v_primary_iface_set(struct batadv_hard_iface *hard_iface) { batadv_v_elp_primary_iface_set(hard_iface); batadv_v_ogm_primary_iface_set(hard_iface); } +static void batadv_v_iface_update_mac(struct batadv_hard_iface *hard_iface) +{ + struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); + struct batadv_hard_iface *primary_if; + + primary_if = batadv_primary_if_get_selected(bat_priv); + if (primary_if != hard_iface) + goto out; + + batadv_v_primary_iface_set(hard_iface); +out: + if (primary_if) + batadv_hardif_put(primary_if); +} + static void batadv_v_hardif_neigh_init(struct batadv_hardif_neigh_node *hardif_neigh) { -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, updated. batman-adv-fix-for-davem
by postmaster＠open-mesh.org 18 May '16

18 May '16

The annotated tag, batman-adv-fix-for-davem has been updated to 930e8c393785212baa0af362a4785a20cce44a9a (tag) from 8038fa43551cae79bdeda7944078f4eb2bddeb8f (which is now obsolete) tagging ebe24cea95ab969f76f2922032f6c390fdc816f2 (commit) replaces v4.6-rc7 tagged by Antonio Quartulli on Wed May 18 11:49:59 2016 +0800 - Shortlog ------------------------------------------------------------ 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 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJXO+ZsAAoJEJ4aZjxxc6bK7UEQALxcPqv2YtQhQCexHAPlmTxg 73uXuXpo0eWPxJh2FElcsHTHSt/l0/m/G8MEWCOfqI8MTeg+UTY5lXCY4iThtiY6 n08nl/CLkPNLuDGzAd7CpCM2jJ1iAzgJEVpUGQ6qoO5ekFvO09U/J/o6E8gDTX4I yc1kR3hcJeLbF6EUXEfTX/2THdFhkYSgHgZoGyM3eu43Zhv/6v454iEpqNxA/Ubr UngJTGSfqf20FidUt+xjbfptltTzj25Cp+VQ2DQ/LOuit0ChECjXwMfk0UkDHlKX bYPm1tcUJ0dzbR7cILMlzzzCSzH00leUk5GYYo59rAxBQiJ2j+92c2K0dcnv8cJJ q+GsZapyQFBIgPWS/TLtG1II3u8YWYvl+nEQXBDtPeRAjGoO4VwSbuatsf+enM8K i0c622iEc0b3cVe5H8reUh7SZMfMT/cQkEgpX5/psf8FWvEzeDv4HI3aUfVuSpck mEZAy59HeLWrF+KTScougv14vyoMmKfUcr5E1Oe4X1Ke9dpVvHGiI9wlqb/J0lfl rIc/5WI3ae/QAXkcPybanPEO8O0pBMP+Y4oCYpWmDu1qYfwZzDaSMqqEALQVVW2I 8Ta1gbzamgZDslf7YDSWOR0iyFAFcnMhT0qU6gv2+RGbcfwD+AGRLu5ufY/th0N3 L6AuFhvT/bxW6jN+iuAS =IACg -----END PGP SIGNATURE----- Andrew Lunn (2): batman-adv: NETIF_F_NETNS_LOCAL feature to prevent netns moves batman-adv: Create batman soft interfaces within correct netns. Antonio Quartulli (4): batman-adv: use static string for table headers batman-adv: fix wrong names in kerneldoc batman-adv: use batadv_compare_eth when possible batman-adv: make sure ELP/OGM orig MAC is updated on address change David S. Miller (2): Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge Florian Westphal (2): treewide: replace dev->trans_start update with helper batman-adv: fix skb deref after free Geliang Tang (2): batman-adv: use list_for_each_entry_safe batman-adv: use to_delayed_work Linus Lüssing (1): batman-adv: Avoid duplicate neigh_node additions Marek Lindner (2): batman-adv: replace ethertype variable with ETH_P_BATMAN for readability batman-adv: initialize ELP orig address on secondary interfaces Simon Wunderlich (5): batman-adv: Start new development cycle batman-adv: fix debuginfo macro style issue batman-adv: move and restructure batadv_v_ogm_forward batman-adv: Merge batadv_v_ogm_orig_update into batadv_v_ogm_route_update batman-adv: add detection for complex bridge loops Sven Eckelmann (21): batman-adv: Fix checkpatch warning about 'unsigned' type batman-adv: Fix kerneldoc for batadv_compare_claim batman-adv: Add kernel-doc for batadv_interface_rx batman-adv: Fix function names on new line starting with '*' batman-adv: Split batadv_iv_ogm_orig_del_if function batman-adv: Remove unused parameter recv_if of batadv_interface_rx batman-adv: Remove hdr_size skb size check in batadv_interface_rx batman-adv: Check hard_iface refcnt before calling function batman-adv: Check hard_iface refcnt when receiving skb batman-adv: Increase hard_iface refcnt for ptype batman-adv: Use kref_get for batadv_tvlv_container_get batman-adv: Use kref_get for batadv_nc_get_nc_node batman-adv: Use kref_get for batadv_gw_select batman-adv: Use kref_get for batadv_gw_node_add batman-adv: Use kref_get for hard_iface subfunctions batman-adv: Use kref_get for _batadv_update_route batman-adv: Use bool as return type for boolean functions 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 ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, updated. batman-adv-fix-for-davem
by postmaster＠open-mesh.org 18 May '16

18 May '16

The annotated tag, batman-adv-fix-for-davem has been updated to 8038fa43551cae79bdeda7944078f4eb2bddeb8f (tag) from 7256a56520bad339789f37389155bf60b2a0b1b4 (which is now obsolete) tagging c9663af5632a1393ae1311f774339634dcf4e5ce (commit) replaces v4.6-rc7 tagged by Antonio Quartulli on Wed May 18 10:18:07 2016 +0800 - Shortlog ------------------------------------------------------------ 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 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJXO947AAoJEJ4aZjxxc6bK6xQP/iNroyHxQBh+ALfenyz6lSew D1V5FZ2gXYkiR/zxIASNmO2LsxgFDykmVgVF3MeCKCPDg+4Zp2Pb8O1nJLbJc2hZ Yr72PriIVnNa4pi3mKZ6g/oPLdyQjFE3YdHkfw1lE43oHJKVUM05IsVRzOoji0Of MHE8mLtX+CEH/2sUBtNQG4SPKfUoz8hnpEK+MTmS+eZ1gK+AMl8hkbaw5kyT2ppR EDBM2jGP4U4h/WnyL/jDlM6zGRWqx/7OFoNYVxTT+IwMWorXtYJR9qOvNsp+ZVua N/FYycphQ9utLx6LtafWwuTaMfKkg83LMNY4A50SE6b5CG20pUeG/CWhdbfPdVQf Un7l96z8MRoiKQhHIaLME1xw8nftd4YEGZrbZTdwgNeIJw6hCjzA+RnIJN51D6xW 8BeUIXaHRObitbwLpyCPCv5xHaZHWgwkLLHvvBjbnFFwIuX84bz5HLm1HDNDe+2L A8jMiR/0ggnUkcu9JNiIjuFNvpAJSmAVeEcyG2Bw9R6PTUqNnVhQVrFG2vG/4Kpy ibJbO7/QrCmOlMV7bgCecb20Myd2DqU/OZrb4a+gXjaSk5rRb77GntmU8G2IJzMP /rxMFFpBvclKj+x1cFQnQn34IxIJp9/vjlTCp0Vd4t+F/y/ECiN9MqAoybk2R/KU o72K4j0XhwNS6paGvEgS =goVR -----END PGP SIGNATURE----- Andrew Lunn (2): batman-adv: NETIF_F_NETNS_LOCAL feature to prevent netns moves batman-adv: Create batman soft interfaces within correct netns. Antonio Quartulli (4): batman-adv: use static string for table headers batman-adv: fix wrong names in kerneldoc batman-adv: use batadv_compare_eth when possible batman-adv: make sure ELP/OGM orig MAC is updated on address change David S. Miller (2): Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge Florian Westphal (2): treewide: replace dev->trans_start update with helper batman-adv: fix skb deref after free Geliang Tang (2): batman-adv: use list_for_each_entry_safe batman-adv: use to_delayed_work Linus Lüssing (1): batman-adv: Avoid duplicate neigh_node additions Marek Lindner (2): batman-adv: replace ethertype variable with ETH_P_BATMAN for readability batman-adv: initialize ELP orig address on secondary interfaces Simon Wunderlich (5): batman-adv: Start new development cycle batman-adv: fix debuginfo macro style issue batman-adv: move and restructure batadv_v_ogm_forward batman-adv: Merge batadv_v_ogm_orig_update into batadv_v_ogm_route_update batman-adv: add detection for complex bridge loops Sven Eckelmann (21): batman-adv: Fix checkpatch warning about 'unsigned' type batman-adv: Fix kerneldoc for batadv_compare_claim batman-adv: Add kernel-doc for batadv_interface_rx batman-adv: Fix function names on new line starting with '*' batman-adv: Split batadv_iv_ogm_orig_del_if function batman-adv: Remove unused parameter recv_if of batadv_interface_rx batman-adv: Remove hdr_size skb size check in batadv_interface_rx batman-adv: Check hard_iface refcnt before calling function batman-adv: Check hard_iface refcnt when receiving skb batman-adv: Increase hard_iface refcnt for ptype batman-adv: Use kref_get for batadv_tvlv_container_get batman-adv: Use kref_get for batadv_nc_get_nc_node batman-adv: Use kref_get for batadv_gw_select batman-adv: Use kref_get for batadv_gw_node_add batman-adv: Use kref_get for hard_iface subfunctions batman-adv: Use kref_get for _batadv_update_route batman-adv: Use bool as return type for boolean functions 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 ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: Merge branch 'next' (27126f2)
by postmaster＠open-mesh.org 17 May '16

17 May '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 27126f2b0e4a1321882737a52fba34bc61fdc078 Merge: f1f0fbb e2dd65c Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Tue May 17 17:13:23 2016 +0800 Merge branch 'next' >--------------------------------------------------------------- 27126f2b0e4a1321882737a52fba34bc61fdc078 net/batman-adv/translation-table.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

1 0

[batman-adv] master: batman-adv: Fix mcast_flags debugfs output (8151e97)
by postmaster＠open-mesh.org 17 May '16

17 May '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 8151e97ee0a3d897a377f0e8db5731a2d1bff7c6 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Fri May 13 18:35:41 2016 +0200 batman-adv: Fix mcast_flags debugfs output We recently switched to the atomic variants set_bit() / clear_bit() / test_bit() for originator capabilities. Unfortunately, this was missed for the new multicast debugfs entry, resulting in an empty multicast flags table. Fixing this by using test_bit(). Fixes: f1f0fbb2c956 ("batman-adv: Add debugfs table for mcast flags") Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 8151e97ee0a3d897a377f0e8db5731a2d1bff7c6 net/batman-adv/multicast.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index abb12f1..2dd5aec 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -1205,12 +1205,12 @@ int batadv_mcast_flags_seq_print_text(struct seq_file *seq, void *offset) rcu_read_lock(); hlist_for_each_entry_rcu(orig_node, head, hash_entry) { - if (!(orig_node->capa_initialized & - BATADV_ORIG_CAPA_HAS_MCAST)) + if (!test_bit(BATADV_ORIG_CAPA_HAS_MCAST, + &orig_node->capa_initialized)) continue; - if (!(orig_node->capabilities & - BATADV_ORIG_CAPA_HAS_MCAST)) { + if (!test_bit(BATADV_ORIG_CAPA_HAS_MCAST, + &orig_node->capabilities)) { seq_printf(seq, "%pM -\n", orig_node->orig); continue; }

1 0

[batman-adv] master's head updated: batman-adv: Fix mcast_flags debugfs output (8151e97)
by postmaster＠open-mesh.org 17 May '16

17 May '16

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 0479211 batman-adv: replace WARN with rate limited output on non-existing VLAN e2dd65c Merge branch 'maint' into next 27126f2 Merge branch 'next' 8151e97 batman-adv: Fix mcast_flags debugfs output

1 0

[batctl] master: batctl: Add attributes/command for BATADV_CMD_GET_MESH_INFO (071c16c)
by postmaster＠open-mesh.org 17 May '16

17 May '16

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 071c16c512e35f6a4c8bcb6d78c2ef1149ac1912 Author: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Date: Wed May 11 11:35:31 2016 +0200 batctl: Add attributes/command for BATADV_CMD_GET_MESH_INFO BATADV_CMD_GET_MESH_INFO will be used as common function to retrieve information from the kernel. This information can be used to display a header for debugfs tables. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 071c16c512e35f6a4c8bcb6d78c2ef1149ac1912 netlink.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/netlink.c b/netlink.c index 409953a..74d7566 100644 --- a/netlink.c +++ b/netlink.c @@ -22,7 +22,23 @@ #include "netlink.h" #include "main.h" +#include <net/ethernet.h> + #include "batman_adv.h" struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { + [BATADV_ATTR_VERSION] = { .type = NLA_STRING }, + [BATADV_ATTR_ALGO_NAME] = { .type = NLA_STRING }, + [BATADV_ATTR_MESH_IFINDEX] = { .type = NLA_U32 }, + [BATADV_ATTR_MESH_IFNAME] = { .type = NLA_STRING, + .maxlen = IFNAMSIZ }, + [BATADV_ATTR_MESH_ADDRESS] = { .type = NLA_UNSPEC, + .minlen = ETH_ALEN, + .maxlen = ETH_ALEN }, + [BATADV_ATTR_HARD_IFINDEX] = { .type = NLA_U32 }, + [BATADV_ATTR_HARD_IFNAME] = { .type = NLA_STRING, + .maxlen = IFNAMSIZ }, + [BATADV_ATTR_HARD_ADDRESS] = { .type = NLA_UNSPEC, + .minlen = ETH_ALEN, + .maxlen = ETH_ALEN }, };

1 0

[batctl] master: batctl: adding mcast flags debugfs table (2f6b65f)
by postmaster＠open-mesh.org 17 May '16

17 May '16

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 2f6b65f1de74205a6333c664495ecd0bc8bc8af0 Author: Linus Lüssing <linus.luessing(a)web.de> Date: Fri May 13 18:35:42 2016 +0200 batctl: adding mcast flags debugfs table This patch adds an option to retrieve the per originator multicast flags table. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 2f6b65f1de74205a6333c664495ecd0bc8bc8af0 README | 34 ++++++++++++++++++++++++++++++++++ debug.c | 6 ++++++ debug.h | 1 + functions.c | 1 + man/batctl.8 | 3 +++ 5 files changed, 45 insertions(+) diff --git a/README b/README index b5de8a6..6df669a 100644 --- a/README +++ b/README @@ -426,6 +426,40 @@ display or modify the multicast mode setting Usage: batctl multicast_mode|mm [0|1] +batctl mcast_flags +================= + +display local and remote multicast flags + +Usage batctl mcast_flags|mf + +Example: + +Multicast flags (own flags: [U46]) +* Bridged [U] U +* No IGMP/MLD Querier [4/6]: ./. +* Shadowing IGMP/MLD Querier [4/6]: 4/6 +------------------------------------------- + Originator Flags +02:04:64:a4:39:c1 [U..] +02:04:64:a4:39:c2 [U..] +02:04:64:a4:39:c3 [...] + +where: +- Originator: the MAC address of the originating (primary interface) + batman-adv node +- Flags: multicast flags of the according node +- U: wants all unsnoopable multicast traffic, meaning other nodes need to always + forward any multicast traffic destined to ff02::1 or 224.0.0.0/24 to it +- 4: wants all IPv4 multicast traffic, meaning other nodes need to always + forward any IPv4 multicast traffic to it +- 6: wants all IPv6 multicast traffic, meaning other nodes need to always + forward any IPv6 multicast traffic to it + +If a node does not have multicast optimizations available (e.g. old batman-adv +version or optimizations not compiled in), therefore not announcing any +multicast tvlv/flags, a '-' will be displayed instead of '[...]'. + batctl aggregation ================== diff --git a/debug.c b/debug.c index 3db3ed9..5b280cb 100644 --- a/debug.c +++ b/debug.c @@ -84,6 +84,12 @@ const struct debug_table_data batctl_debug_tables[BATCTL_TABLE_NUM] = { .debugfs_name = "nc_nodes", .header_lines = 0, }, + { + .opt_long = "mcast_flags", + .opt_short = "mf", + .debugfs_name = "mcast_flags", + .header_lines = 6, + }, }; static void debug_table_usage(int debug_table) diff --git a/debug.h b/debug.h index df65f50..46e8c3c 100644 --- a/debug.h +++ b/debug.h @@ -40,6 +40,7 @@ enum batctl_debug_tables { BATCTL_TABLE_BLA_BACKBONES, BATCTL_TABLE_DAT, BATCTL_TABLE_NETWORK_CODING_NODES, + BATCTL_TABLE_MCAST_FLAGS, BATCTL_TABLE_NUM, }; diff --git a/functions.c b/functions.c index be8f8b0..97a6dbd 100644 --- a/functions.c +++ b/functions.c @@ -68,6 +68,7 @@ const char *fs_compile_out_param[] = { batctl_debug_tables[BATCTL_TABLE_BLA_BACKBONES].debugfs_name, batctl_debug_tables[BATCTL_TABLE_DAT].debugfs_name, batctl_debug_tables[BATCTL_TABLE_NETWORK_CODING_NODES].debugfs_name, + batctl_debug_tables[BATCTL_TABLE_MCAST_FLAGS].debugfs_name, NULL, }; diff --git a/man/batctl.8 b/man/batctl.8 index f8955d0..05f68d3 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -236,6 +236,9 @@ List of debug tables: .RS 10 \- nc_nodes|nn (compile time option) .RE +.RS 10 +\- mcast_flags|mf (compile time option) +.RE .RE .br .IP "\fBtranslate\fP|\fBt\fP \fBMAC_address\fP|\fBbat\-host_name\fP|\fBhost_name\fP|\fBIP_address\fP"

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (e2dd65c)
by postmaster＠open-mesh.org 17 May '16

17 May '16

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 0479211 batman-adv: replace WARN with rate limited output on non-existing VLAN e2dd65c Merge branch 'maint' into next

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits May 2016