commits May 2016

commits@lists.open-mesh.org

1 participants
174 discussions

[batman-adv] maint: batman-adv: Avoid nullptr derefence in batadv_v_neigh_is_sob (036aa7b)
by postmaster＠open-mesh.org 06 May '16

06 May '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 036aa7b7181ee96ae6971eb31dd97b6ace7c0a80 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri May 6 11:43:38 2016 +0200 batman-adv: Avoid nullptr derefence in batadv_v_neigh_is_sob batadv_neigh_ifinfo_get can return NULL when it cannot find (even when only temporarily) anymore the neigh_ifinfo in the list neigh->ifinfo_list. This has to be checked to avoid kernel Oopses when the ifinfo is dereferenced. This a situation which isn't expected but is already handled by functions like batadv_v_neigh_cmp. The same kind of warning is therefore used before the function returns without dereferencing the pointers. Fixes: b05bbab5e1fc ("batman-adv: B.A.T.M.A.N. V - implement neighbor comparison API calls") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 036aa7b7181ee96ae6971eb31dd97b6ace7c0a80 net/batman-adv/bat_v.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 4547fce..7e1467a 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -295,6 +295,9 @@ static bool batadv_v_neigh_is_sob(struct batadv_neigh_node *neigh1, ifinfo1 = batadv_neigh_ifinfo_get(neigh1, if_outgoing1); ifinfo2 = batadv_neigh_ifinfo_get(neigh2, if_outgoing2); + if (WARN_ON(!ifinfo1 || !ifinfo2)) + return false; + threshold = ifinfo1->bat_v.throughput / 4; threshold = ifinfo1->bat_v.throughput - threshold;

1 0

[batman-adv] master: batman-adv: move GW mode and selection class to private data structure (6435277)
by postmaster＠open-mesh.org 06 May '16

06 May '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 643527765b28a1f5756bf2bf8d7ecd0a09771975 Author: Antonio Quartulli <a(a)unstable.cc> Date: Fri May 6 02:46:38 2016 +0800 batman-adv: move GW mode and selection class to private data structure To reduce the field pollution in our main batadv_priv data structure we've already created some substructures so that we could group fields in a convenient manner. However gw_mode and gw_sel_class are still part of the main object. More both fields to the GW private substructure. Signed-off-by: Antonio Quartulli <a(a)unstable.cc> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 643527765b28a1f5756bf2bf8d7ecd0a09771975 net/batman-adv/gateway_client.c | 12 ++++++------ net/batman-adv/gateway_common.c | 6 +++--- net/batman-adv/soft-interface.c | 6 +++--- net/batman-adv/sysfs.c | 10 +++++----- net/batman-adv/types.h | 8 ++++---- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index 5839c56..31ba24e 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -192,7 +192,7 @@ batadv_gw_get_best_gw_node(struct batadv_priv *bat_priv) tq_avg = router_ifinfo->bat_iv.tq_avg; - switch (atomic_read(&bat_priv->gw_sel_class)) { + switch (atomic_read(&bat_priv->gw.sel_class)) { case 1: /* fast connection */ tmp_gw_factor = tq_avg * tq_avg; tmp_gw_factor *= gw_node->bandwidth_down; @@ -255,7 +255,7 @@ void batadv_gw_check_client_stop(struct batadv_priv *bat_priv) { struct batadv_gw_node *curr_gw; - if (atomic_read(&bat_priv->gw_mode) != BATADV_GW_MODE_CLIENT) + if (atomic_read(&bat_priv->gw.mode) != BATADV_GW_MODE_CLIENT) return; curr_gw = batadv_gw_get_selected_gw_node(bat_priv); @@ -283,7 +283,7 @@ void batadv_gw_election(struct batadv_priv *bat_priv) struct batadv_neigh_ifinfo *router_ifinfo = NULL; char gw_addr[18] = { '\0' }; - if (atomic_read(&bat_priv->gw_mode) != BATADV_GW_MODE_CLIENT) + if (atomic_read(&bat_priv->gw.mode) != BATADV_GW_MODE_CLIENT) goto out; curr_gw = batadv_gw_get_selected_gw_node(bat_priv); @@ -402,8 +402,8 @@ void batadv_gw_check_election(struct batadv_priv *bat_priv, /* if the routing class is greater than 3 the value tells us how much * greater the TQ value of the new gateway must be */ - if ((atomic_read(&bat_priv->gw_sel_class) > 3) && - (orig_tq_avg - gw_tq_avg < atomic_read(&bat_priv->gw_sel_class))) + if ((atomic_read(&bat_priv->gw.sel_class) > 3) && + (orig_tq_avg - gw_tq_avg < atomic_read(&bat_priv->gw.sel_class))) goto out; batadv_dbg(BATADV_DBG_BATMAN, bat_priv, @@ -821,7 +821,7 @@ bool batadv_gw_out_of_range(struct batadv_priv *bat_priv, if (!gw_node) goto out; - switch (atomic_read(&bat_priv->gw_mode)) { + switch (atomic_read(&bat_priv->gw.mode)) { case BATADV_GW_MODE_SERVER: /* If we are a GW then we are our best GW. We can artificially * set the tq towards ourself as the maximum value diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c index 4423047..3c26945 100644 --- a/net/batman-adv/gateway_common.c +++ b/net/batman-adv/gateway_common.c @@ -144,7 +144,7 @@ void batadv_gw_tvlv_container_update(struct batadv_priv *bat_priv) u32 down, up; char gw_mode; - gw_mode = atomic_read(&bat_priv->gw_mode); + gw_mode = atomic_read(&bat_priv->gw.mode); switch (gw_mode) { case BATADV_GW_MODE_OFF: @@ -241,8 +241,8 @@ static void batadv_gw_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv, /* restart gateway selection if fast or late switching was enabled */ if ((gateway.bandwidth_down != 0) && - (atomic_read(&bat_priv->gw_mode) == BATADV_GW_MODE_CLIENT) && - (atomic_read(&bat_priv->gw_sel_class) > 2)) + (atomic_read(&bat_priv->gw.mode) == BATADV_GW_MODE_CLIENT) && + (atomic_read(&bat_priv->gw.sel_class) > 2)) batadv_gw_check_election(bat_priv, orig); } diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 343d2c9..81665b1 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -255,7 +255,7 @@ static int batadv_interface_tx(struct sk_buff *skb, if (batadv_compare_eth(ethhdr->h_dest, ectp_addr)) goto dropped; - gw_mode = atomic_read(&bat_priv->gw_mode); + gw_mode = atomic_read(&bat_priv->gw.mode); if (is_multicast_ether_addr(ethhdr->h_dest)) { /* if gw mode is off, broadcast every packet */ if (gw_mode == BATADV_GW_MODE_OFF) { @@ -815,8 +815,8 @@ static int batadv_softif_init_late(struct net_device *dev) atomic_set(&bat_priv->mcast.num_want_all_ipv4, 0); atomic_set(&bat_priv->mcast.num_want_all_ipv6, 0); #endif - atomic_set(&bat_priv->gw_mode, BATADV_GW_MODE_OFF); - atomic_set(&bat_priv->gw_sel_class, 20); + atomic_set(&bat_priv->gw.mode, BATADV_GW_MODE_OFF); + atomic_set(&bat_priv->gw.sel_class, 20); atomic_set(&bat_priv->gw.bandwidth_down, 100); atomic_set(&bat_priv->gw.bandwidth_up, 20); atomic_set(&bat_priv->orig_interval, 1000); diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index ef5832f..233abcf 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -427,7 +427,7 @@ static ssize_t batadv_show_gw_mode(struct kobject *kobj, struct attribute *attr, struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj); int bytes_written; - switch (atomic_read(&bat_priv->gw_mode)) { + switch (atomic_read(&bat_priv->gw.mode)) { case BATADV_GW_MODE_CLIENT: bytes_written = sprintf(buff, "%s\n", BATADV_GW_MODE_CLIENT_NAME); @@ -476,10 +476,10 @@ static ssize_t batadv_store_gw_mode(struct kobject *kobj, return -EINVAL; } - if (atomic_read(&bat_priv->gw_mode) == gw_mode_tmp) + if (atomic_read(&bat_priv->gw.mode) == gw_mode_tmp) return count; - switch (atomic_read(&bat_priv->gw_mode)) { + switch (atomic_read(&bat_priv->gw.mode)) { case BATADV_GW_MODE_CLIENT: curr_gw_mode_str = BATADV_GW_MODE_CLIENT_NAME; break; @@ -508,7 +508,7 @@ static ssize_t batadv_store_gw_mode(struct kobject *kobj, * state */ batadv_gw_check_client_stop(bat_priv); - atomic_set(&bat_priv->gw_mode, (unsigned int)gw_mode_tmp); + atomic_set(&bat_priv->gw.mode, (unsigned int)gw_mode_tmp); batadv_gw_tvlv_container_update(bat_priv); return count; } @@ -624,7 +624,7 @@ BATADV_ATTR_SIF_UINT(orig_interval, orig_interval, S_IRUGO | S_IWUSR, 2 * BATADV_JITTER, INT_MAX, NULL); BATADV_ATTR_SIF_UINT(hop_penalty, hop_penalty, S_IRUGO | S_IWUSR, 0, BATADV_TQ_MAX_VALUE, NULL); -BATADV_ATTR_SIF_UINT(gw_sel_class, gw_sel_class, S_IRUGO | S_IWUSR, 1, +BATADV_ATTR_SIF_UINT(gw_sel_class, gw.sel_class, S_IRUGO | S_IWUSR, 1, BATADV_TQ_MAX_VALUE, batadv_post_gw_reselect); static BATADV_ATTR(gw_bandwidth, S_IRUGO | S_IWUSR, batadv_show_gw_bwidth, batadv_store_gw_bwidth); diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index b70b6ae..32c6d0e 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -707,6 +707,8 @@ struct batadv_priv_debug_log { * @list: list of available gateway nodes * @list_lock: lock protecting gw_list & curr_gw * @curr_gw: pointer to currently selected gateway node + * @mode: gateway operation: off, client or server (see batadv_gw_modes) + * @sel_class: gateway selection class (applies if gw_mode client) * @bandwidth_down: advertised uplink download bandwidth (if gw_mode server) * @bandwidth_up: advertised uplink upload bandwidth (if gw_mode server) * @reselect: bool indicating a gateway re-selection is in progress @@ -715,6 +717,8 @@ struct batadv_priv_gw { struct hlist_head list; spinlock_t list_lock; /* protects gw_list & curr_gw */ struct batadv_gw_node __rcu *curr_gw; /* rcu protected pointer */ + atomic_t mode; + atomic_t sel_class; atomic_t bandwidth_down; atomic_t bandwidth_up; atomic_t reselect; @@ -865,8 +869,6 @@ struct batadv_priv_bat_v { * enabled * @multicast_mode: Enable or disable multicast optimizations on this node's * sender/originating side - * @gw_mode: gateway operation: off, client or server (see batadv_gw_modes) - * @gw_sel_class: gateway selection class (applies if gw_mode client) * @orig_interval: OGM broadcast interval in milliseconds * @hop_penalty: penalty which will be applied to an OGM's tq-field on every hop * @log_level: configured log level (see batadv_dbg_level) @@ -922,8 +924,6 @@ struct batadv_priv { #ifdef CONFIG_BATMAN_ADV_MCAST atomic_t multicast_mode; #endif - atomic_t gw_mode; - atomic_t gw_sel_class; atomic_t orig_interval; atomic_t hop_penalty; #ifdef CONFIG_BATMAN_ADV_DEBUG

1 0

[batman-adv] master: batman-adv: remove useless inline attribute for sysfs helper function (67bf881)
by postmaster＠open-mesh.org 06 May '16

06 May '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 67bf881129c362d2ab63efcb06c9926fbd66c26c Author: Antonio Quartulli <a(a)unstable.cc> Date: Fri May 6 02:46:37 2016 +0800 batman-adv: remove useless inline attribute for sysfs helper function the compiler can optimize functions within the same C file and therefore there is no need to make it explicit. Remove the useless inline attribute for __batadv_store_uint_attr() Signed-off-by: Antonio Quartulli <a(a)unstable.cc> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 67bf881129c362d2ab63efcb06c9926fbd66c26c net/batman-adv/sysfs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index 414b207..ef5832f 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -389,12 +389,12 @@ static int batadv_store_uint_attr(const char *buff, size_t count, return count; } -static inline ssize_t -__batadv_store_uint_attr(const char *buff, size_t count, - int min, int max, - void (*post_func)(struct net_device *), - const struct attribute *attr, - atomic_t *attr_store, struct net_device *net_dev) +static ssize_t __batadv_store_uint_attr(const char *buff, size_t count, + int min, int max, + void (*post_func)(struct net_device *), + const struct attribute *attr, + atomic_t *attr_store, + struct net_device *net_dev) { int ret;

1 0

[openwrt-feed-devel] master: batman-adv-devel: add compat support for netif_trans_update() (be40569)
by postmaster＠open-mesh.org 05 May '16

05 May '16

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit be405690bda047348f9d1aadfc0431766734901f Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Fri May 6 00:04:59 2016 +0800 batman-adv-devel: add compat support for netif_trans_update() Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- be405690bda047348f9d1aadfc0431766734901f batman-adv-devel/files/compat-hacks.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/batman-adv-devel/files/compat-hacks.h b/batman-adv-devel/files/compat-hacks.h index 5126fc2..a910c2d 100644 --- a/batman-adv-devel/files/compat-hacks.h +++ b/batman-adv-devel/files/compat-hacks.h @@ -74,3 +74,13 @@ batadv_ethtool_get_link_ksettings(struct net_device *dev, } #endif /* < KERNEL_VERSION(4, 6, 0) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) + +#define netif_trans_update batadv_netif_trans_update +static inline void batadv_netif_trans_update(struct net_device *dev) +{ + dev->trans_start = jiffies; +} + +#endif /* < KERNEL_VERSION(4, 7, 0) */

1 0

[openwrt-feed-devel] master: batman-adv-devel: revert partial cfg80211 kernel dependency (a95e850)
by postmaster＠open-mesh.org 05 May '16

05 May '16

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit a95e85070d793422fb316553f06c5b5a0607c028 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Fri May 6 00:02:59 2016 +0800 batman-adv-devel: revert partial cfg80211 kernel dependency The entire batman-adv code relies on the kernel backports introduced by the mac80211 package. Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- a95e85070d793422fb316553f06c5b5a0607c028 batman-adv-devel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 0807332..404b509 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -28,7 +28,7 @@ define KernelPackage/batman-adv-devel URL:=https://www.open-mesh.org/ MAINTAINER:=Marek Lindner <mareklindner(a)neomailbox.ch> SUBMENU:=Network Support - DEPENDS:=+KMOD_BATMAN_ADV_DEVEL_BLA:kmod-lib-crc16 +kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c +KMOD_BATMAN_ADV_DEVEL_BATMAN_V:kmod-cfg80211 + DEPENDS:=+KMOD_BATMAN_ADV_DEVEL_BLA:kmod-lib-crc16 +kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c +kmod-cfg80211 TITLE:=B.A.T.M.A.N. Adv devel FILES:=$(PKG_BUILD_DIR)/net/batman-adv/batman-adv.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,cfg80211 batman-adv)

1 0

[batman-adv] master: batman-adv: Add missing include for container_of (ba17db2)
by postmaster＠open-mesh.org 05 May '16

05 May '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit ba17db26e2d5226c1749195006e258d09b291c45 Author: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Date: Thu May 5 12:35:19 2016 +0200 batman-adv: Add missing include for container_of Fixes: 0d8468553c3c ("batman-adv: remove ogm_emit and ogm_schedule API calls") Signed-off-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- ba17db26e2d5226c1749195006e258d09b291c45 net/batman-adv/bat_iv_ogm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 67bdba1..4815db9 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -30,6 +30,7 @@ #include <linux/if_ether.h> #include <linux/init.h> #include <linux/jiffies.h> +#include <linux/kernel.h> #include <linux/list.h> #include <linux/kref.h> #include <linux/lockdep.h>

1 0

[batman-adv] master: batman-adv: Remove unused work_struct forward declaration (2ceab95)
by postmaster＠open-mesh.org 05 May '16

05 May '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 2ceab95956f05020e9c440f5fd33a45e5ff30126 Author: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Date: Thu May 5 12:35:18 2016 +0200 batman-adv: Remove unused work_struct forward declaration The only function declaration using the "struct work_struct" was removed and thus this forward declaration should also be removed. Fixes: 0d8468553c3c ("batman-adv: remove ogm_emit and ogm_schedule API calls") Signed-off-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 2ceab95956f05020e9c440f5fd33a45e5ff30126 net/batman-adv/send.h | 1 - 1 file changed, 1 deletion(-) diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h index f6fda19..7cecb75 100644 --- a/net/batman-adv/send.h +++ b/net/batman-adv/send.h @@ -26,7 +26,6 @@ #include "packet.h" struct sk_buff; -struct work_struct; void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet); int batadv_send_skb_to_orig(struct sk_buff *skb,

1 0

[batman-adv] master's head updated: batman-adv: Remove unused work_struct forward declaration (2ceab95)
by postmaster＠open-mesh.org 05 May '16

05 May '16

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: c5ebb1b batman-adv: replace dev->trans_start update with helper 55cfcce Merge branch 'next' 2ceab95 batman-adv: Remove unused work_struct forward declaration

1 0

[batman-adv] master: Merge branch 'next' (55cfcce)
by postmaster＠open-mesh.org 05 May '16

05 May '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 55cfcceab90a0b9f234f8066ad0dc71ab99bcb25 Merge: 0d84685 c5ebb1b Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Thu May 5 18:06:04 2016 +0800 Merge branch 'next' >--------------------------------------------------------------- 55cfcceab90a0b9f234f8066ad0dc71ab99bcb25 compat-include/linux/netdevice.h | 10 ++++++++++ net/batman-adv/soft-interface.c | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-)

1 0

[openwrt-feed-devel] master: alfred-devel: initial commit (6667bea)
by postmaster＠open-mesh.org 05 May '16

05 May '16

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 6667bea3a5bc1614d47351eb5b2a045a4ace9b73 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Thu May 5 22:34:55 2016 +0800 alfred-devel: initial commit Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 6667bea3a5bc1614d47351eb5b2a045a4ace9b73 alfred-devel/Config.in | 22 ++++++++ alfred-devel/Makefile | 70 +++++++++++++++++++++++ alfred-devel/files/alfred.config | 8 +++ alfred-devel/files/alfred.init | 118 +++++++++++++++++++++++++++++++++++++++ alfred-devel/files/bat-hosts.lua | 107 +++++++++++++++++++++++++++++++++++ 5 files changed, 325 insertions(+) diff --git a/alfred-devel/Config.in b/alfred-devel/Config.in new file mode 100644 index 0000000..98c409b --- /dev/null +++ b/alfred-devel/Config.in @@ -0,0 +1,22 @@ +config ALFRED_DEVEL_NEEDS_lua + bool + +config ALFRED_DEVEL_NEEDS_libgps + bool + +config PACKAGE_ALFRED_DEVEL_VIS + bool "enable vis server for alfred" + depends on PACKAGE_alfred-devel + default y + +config PACKAGE_ALFRED_DEVEL_BATHOSTS + bool "enable autogeneration of /etc/bat-hosts" + depends on PACKAGE_alfred-devel + select ALFRED_DEVEL_NEEDS_lua + default n + +config PACKAGE_ALFRED_DEVEL_GPSD + bool "enable gpsd service for alfred" + depends on PACKAGE_alfred-devel + select ALFRED_DEVEL_NEEDS_libgps + default n diff --git a/alfred-devel/Makefile b/alfred-devel/Makefile new file mode 100644 index 0000000..df52b2a --- /dev/null +++ b/alfred-devel/Makefile @@ -0,0 +1,70 @@ +# +# Copyright (C) 2013 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=alfred-devel + +PKG_BRANCH:=master +PKG_VERSION:=$(shell git ls-remote https://git@git.open-mesh.org/alfred.git $(PKG_BRANCH) | cut -c1-7) +PKG_ALFRED_FNAME:=alfred-devel-$(PKG_VERSION).tar.gz +PKG_ALFRED_DIR:=alfred-$(PKG_VERSION) + +PKG_SOURCE_URL:=https://git.open-mesh.org/snapshot/ +PKG_SOURCE:=$(PKG_ALFRED_FNAME) + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_ALFRED_DIR) + +include $(INCLUDE_DIR)/package.mk + +init-y := alfred + +define Package/alfred-devel + SECTION:=net + CATEGORY:=Network + TITLE:=Almighty Lightweight Fact Remote Exchange Daemon + DEPENDS:= +libc +kmod-ipv6 +librt \ + +ALFRED_DEVEL_NEEDS_lua:lua \ + +ALFRED_DEVEL_NEEDS_libgps:libgps +endef + +define Package/alfred-devel/conffiles +/etc/config/alfred +endef + +define Package/alfred-devel/config + source "$(SOURCE)/Config.in" +endef + +MAKE_ALFRED_FLAGS=\ + CONFIG_ALFRED_VIS=$(if $(CONFIG_PACKAGE_ALFRED_DEVEL_VIS),y,n) \ + CONFIG_ALFRED_GPSD=$(if $(CONFIG_PACKAGE_ALFRED_DEVEL_GPSD),y,n) \ + CONFIG_ALFRED_CAPABILITIES=n + +TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto +TARGET_LDFLAGS += -Wl,--gc-sections -fuse-linker-plugin + +define Build/Compile + CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" \ + $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) $(MAKE_ALFRED_FLAGS) all +endef + +define Package/alfred-devel/install + $(INSTALL_DIR) $(1)/usr/sbin + cp -fpR $(PKG_BUILD_DIR)/alfred $(1)/usr/sbin/ + [ "x$(CONFIG_PACKAGE_ALFRED_DEVEL_VIS)" == "xy" ] && cp -fpR $(PKG_BUILD_DIR)/vis/batadv-vis $(1)/usr/sbin/ ; true + [ "x$(CONFIG_PACKAGE_ALFRED_DEVEL_GPSD)" == "xy" ] && cp -fpR $(PKG_BUILD_DIR)/gpsd/alfred-gpsd $(1)/usr/sbin/ ; true + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/alfred.init $(1)/etc/init.d/alfred + $(INSTALL_DIR) $(1)/etc/config + $(INSTALL_DATA) ./files/alfred.config $(1)/etc/config/alfred + $(INSTALL_DIR) $(1)/etc/alfred + [ "x$(CONFIG_PACKAGE_ALFRED_DEVEL_BATHOSTS)" == "xy" ] && $(INSTALL_BIN) ./files/bat-hosts.lua $(1)/etc/alfred/bat-hosts.lua ; true +endef + +$(eval $(call BuildPackage,alfred-devel)) diff --git a/alfred-devel/files/alfred.config b/alfred-devel/files/alfred.config new file mode 100644 index 0000000..9d3fff6 --- /dev/null +++ b/alfred-devel/files/alfred.config @@ -0,0 +1,8 @@ +config 'alfred' 'alfred' + option interface 'br-lan' + option mode 'master' + option batmanif 'bat0' + option start_vis '1' + option run_facters '1' +# REMOVE THIS LINE TO ENABLE ALFRED + option disabled '1' diff --git a/alfred-devel/files/alfred.init b/alfred-devel/files/alfred.init new file mode 100755 index 0000000..5ce06c0 --- /dev/null +++ b/alfred-devel/files/alfred.init @@ -0,0 +1,118 @@ +#!/bin/sh /etc/rc.common + +# +# Copyright (C) 2013 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +START=99 +STOP=99 +alfred_args="" +vis_args="" +facters_dir="/etc/alfred" +pid_file_alfred="/var/run/alfred.pid" +pid_file_vis="/var/run/batadv-vis.pid" +enable=0 +vis_enable=0 +SERVICE_DAEMONIZE=1 +SERVICE_WRITE_PID=1 + +wait_for_dir() +{ + local ifce="$1" dir="$2" + + if ! [ -d "$dir" ] ; then + timeout=30 + echo "${initscript}: waiting $timeout secs for $ifce interface..." + for i in $(seq $timeout); do + sleep 1 + [ -d "$dir" ] && break + if [ $i == $timeout ] ; then + echo "${initscript}: $ifce not detected, alfred not starting." + exit 1 + fi + done + fi +} + +alfred_start() +{ + local args="" + local section="$1" + local disabled interface mode + + # check if section is disabled + config_get_bool disabled "$section" disabled 0 + [ $disabled = 0 ] || return 1 + + args="" + + config_get interface "$section" interface + append args "-i $interface" + + config_get mode "$section" mode + [ "$mode" = "master" ] && append args "-m" + + config_get batmanif "$section" batmanif + append args "-b $batmanif" + + if [ "$batmanif" != "none" ]; then + wait_for_dir "$batmanif" "/sys/class/net/$batmanif/mesh" + fi + + wait_for_dir "$interface" "/sys/class/net/$interface/" + + append alfred_args "$args" + enable=1 + + config_get_bool start_vis "$section" start_vis 0 + if [ "$start_vis" = 1 ] && [ -x /usr/sbin/batadv-vis ]; then + vis_enable=1 + append vis_args "-i $batmanif -s" + fi + + config_get_bool run_facters "$section" run_facters 0 + + return 0 +} + +start() +{ + config_load "alfred" + config_foreach alfred_start alfred + + if [ "$enable" = "0" ]; then + exit 0 + fi + + echo "${initscript}: starting alfred" + SERVICE_PID_FILE="$pid_file_alfred" + service_start /usr/sbin/alfred ${alfred_args} + + if [ "$vis_enable" = "1" ]; then + echo "${initscript}: starting batadv-vis" + SERVICE_PID_FILE="$pid_file_vis" + service_start /usr/sbin/batadv-vis ${vis_args} + fi + + if [ "$run_facters" = "1" ]; then + ( for file in $facters_dir/* ; do [ -x $file ] && $file ; done ) + if ! ( grep -q "for file in $facters_dir/\* ; do " /etc/crontabs/root 2>/dev/null ) ; then + echo "*/5 * * * * ( for file in $facters_dir/* ; do [ -x \$file ] && \$file ; done )" >> /etc/crontabs/root + /etc/init.d/cron enable + /etc/init.d/cron restart + fi + fi +} + +stop() +{ + SERVICE_PID_FILE="$pid_file_alfred" + service_stop /usr/sbin/alfred + SERVICE_PID_FILE="$pid_file_vis" + [ -x /usr/sbin/batadv-vis ] && service_stop /usr/sbin/batadv-vis + sed "\|for file in $facters_dir/\* ; do |d" -i /etc/crontabs/root + /etc/init.d/cron restart +} diff --git a/alfred-devel/files/bat-hosts.lua b/alfred-devel/files/bat-hosts.lua new file mode 100644 index 0000000..8648caf --- /dev/null +++ b/alfred-devel/files/bat-hosts.lua @@ -0,0 +1,107 @@ +#!/usr/bin/lua + +local type_id = 64 -- bat-hosts + +function get_hostname() + local hostfile = io.open("/proc/sys/kernel/hostname", "r") + local ret_string = hostfile:read() + hostfile:close() + return ret_string +end + +function get_interfaces_names() + local ret = {} + + for name in io.popen("ls -1 /sys/class/net/"):lines() do + table.insert(ret, name) + end + + return ret +end + +function get_interface_address(name) + local addressfile = io.open("/sys/class/net/"..name.."/address", "r") + local ret_string = addressfile:read() + addressfile:close() + return ret_string +end + + +local function generate_bat_hosts() +-- get hostname and interface macs/names +-- then return a table containing valid bat-hosts lines + local n, i + local ifaces, ret = {}, {} + + local hostname = get_hostname() + + for n, i in ipairs(get_interfaces_names()) do + local address = get_interface_address(i) + if not ifaces[address] then ifaces[address] = i end + end + + for mac, iname in pairs(ifaces) do + if mac:match("^%x%x:%x%x:%x%x:%x%x:%x%x:%x%x$") and not mac:match("00:00:00:00:00:00") then + table.insert(ret, mac.." "..hostname.."_"..iname.."\n") + end + end + + return ret +end + +local function publish_bat_hosts() +-- pass a raw chunk of data to alfred + local fd = io.popen("alfred -s " .. type_id, "w") + if fd then + local ret = generate_bat_hosts() + if ret then + fd:write(table.concat(ret)) + end + fd:close() + end +end + +local function write_bat_hosts(rows) + local content = { "### /tmp/bat-hosts generated by alfred-bat-hosts\n", + "### /!\\ This file is overwritten every 5 minutes /!\\\n", + "### (To keep manual changes, replace /etc/bat-hosts symlink with a static file)\n" } + + -- merge the chunks from all nodes, de-escaping newlines + for _, row in ipairs(rows) do + local node, value = unpack(row) + table.insert(content, "# Node ".. node .. "\n") + table.insert(content, value:gsub("\x0a", "\n") .. "\n") + end + + -- write parsed content down to disk + local fd = io.open("/tmp/bat-hosts", "w") + if fd then + fd:write(table.concat(content)) + fd:close() + end + + -- try to make a symlink in /etc pointing to /tmp, + -- if it exists, ln will do nothing. + os.execute("ln -ns /tmp/bat-hosts /etc/bat-hosts 2>/dev/null") +end + +local function receive_bat_hosts() +-- read raw chunks from alfred, convert them to a nested table and call write_bat_hosts + local fd = io.popen("alfred -r " .. type_id) + --[[ this command returns something like + { "54:e6:fc:b9:cb:37", "00:11:22:33:44:55 ham_wlan0\x0a00:22:33:22:33:22 ham_eth0\x0a" }, + { "90:f6:52:bb:ec:57", "00:22:33:22:33:23 spam\x0a" }, + ]]-- + + if fd then + local output = fd:read("*a") + if output then + assert(loadstring("rows = {" .. output .. "}"))() + write_bat_hosts(rows) + end + fd:close() + end +end + +publish_bat_hosts() +receive_bat_hosts()

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits May 2016