B.A.T.M.A.N January 2016

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

13 participants
50 discussions

[B.A.T.M.A.N.] Fwd: [OpenWrt] #21756: batman-adv & batctl errors
by Ufo 31 Jan '16

31 Jan '16

i am missing batman-adv inside openwrt since some weeks :-o please someone may have a look on it.. i just created a ticket on openwrt for that greeting, ufo -------- Weitergeleitete Nachricht -------- Betreff: [OpenWrt] #21756: batman-adv & batctl errors Datum: Sat, 30 Jan 2016 20:24:50 -0000 Von: OpenWrt <openwrt-devel(a)lists.openwrt.org> Antwort an: openwrt-devel(a)lists.openwrt.org Kopie (CC): openwrt-tickets(a)lists.openwrt.org #21756: batman-adv & batctl errors -------------------------+--------------------------------------- Reporter: ufo@… | Owner: developers Type: defect | Status: new Priority: normal | Milestone: Designated Driver (Trunk) Component: base system | Version: Trunk Keywords: | -------------------------+--------------------------------------- batman-adv and batctl packages cant be built with openwrt at the moment. so its not built there: http://downloads.openwrt.org/snapshots/trunk/ar71xx/generic/packages/base/ -- Ticket URL: <https://dev.openwrt.org/ticket/21756> OpenWrt <http://openwrt.org> Opensource Wireless Router Technology

2 1

[B.A.T.M.A.N.] [PATCH] openwrt-feed-batman-adv: Allow to select routing algorithm
by Sven Eckelmann 30 Jan '16

30 Jan '16

The network config section for proto batadv now allows to select the routing algorithm via the option routing_algo. This allows to chose between BATMAN_IV and BATMAN_V when BATMAN_V is released. This option is only useful when a new batman-adv device is created and not when only a device is added to an already existing batman-adv device. Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> --- batman-adv-devel/files/lib/netifd/proto/batadv.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/batman-adv-devel/files/lib/netifd/proto/batadv.sh b/batman-adv-devel/files/lib/netifd/proto/batadv.sh index 632a209..1e0c9d0 100644 --- a/batman-adv-devel/files/lib/netifd/proto/batadv.sh +++ b/batman-adv-devel/files/lib/netifd/proto/batadv.sh @@ -6,14 +6,18 @@ init_proto "$@" proto_batadv_init_config() { proto_config_add_string "mesh" + proto_config_add_string "routing_algo" } proto_batadv_setup() { local config="$1" local iface="$2" - local mesh - json_get_vars mesh + local mesh routing_algo + json_get_vars mesh routing_algo + + [ -n "$routing_algo" ] || routing_algo="BATMAN_IV" + echo "$routing_algo" > "/sys/module/batman_adv/parameters/routing_algo" echo "$mesh" > "/sys/class/net/$iface/batman_adv/mesh_iface" proto_init_update "$iface" 1 -- 2.7.0.rc3

2 1

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: move and restructure batadv_v_ogm_forward
by Simon Wunderlich 30 Jan '16

30 Jan '16

From: Simon Wunderlich <simon(a)open-mesh.com> To match our code better to the protocol description of B.A.T.M.A.N. V, move batadv_v_ogm_forward() out into batadv_v_ogm_process_per_outif() and move all checks directly deciding whether the OGM should be forwarded into batadv_v_ogm_forward(). Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> --- net/batman-adv/bat_v_ogm.c | 102 +++++++++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 45 deletions(-) diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index d9bcbe6..d6e89a7 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -347,10 +347,11 @@ static u32 batadv_v_forward_penalty(struct batadv_priv *bat_priv, } /** - * batadv_v_ogm_forward - forward an OGM to the given outgoing interface + * batadv_v_ogm_forward - check conditions and forward an OGM to the given + * outgoing interface * @bat_priv: the bat priv with all the soft interface information * @ogm_received: previously received OGM to be forwarded - * @throughput: throughput to announce, may vary per outgoing interface + * @neigh_node: the neigh_node through with the OGM has been received * @if_incoming: the interface on which this OGM was received on * @if_outgoing: the interface to which the OGM has to be forwarded to * @@ -359,28 +360,55 @@ static u32 batadv_v_forward_penalty(struct batadv_priv *bat_priv, */ static void batadv_v_ogm_forward(struct batadv_priv *bat_priv, const struct batadv_ogm2_packet *ogm_received, - u32 throughput, + struct batadv_neigh_node *neigh_node, struct batadv_hard_iface *if_incoming, struct batadv_hard_iface *if_outgoing) { + struct batadv_neigh_ifinfo *neigh_ifinfo = NULL; + struct batadv_orig_ifinfo *orig_ifinfo = NULL; + struct batadv_neigh_node *router = NULL; struct batadv_ogm2_packet *ogm_forward; unsigned char *skb_buff; struct sk_buff *skb; size_t packet_len; u16 tvlv_len; + /* only forward for specific interfaces, not for the default one. */ + if (if_outgoing != BATADV_IF_DEFAULT) + goto out; + + orig_ifinfo = batadv_orig_ifinfo_new(orig_node, if_outgoing); + if (!orig_ifinfo) + goto out; + /* acquire possibly updated router */ + router = batadv_orig_router_get(orig_node, if_outgoing); + + /* strict rule: forward packets coming from the best next hop only */ + if (neigh_node != router) + goto out; + + /* don't forward the same seqno twice on one interface */ + if (orig_ifinfo->last_seqno_forwarded == ntohl(ogm2->seqno)) + goto out; + + orig_ifinfo->last_seqno_forwarded = ntohl(ogm2->seqno); + if (ogm_received->ttl <= 1) { batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "ttl exceeded\n"); - return; + goto out; } + neigh_ifinfo = batadv_neigh_ifinfo_get(neigh_node, if_outgoing); + if (!neigh_ifinfo) + goto out; + tvlv_len = ntohs(ogm_received->tvlv_len); packet_len = BATADV_OGM2_HLEN + tvlv_len; skb = netdev_alloc_skb_ip_align(if_outgoing->net_dev, ETH_HLEN + packet_len); if (!skb) - return; + goto out; skb_reserve(skb, ETH_HLEN); skb_buff = skb_put(skb, packet_len); @@ -388,7 +416,7 @@ static void batadv_v_ogm_forward(struct batadv_priv *bat_priv, /* apply forward penalty */ ogm_forward = (struct batadv_ogm2_packet *)skb_buff; - ogm_forward->throughput = htonl(throughput); + ogm_forward->throughput = htonl(neigh_ifinfo->bat_v.throughput); ogm_forward->ttl--; batadv_dbg(BATADV_DBG_BATMAN, bat_priv, @@ -397,6 +425,14 @@ static void batadv_v_ogm_forward(struct batadv_priv *bat_priv, if_incoming->net_dev->name); batadv_v_ogm_send_to_if(skb, if_outgoing); + +out: + if (orig_ifinfo) + batadv_orig_ifinfo_put(orig_ifinfo); + if (router) + batadv_neigh_node_put(router); + if (neigh_ifinfo) + batadv_neigh_ifinfo_put(neigh_ifinfo); } /** @@ -493,8 +529,10 @@ out: * @neigh_node: the neigh_node through with the OGM has been received * @if_incoming: the interface where this packet was received * @if_outgoing: the interface for which the packet should be considered + * + * Return: true if the packet should be forwarded, false otherwise */ -static void batadv_v_ogm_route_update(struct batadv_priv *bat_priv, +static bool batadv_v_ogm_route_update(struct batadv_priv *bat_priv, const struct ethhdr *ethhdr, const struct batadv_ogm2_packet *ogm2, struct batadv_orig_node *orig_node, @@ -503,14 +541,9 @@ static void batadv_v_ogm_route_update(struct batadv_priv *bat_priv, struct batadv_hard_iface *if_outgoing) { struct batadv_neigh_node *router = NULL; - struct batadv_neigh_ifinfo *neigh_ifinfo = NULL; struct batadv_orig_node *orig_neigh_node = NULL; - struct batadv_orig_ifinfo *orig_ifinfo = NULL; struct batadv_neigh_node *orig_neigh_router = NULL; - - neigh_ifinfo = batadv_neigh_ifinfo_get(neigh_node, if_outgoing); - if (!neigh_ifinfo) - goto out; + bool forward = false; orig_neigh_node = batadv_v_ogm_orig_get(bat_priv, ethhdr->h_source); if (!orig_neigh_node) @@ -529,47 +562,20 @@ static void batadv_v_ogm_route_update(struct batadv_priv *bat_priv, goto out; } - if (router) - batadv_neigh_node_put(router); - /* 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, if_outgoing); - orig_ifinfo = batadv_orig_ifinfo_new(orig_node, if_outgoing); - if (!orig_ifinfo) - goto out; - - /* don't forward the same seqno twice on one interface */ - if (orig_ifinfo->last_seqno_forwarded == ntohl(ogm2->seqno)) - goto out; - - /* acquire possibly updated router */ - router = batadv_orig_router_get(orig_node, if_outgoing); - - /* strict rule: forward packets coming from the best next hop only */ - if (neigh_node != router) - goto out; - - /* only forward for specific interface, not for the default one. */ - if (if_outgoing != BATADV_IF_DEFAULT) { - orig_ifinfo->last_seqno_forwarded = ntohl(ogm2->seqno); - batadv_v_ogm_forward(bat_priv, ogm2, - neigh_ifinfo->bat_v.throughput, - if_incoming, if_outgoing); - } - + forward = true; out: - if (orig_ifinfo) - batadv_orig_ifinfo_put(orig_ifinfo); if (router) batadv_neigh_node_put(router); if (orig_neigh_router) batadv_neigh_node_put(orig_neigh_router); if (orig_neigh_node) batadv_orig_node_put(orig_neigh_node); - if (neigh_ifinfo) - batadv_neigh_ifinfo_put(neigh_ifinfo); + + return forward; } /** @@ -610,8 +616,14 @@ batadv_v_ogm_process_per_outif(struct batadv_priv *bat_priv, ntohs(ogm2->tvlv_len)); /* if the metric update went through, update routes if needed */ - batadv_v_ogm_route_update(bat_priv, ethhdr, ogm2, orig_node, - neigh_node, if_incoming, if_outgoing); + forward = batadv_v_ogm_route_update(bat_priv, ethhdr, ogm2, orig_node, + neigh_node, if_incoming, + if_outgoing); + + /* if the routes have been processed correctly, check and forward */ + if (forward) + bat_v_ogm_forward(bat_priv, ogm2, neigh_node, if_incoming, + if_outgoing); } /** -- 2.7.0.rc3

3 8

[B.A.T.M.A.N.] [PATCH] batman-adv: Ignore temporary files in git-status/git-add/...
by Sven Eckelmann 30 Jan '16

30 Jan '16

Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> --- .gitattributes | 2 ++ .gitignore | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..eeef3e0 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +/.gitignore export-ignore +/.gitattributes export-ignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..59c6a30 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +/compat-autoconf.h +/compat-autoconf.h.tmp +/net/batman-adv/.* +/net/batman-adv/batman-adv.ko +/net/batman-adv/batman-adv.mod.c +/net/batman-adv/modules.order +/net/batman-adv/Module.symvers +/net/batman-adv/*.o -- 2.7.0.rc3

2 1

[B.A.T.M.A.N.] [PATCH] batctl: Ignore temporary files in git-status/git-add/...
by Sven Eckelmann 30 Jan '16

30 Jan '16

Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> --- .gitattributes | 2 ++ .gitignore | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..eeef3e0 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +/.gitignore export-ignore +/.gitattributes export-ignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8f1d328 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/*.d +/*.o +/batctl -- 2.7.0.rc3

2 1

[B.A.T.M.A.N.] [PATCH v2] batman-adv: Add compat code for BUILD_BUG_ON_NOT_POWER_OF_2
by Sven Eckelmann 30 Jan '16

30 Jan '16

Fixes: 2c2fe0ba9ea5 ("batman-adv: ELP - creating neighbor structures") Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> --- v2: - add missing include in average.h which is required to always defined BUILD_BUG_ON_NOT_POWER_OF_2 correctly compat-include/linux/average.h | 2 ++ compat-include/linux/bug.h | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/compat-include/linux/average.h b/compat-include/linux/average.h index e5a2bf5..631df9b 100644 --- a/compat-include/linux/average.h +++ b/compat-include/linux/average.h @@ -26,6 +26,8 @@ #include_next <linux/average.h> #endif +#include <linux/bug.h> + #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) /* Exponentially weighted moving average (EWMA) */ diff --git a/compat-include/linux/bug.h b/compat-include/linux/bug.h index 124fd28..0c46158 100644 --- a/compat-include/linux/bug.h +++ b/compat-include/linux/bug.h @@ -24,6 +24,19 @@ #include <linux/version.h> #include_next <linux/bug.h> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) + +#undef BUILD_BUG_ON_NOT_POWER_OF_2 +#ifdef __CHECKER__ +#define BUILD_BUG_ON_NOT_POWER_OF_2(n) (0) +#else +/* Force a compilation error if a constant expression is not a power of 2 */ +#define BUILD_BUG_ON_NOT_POWER_OF_2(n) \ + BUILD_BUG_ON((n) == 0 || (((n) & ((n) - 1)) != 0)) +#endif + +#endif /* < KERNEL_VERSION(2, 6, 33) */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) #undef BUILD_BUG_ON -- 2.7.0.rc3

2 1

[B.A.T.M.A.N.] [PATCH] batctl: Add support for network namespaces
by Andrew Lunn 29 Jan '16

29 Jan '16

When running within a network namespace, access to files within debugfs have to take into account the network name space. Each namespace has its own directory under /sys/kernel/debug/batman_adv/netns. Signed-off-by: Andrew Lunn <andrew(a)lunn.ch> --- debug.h | 2 +- debugfs.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/debug.h b/debug.h index df65f50..ac7a97b 100644 --- a/debug.h +++ b/debug.h @@ -25,7 +25,7 @@ #include <stddef.h> #include "main.h" -#define DEBUG_BATIF_PATH_FMT "%s/batman_adv/%s" +#define DEBUG_BATIF_PATH_FMT "%s/batman_adv/%s%s" #define DEBUG_TRANSTABLE_GLOBAL "transtable_global" #define DEBUG_LOG "log" #define DEBUG_ROUTING_ALGOS "routing_algos" diff --git a/debugfs.c b/debugfs.c index 3c58195..a66dbdd 100644 --- a/debugfs.c +++ b/debugfs.c @@ -20,11 +20,15 @@ #include "debugfs.h" #include <errno.h> +#include <fcntl.h> +#include <limits.h> #include <stdio.h> #include <string.h> #include <sys/mount.h> #include <sys/stat.h> #include <sys/statfs.h> +#include <sys/types.h> +#include <unistd.h> #ifndef DEBUGFS_MAGIC #define DEBUGFS_MAGIC 0x64626720 @@ -39,15 +43,58 @@ static const char *debugfs_known_mountpoints[] = { NULL, }; +/* Return the current net namespace number. 0 is never a valid + * namespace, so use it to return that there is no name space + * support. + */ + +static unsigned int debugfs_get_netns_inum(void) +{ + char net_path[] = "/proc/self/ns/net"; + struct stat netst; + int netns; + + netns = open(net_path, O_RDONLY); + if (netns < 0) { + if (errno == ENOENT) + /* Probably means no netns support in the kernel */ + return 0; + + fprintf(stderr, + "Error - can't open /proc/self/ns/net for read: %s\n", + strerror(errno)); + return 0; + } + + if (fstat(netns, &netst) < 0) { + fprintf(stderr, "Stat of netns failed: %s\n", + strerror(errno)); + return 0; + } + close (netns); + + return netst.st_ino; +} + /* construct a full path to a debugfs element */ int debugfs_make_path(const char *fmt, char *mesh_iface, char *buffer, int size) { + unsigned int ns = debugfs_get_netns_inum(); + char ns_dir[PATH_MAX]; + if (strlen(debugfs_mountpoint) == 0) { buffer[0] = '\0'; return -1; } - return snprintf(buffer, size, fmt, debugfs_mountpoint, mesh_iface); + if (ns) { + snprintf(ns_dir, PATH_MAX, "netns/%u/", ns); + return snprintf(buffer, size, fmt, debugfs_mountpoint, ns_dir, + mesh_iface); + } else { + return snprintf(buffer, size, fmt, debugfs_mountpoint, "", + mesh_iface); + } } static int debugfs_found; -- 2.7.0.rc3

2 2

[B.A.T.M.A.N.] B.A.T.M.A.N. V leaves the nest v2
by Marek Lindner 21 Jan '16

21 Jan '16

Hi, after several rounds of code & documentation reviews a number of improvements found their way into the patchset. The changelog is as follows: v2: - rebroadcast packet immediately after best neighbor timeout - add a flag to avoid forwarding the same OGMs multiple times - move TVLV processing out of update_route() and into batadv_v_ogm_process_per_outif() - code comments improvements (typ0s, clarifications, etc) - mark OGM packet as new when protection window is started - remove redundant throughput checks - simplify/fix best neighbor check Happy routing, The B.A.T.M.A.N. team

5 33

[B.A.T.M.A.N.] [PATCH] alfred: Ignore temporary files in git-status/git-add/...
by Sven Eckelmann 20 Jan '16

20 Jan '16

Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> --- .gitattributes | 2 ++ .gitignore | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..eeef3e0 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +/.gitignore export-ignore +/.gitattributes export-ignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b341a0e --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +/*.d +/*.o +/alfred +/gpsd/*.d +/gpsd/*.o +/gpsd/alfred-gpsd +/vis/*.d +/vis/*.o +/vis/batadv-vis -- 2.7.0.rc3

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Add compat code for BUILD_BUG_ON_NOT_POWER_OF_2
by Sven Eckelmann 20 Jan '16

20 Jan '16

Fixes: 2c2fe0ba9ea5 ("batman-adv: ELP - creating neighbor structures") Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> --- compat-include/linux/bug.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/compat-include/linux/bug.h b/compat-include/linux/bug.h index 124fd28..0c46158 100644 --- a/compat-include/linux/bug.h +++ b/compat-include/linux/bug.h @@ -24,6 +24,19 @@ #include <linux/version.h> #include_next <linux/bug.h> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) + +#undef BUILD_BUG_ON_NOT_POWER_OF_2 +#ifdef __CHECKER__ +#define BUILD_BUG_ON_NOT_POWER_OF_2(n) (0) +#else +/* Force a compilation error if a constant expression is not a power of 2 */ +#define BUILD_BUG_ON_NOT_POWER_OF_2(n) \ + BUILD_BUG_ON((n) == 0 || (((n) & ((n) - 1)) != 0)) +#endif + +#endif /* < KERNEL_VERSION(2, 6, 33) */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) #undef BUILD_BUG_ON -- 2.7.0.rc3

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N January 2016