[RFC PATCH 4/9] buildscript: change batman feed to gluon batman-legacy feed
Tobias Klaus
tk+ff at meskal.net
Mo Nov 2 22:43:14 CET 2015
Hier hab ich nur Kleinigkeiten in der Commit-Message gefunden.
Am Sonntag, 25. Oktober 2015, 16:26:23 schrieb Tim Niemeyer:
> I discovered some batman-adv problems with the gateway selection.
> Sometime just the wrong gateway was selected. The gluon project added
Sometimes?
> some batman-adv patches which deals with gateway selection problems.
deal
>
> Signed-off-by: Tim Niemeyer <tim.niemeyer at mastersword.de>
> ---
>
> .../0001-batman-adv-no-rebroadcast-option.patch | 194
> --------------------- buildscript |
> 7 +-
> 2 files changed, 3 insertions(+), 198 deletions(-)
> delete mode 100644
> build_patches/0001-batman-adv-no-rebroadcast-option.patch
>
> diff --git a/build_patches/0001-batman-adv-no-rebroadcast-option.patch
> b/build_patches/0001-batman-adv-no-rebroadcast-option.patch deleted file
> mode 100644
> index f8d9d09..0000000
> --- a/build_patches/0001-batman-adv-no-rebroadcast-option.patch
> +++ /dev/null
> @@ -1,194 +0,0 @@
> -From 3abc4d782dcbf7814646e03d73bd509181a1ccd1 Mon Sep 17 00:00:00 2001
> -From: Tim Niemeyer <tim.niemeyer at mastersword.de>
> -Date: Fri, 22 Nov 2013 18:59:26 +0100
> -Subject: [PATCH] batman-adv: no rebroadcast option
> -
> ----
> - ...man-adv_introduce__no_rebroadcast__option.patch | 176
> ++++++++++++++++++++ - 1 file changed, 176 insertions(+)
> - create mode 100644
> batman-adv/patches/0002-batman-adv_introduce__no_rebroadcast__option.patch
> -
> -diff --git
> a/batman-adv/patches/0002-batman-adv_introduce__no_rebroadcast__option.patc
> h
> b/batman-adv/patches/0002-batman-adv_introduce__no_rebroadcast__option.patc
> h -new file mode 100644
> -index 0000000..57d8491
> ---- /dev/null
> -+++
> b/batman-adv/patches/0002-batman-adv_introduce__no_rebroadcast__option.patc
> h -@@ -0,0 +1,176 @@
> -+This patch introduces a new sysfs option named "no_rebroadcast" on
> -+a per hard interface basis. It allows manually enabling a split-horizon
> -+like behaviour for the layer 2 multicast payload frames, in that
> -+incoming multicast payload frames on such a hard interface are only
> -+being rebroadcasted on all interfaces except the incoming one instead
> -+of being rebroadcasted on all interfaces.
> -+
> -+Such an option should only be enabled if you are certain that these
> -+rebroadcasts are unnecessary. This is usually the case for instance
> -+for point-to-point wifi longshots or wired links.
> -+
> -+This option can especially safe a significant amount of upload overhead
> -+if the neighbourhood on a link is rather large, for instance in some
> -+transitive, symmetric VPN configurations.
> -+
> -+Using this option wrongly will break your mesh network, use this option
> -+wisely and at your own risk!
> -+
> -+Signed-off-by: Linus L�ssing <linus.luessing at web.de>
> -+---
> -+ hard-interface.c | 2 ++
> -+ send.c | 4 +++
> -+ sysfs-class-net-batman-adv | 10 ++++++++
> -+ sysfs.c | 59
> ++++++++++++++++++++++++++++++++++++++++++++ -+ types.h
> | 1 +
> -+ 5 files changed, 76 insertions(+)
> -+
> -+diff --git a/hard-interface.c b/hard-interface.c
> -+index c60d3ed..4c27f05 100644
> -+--- a/hard-interface.c
> -++++ b/hard-interface.c
> -+@@ -602,6 +602,8 @@ batadv_hardif_add_interface(struct net_device
> *net_dev) -+ /* extra reference for return */
> -+ atomic_set(&hard_iface->refcount, 2);
> -+
> -++ atomic_set(&hard_iface->no_rebroadcast, 0);
> -++
> -+ batadv_check_known_mac_addr(hard_iface->net_dev);
> -+ list_add_tail_rcu(&hard_iface->list, &batadv_hardif_list);
> -+
> -+diff --git a/send.c b/send.c
> -+index c83be5e..2a0e0cc 100644
> -+--- a/send.c
> -++++ b/send.c
> -+@@ -496,6 +496,10 @@ static void
> batadv_send_outstanding_bcast_packet(struct work_struct *work) -+ if
> (forw_packet->num_packets >= hard_iface->num_bcasts)
> -+ continue;
> -+
> -++ if (atomic_read(&hard_iface->no_rebroadcast) &&
> -++ forw_packet->skb->dev == hard_iface->net_dev)
> -++ continue;
> -++
> -+ /* send a copy of the saved skb */
> -+ skb1 = skb_clone(forw_packet->skb, GFP_ATOMIC);
> -+ if (skb1)
> -+diff --git a/sysfs-class-net-batman-adv b/sysfs-class-net-batman-adv
> -+index bdc0070..88f6f70 100644
> -+--- a/sysfs-class-net-batman-adv
> -++++ b/sysfs-class-net-batman-adv
> -+@@ -13,3 +13,13 @@ Description:
> -+ displays the batman mesh interface this <iface>
> -+ currently is associated with.
> -+
> -++What: /sys/class/net/<iface>/batman-adv/no_rebroadcast
> -++Date: Sep 2013
> -++Contact: Linus L�ssing <linus.luessing at web.de>
> -++Description:
> -++ With this option set incoming multicast payload frames on
> -++ <iface> are not being rebroadcasted on <iface> again.
> This -++ option should be set on links which are known to be
> transitive -++ and symmetric only, for instance
> point-to-point wifi longshots -++ or wired links. Using this
> option wrongly is going to -++ break your mesh network, use
> at your own risk!
> -+diff --git a/sysfs.c b/sysfs.c
> -+index 096b511..5e2cd21 100644
> -+--- a/sysfs.c
> -++++ b/sysfs.c
> -+@@ -110,6 +110,17 @@ struct batadv_attribute batadv_attr_vlan_##_name =
> { \ -+ .store = _store, \
> -+ };
> -+
> -++/* Use this, if you have customized show and store functions
> -++ * for hard interface attrs
> -++ */
> -++#define BATADV_ATTR_HIF(_name, _mode, _show, _store) \
> -++struct batadv_attribute batadv_attr_hif_##_name = { \
> -++ .attr = {.name = __stringify(_name), \
> -++ .mode = _mode }, \
> -++ .show = _show, \
> -++ .store = _store, \
> -++};
> -++
> -+ /* Use this, if you have customized show and store functions */
> -+ #define BATADV_ATTR(_name, _mode, _show, _store) \
> -+ struct batadv_attribute batadv_attr_##_name = { \
> -+@@ -215,6 +226,52 @@ ssize_t batadv_show_vlan_##_name(struct kobject
> *kobj, \ -+ static BATADV_ATTR_VLAN(_name, _mode,
> batadv_show_vlan_##_name, \ -+
batadv_store_vlan_##_name)
> -+
> -++#define BATADV_ATTR_HIF_STORE_BOOL(_name, _post_func) \
> -++ssize_t batadv_store_hif_##_name(struct kobject *kobj, \
> -++ struct attribute *attr, char *buff, \
> -++ size_t count) \
> -++{ \
> -++ struct net_device *net_dev = batadv_kobj_to_netdev(kobj); \
> -++ struct batadv_hard_iface *hard_iface; \
> -++ size_t res; \
> -++ \
> -++ hard_iface = batadv_hardif_get_by_netdev(net_dev); \
> -++ if (!hard_iface) \
> -++ return 0; \
> -++ \
> -++ res = __batadv_store_bool_attr(buff, count, _post_func, \
> -++ attr, &hard_iface->_name, \
> -++ hard_iface->soft_iface); \
> -++ batadv_hardif_free_ref(hard_iface); \
> -++ return res; \
> -++}
> -++
> -++#define BATADV_ATTR_HIF_SHOW_BOOL(_name) \
> -++ssize_t batadv_show_hif_##_name(struct kobject *kobj, \
> -++ struct attribute *attr, char *buff) \
> -++{ \
> -++ struct net_device *net_dev = batadv_kobj_to_netdev(kobj); \
> -++ struct batadv_hard_iface *hard_iface; \
> -++ size_t res; \
> -++ \
> -++ hard_iface = batadv_hardif_get_by_netdev(net_dev); \
> -++ if (!hard_iface) \
> -++ return 0; \
> -++ \
> -++ res = sprintf(buff, "%s\n", \
> -++ atomic_read(&hard_iface->_name) == 0 ? \
> -++ "disabled" : "enabled"); \
> -++ batadv_hardif_free_ref(hard_iface); \
> -++ return res; \
> -++}
> -++
> -++/* Use this, if you are going to turn a [name] in the vlan struct on or
> off */ -++#define BATADV_ATTR_HIF_BOOL(_name, _mode, _post_func) \
> -++ static BATADV_ATTR_HIF_STORE_BOOL(_name, _post_func) \
> -++ static BATADV_ATTR_HIF_SHOW_BOOL(_name) \
> -++ static BATADV_ATTR_HIF(_name, _mode, batadv_show_hif_##_name, \
> -++ batadv_store_hif_##_name)
> -++
> -+ static int batadv_store_bool_attr(char *buff, size_t count,
> -+ struct net_device *net_dev,
> -+ const char *attr_name, atomic_t *attr)
> -+@@ -750,10 +807,12 @@ static ssize_t batadv_show_iface_status(struct
> kobject *kobj, -+ static BATADV_ATTR(mesh_iface, S_IRUGO | S_IWUSR,
> batadv_show_mesh_iface, -+ batadv_store_mesh_iface);
> -+ static BATADV_ATTR(iface_status, S_IRUGO, batadv_show_iface_status,
> NULL); -++BATADV_ATTR_HIF_BOOL(no_rebroadcast, S_IRUGO | S_IWUSR, NULL);
> -+
> -+ static struct batadv_attribute *batadv_batman_attrs[] = {
> -+ &batadv_attr_mesh_iface,
> -+ &batadv_attr_iface_status,
> -++ &batadv_attr_hif_no_rebroadcast,
> -+ NULL,
> -+ };
> -+
> -+diff --git a/types.h b/types.h
> -+index f323822..b5a5824 100644
> -+--- a/types.h
> -++++ b/types.h
> -+@@ -76,6 +76,7 @@ struct batadv_hard_iface {
> -+ struct rcu_head rcu;
> -+ struct batadv_hard_iface_bat_iv bat_iv;
> -+ struct work_struct cleanup_work;
> -++ atomic_t no_rebroadcast;
> -+ };
> -+
> -+ /**
> -+--
> -+1.7.10.4
> -+
> ---
> -1.7.10.4
> diff --git a/buildscript b/buildscript
> index f60ec00..197bc9f 100755
> --- a/buildscript
> +++ b/buildscript
> @@ -18,10 +18,9 @@ OPENWRT_PKGS="bridge gpioctl-sysfs libugpio mii-tool
> kmod-gpiotoggling fastd" ## Be careful: FFF uses COMPAT_VERSION 14 at the
> moment.
> ## See http://www.open-mesh.org/projects/batman-adv/wiki/Compatversion
> BATMAN_ADV=(batman_adv
> - https://github.com/openwrt-routing/packages.git
> - 44318d05898069300ce2ad6eb05eb40f232e7123
> -
> ../../../build_patches/0001-batman-adv-no-rebroadcast-option.patch)
> -BATMAN_ADV_PKGS="kmod-batman-adv"
> + https://github.com/freifunk-gluon/packages.git
> + 3b67a18a51ee0d3545fb6a3da3d5b30d9482ae7e)
> +BATMAN_ADV_PKGS="kmod-batman-adv-legacy"
>
> #official openwrt routing packages
> ROUTING=(routing
Mehr Informationen über die Mailingliste franken-dev