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.] [PATCHv6 0/3] Multicast optimizations for bridges
by Linus Lüssing 07 Aug '14

07 Aug '14

This patchset enables the usage of the batman-adv multicast optimizations for scenarios involving bridges on top of e.g. bat0, too. Along come two more patches adding according debugging facilities to make it possible for the user to check why the multicast optimizations might not work ideally to give hints about what they might change about their topology. Cheers, Linus Changes in v6: * New PATCH 2/3 inserted, moving logging to separate patch * More verbose logging added to PATCH 2/3: Bridge and querier state changes are logged too * upper case to lower case for kernel doc of batadv_mcast_flags_open (PATCH 2/3) * Adding note to kernel doc of batadv_mcast_get_bridge about increased refcount (PATCH 1/3) * Printing some lines about current bridge and querier state to debugfs too (PATCH 3/3) Changes in v5 (PATCH 2/2 only): * s/dat_cache/mcast_flags/ in kerneldoc (copy&paste error) Changes in v4 (PATCH 2/2 only): * initial {ad,e}dition of this patch Changes in v3 (PATCH 1/2 only): * Removed "RFC" tag in title again: The stubs and new export are upstream in net-next and therefore going to be included in 3.17 * Added some debug output: * Two warning messages: -> Old kernel version or no bridge IGMP/MLD snooping compiled * New batman-adv log-level "mcast": -> Logging mcast flag changes (a third debugging facility, a new table for debugfs for a global mcast flag overview will be added in a separate patch later as discussed with Simon) Changes in v2 (PATCH 1/2 only): * fetching local (= on this same kernel) multicast listeners from the bridge instead of the bat0 interface if a bridge is present - just like ip addresses and routes should be used from br0, the same goes for multicast listeners * beautification of batadv_mcast_mla_br_addr_cpy(), now using already present functions from the kernel instead of own, hackish approach * changed names of some goto-labels (not using "skip" anymore) * using new, third bridge multicast export (because this export is not upstream yet, I've added the "RFC" in the title): br_multicast_has_querier_anywhere() * adding compat stubs for two bridge multicast exports, to make batman-adv compile- and usable even if a 3.16 kernel was compiled without bridge code - the stubs are supposed to be upstream in the bridge code in 3.17 (therefore just 'compat') * updated kerneldocs for batadv_mcast_mla_bridge_get() and batadv_mcast_mla_softif_get() * The two sentences in the commit message starting with "Queriers: ..." were slightly modified to include the third bridge multicast export

2 5

[B.A.T.M.A.N.] Running alfred as non-root user?
by Jan Lühr 07 Aug '14

07 Aug '14

Hello, everytime I try to start alfred 2014.3.0 using a dedicated non-root user it fails with: can't bind unix socket: Address already in use Running as root is successful. Is it possible to start alfred as non-root? Thanks, Jan

2 1

[B.A.T.M.A.N.] alfred: IPC issues
by Jan Lühr 07 Aug '14

07 Aug '14

Hei folks, I'm using alfred 2014.0.0 on OpenWRT Barrier Breaker. Alfred is running: root@6466b34ffcac:~# ps -w | grep alfred 1718 root 1100 S /usr/sbin/alfred -i br-freifunk -b bat0 But cannot be queried using the client: root@6466b34ffcac:~# alfred -r 94 can't connect to unix socket: Connection refused What's wrong here? Configuration is config 'alfred' 'alfred' option interface 'br-freifunk' option mode 'server' option batmanif 'bat0' option start_vis '0' option run_facters '0' Thanks, Keep smiling yanosz

3 4

[B.A.T.M.A.N.] [PATCH net 2/3] batman: fix duplicate #include of multicast.h
by Jean Sacren 07 Aug '14

07 Aug '14

The header multicast.h was included twice, so delete one of them. Signed-off-by: Jean Sacren <sakiwit(a)gmail.com> Cc: Marek Lindner <mareklindner(a)neomailbox.ch> Cc: Simon Wunderlich <sw(a)simonwunderlich.de> Cc: Antonio Quartulli <antonio(a)meshcoding.com> Cc: b.a.t.m.a.n(a)lists.open-mesh.org --- net/batman-adv/multicast.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 96b66fd30f96..ab6bb2af1d45 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -19,9 +19,8 @@ #include "multicast.h" #include "originator.h" #include "hard-interface.h" #include "translation-table.h" -#include "multicast.h" /** * batadv_mcast_mla_softif_get - get softif multicast listeners * @dev: the device to collect multicast addresses from

1 0

[B.A.T.M.A.N.] pull request: batman-adv 2014-08-05
by Antonio Quartulli 05 Aug '14

05 Aug '14

Hello David, this is a pull request intended for net-next/linux-3.17 (yeah..it's really late). Patches 1, 2 and 4 are really minor changes: - kmalloc_array is substituted to kmalloc when possible (as suggested by checkpatch); - net_ratelimited() is now used properly and the "suppressed" message is not printed anymore if not needed; - the internal version number has been increased to reflect our current version. Patch 3 instead is introducing a change in the metric computation function by changing the penalty applied at each mesh hop from 15/255 (~6%) to 30/255 (~11%). This change is introduced by Simon Wunderlich after having observed a performance improvement in several networks when using the new value. Please pull or let me know of any problem! Thanks a lot, Antonio The following changes since commit e6b92c25d20c64c271ef429bba8febeefb848b5b: cxgb4i : remove spurious use of rcu (2014-08-02 20:34:33 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to 0028c72ec4300997f2d0b73594f391983090463b: batman-adv: Start new development cycle (2014-08-04 16:03:13 +0200) ---------------------------------------------------------------- Included changes: - kmalloc_array instead of kmalloc when possible - avoid log spam due to useless net_ratelimit() invocations - increase default metric hop penalty from 15 to 30 - update internal version number ---------------------------------------------------------------- André Gaul (1): batman-adv: remove unnecessary logspam Antonio Quartulli (1): batman-adv: prefer kmalloc_array to kmalloc when possible Simon Wunderlich (2): batman-adv: increase default hop penalty batman-adv: Start new development cycle net/batman-adv/bat_iv_ogm.c | 13 +++++++------ net/batman-adv/distributed-arp-table.c | 3 ++- net/batman-adv/hash.c | 6 +++--- net/batman-adv/main.h | 22 +++++++++++++++------- net/batman-adv/routing.c | 18 +++++++++--------- net/batman-adv/soft-interface.c | 2 +- 6 files changed, 37 insertions(+), 27 deletions(-)

2 5

[B.A.T.M.A.N.] pull request net: batman-adv 2014-08-04
by Antonio Quartulli 05 Aug '14

05 Aug '14

Hello David, this is a pull request intended for net. It just contains a patch by Sven Eckelmann that fixes the reception of out-of-order fragments. As explained in the commit message, the issue was due to a wrong assumption about hlist_for_each_entry() in batadv_frag_insert_packet(). Please pull or let me know of any problem. *If possible, this patch should also be enqueued for stable* Thanks a lot, Antonio The following changes since commit 4f933f414bf629852f361edf0fc5e765e3e78388: r8152: add missing Makefile rule (2014-08-02 20:53:55 -0700) 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 9d2155fb59e21f4a38838035d2a26a8a02fec16c: batman-adv: Fix out-of-order fragmentation support (2014-08-04 16:05:43 +0200) ---------------------------------------------------------------- Fix out-of-order fragments reception. ---------------------------------------------------------------- Sven Eckelmann (1): batman-adv: Fix out-of-order fragmentation support net/batman-adv/fragmentation.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)

3 4

[B.A.T.M.A.N.] [PATCHv5 1/2] batman-adv: Add multicast optimization support for bridged setups
by Linus Lüssing 02 Aug '14

02 Aug '14

So far, the recently added multicast optimizations did not support a configuration where a bridge is on top of the soft-interface (e.g. bat0). Now the Linux bridge code is able to provide us with the missing bits: Multicast Listeners: The bridge hands us a list of multicast listeners it has detected behind the bridge which we will announce through the mesh via the translation table, allowing other nodes to direct multicast packets to these clients behind the bridge even with enabled multicast optimizations. Queriers: The bridge informs us whether there is a selected IGMP or MLD querier behind the bridge or if there is no querier at all. In these cases we need all according IPv4 or IPv6 multicast traffic directed to us. These two parts together allow us to serve all multicast listeners with IPv6 link-local multicast packets even when bridges are involved and our multicast optimizations enabled. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- Changes in v5: * none Changes in v4: * none Changes in v3: * Removed "RFC" tag in title again: The stubs and new export are upstream in net-next and therefore going to be included in 3.17 * Added some debug output: * Two warning messages: -> Old kernel version or no bridge IGMP/MLD snooping compiled * New batman-adv log-level "mcast": -> Logging mcast flag changes (a third debugging facility, a new table for debugfs for a global mcast flag overview will be added in a separate patch later as discussed with Simon) Changes in v2: * fetching local (= on this same kernel) multicast listeners from the bridge instead of the bat0 interface if a bridge is present - just like ip addresses and routes should be used from br0, the same goes for multicast listeners * beautification of batadv_mcast_mla_br_addr_cpy(), now using already present functions from the kernel instead of own, hackish approach * changed names of some goto-labels (not using "skip" anymore) * using new, third bridge multicast export (because this export is not upstream yet, I've added the "RFC" in the title): br_multicast_has_querier_anywhere() * adding compat stubs for two bridge multicast exports, to make batman-adv compile- and usable even if a 3.16 kernel was compiled without bridge code - the stubs are supposed to be upstream in the bridge code in 3.17 (therefore just 'compat') * updated kerneldocs for batadv_mcast_mla_bridge_get() and batadv_mcast_mla_softif_get() * The two sentences in the commit message starting with "Queriers: ..." were slightly modified to include the third bridge multicast export compat.c | 39 ++++++++++++ compat.h | 32 ++++++++++ main.h | 6 +- multicast.c | 193 +++++++++++++++++++++++++++++++++++++++++++++++++++++------ 4 files changed, 251 insertions(+), 19 deletions(-) diff --git a/compat.c b/compat.c index 3dbf9d2..31546f5 100644 --- a/compat.c +++ b/compat.c @@ -109,3 +109,42 @@ void batadv_free_rcu_tvlv_handler(struct rcu_head *rcu) } #endif /* < KERNEL_VERSION(3, 0, 0) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) + +int br_multicast_list_adjacent(struct net_device *dev, + struct list_head *br_ip_list) +{ + return 0; +} + +bool br_multicast_has_querier_adjacent(struct net_device *dev, int proto) +{ + return false; +} + +#endif /* < KERNEL_VERSION(3, 16, 0) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) + +bool br_multicast_has_querier_anywhere(struct net_device *dev, int proto) +{ + pr_warn_once("Old kernel detected (< 3.17) - multicast optimizations disabled\n"); + + return false; +} + +#if !(IS_ENABLED(CONFIG_BRIDGE) && IS_ENABLED(CONFIG_BRIDGE_IGMP_SNOOPING)) +int br_multicast_list_adjacent(struct net_device *dev, + struct list_head *br_ip_list) +{ + return 0; +} + +bool br_multicast_has_querier_adjacent(struct net_device *dev, int proto) +{ + return false; +} +#endif + +#endif /* < KERNEL_VERSION(3, 17, 0) */ diff --git a/compat.h b/compat.h index ed5b815..14de948 100644 --- a/compat.h +++ b/compat.h @@ -240,6 +240,12 @@ static inline void skb_reset_mac_len(struct sk_buff *skb) #endif /* < KERNEL_VERSION(3, 0, 0) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0) + +#define IS_ENABLED(x) defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) + +#endif /* < KERNEL_VERSION(3, 1, 0) */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) #define batadv_interface_add_vid(x, y, z) \ @@ -444,6 +450,32 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\ #define pskb_copy_for_clone pskb_copy +int br_multicast_list_adjacent(struct net_device *dev, + struct list_head *br_ip_list); +bool br_multicast_has_querier_adjacent(struct net_device *dev, int proto); + +struct br_ip { + union { + __be32 ip4; +#if IS_ENABLED(CONFIG_IPV6) + struct in6_addr ip6; +#endif + } u; + __be16 proto; + __u16 vid; +}; + +struct br_ip_list { + struct list_head list; + struct br_ip addr; +}; + #endif /* < KERNEL_VERSION(3, 16, 0) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) + +bool br_multicast_has_querier_anywhere(struct net_device *dev, int proto); + +#endif /* < KERNEL_VERSION(3, 17, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ diff --git a/main.h b/main.h index 4bb500b..1e1e000 100644 --- a/main.h +++ b/main.h @@ -169,6 +169,7 @@ enum batadv_uev_type { #include <linux/netdevice.h> /* netdevice */ #include <linux/etherdevice.h> /* ethernet address classification */ #include <linux/if_ether.h> /* ethernet header */ +#include <linux/if_bridge.h> /* bridge / multicast-snooping communication */ #include <linux/poll.h> /* poll_table */ #include <linux/kthread.h> /* kernel threads */ #include <linux/pkt_sched.h> /* schedule types */ @@ -177,6 +178,7 @@ enum batadv_uev_type { #include <linux/slab.h> #include <net/sock.h> /* struct sock */ #include <net/addrconf.h> /* ipv6 address stuff */ +#include <net/ip.h> #include <linux/ip.h> #include <net/rtnetlink.h> #include <linux/jiffies.h> @@ -223,6 +225,7 @@ __be32 batadv_skb_crc32(struct sk_buff *skb, u8 *payload_ptr); * @BATADV_DBG_BLA: bridge loop avoidance messages * @BATADV_DBG_DAT: ARP snooping and DAT related messages * @BATADV_DBG_NC: network coding related messages + * @BATADV_DBG_MCAST: multicast related messages * @BATADV_DBG_ALL: the union of all the above log levels */ enum batadv_dbg_level { @@ -232,7 +235,8 @@ enum batadv_dbg_level { BATADV_DBG_BLA = BIT(3), BATADV_DBG_DAT = BIT(4), BATADV_DBG_NC = BIT(5), - BATADV_DBG_ALL = 63, + BATADV_DBG_MCAST = BIT(6), + BATADV_DBG_ALL = 127, }; #ifdef CONFIG_BATMAN_ADV_DEBUG diff --git a/multicast.c b/multicast.c index 96b66fd..5e8a931 100644 --- a/multicast.c +++ b/multicast.c @@ -23,12 +23,42 @@ #include "multicast.h" /** + * batadv_mcast_get_bridge - get the bridge on top of the softif if it exists + * @soft_iface: netdev struct of the mesh interface + * + * Returns either a bridge interface on top of our soft interface or + * NULL if no such bridge exists. + */ +static struct net_device *batadv_mcast_get_bridge(struct net_device *soft_iface) +{ + struct net_device *upper = soft_iface; + + rcu_read_lock(); + do { + upper = netdev_master_upper_dev_get_rcu(upper); + } while (upper && !(upper->priv_flags & IFF_EBRIDGE)); + + if (upper) + dev_hold(upper); + rcu_read_unlock(); + + return upper; +} + +/** * batadv_mcast_mla_softif_get - get softif multicast listeners * @dev: the device to collect multicast addresses from * @mcast_list: a list to put found addresses into * - * Collect multicast addresses of the local multicast listeners - * on the given soft interface, dev, in the given mcast_list. + * Collects multicast addresses of multicast listeners residing + * on this kernel on the given soft interface, dev, in + * the given mcast_list. In general, multicast listeners provided by + * your multicast receiving applications run directly on this node. + * + * If there is a bridge interface on top of dev, collects from that one + * instead. Just like with IP addresses and routes, multicast listeners + * will(/should) register to the bridge interface instead of an + * enslaved bat0. * * Returns -ENOMEM on memory allocation error or the number of * items added to the mcast_list otherwise. @@ -36,12 +66,13 @@ static int batadv_mcast_mla_softif_get(struct net_device *dev, struct hlist_head *mcast_list) { + struct net_device *bridge = batadv_mcast_get_bridge(dev); struct netdev_hw_addr *mc_list_entry; struct batadv_hw_addr *new; int ret = 0; - netif_addr_lock_bh(dev); - netdev_for_each_mc_addr(mc_list_entry, dev) { + netif_addr_lock_bh(bridge ? bridge : dev); + netdev_for_each_mc_addr(mc_list_entry, bridge ? bridge : dev) { new = kmalloc(sizeof(*new), GFP_ATOMIC); if (!new) { ret = -ENOMEM; @@ -52,7 +83,10 @@ static int batadv_mcast_mla_softif_get(struct net_device *dev, hlist_add_head(&new->list, mcast_list); ret++; } - netif_addr_unlock_bh(dev); + netif_addr_unlock_bh(bridge ? bridge : dev); + + if (bridge) + dev_put(bridge); return ret; } @@ -78,6 +112,83 @@ static bool batadv_mcast_mla_is_duplicate(uint8_t *mcast_addr, } /** + * batadv_mcast_mla_br_addr_cpy - copy a bridge multicast address + * @dst: destination to write to - a multicast MAC address + * @src: source to read from - a multicast IP address + * + * Converts a given multicast IPv4/IPv6 address from a bridge + * to its matching multicast MAC address and copies it into the given + * destination buffer. + * + * Caller needs to make sure the destination buffer can hold + * at least ETH_ALEN bytes. + */ +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)) + ipv6_eth_mc_map(&src->u.ip6, dst); +#endif + else + memset(dst, 0, ETH_ALEN); +} + +/** + * batadv_mcast_mla_bridge_get - get bridged-in multicast listeners + * @dev: a bridge slave whose bridge to collect multicast addresses from + * @mcast_list: a list to put found addresses into + * + * Collects multicast addresses of multicast listeners residing + * on foreign, non-mesh devices which we gave access to our mesh via + * a bridge on top of the given soft interface, dev, in the given + * mcast_list. + * + * Returns -ENOMEM on memory allocation error or the number of + * items added to the mcast_list otherwise. + */ +static int batadv_mcast_mla_bridge_get(struct net_device *dev, + struct hlist_head *mcast_list) +{ + struct list_head bridge_mcast_list = LIST_HEAD_INIT(bridge_mcast_list); + struct br_ip_list *br_ip_entry, *tmp; + struct batadv_hw_addr *new; + uint8_t mcast_addr[ETH_ALEN]; + int ret; + + /* we don't need to detect these devices/listeners, the IGMP/MLD + * snooping code of the Linux bridge already does that for us + */ + ret = br_multicast_list_adjacent(dev, &bridge_mcast_list); + if (ret < 0) + goto out; + + list_for_each_entry(br_ip_entry, &bridge_mcast_list, list) { + batadv_mcast_mla_br_addr_cpy(mcast_addr, &br_ip_entry->addr); + if (batadv_mcast_mla_is_duplicate(mcast_addr, mcast_list)) + continue; + + new = kmalloc(sizeof(*new), GFP_ATOMIC); + if (!new) { + ret = -ENOMEM; + break; + } + + ether_addr_copy(new->addr, mcast_addr); + hlist_add_head(&new->list, mcast_list); + } + +out: + list_for_each_entry_safe(br_ip_entry, tmp, &bridge_mcast_list, list) { + list_del(&br_ip_entry->list); + kfree(br_ip_entry); + } + + return ret; +} + +/** * batadv_mcast_mla_list_free - free a list of multicast addresses * @mcast_list: the list to free * @@ -185,38 +296,80 @@ static bool batadv_mcast_has_bridge(struct batadv_priv *bat_priv) * Updates the own multicast tvlv with our current multicast related settings, * capabilities and inabilities. * - * Returns true if the tvlv container is registered afterwards. Otherwise - * returns false. + * Returns false if we want all IPv4 && IPv6 multicast traffic and true + * otherwise. */ static bool batadv_mcast_mla_tvlv_update(struct batadv_priv *bat_priv) { struct batadv_tvlv_mcast_data mcast_data; + struct net_device *soft_iface = bat_priv->soft_iface; + int str_flags_len = strlen("<undefined>") + 1; + char str_flags_old[str_flags_len], str_flags_new[str_flags_len]; mcast_data.flags = BATADV_NO_FLAGS; memset(mcast_data.reserved, 0, sizeof(mcast_data.reserved)); - /* Avoid attaching MLAs, if there is a bridge on top of our soft - * interface, we don't support that yet (TODO) + if (!batadv_mcast_has_bridge(bat_priv)) + goto update; + +#if !IS_ENABLED(CONFIG_BRIDGE_IGMP_SNOOPING) + pr_warn_once("No bridge IGMP snooping compiled - multicast optimizations disabled\n"); +#endif + + mcast_data.flags |= BATADV_MCAST_WANT_ALL_UNSNOOPABLES; + + /* 1) If no querier exists at all, then multicast listeners on + * our local TT clients behind the bridge will keep silent. + * 2) If the selected querier is on one of our local TT clients, + * behind the bridge, then this querier might shadow multicast + * listeners on our local TT clients, behind this bridge. + * + * In both cases, we will signalize other batman nodes that + * we need all multicast traffic of the according protocol. */ - if (batadv_mcast_has_bridge(bat_priv)) { - if (bat_priv->mcast.enabled) { - batadv_tvlv_container_unregister(bat_priv, - BATADV_TVLV_MCAST, 1); - bat_priv->mcast.enabled = false; - } + if (!br_multicast_has_querier_anywhere(soft_iface, ETH_P_IP) || + br_multicast_has_querier_adjacent(soft_iface, ETH_P_IP)) + mcast_data.flags |= BATADV_MCAST_WANT_ALL_IPV4; - return false; - } + if (!br_multicast_has_querier_anywhere(soft_iface, ETH_P_IPV6) || + br_multicast_has_querier_adjacent(soft_iface, ETH_P_IPV6)) + mcast_data.flags |= BATADV_MCAST_WANT_ALL_IPV6; +update: if (!bat_priv->mcast.enabled || mcast_data.flags != bat_priv->mcast.flags) { + if (!bat_priv->mcast.enabled) + sprintf(str_flags_old, "<undefined>"); + else + sprintf(str_flags_old, "[%c%c%c]", + (bat_priv->mcast.flags & + BATADV_MCAST_WANT_ALL_UNSNOOPABLES ? + 'U' : '.'), + (bat_priv->mcast.flags & + BATADV_MCAST_WANT_ALL_IPV4 ? '4' : '.'), + (bat_priv->mcast.flags & + BATADV_MCAST_WANT_ALL_IPV6 ? '6' : '.')); + + sprintf(str_flags_new, "[%c%c%c]", + (mcast_data.flags & + BATADV_MCAST_WANT_ALL_UNSNOOPABLES ? 'U' : '.'), + (mcast_data.flags & + BATADV_MCAST_WANT_ALL_IPV4 ? '4' : '.'), + (mcast_data.flags & + BATADV_MCAST_WANT_ALL_IPV6 ? '6' : '.')); + + batadv_dbg(BATADV_DBG_MCAST, bat_priv, + "Changing multicast flags from '%s' to '%s'\n", + str_flags_old, str_flags_new); + batadv_tvlv_container_register(bat_priv, BATADV_TVLV_MCAST, 1, &mcast_data, sizeof(mcast_data)); bat_priv->mcast.flags = mcast_data.flags; bat_priv->mcast.enabled = true; } - return true; + return !(mcast_data.flags & + (BATADV_MCAST_WANT_ALL_IPV4 + BATADV_MCAST_WANT_ALL_IPV6)); } /** @@ -239,6 +392,10 @@ void batadv_mcast_mla_update(struct batadv_priv *bat_priv) if (ret < 0) goto out; + ret = batadv_mcast_mla_bridge_get(soft_iface, &mcast_list); + if (ret < 0) + goto out; + update: batadv_mcast_mla_tt_retract(bat_priv, &mcast_list); batadv_mcast_mla_tt_add(bat_priv, &mcast_list); -- 1.7.10.4

2 5

[B.A.T.M.A.N.] How to set up the communication in layer 3 in mesh node with batman.adv
by liudows 01 Aug '14

01 Aug '14

hello, eveyone.I am a b.a.t.m.a.n. beginner.I work on openwrt with batman-adv 2012.3.0. There are three mesh nodes. Node A is far from node C. A can't communicate with C directly, but it can commuticate with C via node B, which is between A and C. The path is A <--> B <--> C. On node A, I can run the command 'batctl ping' to node B and node C successfully. I can also 'ping' the node B, but I can't 'ping' node C. It shows that I have set up the commuication with all the nodes in layer 2, but I can only communicate with the neighbor in layer 3. How can I fix this? Thanks.

2 1

[B.A.T.M.A.N.] [PATCH] alfred: add more debug output for libc errors
by Sven Eckelmann 30 Jul '14

30 Jul '14

perror(..) can automatically decode the errno variable and print more information for an error. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- gpsd/alfred-gpsd.c | 2 +- main.c | 2 +- send.c | 2 +- vis/vis.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gpsd/alfred-gpsd.c b/gpsd/alfred-gpsd.c index 6e88dc7..d736ad1 100644 --- a/gpsd/alfred-gpsd.c +++ b/gpsd/alfred-gpsd.c @@ -443,7 +443,7 @@ static struct globals *gpsd_init(int argc, char *argv[]) gpsd_source_spec(NULL, &globals->gpsdsource); if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) - fprintf(stderr, "could not register SIGPIPE handler\n"); + perror("could not register SIGPIPE handler"); return globals; } diff --git a/main.c b/main.c index 0a79e08..1add44e 100644 --- a/main.c +++ b/main.c @@ -150,7 +150,7 @@ static struct globals *alfred_init(int argc, char *argv[]) } if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) - fprintf(stderr, "could not register SIGPIPE handler\n"); + perror("could not register SIGPIPE handler"); return globals; } diff --git a/send.c b/send.c index dc0e428..32b7cbb 100644 --- a/send.c +++ b/send.c @@ -170,7 +170,7 @@ ssize_t send_alfred_packet(struct globals *globals, const struct in6_addr *dest, (struct sockaddr *)&dest_addr, sizeof(struct sockaddr_in6)); if (ret == -EPERM) { - fprintf(stderr, "Error during sent\n"); + perror("Error during sent"); netsock_close(globals->netsock); globals->netsock = -1; } diff --git a/vis/vis.c b/vis/vis.c index 6cc4034..00372ab 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -258,7 +258,7 @@ static int register_interfaces(struct globals *globals) path_buff = malloc(PATH_BUFF_LEN); if (!path_buff) { - fprintf(stderr, "Error - could not allocate path buffer: out of memory ?\n"); + perror("Error - could not allocate path buffer"); goto err; } @@ -880,7 +880,7 @@ static struct globals *vis_init(int argc, char *argv[]) } if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) - fprintf(stderr, "could not register SIGPIPE handler\n"); + perror("could not register SIGPIPE handler"); return globals; } -- 2.0.1

2 1

[B.A.T.M.A.N.] [PATCH 1/2] alfred: Print libc errors with perror
by Sven Eckelmann 29 Jul '14

29 Jul '14

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- debugfs.c | 4 +--- gpsd/alfred-gpsd.c | 9 +++------ netsock.c | 12 ++++++------ recv.c | 3 +-- server.c | 11 ++++------- unix_sock.c | 21 +++++++-------------- vis/vis.c | 10 ++++------ 7 files changed, 26 insertions(+), 44 deletions(-) diff --git a/debugfs.c b/debugfs.c index 4b8801a..fbf992e 100644 --- a/debugfs.c +++ b/debugfs.c @@ -89,9 +89,7 @@ static const char *debugfs_find_mountpoint(void) /* give up and parse /proc/mounts */ fp = fopen("/proc/mounts", "r"); if (fp == NULL) { - fprintf(stderr, - "Error - can't open /proc/mounts for read: %s\n", - strerror(errno)); + perror("Error - can't open /proc/mounts for read"); return NULL; } diff --git a/gpsd/alfred-gpsd.c b/gpsd/alfred-gpsd.c index 06c0680..6e88dc7 100644 --- a/gpsd/alfred-gpsd.c +++ b/gpsd/alfred-gpsd.c @@ -29,8 +29,7 @@ static int alfred_open_sock(struct globals *globals) globals->unix_sock = socket(AF_LOCAL, SOCK_STREAM, 0); if (globals->unix_sock < 0) { - fprintf(stderr, "can't create unix socket: %s\n", - strerror(errno)); + perror("can't create unix socket"); return -1; } @@ -41,8 +40,7 @@ static int alfred_open_sock(struct globals *globals) if (connect(globals->unix_sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - fprintf(stderr, "can't connect to unix socket: %s\n", - strerror(errno)); + perror("can't connect to unix socket"); return -1; } @@ -514,8 +512,7 @@ static int gpsd_server(struct globals *globals) errno = 0; ret = select(max_fd, &fds, NULL, NULL, &tv); if (ret == -1 && errno != EINTR) - printf("select error %s(%d)\n", - strerror(errno), errno); + perror("select error"); if (ret == 1) gpsd_read_gpsd(globals); diff --git a/netsock.c b/netsock.c index 305983f..a1a97e4 100644 --- a/netsock.c +++ b/netsock.c @@ -54,7 +54,7 @@ int netsock_open(struct globals *globals) sock = socket(PF_INET6, SOCK_DGRAM, 0); if (sock < 0) { - fprintf(stderr, "can't open socket: %s\n", strerror(errno)); + perror("can't open socket"); return -1; } @@ -62,7 +62,7 @@ int netsock_open(struct globals *globals) strncpy(ifr.ifr_name, globals->interface, IFNAMSIZ); ifr.ifr_name[IFNAMSIZ - 1] = '\0'; if (ioctl(sock, SIOCGIFINDEX, &ifr) == -1) { - fprintf(stderr, "can't get interface: %s\n", strerror(errno)); + perror("can't get interface"); goto err; } @@ -75,7 +75,7 @@ int netsock_open(struct globals *globals) sin6.sin6_scope_id = ifr.ifr_ifindex; if (ioctl(sock, SIOCGIFHWADDR, &ifr) == -1) { - fprintf(stderr, "can't get MAC address: %s\n", strerror(errno)); + perror("can't get MAC address"); goto err; } @@ -83,19 +83,19 @@ int netsock_open(struct globals *globals) mac_to_ipv6(&globals->hwaddr, &globals->address); if (bind(sock, (struct sockaddr *)&sin6, sizeof(sin6)) < 0) { - fprintf(stderr, "can't bind\n"); + perror("can't bind"); goto err; } ret = fcntl(sock, F_GETFL, 0); if (ret < 0) { - fprintf(stderr, "failed to get file status flags\n"); + perror("failed to get file status flags"); goto err; } ret = fcntl(sock, F_SETFL, ret | O_NONBLOCK); if (ret < 0) { - fprintf(stderr, "failed to set file status flags\n"); + perror("failed to set file status flags"); goto err; } diff --git a/recv.c b/recv.c index 724c551..2948547 100644 --- a/recv.c +++ b/recv.c @@ -385,8 +385,7 @@ int recv_alfred_packet(struct globals *globals) length = recvfrom(globals->netsock, buf, sizeof(buf), 0, (struct sockaddr *)&source, &sourcelen); if (length <= 0) { - fprintf(stderr, "read from network socket failed: %s\n", - strerror(errno)); + perror("read from network socket failed"); return -1; } diff --git a/server.c b/server.c index b060d55..94e6145 100644 --- a/server.c +++ b/server.c @@ -236,7 +236,7 @@ static void check_if_socket(struct globals *globals) sock = socket(PF_INET6, SOCK_DGRAM, 0); if (sock < 0) { - fprintf(stderr, "can't open socket: %s\n", strerror(errno)); + perror("can't open socket"); return; } @@ -244,8 +244,7 @@ static void check_if_socket(struct globals *globals) strncpy(ifr.ifr_name, globals->interface, IFNAMSIZ); ifr.ifr_name[IFNAMSIZ - 1] = '\0'; if (ioctl(sock, SIOCGIFINDEX, &ifr) == -1) { - fprintf(stderr, "can't get interface: %s, closing netsock\n", - strerror(errno)); + perror("can't get interface, closing netsock"); goto close; } @@ -257,8 +256,7 @@ static void check_if_socket(struct globals *globals) } if (ioctl(sock, SIOCGIFHWADDR, &ifr) == -1) { - fprintf(stderr, "can't get MAC address: %s, closing netsock\n", - strerror(errno)); + perror("can't get MAC address, closing netsock"); goto close; } @@ -330,8 +328,7 @@ int alfred_server(struct globals *globals) ret = pselect(maxsock + 1, &fds, NULL, &errfds, &tv, NULL); if (ret == -1) { - fprintf(stderr, "main loop select failed ...: %s\n", - strerror(errno)); + perror("main loop select failed ..."); } else if (ret) { if (globals->netsock >= 0 && FD_ISSET(globals->netsock, &errfds)) { diff --git a/unix_sock.c b/unix_sock.c index fb7e391..cc0d25c 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -43,8 +43,7 @@ int unix_sock_open_daemon(struct globals *globals) globals->unix_sock = socket(AF_LOCAL, SOCK_STREAM, 0); if (globals->unix_sock < 0) { - fprintf(stderr, "can't create unix socket: %s\n", - strerror(errno)); + perror("can't create unix socket"); return -1; } @@ -55,14 +54,12 @@ int unix_sock_open_daemon(struct globals *globals) if (bind(globals->unix_sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - fprintf(stderr, "can't bind unix socket: %s\n", - strerror(errno)); + perror("can't bind unix socket"); return -1; } if (listen(globals->unix_sock, 10) < 0) { - fprintf(stderr, "can't listen on unix socket: %s\n", - strerror(errno)); + perror("can't listen on unix socket"); return -1; } @@ -75,8 +72,7 @@ int unix_sock_open_client(struct globals *globals) globals->unix_sock = socket(AF_LOCAL, SOCK_STREAM, 0); if (globals->unix_sock < 0) { - fprintf(stderr, "can't create unix socket: %s\n", - strerror(errno)); + perror("can't create unix socket"); return -1; } @@ -87,8 +83,7 @@ int unix_sock_open_client(struct globals *globals) if (connect(globals->unix_sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - fprintf(stderr, "can't connect to unix socket: %s\n", - strerror(errno)); + perror("can't connect to unix socket"); return -1; } @@ -315,16 +310,14 @@ int unix_sock_read(struct globals *globals) client_sock = accept(globals->unix_sock, (struct sockaddr *)&sun_addr, &sun_size); if (client_sock < 0) { - fprintf(stderr, "can't accept unix connection: %s\n", - strerror(errno)); + perror("can't accept unix connection"); return -1; } /* we assume that we can instantly read here. */ length = read(client_sock, buf, sizeof(buf)); if (length <= 0) { - fprintf(stderr, "read from unix socket failed: %s\n", - strerror(errno)); + perror("read from unix socket failed"); goto err; } diff --git a/vis/vis.c b/vis/vis.c index 0cc4981..6cc4034 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -108,7 +108,7 @@ static int get_if_mac(char *ifname, uint8_t *mac) ifr.ifr_name[IFNAMSIZ - 1] = '\0'; if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) { - fprintf(stderr, "can't get interface: %s\n", strerror(errno)); + perror("can't get interface"); return -1; } @@ -117,7 +117,7 @@ static int get_if_mac(char *ifname, uint8_t *mac) close(sock); if (ret == -1) { - fprintf(stderr, "can't get MAC address: %s\n", strerror(errno)); + perror("can't get MAC address"); return -1; } @@ -162,8 +162,7 @@ static int alfred_open_sock(struct globals *globals) globals->unix_sock = socket(AF_LOCAL, SOCK_STREAM, 0); if (globals->unix_sock < 0) { - fprintf(stderr, "can't create unix socket: %s\n", - strerror(errno)); + perror("can't create unix socket"); return -1; } @@ -174,8 +173,7 @@ static int alfred_open_sock(struct globals *globals) if (connect(globals->unix_sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - fprintf(stderr, "can't connect to unix socket: %s\n", - strerror(errno)); + perror("can't connect to unix socket"); return -1; } -- 2.0.1

3 3

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