B.A.T.M.A.N

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

15 participants
4308 discussions

[B.A.T.M.A.N.] [PATCH] batman-adv: set git diff driver for C source code files
by Sven Eckelmann 21 Feb '17

21 Feb '17

From: Jean Delvare <jdelvare(a)suse.de> Git can be told to apply language-specific rules when generating diffs. Enable this for C source code files (*.c and *.h) so that function names are printed right. Specifically, doing so prevents "git diff" from mistakenly considering unindented goto labels as function names. Signed-off-by: Jean Delvare <jdelvare(a)suse.de> [sven(a)narfation.org: Ported patch from linux.git] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitattributes b/.gitattributes index eeef3e0..1d2a7e9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,4 @@ /.gitignore export-ignore /.gitattributes export-ignore +*.c diff=cpp +*.h diff=cpp -- 2.11.0

1 1

[B.A.T.M.A.N.] Interface limit 127 in bat0?!
by jens 21 Feb '17

21 Feb '17

i observe a limit of 127 interfaces which can be hooked into bat0 where do i find this limit, or does somebody can tell me more about this? Or, if it is a good idea to circumwent this at all? Or, if its even possible in actual protocoll structure. background: Freifunk with tunneldigger and l2tp tunnel interfaces put a whole lot of l2tp-eth interfaces in a bridge and hook the bridge into batman, which make trouble and also doesnt feel like good practice. (i think to circumvent this limit) Freifunk with wireguard and gretap also have a lot of gretap tunnel interfaces - but without bridging is limited to 127 interfaces (we also experiment with vxlan which is limited to v4 in bridge forwarding and by this not really an option - idea was to hook vxlan0 in bat0 , which may be similar to bridging l2tp-eth) you can find the test here (in german) https://forum.freifunk.net/t/500-gretap-tunnel-interfaces-in-batman-einhaen… or the wireguard in freifunk structures (batman network) here https://forum.freifunk.net/t/wireguard-0-0-20161230-mit-linux-3-18-kernel-u… the error if you exceed the interface limit in dmesg : |Error - can't write to file '/sys/class/net/gre127/batman_adv/mesh_iface': Cannot allocate memory| -- make the world nicer, please use PGP encryption

3 3

Re: [B.A.T.M.A.N.] Interface limit 127 in bat0?!
by Andrew Lunn 21 Feb '17

21 Feb '17

Hi Jens The script i just used is: # add one if per 3 second and give output, also monitor dmesg dmesg -w & for i in `seq 1 255`; do # one interface ip link add gre$i type gretap local 192.168.99.1 remote 192.168.3.$i ttl 255 dev lan1 ip link set up dev gre$i batctl if add gre$i # another inf ip link add grex$i type gretap local 192.168.99.1 remote 192.168.4.$i ttl 255 dev lan1 ip link set up dev grex$i batctl if add grex$i echo -n $(uptime|cut -d"," -f4-) $(ifconfig lan1|grep TX\ p) $i sleep 3 done So this adds two interfaces per 3 seconds to bat0. root@wrt1900ac:~# batctl if grex122: active gre123: active grex123: active gre124: active grex124: active gre125: active grex125: active gre126: active ... grex119: active gre120: active grex120: active gre121: active grex121: active gre122: active root@wrt1900ac:~# batctl if | wc 344 688 5116 So i have 344 interfaces in the mesh. No memory problems reported. Andrew

1 0

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Remove preprocessor checks in multicast.c
by Sven Eckelmann 20 Feb '17

20 Feb '17

It is not necessary to disable these code sections in case other kernel features are disabled. Instead the IS_ENABLED tests can be added directly in the code and the compiler can remove the unnecessary code parts during its optimization run. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/multicast.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 952ba81..0e9112c 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -182,10 +182,8 @@ static void batadv_mcast_mla_br_addr_cpy(char *dst, const struct br_ip *src) { if (src->proto == htons(ETH_P_IP)) ip_eth_mc_map(src->u.ip4, dst); -#if IS_ENABLED(CONFIG_IPV6) - else if (src->proto == htons(ETH_P_IPV6)) + else if (IS_ENABLED(CONFIG_IPV6) && src->proto == htons(ETH_P_IPV6)) ipv6_eth_mc_map(&src->u.ip6, dst); -#endif else eth_zero_addr(dst); } @@ -494,9 +492,8 @@ static bool batadv_mcast_mla_tvlv_update(struct batadv_priv *bat_priv) if (!bridged) goto update; -#if !IS_ENABLED(CONFIG_BRIDGE_IGMP_SNOOPING) - pr_warn_once("No bridge IGMP snooping compiled - multicast optimizations disabled\n"); -#endif + if (!IS_ENABLED(CONFIG_BRIDGE_IGMP_SNOOPING)) + pr_warn_once("No bridge IGMP snooping compiled - multicast optimizations disabled\n"); querier4.exists = br_multicast_has_querier_anywhere(dev, ETH_P_IP); querier4.shadowing = br_multicast_has_querier_adjacent(dev, ETH_P_IP); @@ -671,7 +668,6 @@ static int batadv_mcast_forw_mode_check_ipv4(struct batadv_priv *bat_priv, return 0; } -#if IS_ENABLED(CONFIG_IPV6) /** * batadv_mcast_is_report_ipv6 - check for MLD reports * @skb: the ethernet frame destined for the mesh @@ -736,7 +732,6 @@ static int batadv_mcast_forw_mode_check_ipv6(struct batadv_priv *bat_priv, return 0; } -#endif /** * batadv_mcast_forw_mode_check - check for optimized forwarding potential @@ -765,11 +760,12 @@ static int batadv_mcast_forw_mode_check(struct batadv_priv *bat_priv, case ETH_P_IP: return batadv_mcast_forw_mode_check_ipv4(bat_priv, skb, is_unsnoopable); -#if IS_ENABLED(CONFIG_IPV6) case ETH_P_IPV6: + if (!IS_ENABLED(CONFIG_IPV6)) + return -EINVAL; + return batadv_mcast_forw_mode_check_ipv6(bat_priv, skb, is_unsnoopable); -#endif default: return -EINVAL; } -- 2.11.0

1 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Fix unbalanced braces around else statement
by Sven Eckelmann 20 Feb '17

20 Feb '17

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/translation-table.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 6077a87d46f0..a75f0a640bcd 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -2253,12 +2253,13 @@ batadv_tt_global_del_roaming(struct batadv_priv *bat_priv, /* its the last one, mark for roaming. */ tt_global_entry->common.flags |= BATADV_TT_CLIENT_ROAM; tt_global_entry->roam_at = jiffies; - } else + } else { /* there is another entry, we can simply delete this * one and can still use the other one. */ batadv_tt_global_del_orig_node(bat_priv, tt_global_entry, orig_node, message); + } } /** @@ -2314,10 +2315,11 @@ static void batadv_tt_global_del(struct batadv_priv *bat_priv, /* local entry exists, case 2: client roamed to us. */ batadv_tt_global_del_orig_list(tt_global_entry); batadv_tt_global_free(bat_priv, tt_global_entry, message); - } else + } else { /* no local entry exists, case 1: check for roaming */ batadv_tt_global_del_roaming(bat_priv, tt_global_entry, orig_node, message); + } out: if (tt_global_entry)

1 0

[B.A.T.M.A.N.] [PATCH] RFC: batman-adv: BATMAN V: Make route switching more opportunistic
by Linus Lüssing 17 Feb '17

17 Feb '17

Increase route switching likelikood with every seqno we missed from our currently selected router. This is safe to do without causing any loops at any time because the sequence number is strictly larger than the one we last got from our selected router. --- Another idea to improve route convergence time. Simpler than the "Rest-In-Peace" protocol idea, but they should be combinable. Idea is a little inspired from once again potentially having missed a bus: Should I stick to the plan of taking the bus and wait a few more minutes (maybe it is just late?) or should I walk instead? (Here in Lübeck buses usually arrive about every 30min. - or not all between 00:30 and 04:30 - so it often makes sense to just use the slower alternative of walking if you have missed it :-) ) Also inspired by the asymmetric link penalty. Potential cons: * might potentially increase route flappiness if the route has a certain amount of packet loss / length -> Maybe additional to broadcasting OGMs to neighbors, distribute it to a few, good/promising ones via unicast, too? PS: Please disregard the patch style, it's just an RFC for the concept/idea for now :-) --- net/batman-adv/bat_v_ogm.c | 51 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 03a35c9..08a79a9 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -492,6 +492,53 @@ out: } /** + * batadv_v_ogm_seq_tx - penalize router throughput + * @router_throughput: the router throughput to penalize + * @seq_diff: seqno diff between OGM and current router + */ +static u32 batadv_v_ogm_seq_tx(u32 router_throughput, u32 seq_diff) +{ + const u32 m = BATADV_OGM_MAX_ORIGDIFF; + const u32 r = router_throughput; + const u32 d = seq_diff; + u64 ret; + + if (s <= 1) + return r; + else if (s >= d) + return 0; + + /* f(x) = [ - 1/(m-1)^2 * (d-1)^2 + 1 ] * r */ + ret = r * (m-1) * (m-1) - r * (d-1) * (d-1) + return (u32)(ret / ( (m-1) * (m-1) )); + + /** + * For BATADV_OGM_MAX_ORIGDIFF == 5 equivalent to: + */ + switch(seq_diff) { + case 0: + /* fallthrough */ + case 1: + /* no penalty for seq-diff == 1 either, + * maybe the best route has just a little more + * latency + */ + return router_throughput; + case 2: + /* 15/16 */ + return 0.9375 * router_throughput; + case 3: + /* 3/4 */ + return 0.75 * router_throughput; + case 4: + /* 7/16 */ + return 0.4375 * router_throughput; + default: + return 0; + } +} + +/** * batadv_v_ogm_route_update - update routes based on OGM * @bat_priv: the bat priv with all the soft interface information * @ethhdr: the Ethernet header of the OGM2 @@ -570,8 +617,8 @@ static bool batadv_v_ogm_route_update(struct batadv_priv *bat_priv, router_throughput = router_ifinfo->bat_v.throughput; neigh_throughput = neigh_ifinfo->bat_v.throughput; - if ((neigh_seq_diff < BATADV_OGM_MAX_ORIGDIFF) && - (router_throughput >= neigh_throughput)) + if (batadv_v_ogm_seq_tx(router_throughput, neigh_seq_diff) + >= neigh_throughput) goto out; } -- 2.1.4

1 0

[B.A.T.M.A.N.] Distributing Data using BATMAN-Multicast
by Shantanoo Desai 17 Feb '17

17 Feb '17

Hello all, I have developed a Multicast based Data Distribution protocol and would like to compare it with Batman's Multicast feature. I know how to enable the multicast on the the mesh interface but is there any tool or utility I can use to send data over the Mesh network ? scp of sftp won't work since there is no multicast or broadcasting present in them. I would like to compare how quick can data be disseminated in a Batman enabled Mesh network versus the protocol that I have developed over an adhoc network consisting of multiple Raspberry Pis. Any hints would be suggested. Thanks, Shan -- Shantanoo Desai MSc. Communication & Information Tech. Bremen, Germany

4 3

[B.A.T.M.A.N.] Unable to Change from BATMAN_IV to BATMAN_V
by leftbydefault＠riseup.net 17 Feb '17

17 Feb '17

I came across a thread previously on this same issue with respect to openwrt. I tried to change the routing algo following tweaking section of batman wiki as soon as loading the batman_adv module. I am able to see BATMAN_V under availabile algorithms but available for next instance of batx. I understand it has to be done before this bat0 interface is created, but I am doing this before bringing up bat0 using ifconfig batctl 2016.4 batman-adv 2016.4 -- Sent from my phone

2 1

Re: [B.A.T.M.A.N.] [PATCH 3.2 049/126] batman-adv: fix splat on disabling an interface
by Linus Lüssing 16 Feb '17

16 Feb '17

On Wed, Feb 15, 2017 at 10:41:34PM +0000, Ben Hutchings wrote: > 3.2.85-rc1 review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Linus Lüssing <linus.luessing(a)c0d3.blue> > > commit 9799c50372b23ed774791bdb87d700f1286ee8a9 upstream. Hi Ben, This commit was reverted in 27915aa61060fd8954a68a86657784705955088a ('batman-adv: Revert "fix splat on disabling an interface"'). Greg dropped this patch from his stable queue back then, too [0]. Regards, Linus [0]: https://marc.info/?l=linux-kernel&m=147938417410032

2 1

[B.A.T.M.A.N.] [PATCH v7 1/5] batman-adv: prevent multiple ARP replies sent by gateways if dat enabled
by Sven Eckelmann 16 Feb '17

16 Feb '17

From: Andreas Pape <APape(a)phoenixcontact.com> If dat is enabled it must be made sure that only the backbone gw which has claimed the remote destination for the ARP request answers the ARP request directly if the MAC address is known due to the local dat table. This prevents multiple ARP replies in a common backbone if more than one gateway already knows the remote mac searched for in the ARP request. Signed-off-by: Andreas Pape <apape(a)phoenixcontact.com> Acked-by: Simon Wunderlich <sw(a)simonwunderlich.de> [sven(a)narfation.org: fix conflicts with current version] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/bridge_loop_avoidance.c | 49 ++++++++++++++++++++++++++++++++++ net/batman-adv/bridge_loop_avoidance.h | 11 ++++++++ net/batman-adv/distributed-arp-table.c | 15 +++++++++++ 3 files changed, 75 insertions(+) diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index e7f690b..41ab4a6 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -2450,3 +2450,52 @@ out: return ret; } + +#ifdef CONFIG_BATMAN_ADV_DAT +/** + * batadv_bla_check_claim - check if address is claimed + * + * @bat_priv: the bat priv with all the soft interface information + * @addr: mac address of which the claim status is checked + * @vid: the VLAN ID + * + * addr is checked if this address is claimed by the local device itself. + * + * Return: true if bla is disabled or the mac is claimed by the device, + * false if the device addr is already claimed by another gateway + */ +bool batadv_bla_check_claim(struct batadv_priv *bat_priv, + u8 *addr, unsigned short vid) +{ + struct batadv_bla_claim search_claim; + struct batadv_bla_claim *claim = NULL; + struct batadv_hard_iface *primary_if = NULL; + bool ret = true; + + if (!atomic_read(&bat_priv->bridge_loop_avoidance)) + return ret; + + primary_if = batadv_primary_if_get_selected(bat_priv); + if (!primary_if) + return ret; + + /* First look if the mac address is claimed */ + ether_addr_copy(search_claim.addr, addr); + search_claim.vid = vid; + + claim = batadv_claim_hash_find(bat_priv, &search_claim); + + /* If there is a claim and we are not owner of the claim, + * return false. + */ + if (claim) { + if (!batadv_compare_eth(claim->backbone_gw->orig, + primary_if->net_dev->dev_addr)) + ret = false; + batadv_claim_put(claim); + } + + batadv_hardif_put(primary_if); + return ret; +} +#endif diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h index 1ae93e4..86b8740 100644 --- a/net/batman-adv/bridge_loop_avoidance.h +++ b/net/batman-adv/bridge_loop_avoidance.h @@ -51,6 +51,10 @@ void batadv_bla_status_update(struct net_device *net_dev); int batadv_bla_init(struct batadv_priv *bat_priv); void batadv_bla_free(struct batadv_priv *bat_priv); int batadv_bla_claim_dump(struct sk_buff *msg, struct netlink_callback *cb); +#ifdef CONFIG_BATMAN_ADV_DAT +bool batadv_bla_check_claim(struct batadv_priv *bat_priv, u8 *addr, + unsigned short vid); +#endif #define BATADV_BLA_CRC_INIT 0 #else /* ifdef CONFIG_BATMAN_ADV_BLA */ @@ -127,6 +131,13 @@ static inline int batadv_bla_backbone_dump(struct sk_buff *msg, return -EOPNOTSUPP; } +static inline +bool batadv_bla_check_claim(struct batadv_priv *bat_priv, u8 *addr, + unsigned short vid) +{ + return true; +} + #endif /* ifdef CONFIG_BATMAN_ADV_BLA */ #endif /* ifndef _NET_BATMAN_ADV_BLA_H_ */ diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index e257efd..cf53404 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -43,6 +43,7 @@ #include <linux/workqueue.h> #include <net/arp.h> +#include "bridge_loop_avoidance.h" #include "hard-interface.h" #include "hash.h" #include "log.h" @@ -1007,6 +1008,20 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, goto out; } + /* If BLA is enabled, only send ARP replies if we have claimed + * the destination for the ARP request or if no one else of + * the backbone gws belonging to our backbone has claimed the + * destination. + */ + if (!batadv_bla_check_claim(bat_priv, + dat_entry->mac_addr, vid)) { + batadv_dbg(BATADV_DBG_DAT, bat_priv, + "Device %pM claimed by another backbone gw. Don't send ARP reply!", + dat_entry->mac_addr); + ret = true; + goto out; + } + skb_new = arp_create(ARPOP_REPLY, ETH_P_ARP, ip_src, bat_priv->soft_iface, ip_dst, hw_src, dat_entry->mac_addr, hw_src); -- 2.9.3

3 10

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