From dc9b995c1e0ecb894b86f79c69b35c4cceb62cb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Gaul?= <gaul@web-yard.de>
Date: Fri, 23 May 2014 19:55:05 +0200
Subject: [PATCH 001/368] [alfred] fix missing alfred-gpsd binary

fixes #22

Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
 alfred/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/alfred/Makefile b/alfred/Makefile
index 648a5ef..de1a801 100644
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -73,7 +73,7 @@ define Package/alfred/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	cp -fpR  $(PKG_BUILD_DIR)/alfred $(1)/usr/sbin/
 	[ "x$(CONFIG_PACKAGE_ALFRED_VIS)" == "xy" ] && cp -fpR  $(PKG_BUILD_DIR)/vis/batadv-vis $(1)/usr/sbin/ ; true
-	[ "x$(CONFIG_PACKAGE_ALFRED_GPSD)" == "xy" ] && cp -fpR  $(PKG_BUILD_DIR)/vis/alfred-gpsd $(1)/usr/sbin/ ; true
+	[ "x$(CONFIG_PACKAGE_ALFRED_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

From ee80086e1ad08b6dc554b3945373347dfee10f48 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Mon, 15 Sep 2014 11:51:21 +0200
Subject: [PATCH 002/368] miniupnpd: bump to 1.8.20140906

Signed-off-by: Steven Barth <steven@midlink.org>
---
 miniupnpd/Makefile                                |  6 +++---
 miniupnpd/patches/100-no-ssl.patch                |  4 +---
 miniupnpd/patches/101-ipv6-pinhole.patch          | 13 -------------
 miniupnpd/patches/102-ipv6-ext-port.patch         | 10 ++++------
 miniupnpd/patches/103-nat-pmp-fix-writenu16.patch | 11 -----------
 5 files changed, 8 insertions(+), 36 deletions(-)
 delete mode 100644 miniupnpd/patches/101-ipv6-pinhole.patch
 delete mode 100644 miniupnpd/patches/103-nat-pmp-fix-writenu16.patch

diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index af9a940..139320f 100644
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
-PKG_VERSION:=1.8.20140523
-PKG_RELEASE:=4
+PKG_VERSION:=1.8.20140906
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=fcac89e11da091b1cc61f43d83c9e4f5
+PKG_MD5SUM:=72a68c5757031d906a555f84e9a2a8f2
 
 PKG_MAINTAINER:=Markus Stenberg <fingon@iki.fi>
 
diff --git a/miniupnpd/patches/100-no-ssl.patch b/miniupnpd/patches/100-no-ssl.patch
index f058c3b..343e615 100644
--- a/miniupnpd/patches/100-no-ssl.patch
+++ b/miniupnpd/patches/100-no-ssl.patch
@@ -1,8 +1,6 @@
-diff --git a/Makefile.linux b/Makefile.linux
-index bcca779..7946108 100644
 --- a/Makefile.linux
 +++ b/Makefile.linux
-@@ -147,7 +147,8 @@ LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libmnl)
+@@ -147,7 +147,8 @@ LDLIBS += $(shell $(PKG_CONFIG) --static
  LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libnetfilter_conntrack)
  endif # ($(TEST),1)
  
diff --git a/miniupnpd/patches/101-ipv6-pinhole.patch b/miniupnpd/patches/101-ipv6-pinhole.patch
deleted file mode 100644
index 0ab4d4d..0000000
--- a/miniupnpd/patches/101-ipv6-pinhole.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/netfilter/iptpinhole.c b/netfilter/iptpinhole.c
-index 61ed41b..5cb0e0e 100644
---- a/netfilter/iptpinhole.c
-+++ b/netfilter/iptpinhole.c
-@@ -206,6 +206,8 @@ int add_pinhole(const char * ifname,
- 
- 	e = calloc(1, sizeof(struct ip6t_entry));
- 	e->ipv6.proto = proto;
-+	if (proto)
-+		e->ipv6.flags |= IP6T_F_PROTO;
- 
- 	if(ifname)
- 		strncpy(e->ipv6.iniface, ifname, IFNAMSIZ);
diff --git a/miniupnpd/patches/102-ipv6-ext-port.patch b/miniupnpd/patches/102-ipv6-ext-port.patch
index d0c68ae..fdb2af4 100644
--- a/miniupnpd/patches/102-ipv6-ext-port.patch
+++ b/miniupnpd/patches/102-ipv6-ext-port.patch
@@ -1,12 +1,10 @@
-diff --git a/pcpserver.c b/pcpserver.c
-index dec4b58..3cdf460 100644
 --- a/pcpserver.c
 +++ b/pcpserver.c
-@@ -1020,6 +1020,7 @@ static int CreatePCPMap_FW(pcp_info_t *pcp_msg_info)
- 					&uid);
+@@ -1004,6 +1004,7 @@ static int CreatePCPMap_NAT(pcp_info_t *
+ 				   timestamp);
  	if (r < 0)
  		return PCP_ERR_NO_RESOURCES;
 +	pcp_msg_info->ext_port = pcp_msg_info->int_port;
  	return PCP_SUCCESS;
- #else
- 	return PCP_ERR_NO_RESOURCES;
+ }
+ 
diff --git a/miniupnpd/patches/103-nat-pmp-fix-writenu16.patch b/miniupnpd/patches/103-nat-pmp-fix-writenu16.patch
deleted file mode 100644
index 6e94ad8..0000000
--- a/miniupnpd/patches/103-nat-pmp-fix-writenu16.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/natpmp.c
-+++ b/natpmp.c
-@@ -54,7 +54,7 @@ INLINE void writenu32(uint8_t * p, uint3
- #define WRITENU32(p, n) writenu32(p, n)
- INLINE void writenu16(uint8_t * p, uint16_t n)
- {
--	p[0] = (n < 0xff00) >> 8;
-+	p[0] = (n & 0xff00) >> 8;
- 	p[1] = n & 0xff;
- }
- #define WRITENU16(p, n) writenu16(p, n)

From d7a3c105864568993717738c841c5f220a75fef6 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Fri, 26 Sep 2014 09:33:42 +0200
Subject: [PATCH 003/368] hnetd: stability and bug fixes

---
 hnetd/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hnetd/Makefile b/hnetd/Makefile
index c9d7ce6..4ca21d3 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -7,9 +7,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hnetd
-PKG_SOURCE_VERSION:=91aaab8bdd4de8bc96ad906673a79a6600cf93ac
-PKG_VERSION:=2014-09-02-$(PKG_SOURCE_VERSION)
-PKG_RELEASE:=2
+PKG_SOURCE_VERSION:=0c1d55d03983c726aaad010738236c2da64ca7df
+PKG_VERSION:=2014-09-26-$(PKG_SOURCE_VERSION)
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/sbyx/hnetd.git

From 416e1d77494809ff24dae70a5c2d1d1a5351585c Mon Sep 17 00:00:00 2001
From: Andreas Thienemann <andreas@bawue.net>
Date: Sun, 28 Sep 2014 16:52:25 +0200
Subject: [PATCH 004/368] Prevent miniupnpd compile failure when building IPv4
 only.

---
 .../patches/103-no-ipv6-autodetection.patch   | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 miniupnpd/patches/103-no-ipv6-autodetection.patch

diff --git a/miniupnpd/patches/103-no-ipv6-autodetection.patch b/miniupnpd/patches/103-no-ipv6-autodetection.patch
new file mode 100644
index 0000000..acef536
--- /dev/null
+++ b/miniupnpd/patches/103-no-ipv6-autodetection.patch
@@ -0,0 +1,29 @@
+The miniupnpd makefile tries to autodetect iptables capabilities.
+This will incorrectly detect capabilities such as ipv6 support even though it is disabled for the target build.
+
+As the OpenWRT buildsystem already passes the right compile flags, we can skip the autodetection.
+
+
+diff -up miniupnpd-1.8.20140906/netfilter/Makefile.orig miniupnpd-1.8.20140906/netfilter/Makefile
+--- miniupnpd-1.8.20140906/netfilter/Makefile.orig	2014-09-28 16:39:56.652296642 +0200
++++ miniupnpd-1.8.20140906/netfilter/Makefile	2013-12-13 14:12:11.000000000 +0100
+@@ -38,6 +38,4 @@ endif
+ endif
+ endif
+ 
+-LIBS +=  /lib/libip4tc.so /lib/libip6tc.so
+-
+ all:	iptcrdr.o testiptcrdr iptpinhole.o \
+         testiptcrdr_peer testiptcrdr_dscp test_nfct_get
+ #        testiptpinhole
+diff -up miniupnpd-1.8.20140906/Makefile.linux.orig miniupnpd-1.8.20140906/Makefile.linux
+--- miniupnpd-1.8.20140906/Makefile.linux.orig	2014-09-28 16:46:06.781835136 +0200
++++ miniupnpd-1.8.20140906/Makefile.linux	2014-09-28 16:46:14.388907413 +0200
+@@ -70,7 +70,6 @@ CPPFLAGS += -DIPTABLES_143
+ endif
+ 
+ CFLAGS  += $(shell $(PKG_CONFIG) --cflags libiptc)
+-LDLIBS  += $(shell $(PKG_CONFIG) --static --libs-only-l libiptc)
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L libiptc)
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-other libiptc)
+ else

From 76a1f8109dbcd95b2998678f7a0887b0b68d4d4e Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Mon, 29 Sep 2014 11:03:54 +0300
Subject: [PATCH 005/368] ohybridproxy: Added -4 and -6 options to explicitly
 specify AF.

---
 ohybridproxy/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ohybridproxy/Makefile b/ohybridproxy/Makefile
index 2680a9b..6ed8b91 100644
--- a/ohybridproxy/Makefile
+++ b/ohybridproxy/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ohybridproxy
-PKG_SOURCE_VERSION:=3a9489615c488afa85a823a40aea89b39bbac391
-PKG_VERSION:=2014-06-19-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=ab6559bd5df88967e08478ab486b307c1b7eb759
+PKG_VERSION:=2014-09-29-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git

From f874b34485d482a6cf84049448b81ffb7df7eb1a Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Tue, 30 Sep 2014 19:31:44 +0200
Subject: [PATCH 006/368] hnetd: remove exit statement in postinst script

---
 hnetd/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hnetd/Makefile b/hnetd/Makefile
index 4ca21d3..25cbd60 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -101,7 +101,6 @@ define Package/hnetd/postinst
 	/etc/init.d/hnetd enable
 	/etc/init.d/hnetd start
 }
-exit 0
 endef
 
 $(eval $(call BuildPackage,hnetd))

From 3c424899edefabac04dd40093b5f5393998b51cb Mon Sep 17 00:00:00 2001
From: Marek Lindner <mareklindner@neomailbox.ch>
Date: Mon, 13 Oct 2014 14:07:10 +0800
Subject: [PATCH 007/368] batman-adv: upgrade package to latest release
 2014.3.0

Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
 batman-adv/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 889dea7..6103cd2 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
 
-PKG_VERSION:=2014.2.0
+PKG_VERSION:=2014.3.0
 PKG_RELEASE:=1
-PKG_MD5SUM:=1243029b3a3e2f4fa721d1a59c2faaf5
+PKG_MD5SUM:=e9ee1d42ff4b0254699c779668054bed
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From 93f7d5cacb64aa229e5aa17e95d0b2761ab2e675 Mon Sep 17 00:00:00 2001
From: Marek Lindner <mareklindner@neomailbox.ch>
Date: Mon, 13 Oct 2014 14:07:34 +0800
Subject: [PATCH 008/368] batctl: upgrade package to latest release 2014.3.0

Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
 batctl/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/batctl/Makefile b/batctl/Makefile
index ae22286..43c9098 100644
--- a/batctl/Makefile
+++ b/batctl/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batctl
 
-PKG_VERSION:=2014.2.0
+PKG_VERSION:=2014.3.0
 PKG_RELEASE:=1
-PKG_MD5SUM:=c196cf95b7324d9123b701a56b06b31d
+PKG_MD5SUM:=7d2b8c129424c014d020c4b1a2add31b
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From 8bc38fccc73b40e9599b897e335f2e7a5a67e879 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Wed, 15 Oct 2014 23:05:34 +0200
Subject: [PATCH 009/368] miniupnpd: avoid unnecessary restarts, add SPDX tag

---
 miniupnpd/Makefile                |  3 ++-
 miniupnpd/files/miniupnpd.hotplug | 29 ++++++++++++++++++-----------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index 139320f..4575dad 100644
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
 PKG_VERSION:=1.8.20140906
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MD5SUM:=72a68c5757031d906a555f84e9a2a8f2
 
 PKG_MAINTAINER:=Markus Stenberg <fingon@iki.fi>
+PKG_LICENSE:=BSD-3-Clause
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/miniupnpd/files/miniupnpd.hotplug b/miniupnpd/files/miniupnpd.hotplug
index 09a4913..8b643f1 100644
--- a/miniupnpd/files/miniupnpd.hotplug
+++ b/miniupnpd/files/miniupnpd.hotplug
@@ -16,22 +16,29 @@ fi
 
 [ ! "$ACTION" = "ifup" ] && service_check /usr/sbin/miniupnpd && exit 0
 
-# DEVICE is set only in ifup as of 20140625 netifd
-[ -z "$DEVICE" ] && network_get_device DEVICE $INTERFACE
-
 local iface
-local ext_iface
-local ext_iface6
+local ifname
+local tmpconf="/var/etc/miniupnpd.conf"
+local extiface=$(uci get upnpd.config.external_iface)
+local extzone=$(uci get upnpd.config.external_zone)
 
 . /lib/functions/network.sh
-network_find_wan ext_iface
-network_find_wan6 ext_iface6
 
-for iface in $ext_iface $ext_iface6 $(uci_get upnpd config internal_iface; uci_get upnpd config external_iface); do
+for iface in $(uci get upnpd.config.internal_iface); do
     network_get_device device $iface
     [ "$DEVICE" = "$device" ] && /etc/init.d/miniupnpd restart && exit 0
 done
 
-for device in $(fw3 -q zone `uci_get upnpd config external_zone`); do
-    [ "$DEVICE" = "$device" ] && /etc/init.d/miniupnpd restart && exit 0
-done
+
+if [ -z "$extiface" ] ; then
+  # manual external zone (if dynamically find interfaces
+  # belonging to it) overrides network_find_wan*
+  if [ -n "$extzone" ] ; then
+    ifname=$(fw3 -q zone $extzone | head -1)
+  fi
+  [ -n "$extiface" ] || network_find_wan extiface
+  [ -n "$extiface" ] || network_find_wan6 extiface
+fi
+
+[ -n "$ifname" ] || network_get_device ifname ${extiface}
+grep -q "ext_ifname=$ifname" $tmpconf || /etc/init.d/miniupnpd restart

From 8374881b3c9772320e942a7554392d1a1635ffbf Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Wed, 15 Oct 2014 23:07:34 +0200
Subject: [PATCH 010/368] babels: add SPDX tag

---
 babels/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/babels/Makefile b/babels/Makefile
index 2652c00..521dea5 100644
--- a/babels/Makefile
+++ b/babels/Makefile
@@ -15,6 +15,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/boutier/babeld.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_LICENSE:=MIT
 
 include $(INCLUDE_DIR)/package.mk
 

From 21e4cc47bd7a2f84d2f656bafa161eaff2794f38 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Wed, 15 Oct 2014 23:07:59 +0200
Subject: [PATCH 011/368] pim6sd/mcast-tools: abandon package

---
 mcast-tools/Makefile                          |  62 -----
 mcast-tools/files/pim6sd.conf                 | 105 --------
 mcast-tools/files/pim6sd.init                 |  14 --
 ...0001-Fix-compilation-on-recent-Linux.patch |  90 -------
 ...x-configure.in-for-cross-compilation.patch |  49 ----
 ...03-Add-compatibility-code-for-uclibc.patch | 227 ------------------
 .../0004-fix_linux_pim.h_include.patch        |  11 -
 7 files changed, 558 deletions(-)
 delete mode 100644 mcast-tools/Makefile
 delete mode 100644 mcast-tools/files/pim6sd.conf
 delete mode 100644 mcast-tools/files/pim6sd.init
 delete mode 100644 mcast-tools/patches/0001-Fix-compilation-on-recent-Linux.patch
 delete mode 100644 mcast-tools/patches/0002-Fix-configure.in-for-cross-compilation.patch
 delete mode 100644 mcast-tools/patches/0003-Add-compatibility-code-for-uclibc.patch
 delete mode 100644 mcast-tools/patches/0004-fix_linux_pim.h_include.patch

diff --git a/mcast-tools/Makefile b/mcast-tools/Makefile
deleted file mode 100644
index 7a918bd..0000000
--- a/mcast-tools/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Copyright (C) 2014 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:=mcast-tools
-PKG_SOURCE_VERSION:=e5c860f174c6deb4cc30211e895831aca0a55b7f
-PKG_VERSION:=2014-04-06
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/F0rth/mcast-tools.git
-PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-CONFIGURE_ARGS+=--enable-mldv2host --disable-pim6dd --disable-mcastread --disable-mcastsend --disable-mfc --disable-mtrace6 --disable-pmsft
-TARGET_CFLAGS+=-DIP6OPT_RTALERT_LEN=4 -D_GNU_SOURCE
-
-define Package/pim6sd
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Routing and Redirection
-  TITLE:=Sparse PIM IPv6 Multicast Routing Daemon
-endef
-
-define Package/pim6sd/description
- pim6sd is an IPv6 multicast routing daemon, which supports PIMv2(Protocol
- Independent Multicast Version 2) sparse mode and SSM(Source-Specific-
- Multicast) for IPv6.
-endef
-
-define Package/pim6sd/conffiles
-/etc/pim6sd.conf
-endef
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	( cd $(PKG_BUILD_DIR) ; \
-		aclocal ; \
-		autoheader ; \
-		automake --add-missing; \
-		autoconf ; \
-	)
-endef
-
-define Package/pim6sd/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_CONF) ./files/pim6sd.conf $(1)/etc
-	$(INSTALL_BIN) ./files/pim6sd.init $(1)/etc/init.d/pim6sd
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/pim6sd/pim6sd $(1)/usr/sbin/pim6sd
-endef
-
-$(eval $(call BuildPackage,pim6sd))
diff --git a/mcast-tools/files/pim6sd.conf b/mcast-tools/files/pim6sd.conf
deleted file mode 100644
index 63e1223..0000000
--- a/mcast-tools/files/pim6sd.conf
+++ /dev/null
@@ -1,105 +0,0 @@
-#The timer granularity.
-#More this value is small,more pim6sd will be accurate 
-#default if not specified : 5
-#BE SURE to have to same granularity on ALL routers,
-#otherwise....
-
-#granularity 5;
-
-#syntax : phyint <interface> <disable> <metric> [metric] <preference> [preference]
-#metric and pref are for the asserts messages
-#samples :
-
-#phyint ed1 disable;
-#phyint de0 disable;
-#phyint ed0 disable;
-#phyint gif0 disable;
-
-#---------------Protocol timer specifications---------------------------#
-#Notes : theses value are the default spec value!
-#do not touch it if you don't know what you do!!
-#you MUST change theses values according to the granularity value!
-#syntax :  'hello_period <number> <coef>'.
-# number is the period in second between 2 hello messages
-# and coef is the coef to determine the hello holdtime=hello_period*coef
-# default if not specified: 30 3.5
-
-#hello_period 30 3.5;
-
-#syntax :  'join_prune_period <number> <coef>'.
-# number is the period in second between 2 join/prune messages
-# and coef is the coef to determine the join/prune holdtime=join_prune_period*coef
-# default if not specified : 60 3.5
-
-#join_prune_period 60 3.5;
-
-#syntax :  'data_timeout <number>'.
-# number is the time after which (S,G) state for a silent source will be deleted
-# default if not specified  : 210 
-
-#data_timeout 210;
-
-#syntax :  'register_suppression_timeout <number>'.
-# This is the mean interval between receiving a Register-Stop and allowing
-#Register to be send again.
-# default if not specified  : 60
-
-#register_suppression_timeout 60;
-
-#syntax :  'probe_time <number>'.
-#This is the time between sending a null Register and the Register-Suppression-Timer
-#expiring unless it is restarted by receiving a Register-Stop.
-#default if not specified : 5
-
-#probe_time 5;
-
-#syntax :  'assert_timeout <number>'.
-#this is the interval between the last time an Assert is received and the time at which the 
-#assert is timeout
-#default if not specified : 180
-
-#assert_timeout 180;
-
-#syntax : <cand_rp> <interface> <time> [time] <priority> [priority]
-#and time can't be <  10 
-#you can just type cand_rp, 
-#samples :
-#cand_rp;
-#cand_rp de0;
-#cand_rp ed0 priority 0 time 6;
-
-#syntax : <group_prefix> <multicast address>/<prefix length>
-#group_prefix ff06::15 
-#default if not specified : ff00::/8
-#samples:
-#group_prefix ff1e::15/128;
-#group_prefix ff2e::/16;
-
-#syntax : <cand_bootstrap_router> <interface> <priority> [priority] <time> [time]
-#Typically, you can simply set cand_bootstrap_router for a candidate bootstrap
-#router. All other parameters are optional.
-#the bootstrap period is configurable, BUT the holdtime of a bootstrap
-#router is not in the fields of a bootstrap message : it is hard-coded
-#in the pim6sd include file!
-#So be sure to have a time < PIM_BOOTSTRAP_TIMEOUT (file pimd.h )
-#cand_bootstrap_router de0 priority 15 time 5;
-
-#syntax : <switch_register_threshold> <rate> [number] <interval> [number]
-#default rate = 50000 interval = 20s
-#samples :
-#TODO : not tested
-#switch_register_threshold rate 54389 interval 45;
-#switch_register_threshold;
-
-#syntax : <switch_data_threshold> <rate> [number] <interval> [number]
-#default rate = 50000 interval = 20s
-#TODO : not tested
-#samples:
-#switch_data_threshold interval 100 rate 1000;
-
-#syntax : <default_source_metric> [number]
-
-#default_source_metric 1243;
-#syntax : <default_source_preference> [number]
-
-#default_source_preference 123 ;
diff --git a/mcast-tools/files/pim6sd.init b/mcast-tools/files/pim6sd.init
deleted file mode 100644
index bb98ba3..0000000
--- a/mcast-tools/files/pim6sd.init
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=50
-USE_PROCD=1
-
-start_service() {
-	procd_open_instance
-
-	procd_set_param command /usr/sbin/pim6sd
-	procd_append_param command -f -c /etc/pim6sd.conf
-
-	procd_set_param respawn
-	procd_close_instance
-}
diff --git a/mcast-tools/patches/0001-Fix-compilation-on-recent-Linux.patch b/mcast-tools/patches/0001-Fix-compilation-on-recent-Linux.patch
deleted file mode 100644
index 0ef6884..0000000
--- a/mcast-tools/patches/0001-Fix-compilation-on-recent-Linux.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 179b60f9d6a8a104fd8d1f810d105ddba914cc7a Mon Sep 17 00:00:00 2001
-From: Steven Barth <steven@midlink.org>
-Date: Thu, 3 Apr 2014 09:09:06 +0200
-Subject: [PATCH 1/3] Fix compilation on recent Linux
-
----
- pim6sd/debug.c | 6 +++---
- pim6sd/mld6.c  | 8 ++++----
- pim6sd/trace.c | 8 ++++++++
- 3 files changed, 15 insertions(+), 7 deletions(-)
-
-diff --git a/pim6sd/debug.c b/pim6sd/debug.c
-index a06a876..a96e949 100644
---- a/pim6sd/debug.c
-+++ b/pim6sd/debug.c
-@@ -169,7 +169,7 @@ packet_kind(proto, type, code)
- 	    return "Multicast Listener Query    ";
- 	case MLD_LISTENER_REPORT:
- 	    return "Multicast Listener Report   ";
--	case MLD_LISTENER_DONE:
-+	case MLD_LISTENER_REDUCTION:
- 	    return "Multicast Listener Done     ";
- 	default:
- 	    snprintf(unknown, sizeof(unknown),
-@@ -230,7 +230,7 @@ debug_kind(proto, type, code)
- 	    return DEBUG_MLD;
- 	case MLD_LISTENER_REPORT:
- 	    return DEBUG_MLD;
--	case MLD_LISTENER_DONE:
-+	case MLD_LISTENER_REDUCTION:
- 	    return DEBUG_MLD;
- 	default:
- 	    return DEBUG_MLD;
-@@ -574,7 +574,7 @@ dump_nbrs(fp)
- 				if (n->options_bitmap & PIM_HELLO_GENID_BIT)
- 					fprintf(fp, " %-8x", n->genid);
- 				else
--					fprintf(fp, " %-8x", "-");
-+					fprintf(fp, " %-8s", "-");
- 				if (v->uv_pim_dr == n)
- 					fprintf(fp, " D");
- 				fprintf(fp, "\n");
-diff --git a/pim6sd/mld6.c b/pim6sd/mld6.c
-index d828bbf..0bac85d 100644
---- a/pim6sd/mld6.c
-+++ b/pim6sd/mld6.c
-@@ -207,9 +207,9 @@ init_mld6()
- 
-     /* filter all non-MLD ICMP messages */
-     ICMP6_FILTER_SETBLOCKALL(&filt);
--    ICMP6_FILTER_SETPASS(ICMP6_MEMBERSHIP_QUERY, &filt);
--    ICMP6_FILTER_SETPASS(ICMP6_MEMBERSHIP_REPORT, &filt);
--    ICMP6_FILTER_SETPASS(ICMP6_MEMBERSHIP_REDUCTION, &filt);
-+    ICMP6_FILTER_SETPASS(MLD_LISTENER_QUERY, &filt);
-+    ICMP6_FILTER_SETPASS(MLD_LISTENER_REPORT, &filt);
-+    ICMP6_FILTER_SETPASS(MLD_LISTENER_REDUCTION, &filt);
- #ifdef MLD_MTRACE_RESP
-     ICMP6_FILTER_SETPASS(MLD_MTRACE_RESP, &filt);
-     ICMP6_FILTER_SETPASS(MLD_MTRACE, &filt);
-@@ -448,7 +448,7 @@ accept_mld6(recvlen)
- 		accept_listener_report(src, dst, group);
- 		return;
- 
--	case MLD_LISTENER_DONE:
-+	case MLD_LISTENER_REDUCTION:
- 		accept_listener_done(src, dst, group);
- 		return;
- 
-diff --git a/pim6sd/trace.c b/pim6sd/trace.c
-index e361633..175c858 100644
---- a/pim6sd/trace.c
-+++ b/pim6sd/trace.c
-@@ -110,6 +110,14 @@
- #include "rp.h"
- #include "trace.h"
- 
-+#ifndef MLD_MTRACE_RESP
-+#  define MLD_MTRACE_RESP     200
-+#endif
-+
-+#ifndef MLD_MTRACE
-+#  define MLD_MTRACE          201
-+#endif
-+
- /* TODO */
- /*
-  * Traceroute function which returns traceroute replies to the requesting
--- 
-1.8.3.2
-
diff --git a/mcast-tools/patches/0002-Fix-configure.in-for-cross-compilation.patch b/mcast-tools/patches/0002-Fix-configure.in-for-cross-compilation.patch
deleted file mode 100644
index 47fce71..0000000
--- a/mcast-tools/patches/0002-Fix-configure.in-for-cross-compilation.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 52e110289fcc0990688e16e640ca5e7f01c66bb1 Mon Sep 17 00:00:00 2001
-From: Steven Barth <steven@midlink.org>
-Date: Sun, 6 Apr 2014 17:46:42 +0200
-Subject: [PATCH 23/23] Fix configure.in for cross-compilation
-
----
- configure.in | 26 ++------------------------
- 1 file changed, 2 insertions(+), 24 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index b8446e2..e626a19 100644
---- a/configure.in
-+++ b/configure.in
-@@ -170,30 +170,8 @@ fi
- AC_MSG_RESULT($enable_mldv2host)
- 
- dnl Determine routing get and set method
--AC_MSG_CHECKING(userland-kernel interface for routing information)
--AC_TRY_RUN([#include <errno.h>
--#include <sys/types.h>
--#include <sys/socket.h>
--
--main ()
--{
--#ifdef AF_NETLINK
--  exit(1);
--#else
--  int ac_sock;
--
--  ac_sock = socket (AF_ROUTE, SOCK_RAW, 0);
--  if (ac_sock < 0 && errno == EINVAL)
--    exit (1);
--  exit (0);
--#endif
--}],
--	[AC_DEFINE(HAVE_ROUTING_SOCKETS)
--	 UK_METHOD=routesock
--	 AC_MSG_RESULT(routing socket)],
--	[AC_DEFINE(HAVE_NETLINK)
--	 UK_METHOD=netlink
--	 AC_MSG_RESULT(netlink)])
-+AC_DEFINE(HAVE_NETLINK)
-+UK_METHOD=netlink
- AC_SUBST(UK_METHOD)
- 
- dnl Checks for RFC3542
--- 
-1.9.1
-
diff --git a/mcast-tools/patches/0003-Add-compatibility-code-for-uclibc.patch b/mcast-tools/patches/0003-Add-compatibility-code-for-uclibc.patch
deleted file mode 100644
index 55cec6a..0000000
--- a/mcast-tools/patches/0003-Add-compatibility-code-for-uclibc.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-From 50bcf257f5f7d359d06744128585103f19072ee3 Mon Sep 17 00:00:00 2001
-From: Steven Barth <steven@midlink.org>
-Date: Thu, 10 Apr 2014 18:56:53 +0200
-Subject: [PATCH] Add compatibility code for uclibc
-
----
- pim6sd/cftoken.l      |   5 ++
- pim6sd/inet6_compat.c | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++
- pim6sd/mld6.c         |   4 ++
- pim6sd/mld6v2.c       |   5 ++
- 4 files changed, 175 insertions(+)
- create mode 100644 pim6sd/inet6_compat.c
-
-diff --git a/pim6sd/cftoken.l b/pim6sd/cftoken.l
-index 17479d0..5b20741 100644
---- a/pim6sd/cftoken.l
-+++ b/pim6sd/cftoken.l
-@@ -697,3 +697,8 @@ cfparse(strict, debugonly)
- 
- 	return cf_post_config();
- }
-+
-+int yywrap(void)
-+{
-+	return 1;
-+}
-diff --git a/pim6sd/inet6_compat.c b/pim6sd/inet6_compat.c
-new file mode 100644
-index 0000000..375f17f
---- /dev/null
-+++ b/pim6sd/inet6_compat.c
-@@ -0,0 +1,161 @@
-+#include <assert.h>
-+
-+static void
-+add_pad (struct cmsghdr *cmsg, int len)
-+{
-+  unsigned char *p = CMSG_DATA (cmsg) + cmsg->cmsg_len - CMSG_LEN (0);
-+
-+  if (len == 1)
-+    /* Special handling for 1, a one-byte solution.  */
-+    *p++ = IP6OPT_PAD1;
-+  else if (len != 0)
-+    {
-+      /* Multibyte padding.  */
-+      *p++ = IP6OPT_PADN;
-+      *p++ = len - 2;	/* Discount the two header bytes.  */
-+      /* The rest is filled with zero.  */
-+      memset (p, '\0', len - 2);
-+      p += len - 2;
-+    }
-+
-+  /* Account for the bytes.  */
-+  cmsg->cmsg_len += len;
-+}
-+
-+
-+/* RFC 2292, 6.3.4
-+
-+   This function appends a Hop-by-Hop option or a Destination option
-+   into an ancillary data object that has been initialized by
-+   inet6_option_init().  This function returns a pointer to the 8-bit
-+   option type field that starts the option on success, or NULL on an
-+   error.  */
-+static uint8_t *
-+option_alloc (struct cmsghdr *cmsg, int datalen, int multx, int plusy)
-+{
-+  /* The RFC limits the value of the alignment values.  */
-+  if ((multx != 1 && multx != 2 && multx != 4 && multx != 8)
-+      || ! (plusy >= 0 && plusy <= 7))
-+    return NULL;
-+
-+  /* Current data size.  */
-+  int dsize = cmsg->cmsg_len - CMSG_LEN (0);
-+
-+  /* The first two bytes of the option are for the extended header.  */
-+  if (__builtin_expect (dsize == 0, 0))
-+    {
-+      cmsg->cmsg_len += sizeof (struct ip6_ext);
-+      dsize = sizeof (struct ip6_ext);
-+    }
-+
-+  /* First add padding.  */
-+  add_pad (cmsg, ((multx - (dsize & (multx - 1))) & (multx - 1)) + plusy);
-+
-+  /* Return the pointer to the start of the option space.  */
-+  uint8_t *result = CMSG_DATA (cmsg) + cmsg->cmsg_len - CMSG_LEN (0);
-+  cmsg->cmsg_len += datalen;
-+
-+  /* The extended option header length is measured in 8-byte groups.
-+     To represent the current length we might have to add padding.  */
-+  dsize = cmsg->cmsg_len - CMSG_LEN (0);
-+  add_pad (cmsg, (8 - (dsize & (8 - 1))) & (8 - 1));
-+
-+  /* Record the new length of the option.  */
-+  assert (((cmsg->cmsg_len - CMSG_LEN (0)) % 8) == 0);
-+  int len8b = (cmsg->cmsg_len - CMSG_LEN (0)) / 8 - 1;
-+  if (len8b >= 256)
-+    /* Too long.  */
-+    return NULL;
-+
-+  struct ip6_ext *ie = (void *) CMSG_DATA (cmsg);
-+  ie->ip6e_len = len8b;
-+
-+  return result;
-+}
-+
-+
-+/* RFC 2292, 6.3.1
-+
-+   This function returns the number of bytes required to hold an option
-+   when it is stored as ancillary data, including the cmsghdr structure
-+   at the beginning, and any padding at the end (to make its size a
-+   multiple of 8 bytes).  The argument is the size of the structure
-+   defining the option, which must include any pad bytes at the
-+   beginning (the value y in the alignment term "xn + y"), the type
-+   byte, the length byte, and the option data.  */
-+static int
-+inet6_option_space (nbytes)
-+     int nbytes;
-+{
-+  /* Add room for the extension header.  */
-+  nbytes += sizeof (struct ip6_ext);
-+
-+  return CMSG_SPACE (roundup (nbytes, 8));
-+}
-+
-+
-+/* RFC 2292, 6.3.2
-+
-+   This function is called once per ancillary data object that will
-+   contain either Hop-by-Hop or Destination options.  It returns 0 on
-+   success or -1 on an error.  */
-+static int
-+inet6_option_init (bp, cmsgp, type)
-+     void *bp;
-+     struct cmsghdr **cmsgp;
-+     int type;
-+{
-+  /* Only Hop-by-Hop or Destination options allowed.  */
-+  if (type != IPV6_HOPOPTS && type != IPV6_DSTOPTS)
-+    return -1;
-+
-+  /* BP is a pointer to the previously allocated space.  */
-+  struct cmsghdr *newp = (struct cmsghdr *) bp;
-+
-+  /* Initialize the message header.
-+
-+     Length: No data yet, only the cmsghdr struct.  */
-+  newp->cmsg_len = CMSG_LEN (0);
-+  /* Originating protocol: obviously IPv6.  */
-+  newp->cmsg_level = IPPROTO_IPV6;
-+  /* Message type.  */
-+  newp->cmsg_type = type;
-+
-+  /* Pass up the result.  */
-+  *cmsgp = newp;
-+
-+  return 0;
-+}
-+
-+
-+/* RFC 2292, 6.3.3
-+
-+   This function appends a Hop-by-Hop option or a Destination option
-+   into an ancillary data object that has been initialized by
-+   inet6_option_init().  This function returns 0 if it succeeds or -1 on
-+   an error.  */
-+static int
-+inet6_option_append (cmsg, typep, multx, plusy)
-+     struct cmsghdr *cmsg;
-+     const uint8_t *typep;
-+     int multx;
-+     int plusy;
-+{
-+  /* typep is a pointer to the 8-bit option type.  It is assumed that this
-+     field is immediately followed by the 8-bit option data length field,
-+     which is then followed immediately by the option data.
-+
-+     The option types IP6OPT_PAD1 and IP6OPT_PADN also must be handled.  */
-+  int len = typep[0] == IP6OPT_PAD1 ? 1 : typep[1] + 2;
-+
-+  /* Get the pointer to the space in the message.  */
-+  uint8_t *ptr = option_alloc (cmsg, len, multx, plusy);
-+  if (ptr == NULL)
-+    /* Some problem with the parameters.  */
-+    return -1;
-+
-+  /* Copy the content.  */
-+  memcpy (ptr, typep, len);
-+
-+  return 0;
-+}
-diff --git a/pim6sd/mld6.c b/pim6sd/mld6.c
-index 0bac85d..febdc98 100644
---- a/pim6sd/mld6.c
-+++ b/pim6sd/mld6.c
-@@ -108,6 +108,10 @@
- #include "trace.h"
- #include "mld6.h"
- 
-+#ifdef __UCLIBC__
-+#include "inet6_compat.c"
-+#endif
-+
- /*
-  * Exported variables.
-  */
-diff --git a/pim6sd/mld6v2.c b/pim6sd/mld6v2.c
-index 8cd5a4d..322cb7b 100644
---- a/pim6sd/mld6v2.c
-+++ b/pim6sd/mld6v2.c
-@@ -73,6 +73,11 @@
- #include "callout.h"
- #include "timer.h"
- 
-+#ifdef __UCLIBC__
-+#include "inet6_compat.c"
-+#endif
-+
-+
- #ifdef HAVE_MLDV2
- 
- #ifndef HAVE_RFC3542
--- 
-1.9.1
-
diff --git a/mcast-tools/patches/0004-fix_linux_pim.h_include.patch b/mcast-tools/patches/0004-fix_linux_pim.h_include.patch
deleted file mode 100644
index 7f8b9bc..0000000
--- a/mcast-tools/patches/0004-fix_linux_pim.h_include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/include/linux/pim.h
-+++ b/include/linux/pim.h
-@@ -10,7 +10,7 @@ struct pim {
- 	__u8	pim_type:4,		/* PIM message type */
- 		pim_ver:4;		/* PIM version */
- #elif defined(__BIG_ENDIAN_BITFIELD)
--	__u8	pim_ver:4;		/* PIM version */
-+	__u8	pim_ver:4,		/* PIM version */
- 		pim_type:4;		/* PIM message type */
- #endif
- 	__u8	pim_rsv;		/* Reserved */

From 10fd030ef4a4e647bbfa0cafc2a0efabdb50bced Mon Sep 17 00:00:00 2001
From: Bastian Bittorf <bittorf@bluebottle.com>
Date: Sun, 19 Oct 2014 08:34:34 +0200
Subject: [PATCH 012/368] [OLSRd] bump version from 0.6.6.2 to 0.6.7 (released
 5-oct-2014)

See:
https://lists.olsr.org/pipermail/olsr-dev/2014-October/007429.html
---
 olsrd/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/olsrd/Makefile b/olsrd/Makefile
index 32c5be5..27cf3ed 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
-PKG_VERSION:=0.6.6.2
-PKG_RELEASE:=4
+PKG_VERSION:=0.6.7
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6
 
-PKG_MD5SUM:=e4e04bb033cffd99b3be397fa9063a54
+PKG_MD5SUM:=ad46cb0a6b361f4790527da5566a076f
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk

From f962a32b6f0039766f56796a2ee035598f807289 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Tue, 21 Oct 2014 10:53:13 +0200
Subject: [PATCH 013/368] miniupnpd: fix musl build

Signed-off-by: Steven Barth <steven@midlink.org>
---
 miniupnpd/Makefile                            |  2 +-
 miniupnpd/patches/101-musl-fixes.patch        | 21 +++++++++++++++++++
 .../patches/103-no-ipv6-autodetection.patch   | 12 +++++------
 3 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 miniupnpd/patches/101-musl-fixes.patch

diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index 4575dad..16803d4 100644
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
 PKG_VERSION:=1.8.20140906
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/miniupnpd/patches/101-musl-fixes.patch b/miniupnpd/patches/101-musl-fixes.patch
new file mode 100644
index 0000000..36da566
--- /dev/null
+++ b/miniupnpd/patches/101-musl-fixes.patch
@@ -0,0 +1,21 @@
+--- a/miniupnpd.c
++++ b/miniupnpd.c
+@@ -39,7 +39,7 @@
+ #include <sys/param.h>
+ #if defined(sun)
+ #include <kstat.h>
+-#else
++#elif !defined(__linux__)
+ /* for BSD's sysctl */
+ #include <sys/sysctl.h>
+ #endif
+--- a/netfilter/iptpinhole.h
++++ b/netfilter/iptpinhole.h
+@@ -8,6 +8,7 @@
+ #define IPTPINHOLE_H_INCLUDED
+ 
+ #ifdef ENABLE_UPNPPINHOLE
++#include <sys/types.h>
+ 
+ int add_pinhole(const char * ifname,
+                 const char * rem_host, unsigned short rem_port,
diff --git a/miniupnpd/patches/103-no-ipv6-autodetection.patch b/miniupnpd/patches/103-no-ipv6-autodetection.patch
index acef536..61c023a 100644
--- a/miniupnpd/patches/103-no-ipv6-autodetection.patch
+++ b/miniupnpd/patches/103-no-ipv6-autodetection.patch
@@ -4,10 +4,9 @@ This will incorrectly detect capabilities such as ipv6 support even though it is
 As the OpenWRT buildsystem already passes the right compile flags, we can skip the autodetection.
 
 
-diff -up miniupnpd-1.8.20140906/netfilter/Makefile.orig miniupnpd-1.8.20140906/netfilter/Makefile
---- miniupnpd-1.8.20140906/netfilter/Makefile.orig	2014-09-28 16:39:56.652296642 +0200
-+++ miniupnpd-1.8.20140906/netfilter/Makefile	2013-12-13 14:12:11.000000000 +0100
-@@ -38,6 +38,4 @@ endif
+--- a/netfilter/Makefile
++++ b/netfilter/Makefile
+@@ -38,8 +38,6 @@ endif
  endif
  endif
  
@@ -16,9 +15,8 @@ diff -up miniupnpd-1.8.20140906/netfilter/Makefile.orig miniupnpd-1.8.20140906/n
  all:	iptcrdr.o testiptcrdr iptpinhole.o \
          testiptcrdr_peer testiptcrdr_dscp test_nfct_get
  #        testiptpinhole
-diff -up miniupnpd-1.8.20140906/Makefile.linux.orig miniupnpd-1.8.20140906/Makefile.linux
---- miniupnpd-1.8.20140906/Makefile.linux.orig	2014-09-28 16:46:06.781835136 +0200
-+++ miniupnpd-1.8.20140906/Makefile.linux	2014-09-28 16:46:14.388907413 +0200
+--- a/Makefile.linux
++++ b/Makefile.linux
 @@ -70,7 +70,6 @@ CPPFLAGS += -DIPTABLES_143
  endif
  

From 3b6e617ac548b8b71c9c8eac179875ea1875814a Mon Sep 17 00:00:00 2001
From: Bastian Bittorf <bittorf@bluebottle.com>
Date: Fri, 24 Oct 2014 20:05:20 +0200
Subject: [PATCH 014/368] OLSRd: bump version from 0.6.7 to 0.6.7.1 (released
 24-oct-2014)

---
 olsrd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/olsrd/Makefile b/olsrd/Makefile
index 27cf3ed..b22d286 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
-PKG_VERSION:=0.6.7
+PKG_VERSION:=0.6.7.1
 PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6
 
-PKG_MD5SUM:=ad46cb0a6b361f4790527da5566a076f
+PKG_MD5SUM:=d4411d4ed94b399a3778b8036dee1214
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk

From 69f203d5c309e84a4ec89396a07a160a176b53c9 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Mon, 3 Nov 2014 13:16:46 +0100
Subject: [PATCH 015/368] Add SPDX license tags

Signed-off-by: Steven Barth <steven@midlink.org>
---
 ahcpd/Makefile                      | 1 +
 alfred/Makefile                     | 1 +
 babeld/Makefile                     | 1 +
 batctl/Makefile                     | 1 +
 batman-adv/Makefile                 | 1 +
 batmand/Makefile                    | 1 +
 bcp38/Makefile                      | 1 +
 bird-openwrt/bird4-openwrt/Makefile | 1 +
 bird-openwrt/bird6-openwrt/Makefile | 1 +
 bird/Makefile                       | 1 +
 bmx6/Makefile                       | 1 +
 hnetd/Makefile                      | 1 +
 luci-app-bcp38/Makefile             | 1 +
 luci-app-bmx6/Makefile              | 1 +
 mcproxy/Makefile                    | 1 +
 minimalist-pcproxy/Makefile         | 1 +
 mrd6/Makefile                       | 1 +
 nat46/Makefile                      | 1 +
 ndppd/Makefile                      | 1 +
 nodogsplash/Makefile                | 1 +
 ohybridproxy/Makefile               | 1 +
 olsrd/Makefile                      | 1 +
 quagga/Makefile                     | 1 +
 23 files changed, 23 insertions(+)

diff --git a/ahcpd/Makefile b/ahcpd/Makefile
index e6ff1e7..d4f8744 100644
--- a/ahcpd/Makefile
+++ b/ahcpd/Makefile
@@ -14,6 +14,7 @@ PKG_RELEASE:=2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/files/
 PKG_MD5SUM:=a1a610bf20965aa522cd766bf3d5829a
+PKG_LICENSE:=MIT
 
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/alfred/Makefile b/alfred/Makefile
index de1a801..90ee411 100644
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -17,6 +17,7 @@ PKG_MD5SUM:=b8ab5677ed73d817b02b0e4fae10357a
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
+PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/babeld/Makefile b/babeld/Makefile
index e939310..43a91b8 100644
--- a/babeld/Makefile
+++ b/babeld/Makefile
@@ -14,6 +14,7 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/files/
 PKG_MD5SUM:=20e3284d5ad291d7ba2ad91d5b47de10
+PKG_LICENSE:=MIT
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/batctl/Makefile b/batctl/Makefile
index 43c9098..966bed3 100644
--- a/batctl/Makefile
+++ b/batctl/Makefile
@@ -15,6 +15,7 @@ PKG_MD5SUM:=7d2b8c129424c014d020c4b1a2add31b
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
+PKG_LICENSE:=GPL-2.0
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
 
diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 6103cd2..c7be16c 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -16,6 +16,7 @@ PKG_MD5SUM:=e9ee1d42ff4b0254699c779668054bed
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
+PKG_LICENSE:=GPL-2.0
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
 
diff --git a/batmand/Makefile b/batmand/Makefile
index 4026496..a807650 100644
--- a/batmand/Makefile
+++ b/batmand/Makefile
@@ -20,6 +20,7 @@ PKG_SOURCE_SUBDIR:=$(if $(PKG_BRANCH),$(PKG_BRANCH),$(PKG_NAME))-$(PKG_VERSION)
 PKG_SOURCE_URL:=http://downloads.open-mesh.org/svn/batman/trunk/
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
+PKG_LICENSE:=GPL-2.0
 
 PKG_KMOD_BUILD_DIR:=$(PKG_BUILD_DIR)/batman/linux/modules
 
diff --git a/bcp38/Makefile b/bcp38/Makefile
index d777e13..5cbe882 100644
--- a/bcp38/Makefile
+++ b/bcp38/Makefile
@@ -10,6 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=bcp38
 PKG_VERSION:=4
 PKG_RELEASE:=1
+PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/bird-openwrt/bird4-openwrt/Makefile b/bird-openwrt/bird4-openwrt/Makefile
index 55b5bf9..1e488b3 100644
--- a/bird-openwrt/bird4-openwrt/Makefile
+++ b/bird-openwrt/bird4-openwrt/Makefile
@@ -22,6 +22,7 @@ BIRD:=bird4
 PKG_NAME:=$(BIRD)-openwrt
 PKG_RELEASE:=0.2
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_LICENSE:=GPL-3.0+
 uci:=$(BIRD)-uci
 luci:=luci-app-$(BIRD)
 
diff --git a/bird-openwrt/bird6-openwrt/Makefile b/bird-openwrt/bird6-openwrt/Makefile
index 53e841e..74c2423 100644
--- a/bird-openwrt/bird6-openwrt/Makefile
+++ b/bird-openwrt/bird6-openwrt/Makefile
@@ -22,6 +22,7 @@ BIRD:=bird6
 PKG_NAME:=$(BIRD)-openwrt
 PKG_RELEASE:=0.2
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_LICENSE:=GPL-3.0+
 uci:=$(BIRD)-uci
 luci:=luci-app-$(BIRD)
 
diff --git a/bird/Makefile b/bird/Makefile
index 971afc4..9dd5cf3 100644
--- a/bird/Makefile
+++ b/bird/Makefile
@@ -14,6 +14,7 @@ PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird
 PKG_MD5SUM:=eb7e00b9c1d102ddfcbc19d9cb168511
 PKG_BUILD_DEPENDS:=libncurses libreadline
+PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/bmx6/Makefile b/bmx6/Makefile
index 5028906..9af1950 100644
--- a/bmx6/Makefile
+++ b/bmx6/Makefile
@@ -34,6 +34,7 @@ PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 PKG_REV:=8b0585e84ca8a0110bd4587e19192beda1ba3238
 PKG_VERSION:=r2014052301
 PKG_RELEASE:=4
+PKG_LICENSE:=GPL-2.0
 
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
diff --git a/hnetd/Makefile b/hnetd/Makefile
index 25cbd60..c4afb75 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -14,6 +14,7 @@ PKG_RELEASE:=1
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/sbyx/hnetd.git
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
+PKG_LICENSE:=GPL-2.0
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
diff --git a/luci-app-bcp38/Makefile b/luci-app-bcp38/Makefile
index 66f3316..d42916c 100644
--- a/luci-app-bcp38/Makefile
+++ b/luci-app-bcp38/Makefile
@@ -10,6 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=luci-app-bcp38
 PKG_VERSION:=2
 PKG_RELEASE:=1
+PKG_LICENSE:=Apache-2.0
 LUCI_DIR:=/usr/lib/lua/luci
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/luci-app-bmx6/Makefile b/luci-app-bmx6/Makefile
index 09a9512..ec69d2d 100644
--- a/luci-app-bmx6/Makefile
+++ b/luci-app-bmx6/Makefile
@@ -23,6 +23,7 @@ PKG_NAME:=luci-app-bmx6
 PKG_RELEASE:=3
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_LICENSE:=GPL-2.0+
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/mcproxy/Makefile b/mcproxy/Makefile
index 51f6d65..ef0b09e 100644
--- a/mcproxy/Makefile
+++ b/mcproxy/Makefile
@@ -15,6 +15,7 @@ PKG_RELEASE:=1
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/mcproxy/mcproxy.git
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
+PKG_LICENSE:=GPL-2.0+
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
diff --git a/minimalist-pcproxy/Makefile b/minimalist-pcproxy/Makefile
index 94dfff3..57c2651 100644
--- a/minimalist-pcproxy/Makefile
+++ b/minimalist-pcproxy/Makefile
@@ -14,6 +14,7 @@ PKG_RELEASE:=2
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/fingon/minimalist-pcproxy.git
 PKG_MAINTAINER:=Markus Stenberg <fingon@iki.fi>
+PKG_LICENSE:=GPL-2.0
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
diff --git a/mrd6/Makefile b/mrd6/Makefile
index 252a151..a20ea26 100644
--- a/mrd6/Makefile
+++ b/mrd6/Makefile
@@ -15,6 +15,7 @@ PKG_RELEASE:=1
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/hugosantos/mrd6.git
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
+PKG_LICENSE:=GPL-2.0+
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
diff --git a/nat46/Makefile b/nat46/Makefile
index 6f5a7e3..728f3b4 100644
--- a/nat46/Makefile
+++ b/nat46/Makefile
@@ -18,6 +18,7 @@ PKG_SOURCE_URL:=https://github.com/ayourtch/nat46.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=758a02e6f9e4c43553e0fc37d83c286c77febe94
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
+PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/ndppd/Makefile b/ndppd/Makefile
index c5f1d20..ebc764c 100644
--- a/ndppd/Makefile
+++ b/ndppd/Makefile
@@ -16,6 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 # Latest release
 PKG_SOURCE_URL:=http://www.priv.nu/projects/ndppd/files/
 PKG_MD5SUM:=d6f3243bb7fc04c8085371c9acddc50e
+PKG_LICENSE:=GPL-3.0+
 
 # Development snapshot
 #PKG_SOURCE_URL=git://github.com/Tuhox/ndppd.git
diff --git a/nodogsplash/Makefile b/nodogsplash/Makefile
index dd2b1e4..61726cc 100644
--- a/nodogsplash/Makefile
+++ b/nodogsplash/Makefile
@@ -18,6 +18,7 @@ PKG_SOURCE_URL:=git://github.com/nodogsplash/nodogsplash.git
 PKG_SOURCE_VERSION:=v0.9_beta9.9.8
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1
+PKG_LICENSE:=GPL-2.0+
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/ohybridproxy/Makefile b/ohybridproxy/Makefile
index 6ed8b91..e84176a 100644
--- a/ohybridproxy/Makefile
+++ b/ohybridproxy/Makefile
@@ -14,6 +14,7 @@ PKG_RELEASE:=1
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/sbyx/ohybridproxy.git
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
+PKG_LICENSE:=GPL-2.0
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
diff --git a/olsrd/Makefile b/olsrd/Makefile
index b22d286..188d0b7 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6
 
 PKG_MD5SUM:=d4411d4ed94b399a3778b8036dee1214
 PKG_BUILD_PARALLEL:=1
+PKG_LICENSE:=BSD-3-Clause
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/quagga/Makefile b/quagga/Makefile
index e9bb6c7..46a4235 100644
--- a/quagga/Makefile
+++ b/quagga/Makefile
@@ -30,6 +30,7 @@ PKG_CONFIG_DEPENDS:= \
 PKG_BUILD_PARALLEL:=1
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
+PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
 

From 250c990ab66b22e64149b77de37bfb19114aa426 Mon Sep 17 00:00:00 2001
From: Leonardo Brondani Schenkel <leonardo@schenkel.net>
Date: Mon, 3 Nov 2014 20:18:05 +0000
Subject: [PATCH 016/368] smcroute: Add package for version 2.0.0.

Signed-off-by: Leonardo Brondani Schenkel <leonardo@schenkel.net>
---
 smcroute/Makefile            | 56 ++++++++++++++++++++++++++++++++++++
 smcroute/files/smcroute.init | 11 +++++++
 2 files changed, 67 insertions(+)
 create mode 100644 smcroute/Makefile
 create mode 100644 smcroute/files/smcroute.init

diff --git a/smcroute/Makefile b/smcroute/Makefile
new file mode 100644
index 0000000..523afb3
--- /dev/null
+++ b/smcroute/Makefile
@@ -0,0 +1,56 @@
+#
+# Copyright (C) 2014 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:=smcroute
+PKG_VERSION:=2.0.0
+PKG_RELEASE:=1
+PKG_LICENSE:=GPL-2.0+
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=ftp://troglobit.com/smcroute/
+PKG_MD5SUM:=cbf478e52ab9ae411adca41b9d22f68a
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/smcroute
+	SECTION:=net
+	CATEGORY:=Network
+	SUBMENU:=Routing and Redirection
+	TITLE:=Static Multicast Routing Daemon
+	URL:=http://troglobit.com/smcroute.html
+	MAINTAINER:=Leonardo Brondani Schenkel <leonardo@schenkel.net>
+endef
+
+define Package/smcroute/description
+	SMCRoute is a command line tool to manipulate the multicast routes of the Linux kernel.
+endef
+
+ifeq ($(HOST_OS),FreeBSD)
+	TARGET_CFLAGS += -fno-builtin-log
+	TARGET_LDFLAGS += -fno-builtin-log
+endif
+
+define Build/Compile
+	$(MAKE) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" -C $(PKG_BUILD_DIR) all
+endef
+
+define Package/smcroute/conffiles
+	/etc/smcproxy.conf
+endef
+
+define Package/smcroute/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/etc/init.d/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/smcroute $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mcsender $(1)/usr/bin/
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/smcroute.conf $(1)/etc
+	$(INSTALL_BIN) ./files/smcroute.init $(1)/etc/init.d/smcroute
+endef
+
+$(eval $(call BuildPackage,smcroute))
diff --git a/smcroute/files/smcroute.init b/smcroute/files/smcroute.init
new file mode 100644
index 0000000..3e36272
--- /dev/null
+++ b/smcroute/files/smcroute.init
@@ -0,0 +1,11 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006-2010 OpenWrt.org
+START=50
+
+start() {
+	smcroute -d
+}
+
+stop() {
+	smcroute -k
+}

From bbcc138fc0bbef5094c3928d892076ae9a56a213 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Tue, 4 Nov 2014 14:37:40 +0100
Subject: [PATCH 017/368] batman-adv: Preserve configuration file on update

The configuration file of batman-adv should be marked as such to avoid that the
old configuration options are overwritten when it is upgraded.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batman-adv/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index c7be16c..40a36e8 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -43,6 +43,10 @@ define KernelPackage/batman-adv/config
 	source "$(SOURCE)/Config.in"
 endef
 
+define Package/kmod-batman-adv/conffiles
+/etc/config/batman-adv
+endef
+
 MAKE_BATMAN_ADV_ARGS += \
 	CROSS_COMPILE="$(TARGET_CROSS)" \
 	KERNELPATH="$(LINUX_DIR)" \

From f81ddf406755afc9b1231182da5e9064828348e1 Mon Sep 17 00:00:00 2001
From: Simon Wunderlich <sw@simonwunderlich.de>
Date: Tue, 4 Nov 2014 16:32:10 +0100
Subject: [PATCH 018/368] Maintainers: Update Simons email address

Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 72c1405..4d8f5e2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -20,6 +20,6 @@ Moritz Warning <moritzwarning@web.de>
 Nicolás Echániz <nicoechaniz@altermundi.net>
 Pau Escrich <pau@dabax.net>
 Saverio Proto <zioproto@gmail.com>
-Simon Wunderlich <simon.wunderlich@s2003.tu-chemnitz.de>
+Simon Wunderlich <sw@simonwunderlich.de>
 Steven Barth <cyrus@openwrt.org>
 Vasilis "acinonyx" Tsiligiannis <acinonyx@openwrt.gr>

From a3c7351b070ba89d2fc851378e011f2a3d8e1fd1 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Wed, 5 Nov 2014 08:12:14 +0100
Subject: [PATCH 019/368] bcp38: moved to packages-feed

Signed-off-by: Steven Barth <steven@midlink.org>
---
 bcp38/Makefile             | 64 -------------------------
 bcp38/files/bcp38.config   | 22 ---------
 bcp38/files/bcp38.defaults | 13 ------
 bcp38/files/run.sh         | 96 --------------------------------------
 4 files changed, 195 deletions(-)
 delete mode 100644 bcp38/Makefile
 delete mode 100644 bcp38/files/bcp38.config
 delete mode 100644 bcp38/files/bcp38.defaults
 delete mode 100755 bcp38/files/run.sh

diff --git a/bcp38/Makefile b/bcp38/Makefile
deleted file mode 100644
index 5cbe882..0000000
--- a/bcp38/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-# Please note this is not an officially released version of bcp38
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bcp38
-PKG_VERSION:=4
-PKG_RELEASE:=1
-PKG_LICENSE:=GPL-2.0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/bcp38
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Routing and Redirection
-  TITLE:=BCP38 compliance 
-  URL:=http://www.github.com/dtaht/bcp38
-  MAINTAINER:=Dave Taht <d+bcp38@taht.net>
-  DEPENDS:=+ipset
-endef
-
-define Package/bcp38/description
- bcp38 implements rfc bcp 38 for home routers.
-endef
-
-define Package/bcp38/conffiles
-/etc/config/bcp38
-endef
-
-define Build/Prepare
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/bcp38/install
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/bcp38.config $(1)/etc/config/bcp38
-	$(INSTALL_DIR) $(1)/usr/lib/bcp38
-	$(INSTALL_BIN) ./files/run.sh $(1)/usr/lib/bcp38/run.sh
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/bcp38.defaults $(1)/etc/uci-defaults/bcp38
-endef
-
-define Package/bcp38/postinst
-#!/bin/sh
-[ -x /etc/uci-defaults/bcp38 ] && /etc/uci-defaults/bcp38 || exit 0
-endef
-
-define Package/bcp38/postrm
-#!/bin/sh
-uci delete firewall.bcp38
-uci commit
-endef
-
-$(eval $(call BuildPackage,bcp38))
diff --git a/bcp38/files/bcp38.config b/bcp38/files/bcp38.config
deleted file mode 100644
index 80431e5..0000000
--- a/bcp38/files/bcp38.config
+++ /dev/null
@@ -1,22 +0,0 @@
-config bcp38
-	option enabled 1
-	option interface 'ge00'
-	option detect_upstream 1
-	list match '127.0.0.0/8'
-	list match '0.0.0.0/8'       # RFC 1700
-	list match '240.0.0.0/4'     # RFC 5745
-	list match '192.0.2.0/24'    # RFC 5737
-	list match '198.51.100.0/24' # RFC 5737
-	list match '203.0.113.0/24'  # RFC 5737
-	list match '192.168.0.0/16'  # RFC 1918
-	list match '10.0.0.0/8'      # RFC 1918
-	list match '172.16.0.0/12'   # RFC 1918
-	list match '169.254.0.0/16'  # RFC 3927
-
-# 	list nomatch '172.26.0.0/21' # Example of something not to match
-#	There is a dhcp trigger to do this for the netmask of a 
-#	double natted connection needed
-
-#	I will argue that this level of indirection doesn't scale
-# 	very well - see how to block china as an example
-#	http://www.okean.com/china.txt
diff --git a/bcp38/files/bcp38.defaults b/bcp38/files/bcp38.defaults
deleted file mode 100644
index d7e0d80..0000000
--- a/bcp38/files/bcp38.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOT
-	delete firewall.bcp38
-	set firewall.bcp38=include
-	set firewall.bcp38.type=script
-	set firewall.bcp38.path=/usr/lib/bcp38/run.sh
-	set firewall.bcp38.family=IPv4
-	set firewall.bcp38.reload=1
-	commit firewall
-EOT
-
-exit 0
diff --git a/bcp38/files/run.sh b/bcp38/files/run.sh
deleted file mode 100755
index 33ec531..0000000
--- a/bcp38/files/run.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-STOP=$1
-IPSET_NAME=bcp38-ipv4
-IPTABLES_CHAIN=BCP38
-
-. /lib/functions.sh
-
-config_load bcp38
-
-add_bcp38_rule()
-{
-	local subnet="$1"
-	local action="$2"
-
-	if [ "$action" == "nomatch" ]; then
-		ipset add "$IPSET_NAME" "$subnet" nomatch
-	else
-		ipset add "$IPSET_NAME" "$subnet"
-	fi
-}
-
-detect_upstream()
-{
-	local interface="$1"
-
-	subnets=$(ip route show dev "$interface"  | grep 'scope link' | awk '{print $1}')
-	for subnet in $subnets; do
-		# ipset test doesn't work for subnets, so strip out the subnet part
-		# and test for that; add as exception if there's a match
-		addr=$(echo $subnet | sed 's|/[0-9]\+$||')
-		ipset test "$IPSET_NAME" $addr 2>/dev/null && add_bcp38_rule $subnet nomatch
-	done
-}
-
-run() {
-    	local section="$1"
-    	local enabled
-	local interface
-	local detect_upstream
-	config_get_bool enabled "$section" enabled 0
-	config_get interface "$section" interface
-	config_get detect_upstream "$section" detect_upstream
-
-	if [ "$enabled" -eq "1" -a -n "$interface" -a -z "$STOP" ] ; then
-		setup_ipset
-		setup_iptables "$interface"
-		config_list_foreach "$section" match add_bcp38_rule match
-		config_list_foreach "$section" nomatch add_bcp38_rule nomatch
-		[ "$detect_upstream" -eq "1" ] && detect_upstream "$interface"
-	fi
-	exit 0
-}
-
-setup_ipset()
-{
-	ipset create "$IPSET_NAME" hash:net family ipv4
-	ipset flush "$IPSET_NAME"
-}
-
-setup_iptables()
-{
-	local interface="$1"
-	iptables -N "$IPTABLES_CHAIN" 2>/dev/null
-	iptables -F "$IPTABLES_CHAIN" 2>/dev/null
-
-	iptables -I output_rule -j "$IPTABLES_CHAIN"
-	iptables -I input_rule -j "$IPTABLES_CHAIN"
-	iptables -I forwarding_rule -j "$IPTABLES_CHAIN"
-
-	# always accept DHCP traffic
-	iptables -A "$IPTABLES_CHAIN" -p udp --dport 67:68 --sport 67:68 -j RETURN
-	iptables -A "$IPTABLES_CHAIN" -o "$interface" -m set --match-set "$IPSET_NAME" dst -j REJECT --reject-with icmp-net-unreachable
-	iptables -A "$IPTABLES_CHAIN" -i "$interface" -m set --match-set "$IPSET_NAME" src -j DROP
-}
-
-destroy_ipset()
-{
-	ipset flush "$IPSET_NAME" 2>/dev/null
-	ipset destroy "$IPSET_NAME" 2>/dev/null
-}
-
-destroy_iptables()
-{
-	iptables -D output_rule -j "$IPTABLES_CHAIN" 2>/dev/null
-	iptables -D input_rule -j "$IPTABLES_CHAIN" 2>/dev/null
-	iptables -D forwarding_rule -j "$IPTABLES_CHAIN" 2>/dev/null
-	iptables -F "$IPTABLES_CHAIN" 2>/dev/null
-	iptables -X "$IPTABLES_CHAIN" 2>/dev/null
-}
-
-destroy_iptables
-destroy_ipset
-config_foreach run bcp38
-
-exit 0

From 4581d5fefa0ce273f4380909654b7bfbed763de7 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Wed, 5 Nov 2014 09:59:28 +0100
Subject: [PATCH 020/368] luci-app-bcp38: moved to github

Signed-off-by: Steven Barth <steven@midlink.org>
---
 luci-app-bcp38/Makefile                   | 57 ----------------------
 luci-app-bcp38/files/bcp38-cbi.lua        | 58 -----------------------
 luci-app-bcp38/files/bcp38-controller.lua |  7 ---
 luci-app-bcp38/files/uci-defaults-bcp38   | 11 -----
 4 files changed, 133 deletions(-)
 delete mode 100644 luci-app-bcp38/Makefile
 delete mode 100644 luci-app-bcp38/files/bcp38-cbi.lua
 delete mode 100644 luci-app-bcp38/files/bcp38-controller.lua
 delete mode 100755 luci-app-bcp38/files/uci-defaults-bcp38

diff --git a/luci-app-bcp38/Makefile b/luci-app-bcp38/Makefile
deleted file mode 100644
index d42916c..0000000
--- a/luci-app-bcp38/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2010 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:=luci-app-bcp38
-PKG_VERSION:=2
-PKG_RELEASE:=1
-PKG_LICENSE:=Apache-2.0
-LUCI_DIR:=/usr/lib/lua/luci
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luci-app-bcp38
-  SECTION:=luci
-  CATEGORY:=LuCI
-  TITLE:=BCP38 LuCI interface
-  MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>
-  PKGARCH:=all
-  DEPENDS:= lua luci-base +bcp38
-  SUBMENU:=3. Applications
-endef
-
-define Package/luci-app-bcp38/description
-	Control BCP38 subnet blocking
-endef
-
-define Build/Compile
-endef
-
-define Build/Configure
-endef
-
-define Package/luci-app-bcp38/install
-	$(INSTALL_DIR) $(1)$(LUCI_DIR)/controller $(1)$(LUCI_DIR)/model/cbi
-	$(INSTALL_DATA) ./files/bcp38-controller.lua $(1)$(LUCI_DIR)/controller/bcp38.lua
-	$(INSTALL_DATA) ./files/bcp38-cbi.lua $(1)$(LUCI_DIR)/model/cbi/bcp38.lua
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/uci-defaults-bcp38 $(1)/etc/uci-defaults/luci-bcp38
-endef
-
-define Package/luci-app-bcp38/postinst
-#!/bin/sh
-[ -x /etc/uci-defaults/luci-bcp38 ] && /etc/uci-defaults/luci-bcp38 || exit 0
-endef
-
-define Package/luci-app-bcp38/postrm
-#!/bin/sh
-uci delete ucitrack.@bcp38[0]
-uci commit
-endef
-
-$(eval $(call BuildPackage,luci-app-bcp38))
diff --git a/luci-app-bcp38/files/bcp38-cbi.lua b/luci-app-bcp38/files/bcp38-cbi.lua
deleted file mode 100644
index b0b8f38..0000000
--- a/luci-app-bcp38/files/bcp38-cbi.lua
+++ /dev/null
@@ -1,58 +0,0 @@
---[[
-LuCI - Lua Configuration Interface
-
-Copyright 2014 Toke Høiland-Jørgensen <toke@toke.dk>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-$Id$
-]]--
-
-local wa = require "luci.tools.webadmin"
-local net = require "luci.model.network".init()
-local ifaces = net:get_interfaces()
-
-m = Map("bcp38", translate("BCP38"),
-	translate("This function blocks packets with private address destinations " ..
-		"from going out onto the internet as per " ..
-		"<a href=\"http://tools.ietf.org/html/bcp38\">BCP 38</a>."))
-
-s = m:section(TypedSection, "bcp38", translate("BCP38 config"))
-s.anonymous = true
--- BASIC
-e = s:option(Flag, "enabled", translate("Enable"))
-e.rmempty = false
-
-a = s:option(Flag, "detect_upstream", translate("Auto-detect upstream IP"),
-				translate("Attempt to automatically detect if the upstream IP " ..
-					"will be blocked by the configuration, and add an exception if it will. " ..
-					"If this does not work correctly, you can add exceptions manually below."))
-a.rmempty = false
-
-n = s:option(ListValue, "interface", translate("Interface name"), translate("Interface to apply the blocking to " ..
-							"(should be the upstream WAN interface)."))
-for _, iface in ipairs(ifaces) do
-     if iface:is_up() then
-	n:value(iface:name())
-     end
-end
-n.rmempty = false
-
-ma = s:option(DynamicList, "match",
-	translate("Blocked IP ranges"))
-
-ma.datatype = "ip4addr"
-
-nm = s:option(DynamicList, "nomatch",
-	translate("Allowed IP ranges"), translate("Takes precedence over blocked ranges. "..
-						  "Use to whitelist your upstream network if you're behind a double NAT " ..
-						  "and the auto-detection doesn't work."))
-
-nm.datatype = "ip4addr"
-
-
-return m
diff --git a/luci-app-bcp38/files/bcp38-controller.lua b/luci-app-bcp38/files/bcp38-controller.lua
deleted file mode 100644
index 7ea2283..0000000
--- a/luci-app-bcp38/files/bcp38-controller.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-module("luci.controller.bcp38", package.seeall)
-
-function index()
-	entry({"admin", "network", "firewall", "bcp38"},
-		cbi("bcp38"),
-		_("BCP38"), 50).dependent = false
-end
diff --git a/luci-app-bcp38/files/uci-defaults-bcp38 b/luci-app-bcp38/files/uci-defaults-bcp38
deleted file mode 100755
index c204236..0000000
--- a/luci-app-bcp38/files/uci-defaults-bcp38
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null
-	delete ucitrack.@bcp38[-1]
-	add ucitrack bcp38
-        add_list ucitrack.@bcp38[0].affects=firewall
-	commit ucitrack
-EOF
-
-rm -f /tmp/luci-indexcache
-exit 0

From 3f11a2a9db65b51d31a1f5275fb6ba38b9789b08 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Wed, 5 Nov 2014 11:40:36 +0100
Subject: [PATCH 021/368] nat46: fix compiler issues with gcc 4.9

Signed-off-by: Steven Barth <steven@midlink.org>
---
 nat46/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nat46/Makefile b/nat46/Makefile
index 728f3b4..5bebd9b 100644
--- a/nat46/Makefile
+++ b/nat46/Makefile
@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=nat46
-PKG_VERSION:=1
+PKG_VERSION:=2
 PKG_RELEASE:=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=https://github.com/ayourtch/nat46.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=758a02e6f9e4c43553e0fc37d83c286c77febe94
+PKG_SOURCE_VERSION:=5589212cb35527929fd66218721ab54040c6b788
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
 PKG_LICENSE:=GPL-2.0
 
@@ -43,6 +43,7 @@ include $(INCLUDE_DIR)/kernel-defaults.mk
 define Build/Compile
 	$(MAKE) $(KERNEL_MAKEOPTS) SUBDIRS="$(PKG_BUILD_DIR)/nat46/modules" \
 		MODFLAGS="-DMODULE -mlong-calls" \
+		EXTRA_CFLAGS="-DNAT46_VERSION=\\\"$(PKG_SOURCE_VERSION)\\\"" \
 		modules
 endef
 

From c8eeeee90ae1761da0dab8d99f95f938a5d54b3e Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Thu, 6 Nov 2014 15:44:06 +0200
Subject: [PATCH 022/368] miniupnpd: Upgraded to 1.9 (+ third party PCP patch).

---
 miniupnpd/Makefile                          |  6 +-
 miniupnpd/patches/101-musl-fixes.patch      | 21 ------
 miniupnpd/patches/101-pcp-third-party.patch | 75 +++++++++++++++++++++
 3 files changed, 78 insertions(+), 24 deletions(-)
 delete mode 100644 miniupnpd/patches/101-musl-fixes.patch
 create mode 100644 miniupnpd/patches/101-pcp-third-party.patch

diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index 16803d4..2f05ec8 100644
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
-PKG_VERSION:=1.8.20140906
-PKG_RELEASE:=3
+PKG_VERSION:=1.9
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=72a68c5757031d906a555f84e9a2a8f2
+PKG_MD5SUM:=9151502f84f130b0ef1245ac938c33f9
 
 PKG_MAINTAINER:=Markus Stenberg <fingon@iki.fi>
 PKG_LICENSE:=BSD-3-Clause
diff --git a/miniupnpd/patches/101-musl-fixes.patch b/miniupnpd/patches/101-musl-fixes.patch
deleted file mode 100644
index 36da566..0000000
--- a/miniupnpd/patches/101-musl-fixes.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/miniupnpd.c
-+++ b/miniupnpd.c
-@@ -39,7 +39,7 @@
- #include <sys/param.h>
- #if defined(sun)
- #include <kstat.h>
--#else
-+#elif !defined(__linux__)
- /* for BSD's sysctl */
- #include <sys/sysctl.h>
- #endif
---- a/netfilter/iptpinhole.h
-+++ b/netfilter/iptpinhole.h
-@@ -8,6 +8,7 @@
- #define IPTPINHOLE_H_INCLUDED
- 
- #ifdef ENABLE_UPNPPINHOLE
-+#include <sys/types.h>
- 
- int add_pinhole(const char * ifname,
-                 const char * rem_host, unsigned short rem_port,
diff --git a/miniupnpd/patches/101-pcp-third-party.patch b/miniupnpd/patches/101-pcp-third-party.patch
new file mode 100644
index 0000000..b66621d
--- /dev/null
+++ b/miniupnpd/patches/101-pcp-third-party.patch
@@ -0,0 +1,75 @@
+From 27d4d10a3ed3a4d87941247ed73bcb67c68b2bb9 Mon Sep 17 00:00:00 2001
+From: Thomas Bernard <miniupnp@free.fr>
+Date: Thu, 30 Oct 2014 20:37:35 +0100
+Subject: [PATCH] miniupnpd.c: fix PCP third party mode (in IPv4)
+
+fixes problem introduced in commit 16389fda3c5313bffc83fb6594f5bb5872e37e5e
+---
+ miniupnpd.c | 38 +++++++++++++++++++++++++++-----------
+ 1 file changed, 27 insertions(+), 11 deletions(-)
+
+diff --git a/miniupnpd.c b/miniupnpd.c
+index 6468075..06bcae2 100644
+--- a/miniupnpd.c
++++ b/miniupnpd.c
+@@ -2133,30 +2133,46 @@ main(int argc, char * * argv)
+ 				                               msg_buff, sizeof(msg_buff));
+ 				if (len < 1)
+ 					continue;
++#ifdef ENABLE_PCP
++				if (msg_buff[0]==0) {  /* version equals to 0 -> means NAT-PMP */
++					/* Check if the packet is coming from a LAN to enforce RFC6886 :
++					 * The NAT gateway MUST NOT accept mapping requests destined to the NAT
++					 * gateway's external IP address or received on its external network
++					 * interface.  Only packets received on the internal interface(s) with a
++					 * destination address matching the internal address(es) of the NAT
++					 * gateway should be allowed. */
++					/* TODO : move to ProcessIncomingNATPMPPacket() ? */
++					lan_addr = get_lan_for_peer((struct sockaddr *)&senderaddr);
++					if(lan_addr == NULL) {
++						char sender_str[64];
++						sockaddr_to_string((struct sockaddr *)&senderaddr, sender_str, sizeof(sender_str));
++						syslog(LOG_WARNING, "NAT-PMP packet sender %s not from a LAN, ignoring",
++						       sender_str);
++						continue;
++					}
++					ProcessIncomingNATPMPPacket(snatpmp[i], msg_buff, len,
++					                            &senderaddr);
++				} else { /* everything else can be PCP */
++					ProcessIncomingPCPPacket(snatpmp[i], msg_buff, len,
++					                         (struct sockaddr *)&senderaddr, NULL);
++				}
++
++#else
+ 				/* Check if the packet is coming from a LAN to enforce RFC6886 :
+ 				 * The NAT gateway MUST NOT accept mapping requests destined to the NAT
+ 				 * gateway's external IP address or received on its external network
+ 				 * interface.  Only packets received on the internal interface(s) with a
+ 				 * destination address matching the internal address(es) of the NAT
+ 				 * gateway should be allowed. */
++				/* TODO : move to ProcessIncomingNATPMPPacket() ? */
+ 				lan_addr = get_lan_for_peer((struct sockaddr *)&senderaddr);
+ 				if(lan_addr == NULL) {
+ 					char sender_str[64];
+ 					sockaddr_to_string((struct sockaddr *)&senderaddr, sender_str, sizeof(sender_str));
+-					syslog(LOG_WARNING, "NAT-PMP/PCP packet sender %s not from a LAN, ignoring",
++					syslog(LOG_WARNING, "NAT-PMP packet sender %s not from a LAN, ignoring",
+ 					       sender_str);
+ 					continue;
+ 				}
+-#ifdef ENABLE_PCP
+-				if (msg_buff[0]==0) {  /* version equals to 0 -> means NAT-PMP */
+-					ProcessIncomingNATPMPPacket(snatpmp[i], msg_buff, len,
+-					                            &senderaddr);
+-				} else { /* everything else can be PCP */
+-					ProcessIncomingPCPPacket(snatpmp[i], msg_buff, len,
+-					                         (struct sockaddr *)&senderaddr, NULL);
+-				}
+-
+-#else
+ 				ProcessIncomingNATPMPPacket(snatpmp[i], msg_buff, len, &senderaddr);
+ #endif
+ 			}
+-- 
+2.1.0
+

From afbe4af9c8bf3e933160edcc8889702624095061 Mon Sep 17 00:00:00 2001
From: Leonardo Brondani Schenkel <leonardo@schenkel.net>
Date: Thu, 13 Nov 2014 20:16:45 +0100
Subject: [PATCH 023/368] smcroute: Use correct file name in conffiles.

Signed-off-by: Leonardo Brondani Schenkel <leonardo@schenkel.net>
---
 smcroute/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/smcroute/Makefile b/smcroute/Makefile
index 523afb3..1a5a202 100644
--- a/smcroute/Makefile
+++ b/smcroute/Makefile
@@ -40,7 +40,7 @@ define Build/Compile
 endef
 
 define Package/smcroute/conffiles
-	/etc/smcproxy.conf
+	/etc/smcroute.conf
 endef
 
 define Package/smcroute/install

From 40405d022b029186fb862a09789a6c0cf2f224a3 Mon Sep 17 00:00:00 2001
From: Pau Escrich <p4u@dabax.net>
Date: Thu, 20 Nov 2014 18:13:43 +0100
Subject: [PATCH 024/368] [bird-openwrt] Add documentation file. Remove OSPF
 and filters configuration examples (OSPF not yet supported).

Signed-off-by: Pau Escrich <p4u@dabax.net>
---
 bird-openwrt/DOCUMENTATION                  | 531 ++++++++++++++++++++
 bird-openwrt/bird4-openwrt/src/config/bird4 |  62 ---
 bird-openwrt/bird6-openwrt/src/config/bird6 |   6 -
 3 files changed, 531 insertions(+), 68 deletions(-)
 create mode 100644 bird-openwrt/DOCUMENTATION

diff --git a/bird-openwrt/DOCUMENTATION b/bird-openwrt/DOCUMENTATION
new file mode 100644
index 0000000..a55e271
--- /dev/null
+++ b/bird-openwrt/DOCUMENTATION
@@ -0,0 +1,531 @@
+---------------------------------------------------------------------
+
+Copyright (C) 2014 - Eloi Carbó Solé (GSoC2014) 
+BGP/Bird integration with OpenWRT
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+---------------------------------------------------------------------
+
+*** Original documentation for BIRD Daemon can be found here: http://bird.network.cz/?get_doc
+*** Some interesting examples are placed in BIRD daemon Gitlab page: https://gitlab.labs.nic.cz/labs/bird/wikis/home
+*** If you want to add new options to bird*-openwrt packages,
+*** feel free to make a pull request it in: https://github.com/openwrt-routing/packages/bird-openwrt
+*** or email me and ask for it: eloicaso@openmailbox.org
+
+- Options used in /etc/config/birdX -
+
+---------------------------------------------------------------------
+CONFIGURATION SECTION 1: 'bird'
+---------------------------------------------------------------------
+
+Example 
+--
+config bird 'bird'
+    option use_UCI_config '1'
+    option UCI_config_file '/tmp/bird4.conf'
+--
+
+* use_UCI_config: Boolean
+This option allows you to use UCI configuration translation file instead of the original Bird one. If true/1, birdX init.d script will use the translation placed in "UCI_config_file". Otherwise, it will use the default "/etc/birdX.conf" configuration.
+[Hint] This could be used to allow multiple configurations and swap them easily.
+Default: 0
+
+* UCI_config_file: String (File path)
+This option sets where will be placed the translation of the UCI configuration file. 
+Default: /tmp/birdX.conf
+
+
+
+---------------------------------------------------------------------
+CONFIGURATION SECTION 2: 'global NAME'
+---------------------------------------------------------------------
+
+Example
+--
+config global 'global'
+    option log_file '/tmp/bird4.log'
+    option log 'all'
+    option debug 'off'
+    option router_id '172.16.1.6'
+--
+
+* log_file: String (File path)
+This option sets the path of the file used to save Bird Log and Debug's information.
+Default: /tmp/birdX.log
+
+* log: String/Enumeration (all/off, info, warning, error, fatal, debug, trace, remote, auth, bug)
+This option allows you to set which information you want to save in the 
+[HINT] Use the enumeration like: { info, waning, error }
+Default: all
+
+* debug: String/Enumeration ( all/off, states, routes, filters, interfaces, events, packets)
+This option allows you to set which debug information will be saved in the "log_file" file.
+[HINT] Use the enumeration like: { info, waning, error }
+Default: off
+
+* router_id: IP Address
+This option sets which will be the Router ID. Usually is the lowest IP address (not loopback) among the existing interfaces.
+[HINT] In IPv4 this field is optional. In IPv6 is mandatory.
+
+* listen_bgp_addr: IP Address
+This option sets the IP address that Bird BGP instances will listen by default.
+Default: 0.0.0.0
+
+* listen_bgp_port: Integer (Port)
+This option sets the port that Bird BGP instances will listen by default.
+Default: 179
+
+[IPv6 only]
+* listen_bgp_dual: Boolean
+This option sets if Bird6 BGP instances will listen only to IPv6 or IPv4/6 BGP routes.
+
+
+
+---------------------------------------------------------------------
+CONFIGURATION SECTION 3: 'table'
+---------------------------------------------------------------------
+
+Example
+--
+config table
+    option name 'aux'
+--
+
+* name: String
+This option allows you to set the name of the auxiliar kernel tables used for Bird.
+
+
+
+---------------------------------------------------------------------
+CONFIGURATION SECTION 4: 'kernel NAME'
+---------------------------------------------------------------------
+
+Example
+--
+config kernel kernel1
+    option table 'aux'
+    option import 'all'
+    option export 'all'
+    option kernel_table '100'
+    option scan_time '10'
+    option learn '1'
+    option persist '0'
+    option disabled '0'
+--
+
+* table: String
+Set an auxiliary table for the current kernel routing instance. This table MUST exist as a SECTION 3 instance.
+[HINT] If there is an Kernel protocol instance that uses the "main" kernel table (not using table/kernel_table options), this should be included before the rest of Kernel instances (which will use auxiliary tables).
+
+* import: String/Filter function
+This option delimits which routes coming from other protocols will be accepted. This option allows filters in different manners:
+1. All/none: allows to import all the routes or none of them.
+2. Filter name: [import 'bgp_filter_in'] the protocol will use the filter with the Filter name. (Needs an existing filter declared in the UCI configuration file)
+
+* export: String/Filter function
+This option delimits which routes going out from the protocol. This option allows filters in different manners:
+1. All/none: allows to export all the routes or none of them.
+2. Filter name: [export 'bgp_filter_out'] the protocol will use the filter with the 'Filter name'. (Needs an existing filter declared in the UCI configuration file)
+
+* kernel_table: Integer
+This option sets the identification number of the Kernel table that will be used instead of the main one.
+Default: main table (254)
+
+* scan_time: Integer
+This option sets the time between checks to the selected kernel table.
+
+* learn: Boolean
+Set if the kernel table will add the routes from other routing protocols or the system administrator.
+
+* persist: Boolean
+Set if Bird Daemon will save the known routes when exiting or if it will clean the routing table.
+
+* disable: Boolean
+This option sets if the protocol will be used or dismissed.
+Default: 0
+
+
+
+---------------------------------------------------------------------
+CONFIGURATION SECTION 5: 'device NAME'
+---------------------------------------------------------------------
+
+Example
+--
+config device device1
+    option scan_time '10'
+    option disabled '0'
+--
+
+* scan_time: Integer
+This option sets the time between checks to the selected kernel table.
+
+* disable: Boolean
+This option sets if the protocol will be used or dismissed.
+Default: 0
+
+
+
+CONFIGURATION SECTION 6: 'static NAME'
+
+Example
+--
+config static static1
+    option table 'aux'
+    option disabled '0'
+--
+
+* table: String
+Set an auxiliary table for the current static instance. This table MUST exist as a SECTION 3 instance.
+[HINT] If there is an static instance that uses the "main" kernel table (not using table/kernel_table options), this should be included before the rest of static instances (which will use auxiliary tables).
+
+* disable: Boolean
+This option sets if the protocol will be used or dismissed.
+Default: 0
+
+
+
+---------------------------------------------------------------------
+CONFIGURATION SECTION 7 & 8: 'bgp NAME' & 'bgp_template NAME'
+---------------------------------------------------------------------
+
+This section merges two different configuration sections: bgp instances and templates. The first one is the basic bgp configuration part and the second one is the template used to minimize the number of options written in the configuration file. Both configuration sections has the same options, but when Bird found duplicities, the bgp instance has priority over the template.
+
+Examples
+
+-- instance --
+config bgp bgp1
+    option template 'bgp_common'
+    option description 'Description of the BGP instance'
+    option neighbor_address '172.16.1.5'
+    option neighbor_as '65530'
+    option source_address '172.16.1.6'
+    option next_hop_self '0'
+    option next_hop_keep '0'
+    option rr_client '1'
+    option rr_cluster_id '172.16.1.6'
+--
+-- template --
+config bgp_template bgp_common
+    option table 'aux'
+    option import 'all'
+    option export 'all'
+    option local_address '172.16.1.6'
+    option local_as '65001'
+    option import_limit '100'
+    option import_limit_action 'warn'
+    option export_limit '100'
+    option export_limit_action 'warn'
+    option receive_limit '100'
+    option receive_limit_action 'warn'
+    option disabled '0'
+--
+
+* template: String
+This option states the template used for current BGP instance. This template MUST exist as a SECTION 8 instance.
+
+* description: String
+This option allows to add a description of the bgp instance and its function
+
+* local_addr: IP address
+This optional option allows to set the IP source of our Autonomous System (AS).
+
+* local_as: Integer
+This option allows to set the identification number of our AS number. This option is mandatory for each BGP instance.
+
+* neighbor_addr: IP address 
+Each BGP instance has a neighbor connected to. This option allows to set its IP address
+
+* neighbor_as: Integer
+Each BGP instance has a neighbor connected to. This option allows to set its AS ID.
+
+* next_hop_self: Boolean
+If this option is true, BGP protocol will avoid to calculate the next hop and always advertise own "Router id" IP .
+Default: 0
+
+* next_hop_keep: Boolean
+If this option is true, BGP will always use the received next_hop information to redirect the route.
+Default: 0
+
+* rr_client: Boolean
+IF this option is true, the router will be set as Route Reflector and will treat the rest of the routers as RR clients.
+Default: 0
+
+* rr_cluster_id: Integer
+This option sets the identification number of the RR cluster. All the nodes in a cluster needs this option and share the same number.
+Default: Router id
+
+* import_limit: Integer
+This option sets the limit of routes that a protocol can import until take the action indicated in the import_limit_action.
+import_limit also counts filtered routes (even dropped).
+Default: 0 (no limit)
+
+* import_limit_action: String
+This option allows to decide the action to take when reached the limit of imported routes.
+Actions are: warn, block, restart, disable
+
+* export_limit: Integer
+This option sets the limit of routes that a protocol can export until take the action indicated in the export_limit_action.
+Default: 0 (no limit)
+
+* export_limit_action: String
+This option allows to decide the action to take when reached the limit of exported routes.
+Actions are: warn, block, restart, disable
+
+* receive_limit: Integer
+This option sets the limit of routes that a protocol can receive until take the action indicated in the receive_limit_action. receive_limit only counts accepted routes from the protocol.
+Default: 0 (no limit)
+
+* receive_limit_action: String
+This option allows to decide the action to take when reached the limit of received routes.
+Actions are: warn, block, restart, disable
+
+* disable: Boolean
+This option sets if the protocol will be used or dismissed.
+Default: 0
+
+
+
+---------------------------------------------------------------------
+CONFIGURATION SECTION 9: 'route' 
+---------------------------------------------------------------------
+
+Example
+--
+config route
+    option instance 'static1'
+    option type 'router'
+    option prefix '192.168.9.0/24'
+    option via '10.99.105.159'
+
+config route
+    option instance 'static1'
+    option type 'special'
+    option prefix '192.168.2.0/24'
+    option attribute 'unreachable'
+
+config route
+    option instance 'static1'
+    option type 'iface'
+    option prefix '192.168.3.0/24'
+    option iface 'mgmt0'
+
+config route
+    option instance 'static1'
+    option type 'recursive'
+    option prefix '192.168.4.0/24'
+    option ip '192.168.1.1'
+
+config route
+    option instance 'static1'
+    option type 'multipath'
+    option prefix '192.168.30.0/24'
+    list l_via '172.16.1.5'
+    list l_via '172.16.1.6'
+--
+
+* instance: String
+This option indicates the route that the static protocol instance will apply.
+
+* type: String
+This option states the type of route that will be applied. Also defines the options available for it.
+Types are: 'router', 'special', 'iface', 'recursive' or 'multipath'.
+
+* prefix: IP address/network
+This option allows to define the network that you want to define.
+
+[router only]
+* via: IP Address
+This option indicates the IP address of the neighbor router where the routes will pass through.
+
+[special only]
+* attribute: String
+This option will mark the behaviour of the route.
+Attribures are: 'blackhole', 'unreachable' or 'prohibit'.
+
+[iface only]
+* iface: String
+This option indicates the interface used to redirect the BGP routes. Careful, the interface MUST exist, or Bird will fail to start.
+
+[recursive only]
+* ip: IP address
+This option states the IP address which the next hop will depend on.
+
+[multipath only][This is a list, not an option. Use it as in the example, or check the UCI configuration documentation.]
+* l_via: IP address
+This list of IPs specifies the list (following the sequence) of routers that the route will follow as next hops.
+
+
+
+---------------------------------------------------------------------
+CONFIGURATION SECTION 10: 'filter NAME' 
+---------------------------------------------------------------------
+
+Filters are written in separated files. Its syntax can be found in http://bird.network.cz/?get_doc&f=bird-5.html
+The content of each filter file is copied in the birdX.conf file without checking its syntax.
+
+Example
+--
+config filter 'firstFilter'
+    option type 'bgp'
+    option instance 'bgp1'
+    option file_path '/var/filters/f1'
+--
+
+* type: String
+The type indicates to which routing protocol is the filter directed to. Currently only BGP is available.
+
+* instance: String
+This option indicates the filter that the routing protocol instance will apply.
+
+* file_path: String (File path)
+This option specifies the path to the filter file to be used in the routing protocol.
+
+
+
+---------------------------------------------------------------------
+COMPLETE CONFIGURATION EXAMPLE:
+---------------------------------------------------------------------
+
+config bird 'bird'
+    option use_UCI_config '1'
+        #Caution! Enabling this option, Bird will translate this
+        #UCI file and use it instead of /etc/bird4.conf
+    option UCI_config_file '/tmp/bird4.conf'
+        #If you enable useUCIconfig, UCIconfigFile will be Bird's
+        #configuration file location.
+
+config global 'global'
+    option log_file '/tmp/bird4.log'
+    option log 'all'
+    option debug 'off'
+    option router_id '172.16.1.6'
+
+config table
+    option name 'aux'
+    
+config kernel kernel1
+    option table 'aux'
+    option import 'all'
+    option export 'all'
+    option kernel_table '100'
+    option scan_time '10'
+    option learn '1'
+    option persist '0'
+    option disabled '0'
+
+config device device1
+    option scan_time '10'
+    option disabled '0'
+
+config static static1
+    option table 'aux'
+    option disabled '0'
+
+config bgp bgp1
+    option template 'bgp_common'
+    option description 'Description of the BGP instance'
+    option neighbor_address '172.16.1.5'
+    option neighbor_as '65530'
+    option source_address '172.16.1.6'
+    option next_hop_self '0'
+    option next_hop_keep '0'
+    option rr_client '1'
+    option rr_cluster_id '172.16.1.6'
+
+config bgp_template bgp_common
+    option table 'aux'
+    option import 'all'
+    option export 'all'
+    option local_address '172.16.1.6'
+    option local_as '65001'
+    option import_limit '100'
+    option import_limit_action 'warn'
+    option export_limit '100'
+    option export_limit_action 'warn'
+    option receive_limit '100'
+    option receive_limit_action 'warn'
+    option disabled '0'
+
+#config ospf ospf1
+#    option cfg1583compat '1'
+#
+#config ospf_area '0.0.0.0'
+#    option instance 'ospf1'
+#    option stub '0'
+#
+#config ospf_interface '*'
+#    option area '0.0.0.0'
+#    option cost '100'
+#    option type 'broadcast'
+#    option hello '5'
+#    option password '1'
+#
+#config ospf_password '1'
+#    option authentication 'cryptographic'
+#    option passphrase '1234'
+#
+#config ospf_networks
+#    option area '0.0.0.0'
+#    list prefix '10.0.0.0/24'
+#
+#config ospf_hidden_networks
+#    option area '0.0.0.0'
+#    option prefix '12.0.0.0/24'
+#
+#config ospf_stubnet '11.0.0.0/24'
+#    option area '0.0.0.0'
+#    option hidden '0'
+#    option summary '0'
+#    option cost '101'
+#
+
+config route
+    option instance 'static1'
+    option type 'router'
+    option prefix '192.168.9.0/24'
+    option via '10.99.105.159'
+
+config route
+    option instance 'static1'
+    option type 'special'
+    option prefix '192.168.2.0/24'
+    option attribute 'unreachable'
+
+config route
+    option instance 'static1'
+    option type 'iface'
+    option prefix '192.168.3.0/24'
+    option iface 'mgmt0'
+
+config route
+    option instance 'static1'
+    option type 'recursive'
+    option prefix '192.168.4.0/24'
+    option ip '192.168.1.1'
+
+config route
+    option instance 'static1'
+    option type 'multipath'
+    option prefix '192.168.30.0/24'
+    list l_via '172.16.1.5'
+    list l_via '172.16.1.6'
+
+config filter 'firstFilter'
+    option type 'bgp'
+    option instance 'bgp1'
+    option file_path '/var/filters/f1'
+
+
diff --git a/bird-openwrt/bird4-openwrt/src/config/bird4 b/bird-openwrt/bird4-openwrt/src/config/bird4
index 05eaffa..5bfc372 100644
--- a/bird-openwrt/bird4-openwrt/src/config/bird4
+++ b/bird-openwrt/bird4-openwrt/src/config/bird4
@@ -58,72 +58,10 @@ config bgp_template bgp_common
     option receive_limit_action 'warn'
     option disabled '0'
 
-config ospf ospf1
-    option cfg1583compat '1'
-
-config ospf_area '0.0.0.0'
-    option instance 'ospf1'
-    option stub '0'
-
-config ospf_interface '*'
-    option area '0.0.0.0'
-    option cost '100'
-    option type 'broadcast'
-    option hello '5'
-    option password '1'
-
-config ospf_password '1'
-    option authentication 'cryptographic'
-    option passphrase '1234'
-
-config ospf_networks
-    option area '0.0.0.0'
-    list prefix '10.0.0.0/24'
-
-config ospf_hidden_networks
-    option area '0.0.0.0'
-    option prefix '12.0.0.0/24'
-
-config ospf_stubnet '11.0.0.0/24'
-    option area '0.0.0.0'
-    option hidden '0'
-    option summary '0'
-    option cost '101'
-
 config route
     option instance 'static1'
     option type 'router'
     option prefix '192.168.9.0/24'
     option via '10.99.105.159'
 
-config route
-    option instance 'static1'
-    option type 'special'
-    option prefix '192.168.2.0/24'
-    option attribute 'unreachable'
-
-config route
-    option instance 'static1'
-    option type 'iface'
-    option prefix '192.168.3.0/24'
-    option iface 'mgmt0'
-
-config route
-    option instance 'static1'
-    option type 'recursive'
-    option prefix '192.168.4.0/24'
-    option ip '192.168.1.1'
-
-config route
-    option instance 'static1'
-    option type 'multipath'
-    option prefix '192.168.30.0/24'
-    list l_via '172.16.1.5'
-    list l_via '172.16.1.6'
-
-config filter 'firstFilter'
-    option type 'bgp'
-    option instance 'bgp1'
-    option file_path '/var/filters/f1'
-
 
diff --git a/bird-openwrt/bird6-openwrt/src/config/bird6 b/bird-openwrt/bird6-openwrt/src/config/bird6
index 1807df7..134b44f 100644
--- a/bird-openwrt/bird6-openwrt/src/config/bird6
+++ b/bird-openwrt/bird6-openwrt/src/config/bird6
@@ -78,9 +78,3 @@ config route
     option type 'iface'
     option prefix '2001:db8:0:f101::1111/128'
     option iface 'eth0'
-
-config filter 'firstFilter'
-    option type 'bgp'
-    option instance 'bgp1'
-    option file_path '/var/filters/f1'
-

From 52c2996771939468e4922653367cc21aad6d1540 Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Mon, 24 Nov 2014 20:46:19 +0100
Subject: [PATCH 025/368] bmx6 update to master tip

---
 bmx6/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bmx6/Makefile b/bmx6/Makefile
index 9af1950..b9868db 100644
--- a/bmx6/Makefile
+++ b/bmx6/Makefile
@@ -31,8 +31,8 @@ PKG_SOURCE_PROTO:=git
 #PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
 PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 
-PKG_REV:=8b0585e84ca8a0110bd4587e19192beda1ba3238
-PKG_VERSION:=r2014052301
+PKG_REV:=6a6195e46bf15ed58d75bdec14c2941aca31fc3f
+PKG_VERSION:=r2014112401
 PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 

From e0ef57fa737b21abde5fbbbac5f26281b9409210 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Tue, 25 Nov 2014 12:29:13 +0100
Subject: [PATCH 026/368] hnetd: update to latest version

Signed-off-by: Steven Barth <steven@midlink.org>
---
 hnetd/Makefile          | 6 +++---
 hnetd/files/hnet.config | 1 +
 hnetd/files/hnetd.init  | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/hnetd/Makefile b/hnetd/Makefile
index c4afb75..9f681bd 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2012-2013 OpenWrt.org
+# Copyright (C) 2012-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hnetd
-PKG_SOURCE_VERSION:=0c1d55d03983c726aaad010738236c2da64ca7df
-PKG_VERSION:=2014-09-26-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=10b22c409f2ecadaaec45e068fd01c74ffe5c772
+PKG_VERSION:=2014-11-25-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
diff --git a/hnetd/files/hnet.config b/hnetd/files/hnet.config
index e67e6eb..462f045 100644
--- a/hnetd/files/hnet.config
+++ b/hnetd/files/hnet.config
@@ -1,6 +1,7 @@
 config pa pa
 #	option ip4prefix 10.0.0.0/8
 #	option ulaprefix fd12:3456:789A::/48
+#	option ulamode off
 #	option persistent_store /etc/hnet-pa.store
 
 config sd sd
diff --git a/hnetd/files/hnetd.init b/hnetd/files/hnetd.init
index 8ee076a..3c5505d 100644
--- a/hnetd/files/hnetd.init
+++ b/hnetd/files/hnetd.init
@@ -57,6 +57,9 @@ start_service() {
     config_get val pa ulaprefix
     [ -n "$val" ] && procd_append_param command --ulaprefix $val
 
+    config_get val pa ulamode
+    [ -n "$val" ] && procd_append_param command --ulamode $val
+
     config_get val sd router_name
     [ -n "$val" ] && procd_append_param command -n $val
 

From 33fe96324251427017106efb76e73373e509f763 Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Sat, 29 Nov 2014 08:11:36 +0100
Subject: [PATCH 027/368] nodogsplash: upgrade to 0.9_beta9.9.9

---
 nodogsplash/Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nodogsplash/Makefile b/nodogsplash/Makefile
index 61726cc..d7ff5e6 100644
--- a/nodogsplash/Makefile
+++ b/nodogsplash/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nodogsplash
 PKG_FIXUP:=autoreconf
-PKG_VERSION:=0.9_beta9.9.8
+PKG_VERSION:=0.9_beta9.9.9
 PKG_RELEASE:=2
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=git://github.com/nodogsplash/nodogsplash.git
-PKG_SOURCE_VERSION:=v0.9_beta9.9.8
+PKG_SOURCE_VERSION:=v0.9_beta9.9.9
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=GPL-2.0+
@@ -52,6 +52,8 @@ define Package/nodogsplash/install
 	$(CP) $(PKG_BUILD_DIR)/resources/splash.jpg $(1)/etc/$(PKG_NAME)/htdocs/images/
 endef
 
+define Package/nodogsplash/conffiles
+/etc/nodogsplash/nodogsplash.conf
+endef
 
 $(eval $(call BuildPackage,nodogsplash))
-

From 53a4f6b93baa33ee7f2eb4f41e0a3792f22a450b Mon Sep 17 00:00:00 2001
From: Stijn Tintel <stijn@linux-ipv6.be>
Date: Tue, 2 Dec 2014 06:37:39 +0100
Subject: [PATCH 028/368] miniupnpd: fix error message during shutdown

During shutdown, miniupnpd is stopped after network. Because of this,
miniupnpd is unable to broadcast good-bye notifications, and displays an
error message. Stop miniupnpd before netifd to solve this.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
---
 miniupnpd/files/miniupnpd.init | 1 +
 1 file changed, 1 insertion(+)

diff --git a/miniupnpd/files/miniupnpd.init b/miniupnpd/files/miniupnpd.init
index f8a66fd..9ac6de2 100644
--- a/miniupnpd/files/miniupnpd.init
+++ b/miniupnpd/files/miniupnpd.init
@@ -2,6 +2,7 @@
 # Copyright (C) 2006-2011 OpenWrt.org
 
 START=95
+STOP=15
 
 SERVICE_USE_PID=1
 

From cd8234f10c3714058dc10c6bac9d8e7568dc3e13 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Tue, 2 Dec 2014 15:16:39 +0100
Subject: [PATCH 029/368] miniupnpd: bump to 1.9.20141118

Signed-off-by: Steven Barth <steven@midlink.org>
---
 miniupnpd/Makefile                          |  4 +-
 miniupnpd/files/miniupnpd.init              |  2 +-
 miniupnpd/patches/101-pcp-third-party.patch | 75 ---------------------
 3 files changed, 3 insertions(+), 78 deletions(-)
 delete mode 100644 miniupnpd/patches/101-pcp-third-party.patch

diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index 2f05ec8..ceed43c 100644
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
-PKG_VERSION:=1.9
+PKG_VERSION:=1.9.20141128
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=9151502f84f130b0ef1245ac938c33f9
+PKG_MD5SUM:=a9e71952bebb80e643a9c7a0e2c58faa
 
 PKG_MAINTAINER:=Markus Stenberg <fingon@iki.fi>
 PKG_LICENSE:=BSD-3-Clause
diff --git a/miniupnpd/files/miniupnpd.init b/miniupnpd/files/miniupnpd.init
index 9ac6de2..79def5d 100644
--- a/miniupnpd/files/miniupnpd.init
+++ b/miniupnpd/files/miniupnpd.init
@@ -1,5 +1,5 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2014 OpenWrt.org
 
 START=95
 STOP=15
diff --git a/miniupnpd/patches/101-pcp-third-party.patch b/miniupnpd/patches/101-pcp-third-party.patch
deleted file mode 100644
index b66621d..0000000
--- a/miniupnpd/patches/101-pcp-third-party.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 27d4d10a3ed3a4d87941247ed73bcb67c68b2bb9 Mon Sep 17 00:00:00 2001
-From: Thomas Bernard <miniupnp@free.fr>
-Date: Thu, 30 Oct 2014 20:37:35 +0100
-Subject: [PATCH] miniupnpd.c: fix PCP third party mode (in IPv4)
-
-fixes problem introduced in commit 16389fda3c5313bffc83fb6594f5bb5872e37e5e
----
- miniupnpd.c | 38 +++++++++++++++++++++++++++-----------
- 1 file changed, 27 insertions(+), 11 deletions(-)
-
-diff --git a/miniupnpd.c b/miniupnpd.c
-index 6468075..06bcae2 100644
---- a/miniupnpd.c
-+++ b/miniupnpd.c
-@@ -2133,30 +2133,46 @@ main(int argc, char * * argv)
- 				                               msg_buff, sizeof(msg_buff));
- 				if (len < 1)
- 					continue;
-+#ifdef ENABLE_PCP
-+				if (msg_buff[0]==0) {  /* version equals to 0 -> means NAT-PMP */
-+					/* Check if the packet is coming from a LAN to enforce RFC6886 :
-+					 * The NAT gateway MUST NOT accept mapping requests destined to the NAT
-+					 * gateway's external IP address or received on its external network
-+					 * interface.  Only packets received on the internal interface(s) with a
-+					 * destination address matching the internal address(es) of the NAT
-+					 * gateway should be allowed. */
-+					/* TODO : move to ProcessIncomingNATPMPPacket() ? */
-+					lan_addr = get_lan_for_peer((struct sockaddr *)&senderaddr);
-+					if(lan_addr == NULL) {
-+						char sender_str[64];
-+						sockaddr_to_string((struct sockaddr *)&senderaddr, sender_str, sizeof(sender_str));
-+						syslog(LOG_WARNING, "NAT-PMP packet sender %s not from a LAN, ignoring",
-+						       sender_str);
-+						continue;
-+					}
-+					ProcessIncomingNATPMPPacket(snatpmp[i], msg_buff, len,
-+					                            &senderaddr);
-+				} else { /* everything else can be PCP */
-+					ProcessIncomingPCPPacket(snatpmp[i], msg_buff, len,
-+					                         (struct sockaddr *)&senderaddr, NULL);
-+				}
-+
-+#else
- 				/* Check if the packet is coming from a LAN to enforce RFC6886 :
- 				 * The NAT gateway MUST NOT accept mapping requests destined to the NAT
- 				 * gateway's external IP address or received on its external network
- 				 * interface.  Only packets received on the internal interface(s) with a
- 				 * destination address matching the internal address(es) of the NAT
- 				 * gateway should be allowed. */
-+				/* TODO : move to ProcessIncomingNATPMPPacket() ? */
- 				lan_addr = get_lan_for_peer((struct sockaddr *)&senderaddr);
- 				if(lan_addr == NULL) {
- 					char sender_str[64];
- 					sockaddr_to_string((struct sockaddr *)&senderaddr, sender_str, sizeof(sender_str));
--					syslog(LOG_WARNING, "NAT-PMP/PCP packet sender %s not from a LAN, ignoring",
-+					syslog(LOG_WARNING, "NAT-PMP packet sender %s not from a LAN, ignoring",
- 					       sender_str);
- 					continue;
- 				}
--#ifdef ENABLE_PCP
--				if (msg_buff[0]==0) {  /* version equals to 0 -> means NAT-PMP */
--					ProcessIncomingNATPMPPacket(snatpmp[i], msg_buff, len,
--					                            &senderaddr);
--				} else { /* everything else can be PCP */
--					ProcessIncomingPCPPacket(snatpmp[i], msg_buff, len,
--					                         (struct sockaddr *)&senderaddr, NULL);
--				}
--
--#else
- 				ProcessIncomingNATPMPPacket(snatpmp[i], msg_buff, len, &senderaddr);
- #endif
- 			}
--- 
-2.1.0
-

From 3c8e0c96703bfdcf395cc9baca4920f99c1d3c2d Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Thu, 11 Dec 2014 09:47:26 +0100
Subject: [PATCH 030/368] quagga: mark as @BROKEN, unfixed since September

https://github.com/openwrt-routing/packages/issues/56

Signed-off-by: Steven Barth <steven@midlink.org>
---
 quagga/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quagga/Makefile b/quagga/Makefile
index 46a4235..cb88b71 100644
--- a/quagga/Makefile
+++ b/quagga/Makefile
@@ -46,7 +46,7 @@ endef
 
 define Package/quagga
   $(call Package/quagga/Default)
-  DEPENDS:=+librt
+  DEPENDS:=@BROKEN +librt
   MENU:=1
 endef
 

From c24d74657c1bfd01c651f25055ef5e5e86c041b5 Mon Sep 17 00:00:00 2001
From: Stijn Tintel <stijn@linux-ipv6.be>
Date: Fri, 5 Dec 2014 00:46:12 +0100
Subject: [PATCH 031/368] bird: bump to 1.4.5

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
---
 bird/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bird/Makefile b/bird/Makefile
index 9dd5cf3..920ae81 100644
--- a/bird/Makefile
+++ b/bird/Makefile
@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bird
-PKG_VERSION:=1.4.3
+PKG_VERSION:=1.4.5
 PKG_RELEASE:=1
 
 PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird
-PKG_MD5SUM:=eb7e00b9c1d102ddfcbc19d9cb168511
+PKG_MD5SUM:=a8e5e0a9129ce30fe6102c593bafb763
 PKG_BUILD_DEPENDS:=libncurses libreadline
 PKG_LICENSE:=GPL-2.0
 

From 0820b44d826d90f958c85435f6019888842dc451 Mon Sep 17 00:00:00 2001
From: Saverio Proto <zioproto@gmail.com>
Date: Mon, 15 Dec 2014 20:58:19 +0100
Subject: [PATCH 032/368] Fix Quagga vtysh build against readline 6.3

---
 quagga/Makefile                                   |  4 ++--
 ...110-vtysh-fix-build-against-readline-6.3.patch | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 quagga/patches/110-vtysh-fix-build-against-readline-6.3.patch

diff --git a/quagga/Makefile b/quagga/Makefile
index cb88b71..67eedd6 100644
--- a/quagga/Makefile
+++ b/quagga/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=quagga
 PKG_VERSION:=0.99.22.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MD5SUM:=03ef24a448be47beba80efa2152f8a28
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
@@ -46,7 +46,7 @@ endef
 
 define Package/quagga
   $(call Package/quagga/Default)
-  DEPENDS:=@BROKEN +librt
+  DEPENDS:=+librt
   MENU:=1
 endef
 
diff --git a/quagga/patches/110-vtysh-fix-build-against-readline-6.3.patch b/quagga/patches/110-vtysh-fix-build-against-readline-6.3.patch
new file mode 100644
index 0000000..e8c499e
--- /dev/null
+++ b/quagga/patches/110-vtysh-fix-build-against-readline-6.3.patch
@@ -0,0 +1,15 @@
+--- a/vtysh/vtysh.c
++++ b/vtysh/vtysh.c
+@@ -2211,9 +2211,9 @@
+ vtysh_readline_init (void)
+ {
+   /* readline related settings. */
+-  rl_bind_key ('?', (Function *) vtysh_rl_describe);
++  rl_bind_key ('?', (rl_command_func_t *) vtysh_rl_describe);
+   rl_completion_entry_function = vtysh_completion_entry_function;
+-  rl_attempted_completion_function = (CPPFunction *)new_completion;
++  rl_attempted_completion_function = (rl_completion_func_t *) new_completion;
+   /* do not append space after completion. It will be appended
+    * in new_completion() function explicitly. */
+   rl_completion_append_character = '\0';
+

From 061ce7584c793b83066a62b969e4d83f145a6751 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Sun, 21 Dec 2014 09:56:30 +0100
Subject: [PATCH 033/368] miniupnpd: bump to latest, fix enabled-check in
 hotplug script

Signed-off-by: Steven Barth <steven@midlink.org>
---
 miniupnpd/Makefile                | 4 ++--
 miniupnpd/files/miniupnpd.hotplug | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index ceed43c..b890c8b 100644
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
-PKG_VERSION:=1.9.20141128
+PKG_VERSION:=1.9.20141209
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=a9e71952bebb80e643a9c7a0e2c58faa
+PKG_MD5SUM:=e9e53869bb725e931cae74b20d4a39be
 
 PKG_MAINTAINER:=Markus Stenberg <fingon@iki.fi>
 PKG_LICENSE:=BSD-3-Clause
diff --git a/miniupnpd/files/miniupnpd.hotplug b/miniupnpd/files/miniupnpd.hotplug
index 8b643f1..65bc500 100644
--- a/miniupnpd/files/miniupnpd.hotplug
+++ b/miniupnpd/files/miniupnpd.hotplug
@@ -1,9 +1,6 @@
 #!/bin/sh
 
-if [ ! /etc/init.d/miniupnpd enabled ]
-then
-    exit 0
-fi
+/etc/init.d/miniupnpd enabled || exit 0
 
 . /lib/functions/service.sh
 

From 743e4c27e2d50be834e46c7c6f9d13c255f81451 Mon Sep 17 00:00:00 2001
From: Saverio Proto <zioproto@gmail.com>
Date: Mon, 29 Dec 2014 14:09:37 +0100
Subject: [PATCH 034/368] olsrd: bump to 0.6.8

---
 olsrd/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/olsrd/Makefile b/olsrd/Makefile
index 188d0b7..1b09167 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
-PKG_VERSION:=0.6.7.1
-PKG_RELEASE:=5
+PKG_VERSION:=0.6.8
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6
 
-PKG_MD5SUM:=d4411d4ed94b399a3778b8036dee1214
+PKG_MD5SUM:=feabdd611391dcb30af5795e834cc258
 PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=BSD-3-Clause
 

From 1696064d221d27ac9208ec860c06487ea9a3f16e Mon Sep 17 00:00:00 2001
From: Gabriel Kerneis <gabriel@kerneis.info>
Date: Tue, 30 Dec 2014 16:38:21 +0100
Subject: [PATCH 035/368] babel-pinger: initial import (closes #65)

Signed-off-by: Gabriel Kerneis <gabriel@kerneis.info>
---
 babel-pinger/Makefile | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 babel-pinger/Makefile

diff --git a/babel-pinger/Makefile b/babel-pinger/Makefile
new file mode 100644
index 0000000..528a07f
--- /dev/null
+++ b/babel-pinger/Makefile
@@ -0,0 +1,41 @@
+# Copyright (C) 2012-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=babel-pinger
+PKG_VERSION:=0.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/files/
+PKG_MD5SUM:=40d4931986913f5f8d9b5b70abf6fda5
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/babel-pinger
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Routing and Redirection
+  TITLE:=Babel-pinger
+  URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/babel/
+  MAINTAINER:=Gabriel Kerneis <gabriel@kerneis.info>
+  DEPENDS:=+librt
+endef
+
+define Package/babel-pinger/description
+ Babel-pinger is a hack to export a default route into Babel for people
+ using DHCP to configure their routers rather than speaking to their
+ upstream provider with a proper routing protocol.
+endef
+
+MAKE_FLAGS+= \
+	CFLAGS="$(TARGET_CFLAGS)" \
+
+define Package/babeld/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/babel-pinger $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,babel-pinger))

From e03ee22d045a77eebee7a8c32d71212e73633c98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
Date: Wed, 31 Dec 2014 20:40:56 +0100
Subject: [PATCH 036/368] mcproxy: update to latest version, add UCI support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 mcproxy/Makefile                           |  12 +-
 mcproxy/files/mcproxy.conf                 |  66 +++++-
 mcproxy/files/mcproxy.config               | 231 +++++++++++++++++++++
 mcproxy/files/mcproxy.init                 | 163 ++++++++++++++-
 mcproxy/patches/0004-uclibc-add-defs.patch |  11 +
 5 files changed, 470 insertions(+), 13 deletions(-)
 create mode 100644 mcproxy/files/mcproxy.config
 create mode 100644 mcproxy/patches/0004-uclibc-add-defs.patch

diff --git a/mcproxy/Makefile b/mcproxy/Makefile
index ef0b09e..cb3fb20 100644
--- a/mcproxy/Makefile
+++ b/mcproxy/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mcproxy
-PKG_SOURCE_VERSION:=6638aa9aabd2ccdde8915b61a8e0fb995b1f91a3
-PKG_VERSION:=2014-05-31-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=b7bd2d0809a0d1f177181c361b9a6c83e193b79a
+PKG_VERSION:=2014-12-31-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
@@ -40,11 +40,15 @@ endef
 
 define Package/mcproxy/conffiles
 /etc/mcproxy.conf
+/etc/config/mcproxy
 endef
 
 define Package/mcproxy/install
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_CONF) ./files/mcproxy.conf $(1)/etc/mcproxy.conf
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/mcproxy.config $(1)/etc/config/mcproxy
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_CONF) ./files/mcproxy.conf $(1)/etc
 	$(INSTALL_BIN) ./files/mcproxy.init $(1)/etc/init.d/mcproxy
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mcproxy-bin $(1)/usr/sbin/mcproxy
diff --git a/mcproxy/files/mcproxy.conf b/mcproxy/files/mcproxy.conf
index 60a655e..936cdda 100644
--- a/mcproxy/files/mcproxy.conf
+++ b/mcproxy/files/mcproxy.conf
@@ -2,13 +2,67 @@
 ##-- mcproxy configuration script --##
 ######################################
 
-# Erase or comment out the following line when configured
-disable;
-
 # Protocol: IGMPv1|IGMPv2|IGMPv3 (IPv4) - MLDv1|MLDv2 (IPv6)
 protocol IGMPv3;
 
+###########################################
+
 # Proxy Instance: upstream ==> downstream
-pinstance proxy1: eth1 ==> "eth0.1";
-#pinstance proxy2: "eth0.2" ==> "br-lan";
-#pinstance proxy3: eth0 ==> eth1 eth2;
+pinstance A: ap a1 ==> ap a2;
+pinstance B: bp b1 ==> bp b2;
+
+###########################################
+
+# Tables
+table allways {
+	(*|*)
+};
+
+table piA_peering_ifs {
+	ap(*|*)
+};
+
+table piA_upstreams {
+	a1(*|*)
+};
+
+table piB_peering_ifs {
+	bp(*|*)
+};
+
+table piB_upstreams {
+	b1(*|*)
+};
+
+###########################################
+
+# Instance Behaviour
+pinstance A upstream * in rulematching mutex 10; #or 25ms (u4)
+#pinstance A upstream * out rulematching all; #default
+
+pinstance A upstream ap out blacklist table allways; #(u1)
+#pinstance A upstream ap in whitelist table {(*|*)}; #default (u2, u3)
+
+pinstance A upstream a1 out blacklist table piA_peering_ifs; #(u3_1)
+#pinstance A upstream a1 in whitelist table {(*|*)}; #default
+
+pinstance A downstream ap in blacklist table allways; #(d1)
+pinstance A downstream ap out blacklist table piA_upstreams; #(d2, d2_1, d3, d4)
+
+#pinstance A downstream a2 in whitelist table {(*|*)}; #default
+#pinstance A downstream a2 out whitelist table {(*|*)}; #default
+
+pinstance B upstream * in rulematching mutex 10;  #or 25ms (u4)
+#pinstance B upstream * out rulematching all; #default
+
+pinstance B upstream bp out blacklist table allways; #(u1)
+#pinstance B upstream bp in whitelist table {(*|*)}; #default (u2, u3)
+
+pinstance B upstream b1 out blacklist table piB_peering_ifs; #(u3_1)
+#pinstance b upstream b1 in whitelist table {(*|*)}; #default
+
+pinstance B downstream bp in blacklist table allways; #(d1)
+pinstance B downstream bp out blacklist table piB_upstreams; #(d2, d2_1, d3, d4)
+
+#pinstance B downstream b2 in whitelist table {(*|*)}; #default
+#pinstance B downstream b2 out whitelist table {(*|*)}; #default
diff --git a/mcproxy/files/mcproxy.config b/mcproxy/files/mcproxy.config
new file mode 100644
index 0000000..10cc410
--- /dev/null
+++ b/mcproxy/files/mcproxy.config
@@ -0,0 +1,231 @@
+# Use your own MCProxy config file
+config mcproxy 'mcproxy_file'
+	option disabled '1'
+	option respawn '1'
+	option file '/etc/mcproxy.conf'
+
+# Use OpenWrt UCI config
+config mcproxy 'mcproxy'
+	option disabled '1'
+	option respawn '1'
+	option protocol 'IGMPv3'
+
+###########################################
+
+# Simple configuration examples
+
+config instance
+	option disabled '1'
+	option name 'proxy1'
+	list upstream 'eth1'
+	list downstream 'eth0.2'
+
+config instance
+	option disabled '1'
+	option name 'proxy2'
+	list upstream 'eth0.2'
+	list downstream 'eth0.4'
+	list downstream 'br-lan'
+
+config instance
+	option disabled '1'
+	option name 'proxy3'
+	list upstream 'eth1.2'
+	list upstream 'eth1.4'
+	list downstream 'eth0.1'
+
+###########################################
+
+# Advanced configuration example
+
+config instance
+	option name 'A'
+	list upstream 'ap'
+	list upstream 'a1'
+	list downstream 'ap'
+	list downstream 'a2'
+
+config instance
+	option name 'B'
+	list upstream 'bp'
+	list upstream 'b1'
+	list downstream 'bp'
+	list downstream 'b2'
+
+config table
+	option name 'allways'
+	list entries '(*|*)'
+
+config table
+	option name 'piA_peering_ifs'
+	list entries 'ap(*|*)'
+
+config table
+	option name 'piA_upstreams'
+	list entries 'a1(*|*)'
+
+config table
+	option name 'piB_peering_ifs'
+	list entries 'bp(*|*)'
+
+config table
+	option name 'piB_upstreams'
+	list entries 'b1(*|*)'
+
+config behaviour
+	option instance 'A'
+	option section 'upstream'
+	option interface '*'
+	option direction 'in'
+	option rulematching 'mutex 10'
+
+config behaviour
+	option disabled '1'
+	option instance 'A'
+	option section 'upstream'
+	option interface '*'
+	option direction 'out'
+	option rulematching 'all'
+
+config behaviour
+	option instance 'A'
+	option section 'upstream'
+	option interface 'ap'
+	option direction 'out'
+	option table 'allways'
+
+config behaviour
+	option disabled '1'
+	option instance 'A'
+	option section 'upstream'
+	option interface 'ap'
+	option direction 'in'
+	option whitelist '1'
+	option table '{(*|*)}'
+
+config behaviour
+	option instance 'A'
+	option section 'upstream'
+	option interface 'a1'
+	option direction 'out'
+	option table 'piA_peering_ifs'
+
+config behaviour
+	option disabled '1'
+	option instance 'A'
+	option section 'upstream'
+	option interface 'a1'
+	option direction 'in'
+	option whitelist '1'
+	option table '{(*|*)}'
+
+config behaviour
+	option instance 'A'
+	option section 'downstream'
+	option interface 'ap'
+	option direction 'in'
+	option table 'allways'
+
+config behaviour
+	option instance 'A'
+	option section 'downstream'
+	option interface 'ap'
+	option direction 'out'
+	option table 'piA_upstreams'
+
+config behaviour
+	option disabled '1'
+	option instance 'A'
+	option section 'downstream'
+	option interface 'a2'
+	option direction 'in'
+	option whitelist '1'
+	option table '{(*|*)}'
+
+config behaviour
+	option disabled '1'
+	option instance 'A'
+	option section 'downstream'
+	option interface 'a2'
+	option direction 'out'
+	option whitelist '1'
+	option table '{(*|*)}'
+
+config behaviour
+	option instance 'B'
+	option section 'upstream'
+	option interface '*'
+	option direction 'in'
+	option rulematching 'mutex 10'
+
+config behaviour
+	option disabled '1'
+	option instance 'B'
+	option section 'upstream'
+	option interface '*'
+	option direction 'out'
+	option rulematching 'all'
+
+config behaviour
+	option instance 'B'
+	option section 'upstream'
+	option interface 'bp'
+	option direction 'out'
+	option table 'allways'
+
+config behaviour
+	option disabled '1'
+	option instance 'B'
+	option section 'upstream'
+	option interface 'bp'
+	option direction 'in'
+	option whitelist '1'
+	option table '{(*|*)}'
+
+config behaviour
+	option instance 'B'
+	option section 'upstream'
+	option interface 'b1'
+	option direction 'out'
+	option table 'piB_peering_ifs'
+
+config behaviour
+	option disabled '1'
+	option instance 'B'
+	option section 'upstream'
+	option interface 'b1'
+	option direction 'in'
+	option whitelist '1'
+	option table '{(*|*)}'
+
+config behaviour
+	option instance 'B'
+	option section 'downstream'
+	option interface 'bp'
+	option direction 'in'
+	option table 'allways'
+
+config behaviour
+	option instance 'B'
+	option section 'downstream'
+	option interface 'bp'
+	option direction 'out'
+	option table 'piB_upstreams'
+
+config behaviour
+	option disabled '1'
+	option instance 'B'
+	option section 'downstream'
+	option interface 'b2'
+	option direction 'in'
+	option whitelist '1'
+	option table '{(*|*)}'
+
+config behaviour
+	option disabled '1'
+	option instance 'B'
+	option section 'downstream'
+	option interface 'b2'
+	option direction 'out'
+	option whitelist '1'
+	option table '{(*|*)}'
diff --git a/mcproxy/files/mcproxy.init b/mcproxy/files/mcproxy.init
index 7a33030..a7584e8 100644
--- a/mcproxy/files/mcproxy.init
+++ b/mcproxy/files/mcproxy.init
@@ -1,14 +1,171 @@
 #!/bin/sh /etc/rc.common
+# Copyright (C) 2014 OpenWrt.org
 
 START=50
 USE_PROCD=1
 
-start_service() {
+# mcproxy_list_iface <var> <section> <option>
+mcproxy_list_iface() {
+	local val
+	local len
+	local _buffer
+	local c=1
+
+	config_get len "$2" "${3}_LENGTH"
+	[ -z "$len" ] && return 0
+	while [ $c -le "$len" ]; do
+		config_get val "$2" "${3}_ITEM$c"
+		append _buffer "\"${val}\""
+		c="$(($c + 1))"
+	done
+
+	export "${1}=${_buffer}";
+}
+
+mcproxy_handle_instances() {
+	local instance="$1"
+	local conf_file="$2"
+	local disabled
+	local pre=""
+	local name
+	local upstream
+	local downstream
+
+	config_get_bool disabled "$instance" 'disabled' '0'
+	config_get name "$instance" "name" "$instance"
+	mcproxy_list_iface upstream "$instance" "upstream"
+	mcproxy_list_iface downstream "$instance" "downstream"
+
+	if [ $disabled -eq 1 ]; then
+		pre="# "
+	fi
+
+	if [ ! -z $upstream ] && [ ! -z $downstream ]; then
+		echo -e "${pre}pinstance ${name}: ${upstream} ==> ${downstream};\n" >> $conf_file
+	fi
+}
+
+# mcproxy_list_table <var> <section> <option>
+mcproxy_list_table() {
+	local val
+	local len
+	local _buffer
+	local c=1
+
+	config_get len "$2" "${3}_LENGTH"
+	[ -z "$len" ] && return 0
+	while [ $c -le "$len" ]; do
+		config_get val "$2" "${3}_ITEM$c"
+		append _buffer "\t${val}\n"
+		c="$(($c + 1))"
+	done
+
+	export "${1}=${_buffer}";
+}
+
+mcproxy_handle_tables() {
+	local table="$1"
+	local conf_file="$2"
+	local table_name
+	local table_entries
+
+	config_get table_name "$table" "name" ""
+	mcproxy_list_table table_entries "$table" "entries"
+
+	if [ ! -z $name ] && [ ! -z $table ]; then
+		echo -e "table $table_name {\n" >> $conf_file
+		echo -e "$table_entries\n" >> $conf_file
+		echo -e "};\n" >> $conf_file
+	fi
+}
+
+mcproxy_handle_behaviour() {
+	local behaviour="$1"
+	local conf_file="$2"
+	local disabled
+	local pre=""
+	local instance
+	local section
+	local interface
+	local direction
+	local rulematching
+	local table
+
+	config_get_bool disabled "$behaviour" 'disabled' '0'
+	config_get instance "$behaviour" "instance"
+	config_get section "$behaviour" "section" "upstream"
+	config_get interface "$behaviour" "interface" "*"
+	config_get direction "$behaviour" "direction" "in"
+	config_get rulematching "$behaviour" "rulematching"
+	config_get table "$behaviour" "table"
+
+	if [ -z $instance ]; then
+		return 1
+	fi
+
+	local rule_table
+	if [ ! -z $rulematching ]; then
+		rule_table="rulematching $rulematching"
+	elif [ ! -z $table ]; then
+		local whitelist
+		local list
+
+		config_get_bool whitelist "$behaviour" 'whitelist' '0'
+		if [ $whitelist -eq 1 ]; then
+			list="whitelist"
+		else
+			list="blacklist"
+		fi
+
+		rule_table="$list table $table"
+	else
+		rule_table="rulematching all"
+	fi
+
+	if [ $disabled -eq 1 ]; then
+		pre="# "
+	fi
+
+	echo -e "${pre}pinstance $instance $section $interface $direction $rule_table;\n" >> $conf_file
+}
+
+start_instance() {
+	local cfg="$1"
+	local aux
+	local conf_file
+
+	config_get_bool aux "$cfg" 'disabled' '0'
+	[ "$aux" = 1 ] && return 1
+
+	config_get conf_file "$cfg" "file"
+	if [ ! -n "$conf_file" ]; then
+		conf_file="/var/etc/mcproxy_${cfg}.conf"
+
+		local protocol
+		config_get protocol "$cfg" "protocol" "IGMPv3"
+		echo -e "protocol ${protocol};\n" > $conf_file
+
+		config_foreach mcproxy_handle_instances instance $conf_file
+		config_foreach mcproxy_handle_tables table $conf_file
+		config_foreach mcproxy_handle_behaviour behaviour $conf_file
+	fi
+
 	procd_open_instance
 
 	procd_set_param command /usr/sbin/mcproxy
-	procd_append_param command -f /etc/mcproxy.conf
+	procd_append_param command -f $conf_file
+
+	config_get_bool aux "$cfg" 'respawn' '0'
+	[ "$aux" = 1 ] && procd_set_param respawn
 
-	procd_set_param respawn
 	procd_close_instance
 }
+
+service_triggers() { 
+	procd_add_reload_trigger "mcproxy" 
+}
+
+start_service() {
+	config_load mcproxy
+	config_foreach start_instance mcproxy
+}
diff --git a/mcproxy/patches/0004-uclibc-add-defs.patch b/mcproxy/patches/0004-uclibc-add-defs.patch
new file mode 100644
index 0000000..022cb02
--- /dev/null
+++ b/mcproxy/patches/0004-uclibc-add-defs.patch
@@ -0,0 +1,11 @@
+--- a/mcproxy/src/utils/mc_socket.cpp
++++ b/mcproxy/src/utils/mc_socket.cpp
+@@ -38,6 +38,8 @@
+ #include <unistd.h>
+ 
+ #ifdef __UCLIBC__
++#define IP_MULTICAST_ALL 49
++
+ #include "sourcefilter.cpp"
+ #endif /* __UCLIBC__ */
+ 

From fe84974abbf5e39ade694e708a3611b003603902 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Gaul?= <andre@gaul.io>
Date: Sat, 3 Jan 2015 15:24:46 +0100
Subject: [PATCH 037/368] [olsrd] adapt init script for 0.6.8 (PingCmd option)

olsrd 0.6.8 accepts a PingCmd parameter as of
http://olsr.org/git/?p=olsrd.git;a=commitdiff;h=0a26c52af3941eb9060b193cae5552f8d13fd28e.
The PingCmd is a string of the form "ping -c 1 -q %s" where %s is
replaced with an IP. This commit allows for '%' characters in an olsrd
option.
---
 olsrd/files/olsrd.init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/olsrd/files/olsrd.init b/olsrd/files/olsrd.init
index 887a4a2..5bee27a 100644
--- a/olsrd/files/olsrd.init
+++ b/olsrd/files/olsrd.init
@@ -38,7 +38,7 @@ validate_varname() {
 
 validate_olsrd_option() {
 	local str="$1"
-	[ -z "$str" -o "$str" != "${str%%[! 	0-9A-Za-z./|:_-]*}" ] && return 1
+	[ -z "$str" -o "$str" != "${str%%[! 	0-9A-Za-z.%/|:_-]*}" ] && return 1
 	return 0
 }
 

From b759b28ee4c1ccf1e5b1a7f703e2480b1fb218d2 Mon Sep 17 00:00:00 2001
From: Saverio Proto <zioproto@gmail.com>
Date: Mon, 5 Jan 2015 08:40:53 +0100
Subject: [PATCH 038/368] olsrd: increasing package version after merging pull
 request

---
 olsrd/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/olsrd/Makefile b/olsrd/Makefile
index 1b09167..362e922 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
 PKG_VERSION:=0.6.8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6

From 98699f47d7cff6abe9d00aa7cb31af5d825fd1e4 Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Tue, 9 Dec 2014 11:10:51 +0100
Subject: [PATCH 039/368] nodogsplash: migrate to uci based configuration

Use /etc/config/nodogsplash for configuration.
Old setups will migrate using config option to use old
file base configuration.
---
 nodogsplash/Makefile                  |   6 +-
 nodogsplash/files/nodogsplash.init    | 208 ++++++++++++++++++++++++--
 nodogsplash/files/nodogsplash.migrate |  44 ++++++
 3 files changed, 243 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 nodogsplash/files/nodogsplash.init
 create mode 100644 nodogsplash/files/nodogsplash.migrate

diff --git a/nodogsplash/Makefile b/nodogsplash/Makefile
index d7ff5e6..d630dba 100644
--- a/nodogsplash/Makefile
+++ b/nodogsplash/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=nodogsplash
 PKG_FIXUP:=autoreconf
 PKG_VERSION:=0.9_beta9.9.9
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -45,8 +45,10 @@ define Package/nodogsplash/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) files/nodogsplash.init $(1)/etc/init.d/$(PKG_NAME)
 
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_CONF) ./files/nodogsplash.migrate $(1)/etc/uci-defaults/30_nodogsplash
+
 	$(INSTALL_DIR) $(1)/etc/$(PKG_NAME)/htdocs/images
-	$(CP) $(PKG_BUILD_DIR)/resources/nodogsplash.conf $(1)/etc/$(PKG_NAME)/
 	$(CP) $(PKG_BUILD_DIR)/resources/splash.html $(1)/etc/$(PKG_NAME)/htdocs/
 	$(CP) $(PKG_BUILD_DIR)/resources/infoskel.html $(1)/etc/$(PKG_NAME)/htdocs/
 	$(CP) $(PKG_BUILD_DIR)/resources/splash.jpg $(1)/etc/$(PKG_NAME)/htdocs/images/
diff --git a/nodogsplash/files/nodogsplash.init b/nodogsplash/files/nodogsplash.init
old mode 100644
new mode 100755
index e5a20b2..682d505
--- a/nodogsplash/files/nodogsplash.init
+++ b/nodogsplash/files/nodogsplash.init
@@ -2,6 +2,7 @@
 #
 # description: Startup/shutdown script for nodogsplash captive portal
 #
+# Alexander Couzens <lynxis@fe80.eu> 2014
 # P. Kube 2007
 #
 # (Based on wifidog startup script
@@ -17,32 +18,213 @@ USE_PROCD=1
 
 IPT=/usr/sbin/iptables
 WD_DIR=/usr/bin
-NDS_CONF=/etc/nodogsplash/nodogsplash.conf
 # -s -d 5 runs in background, with level 5 (not so verbose) messages to syslog
 # -f -d 7 runs in foreground, with level 7 (verbose) debug messages to terminal
 OPTIONS="-s -f -d 5"
+CONFIGFILE="/tmp/invalid_nodogsplash.conf"
+
+# nolog(loglevel message ...)
+nolog() {
+  local level=$1
+  shift
+  logger -s -t nodogsplash -p daemon.$level $@
+}
+
+# append_config_option <cfgfile> <uci_cfg_obj> <option_name> <config_counterpart> [<optional default>]
+# append "$config_counterpart $value" to cfgfile if option_name exists
+# e.g. append_config_option "$CONFIGFILE" "$cfg" bind_address BindAddress 0.0.0.0
+# will append "BindAddress 192.168.1.1" if uci bind_address is '192.168.1.1'
+append_config_option() {
+  local val=""
+  local cfg="$1"
+  local config_file="$2"
+  local option_name="$3"
+  local config_counterpart="$4"
+  local default="$5"
+  config_get val "$cfg" "$option_name" "$default"
+  [ -n "$val" ] && echo "" >> $config_file
+}
+
+setup_user_authentication() {
+  local cfg="$1"
+  local val
+
+  config_get_bool val "$cfg" authenticate_immediately 0
+  [ $val -gt 0 ] && echo "AuthenticateImmediately yes" >> $CONFIGFILE
+
+  config_get val "$cfg" username
+  if [ -n "${val}" ] ; then
+    echo "UsernameAuthentication" >> $CONFIGFILE
+    echo "Username ${val}" >> $CONFIGFILE
+  fi
+
+  config_get val "$cfg" password
+  if [ -n "${val}" ] ; then
+    echo "PasswordAuthentication" >> $CONFIGFILE
+    echo "Password ${val}" >> $CONFIGFILE
+  fi
+}
+
+setup_mac_lists() {
+  local cfg="$1"
+  local MAC=""
+  local val
+
+  append_mac() {
+    append MAC $1 ,
+  }
+
+  config_get val "$cfg" macmechanism
+  if [ -z "${val}" ] ; then
+    # check if we have AllowedMACList or BlockedMACList defined they will be ignored
+    config_get val "$cfg" allowedmac
+    if [ -n "${val}" ] ; then
+      echo "Ignoring allowedmac - macmechanism not \"allow\"" >&2
+    fi
+
+    config_get val "$cfg" blockedmac
+    if [ -n "${val}" ] ; then
+      echo "Ignoring blockedmac - macmechanism not \"block\"" >&2
+    fi
+  elif [ "${val}" == "allow" ] ; then
+    MAC=""
+    config_list_foreach "$cfg" allowedmac append_mac
+    echo "AllowedMACList $MAC" >> $CONFIGFILE
+  elif [ "${val}" == "block" ] ; then
+    MAC=""
+    config_list_foreach "$cfg" blockedmac append_mac
+    echo "BlockedMACList $MAC" >> $CONFIGFILE
+  else
+    nolog error "$cfg Invalid macmechanism '$val' - allow or block are valid."
+    return 1
+  fi
+  MAC=""
+  config_list_foreach "$cfg" trustedmac append_mac
+  [ -n "$MAC" ] && echo "TrustedMACList $MAC" >> $CONFIGFILE
+}
+
+setup_firewall() {
+  local cfg="$1"
+  local uciname
+  local val
+
+  append_firewall() {
+    echo "    FirewallRule $1" >> $CONFIGFILE
+  }
+
+  for rule in $(echo authenticated-users preauthenticated-users users-to-router trusted-users trusted-users-to-router)
+  do
+    uci_name=${rule//-/_}
+    # uci does not allow - dashes
+    echo "FirewallRuleSet $rule {" >> $CONFIGFILE
+    config_list_foreach "$cfg" ${uci_name} append_firewall
+    echo "}" >> $CONFIGFILE
+    config_get val "$cfg" policy_${uci_name}
+    [ -n "${val}" ] && echo "EmptyRuleSetPolicy $rule $val" >> $CONFIGFILE
+  done
+}
+
+generate_uci_config() {
+  local cfg="$1"
+  local val
+  local ifname
+  local download
+  local upload
+
+  CONFIGFILE="/tmp/etc/nodogsplash_$cfg.conf"
+
+  echo "# auto-generated config file from /etc/config/nodogsplash" > $CONFIGFILE
+  config_get val "$cfg" network
+  if [ ! -n "${val}" ] ; then
+    nolog error "$cfg missing network"
+    return 1
+  fi
+
+  if ! network_get_device ifname $val ; then
+    nolog error "$cfg can not find ifname for network '${val}'"
+    return 1
+  fi
+
+  echo "GatewayInterface $ifname" >> $CONFIGFILE
+  config_get val "$cfg" externalnetwork
+  [ -n "${val}" ] && network_get_device ifname ${val} && echo "ExternalInterface $ifname" >> $CONFIGFILE
+
+  append_config_option "$CONFIGFILE" "$cfg" gatewayname GatewayName
+  append_config_option "$CONFIGFILE" "$cfg" gatewayaddress GatewayAddress
+  append_config_option "$CONFIGFILE" "$cfg" gatewayport GatewayPort
+  append_config_option "$CONFIGFILE" "$cfg" maxclients MaxClients
+  append_config_option "$CONFIGFILE" "$cfg" imagedir ImagesDir
+  append_config_option "$CONFIGFILE" "$cfg" redirecturl RedirectURL
+  append_config_option "$CONFIGFILE" "$cfg" clientidletimeout ClientIdleTimeout
+  append_config_option "$CONFIGFILE" "$cfg" clientforcetimeout ClientForceTimeout
+  append_config_option "$CONFIGFILE" "$cfg" gatewayiprange GatewayIPRange
+  append_config_option "$CONFIGFILE" "$cfg" passwordattempts PasswordAttempts
+  append_config_option "$CONFIGFILE" "$cfg" macmechanism MACMechanism
+  append_config_option "$CONFIGFILE" "$cfg" uploadlimit UploadLimit
+  append_config_option "$CONFIGFILE" "$cfg" downloadlimit DownloadLimit
+
+  config_get download "$cfg" downloadlimit
+  config_get upload "$cfg" uploadlimit
+  [ -n "$upload" -o -n "$download" ] && echo "TrafficControl yes" >> $CONFIGFILE
+
+  setup_mac_lists "$cfg"
+  setup_user_authentication "$cfg"
+  setup_firewall "$cfg"
+}
+
+# setup configuration and start instance
+create_instance() {
+  local cfg="$1"
+  local manual_config
+  local val
+  CONFIGFILE="/tmp/etc/nodogsplash_$cfg.conf"
+
+  config_get_bool val "$cfg" disabled 0
+  [ $val -gt 0 ] && return 0
+
+  config_get manual_config "$cfg" config ""
+  if [ ! -n "$manual_config" ] ; then
+    generate_uci_config "$cfg"
+  else
+    # check if configration exists
+    if [ ! -f "$manual_config" ] ; then
+      nolog error "Configuration file '$file' doesn't exists"
+      return 0
+    fi
+    CONFIGFILE="$manual_config"
+  fi
+
+  if ! test_module ;  then
+    logger -s -t nodogsplash -p daemon.error "nodogsplash is missing some kernel modules"
+  fi
+
+  procd_open_instance $cfg
+  procd_set_param command /usr/bin/nodogsplash -c $CONFIGFILE $OPTIONS
+  procd_set_param respawn
+  procd_set_param file $CONFIGFILE
+  procd_close_instance
+}
 
 start_service() {
-	if test_module ;  then
-		procd_open_instance
-		procd_set_param command /usr/bin/nodogsplash $OPTIONS
-		procd_set_param respawn
-		procd_close_instance
-	else
-		logger -s -t nodogsplash -p daemon.error "nodogsplash is missing some kernel modules"
-	fi
+  include /lib/functions
+
+  mkdir -p /tmp/etc/
+  config_load nodogsplash
+
+  config_foreach create_instance instance
 }
 
 stop_service() {
-	# nodogsplash doesn't exit fast enought, when procd terminates it.
-	# otherwise procd will restart nodogsplash twice. first time starting nodogsplash fails, second time it succeeds
-	sleep 1
+  # nodogsplash doesn't exit fast enought, when procd terminates it.
+  # otherwise procd will restart nodogsplash twice. first time starting nodogsplash fails, second time it succeeds
+  sleep 1
 }
 
 status() {
-	$WD_DIR/ndsctl status
+  $WD_DIR/ndsctl status
 }
 
+# Test if we got all modules loaded
 test_module() {
 
     ### Test ipt_mark with iptables
diff --git a/nodogsplash/files/nodogsplash.migrate b/nodogsplash/files/nodogsplash.migrate
new file mode 100644
index 0000000..a193b31
--- /dev/null
+++ b/nodogsplash/files/nodogsplash.migrate
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+add_uci_default() {
+  local disabled=$1
+
+# add default configuration
+  uci batch <<EOF
+add nodogsplash instance
+set nodogsplash.@instance[-1].network='lan'
+set nodogsplash.@instance[-1].gatewayname='OpenWrt Nodogsplash'
+set nodogsplash.@instance[-1].maxclients=250
+set nodogsplash.@instance[-1].idletimeout=1200
+set nodogsplash.@instance[-1].disabled=$disabled
+add_list nodogsplash.@instance[-1].users_to_router='allow tcp port 22'
+add_list nodogsplash.@instance[-1].users_to_router='allow tcp port 23'
+add_list nodogsplash.@instance[-1].users_to_router='allow tcp port 53'
+add_list nodogsplash.@instance[-1].users_to_router='allow udp port 53'
+add_list nodogsplash.@instance[-1].users_to_router='allow udp port 67'
+add_list nodogsplash.@instance[-1].users_to_router='allow tcp port 80'
+add_list nodogsplash.@instance[-1].users_to_router='allow tcp port 443'
+EOF
+
+}
+
+[ -e /etc/config/nodogsplash ] && exit 0
+
+touch /etc/config/nodogsplash
+
+# check if we have an old config
+if [ -e "/etc/nodogsplash/nodogsplash.conf" ] ; then
+
+  uci batch <<EOF
+add nodogsplash instance
+set nodogsplash.@instance[-1].config='/etc/nodogsplash/nodogsplash.conf'
+EOF
+
+  add_uci_default 1
+else
+  add_uci_default 0
+fi
+
+exit 0

From c68c6947658060b9a6b7b9a5a53cf39bac87ab62 Mon Sep 17 00:00:00 2001
From: Marek Lindner <mareklindner@neomailbox.ch>
Date: Thu, 8 Jan 2015 01:01:58 +0800
Subject: [PATCH 040/368] batman-adv: upgrade package to latest release
 2014.4.0

Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
 batman-adv/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 40a36e8..6909ba8 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
 
-PKG_VERSION:=2014.3.0
+PKG_VERSION:=2014.4.0
 PKG_RELEASE:=1
-PKG_MD5SUM:=e9ee1d42ff4b0254699c779668054bed
+PKG_MD5SUM:=b1518e84ce530883d224c6ca4c673ce8
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From 3770cb203944f89c8e9a4780bd916e84b0f43893 Mon Sep 17 00:00:00 2001
From: Marek Lindner <mareklindner@neomailbox.ch>
Date: Thu, 8 Jan 2015 01:02:20 +0800
Subject: [PATCH 041/368] batctl: upgrade package to latest release 2014.4.0

Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
 batctl/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/batctl/Makefile b/batctl/Makefile
index 966bed3..48407e9 100644
--- a/batctl/Makefile
+++ b/batctl/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batctl
 
-PKG_VERSION:=2014.3.0
+PKG_VERSION:=2014.4.0
 PKG_RELEASE:=1
-PKG_MD5SUM:=7d2b8c129424c014d020c4b1a2add31b
+PKG_MD5SUM:=f3a14565699313258ee6ba3de783eb0a
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From dd3e3dd88134447772f6c337f295f76993f0311c Mon Sep 17 00:00:00 2001
From: Simon Wunderlich <sw@simonwunderlich.de>
Date: Thu, 8 Jan 2015 20:52:42 +0100
Subject: [PATCH 042/368] alfred: bump version to 2014.4.0

From the CHANGELOG:

 * add support for multiple interfaces per master
 * add support for changing interfaces on the fly
 * changes to support multiple alfred interfaces:
   - bind alfred to a specific interface
   - allow configuring the unix socket path
 * enhanced debugging

Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
 alfred/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/alfred/Makefile b/alfred/Makefile
index 90ee411..dade218 100644
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -11,9 +11,9 @@ include $(TOPDIR)/rules.mk
 # The latest alfred git hash in PKG_REV can be obtained from http://git.open-mesh.org/alfred.git
 #
 PKG_NAME:=alfred
-PKG_VERSION:=2014.3.0
+PKG_VERSION:=2014.4.0
 PKG_RELEASE:=0
-PKG_MD5SUM:=b8ab5677ed73d817b02b0e4fae10357a
+PKG_MD5SUM:=053cb5d9e7ca9384598e82944343dea2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From f0edc676c70964d399e08bb6d32031a56b60de68 Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Mon, 12 Jan 2015 11:38:14 +0200
Subject: [PATCH 043/368] ohybridproxy: Update to latest.

---
 ohybridproxy/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ohybridproxy/Makefile b/ohybridproxy/Makefile
index e84176a..1d96804 100644
--- a/ohybridproxy/Makefile
+++ b/ohybridproxy/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ohybridproxy
-PKG_SOURCE_VERSION:=ab6559bd5df88967e08478ab486b307c1b7eb759
-PKG_VERSION:=2014-09-29-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=f2ba152799c481471ddc0213b3f98b1c143d97a3
+PKG_VERSION:=2015-01-12-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git

From a5f73bbaf82d4644b575a26813554389b1cf4a21 Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Mon, 12 Jan 2015 11:40:21 +0200
Subject: [PATCH 044/368] minimalist-pcproxy: Update to github HEAD.

---
 minimalist-pcproxy/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/minimalist-pcproxy/Makefile b/minimalist-pcproxy/Makefile
index 57c2651..d0c2f06 100644
--- a/minimalist-pcproxy/Makefile
+++ b/minimalist-pcproxy/Makefile
@@ -7,9 +7,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=minimalist-pcproxy
-PKG_SOURCE_VERSION:=9e41b6b698ff719960299711707785ffa0b250ab
-PKG_VERSION:=2014-09-02-$(PKG_SOURCE_VERSION)
-PKG_RELEASE:=2
+PKG_SOURCE_VERSION:=2d6d1b0b0a3b79a9b4a9b0a7606a84600a967bcb
+PKG_VERSION:=2015-01-12-$(PKG_SOURCE_VERSION)
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/fingon/minimalist-pcproxy.git

From 820f567d5d1d4a622d790c460c7823d67b27f3a4 Mon Sep 17 00:00:00 2001
From: Gabriel Kerneis <gabriel@kerneis.info>
Date: Thu, 1 Jan 2015 14:18:39 +0100
Subject: [PATCH 045/368] babel-pinger: fix typo in Makefile

---
 babel-pinger/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel-pinger/Makefile b/babel-pinger/Makefile
index 528a07f..40e7b1a 100644
--- a/babel-pinger/Makefile
+++ b/babel-pinger/Makefile
@@ -33,7 +33,7 @@ endef
 MAKE_FLAGS+= \
 	CFLAGS="$(TARGET_CFLAGS)" \
 
-define Package/babeld/install
+define Package/babel-pinger/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/babel-pinger $(1)/usr/sbin/
 endef

From 60a93cc58d6e4a299292372074a29a5029c87278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
Date: Fri, 23 Jan 2015 14:19:48 +0100
Subject: [PATCH 046/368] bird: add lightweight client support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Based on pull request https://github.com/openwrt-routing/packages/pull/42 by MartinStrbacka.
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 bird/Makefile | 54 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 51 insertions(+), 3 deletions(-)

diff --git a/bird/Makefile b/bird/Makefile
index 920ae81..5f8200c 100644
--- a/bird/Makefile
+++ b/bird/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2009-2014 OpenWrt.org
+# Copyright (C) 2009-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bird
 PKG_VERSION:=1.4.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird
@@ -30,6 +30,11 @@ define Package/birdc/Default
   DEPENDS:= +libreadline +libncurses
 endef
 
+define Package/birdcl/Default
+  TITLE:=The BIRD lightweight command-line client
+  URL:=http://bird.network.cz/
+endef
+
 define Package/bird/Default/description1
 BIRD is an internet routing daemon which manages TCP/IP routing tables
 with support of modern routing protocols, easy to use configuration
@@ -58,6 +63,14 @@ should install BIRD command-line client together with BIRD.
 
 endef
 
+define Package/bird/Default/description4
+This is a BIRD lightweight command-line client. It is used to send commands to BIRD,
+commands can perform simple actions such as enabling/disabling of
+protocols, telling BIRD to show various information, telling it to show
+a routing table filtered by a filter, or asking BIRD to reconfigure.
+
+endef
+
 define Package/bird4
 $(call Package/bird/Default)
   SECTION:=net
@@ -75,6 +88,15 @@ $(call Package/birdc/Default)
   DEPENDS+= +bird4
 endef
 
+define Package/birdcl4
+$(call Package/birdcl/Default)
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Routing and Redirection
+  TITLE+= (IPv4)
+  DEPENDS+= +bird4
+endef
+
 define Package/bird6
 $(call Package/bird/Default)
   SECTION:=net
@@ -92,6 +114,15 @@ $(call Package/birdc/Default)
   DEPENDS+= +bird6
 endef
 
+define Package/birdcl6
+$(call Package/birdcl/Default)
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Routing and Redirection
+  TITLE+= (IPv6)
+  DEPENDS+= +bird6
+endef
+
 define Package/bird4/description
 $(call Package/bird/Default/description1)
 This is IPv4 version of BIRD, it supports OSPFv2, RIPv2 and BGP
@@ -105,6 +136,11 @@ $(call Package/bird/Default/description1)
 $(call Package/bird/Default/description3)
 endef
 
+define Package/birdcl4/description
+$(call Package/bird/Default/description1)
+$(call Package/bird/Default/description4)
+endef
+
 define Package/bird6/description
 $(call Package/bird/Default/description1)
 This is IPv6 version of BIRD, it supports OSPFv3, RIPng and BGP
@@ -118,6 +154,11 @@ $(call Package/bird/Default/description1)
 $(call Package/bird/Default/description3)
 endef
 
+define Package/birdcl6/description
+$(call Package/bird/Default/description1)
+$(call Package/bird/Default/description4)
+endef
+
 CONFIGURE_ARGS += --with-linux-headers="$(LINUX_DIR)"
 
 define Build/Template
@@ -125,7 +166,7 @@ define Build/Template
 $(STAMP_BUILT)-$(2): $(STAMP_PREPARED)
 	$(call Build/Configure/Default,$(3))
 	$(call Build/Compile/Default,)
-	( cd $(PKG_BUILD_DIR); mv -f bird bird$(2); mv -f birdc birdc$(2) )
+	( cd $(PKG_BUILD_DIR); mv -f bird bird$(2); mv -f birdc birdc$(2); mv -f birdcl birdcl$(2) )
 	-$(MAKE) -C $(PKG_BUILD_DIR) clean
 	touch $$@
 
@@ -150,6 +191,11 @@ define Package/birdc$(2)/install
 	$(INSTALL_BIN) $$(PKG_BUILD_DIR)/birdc$(2) $$(1)/usr/sbin/
 endef
 
+define Package/birdcl$(2)/install
+	$(INSTALL_DIR) $$(1)/usr/sbin
+	$(INSTALL_BIN) $$(PKG_BUILD_DIR)/birdcl$(2) $$(1)/usr/sbin/
+endef
+
 endef
 
 
@@ -158,5 +204,7 @@ $(eval $(call Build/Template,bird6,6, --enable-ipv6))
 
 $(eval $(call BuildPackage,bird4))
 $(eval $(call BuildPackage,birdc4))
+$(eval $(call BuildPackage,birdcl4))
 $(eval $(call BuildPackage,bird6))
 $(eval $(call BuildPackage,birdc6))
+$(eval $(call BuildPackage,birdcl6))

From 5f49ef1192150a1f41700ae8a562bc400ffe68a3 Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Mon, 26 Jan 2015 14:52:13 +0100
Subject: [PATCH 047/368] nodogsplash: code cleanup, add option
 gatewayinterface, allow uci and manual configration in parallel

---
 nodogsplash/Makefile                  |   9 +-
 nodogsplash/files/nodogsplash.config  |  39 ++++
 nodogsplash/files/nodogsplash.init    | 318 +++++++++++++-------------
 nodogsplash/files/nodogsplash.migrate |  44 ----
 4 files changed, 206 insertions(+), 204 deletions(-)
 create mode 100644 nodogsplash/files/nodogsplash.config
 delete mode 100644 nodogsplash/files/nodogsplash.migrate

diff --git a/nodogsplash/Makefile b/nodogsplash/Makefile
index d630dba..ca223b7 100644
--- a/nodogsplash/Makefile
+++ b/nodogsplash/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=nodogsplash
 PKG_FIXUP:=autoreconf
 PKG_VERSION:=0.9_beta9.9.9
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -43,10 +43,9 @@ define Package/nodogsplash/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ndsctl $(1)/usr/bin/
 
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) files/nodogsplash.init $(1)/etc/init.d/$(PKG_NAME)
-
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_CONF) ./files/nodogsplash.migrate $(1)/etc/uci-defaults/30_nodogsplash
+	$(INSTALL_BIN) files/nodogsplash.init $(1)/etc/init.d/nodogsplash
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) files/nodogsplash.config $(1)/etc/config/nodogsplash
 
 	$(INSTALL_DIR) $(1)/etc/$(PKG_NAME)/htdocs/images
 	$(CP) $(PKG_BUILD_DIR)/resources/splash.html $(1)/etc/$(PKG_NAME)/htdocs/
diff --git a/nodogsplash/files/nodogsplash.config b/nodogsplash/files/nodogsplash.config
new file mode 100644
index 0000000..dbefeb4
--- /dev/null
+++ b/nodogsplash/files/nodogsplash.config
@@ -0,0 +1,39 @@
+config instance
+  # Set to 1 to enable nodogsplash
+  option enabled 0
+
+  # Use plain configuration file as well
+  #option config '/etc/nodogsplash/nodogsplash.conf'
+  option network 'lan'
+  option gatewayname 'OpenWrt Nodogsplash'
+  option maxclients '250'
+  option idletimeout '1200'
+
+  # Your router may have several interfaces, and you
+  # probably want to keep them private from the network/gatewayinterface.
+  # If so, you should block the entire subnets on those interfaces, e.g.:
+  list authenticated_users 'block to 192.168.0.0/16'
+  list authenticated_users 'block to 10.0.0.0/8'
+
+  # Typical ports you will probably want to open up.
+  list authenticated_users 'allow tcp port 22'
+  list authenticated_users 'allow tcp port 53'
+  list authenticated_users 'allow udp port 53'
+  list authenticated_users 'allow tcp port 80'
+  list authenticated_users 'allow tcp port 443'
+
+  # For preauthenticated users to resolve IP addresses in their
+  # initial request not using the router itself as a DNS server,
+  list preauthenticated_users 'allow tcp port 53'
+  list preauthenticated_users 'allow udp port 53'
+
+  # Allow ports for SSH/Telnet/DNS/DHCP/HTTP/HTTPS
+  list users_to_router 'allow tcp port 22'
+  list users_to_router 'allow tcp port 23'
+  list users_to_router 'allow tcp port 53'
+  list users_to_router 'allow udp port 53'
+  list users_to_router 'allow udp port 67'
+  list users_to_router 'allow tcp port 80'
+  list users_to_router 'allow tcp port 443'
+
+  # See https://github.com/nodogsplash for a full list of available options.
diff --git a/nodogsplash/files/nodogsplash.init b/nodogsplash/files/nodogsplash.init
index 682d505..7337826 100755
--- a/nodogsplash/files/nodogsplash.init
+++ b/nodogsplash/files/nodogsplash.init
@@ -53,15 +53,15 @@ setup_user_authentication() {
   [ $val -gt 0 ] && echo "AuthenticateImmediately yes" >> $CONFIGFILE
 
   config_get val "$cfg" username
-  if [ -n "${val}" ] ; then
+  if [ -n "$val" ] ; then
     echo "UsernameAuthentication" >> $CONFIGFILE
-    echo "Username ${val}" >> $CONFIGFILE
+    echo "Username $val" >> $CONFIGFILE
   fi
 
   config_get val "$cfg" password
-  if [ -n "${val}" ] ; then
+  if [ -n "$val" ] ; then
     echo "PasswordAuthentication" >> $CONFIGFILE
-    echo "Password ${val}" >> $CONFIGFILE
+    echo "Password $val" >> $CONFIGFILE
   fi
 }
 
@@ -71,26 +71,26 @@ setup_mac_lists() {
   local val
 
   append_mac() {
-    append MAC $1 ,
+    append MAC "$1" ","
   }
 
   config_get val "$cfg" macmechanism
-  if [ -z "${val}" ] ; then
+  if [ -z "$val" ] ; then
     # check if we have AllowedMACList or BlockedMACList defined they will be ignored
     config_get val "$cfg" allowedmac
-    if [ -n "${val}" ] ; then
+    if [ -n "$val" ] ; then
       echo "Ignoring allowedmac - macmechanism not \"allow\"" >&2
     fi
 
     config_get val "$cfg" blockedmac
-    if [ -n "${val}" ] ; then
+    if [ -n "$val" ] ; then
       echo "Ignoring blockedmac - macmechanism not \"block\"" >&2
     fi
-  elif [ "${val}" == "allow" ] ; then
+  elif [ "$val" == "allow" ] ; then
     MAC=""
     config_list_foreach "$cfg" allowedmac append_mac
     echo "AllowedMACList $MAC" >> $CONFIGFILE
-  elif [ "${val}" == "block" ] ; then
+  elif [ "$val" == "block" ] ; then
     MAC=""
     config_list_foreach "$cfg" blockedmac append_mac
     echo "BlockedMACList $MAC" >> $CONFIGFILE
@@ -120,7 +120,7 @@ setup_firewall() {
     config_list_foreach "$cfg" ${uci_name} append_firewall
     echo "}" >> $CONFIGFILE
     config_get val "$cfg" policy_${uci_name}
-    [ -n "${val}" ] && echo "EmptyRuleSetPolicy $rule $val" >> $CONFIGFILE
+    [ -n "$val" ] && echo "EmptyRuleSetPolicy $rule $val" >> $CONFIGFILE
   done
 }
 
@@ -134,20 +134,41 @@ generate_uci_config() {
   CONFIGFILE="/tmp/etc/nodogsplash_$cfg.conf"
 
   echo "# auto-generated config file from /etc/config/nodogsplash" > $CONFIGFILE
-  config_get val "$cfg" network
-  if [ ! -n "${val}" ] ; then
-    nolog error "$cfg missing network"
-    return 1
+
+  config_get val "$cfg" config
+  if [ -n "$val" ] ; then
+    if [ -f "$val" ] ; then
+      nolog error "Configuration file '$file' doesn't exist"
+      return 0
+    fi
+    cat $val > CONFIGFILE
   fi
 
-  if ! network_get_device ifname $val ; then
-    nolog error "$cfg can not find ifname for network '${val}'"
-    return 1
+  config_get val "$cfg" network
+  if [ -n "$val" ] ; then
+    if ! network_get_device ifname "$val" ; then
+      nolog error "$cfg can not find ifname for network '$val'"
+      return 1
+    fi
+  fi
+
+  config_get val "$cfg" gatewayinterface
+  if [ -n "$val" ] ; then
+    if [ -n "$ifname" ] ; then
+      nolog error "$cfg cannot use both option network and gatewayinterface"
+      return 1
+    fi
+    ifname="$val"
+  fi
+
+  if [ -z "$ifname" ] ; then
+      nolog error "$cfg option network or gatewayinterface missing"
+      return 1
   fi
 
   echo "GatewayInterface $ifname" >> $CONFIGFILE
   config_get val "$cfg" externalnetwork
-  [ -n "${val}" ] && network_get_device ifname ${val} && echo "ExternalInterface $ifname" >> $CONFIGFILE
+  [ -n "$val" ] && network_get_device ifname "$val" && echo "ExternalInterface $ifname" >> $CONFIGFILE
 
   append_config_option "$CONFIGFILE" "$cfg" gatewayname GatewayName
   append_config_option "$CONFIGFILE" "$cfg" gatewayaddress GatewayAddress
@@ -177,22 +198,11 @@ create_instance() {
   local cfg="$1"
   local manual_config
   local val
-  CONFIGFILE="/tmp/etc/nodogsplash_$cfg.conf"
 
-  config_get_bool val "$cfg" disabled 0
-  [ $val -gt 0 ] && return 0
+  config_get_bool val "$cfg" enabled 0
+  [ $val -gt 0 ] || return 0
 
-  config_get manual_config "$cfg" config ""
-  if [ ! -n "$manual_config" ] ; then
-    generate_uci_config "$cfg"
-  else
-    # check if configration exists
-    if [ ! -f "$manual_config" ] ; then
-      nolog error "Configuration file '$file' doesn't exists"
-      return 0
-    fi
-    CONFIGFILE="$manual_config"
-  fi
+  generate_uci_config "$cfg"
 
   if ! test_module ;  then
     logger -s -t nodogsplash -p daemon.error "nodogsplash is missing some kernel modules"
@@ -226,127 +236,125 @@ status() {
 
 # Test if we got all modules loaded
 test_module() {
-
-    ### Test ipt_mark with iptables
-    test_ipt_mark () {
-	($IPT -A FORWARD -m mark --mark 2 -j ACCEPT 2>&1) > /dev/null
-	IPTABLES_OK=$?
-	if [ "$IPTABLES_OK" -eq 0 ]; then
-	    ($IPT -D FORWARD -m mark --mark 2 -j ACCEPT 2>&1) > /dev/null
-	    return 0
-	else
-	    return 1
-	fi
-    }
-    ### Test ipt_mac with iptables
-    test_ipt_mac () {
-	($IPT -A INPUT -m mac --mac-source 00:00:00:00:00:00 -j ACCEPT 2>&1) > /dev/null
-	IPTABLES_OK=$?
-	if [ "$IPTABLES_OK" -eq 0 ]; then
-	    ($IPT -D INPUT -m mac --mac-source 00:00:00:00:00:00 -j ACCEPT 2>&1) > /dev/null
-	    return 0
-	else
-	    return 1
-	fi
-    }
-
-    ### Test ipt_IMQ with iptables
-    test_ipt_IMQ () {
-	($IPT -t mangle -A PREROUTING -j IMQ --todev 0 2>&1) > /dev/null
-	IPTABLES_OK=$?
-	if [ "$IPTABLES_OK" -eq 0 ]; then
-	    ($IPT -t mangle -D PREROUTING -j IMQ --todev 0 2>&1) > /dev/null
-	    return 0
-	else
-	    return 1
-	fi
-    }
-
-    ### Test imq with ip
-    test_imq () {
-	(ip link set imq0 up 2>&1) > /dev/null
-	IMQ0_OK=$?
-	(ip link set imq1 up 2>&1) > /dev/null
-	IMQ1_OK=$?
-	if [ "$IMQ0_OK" -eq 0 -a "$IMQ1_OK" -eq 0 ]; then
-	    (ip link set imq0 down 2>&1) > /dev/null
-	    (ip link set imq1 down 2>&1) > /dev/null
-	    return 0
-	else
-	    return 1
-	fi
-    }
-
-    ### Test sch_htb with tc; requires imq0
-    test_sch_htb () {
-	(tc qdisc del dev imq0 root 2>&1) > /dev/null
-	(tc qdisc add dev imq0 root htb 2>&1) > /dev/null
-	TC_OK=$?
-	if [ "$TC_OK" -eq 0 ]; then
-	    (tc qdisc del dev imq0 root 2>&1) > /dev/null
-	    return 0
-	else
-	    return 1
-	fi
-    }
-
-    
-    ### Find a module on disk
-    module_exists () {
-      EXIST=$(find /lib/modules/`uname -r` -name $1.*o 2> /dev/null)
-      if [ -n "$EXIST" ]; then
-        return 0
-      else
-        return 1
-      fi
-    }
-
-    ### Test if a module is in memory
-    module_in_memory () {
-      MODULE=$(lsmod | grep $1 | awk '{print $1}')
-      if [ "$MODULE" = "$1" ]; then
-        return 0
-      else
-        return 1
-      fi
-    }
-
-    ### Test functionality of a module; load if necessary
-    do_module_tests () {
-	echo "  Testing module $1 $2"
-	"test_$1"
-	if [ $? -ne 0 ]; then
-	    echo "   Module $1 $2 needed"
-	    echo "   Scanning disk for $1 module"
-	    module_exists $1
-	    if [ $? -ne 0 ]; then 
-		echo "   $1 module missing: please install it"
-		exit 1
-	    else
-		echo "   $1 exists, trying to load"
-		insmod $1 $2 > /dev/null
-		if [ $? -ne 0 ]; then
-		    echo "   Error: insmod $1 $2 failed"
-		    exit 1
-		else
-		    echo "   $1 $2 loaded successfully"
-		fi
-	    fi
-	else
-	    echo "   $1 is working"
-	fi 
-		
-    }
-
-    echo " Testing required modules"
-
-    do_module_tests "ipt_mac"
-    do_module_tests "ipt_mark"
-
-    # test for imq modules, only if TrafficControl is enabled in conf
-    if ( grep -q -E '^[[:space:]]*TrafficControl[[:space:]]+(yes|true|1)' "$NDS_CONF" ) ; then
-        do_module_tests "imq" "numdevs=2"
-        do_module_tests "ipt_IMQ"
-        do_module_tests "sch_htb"
+  ### Test ipt_mark with iptables
+  test_ipt_mark () {
+    ($IPT -A FORWARD -m mark --mark 2 -j ACCEPT 2>&1) > /dev/null
+    IPTABLES_OK=$?
+    if [ "$IPTABLES_OK" -eq 0 ]; then
+      ($IPT -D FORWARD -m mark --mark 2 -j ACCEPT 2>&1) > /dev/null
+      return 0
+    else
+      return 1
     fi
+  }
+
+  ### Test ipt_mac with iptables
+  test_ipt_mac () {
+    ($IPT -A INPUT -m mac --mac-source 00:00:00:00:00:00 -j ACCEPT 2>&1) > /dev/null
+    IPTABLES_OK=$?
+    if [ "$IPTABLES_OK" -eq 0 ]; then
+      ($IPT -D INPUT -m mac --mac-source 00:00:00:00:00:00 -j ACCEPT 2>&1) > /dev/null
+      return 0
+    else
+      return 1
+    fi
+  }
+
+  ### Test ipt_IMQ with iptables
+  test_ipt_IMQ () {
+    ($IPT -t mangle -A PREROUTING -j IMQ --todev 0 2>&1) > /dev/null
+    IPTABLES_OK=$?
+    if [ "$IPTABLES_OK" -eq 0 ]; then
+      ($IPT -t mangle -D PREROUTING -j IMQ --todev 0 2>&1) > /dev/null
+      return 0
+    else
+      return 1
+    fi
+  }
+
+  ### Test imq with ip
+  test_imq () {
+    (ip link set imq0 up 2>&1) > /dev/null
+    IMQ0_OK=$?
+    (ip link set imq1 up 2>&1) > /dev/null
+    IMQ1_OK=$?
+    if [ "$IMQ0_OK" -eq 0 -a "$IMQ1_OK" -eq 0 ]; then
+      (ip link set imq0 down 2>&1) > /dev/null
+      (ip link set imq1 down 2>&1) > /dev/null
+      return 0
+    else
+      return 1
+    fi
+  }
+
+  ### Test sch_htb with tc; requires imq0
+  test_sch_htb () {
+    (tc qdisc del dev imq0 root 2>&1) > /dev/null
+    (tc qdisc add dev imq0 root htb 2>&1) > /dev/null
+    TC_OK=$?
+    if [ "$TC_OK" -eq 0 ]; then
+      (tc qdisc del dev imq0 root 2>&1) > /dev/null
+      return 0
+    else
+      return 1
+    fi
+  }
+
+  ### Find a module on disk
+  module_exists () {
+    EXIST=$(find /lib/modules/`uname -r` -name $1.*o 2> /dev/null)
+    if [ -n "$EXIST" ]; then
+      return 0
+    else
+      return 1
+    fi
+  }
+
+  ### Test if a module is in memory
+  module_in_memory () {
+    MODULE=$(lsmod | grep $1 | awk '{print $1}')
+    if [ "$MODULE" = "$1" ]; then
+      return 0
+    else
+      return 1
+    fi
+  }
+
+  ### Test functionality of a module; load if necessary
+  do_module_tests () {
+    echo "  Testing module $1 $2"
+    "test_$1"
+    if [ $? -ne 0 ]; then
+      echo "   Module $1 $2 needed"
+      echo "   Scanning disk for $1 module"
+      module_exists $1
+      if [ $? -ne 0 ]; then
+        echo "   $1 module missing: please install it"
+        exit 1
+      else
+        echo "   $1 exists, trying to load"
+        insmod $1 $2 > /dev/null
+        if [ $? -ne 0 ]; then
+          echo "   Error: insmod $1 $2 failed"
+          exit 1
+        else
+          echo "   $1 $2 loaded successfully"
+        fi
+      fi
+    else
+      echo "   $1 is working"
+    fi
+  }
+
+  echo " Testing required modules"
+
+  do_module_tests "ipt_mac"
+  do_module_tests "ipt_mark"
+
+  # test for imq modules, only if TrafficControl is enabled in conf
+  if ( grep -q -E '^[[:space:]]*TrafficControl[[:space:]]+(yes|true|1)' "$CONFIGFILE" ) ; then
+    do_module_tests "imq" "numdevs=2"
+    do_module_tests "ipt_IMQ"
+    do_module_tests "sch_htb"
+  fi
 }
diff --git a/nodogsplash/files/nodogsplash.migrate b/nodogsplash/files/nodogsplash.migrate
deleted file mode 100644
index a193b31..0000000
--- a/nodogsplash/files/nodogsplash.migrate
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-add_uci_default() {
-  local disabled=$1
-
-# add default configuration
-  uci batch <<EOF
-add nodogsplash instance
-set nodogsplash.@instance[-1].network='lan'
-set nodogsplash.@instance[-1].gatewayname='OpenWrt Nodogsplash'
-set nodogsplash.@instance[-1].maxclients=250
-set nodogsplash.@instance[-1].idletimeout=1200
-set nodogsplash.@instance[-1].disabled=$disabled
-add_list nodogsplash.@instance[-1].users_to_router='allow tcp port 22'
-add_list nodogsplash.@instance[-1].users_to_router='allow tcp port 23'
-add_list nodogsplash.@instance[-1].users_to_router='allow tcp port 53'
-add_list nodogsplash.@instance[-1].users_to_router='allow udp port 53'
-add_list nodogsplash.@instance[-1].users_to_router='allow udp port 67'
-add_list nodogsplash.@instance[-1].users_to_router='allow tcp port 80'
-add_list nodogsplash.@instance[-1].users_to_router='allow tcp port 443'
-EOF
-
-}
-
-[ -e /etc/config/nodogsplash ] && exit 0
-
-touch /etc/config/nodogsplash
-
-# check if we have an old config
-if [ -e "/etc/nodogsplash/nodogsplash.conf" ] ; then
-
-  uci batch <<EOF
-add nodogsplash instance
-set nodogsplash.@instance[-1].config='/etc/nodogsplash/nodogsplash.conf'
-EOF
-
-  add_uci_default 1
-else
-  add_uci_default 0
-fi
-
-exit 0

From 90ec859959ae33dcbe8d2428f32c1bb5ab038d81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
Date: Sat, 31 Jan 2015 15:45:11 +0100
Subject: [PATCH 048/368] mcproxy: uci config improvements and fixes - fix
 /var/etc race condition (uci config) - start mcproxy later - rework mcproxy
 config trigger - add network triggers - simplify uci instances generation and
 allow querier only configs - improve uci tables generation - fix uci
 behaviour generation for specific interface names
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 mcproxy/Makefile           |  4 +-
 mcproxy/files/mcproxy.init | 85 ++++++++++++++++++++++----------------
 2 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/mcproxy/Makefile b/mcproxy/Makefile
index cb3fb20..be96bc7 100644
--- a/mcproxy/Makefile
+++ b/mcproxy/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014 OpenWrt.org
+# Copyright (C) 2014-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=mcproxy
 PKG_SOURCE_VERSION:=b7bd2d0809a0d1f177181c361b9a6c83e193b79a
 PKG_VERSION:=2014-12-31-$(PKG_SOURCE_VERSION)
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/mcproxy/mcproxy.git
diff --git a/mcproxy/files/mcproxy.init b/mcproxy/files/mcproxy.init
index a7584e8..60e4c87 100644
--- a/mcproxy/files/mcproxy.init
+++ b/mcproxy/files/mcproxy.init
@@ -1,47 +1,45 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2014 OpenWrt.org
+# Copyright (C) 2014-2015 OpenWrt.org
 
-START=50
+START=99
 USE_PROCD=1
 
-# mcproxy_list_iface <var> <section> <option>
-mcproxy_list_iface() {
-	local val
-	local len
-	local _buffer
-	local c=1
-
-	config_get len "$2" "${3}_LENGTH"
-	[ -z "$len" ] && return 0
-	while [ $c -le "$len" ]; do
-		config_get val "$2" "${3}_ITEM$c"
-		append _buffer "\"${val}\""
-		c="$(($c + 1))"
-	done
-
-	export "${1}=${_buffer}";
-}
-
 mcproxy_handle_instances() {
 	local instance="$1"
 	local conf_file="$2"
 	local disabled
 	local pre=""
 	local name
-	local upstream
-	local downstream
+	local upstreams
+	local downstreams
 
 	config_get_bool disabled "$instance" 'disabled' '0'
 	config_get name "$instance" "name" "$instance"
-	mcproxy_list_iface upstream "$instance" "upstream"
-	mcproxy_list_iface downstream "$instance" "downstream"
+	config_get upstreams "$instance" "upstream"
+	config_get downstreams "$instance" "downstream"
 
 	if [ $disabled -eq 1 ]; then
 		pre="# "
 	fi
 
-	if [ ! -z $upstream ] && [ ! -z $downstream ]; then
-		echo -e "${pre}pinstance ${name}: ${upstream} ==> ${downstream};\n" >> $conf_file
+	local str_up=""
+	if [ -n "$upstreams" ]; then
+		local upstream
+		for upstream in $upstreams; do
+			str_up="$str_up \"$upstream\""
+		done
+	fi
+
+	local str_down=""
+	if [ -n "$downstreams" ]; then
+		local downstream
+		for downstream in $downstreams; do
+			str_down="$str_down \"$downstream\""
+		done
+	fi
+
+	if [ ! -z $downstream ]; then
+		echo -e "${pre}pinstance ${name}:${str_up} ==>${str_down};\n" >> $conf_file
 	fi
 }
 
@@ -66,16 +64,14 @@ mcproxy_list_table() {
 mcproxy_handle_tables() {
 	local table="$1"
 	local conf_file="$2"
-	local table_name
-	local table_entries
+	local name
+	local entries
 
-	config_get table_name "$table" "name" ""
-	mcproxy_list_table table_entries "$table" "entries"
+	config_get name "$table" "name" ""
+	mcproxy_list_table entries "$table" "entries"
 
 	if [ ! -z $name ] && [ ! -z $table ]; then
-		echo -e "table $table_name {\n" >> $conf_file
-		echo -e "$table_entries\n" >> $conf_file
-		echo -e "};\n" >> $conf_file
+		echo -e "table $name {\n${entries}};\n" >> $conf_file
 	fi
 }
 
@@ -126,7 +122,17 @@ mcproxy_handle_behaviour() {
 		pre="# "
 	fi
 
-	echo -e "${pre}pinstance $instance $section $interface $direction $rule_table;\n" >> $conf_file
+	echo -e "${pre}pinstance $instance $section \"$interface\" $direction $rule_table;\n" >> $conf_file
+}
+
+mcproxy_network_trigger() {
+	procd_add_interface_trigger "interface.*" "$1" /etc/init.d/mcproxy restart
+}
+mcproxy_handle_network() {
+	local instance="$1"
+
+	config_list_foreach "$instance" upstream mcproxy_network_trigger
+	config_list_foreach "$instance" downstream mcproxy_network_trigger
 }
 
 start_instance() {
@@ -139,6 +145,7 @@ start_instance() {
 
 	config_get conf_file "$cfg" "file"
 	if [ ! -n "$conf_file" ]; then
+		mkdir -p /var/etc
 		conf_file="/var/etc/mcproxy_${cfg}.conf"
 
 		local protocol
@@ -158,11 +165,17 @@ start_instance() {
 	config_get_bool aux "$cfg" 'respawn' '0'
 	[ "$aux" = 1 ] && procd_set_param respawn
 
+	procd_open_trigger
+	config_foreach mcproxy_handle_network instance
+	procd_close_trigger
+
 	procd_close_instance
 }
 
-service_triggers() { 
-	procd_add_reload_trigger "mcproxy" 
+service_triggers() {
+	procd_open_trigger
+	procd_add_config_trigger "config.change" "mcproxy" /etc/init.d/mcproxy restart
+	procd_close_trigger
 }
 
 start_service() {

From 8ff37ec52c961acf68f8b3e715dd054357f58351 Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Tue, 3 Feb 2015 13:14:52 +0200
Subject: [PATCH 049/368] hnetd: Disabling localservice from default dnsmasq
 configuration. In a hnetd topology, dnsmasq requests may come from non-local
 prefixes.

---
 hnetd/files/hnetd.defaults | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hnetd/files/hnetd.defaults b/hnetd/files/hnetd.defaults
index 85c8cb2..8dc7871 100644
--- a/hnetd/files/hnetd.defaults
+++ b/hnetd/files/hnetd.defaults
@@ -2,5 +2,6 @@
 
 uci batch <<EOF
 set dhcp.odhcpd.maindhcp=1
+set dhcp.@dnsmasq[0].localservice=0
 commit dhcp
 EOF

From 80711295dd60b7c16106a062c162a9ac349fc434 Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Tue, 10 Feb 2015 13:31:39 +0100
Subject: [PATCH 050/368] nodogsplash: remove option ExternalInterface as there
 is no implementation behind it

---
 nodogsplash/files/nodogsplash.init | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nodogsplash/files/nodogsplash.init b/nodogsplash/files/nodogsplash.init
index 7337826..463ff91 100755
--- a/nodogsplash/files/nodogsplash.init
+++ b/nodogsplash/files/nodogsplash.init
@@ -167,8 +167,6 @@ generate_uci_config() {
   fi
 
   echo "GatewayInterface $ifname" >> $CONFIGFILE
-  config_get val "$cfg" externalnetwork
-  [ -n "$val" ] && network_get_device ifname "$val" && echo "ExternalInterface $ifname" >> $CONFIGFILE
 
   append_config_option "$CONFIGFILE" "$cfg" gatewayname GatewayName
   append_config_option "$CONFIGFILE" "$cfg" gatewayaddress GatewayAddress

From 9c661a093fc352871000e353cf2015bf675b5a32 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Sat, 21 Feb 2015 10:31:14 +0100
Subject: [PATCH 051/368] nat46: fix compilation with newer kernels (thx to
 Andrew Yourtchenko)

Signed-off-by: Steven Barth <steven@midlink.org>
---
 nat46/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nat46/Makefile b/nat46/Makefile
index 5bebd9b..fb2419e 100644
--- a/nat46/Makefile
+++ b/nat46/Makefile
@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=nat46
-PKG_VERSION:=2
+PKG_VERSION:=3
 PKG_RELEASE:=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=https://github.com/ayourtch/nat46.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5589212cb35527929fd66218721ab54040c6b788
+PKG_SOURCE_VERSION:=a28e24b45c31bfa61447d0bdd591478cff1cad10
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
 PKG_LICENSE:=GPL-2.0
 

From 375378d4de4bed0ceb52825eeb50b6fb044d1bb6 Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Thu, 5 Mar 2015 12:47:15 +0100
Subject: [PATCH 052/368] nodogsplash: make missing config options available
 through uci

---
 nodogsplash/Makefile               |  2 +-
 nodogsplash/files/nodogsplash.init | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/nodogsplash/Makefile b/nodogsplash/Makefile
index ca223b7..38e8f2b 100644
--- a/nodogsplash/Makefile
+++ b/nodogsplash/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=nodogsplash
 PKG_FIXUP:=autoreconf
 PKG_VERSION:=0.9_beta9.9.9
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/nodogsplash/files/nodogsplash.init b/nodogsplash/files/nodogsplash.init
index 463ff91..3352aa9 100755
--- a/nodogsplash/files/nodogsplash.init
+++ b/nodogsplash/files/nodogsplash.init
@@ -172,6 +172,13 @@ generate_uci_config() {
   append_config_option "$CONFIGFILE" "$cfg" gatewayaddress GatewayAddress
   append_config_option "$CONFIGFILE" "$cfg" gatewayport GatewayPort
   append_config_option "$CONFIGFILE" "$cfg" maxclients MaxClients
+  append_config_option "$CONFIGFILE" "$cfg" webroot webroot
+  append_config_option "$CONFIGFILE" "$cfg" debuglevel debuglevel
+  append_config_option "$CONFIGFILE" "$cfg" splashpage splashpage
+  append_config_option "$CONFIGFILE" "$cfg" pagesdir pagesdir
+  append_config_option "$CONFIGFILE" "$cfg" checkinterval checkinterval
+  append_config_option "$CONFIGFILE" "$cfg" syslogfacility syslogfacility
+  append_config_option "$CONFIGFILE" "$cfg" gatewayiprange gatewayiprange
   append_config_option "$CONFIGFILE" "$cfg" imagedir ImagesDir
   append_config_option "$CONFIGFILE" "$cfg" redirecturl RedirectURL
   append_config_option "$CONFIGFILE" "$cfg" clientidletimeout ClientIdleTimeout
@@ -181,6 +188,22 @@ generate_uci_config() {
   append_config_option "$CONFIGFILE" "$cfg" macmechanism MACMechanism
   append_config_option "$CONFIGFILE" "$cfg" uploadlimit UploadLimit
   append_config_option "$CONFIGFILE" "$cfg" downloadlimit DownloadLimit
+  append_config_option "$CONFIGFILE" "$cfg" remoteauthenticatoraction remoteauthenticatoraction
+  append_config_option "$CONFIGFILE" "$cfg" enablepreauth enablepreauth
+  append_config_option "$CONFIGFILE" "$cfg" binvoucher binvoucher
+  append_config_option "$CONFIGFILE" "$cfg" forcevoucher forcevoucher
+  append_config_option "$CONFIGFILE" "$cfg" passwordauthentication passwordauthentication
+  append_config_option "$CONFIGFILE" "$cfg" usernameauthentication usernameauthentication
+  append_config_option "$CONFIGFILE" "$cfg" passwordattempts passwordattempts
+  append_config_option "$CONFIGFILE" "$cfg" username username
+  append_config_option "$CONFIGFILE" "$cfg" password password
+  append_config_option "$CONFIGFILE" "$cfg" authenticateimmediately authenticateimmediately
+  append_config_option "$CONFIGFILE" "$cfg" decongesthttpdthreads decongesthttpdthreads
+  append_config_option "$CONFIGFILE" "$cfg" httpdthreadthreshold httpdthreadthreshold
+  append_config_option "$CONFIGFILE" "$cfg" httpdthreaddelayms httpdthreaddelayms
+  append_config_option "$CONFIGFILE" "$cfg" fw_mark_authenticated fw_mark_authenticated
+  append_config_option "$CONFIGFILE" "$cfg" fw_mark_trusted fw_mark_trusted
+  append_config_option "$CONFIGFILE" "$cfg" fw_mark_blocked fw_mark_blocked
 
   config_get download "$cfg" downloadlimit
   config_get upload "$cfg" uploadlimit

From dfa1e090fbabb0cb6b3beda2aa2aa4756b29c67a Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Thu, 5 Mar 2015 12:52:01 +0100
Subject: [PATCH 053/368] nodogsplash: fix uci configuration by fixing
 append_config_option

append_config_option doesn't wrote anything to nodogsplash.conf.
---
 nodogsplash/files/nodogsplash.init | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nodogsplash/files/nodogsplash.init b/nodogsplash/files/nodogsplash.init
index 3352aa9..424058e 100755
--- a/nodogsplash/files/nodogsplash.init
+++ b/nodogsplash/files/nodogsplash.init
@@ -36,13 +36,13 @@ nolog() {
 # will append "BindAddress 192.168.1.1" if uci bind_address is '192.168.1.1'
 append_config_option() {
   local val=""
-  local cfg="$1"
-  local config_file="$2"
+  local config_file="$1"
+  local cfg="$2"
   local option_name="$3"
   local config_counterpart="$4"
   local default="$5"
   config_get val "$cfg" "$option_name" "$default"
-  [ -n "$val" ] && echo "" >> $config_file
+  [ -n "$val" ] && echo "$config_counterpart $val" >> $config_file
 }
 
 setup_user_authentication() {

From 7a233607af8f435c7b696123d00f272799834342 Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Thu, 5 Mar 2015 13:01:21 +0100
Subject: [PATCH 054/368] nodogsplash: simplify append_config_option

Drop arguement config_counterpart from append_config_option(). append_config_option
took an additional argument named config_counterpart which represents the
configuration name in configfile.This is needed for configuration variable names isn't the same
as in uci. Nodogsplash ignores the case of configuration variables and makes this feature optional.
Introduce new func append_config_option_map() which does the old behaviour.
---
 nodogsplash/files/nodogsplash.init | 91 +++++++++++++++++-------------
 1 file changed, 53 insertions(+), 38 deletions(-)

diff --git a/nodogsplash/files/nodogsplash.init b/nodogsplash/files/nodogsplash.init
index 424058e..0712fa9 100755
--- a/nodogsplash/files/nodogsplash.init
+++ b/nodogsplash/files/nodogsplash.init
@@ -30,11 +30,11 @@ nolog() {
   logger -s -t nodogsplash -p daemon.$level $@
 }
 
-# append_config_option <cfgfile> <uci_cfg_obj> <option_name> <config_counterpart> [<optional default>]
+# append_config_option_map <cfgfile> <uci_cfg_obj> <option_name> <config_counterpart> [<optional default>]
 # append "$config_counterpart $value" to cfgfile if option_name exists
 # e.g. append_config_option "$CONFIGFILE" "$cfg" bind_address BindAddress 0.0.0.0
 # will append "BindAddress 192.168.1.1" if uci bind_address is '192.168.1.1'
-append_config_option() {
+append_config_option_map() {
   local val=""
   local config_file="$1"
   local cfg="$2"
@@ -45,6 +45,21 @@ append_config_option() {
   [ -n "$val" ] && echo "$config_counterpart $val" >> $config_file
 }
 
+# append_config_option <cfgfile> <uci_cfg_obj> <option_name> [<optional default>]
+# append "$option_name $value" to cfgfile if option_name exists
+# e.g. append_config_option "$CONFIGFILE" "$cfg" bind_address 0.0.0.0
+# will append "bind_address 192.168.1.1" if uci bind_address is '192.168.1.1'
+# if uci bind_address is unset append "bind_address 0.0.0.0"
+append_config_option() {
+  local val=""
+  local config_file="$1"
+  local cfg="$2"
+  local option_name="$3"
+  local default="$4"
+  config_get val "$cfg" "$option_name" "$default"
+  [ -n "$val" ] && echo "$option_name $val" >> $config_file
+}
+
 setup_user_authentication() {
   local cfg="$1"
   local val
@@ -168,42 +183,42 @@ generate_uci_config() {
 
   echo "GatewayInterface $ifname" >> $CONFIGFILE
 
-  append_config_option "$CONFIGFILE" "$cfg" gatewayname GatewayName
-  append_config_option "$CONFIGFILE" "$cfg" gatewayaddress GatewayAddress
-  append_config_option "$CONFIGFILE" "$cfg" gatewayport GatewayPort
-  append_config_option "$CONFIGFILE" "$cfg" maxclients MaxClients
-  append_config_option "$CONFIGFILE" "$cfg" webroot webroot
-  append_config_option "$CONFIGFILE" "$cfg" debuglevel debuglevel
-  append_config_option "$CONFIGFILE" "$cfg" splashpage splashpage
-  append_config_option "$CONFIGFILE" "$cfg" pagesdir pagesdir
-  append_config_option "$CONFIGFILE" "$cfg" checkinterval checkinterval
-  append_config_option "$CONFIGFILE" "$cfg" syslogfacility syslogfacility
-  append_config_option "$CONFIGFILE" "$cfg" gatewayiprange gatewayiprange
-  append_config_option "$CONFIGFILE" "$cfg" imagedir ImagesDir
-  append_config_option "$CONFIGFILE" "$cfg" redirecturl RedirectURL
-  append_config_option "$CONFIGFILE" "$cfg" clientidletimeout ClientIdleTimeout
-  append_config_option "$CONFIGFILE" "$cfg" clientforcetimeout ClientForceTimeout
-  append_config_option "$CONFIGFILE" "$cfg" gatewayiprange GatewayIPRange
-  append_config_option "$CONFIGFILE" "$cfg" passwordattempts PasswordAttempts
-  append_config_option "$CONFIGFILE" "$cfg" macmechanism MACMechanism
-  append_config_option "$CONFIGFILE" "$cfg" uploadlimit UploadLimit
-  append_config_option "$CONFIGFILE" "$cfg" downloadlimit DownloadLimit
-  append_config_option "$CONFIGFILE" "$cfg" remoteauthenticatoraction remoteauthenticatoraction
-  append_config_option "$CONFIGFILE" "$cfg" enablepreauth enablepreauth
-  append_config_option "$CONFIGFILE" "$cfg" binvoucher binvoucher
-  append_config_option "$CONFIGFILE" "$cfg" forcevoucher forcevoucher
-  append_config_option "$CONFIGFILE" "$cfg" passwordauthentication passwordauthentication
-  append_config_option "$CONFIGFILE" "$cfg" usernameauthentication usernameauthentication
-  append_config_option "$CONFIGFILE" "$cfg" passwordattempts passwordattempts
-  append_config_option "$CONFIGFILE" "$cfg" username username
-  append_config_option "$CONFIGFILE" "$cfg" password password
-  append_config_option "$CONFIGFILE" "$cfg" authenticateimmediately authenticateimmediately
-  append_config_option "$CONFIGFILE" "$cfg" decongesthttpdthreads decongesthttpdthreads
-  append_config_option "$CONFIGFILE" "$cfg" httpdthreadthreshold httpdthreadthreshold
-  append_config_option "$CONFIGFILE" "$cfg" httpdthreaddelayms httpdthreaddelayms
-  append_config_option "$CONFIGFILE" "$cfg" fw_mark_authenticated fw_mark_authenticated
-  append_config_option "$CONFIGFILE" "$cfg" fw_mark_trusted fw_mark_trusted
-  append_config_option "$CONFIGFILE" "$cfg" fw_mark_blocked fw_mark_blocked
+  append_config_option "$CONFIGFILE" "$cfg" gatewayname
+  append_config_option "$CONFIGFILE" "$cfg" gatewayaddress
+  append_config_option "$CONFIGFILE" "$cfg" gatewayport
+  append_config_option "$CONFIGFILE" "$cfg" maxclients
+  append_config_option "$CONFIGFILE" "$cfg" webroot
+  append_config_option "$CONFIGFILE" "$cfg" debuglevel
+  append_config_option "$CONFIGFILE" "$cfg" splashpage
+  append_config_option "$CONFIGFILE" "$cfg" pagesdir
+  append_config_option "$CONFIGFILE" "$cfg" checkinterval
+  append_config_option "$CONFIGFILE" "$cfg" syslogfacility
+  append_config_option "$CONFIGFILE" "$cfg" gatewayiprange
+  append_config_option "$CONFIGFILE" "$cfg" imagedir
+  append_config_option "$CONFIGFILE" "$cfg" redirecturl
+  append_config_option "$CONFIGFILE" "$cfg" clientidletimeout
+  append_config_option "$CONFIGFILE" "$cfg" clientforcetimeout
+  append_config_option "$CONFIGFILE" "$cfg" gatewayiprange
+  append_config_option "$CONFIGFILE" "$cfg" passwordattempts
+  append_config_option "$CONFIGFILE" "$cfg" macmechanism
+  append_config_option "$CONFIGFILE" "$cfg" uploadlimit
+  append_config_option "$CONFIGFILE" "$cfg" downloadlimit
+  append_config_option "$CONFIGFILE" "$cfg" remoteauthenticatoraction
+  append_config_option "$CONFIGFILE" "$cfg" enablepreauth
+  append_config_option "$CONFIGFILE" "$cfg" binvoucher
+  append_config_option "$CONFIGFILE" "$cfg" forcevoucher
+  append_config_option "$CONFIGFILE" "$cfg" passwordauthentication
+  append_config_option "$CONFIGFILE" "$cfg" usernameauthentication
+  append_config_option "$CONFIGFILE" "$cfg" passwordattempts
+  append_config_option "$CONFIGFILE" "$cfg" username
+  append_config_option "$CONFIGFILE" "$cfg" password
+  append_config_option "$CONFIGFILE" "$cfg" authenticateimmediately
+  append_config_option "$CONFIGFILE" "$cfg" decongesthttpdthreads
+  append_config_option "$CONFIGFILE" "$cfg" httpdthreadthreshold
+  append_config_option "$CONFIGFILE" "$cfg" httpdthreaddelayms
+  append_config_option "$CONFIGFILE" "$cfg" fw_mark_authenticated
+  append_config_option "$CONFIGFILE" "$cfg" fw_mark_trusted
+  append_config_option "$CONFIGFILE" "$cfg" fw_mark_blocked
 
   config_get download "$cfg" downloadlimit
   config_get upload "$cfg" uploadlimit

From 155be29b3145c34150c6ec700086608afa144e45 Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Tue, 24 Mar 2015 19:27:04 +0100
Subject: [PATCH 055/368] bmx6: fix json.h include

unbreaks json plugin

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 bmx6/patches/001-json-c.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 bmx6/patches/001-json-c.patch

diff --git a/bmx6/patches/001-json-c.patch b/bmx6/patches/001-json-c.patch
new file mode 100644
index 0000000..5d29dae
--- /dev/null
+++ b/bmx6/patches/001-json-c.patch
@@ -0,0 +1,13 @@
+Index: bmx6-r2014112401/lib/bmx6_json/json.c
+===================================================================
+--- bmx6-r2014112401.orig/lib/bmx6_json/json.c
++++ bmx6-r2014112401/lib/bmx6_json/json.c
+@@ -27,7 +27,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <stdint.h>
+-#include <json/json.h>
++#include <json-c/json.h>
+ //#include <dirent.h>
+ //#include <sys/inotify.h>
+ 

From b81369bd8f82d40c225d2fc23eb1d47ed39cd19e Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Mon, 30 Mar 2015 18:55:51 +0200
Subject: [PATCH 056/368] miniupnpd: bump to 20150307

Signed-off-by: Steven Barth <steven@midlink.org>
---
 miniupnpd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index b890c8b..6add41a 100644
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
-PKG_VERSION:=1.9.20141209
+PKG_VERSION:=1.9.20150307
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=e9e53869bb725e931cae74b20d4a39be
+PKG_MD5SUM:=f91dc5647b1d2c13a82082a481a53e3d
 
 PKG_MAINTAINER:=Markus Stenberg <fingon@iki.fi>
 PKG_LICENSE:=BSD-3-Clause

From 3ed7001954e187b62b7240409e5f56459c83949b Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Tue, 31 Mar 2015 16:47:54 +0200
Subject: [PATCH 057/368] nat46: initial 464xlat support

Signed-off-by: Steven Barth <steven@midlink.org>
---
 nat46/Makefile         |  26 ++++++++-
 nat46/files/464xlat.sh | 102 ++++++++++++++++++++++++++++++++++++
 nat46/src/464xlatcfg.c | 116 +++++++++++++++++++++++++++++++++++++++++
 nat46/src/Makefile     |   8 +++
 4 files changed, 251 insertions(+), 1 deletion(-)
 create mode 100755 nat46/files/464xlat.sh
 create mode 100644 nat46/src/464xlatcfg.c
 create mode 100644 nat46/src/Makefile

diff --git a/nat46/Makefile b/nat46/Makefile
index fb2419e..4cbc494 100644
--- a/nat46/Makefile
+++ b/nat46/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014 OpenWrt.org
+# Copyright (C) 2014-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -29,6 +29,13 @@ define Package/map-t
   TITLE:=MAP-T configuration support
 endef
 
+define Package/464xlat
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+kmod-nat46
+  TITLE:=464xlat CLAT support
+endef
+
 define KernelPackage/nat46
   DEPENDS:=+kmod-ipv6
   TITLE:=Stateless NAT46 translation kernel module
@@ -40,7 +47,16 @@ endef
 
 include $(INCLUDE_DIR)/kernel-defaults.mk
 
+define Build/Prepare
+	$(call Build/Prepare/Default)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
 define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS) -Wall" \
+		LDFLAGS="$(TARGET_LDFLAGS)"
 	$(MAKE) $(KERNEL_MAKEOPTS) SUBDIRS="$(PKG_BUILD_DIR)/nat46/modules" \
 		MODFLAGS="-DMODULE -mlong-calls" \
 		EXTRA_CFLAGS="-DNAT46_VERSION=\\\"$(PKG_SOURCE_VERSION)\\\"" \
@@ -51,5 +67,13 @@ define Package/map-t/install
 	true
 endef
 
+define Package/464xlat/install
+	$(INSTALL_DIR) $(1)/lib/netifd/proto
+	$(INSTALL_BIN) ./files/464xlat.sh $(1)/lib/netifd/proto/464xlat.sh
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/464xlatcfg $(1)/sbin
+endef
+
 $(eval $(call KernelPackage,nat46))
 $(eval $(call BuildPackage,map-t))
+$(eval $(call BuildPackage,464xlat))
diff --git a/nat46/files/464xlat.sh b/nat46/files/464xlat.sh
new file mode 100755
index 0000000..680d230
--- /dev/null
+++ b/nat46/files/464xlat.sh
@@ -0,0 +1,102 @@
+#!/bin/sh
+# 464xlat.sh - 464xlat CLAT
+#
+# Copyright (c) 2015 Steven Barth <cyrus@openwrt.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2
+# as published by the Free Software Foundation
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+[ -n "$INCLUDE_ONLY" ] || {
+	. /lib/functions.sh
+	. /lib/functions/network.sh
+	. ../netifd-proto.sh
+	init_proto "$@"
+}
+
+proto_464xlat_setup() {
+	local cfg="$1"
+	local iface="$2"
+	local link="464xlat-$cfg"
+
+	local ip6addr ip6prefix tunlink zone
+	json_get_vars ip6addr ip6prefix tunlink zone
+
+	[ -z "$zone" ] && zone="wan"
+
+	( proto_add_host_dependency "$cfg" "::" "$tunlink" )
+
+	if [ -z "$tunlink" ] && ! network_find_wan6 tunlink; then
+		proto_notify_error "$cfg" "NO_WAN_LINK"
+		return
+	fi
+	network_get_device tundev "$tunlink"
+
+	ip6addr=$(464xlatcfg "$link" "$tundev" "$ip6prefix" 192.0.0.1 $ip6addr)
+	if [ -z "$ip6addr" ]; then
+		proto_notify_error "$cfg" "CLAT_CONFIG_FAILED"
+		return
+	fi
+
+	proto_init_update "$link" 1
+	proto_add_ipv4_route "0.0.0.0" 0 "" "" 2048
+	proto_add_ipv6_route $ip6addr 128 "" "" "" "" 128
+
+	proto_add_data
+	[ "$zone" != "-" ] && json_add_string zone "$zone"
+
+	json_add_array firewall
+		json_add_object ""
+			json_add_string type nat
+			json_add_string target SNAT
+			json_add_string family inet
+			json_add_string snat_ip 192.0.0.1
+		json_close_object
+	  	json_add_object ""
+	  		json_add_string type rule
+	  		json_add_string family inet6
+	  		json_add_string proto all
+	  		json_add_string direction in
+			json_add_string dest "$zone"
+			json_add_string src "$zone"
+	  		json_add_string src_ip $ip6addr
+	  		json_add_string target ACCEPT
+	  	json_close_object
+	  	json_add_object ""
+	  		json_add_string type rule
+	  		json_add_string family inet6
+	  		json_add_string proto all
+	  		json_add_string direction out
+			json_add_string dest "$zone"
+			json_add_string src "$zone"
+	  		json_add_string dest_ip $ip6addr
+	  		json_add_string target ACCEPT
+	  	json_close_object
+	json_close_array
+	proto_close_data
+
+	proto_send_update "$cfg"
+}
+
+proto_464xlat_teardown() {
+	464xlatcfg "464xlat-$1"
+}
+
+proto_464xlat_init_config() {
+	no_device=1
+	available=1
+
+	proto_config_add_string "ip6prefix"
+	proto_config_add_string "ip6addr"
+	proto_config_add_string "tunlink"
+	proto_config_add_string "zone"
+}
+
+[ -n "$INCLUDE_ONLY" ] || {
+        add_protocol 464xlat
+}
diff --git a/nat46/src/464xlatcfg.c b/nat46/src/464xlatcfg.c
new file mode 100644
index 0000000..dfce9d7
--- /dev/null
+++ b/nat46/src/464xlatcfg.c
@@ -0,0 +1,116 @@
+/* 464xlatcfg.c
+ *
+ * Copyright (c) 2015 Steven Barth <cyrus@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <netinet/icmp6.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <net/if.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <stdio.h>
+#include <netdb.h>
+
+int main(int argc, const char *argv[])
+{
+	char buf[INET6_ADDRSTRLEN], prefix[INET6_ADDRSTRLEN + 4];
+	int pid;
+	
+	if (argc <= 1) {
+		fprintf(stderr, "Usage: %s <name> [ifname] [ipv6prefix] [ipv4addr] [ipv6addr]\n", argv[0]);
+		return 1;
+	}
+	
+	snprintf(buf, sizeof(buf), "/var/run/%s.pid", argv[1]);
+	FILE *fp = fopen(buf, "r");
+	if (fp) {
+		fscanf(fp, "%d", &pid);
+		kill(pid, SIGTERM);
+		unlink(buf);
+		fclose(fp);
+	}
+	
+	if (!argv[2])
+		return 0;
+	
+	if (!argv[3] || !argv[4] || !(fp = fopen(buf, "wx")))
+		return 1;
+
+	prefix[sizeof(prefix) - 1] = 0;
+	strncpy(prefix, argv[3], sizeof(prefix) - 1);
+
+	if (!prefix[0]) {
+		struct addrinfo hints = { .ai_family = AF_INET6 }, *res;
+		if (getaddrinfo("ipv4only.arpa", NULL, &hints, &res) || !res) {
+			sleep(3);
+			if (getaddrinfo("ipv4only.arpa", NULL, &hints, &res) || !res)
+				return 2;
+		}
+
+		struct sockaddr_in6 *sin6 = (struct sockaddr_in6*)res->ai_addr;
+		inet_ntop(AF_INET6, &sin6->sin6_addr, prefix, sizeof(prefix) - 4);
+		strcat(prefix, "/96");
+		freeaddrinfo(res);
+	}
+		
+	struct sockaddr_in6 saddr = {.sin6_family = AF_INET6, .sin6_addr = {{{0x20, 0x01, 0x0d, 0xb8}}}};
+	socklen_t saddrlen = sizeof(saddr);
+	int sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
+	struct icmp6_filter filt;
+	ICMP6_FILTER_SETBLOCKALL(&filt);
+	setsockopt(sock, IPPROTO_ICMPV6, ICMP6_FILTER, &filt, sizeof(filt));
+	setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, argv[2], strlen(argv[2]));
+	if (connect(sock, (struct sockaddr*)&saddr, sizeof(saddr)) ||
+			getsockname(sock, (struct sockaddr*)&saddr, &saddrlen))
+		return 3;
+	
+	struct ipv6_mreq mreq = {saddr.sin6_addr, if_nametoindex(argv[2])};
+	if (!argv[5]) {
+		srandom(mreq.ipv6mr_multiaddr.s6_addr32[0] ^ mreq.ipv6mr_multiaddr.s6_addr32[1] ^
+				mreq.ipv6mr_multiaddr.s6_addr32[2] ^ mreq.ipv6mr_multiaddr.s6_addr32[3]);
+		mreq.ipv6mr_multiaddr.s6_addr32[2] = random();
+		mreq.ipv6mr_multiaddr.s6_addr32[3] = random();
+	} else if (inet_pton(AF_INET6, argv[5], &mreq.ipv6mr_multiaddr) != 1) {
+		return 1;
+	}
+	
+	if (setsockopt(sock, SOL_IPV6, IPV6_JOIN_ANYCAST, &mreq, sizeof(mreq)))
+		return 3;
+	
+	inet_ntop(AF_INET6, &mreq.ipv6mr_multiaddr, buf, sizeof(buf));
+	fputs(buf, stdout);
+	fputc('\n', stdout);
+	fflush(stdout);
+	
+	FILE *nat46 = fopen("/proc/net/nat46/control", "w");
+	if (!nat46 || fprintf(nat46, "add %s\nconfig %s local.style NONE local.v4 %s/32 local.v6 %s/128 "
+			"remote.style RFC6052 remote.v6 %s\n", argv[1], argv[1], argv[4], buf, prefix) < 0 ||
+			fclose(nat46))
+		return 4;
+	
+	if (!(pid = fork())) {
+		fclose(fp);
+		fclose(stdin);
+		fclose(stdout);
+		fclose(stderr);
+		chdir("/");
+		setsid();
+		pause();
+	} else {
+		fprintf(fp, "%d\n", pid);
+	}
+	
+	return 0;
+}
diff --git a/nat46/src/Makefile b/nat46/src/Makefile
new file mode 100644
index 0000000..3950a6b
--- /dev/null
+++ b/nat46/src/Makefile
@@ -0,0 +1,8 @@
+all: 464xlatcfg
+
+464xlatcfg: 464xlatcfg.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+
+clean:
+	rm -f 464xlatcfg
+

From fdb51f8bd6a4fa283bd8307087d5f2c3bed816d4 Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Wed, 1 Apr 2015 00:14:30 +0200
Subject: [PATCH 058/368] bmx6: fix libjson-c dependency

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 bmx6/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bmx6/Makefile b/bmx6/Makefile
index b9868db..727de09 100644
--- a/bmx6/Makefile
+++ b/bmx6/Makefile
@@ -82,8 +82,8 @@ endef
 
 define Package/bmx6-json
   $(call Package/bmx6/Default)
-  DEPENDS:=bmx6 +libjson
-  TITLE:=json plugin based on jsonc
+  DEPENDS:=bmx6 +libjson-c
+  TITLE:=json plugin based on json-c
 endef
 
 define Package/bmx6-sms

From 83d41fdd19ede2d664fd2195e36861dc7200021a Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Fri, 10 Apr 2015 18:57:25 +0200
Subject: [PATCH 059/368] hnetd: update to latest

Signed-off-by: Steven Barth <steven@midlink.org>
---
 hnetd/Makefile          | 55 ++++++++++++++++++++++++++++++++---------
 hnetd/files/hnet.config | 11 +++++++++
 hnetd/files/hnetd.init  | 22 +++++++++++++++++
 3 files changed, 76 insertions(+), 12 deletions(-)

diff --git a/hnetd/Makefile b/hnetd/Makefile
index 9f681bd..a456ff1 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hnetd
-PKG_SOURCE_VERSION:=10b22c409f2ecadaaec45e068fd01c74ffe5c772
-PKG_VERSION:=2014-11-25-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=faa2b7a42c33f23fac9e08f8e70a8c7ed59ce812
+PKG_VERSION:=2015-04-10-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://github.com/sbyx/hnetd.git
+PKG_SOURCE_URL:=https://github.com/sbyx/hnetd.git
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
 PKG_LICENSE:=GPL-2.0
 
@@ -28,21 +28,43 @@ CMAKE_OPTIONS += -DL_LEVEL=7
 # OpenWRT target
 CMAKE_OPTIONS += -DBACKEND=openwrt
 
-define Package/hnetd
+ifeq ($(BUILD_VARIANT),openssl)
+CMAKE_OPTIONS += -DDTLS_OPENSSL=1
+endif
+
+define Package/hnetd/Default
   SECTION:=net
   CATEGORY:=Network
-  TITLE:=HNCP Homenet daemon
+  TITLE:=HNCP Homenet daemon - $(2)
   URL:=https://github.com/sbyx/hnetd
-  DEPENDS:=+odhcpd +odhcp6c +netifd
+  DEPENDS:=+odhcpd +odhcp6c +netifd $(3)
   DEPENDS+=+@IPV6
+  VARIANT:=$1
 endef
 
+Package/hnetd-nossl=$(call Package/hnetd/Default,nossl,no authentication)
+Package/hnetd-openssl=$(call Package/hnetd/Default,openssl,authentication via OpenSSL,+libopenssl)
+
 define Package/hnet-full
   SECTION:=net
   CATEGORY:=Network
   TITLE:=HNCP Homenet metapackage
   URL:=https://github.com/sbyx/hnetd
-  DEPENDS:=+hnetd +luci-app-hnet
+  DEPENDS:=+hnetd-nossl +luci-app-hnet
+  # Routing
+  DEPENDS+=+babels
+  # Service discovery
+  DEPENDS+=+ohybridproxy
+  # Distributed PCP support
+  DEPENDS+=+miniupnpd +minimalist-pcproxy
+endef
+
+define Package/hnet-full-secure
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=HNCP Homenet metapackage
+  URL:=https://github.com/sbyx/hnetd
+  DEPENDS:=+hnetd-openssl +luci-app-hnet
   # Routing
   DEPENDS+=+babels
   # Service discovery
@@ -56,22 +78,25 @@ define Package/luci-app-hnet
   CATEGORY:=LuCI
   SUBMENU:=3. Applications
   TITLE:=HNCP Homenet configuration and visualization
-  DEPENDS:=+hnetd
+#  DEPENDS:=+hnetd
+# TBD - how to express dependency on 'some' hnetd?
 endef
 
-define Package/hnetd/description
+define Package/hnetd-$(BUILD_VARIANT)/description
 This package provides a daemon which implementats distributed prefix assignment
 and service discovery for a home network consisting of multiple routers
 connected to multiple service providers. It provides a netifd protocol "hnet"
 for use in /etc/config/network.
 endef
 
-define Package/hnetd/install
+define Package/hnetd-$(BUILD_VARIANT)/install
 	$(INSTALL_DIR) $(1)/usr/sbin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/hnetd $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/lib/netifd/proto
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/openwrt/hnet.sh $(1)/lib/netifd/proto
 	ln -s hnetd $(1)/usr/sbin/hnet-ifresolve
+	ln -s hnetd $(1)/usr/sbin/hnet-trust
+	ln -s hnetd $(1)/usr/sbin/hnet-dump
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/hnetd.init $(1)/etc/init.d/hnetd
 	$(INSTALL_DIR) $(1)/etc/config
@@ -87,6 +112,10 @@ define Package/hnet-full/install
 	true
 endef
 
+define Package/hnet-full-secure/install
+	true
+endef
+
 define Package/luci-app-hnet/install
 	$(INSTALL_DIR) $(1)/usr/lib/lua/luci
 	$(INSTALL_DIR) $(1)/www
@@ -94,7 +123,7 @@ define Package/luci-app-hnet/install
 	$(CP) -R $(PKG_BUILD_DIR)/openwrt/luci/htdocs/* $(1)/www/
 endef
 
-define Package/hnetd/postinst
+define Package/hnetd-$(BUILD_VARIANT)/postinst
 #!/bin/sh
 [ -n "$${IPKG_INSTROOT}" ] || {
 	(. /etc/uci-defaults/x-hnetd.defaults) && rm -f /etc/uci-defaults/x-hnetd.defaults
@@ -104,6 +133,8 @@ define Package/hnetd/postinst
 }
 endef
 
-$(eval $(call BuildPackage,hnetd))
+$(eval $(call BuildPackage,hnetd-nossl))
+$(eval $(call BuildPackage,hnetd-openssl))
 $(eval $(call BuildPackage,hnet-full))
+$(eval $(call BuildPackage,hnet-full-secure))
 $(eval $(call BuildPackage,luci-app-hnet))
diff --git a/hnetd/files/hnet.config b/hnetd/files/hnet.config
index 462f045..6ac396f 100644
--- a/hnetd/files/hnet.config
+++ b/hnetd/files/hnet.config
@@ -1,3 +1,14 @@
+config security security
+# Simplest security mode:
+#	option password foo
+# Trust consensus and CA-based share these options:
+#	option certificate_file /etc/hnetd-cert.pem
+#	option private_key_file /etc/hnetd-key.pem
+# Then to enable trust consensus:
+#	option trust_store /etc/hnetd-trust.dat
+# Or CA-based authentication:
+#	option trust_certificate_file /etc/ca-cert.pem
+
 config pa pa
 #	option ip4prefix 10.0.0.0/8
 #	option ulaprefix fd12:3456:789A::/48
diff --git a/hnetd/files/hnetd.init b/hnetd/files/hnetd.init
index 3c5505d..6d7d0ec 100644
--- a/hnetd/files/hnetd.init
+++ b/hnetd/files/hnetd.init
@@ -51,6 +51,7 @@ start_service() {
     # Routing script
     procd_append_param command -r /usr/sbin/hnetd-routing
 
+    # Prefix assignment (pa)
     config_get val pa ip4prefix
     [ -n "$val" ] && procd_append_param command --ip4prefix $val
 
@@ -60,15 +61,36 @@ start_service() {
     config_get val pa ulamode
     [ -n "$val" ] && procd_append_param command --ulamode $val
 
+    # Service discovery (sd)
     config_get val sd router_name
     [ -n "$val" ] && procd_append_param command -n $val
 
     config_get val sd domain_name
     [ -n "$val" ] && procd_append_param command -m $val
 
+    # Security (needs security-enabled build)
+    config_get val security password
+    [ -n "$val" ] && procd_append_param command --password $val
+
+    config_get val security certificate_file
+    [ -n "$val" ] && procd_append_param command --certificate $val
+
+    config_get val security private_key_file
+    [ -n "$val" ] && procd_append_param command --privatekey $val
+
+    config_get val security trust_store
+    [ -n "$val" ] && procd_append_param command --trust $val
+
+    config_get val security trust_certificate_file
+    [ -n "$val" ] && procd_append_param command --verify-path $val
+
     # For more verbose logging, uncomment this:
     #procd_append_param command --loglevel 7
 
     procd_set_param respawn
     procd_close_instance
 }
+
+service_triggers() {
+    procd_add_reload_trigger "hnet"
+}

From 35091bf789ddbf97d5b9e4b295ae46a6a851df40 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Mon, 13 Apr 2015 10:01:07 +0200
Subject: [PATCH 060/368] babels: update to latest source-specific

Signed-off-by: Steven Barth <steven@midlink.org>
---
 babels/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/babels/Makefile b/babels/Makefile
index 521dea5..164ff16 100644
--- a/babels/Makefile
+++ b/babels/Makefile
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=babels
-PKG_SOURCE_VERSION:=2598774f6bd7d9225483c48d72733eab5745d14e
-PKG_VERSION:=2014-08-09-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=8950d3b2f9a4799f8435c7165998c638dd0a98a8
+PKG_VERSION:=2015-04-10-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/boutier/babeld.git
+PKG_SOURCE_URL:=https://github.com/jech/babeld.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=MIT

From 2302e0b0b7a5b1971387e16743b39b34e591958e Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Tue, 14 Apr 2015 11:38:40 +0200
Subject: [PATCH 061/368] miniupnpd: backport portrange-fix

Signed-off-by: Steven Barth <steven@midlink.org>
---
 miniupnpd/Makefile                            |  2 +-
 ...mappings_in_range-in-non-expand-case.patch | 31 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 miniupnpd/patches/001-fix-get_portmappings_in_range-in-non-expand-case.patch

diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index 6add41a..b134ec2 100644
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
 PKG_VERSION:=1.9.20150307
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/miniupnpd/patches/001-fix-get_portmappings_in_range-in-non-expand-case.patch b/miniupnpd/patches/001-fix-get_portmappings_in_range-in-non-expand-case.patch
new file mode 100644
index 0000000..46409a1
--- /dev/null
+++ b/miniupnpd/patches/001-fix-get_portmappings_in_range-in-non-expand-case.patch
@@ -0,0 +1,31 @@
+From 3b472b59e00b2be96cc1ef56fe30b64e7404d9ec Mon Sep 17 00:00:00 2001
+From: Tomofumi Hayashi <s1061123@gmail.com>
+Date: Mon, 9 Mar 2015 17:33:10 +0900
+Subject: [PATCH] Fix get_portmappings_in_range() in non-expand case.
+
+In get_portmappings_in_range(), array[] is not updated when
+realloc() is not called, hence get_portmappings_in_range() is
+always null. This fix changes to fill array[].
+---
+ miniupnpd/netfilter/iptcrdr.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/miniupnpd/netfilter/iptcrdr.c b/miniupnpd/netfilter/iptcrdr.c
+index 99678e7..c7b8b7b 100644
+--- a/miniupnpd/netfilter/iptcrdr.c
++++ b/miniupnpd/netfilter/iptcrdr.c
+@@ -1434,9 +1434,9 @@ get_portmappings_in_range(unsigned short startport, unsigned short endport,
+ 							break;
+ 						}
+ 						array = tmp;
+-						array[*number] = eport;
+-						(*number)++;
+ 					}
++					array[*number] = eport;
++					(*number)++;
+ 				}
+ 			}
+ 		}
+-- 
+2.1.4
+

From 9227cae2c50fd039d9af3df338859ceb0e114db0 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Tue, 14 Apr 2015 12:08:43 +0200
Subject: [PATCH 062/368] miniupnpd: fix patch in last commit

Signed-off-by: Steven Barth <steven@midlink.org>
---
 ...fix-get_portmappings_in_range-in-non-expand-case.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/miniupnpd/patches/001-fix-get_portmappings_in_range-in-non-expand-case.patch b/miniupnpd/patches/001-fix-get_portmappings_in_range-in-non-expand-case.patch
index 46409a1..ff45ee3 100644
--- a/miniupnpd/patches/001-fix-get_portmappings_in_range-in-non-expand-case.patch
+++ b/miniupnpd/patches/001-fix-get_portmappings_in_range-in-non-expand-case.patch
@@ -7,13 +7,13 @@ In get_portmappings_in_range(), array[] is not updated when
 realloc() is not called, hence get_portmappings_in_range() is
 always null. This fix changes to fill array[].
 ---
- miniupnpd/netfilter/iptcrdr.c | 4 ++--
+ netfilter/iptcrdr.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/miniupnpd/netfilter/iptcrdr.c b/miniupnpd/netfilter/iptcrdr.c
+diff --git a/netfilter/iptcrdr.c b/netfilter/iptcrdr.c
 index 99678e7..c7b8b7b 100644
---- a/miniupnpd/netfilter/iptcrdr.c
-+++ b/miniupnpd/netfilter/iptcrdr.c
+--- a/netfilter/iptcrdr.c
++++ b/netfilter/iptcrdr.c
 @@ -1434,9 +1434,9 @@ get_portmappings_in_range(unsigned short startport, unsigned short endport,
  							break;
  						}

From 91d39b4bc59cfd6292e257b6ee66fcd6e159fcd6 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Tue, 14 Apr 2015 15:03:10 +0200
Subject: [PATCH 063/368] Revert "miniupnpd: backport portrange-fix"

This reverts commit 2302e0b0b7a5b1971387e16743b39b34e591958e.
---
 miniupnpd/Makefile                            |  2 +-
 ...mappings_in_range-in-non-expand-case.patch | 31 -------------------
 2 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 miniupnpd/patches/001-fix-get_portmappings_in_range-in-non-expand-case.patch

diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index b134ec2..6add41a 100644
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
 PKG_VERSION:=1.9.20150307
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/miniupnpd/patches/001-fix-get_portmappings_in_range-in-non-expand-case.patch b/miniupnpd/patches/001-fix-get_portmappings_in_range-in-non-expand-case.patch
deleted file mode 100644
index ff45ee3..0000000
--- a/miniupnpd/patches/001-fix-get_portmappings_in_range-in-non-expand-case.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 3b472b59e00b2be96cc1ef56fe30b64e7404d9ec Mon Sep 17 00:00:00 2001
-From: Tomofumi Hayashi <s1061123@gmail.com>
-Date: Mon, 9 Mar 2015 17:33:10 +0900
-Subject: [PATCH] Fix get_portmappings_in_range() in non-expand case.
-
-In get_portmappings_in_range(), array[] is not updated when
-realloc() is not called, hence get_portmappings_in_range() is
-always null. This fix changes to fill array[].
----
- netfilter/iptcrdr.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/netfilter/iptcrdr.c b/netfilter/iptcrdr.c
-index 99678e7..c7b8b7b 100644
---- a/netfilter/iptcrdr.c
-+++ b/netfilter/iptcrdr.c
-@@ -1434,9 +1434,9 @@ get_portmappings_in_range(unsigned short startport, unsigned short endport,
- 							break;
- 						}
- 						array = tmp;
--						array[*number] = eport;
--						(*number)++;
- 					}
-+					array[*number] = eport;
-+					(*number)++;
- 				}
- 			}
- 		}
--- 
-2.1.4
-

From e74055ba8f43c551cbdcad68ea9aed08a97d6bcd Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Wed, 15 Apr 2015 07:55:06 +0200
Subject: [PATCH 064/368] hnetd: bump to latest

Signed-off-by: Steven Barth <steven@midlink.org>
---
 hnetd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hnetd/Makefile b/hnetd/Makefile
index a456ff1..b88d1d3 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hnetd
-PKG_SOURCE_VERSION:=faa2b7a42c33f23fac9e08f8e70a8c7ed59ce812
-PKG_VERSION:=2015-04-10-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=082ebb2aa7a542a198afe38c0d8c8126f0762bdf
+PKG_VERSION:=2015-04-15-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git

From b508f93679d5e05e5d0940439afbf7acbf53ee03 Mon Sep 17 00:00:00 2001
From: Hans Dedecker <hans.dedecker@technicolor.com>
Date: Thu, 16 Apr 2015 15:08:18 +0200
Subject: [PATCH 065/368] nat46: Delete 464xlat device when pause is
 interrupted by SIGTERM

---
 nat46/src/464xlatcfg.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/nat46/src/464xlatcfg.c b/nat46/src/464xlatcfg.c
index dfce9d7..1d9466e 100644
--- a/nat46/src/464xlatcfg.c
+++ b/nat46/src/464xlatcfg.c
@@ -23,6 +23,10 @@
 #include <stdio.h>
 #include <netdb.h>
 
+static void sighandler(__attribute__((unused)) int signal)
+{
+}
+
 int main(int argc, const char *argv[])
 {
 	char buf[INET6_ADDRSTRLEN], prefix[INET6_ADDRSTRLEN + 4];
@@ -48,6 +52,8 @@ int main(int argc, const char *argv[])
 	if (!argv[3] || !argv[4] || !(fp = fopen(buf, "wx")))
 		return 1;
 
+	signal(SIGTERM, sighandler);
+
 	prefix[sizeof(prefix) - 1] = 0;
 	strncpy(prefix, argv[3], sizeof(prefix) - 1);
 
@@ -108,6 +114,12 @@ int main(int argc, const char *argv[])
 		chdir("/");
 		setsid();
 		pause();
+
+		nat46 = fopen("/proc/net/nat46/control", "w");
+		if (nat46) {
+			fprintf(nat46, "del %s\n", argv[1]);
+			fclose(nat46);
+		}
 	} else {
 		fprintf(fp, "%d\n", pid);
 	}

From cd765e581d0061e01d8122687685109e128f4c3e Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Fri, 17 Apr 2015 14:50:16 +0200
Subject: [PATCH 066/368] cjdns: import package from
 github.com:SeattleMeshnet/meshbox

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 cjdns/Makefile                         | 100 ++++++++++
 cjdns/files/cjdns.defaults             | 125 ++++++++++++
 cjdns/files/cjdns.init                 |  32 +++
 cjdns/files/cjdrouteconf               |  30 +++
 cjdns/lua/cjdns/admin.lua              | 105 ++++++++++
 cjdns/lua/cjdns/common.lua             |   7 +
 cjdns/lua/cjdns/init.lua               |  12 ++
 cjdns/lua/cjdns/uci.lua                | 264 +++++++++++++++++++++++++
 cjdns/lua/cjdns/udp.lua                | 102 ++++++++++
 cjdns/patches/010-fix-musl-build.patch |  29 +++
 10 files changed, 806 insertions(+)
 create mode 100644 cjdns/Makefile
 create mode 100644 cjdns/files/cjdns.defaults
 create mode 100755 cjdns/files/cjdns.init
 create mode 100755 cjdns/files/cjdrouteconf
 create mode 100644 cjdns/lua/cjdns/admin.lua
 create mode 100644 cjdns/lua/cjdns/common.lua
 create mode 100644 cjdns/lua/cjdns/init.lua
 create mode 100644 cjdns/lua/cjdns/uci.lua
 create mode 100644 cjdns/lua/cjdns/udp.lua
 create mode 100644 cjdns/patches/010-fix-musl-build.patch

diff --git a/cjdns/Makefile b/cjdns/Makefile
new file mode 100644
index 0000000..3253532
--- /dev/null
+++ b/cjdns/Makefile
@@ -0,0 +1,100 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=cjdns
+PKG_VERSION:=0.16
+PKG_RELEASE:=9
+
+PKG_SOURCE_URL:=https://github.com/cjdelisle/cjdns.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=2138a1f6a94fc009958cde7b002c077a1eee929a
+PKG_LICENSE:=GPL-3.0
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+
+define Package/cjdns
+	SECTION:=net
+	CATEGORY:=Network
+	SUBMENU:=Routing and Redirection
+	TITLE:=Encrypted near-zero-conf mesh routing protocol
+	URL:=https://github.com/hyperboria/cjdns
+	MAINTAINER:=Lars Gierth <larsg@systemli.org>
+	DEPENDS:=+kmod-tun +kmod-ipv6 +libnl-tiny +libpthread +librt \
+		+libuci-lua +lua-bencode +dkjson +luasocket +lua-sha2
+endef
+
+define Package/cjdns/description
+	Cjdns implements an encrypted IPv6 network using public-key cryptography \
+	for address allocation and a distributed hash table for routing. \
+	This provides near-zero-configuration networking, and prevents many \
+	of the security and scalability issues that plague existing networks.
+endef
+
+define Build/Configure
+endef
+
+ifneq ($(CONFIG_KERNEL_SECCOMP_FILTER),y)
+PKG_DO_VARS:=Seccomp_NO=1
+endif
+
+define Build/Compile
+	CROSS="true" \
+	CC="$(TARGET_CC)" \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	SYSTEM="linux" \
+	TARGET_ARCH="$(CONFIG_ARCH)" \
+	UCLIBC=1 \
+	SSP_SUPPORT="$(CONFIG_SSP_SUPPORT)" \
+	$(PKG_DO_VARS) \
+	$(PKG_BUILD_DIR)/do
+endef
+
+define Package/cjdns/install
+	$(INSTALL_DIR) \
+		$(1)/usr/sbin \
+		$(1)/usr/bin \
+		$(1)/etc/config \
+		$(1)/etc/init.d \
+		$(1)/etc/uci-defaults \
+		$(1)/usr/lib/lua/cjdns
+
+	$(INSTALL_BIN) \
+		./files/cjdrouteconf \
+		$(1)/usr/bin
+
+	$(INSTALL_BIN) \
+		$(PKG_BUILD_DIR)/cjdroute \
+		$(1)/usr/sbin
+
+	$(INSTALL_BIN) \
+		$(PKG_BUILD_DIR)/publictoip6 \
+		$(1)/usr/bin
+
+	$(INSTALL_BIN) \
+		./files/cjdns.init \
+		$(1)/etc/init.d/cjdns
+
+	$(INSTALL_BIN) \
+		./files/cjdns.defaults \
+		$(1)/etc/uci-defaults/cjdns
+
+	$(CP) \
+		./lua/cjdns/* \
+		$(1)/usr/lib/lua/cjdns
+endef
+
+define Package/cjdns/postinst
+#!/bin/sh
+if [ -z $${IPKG_INSTROOT} ] ; then
+	( . /etc/uci-defaults/cjdns ) && rm -f /etc/uci-defaults/cjdns
+	# TODO: we should have an 'Enable' button instead
+	/etc/init.d/cjdns enabled || /etc/init.d/cjdns enable
+	exit 0
+fi
+endef
+
+$(eval $(call BuildPackage,cjdns))
diff --git a/cjdns/files/cjdns.defaults b/cjdns/files/cjdns.defaults
new file mode 100644
index 0000000..fd48269
--- /dev/null
+++ b/cjdns/files/cjdns.defaults
@@ -0,0 +1,125 @@
+#!/bin/sh
+
+# if there is an existing config, our work is already done
+uci get cjdns.cjdns.ipv6 >/dev/null 2>&1
+if [ $? -ne 0 ]; then
+
+  # register commit handler
+  uci -q batch <<-EOF >/dev/null
+    delete ucitrack.@cjdns[-1]
+    add ucitrack cjdns
+    set ucitrack.@cjdns[-1].init=cjdns
+    commit ucitrack
+EOF
+
+  # generate configuration
+  touch /etc/config/cjdns
+  cjdroute --genconf | cjdroute --cleanconf | cjdrouteconf set
+
+  # make sure config is present (might fail for any reason)
+  uci get cjdns.cjdns.ipv6 >/dev/null 2>&1
+  if [ $? -ne 0]; then
+    exit 1
+  fi
+
+  # enable auto-peering on ethernet
+  uci show network.lan | grep type=bridge >/dev/null 2>&1
+  if [ $? -eq 0 ]; then
+    # most routers will set up an ethernet bridge for the lan
+    ifname="br-lan"
+  else
+    # docker containers don't have permission to create bridges by default,
+    # so we bind to the underlying interface instead (likely eth0)
+    ifname=`uci get network.lan.ifname`
+  fi
+  uci -q batch <<-EOF >/dev/null
+    add cjdns eth_interface
+    set cjdns.@eth_interface[-1].beacon=2
+    set cjdns.@eth_interface[-1].bind=$ifname
+EOF
+
+  # set the tun interface name
+  uci set cjdns.cjdns.tun_device=tuncjdns
+
+  # create the network interface
+  uci -q batch <<-EOF >/dev/null
+    set network.cjdns=interface
+    set network.cjdns.ifname=tuncjdns
+    set network.cjdns.proto=none
+EOF
+
+  # firewall rules by @dangowrt -- thanks <3
+
+  # create the firewall zone
+  uci -q batch <<-EOF >/dev/null
+    add firewall zone
+    set firewall.@zone[-1].name=cjdns
+    add_list firewall.@zone[-1].network=cjdns
+    set firewall.@zone[-1].input=REJECT
+    set firewall.@zone[-1].output=ACCEPT
+    set firewall.@zone[-1].forward=REJECT
+    set firewall.@zone[-1].conntrack=1
+    set firewall.@zone[-1].family=ipv6
+EOF
+
+  # allow ICMP from cjdns zone, e.g. ping6
+  uci -q batch <<-EOF >/dev/null
+    add firewall rule
+    set firewall.@rule[-1].name='Allow-ICMPv6-cjdns'
+    set firewall.@rule[-1].src=cjdns
+    set firewall.@rule[-1].proto=icmp
+    add_list firewall.@rule[-1].icmp_type=echo-request
+    add_list firewall.@rule[-1].icmp_type=echo-reply
+    add_list firewall.@rule[-1].icmp_type=destination-unreachable
+    add_list firewall.@rule[-1].icmp_type=packet-too-big
+    add_list firewall.@rule[-1].icmp_type=time-exceeded
+    add_list firewall.@rule[-1].icmp_type=bad-header
+    add_list firewall.@rule[-1].icmp_type=unknown-header-type
+    set firewall.@rule[-1].limit='1000/sec'
+    set firewall.@rule[-1].family=ipv6
+    set firewall.@rule[-1].target=ACCEPT
+EOF
+
+  # allow SSH from cjdns zone, needs to be explicitly enabled
+  uci -q batch <<-EOF >/dev/null
+    add firewall rule
+    set firewall.@rule[-1].enabled=0
+    set firewall.@rule[-1].name='Allow-SSH-cjdns'
+    set firewall.@rule[-1].src=cjdns
+    set firewall.@rule[-1].proto=tcp
+    set firewall.@rule[-1].dest_port=22
+    set firewall.@rule[-1].target=ACCEPT
+EOF
+
+  # allow LuCI access from cjdns zone, needs to be explicitly enabled
+  uci -q batch <<-EOF >/dev/null
+    add firewall rule
+    set firewall.@rule[-1].enabled=0
+    set firewall.@rule[-1].name='Allow-HTTP-cjdns'
+    set firewall.@rule[-1].src=cjdns
+    set firewall.@rule[-1].proto=tcp
+    set firewall.@rule[-1].dest_port=80
+    set firewall.@rule[-1].target=ACCEPT
+EOF
+
+  # allow UDP peering from wan zone, if it exists
+  uci show network.wan >/dev/null 2>&1
+  if [ $? -eq 0 ]; then
+    peeringPort=`uci get cjdns.@udp_interface[0].port`
+    uci -q batch <<-EOF >/dev/null
+      add firewall rule
+      set firewall.@rule[-1].name='Allow-cjdns-wan'
+      set firewall.@rule[-1].src=wan
+      set firewall.@rule[-1].proto=udp
+      set firewall.@rule[-1].dest_port=$peeringPort
+      set firewall.@rule[-1].target=ACCEPT
+EOF
+  fi
+
+  uci commit cjdns
+  uci commit firewall
+  uci commit network
+
+fi
+
+exit 0
diff --git a/cjdns/files/cjdns.init b/cjdns/files/cjdns.init
new file mode 100755
index 0000000..b6371d7
--- /dev/null
+++ b/cjdns/files/cjdns.init
@@ -0,0 +1,32 @@
+#!/bin/sh /etc/rc.common
+
+START=90
+STOP=85
+
+USE_PROCD=1
+
+start_service()
+{
+	[ -f /etc/uci-defaults/cjdns ] && ( . /etc/uci-defaults/cjdns )
+
+	procd_open_instance
+	procd_set_param respawn
+	procd_set_param command /bin/ash -c "cjdrouteconf get | tee /tmp/etc/cjdroute.conf | cjdroute --nobg | logger -t cjdns"
+	procd_close_instance
+}
+
+stop_service()
+{
+	killall cjdroute
+}
+
+reload_service()
+{
+	# cat /tmp/etc/cjdroute.conf | cjdrouteconf reload
+	restart
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger cjdns
+}
diff --git a/cjdns/files/cjdrouteconf b/cjdns/files/cjdrouteconf
new file mode 100755
index 0000000..fa5e073
--- /dev/null
+++ b/cjdns/files/cjdrouteconf
@@ -0,0 +1,30 @@
+#!/usr/bin/env lua
+
+dkjson = require("dkjson")
+cjdns = require("cjdns")
+require("cjdns/uci")
+
+function help()
+  print("JSON interface to /etc/config/cjdns\n\nExamples: \
+    cjdrouteconf get > /tmp/etc/cjdroute.conf \
+    cat /tmp/etc/cjdroute.conf | cjdrouteconf set \
+    uci changes \
+    cjdrouteconf get | cjdroute")
+end
+
+if arg[1] == "get" then
+  local json = dkjson.encode(cjdns.uci.get(), { indent = true })
+  print(json)
+elseif arg[1] == "set" then
+  local json = io.stdin:read("*a")
+  local obj, pos, err = dkjson.decode(json, 1, nil)
+
+  if obj then
+    cjdns.uci.set(obj)
+  else
+    print("dkjson: " .. err .. " (try cjdroute --cleanconf)")
+    os.exit(1)
+  end
+else
+  help()
+end
diff --git a/cjdns/lua/cjdns/admin.lua b/cjdns/lua/cjdns/admin.lua
new file mode 100644
index 0000000..2bb58d2
--- /dev/null
+++ b/cjdns/lua/cjdns/admin.lua
@@ -0,0 +1,105 @@
+-- Cjdns admin module for Lua
+-- Written by Philip Horger
+
+common = require 'cjdns/common'
+
+AdminInterface = {}
+AdminInterface.__index = AdminInterface
+common.AdminInterface = AdminInterface
+
+function AdminInterface.new(properties)
+    properties = properties or {}
+
+    properties.host     = properties.host or "127.0.0.1"
+    properties.port     = properties.port or 11234
+    properties.password = properties.password or nil
+    properties.config   = properties.config   or common.ConfigFile.new("/etc/cjdroute.conf", false)
+    properties.timeout  = properties.timeout  or 2
+
+    properties.udp      = common.UDPInterface.new(properties)
+
+    return setmetatable(properties, AdminInterface)
+end
+
+function AdminInterface:send(object)
+    local bencoded, err = bencode.encode(object)
+    if err then
+        return nil, err
+    end
+
+    local sock_obj = assert(socket.udp())
+    sock_obj:settimeout(self.timeout)
+
+    local _, err = sock_obj:sendto(bencoded, self.host, self.port)
+    if err then
+        return nil, err
+    end
+
+    return sock_obj
+end
+
+function AdminInterface:recv(sock_obj)
+    local retrieved, err = sock_obj:receive()
+    if not retrieved then
+        return nil, "ai:recv > " .. err
+    end
+    local bencoded, err = bencode.decode(retrieved)
+    if bencoded then
+        return bencoded
+    else
+        return nil, "ai:recv > " .. err
+    end
+end
+
+function AdminInterface:call(request)
+    local sock_obj, err = self:send(request)
+    if err then
+        return nil, "ai:call > " .. err
+    end
+
+    return self:recv(sock_obj)
+end
+
+function AdminInterface:getCookie()
+    local cookie_response, err = self:call({ q = "cookie" })
+    if not cookie_response then
+        return nil, "ai:getCookie > " .. err
+    end
+    return cookie_response.cookie
+end
+
+function AdminInterface:auth(request)
+    local funcname = request.q
+    local args = {}
+    for k, v in pairs(request) do
+        args[k] = v
+    end
+
+    -- Step 1: Get cookie
+    local cookie, err = self:getCookie()
+    if err then
+        return nil, err
+    end
+
+    -- Step 2: Calculate hash1 (password + cookie)
+    local plaintext1 = self.password .. cookie
+    local hash1 = sha2.sha256hex(plaintext1)
+
+    -- Step 3: Calculate hash2 (intermediate stage request)
+    local request = {
+        q      = "auth",
+        aq     = funcname,
+        args   = args,
+        hash   = hash1,
+        cookie = cookie
+    }
+    local plaintext2, err = bencode.encode(request)
+    if err then
+        return nil, err
+    end
+    local hash2 = sha2.sha256hex(plaintext2)
+
+    -- Step 4: Update hash in request, then ship it out
+    request.hash = hash2
+    return self:call(request)
+end
diff --git a/cjdns/lua/cjdns/common.lua b/cjdns/lua/cjdns/common.lua
new file mode 100644
index 0000000..45f7dad
--- /dev/null
+++ b/cjdns/lua/cjdns/common.lua
@@ -0,0 +1,7 @@
+-- Cjdns admin module for Lua
+-- Written by Philip Horger
+
+-- This table is preserved over multiple imports, and collects
+-- submodules import-by-import via init.lua.
+
+return {}
diff --git a/cjdns/lua/cjdns/init.lua b/cjdns/lua/cjdns/init.lua
new file mode 100644
index 0000000..32abbfc
--- /dev/null
+++ b/cjdns/lua/cjdns/init.lua
@@ -0,0 +1,12 @@
+-- Cjdns admin module for Lua
+-- Written by Philip Horger
+
+bencode = require "bencode" -- https://bitbucket.org/wilhelmy/lua-bencode/
+dkjson  = require "dkjson"  -- http://dkolf.de/src/dkjson-lua.fsl/home
+socket  = require "socket"  -- http://w3.impa.br/~diego/software/luasocket/
+sha2    = require "sha2"    -- https://code.google.com/p/sha2/
+
+require "cjdns/admin"
+require "cjdns/udp"
+
+return require "cjdns/common"
diff --git a/cjdns/lua/cjdns/uci.lua b/cjdns/lua/cjdns/uci.lua
new file mode 100644
index 0000000..70c33bc
--- /dev/null
+++ b/cjdns/lua/cjdns/uci.lua
@@ -0,0 +1,264 @@
+common = require("cjdns/common")
+uci    = require("uci")
+
+UCI = {}
+common.uci = UCI
+
+--- Return the configuration defaults as a table suitable for JSON output
+--
+-- Mostly taken from cjdroute --genconf
+-- @return table with configuration defaults
+function UCI.defaults()
+  return {
+    security = { { exemptAngel = 1, setuser = "nobody" } },
+    router = {
+        ipTunnel = { outgoingConnections = {}, allowedConnections = {} },
+        interface = { type = "TUNInterface" }
+    },
+    interfaces = { UDPInterface = {}, ETHInterface = {} },
+    authorizedPasswords = {},
+    logging = { logTo = "stdout" }
+  }
+end
+
+--- Return the cjdns configuration as a table suitable for JSON output
+--
+-- Iterates over cjdns, eth_interface, udp_interface, eth_peer, udp_peer,
+-- and password sections. Doesn't include IPTunnel related options yet.
+-- @return table with cjdns configuration
+function UCI.get()
+  local obj = UCI.defaults()
+
+  local cursor = uci.cursor()
+
+  local config = cursor:get_all("cjdns", "cjdns")
+  if not config then return obj end
+
+  obj.ipv6 = config.ipv6
+  obj.publicKey = config.public_key
+  obj.privateKey = config.private_key
+  obj.admin = {
+    bind = config.admin_address .. ":" .. config.admin_port,
+    password = config.admin_password }
+
+  if config.tun_device and string.len(config.tun_device) > 0 then
+    obj.router.interface.tunDevice = config.tun_device
+  end
+
+  cursor:foreach("cjdns", "iptunnel_outgoing", function(outgoing)
+    table.insert(obj.router.ipTunnel.outgoingConnections, outgoing.public_key)
+  end)
+
+  cursor:foreach("cjdns", "iptunnel_allowed", function(allowed)
+    entry = { publicKey = allowed.public_key }
+    if allowed.ipv4 then
+      entry["ip4Address"] = allowed.ipv4
+    end
+    if allowed.ipv6 then
+      entry["ip6Address"] = allowed.ipv6
+    end
+    table.insert(obj.router.ipTunnel.allowedConnections, entry)
+  end)
+
+  cursor:foreach("cjdns", "eth_interface", function(eth_interface)
+    table.insert(obj.interfaces.ETHInterface, {
+      bind = eth_interface.bind,
+      beacon = tonumber(eth_interface.beacon),
+      connectTo = {}
+    })
+  end)
+
+  cursor:foreach("cjdns", "udp_interface", function(udp_interface)
+    table.insert(obj.interfaces.UDPInterface, {
+      bind = udp_interface.address .. ":" .. udp_interface.port,
+      connectTo = {}
+    })
+  end)
+
+  cursor:foreach("cjdns", "eth_peer", function(eth_peer)
+    if not eth_peer.address == "" then
+      local i = tonumber(eth_peer.interface)
+      obj.interfaces.ETHInterface[i].connectTo[eth_peer.address] = {
+        publicKey = eth_peer.public_key,
+        password = eth_peer.password
+      }
+    end
+  end)
+
+  cursor:foreach("cjdns", "udp_peer", function(udp_peer)
+    local bind = udp_peer.address .. ":" .. udp_peer.port
+    local i = tonumber(udp_peer.interface)
+    obj.interfaces.UDPInterface[i].connectTo[bind] = {
+      user = udp_peer.user,
+      publicKey = udp_peer.public_key,
+      password = udp_peer.password
+    }
+  end)
+
+  cursor:foreach("cjdns", "password", function(password)
+    table.insert(obj.authorizedPasswords, {
+      password = password.password,
+      user = password.user,
+      contact = password.contact
+    })
+  end)
+
+  return obj
+end
+
+--- Parse and save updated configuration from JSON input
+--
+-- Transforms general settings, ETHInterface, UDPInterface, connectTo, and
+-- authorizedPasswords fields into UCI sections, and replaces the UCI config's
+-- contents with them.
+-- @param table JSON input
+-- @return Boolean whether saving succeeded
+function UCI.set(obj)
+  local cursor = uci.cursor()
+
+  for i, section in pairs(cursor:get_all("cjdns")) do
+    cursor:delete("cjdns", section[".name"])
+  end
+
+  local admin_address, admin_port = string.match(obj.admin.bind, "^(.*):(.*)$")
+  UCI.cursor_section(cursor, "cjdns", "cjdns", "cjdns", {
+    ipv6 = obj.ipv6,
+    public_key = obj.publicKey,
+    private_key = obj.privateKey,
+    admin_password = obj.admin.password,
+    admin_address = admin_address,
+    admin_port = admin_port,
+  })
+
+  if obj.router.interface.tunDevice then
+    UCI.cursor_section(cursor, "cjdns", "cjdns", "cjdns", {
+      tun_device = tostring(obj.router.interface.tunDevice)
+    })
+  end
+
+  if obj.router.ipTunnel.outgoingConnections then
+    for i,public_key in pairs(obj.router.ipTunnel.outgoingConnections) do
+      UCI.cursor_section(cursor, "cjdns", "iptunnel_outgoing", nil, {
+        public_key = public_key
+      })
+    end
+  end
+
+  if obj.router.ipTunnel.allowedConnections then
+    for i,allowed in pairs(obj.router.ipTunnel.allowedConnections) do
+      entry = { public_key = allowed.publicKey }
+      if allowed.ip4Address then
+        entry["ipv4"] = allowed.ip4Address
+      end
+      if allowed.ip6Address then
+        entry["ipv6"] = allowed.ip6Address
+      end
+
+      UCI.cursor_section(cursor, "cjdns", "iptunnel_allowed", nil, entry)
+    end
+  end
+
+  if obj.interfaces.ETHInterface then
+    for i,interface in pairs(obj.interfaces.ETHInterface) do
+      UCI.cursor_section(cursor, "cjdns", "eth_interface", nil, {
+        bind = interface.bind,
+        beacon = tostring(interface.beacon)
+      })
+
+      if interface.connectTo then
+        for peer_address,peer in pairs(interface.connectTo) do
+          UCI.cursor_section(cursor, "cjdns", "eth_peer", nil, {
+            interface = i,
+            address = peer_address,
+            public_key = peer.publicKey,
+            password = peer.password
+          })
+        end
+      end
+    end
+  end
+
+  if obj.interfaces.UDPInterface then
+    for i,interface in pairs(obj.interfaces.UDPInterface) do
+      local address, port = string.match(interface.bind, "^(.*):(.*)$")
+      UCI.cursor_section(cursor, "cjdns", "udp_interface", nil, {
+        address = address,
+        port = port
+      })
+
+      if interface.connectTo then
+        for peer_bind,peer in pairs(interface.connectTo) do
+          local peer_address, peer_port = string.match(peer_bind, "^(.*):(.*)$")
+          UCI.cursor_section(cursor, "cjdns", "udp_peer", nil, {
+            interface = i,
+            address = peer_address,
+            port = peer_port,
+            user = peer.user,
+            public_key = peer.publicKey,
+            password = peer.password
+          })
+        end
+      end
+    end
+  end
+
+  if obj.authorizedPasswords then
+    for i,password in pairs(obj.authorizedPasswords) do
+      local user = password.user
+      if not user or string.len(user) == 0 then
+        user = "user-" .. UCI.random_string(6)
+      end
+
+      UCI.cursor_section(cursor, "cjdns", "password", nil, {
+        password = password.password,
+        user = user,
+        contact = password.contact
+      })
+    end
+  end
+
+  return cursor:save("cjdns")
+end
+
+--- Simple backport of Cursor:section from luci.model.uci
+--
+-- Backport reason: we don't wanna depend on LuCI.
+-- @param Cursor the UCI cursor to operate on
+-- @param string name of the config
+-- @param string type of the section
+-- @param string name of the section (optional)
+-- @param table config values
+function UCI.cursor_section(cursor, config, type, section, values)
+  if section then
+    cursor:set(config, section, type)
+  else
+    section = cursor:add("cjdns", type)
+  end
+
+  for k,v in pairs(values) do
+    cursor:set(config, section, k, v)
+  end
+end
+
+function UCI.makeInterface()
+  local cursor = uci.cursor()
+
+  local config = cursor:get_all("cjdns", "cjdns")
+  if not config then return nil end
+
+  return common.AdminInterface.new({
+    host = config.admin_address,
+    port = config.admin_port,
+    password = config.admin_password,
+    config = UCI.get(),
+    timeout = 2
+  })
+end
+
+function UCI.random_string(length)
+  -- tr -cd 'A-Za-z0-9' < /dev/urandom
+  local urandom = io.popen("tr -cd 'A-Za-z0-9' 2> /dev/null < /dev/urandom", "r")
+  local string = urandom:read(length)
+  urandom:close()
+  return string
+end
diff --git a/cjdns/lua/cjdns/udp.lua b/cjdns/lua/cjdns/udp.lua
new file mode 100644
index 0000000..9dd5901
--- /dev/null
+++ b/cjdns/lua/cjdns/udp.lua
@@ -0,0 +1,102 @@
+-- Cjdns admin module for Lua
+-- Written by Philip Horger
+
+common = require 'cjdns/common'
+
+UDPInterface = {}
+UDPInterface.__index = UDPInterface
+common.UDPInterface = UDPInterface
+
+function UDPInterface.new(ai, config, ptype)
+    properties = {
+        ai     = ai,
+        config = config or ai.config,
+        ptype  = ptype or "ai"
+    }
+
+    return setmetatable(properties, UDPInterface)
+end
+
+function UDPInterface:call(name, args)
+    local func = self[name .. "_" .. self.ptype]
+    return func(self, unpack(args))
+end
+
+function UDPInterface:newBind(...)
+    return self:call("newBind", arg)
+end
+
+function UDPInterface:beginConnection(...)
+    return self:call("beginConnection", arg)
+end
+
+function UDPInterface:newBind_ai(address)
+    local response, err = self.ai:auth({
+        q = "UDPInterface_new",
+        bindAddress = address
+    })
+    if not response then
+        return nil, err
+    elseif response.error ~= "none" then
+        return nil, response.error
+    elseif response.interfaceNumber then
+        return response.interfaceNumber
+    else
+        return nil, "bad response format"
+    end
+end
+
+function UDPInterface:newBind_config(address)
+    local udpif       = self.config.contents.interfaces.UDPInterface
+    local new_interface = {
+        bind = address,
+        connectTo = {}
+    }
+    table.insert(udpif, new_interface)
+    return (#udpif - 1), new_interface
+end
+
+function UDPInterface:newBind_perm(...)
+    return
+        self:newBind_config(unpack(arg)),
+        self:newBind_ai(unpack(arg))
+end
+
+function UDPInterface:beginConnection_ai(pubkey, addr, password, interface)
+    local request = {
+        q = "UDPInterface_beginConnection",
+        publicKey = pubkey,
+        address   = addr,
+        password  = password
+    }
+    if interface then
+        request.interfaceNumber = interface
+    end
+
+    local response, err = self.ai:auth(request)
+    if not response then
+        return nil, err
+    elseif response.error == "none" then
+        -- Unfortunately, no real success indicator either.
+        return "No error"
+    else
+        return nil, response.error
+    end
+end
+
+function UDPInterface:beginConnection_config(pubkey, addr, password, interface)
+    local udpif       = self.config.contents.interfaces.UDPInterface
+    local connections = udpif[(interface or 0) + 1].connectTo
+    local this_conn   = {
+        password  = password,
+        publicKey = pubkey
+    }
+    connections[addr] = this_conn
+    return this_conn -- allows adding metadata fields afterwards
+end
+
+function UDPInterface:beginConnection_perm(...)
+    return
+        self:beginConnection_config(unpack(arg)),
+        self:beginConnection_ai(unpack(arg))
+end
diff --git a/cjdns/patches/010-fix-musl-build.patch b/cjdns/patches/010-fix-musl-build.patch
new file mode 100644
index 0000000..aa5648d
--- /dev/null
+++ b/cjdns/patches/010-fix-musl-build.patch
@@ -0,0 +1,29 @@
+Index: cjdns-649e26c7d61ccc66c20e87e1e3d381f9ef0cfcb0/crypto/random/seed/LinuxRandomUuidSysctlRandomSeed.c
+===================================================================
+--- cjdns-649e26c7d61ccc66c20e87e1e3d381f9ef0cfcb0.orig/crypto/random/seed/LinuxRandomUuidSysctlRandomSeed.c
++++ cjdns-649e26c7d61ccc66c20e87e1e3d381f9ef0cfcb0/crypto/random/seed/LinuxRandomUuidSysctlRandomSeed.c
+@@ -18,6 +18,8 @@
+ #include "util/Hex.h"
+ 
+ #include <unistd.h>
++
++#ifdef __GLIBC__
+ #include <sys/sysctl.h>
+ 
+ static int getUUID(uint64_t output[2])
+@@ -42,6 +44,15 @@ static int get(struct RandomSeed* random
+     return 0;
+ }
+ 
++#else
++
++static int get(struct RandomSeed* randomSeed, uint64_t output[8])
++{
++    return -1;
++}
++
++#endif
++
+ struct RandomSeed* LinuxRandomUuidSysctlRandomSeed_new(struct Allocator* alloc)
+ {
+     return Allocator_clone(alloc, (&(struct RandomSeed) {

From 326d4de13c7ef203165d64358123294ae6903cd0 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Fri, 17 Apr 2015 15:11:53 +0200
Subject: [PATCH 067/368] nat46: shorten prefix for 464xlat interface

Signed-off-by: Steven Barth <steven@midlink.org>
---
 nat46/Makefile         | 2 +-
 nat46/files/464xlat.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nat46/Makefile b/nat46/Makefile
index 4cbc494..3fa8b32 100644
--- a/nat46/Makefile
+++ b/nat46/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=nat46
-PKG_VERSION:=3
+PKG_VERSION:=4
 PKG_RELEASE:=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
diff --git a/nat46/files/464xlat.sh b/nat46/files/464xlat.sh
index 680d230..8154f7f 100755
--- a/nat46/files/464xlat.sh
+++ b/nat46/files/464xlat.sh
@@ -22,7 +22,7 @@
 proto_464xlat_setup() {
 	local cfg="$1"
 	local iface="$2"
-	local link="464xlat-$cfg"
+	local link="464-$cfg"
 
 	local ip6addr ip6prefix tunlink zone
 	json_get_vars ip6addr ip6prefix tunlink zone

From ed025182d7d6667637c720eee527b9a7f7b8a7ba Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Fri, 17 Apr 2015 15:58:00 +0200
Subject: [PATCH 068/368] nat46: fix interface name handling

Signed-off-by: Steven Barth <steven@midlink.org>
---
 nat46/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nat46/Makefile b/nat46/Makefile
index 3fa8b32..f30fbc9 100644
--- a/nat46/Makefile
+++ b/nat46/Makefile
@@ -16,7 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=https://github.com/ayourtch/nat46.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a28e24b45c31bfa61447d0bdd591478cff1cad10
+PKG_SOURCE_VERSION:=ccbba8595d7ccbc2ccb1e7d81b420e9587f07fe5
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
 PKG_LICENSE:=GPL-2.0
 

From de192084463512bac540ca9dfb41c38a33e8b259 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Fri, 17 Apr 2015 16:05:07 +0200
Subject: [PATCH 069/368] hnetd: remove accidental debug logging

Signed-off-by: Steven Barth <steven@midlink.org>
---
 hnetd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hnetd/Makefile b/hnetd/Makefile
index b88d1d3..c497f61 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hnetd
-PKG_SOURCE_VERSION:=082ebb2aa7a542a198afe38c0d8c8126f0762bdf
-PKG_VERSION:=2015-04-15-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=6a5348ca13ae257c02431df499e78b695049324f
+PKG_VERSION:=2015-04-17-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git

From f425d537a097ec47a7a8ef6fb51e2f9896bf5ae7 Mon Sep 17 00:00:00 2001
From: Gabriel Kerneis <kerneis@google.com>
Date: Fri, 17 Apr 2015 10:34:36 +0200
Subject: [PATCH 070/368] babeld: update to release 1.6.0

14 April 2014: babeld-1.6.0

* Added support for source-specific routing.  Thanks to Matthieu Boutier.
* Added support for reflecting metrics as kernel priorities.  Thanks to
  Pierre Pfister.
* Worked around a Linux kernel bug with an infinite EAGAIN loop.  Thanks
  to Dave Taht.
* Changed wildcard updates to not set flag 0x40.  Reported by Markus
  Stenberg.
* Made ipv6-subtrees a runtime option.  Thanks to Matthieu Boutier.

Signed-off-by: Gabriel Kerneis <kerneis@google.com>
---
 babeld/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/babeld/Makefile b/babeld/Makefile
index 43a91b8..1607b04 100644
--- a/babeld/Makefile
+++ b/babeld/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=babeld
-PKG_VERSION:=1.5.1
+PKG_VERSION:=1.6.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/files/
-PKG_MD5SUM:=20e3284d5ad291d7ba2ad91d5b47de10
+PKG_MD5SUM:=b0602a6124ddafb37225bd1a2d8abb13
 PKG_LICENSE:=MIT
 
 include $(INCLUDE_DIR)/package.mk

From 23e20773d8b5c90dad99702e030ce86ccf3344f3 Mon Sep 17 00:00:00 2001
From: Gabriel Kerneis <kerneis@google.com>
Date: Fri, 17 Apr 2015 10:41:16 +0200
Subject: [PATCH 071/368] babels: remove deprecated experimental package

The source-specific functionnality has been merged into babeld 1.6.0.

Signed-off-by: Gabriel Kerneis <kerneis@google.com>
---
 babels/Makefile                               |  69 --------
 babels/files/babeld.conf                      |  38 -----
 babels/files/babeld.config                    |  72 --------
 babels/files/babeld.init                      | 154 ------------------
 ...tes-with-source-128-for-SAS-on-Linux.patch | 103 ------------
 5 files changed, 436 deletions(-)
 delete mode 100644 babels/Makefile
 delete mode 100644 babels/files/babeld.conf
 delete mode 100644 babels/files/babeld.config
 delete mode 100755 babels/files/babeld.init
 delete mode 100644 babels/patches/0001-Allow-routes-with-source-128-for-SAS-on-Linux.patch

diff --git a/babels/Makefile b/babels/Makefile
deleted file mode 100644
index 164ff16..0000000
--- a/babels/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# Copyright (C) 2007-2009 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:=babels
-PKG_SOURCE_VERSION:=8950d3b2f9a4799f8435c7165998c638dd0a98a8
-PKG_VERSION:=2015-04-10-$(PKG_SOURCE_VERSION)
-PKG_RELEASE:=1
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/jech/babeld.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=MIT
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/babels
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Routing and Redirection
-  TITLE:=A loop-free distance-vector routing protocol (source-specific)
-  URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/babel/
-  MAINTAINER:=Steven Barth <cyrus@openwrt.org>
-  DEPENDS:=+kmod-ipv6
-endef
-
-define Package/babels/description
- Babel is a loop-avoiding distance-vector routing protocol roughly based
- on DSDV and AODV, but with provisions for link cost estimation and
- redistribution of routes from other routing protocols.
- While it is optimised for wireless mesh networks, Babel will also work
- efficiently on wired networks. It will generate between 1.2 and 2.4 times
- the amount of routing traffic that RIPng would generate, while
- never counting to infinity.
- This is experimental source routing branch, and should be only used if you
- know what you are doing.
-endef
-
-define Package/babels/conffiles
-/etc/babeld.conf
-/etc/config/babeld
-endef
-
-MAKE_FLAGS+= \
-	CFLAGS="$(TARGET_CFLAGS) -DIPV6_SUBTREES" \
-	LDLIBS="" \
-
-define Package/babels/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/babeld $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) ./files/babeld.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/babeld.config $(1)/etc/config/babeld
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/babeld.init $(1)/etc/init.d/babeld
-endef
-
-define Build/Compile
-	echo "#define BABEL_VERSION \"$(PKG_SOURCE_SUBDIR)\"" > $(PKG_BUILD_DIR)/version.h
-	$(call Build/Compile/Default)
-endef
-
-$(eval $(call BuildPackage,babels))
diff --git a/babels/files/babeld.conf b/babels/files/babeld.conf
deleted file mode 100644
index 746139d..0000000
--- a/babels/files/babeld.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-# babel config file
-#
-# This config file simply documents sample entries. 
-# "redistribute" means: redistribute routes from other routing protocols
-# into babel. "local" means addresses assigned to local interfaces.
-#
-# You do not need to edit this file: you can use /etc/config/babeld
-# instead (sections "interface" and "filter").  Both files can be used
-# simultaneously (the rules of this file are executed first).
-
-# the default rules are:
-#
-## redistribute local 
-## redistribute deny
-#
-# this says, redistribute local addresses but no other routes
-
-
-# redistribute IPv4 default route into babel 
-## redistribute local ip 0.0.0.0/0 le 0 metric 128
-
-# same but for IPv6
-## redistribute local ip ::/0 le 0 metric 128
-
-
-# don't redistribute all local addresses, only selected ones
-# after the first line, the "deny" rules kicks in. After the "deny"
-# no redistribute local rules are going to match
-## redistribute local ip 192.160.4.0/24 
-## redistribute local deny
-
-
-# Babel refuses to redistribute routes with a protocol number of "boot";
-# this is standard practice, and means that you cannot easily
-# redistribute the default route installed by dhcp.  It is however
-# possible to redistribute such route by explicitly specifying "proto 3"
-# on the redistribute line.
-## redistribute ip 0.0.0.0/0 le 0 proto 3 metric 128
diff --git a/babels/files/babeld.config b/babels/files/babeld.config
deleted file mode 100644
index a4f00e6..0000000
--- a/babels/files/babeld.config
+++ /dev/null
@@ -1,72 +0,0 @@
-package babeld
-
-config general
-	# option 'multicast_address' 'ff02:0:0:0:0:0:1:6'
-	# option 'port' '6696'
-	# option 'state_file' '/var/lib/babel-state'
-	# option 'hello_interval' '4'
-	# option 'wired_hello_interval' '20'
-	# option 'diversity' '0,128'
-	# option 'smoothing_half_time' '4'
-	# option 'kernel_priority' '0'
-	# Do not use this option unless you know what you are doing, as it can
-	# cause persistent route flapping.
-	## option 'duplication_priority' '0'
-	# option 'carrier_sense' 'false'
-	# option 'assume_wireless' 'false'
-	# option 'no_split_horizon' 'false'
-	# option 'debug' '0'
-	# Listen for connections from a front-end, e.g. on port 33123.
-	## option 'local_server' '33123'
-	# option 'random_router_id' 'false'
-	# Keep unfeasible routes
-	## option 'keep_unfeasible' 'false'
-	# Use the given kernel routing table for routes inserted by babeld.
-	## option 'export_table' '0'
-	# Export routes from the given kernel routing tables.
-	## list 'import_table' '0'
-	## list 'import_table' '42'
-	# The configuration file is not necessary since you can do everything
-	# from this file.
-	# option 'conf_file' '/etc/babeld.conf'
-	# option 'log_file' '/var/log/babeld.log'
-
-# You can use aliases (like lan, wlan) or real names (like eth0.0).
-# If you use an alias, it must be already defined when babeld starts.
-# Otherwise, the name is taken literally and the interface can be
-# brought up later (useful for tunnels for instance).
-config interface wlan
-	# Remove this line to enable babeld on this interface
-	option 'ignore' 'true'
-	# option 'wired' 'auto'
-	# option 'link_quality' 'auto'
-	# option 'split_horizon' 'auto'
-	# The default is 96 for wired interfaces, and 256 for wireless ones
-	## option 'rxcost' '256'
-	# The default is specified with the -h and -H command-line flags.
-	## option 'hello_interval' '4'
-	# This can be set to a fairly large  value,  unless significant
-	# packet loss is expected.  The default is four times the hello
-	# interval.
-	## option 'update_interval' '16'
-
-config interface lan
-	option 'ignore' 'true'
-
-# A filter consists in a type ('in', 'out' or 'redistribute'), an action
-# ('allow', 'deny' or 'metric xxx') and a set of selectors ('ip', 'eq',
-# etc.).  See /etc/babeld.conf for more details.
-# Here is a sample filter wich redistributes the default route if its
-# protocol number is "boot", e.g. when it installed by dhcp.  It is
-# disabled by default.
-config filter
-	option 'ignore' 'true'
-	# Type
-	option 'type' 'redistribute'
-	# Selectors: ip, eq, le, ge, neigh, id, proto, local, if
-	option 'ip' '0.0.0.0/0' 
-	option 'le' '0'
-	option 'proto' '3'
-	# Action 
-	option 'action' 'metric 128'
-
diff --git a/babels/files/babeld.init b/babels/files/babeld.init
deleted file mode 100755
index 4af7eea..0000000
--- a/babels/files/babeld.init
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=70
-
-pidfile='/var/run/babeld.pid'
-EXTRA_COMMANDS="status"
-EXTRA_HELP="        status Dump Babel's table to the log file."
-
-listen_ifname() {
-	local ifname=$(uci_get_state network "$1" ifname "$1")
-	local switch="$2"
-	append args "$switch $ifname"
-	append interfaces "$ifname"
-}
-
-append_ifname() {
-	local section="$1"
-	local option="$2"
-	local switch="$3"
-	local _name
-	config_get _name "$section" "$option"
-	[ -z "$_name" ] && return 0
-	local ifname=$(uci_get_state network "$_name" ifname "$_name")
-	append args "$switch $ifname"
-}
-
-append_bool() {
-	local section="$1"
-	local option="$2"
-	local value="$3"
-	local _loctmp
-	config_get_bool _loctmp "$section" "$option" 0
-	[ "$_loctmp" -gt 0 ] && append args "$value"
-}
-
-append_switch() {
-	local value="$1"
-	local switch="$2"
-	append args "$switch $value"
-}
-
-append_parm() {
-	local section="$1"
-	local option="$2"
-	local switch="$3"
-	local _loctmp
-	config_get _loctmp "$section" "$option"
-	[ -z "$_loctmp" ] && return 0
-	append args "$switch $_loctmp"
-}
-
-babel_filter() {
-	local cfg="$1"
-	local _loctmp
-
-	local _ignored
-	config_get_bool _ignored "$cfg" 'ignore' 0
-	[ "$_ignored" -eq 1 ] && return 0
-	
-	append args "-C '"
-
-	append_parm "$cfg" 'type' ''
-
-	append_bool "$cfg" 'local' 'local'
-
-	append_parm "$cfg" 'ip' 'ip'
-	append_parm "$cfg" 'eq' 'eq'
-	append_parm "$cfg" 'le' 'le'
-	append_parm "$cfg" 'ge' 'ge'
-	append_parm "$cfg" 'src_ip' 'src-ip'
-	append_parm "$cfg" 'src_eq' 'src-eq'
-	append_parm "$cfg" 'src_le' 'src-le'
-	append_parm "$cfg" 'src_ge' 'src-ge'
-	append_parm "$cfg" 'neigh' 'neigh'
-	append_parm "$cfg" 'id' 'id'
-	append_parm "$cfg" 'proto' 'proto'
-
-	append_ifname "$cfg" 'if' 'if'
-
-	append_parm "$cfg" 'action' ''
-
-	append args ' ' "'"
-}
-
-babel_addif() {
-	local cfg="$1"
-
-	local _ignored
-	config_get_bool _ignored "$cfg" 'ignore' 0
-	[ "$_ignored" -eq 1 ] && return 0
-	
-	listen_ifname "$cfg" "-C 'interface"
-
-	append_parm "$cfg" 'wired' 'wired'
-	append_parm "$cfg" 'link_quality' 'link-quality'
-	append_parm "$cfg" 'split_horizon' 'split-horizon'
-	append_parm "$cfg" 'rxcost' 'rxcost'
-	append_parm "$cfg" 'hello_interval' 'hello-interval'
-	append_parm "$cfg" 'update_interval' 'update-interval'
-
-	append args ' ' "'"
-}
-
-babel_config() {
-	local cfg="$1"
-
-	append_bool "$cfg" 'carrier_sense' '-l'
-	append_bool "$cfg" 'assume_wireless' '-w'
-	append_bool "$cfg" 'no_split_horizon' '-s'
-	append_bool "$cfg" 'keep_unfeasible' '-u'
-	append_bool "$cfg" 'random_router_id' '-r'
-
-	append_parm "$cfg" 'multicast_address' '-m'
-	append_parm "$cfg" 'port' '-p'
-	append_parm "$cfg" 'state_file' '-S'
-	append_parm "$cfg" 'hello_interval' '-h'
-	append_parm "$cfg" 'wired_hello_interval' '-H'
-	append_parm "$cfg" 'diversity' '-z'
-	append_parm "$cfg" 'smoothing_half_time' '-M'
-	append_parm "$cfg" 'kernel_priority' '-k'
-	append_parm "$cfg" 'duplication_priority' '-A'
-	append_parm "$cfg" 'debug' '-d'
-	append_parm "$cfg" 'local_server' '-g'
-	append_parm "$cfg" 'export_table' '-t'
-	config_list_foreach "$cfg" 'import_table' append_switch '-T'
-	append_parm "$cfg" 'conf_file' '-c'
-	append_parm "$cfg" 'log_file' '-L'
-}
-
-start() {
-	mkdir -p /var/lib
-	config_load babeld
-	unset args
-	unset interfaces
-	config_foreach babel_config general
-	config_foreach babel_addif interface
-	config_foreach babel_filter filter
-	[ -z "$interfaces" ] && return 0
-	eval "/usr/sbin/babeld -D -I $pidfile $args $interfaces"
-}
-
-stop() {
-	[ -f "$pidfile" ] && kill $(cat $pidfile)
-  # avoid race-condition on restart: wait for
-  # babeld to die for real.
-  [ -f "$pidfile" ] && sleep 1
-  [ -f "$pidfile" ] && sleep 1
-  [ -f "$pidfile" ] && sleep 1
-  [ -f "$pidfile" ] && exit 42
-}
-
-status() {
-	[ -f "$pidfile" ] && kill -USR1 $(cat $pidfile)
-}
diff --git a/babels/patches/0001-Allow-routes-with-source-128-for-SAS-on-Linux.patch b/babels/patches/0001-Allow-routes-with-source-128-for-SAS-on-Linux.patch
deleted file mode 100644
index 7e9448c..0000000
--- a/babels/patches/0001-Allow-routes-with-source-128-for-SAS-on-Linux.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 3fdbb1f797ee9fe9260af92f5d7ea760684cd271 Mon Sep 17 00:00:00 2001
-From: Steven Barth <steven@midlink.org>
-Date: Tue, 18 Feb 2014 13:18:32 +0100
-Subject: [PATCH] Allow routes with source ::/128 for SAS on Linux
-
-Linux uses the source-address :: (unspecified) to lookup routes in the
-routing table for connections that are not bound to a specific source
-address (e.g. ping6 2001:db8::1). If all default routes are
-source-restricted a command like above will result in a "Permission
-denied" error and no packets are being sent. Adding a default route with
-source ::/128 avoids this issue.
-
-This patch excludes ::/128 from the "martian_prefix" check for source
-prefixes and thus allows such auxiliary routes to be distributed.
-
-Signed-off-by: Steven Barth <cyrus@openwrt.org>
----
- kernel_netlink.c | 4 ++--
- route.c          | 4 ++--
- util.c           | 4 ++--
- util.h           | 2 +-
- xroute.c         | 2 +-
- 5 files changed, 8 insertions(+), 8 deletions(-)
-
---- a/kernel_netlink.c
-+++ b/kernel_netlink.c
-@@ -1242,8 +1242,8 @@ filter_kernel_routes(struct nlmsghdr *nh
-     if(rc < 0)
-         return 0;
- 
--    if(martian_prefix(current_route->prefix, current_route->plen) ||
--       martian_prefix(current_route->src_prefix, current_route->src_plen))
-+    if(martian_prefix(current_route->prefix, current_route->plen, 0) ||
-+       martian_prefix(current_route->src_prefix, current_route->src_plen, 1))
-         return 0;
- 
-     /* Ignore default unreachable routes; no idea where they come from. */
-@@ -1944,7 +1944,7 @@ filter_kernel_rules(struct nlmsghdr *nh,
-     kdebugf("filter_rules: from %s prio %d table %d\n",
-             format_prefix(src, src_plen), priority, table);
- 
--    if(martian_prefix(src, src_plen) || !has_priority)
-+    if(martian_prefix(src, src_plen, 1) || !has_priority)
-         return 0;
- 
-     i = priority - src_table_prio;
---- a/route.c
-+++ b/route.c
-@@ -901,12 +901,12 @@ update_route(const unsigned char *id,
-     if(memcmp(id, myid, 8) == 0)
-         return NULL;
- 
--    if(martian_prefix(prefix, plen)) {
-+    if(martian_prefix(prefix, plen, 0)) {
-         fprintf(stderr, "Rejecting martian route to %s through %s.\n",
-                 format_prefix(prefix, plen), format_address(nexthop));
-         return NULL;
-     }
--    if(src_plen != 0 && martian_prefix(src_prefix, src_plen)) {
-+    if(src_plen != 0 && martian_prefix(src_prefix, src_plen, 1)) {
-         fprintf(stderr, "Rejecting martian route to %s from %s through %s.\n",
-                 format_prefix(prefix, plen),
-                 format_prefix(src_prefix, src_plen), format_eui64(id));
---- a/util.c
-+++ b/util.c
-@@ -437,13 +437,13 @@ wait_for_fd(int direction, int fd, int m
- }
- 
- int
--martian_prefix(const unsigned char *prefix, int plen)
-+martian_prefix(const unsigned char *prefix, int plen, int is_source)
- {
-     return
-         (plen >= 8 && prefix[0] == 0xFF) ||
-         (plen >= 10 && prefix[0] == 0xFE && (prefix[1] & 0xC0) == 0x80) ||
-         (plen >= 128 && memcmp(prefix, zeroes, 15) == 0 &&
--         (prefix[15] == 0 || prefix[15] == 1)) ||
-+         ((prefix[15] == 0 && !is_source) || prefix[15] == 1)) ||
-         (plen >= 96 && v4mapped(prefix) &&
-          ((plen >= 104 && (prefix[12] == 127 || prefix[12] == 0)) ||
-           (plen >= 100 && (prefix[12] & 0xE0) == 0xE0)));
---- a/util.h
-+++ b/util.h
-@@ -106,7 +106,7 @@ int parse_net(const char *net, unsigned
-               int *af_r);
- int parse_eui64(const char *eui, unsigned char *eui_r);
- int wait_for_fd(int direction, int fd, int msecs);
--int martian_prefix(const unsigned char *prefix, int plen) ATTRIBUTE ((pure));
-+int martian_prefix(const unsigned char *prefix, int plen, int is_source) ATTRIBUTE ((pure));
- int linklocal(const unsigned char *address) ATTRIBUTE ((pure));
- int v4mapped(const unsigned char *address) ATTRIBUTE ((pure));
- void v4tov6(unsigned char *dst, const unsigned char *src);
---- a/xroute.c
-+++ b/xroute.c
-@@ -266,7 +266,7 @@ check_xroutes(int send_updates)
-     /* Add any new routes */
- 
-     for(i = 0; i < numroutes; i++) {
--        if(martian_prefix(routes[i].prefix, routes[i].plen))
-+        if(martian_prefix(routes[i].prefix, routes[i].plen, 0))
-             continue;
-         metric = redistribute_filter(routes[i].prefix, routes[i].plen,
-                                      routes[i].src_prefix, routes[i].src_plen,

From c6da651c39e4225a5a5039a32c95379801ff7cbd Mon Sep 17 00:00:00 2001
From: Gabriel Kerneis <kerneis@google.com>
Date: Sat, 18 Apr 2015 06:53:05 +0200
Subject: [PATCH 072/368] Revert "babels: remove deprecated experimental
 package"

This reverts commit 23e20773d8b5c90dad99702e030ce86ccf3344f3.

Signed-off-by: Gabriel Kerneis <kerneis@google.com>
---
 babels/Makefile                               |  69 ++++++++
 babels/files/babeld.conf                      |  38 +++++
 babels/files/babeld.config                    |  72 ++++++++
 babels/files/babeld.init                      | 154 ++++++++++++++++++
 ...tes-with-source-128-for-SAS-on-Linux.patch | 103 ++++++++++++
 5 files changed, 436 insertions(+)
 create mode 100644 babels/Makefile
 create mode 100644 babels/files/babeld.conf
 create mode 100644 babels/files/babeld.config
 create mode 100755 babels/files/babeld.init
 create mode 100644 babels/patches/0001-Allow-routes-with-source-128-for-SAS-on-Linux.patch

diff --git a/babels/Makefile b/babels/Makefile
new file mode 100644
index 0000000..164ff16
--- /dev/null
+++ b/babels/Makefile
@@ -0,0 +1,69 @@
+#
+# Copyright (C) 2007-2009 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:=babels
+PKG_SOURCE_VERSION:=8950d3b2f9a4799f8435c7165998c638dd0a98a8
+PKG_VERSION:=2015-04-10-$(PKG_SOURCE_VERSION)
+PKG_RELEASE:=1
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/jech/babeld.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_LICENSE:=MIT
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/babels
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Routing and Redirection
+  TITLE:=A loop-free distance-vector routing protocol (source-specific)
+  URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/babel/
+  MAINTAINER:=Steven Barth <cyrus@openwrt.org>
+  DEPENDS:=+kmod-ipv6
+endef
+
+define Package/babels/description
+ Babel is a loop-avoiding distance-vector routing protocol roughly based
+ on DSDV and AODV, but with provisions for link cost estimation and
+ redistribution of routes from other routing protocols.
+ While it is optimised for wireless mesh networks, Babel will also work
+ efficiently on wired networks. It will generate between 1.2 and 2.4 times
+ the amount of routing traffic that RIPng would generate, while
+ never counting to infinity.
+ This is experimental source routing branch, and should be only used if you
+ know what you are doing.
+endef
+
+define Package/babels/conffiles
+/etc/babeld.conf
+/etc/config/babeld
+endef
+
+MAKE_FLAGS+= \
+	CFLAGS="$(TARGET_CFLAGS) -DIPV6_SUBTREES" \
+	LDLIBS="" \
+
+define Package/babels/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/babeld $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_CONF) ./files/babeld.conf $(1)/etc/
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/babeld.config $(1)/etc/config/babeld
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/babeld.init $(1)/etc/init.d/babeld
+endef
+
+define Build/Compile
+	echo "#define BABEL_VERSION \"$(PKG_SOURCE_SUBDIR)\"" > $(PKG_BUILD_DIR)/version.h
+	$(call Build/Compile/Default)
+endef
+
+$(eval $(call BuildPackage,babels))
diff --git a/babels/files/babeld.conf b/babels/files/babeld.conf
new file mode 100644
index 0000000..746139d
--- /dev/null
+++ b/babels/files/babeld.conf
@@ -0,0 +1,38 @@
+# babel config file
+#
+# This config file simply documents sample entries. 
+# "redistribute" means: redistribute routes from other routing protocols
+# into babel. "local" means addresses assigned to local interfaces.
+#
+# You do not need to edit this file: you can use /etc/config/babeld
+# instead (sections "interface" and "filter").  Both files can be used
+# simultaneously (the rules of this file are executed first).
+
+# the default rules are:
+#
+## redistribute local 
+## redistribute deny
+#
+# this says, redistribute local addresses but no other routes
+
+
+# redistribute IPv4 default route into babel 
+## redistribute local ip 0.0.0.0/0 le 0 metric 128
+
+# same but for IPv6
+## redistribute local ip ::/0 le 0 metric 128
+
+
+# don't redistribute all local addresses, only selected ones
+# after the first line, the "deny" rules kicks in. After the "deny"
+# no redistribute local rules are going to match
+## redistribute local ip 192.160.4.0/24 
+## redistribute local deny
+
+
+# Babel refuses to redistribute routes with a protocol number of "boot";
+# this is standard practice, and means that you cannot easily
+# redistribute the default route installed by dhcp.  It is however
+# possible to redistribute such route by explicitly specifying "proto 3"
+# on the redistribute line.
+## redistribute ip 0.0.0.0/0 le 0 proto 3 metric 128
diff --git a/babels/files/babeld.config b/babels/files/babeld.config
new file mode 100644
index 0000000..a4f00e6
--- /dev/null
+++ b/babels/files/babeld.config
@@ -0,0 +1,72 @@
+package babeld
+
+config general
+	# option 'multicast_address' 'ff02:0:0:0:0:0:1:6'
+	# option 'port' '6696'
+	# option 'state_file' '/var/lib/babel-state'
+	# option 'hello_interval' '4'
+	# option 'wired_hello_interval' '20'
+	# option 'diversity' '0,128'
+	# option 'smoothing_half_time' '4'
+	# option 'kernel_priority' '0'
+	# Do not use this option unless you know what you are doing, as it can
+	# cause persistent route flapping.
+	## option 'duplication_priority' '0'
+	# option 'carrier_sense' 'false'
+	# option 'assume_wireless' 'false'
+	# option 'no_split_horizon' 'false'
+	# option 'debug' '0'
+	# Listen for connections from a front-end, e.g. on port 33123.
+	## option 'local_server' '33123'
+	# option 'random_router_id' 'false'
+	# Keep unfeasible routes
+	## option 'keep_unfeasible' 'false'
+	# Use the given kernel routing table for routes inserted by babeld.
+	## option 'export_table' '0'
+	# Export routes from the given kernel routing tables.
+	## list 'import_table' '0'
+	## list 'import_table' '42'
+	# The configuration file is not necessary since you can do everything
+	# from this file.
+	# option 'conf_file' '/etc/babeld.conf'
+	# option 'log_file' '/var/log/babeld.log'
+
+# You can use aliases (like lan, wlan) or real names (like eth0.0).
+# If you use an alias, it must be already defined when babeld starts.
+# Otherwise, the name is taken literally and the interface can be
+# brought up later (useful for tunnels for instance).
+config interface wlan
+	# Remove this line to enable babeld on this interface
+	option 'ignore' 'true'
+	# option 'wired' 'auto'
+	# option 'link_quality' 'auto'
+	# option 'split_horizon' 'auto'
+	# The default is 96 for wired interfaces, and 256 for wireless ones
+	## option 'rxcost' '256'
+	# The default is specified with the -h and -H command-line flags.
+	## option 'hello_interval' '4'
+	# This can be set to a fairly large  value,  unless significant
+	# packet loss is expected.  The default is four times the hello
+	# interval.
+	## option 'update_interval' '16'
+
+config interface lan
+	option 'ignore' 'true'
+
+# A filter consists in a type ('in', 'out' or 'redistribute'), an action
+# ('allow', 'deny' or 'metric xxx') and a set of selectors ('ip', 'eq',
+# etc.).  See /etc/babeld.conf for more details.
+# Here is a sample filter wich redistributes the default route if its
+# protocol number is "boot", e.g. when it installed by dhcp.  It is
+# disabled by default.
+config filter
+	option 'ignore' 'true'
+	# Type
+	option 'type' 'redistribute'
+	# Selectors: ip, eq, le, ge, neigh, id, proto, local, if
+	option 'ip' '0.0.0.0/0' 
+	option 'le' '0'
+	option 'proto' '3'
+	# Action 
+	option 'action' 'metric 128'
+
diff --git a/babels/files/babeld.init b/babels/files/babeld.init
new file mode 100755
index 0000000..4af7eea
--- /dev/null
+++ b/babels/files/babeld.init
@@ -0,0 +1,154 @@
+#!/bin/sh /etc/rc.common
+
+START=70
+
+pidfile='/var/run/babeld.pid'
+EXTRA_COMMANDS="status"
+EXTRA_HELP="        status Dump Babel's table to the log file."
+
+listen_ifname() {
+	local ifname=$(uci_get_state network "$1" ifname "$1")
+	local switch="$2"
+	append args "$switch $ifname"
+	append interfaces "$ifname"
+}
+
+append_ifname() {
+	local section="$1"
+	local option="$2"
+	local switch="$3"
+	local _name
+	config_get _name "$section" "$option"
+	[ -z "$_name" ] && return 0
+	local ifname=$(uci_get_state network "$_name" ifname "$_name")
+	append args "$switch $ifname"
+}
+
+append_bool() {
+	local section="$1"
+	local option="$2"
+	local value="$3"
+	local _loctmp
+	config_get_bool _loctmp "$section" "$option" 0
+	[ "$_loctmp" -gt 0 ] && append args "$value"
+}
+
+append_switch() {
+	local value="$1"
+	local switch="$2"
+	append args "$switch $value"
+}
+
+append_parm() {
+	local section="$1"
+	local option="$2"
+	local switch="$3"
+	local _loctmp
+	config_get _loctmp "$section" "$option"
+	[ -z "$_loctmp" ] && return 0
+	append args "$switch $_loctmp"
+}
+
+babel_filter() {
+	local cfg="$1"
+	local _loctmp
+
+	local _ignored
+	config_get_bool _ignored "$cfg" 'ignore' 0
+	[ "$_ignored" -eq 1 ] && return 0
+	
+	append args "-C '"
+
+	append_parm "$cfg" 'type' ''
+
+	append_bool "$cfg" 'local' 'local'
+
+	append_parm "$cfg" 'ip' 'ip'
+	append_parm "$cfg" 'eq' 'eq'
+	append_parm "$cfg" 'le' 'le'
+	append_parm "$cfg" 'ge' 'ge'
+	append_parm "$cfg" 'src_ip' 'src-ip'
+	append_parm "$cfg" 'src_eq' 'src-eq'
+	append_parm "$cfg" 'src_le' 'src-le'
+	append_parm "$cfg" 'src_ge' 'src-ge'
+	append_parm "$cfg" 'neigh' 'neigh'
+	append_parm "$cfg" 'id' 'id'
+	append_parm "$cfg" 'proto' 'proto'
+
+	append_ifname "$cfg" 'if' 'if'
+
+	append_parm "$cfg" 'action' ''
+
+	append args ' ' "'"
+}
+
+babel_addif() {
+	local cfg="$1"
+
+	local _ignored
+	config_get_bool _ignored "$cfg" 'ignore' 0
+	[ "$_ignored" -eq 1 ] && return 0
+	
+	listen_ifname "$cfg" "-C 'interface"
+
+	append_parm "$cfg" 'wired' 'wired'
+	append_parm "$cfg" 'link_quality' 'link-quality'
+	append_parm "$cfg" 'split_horizon' 'split-horizon'
+	append_parm "$cfg" 'rxcost' 'rxcost'
+	append_parm "$cfg" 'hello_interval' 'hello-interval'
+	append_parm "$cfg" 'update_interval' 'update-interval'
+
+	append args ' ' "'"
+}
+
+babel_config() {
+	local cfg="$1"
+
+	append_bool "$cfg" 'carrier_sense' '-l'
+	append_bool "$cfg" 'assume_wireless' '-w'
+	append_bool "$cfg" 'no_split_horizon' '-s'
+	append_bool "$cfg" 'keep_unfeasible' '-u'
+	append_bool "$cfg" 'random_router_id' '-r'
+
+	append_parm "$cfg" 'multicast_address' '-m'
+	append_parm "$cfg" 'port' '-p'
+	append_parm "$cfg" 'state_file' '-S'
+	append_parm "$cfg" 'hello_interval' '-h'
+	append_parm "$cfg" 'wired_hello_interval' '-H'
+	append_parm "$cfg" 'diversity' '-z'
+	append_parm "$cfg" 'smoothing_half_time' '-M'
+	append_parm "$cfg" 'kernel_priority' '-k'
+	append_parm "$cfg" 'duplication_priority' '-A'
+	append_parm "$cfg" 'debug' '-d'
+	append_parm "$cfg" 'local_server' '-g'
+	append_parm "$cfg" 'export_table' '-t'
+	config_list_foreach "$cfg" 'import_table' append_switch '-T'
+	append_parm "$cfg" 'conf_file' '-c'
+	append_parm "$cfg" 'log_file' '-L'
+}
+
+start() {
+	mkdir -p /var/lib
+	config_load babeld
+	unset args
+	unset interfaces
+	config_foreach babel_config general
+	config_foreach babel_addif interface
+	config_foreach babel_filter filter
+	[ -z "$interfaces" ] && return 0
+	eval "/usr/sbin/babeld -D -I $pidfile $args $interfaces"
+}
+
+stop() {
+	[ -f "$pidfile" ] && kill $(cat $pidfile)
+  # avoid race-condition on restart: wait for
+  # babeld to die for real.
+  [ -f "$pidfile" ] && sleep 1
+  [ -f "$pidfile" ] && sleep 1
+  [ -f "$pidfile" ] && sleep 1
+  [ -f "$pidfile" ] && exit 42
+}
+
+status() {
+	[ -f "$pidfile" ] && kill -USR1 $(cat $pidfile)
+}
diff --git a/babels/patches/0001-Allow-routes-with-source-128-for-SAS-on-Linux.patch b/babels/patches/0001-Allow-routes-with-source-128-for-SAS-on-Linux.patch
new file mode 100644
index 0000000..7e9448c
--- /dev/null
+++ b/babels/patches/0001-Allow-routes-with-source-128-for-SAS-on-Linux.patch
@@ -0,0 +1,103 @@
+From 3fdbb1f797ee9fe9260af92f5d7ea760684cd271 Mon Sep 17 00:00:00 2001
+From: Steven Barth <steven@midlink.org>
+Date: Tue, 18 Feb 2014 13:18:32 +0100
+Subject: [PATCH] Allow routes with source ::/128 for SAS on Linux
+
+Linux uses the source-address :: (unspecified) to lookup routes in the
+routing table for connections that are not bound to a specific source
+address (e.g. ping6 2001:db8::1). If all default routes are
+source-restricted a command like above will result in a "Permission
+denied" error and no packets are being sent. Adding a default route with
+source ::/128 avoids this issue.
+
+This patch excludes ::/128 from the "martian_prefix" check for source
+prefixes and thus allows such auxiliary routes to be distributed.
+
+Signed-off-by: Steven Barth <cyrus@openwrt.org>
+---
+ kernel_netlink.c | 4 ++--
+ route.c          | 4 ++--
+ util.c           | 4 ++--
+ util.h           | 2 +-
+ xroute.c         | 2 +-
+ 5 files changed, 8 insertions(+), 8 deletions(-)
+
+--- a/kernel_netlink.c
++++ b/kernel_netlink.c
+@@ -1242,8 +1242,8 @@ filter_kernel_routes(struct nlmsghdr *nh
+     if(rc < 0)
+         return 0;
+ 
+-    if(martian_prefix(current_route->prefix, current_route->plen) ||
+-       martian_prefix(current_route->src_prefix, current_route->src_plen))
++    if(martian_prefix(current_route->prefix, current_route->plen, 0) ||
++       martian_prefix(current_route->src_prefix, current_route->src_plen, 1))
+         return 0;
+ 
+     /* Ignore default unreachable routes; no idea where they come from. */
+@@ -1944,7 +1944,7 @@ filter_kernel_rules(struct nlmsghdr *nh,
+     kdebugf("filter_rules: from %s prio %d table %d\n",
+             format_prefix(src, src_plen), priority, table);
+ 
+-    if(martian_prefix(src, src_plen) || !has_priority)
++    if(martian_prefix(src, src_plen, 1) || !has_priority)
+         return 0;
+ 
+     i = priority - src_table_prio;
+--- a/route.c
++++ b/route.c
+@@ -901,12 +901,12 @@ update_route(const unsigned char *id,
+     if(memcmp(id, myid, 8) == 0)
+         return NULL;
+ 
+-    if(martian_prefix(prefix, plen)) {
++    if(martian_prefix(prefix, plen, 0)) {
+         fprintf(stderr, "Rejecting martian route to %s through %s.\n",
+                 format_prefix(prefix, plen), format_address(nexthop));
+         return NULL;
+     }
+-    if(src_plen != 0 && martian_prefix(src_prefix, src_plen)) {
++    if(src_plen != 0 && martian_prefix(src_prefix, src_plen, 1)) {
+         fprintf(stderr, "Rejecting martian route to %s from %s through %s.\n",
+                 format_prefix(prefix, plen),
+                 format_prefix(src_prefix, src_plen), format_eui64(id));
+--- a/util.c
++++ b/util.c
+@@ -437,13 +437,13 @@ wait_for_fd(int direction, int fd, int m
+ }
+ 
+ int
+-martian_prefix(const unsigned char *prefix, int plen)
++martian_prefix(const unsigned char *prefix, int plen, int is_source)
+ {
+     return
+         (plen >= 8 && prefix[0] == 0xFF) ||
+         (plen >= 10 && prefix[0] == 0xFE && (prefix[1] & 0xC0) == 0x80) ||
+         (plen >= 128 && memcmp(prefix, zeroes, 15) == 0 &&
+-         (prefix[15] == 0 || prefix[15] == 1)) ||
++         ((prefix[15] == 0 && !is_source) || prefix[15] == 1)) ||
+         (plen >= 96 && v4mapped(prefix) &&
+          ((plen >= 104 && (prefix[12] == 127 || prefix[12] == 0)) ||
+           (plen >= 100 && (prefix[12] & 0xE0) == 0xE0)));
+--- a/util.h
++++ b/util.h
+@@ -106,7 +106,7 @@ int parse_net(const char *net, unsigned
+               int *af_r);
+ int parse_eui64(const char *eui, unsigned char *eui_r);
+ int wait_for_fd(int direction, int fd, int msecs);
+-int martian_prefix(const unsigned char *prefix, int plen) ATTRIBUTE ((pure));
++int martian_prefix(const unsigned char *prefix, int plen, int is_source) ATTRIBUTE ((pure));
+ int linklocal(const unsigned char *address) ATTRIBUTE ((pure));
+ int v4mapped(const unsigned char *address) ATTRIBUTE ((pure));
+ void v4tov6(unsigned char *dst, const unsigned char *src);
+--- a/xroute.c
++++ b/xroute.c
+@@ -266,7 +266,7 @@ check_xroutes(int send_updates)
+     /* Add any new routes */
+ 
+     for(i = 0; i < numroutes; i++) {
+-        if(martian_prefix(routes[i].prefix, routes[i].plen))
++        if(martian_prefix(routes[i].prefix, routes[i].plen, 0))
+             continue;
+         metric = redistribute_filter(routes[i].prefix, routes[i].plen,
+                                      routes[i].src_prefix, routes[i].src_plen,

From 89914e47de14d11aaffd5472a3b44c0130e1869f Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Mon, 20 Apr 2015 12:45:07 +0200
Subject: [PATCH 073/368] luci-app-cjdns: import package from
 SeattleMeshnet/meshbox

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 luci-app-cjdns/Makefile                       |  38 ++++++
 luci-app-cjdns/luasrc/controller/cjdns.lua    | 105 ++++++++++++++++
 .../luasrc/model/cbi/cjdns/cjdrouteconf.lua   |  32 +++++
 .../luasrc/model/cbi/cjdns/iptunnel.lua       |  46 +++++++
 .../luasrc/model/cbi/cjdns/overview.lua       |  10 ++
 .../luasrc/model/cbi/cjdns/peering.lua        |  73 +++++++++++
 .../luasrc/model/cbi/cjdns/settings.lua       |  63 ++++++++++
 .../luasrc/view/admin_status/index/cjdns.htm  |   1 +
 luci-app-cjdns/luasrc/view/cjdns/status.htm   | 116 ++++++++++++++++++
 luci-app-cjdns/luasrc/view/cjdns/value.htm    |  35 ++++++
 10 files changed, 519 insertions(+)
 create mode 100644 luci-app-cjdns/Makefile
 create mode 100644 luci-app-cjdns/luasrc/controller/cjdns.lua
 create mode 100644 luci-app-cjdns/luasrc/model/cbi/cjdns/cjdrouteconf.lua
 create mode 100644 luci-app-cjdns/luasrc/model/cbi/cjdns/iptunnel.lua
 create mode 100644 luci-app-cjdns/luasrc/model/cbi/cjdns/overview.lua
 create mode 100644 luci-app-cjdns/luasrc/model/cbi/cjdns/peering.lua
 create mode 100644 luci-app-cjdns/luasrc/model/cbi/cjdns/settings.lua
 create mode 100644 luci-app-cjdns/luasrc/view/admin_status/index/cjdns.htm
 create mode 100644 luci-app-cjdns/luasrc/view/cjdns/status.htm
 create mode 100644 luci-app-cjdns/luasrc/view/cjdns/value.htm

diff --git a/luci-app-cjdns/Makefile b/luci-app-cjdns/Makefile
new file mode 100644
index 0000000..34f18c9
--- /dev/null
+++ b/luci-app-cjdns/Makefile
@@ -0,0 +1,38 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=luci-app-cjdns
+PKG_VERSION:=1.3
+PKG_RELEASE:=4
+
+PKG_LICENSE:=GPL-3.0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/luci-app-cjdns
+	SECTION:=luci
+	CATEGORY:=LuCI
+	SUBMENU:=3. Applications
+	TITLE:=Encrypted near-zero-conf mesh routing protocol
+	URL:=https://github.com/hyperboria/cjdns
+	MAINTAINER:=Lars Gierth <larsg@systemli.org>
+	DEPENDS:=+cjdns +luci-base
+endef
+
+define Package/luci-app-cjdns/description
+	This package allows you to configure and inspect cjdns networking using LuCI.
+
+	Cjdns implements an encrypted IPv6 network using public-key cryptography
+	for address allocation and a distributed hash table for routing.
+	This provides near-zero-configuration networking, and prevents many
+	of the security and scalability issues that plague existing networks.
+endef
+
+define Build/Compile
+endef
+
+define Package/luci-app-cjdns/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua/luci
+	$(CP) ./luasrc/* $(1)/usr/lib/lua/luci
+endef
+
+$(eval $(call BuildPackage,luci-app-cjdns))
diff --git a/luci-app-cjdns/luasrc/controller/cjdns.lua b/luci-app-cjdns/luasrc/controller/cjdns.lua
new file mode 100644
index 0000000..63644cb
--- /dev/null
+++ b/luci-app-cjdns/luasrc/controller/cjdns.lua
@@ -0,0 +1,105 @@
+module("luci.controller.cjdns", package.seeall)
+
+cjdns  = require "cjdns/init"
+dkjson = require "dkjson"
+
+function index()
+	if not nixio.fs.access("/etc/config/cjdns") then
+		return
+	end
+
+	entry({"admin", "services", "cjdns"},
+		cbi("cjdns/overview"), _("cjdns")).dependent = true
+
+	entry({"admin", "services", "cjdns", "overview"},
+		cbi("cjdns/overview"), _("Overview"), 1).leaf = false
+
+	entry({"admin", "services", "cjdns", "peering"},
+		cbi("cjdns/peering"), _("Peers"), 2).leaf = false
+
+	entry({"admin", "services", "cjdns", "iptunnel"},
+		cbi("cjdns/iptunnel"), _("IP Tunnel"), 3).leaf = false
+
+	entry({"admin", "services", "cjdns", "settings"},
+		cbi("cjdns/settings"), _("Settings"), 4).leaf = false
+
+	entry({"admin", "services", "cjdns", "cjdrouteconf"},
+		cbi("cjdns/cjdrouteconf"), _("cjdroute.conf"), 5).leaf = false
+
+	entry({"admin", "services", "cjdns", "peers"}, call("act_peers")).leaf = true
+	entry({"admin", "services", "cjdns", "ping"}, call("act_ping")).leaf = true
+end
+
+function act_peers()
+	require("cjdns/uci")
+	admin = cjdns.uci.makeInterface()
+
+	local page = 0
+	local peers = {}
+
+	while page do
+		local response, err = admin:auth({
+			q = "InterfaceController_peerStats",
+			page = page
+		})
+
+		if err or response.error then
+			luci.http.status(502, "Bad Gateway")
+			luci.http.prepare_content("application/json")
+			luci.http.write_json({ err = err, response = response })
+			return
+		end
+
+		for i,peer in pairs(response.peers) do
+			peer.ipv6 = publictoip6(peer.publicKey)
+			if peer.user == nil then
+				peer.user = ''
+				uci.cursor():foreach("cjdns", "udp_peer", function(udp_peer)
+					if peer.publicKey == udp_peer.public_key then
+						peer.user = udp_peer.user
+					end
+				end)
+			end
+			peers[#peers + 1] = peer
+		end
+
+		if response.more then
+			page = page + 1
+		else
+			page = nil
+		end
+	end
+
+	luci.http.status(200, "OK")
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(peers)
+end
+
+function act_ping()
+	require("cjdns/uci")
+	admin = cjdns.uci.makeInterface()
+
+	local response, err = admin:auth({
+		q = "SwitchPinger_ping",
+		path = luci.http.formvalue("label"),
+		timeout = tonumber(luci.http.formvalue("timeout"))
+	})
+
+	if err or response.error then
+		luci.http.status(502, "Bad Gateway")
+		luci.http.prepare_content("application/json")
+		luci.http.write_json({ err = err, response = response })
+		return
+	end
+
+	luci.http.status(200, "OK")
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(response)
+end
+
+function publictoip6(publicKey)
+	local process = io.popen("/usr/bin/publictoip6 " .. publicKey, "r")
+	local ipv6    = process:read()
+	process:close()
+	return ipv6
+end
diff --git a/luci-app-cjdns/luasrc/model/cbi/cjdns/cjdrouteconf.lua b/luci-app-cjdns/luasrc/model/cbi/cjdns/cjdrouteconf.lua
new file mode 100644
index 0000000..00e9ae0
--- /dev/null
+++ b/luci-app-cjdns/luasrc/model/cbi/cjdns/cjdrouteconf.lua
@@ -0,0 +1,32 @@
+m = Map("cjdns", translate("cjdns"),
+  translate("Implements an encrypted IPv6 network using public-key \
+    cryptography for address allocation and a distributed hash table for \
+    routing. This provides near-zero-configuration networking, and prevents \
+    many of the security and scalability issues that plague existing \
+    networks."))
+
+dkjson = require("dkjson")
+cjdns = require("cjdns")
+require("cjdns/uci")
+
+local f = SimpleForm("cjdrouteconf", translate("Edit cjdroute.conf"),
+	translate("JSON interface to what's /etc/cjdroute.conf on other systems. \
+    Will be parsed and written to UCI by <code>cjdrouteconf set</code>."))
+
+local o = f:field(Value, "_cjdrouteconf")
+o.template = "cbi/tvalue"
+o.rows = 25
+
+function o.cfgvalue(self, section)
+	return dkjson.encode(cjdns.uci.get(), { indent = true })
+end
+
+function o.write(self, section, value)
+  local obj, pos, err = dkjson.decode(value, 1, nil)
+
+  if obj then
+    cjdns.uci.set(obj)
+  end
+end
+
+return f
diff --git a/luci-app-cjdns/luasrc/model/cbi/cjdns/iptunnel.lua b/luci-app-cjdns/luasrc/model/cbi/cjdns/iptunnel.lua
new file mode 100644
index 0000000..02b37dd
--- /dev/null
+++ b/luci-app-cjdns/luasrc/model/cbi/cjdns/iptunnel.lua
@@ -0,0 +1,46 @@
+uci = require "luci.model.uci"
+cursor = uci:cursor_state()
+
+m = Map("cjdns", translate("cjdns"),
+  translate("Implements an encrypted IPv6 network using public-key \
+    cryptography for address allocation and a distributed hash table for \
+    routing. This provides near-zero-configuration networking, and prevents \
+    many of the security and scalability issues that plague existing \
+    networks."))
+
+m.on_after_commit = function(self)
+  os.execute("/etc/init.d/cjdns restart")
+end
+
+-- Outgoing
+outgoing = m:section(TypedSection, "iptunnel_outgoing", translate("Outgoing IP Tunnel Connections"),
+  translate("Enter the public keys of the nodes that will provide Internet access."))
+outgoing.anonymous = true
+outgoing.addremove = true
+outgoing.template  = "cbi/tblsection"
+
+outgoing:option(Value, "public_key", translate("Public Key")).size = 55
+
+-- Allowed
+allowed = m:section(TypedSection, "iptunnel_allowed", translate("Allowed IP Tunnel Connections"),
+  translate("Enter the public key of the node you will provide Internet access to, along with the \
+             IPv4 and/or IPv6 address you will assign them."))
+allowed.anonymous = true
+allowed.addremove = true
+
+public_key = allowed:option(Value, "public_key", translate("Public Key"))
+public_key.template = "cjdns/value"
+public_key.size = 55
+
+ipv4 = allowed:option(Value, "ipv4", translate("IPv4"))
+ipv4.template = "cjdns/value"
+ipv4.datatype = 'ipaddr'
+ipv4.size = 55
+
+ipv6 = allowed:option(Value, "ipv6", translate("IPv6"),
+  translate("IPv6 addresses should be entered <em>without</em> brackets here, e.g. <code>2001:123:ab::10</code>."))
+ipv6.template = "cjdns/value"
+ipv6.datatype = 'ip6addr'
+ipv6.size = 55
+
+return m
diff --git a/luci-app-cjdns/luasrc/model/cbi/cjdns/overview.lua b/luci-app-cjdns/luasrc/model/cbi/cjdns/overview.lua
new file mode 100644
index 0000000..efa3a03
--- /dev/null
+++ b/luci-app-cjdns/luasrc/model/cbi/cjdns/overview.lua
@@ -0,0 +1,10 @@
+m = Map("cjdns", translate("cjdns"),
+  translate("Implements an encrypted IPv6 network using public-key \
+    cryptography for address allocation and a distributed hash table for \
+    routing. This provides near-zero-configuration networking, and prevents \
+    many of the security and scalability issues that plague existing \
+    networks."))
+
+m:section(SimpleSection).template  = "cjdns/status"
+
+return m
diff --git a/luci-app-cjdns/luasrc/model/cbi/cjdns/peering.lua b/luci-app-cjdns/luasrc/model/cbi/cjdns/peering.lua
new file mode 100644
index 0000000..2b1fc1b
--- /dev/null
+++ b/luci-app-cjdns/luasrc/model/cbi/cjdns/peering.lua
@@ -0,0 +1,73 @@
+uci = require "luci.model.uci"
+cursor = uci:cursor_state()
+
+cjdns = require("cjdns")
+require("cjdns/uci")
+
+m = Map("cjdns", translate("cjdns"),
+  translate("Implements an encrypted IPv6 network using public-key \
+    cryptography for address allocation and a distributed hash table for \
+    routing. This provides near-zero-configuration networking, and prevents \
+    many of the security and scalability issues that plague existing \
+    networks."))
+
+m.on_after_commit = function(self)
+  os.execute("/etc/init.d/cjdns restart")
+end
+
+-- Authorized Passwords
+passwords = m:section(TypedSection, "password", translate("Authorized Passwords"),
+  translate("Anyone offering one of the these passwords will be allowed to peer with you on the existing UDP and Ethernet interfaces."))
+passwords.anonymous = true
+passwords.addremove = true
+passwords.template  = "cbi/tblsection"
+
+passwords:option(Value, "user", translate("User/Name"),
+  translate("Must be unique.")
+).default = "user-" .. cjdns.uci.random_string(6)
+passwords:option(Value, "contact", translate("Contact"), translate("Optional, for out-of-band communication."))
+passwords:option(Value, "password", translate("Password"),
+  translate("Hand out to your peer, in accordance with the peering best practices of the network.")
+).default = cjdns.uci.random_string(32)
+
+-- UDP Peers
+udp_peers = m:section(TypedSection, "udp_peer", translate("Outgoing UDP Peers"),
+  translate("For peering via public IP networks, the peer handed you their Public Key and IP address/port along with a password. IPv6 addresses should be entered with square brackets, like so: <code>[2001::1]</code>."))
+udp_peers.anonymous = true
+udp_peers.addremove = true
+udp_peers.template  = "cbi/tblsection"
+udp_peers:option(Value, "user", translate("User/Name")).datatype = "string"
+
+udp_interface = udp_peers:option(Value, "interface", translate("UDP interface"))
+local index = 1
+for i,section in pairs(cursor:get_all("cjdns")) do
+  if section[".type"] == "udp_interface" then
+    udp_interface:value(index, section.address .. ":" .. section.port)
+  end
+end
+udp_interface.default = 1
+udp_peers:option(Value, "address", translate("IP address"))
+udp_peers:option(Value, "port", translate("Port")).datatype = "portrange"
+udp_peers:option(Value, "public_key", translate("Public key"))
+udp_peers:option(Value, "password", translate("Password"))
+
+-- Ethernet Peers
+eth_peers = m:section(TypedSection, "eth_peer", translate("Outgoing Ethernet Peers"),
+  translate("For peering via local Ethernet networks, the peer handed you their Public Key and MAC address along with a password."))
+eth_peers.anonymous = true
+eth_peers.addremove = true
+eth_peers.template  = "cbi/tblsection"
+
+eth_interface = eth_peers:option(Value, "interface", translate("Ethernet interface"))
+local index = 1
+for i,section in pairs(cursor:get_all("cjdns")) do
+  if section[".type"] == "eth_interface" then
+    eth_interface:value(index, section.bind)
+  end
+end
+eth_interface.default = 1
+eth_peers:option(Value, "address", translate("MAC address")).datatype = "macaddr"
+eth_peers:option(Value, "public_key", translate("Public key"))
+eth_peers:option(Value, "password", translate("Password"))
+
+return m
diff --git a/luci-app-cjdns/luasrc/model/cbi/cjdns/settings.lua b/luci-app-cjdns/luasrc/model/cbi/cjdns/settings.lua
new file mode 100644
index 0000000..bbe89df
--- /dev/null
+++ b/luci-app-cjdns/luasrc/model/cbi/cjdns/settings.lua
@@ -0,0 +1,63 @@
+m = Map("cjdns", translate("cjdns"),
+  translate("Implements an encrypted IPv6 network using public-key \
+    cryptography for address allocation and a distributed hash table for \
+    routing. This provides near-zero-configuration networking, and prevents \
+    many of the security and scalability issues that plague existing \
+    networks."))
+
+m.on_after_commit = function(self)
+  os.execute("/etc/init.d/cjdns restart")
+end
+
+s = m:section(NamedSection, "cjdns", nil, translate("Settings"))
+s.addremove = false
+
+-- Identity
+s:tab("identity", translate("Identity"))
+node6 = s:taboption("identity", Value, "ipv6", translate("IPv6 address"),
+      translate("This node's IPv6 address within the cjdns network."))
+node6.datatype = "ip6addr"
+pbkey = s:taboption("identity", Value, "public_key", translate("Public key"),
+      translate("Used for packet encryption and authentication."))
+pbkey.datatype = "string"
+prkey = s:taboption("identity", Value, "private_key", translate("Private key"),
+      translate("Keep this private. When compromised, generate a new keypair and IPv6."))
+prkey.datatype = "string"
+
+-- Admin Interface
+s:tab("admin", translate("Admin API"), translate("The Admin API can be used by other applications or services to configure and inspect cjdns' routing and peering.<br/><br/>Documentation: <a href=\"https://github.com/cjdelisle/cjdns/tree/master/admin#cjdns-admin-api\">admin/README.md</a>"))
+aip = s:taboption("admin", Value, "admin_address", translate("IP Address"),
+      translate("IPv6 addresses should be entered like so: <code>[2001::1]</code>."))
+apt = s:taboption("admin", Value, "admin_port", translate("Port"))
+apt.datatype = "port"
+apw = s:taboption("admin", Value, "admin_password", translate("Password"))
+apw.datatype = "string"
+
+-- UDP Interfaces
+udp_interfaces = m:section(TypedSection, "udp_interface", translate("UDP Interfaces"),
+  translate("These interfaces allow peering via public IP networks, such as the Internet, or many community-operated wireless networks. IPv6 addresses should be entered with square brackets, like so: <code>[2001::1]</code>."))
+udp_interfaces.anonymous = true
+udp_interfaces.addremove = true
+udp_interfaces.template = "cbi/tblsection"
+
+udp_address = udp_interfaces:option(Value, "address", translate("IP Address"))
+udp_address.placeholder = "0.0.0.0"
+udp_interfaces:option(Value, "port", translate("Port")).datatype = "portrange"
+
+-- Ethernet Interfaces
+eth_interfaces = m:section(TypedSection, "eth_interface", translate("Ethernet Interfaces"),
+  translate("These interfaces allow peering via local Ethernet networks, such as home or office networks, or phone tethering. If an interface name is set to \"all\" each available device will be used."))
+eth_interfaces.anonymous = true
+eth_interfaces.addremove = true
+eth_interfaces.template = "cbi/tblsection"
+
+eth_bind = eth_interfaces:option(Value, "bind", translate("Network Interface"))
+eth_bind.placeholder = "br-lan"
+eth_beacon = eth_interfaces:option(Value, "beacon", translate("Beacon Mode"))
+eth_beacon:value(0, translate("0 -- Disabled"))
+eth_beacon:value(1, translate("1 -- Accept beacons"))
+eth_beacon:value(2, translate("2 -- Accept and send beacons"))
+eth_beacon.default = 2
+eth_beacon.datatype = "integer(range(0,2))"
+
+return m
diff --git a/luci-app-cjdns/luasrc/view/admin_status/index/cjdns.htm b/luci-app-cjdns/luasrc/view/admin_status/index/cjdns.htm
new file mode 100644
index 0000000..58c3843
--- /dev/null
+++ b/luci-app-cjdns/luasrc/view/admin_status/index/cjdns.htm
@@ -0,0 +1 @@
+<%+cjdns/status%>
diff --git a/luci-app-cjdns/luasrc/view/cjdns/status.htm b/luci-app-cjdns/luasrc/view/cjdns/status.htm
new file mode 100644
index 0000000..9d43e85
--- /dev/null
+++ b/luci-app-cjdns/luasrc/view/cjdns/status.htm
@@ -0,0 +1,116 @@
+<script type="text/javascript">//<![CDATA[
+
+	var peersURI = '<%=luci.dispatcher.build_url("admin", "services", "cjdns", "peers")%>';
+	var updatePeers = function(x, peers) {
+		var table = document.getElementById('cjdns-peerings');
+		while (table.rows.length > 1) {
+			table.deleteRow(1);
+		}
+
+		if ((peers) && ((peers.err) || (typeof peers.length === 'undefined'))) {
+			var errpeer = (peers.err)
+						? 'Socket Error: unable to connect to Admin API'
+						: 'No active peers';
+			var row = table.insertRow(-1);
+			row.className = 'cbi-section-table-row';
+			var cell = row.insertCell(-1);
+			cell.colSpan = 7;
+			cell.textContent = errpeer;
+			return;
+		};
+
+		peers.forEach(function(peer, i) {
+			if (peer.user == null) {
+				var user = '';
+			} else if (peer.user == 'Local Peers') {
+				var user = 'beacon';
+			} else {
+				var user = peer.user;
+			}
+
+			if (peer.isIncoming === 0) {
+				var interface = 'outgoing';
+			} else {
+				var interface = 'incoming';
+			}
+
+			var status = interface + ', ' + peer.state.toLowerCase();
+
+			if (peer.version === 0) {
+				var version = '-';
+			} else {
+				var version = 'v' + peer.version;
+			}
+
+			var rxtx = lbbytes(peer.bytesIn) + ' / ' + lbbytes(peer.bytesOut);
+
+			var row = table.insertRow(-1);
+			row.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1);
+			row.insertCell(-1).textContent = user;
+			row.insertCell(-1).textContent = peer.ipv6;
+			row.insertCell(-1).textContent = status;
+			row.insertCell(-1).textContent = version;
+			row.insertCell(-1).textContent = rxtx;
+			var latencyCell = row.insertCell(-1);
+			latencyCell.textContent = 'waiting';
+
+			var pingURI = '<%=luci.dispatcher.build_url("admin", "services", "cjdns", "ping")%>';
+			var timeout = 2000;
+			XHR.get(pingURI, { label: peer.switchLabel, timeout: timeout }, function(x, pong) {
+				var pongrsp = ((pong.err == "ai:recv > timeout") || (pong == "undefined") || (pong.ms >= timeout))
+					? '> ' + timeout + ' ms'
+					: pong.ms + ' ms';
+				latencyCell.textContent = pongrsp;
+			})
+		});
+
+	};
+
+	XHR.get(peersURI, null, updatePeers);
+	XHR.poll(5, peersURI, null, updatePeers);
+
+//]]></script>
+
+<script type="text/javascript">
+<%# Author: [GitHub/75lb] -%>
+//<![CDATA[
+function lbbytes (bytes){
+
+	var kilobyte = 1024,
+	    megabyte = kilobyte * 1024,
+	    gigabyte = megabyte * 1024,
+	    terabyte = gigabyte * 1024;
+
+	if ((bytes >= 0) && (bytes < kilobyte)) {
+		return bytes + " B";
+	} else if ((bytes >= kilobyte) && (bytes < megabyte)) {
+		return (bytes / kilobyte).toFixed(2) + " KB";
+	} else if ((bytes >= megabyte) && (bytes < gigabyte)) {
+		return (bytes / megabyte).toFixed(2) + " MB";
+	} else if ((bytes >= gigabyte) && (bytes < terabyte)) {
+		return (bytes / gigabyte).toFixed(2) + " GB";
+	} else if (bytes >= terabyte) {
+		return (bytes / terabyte).toFixed(2) + " TB";
+	} else {
+		return bytes + " B";
+	}
+};
+//]]>
+</script>
+
+<fieldset class="cbi-section">
+	<legend>Active cjdns peers</legend>
+	<table class="cbi-section-table" id="cjdns-peerings">
+		<tr class="cbi-section-table-titles">
+			<th class="cbi-section-table-cell">User/Name</th>
+			<th class="cbi-section-table-cell">IPv6</th>
+			<th class="cbi-section-table-cell">Status</th>
+			<th class="cbi-section-table-cell">Version</th>
+			<th class="cbi-section-table-cell">Rx / Tx</th>
+			<th class="cbi-section-table-cell">Latency</th>
+		</tr>
+		<tr class="cbi-section-table-row">
+			<td colspan="7">Querying Admin API</td>
+		</tr>
+	</table>
+</fieldset>
diff --git a/luci-app-cjdns/luasrc/view/cjdns/value.htm b/luci-app-cjdns/luasrc/view/cjdns/value.htm
new file mode 100644
index 0000000..d1e54bb
--- /dev/null
+++ b/luci-app-cjdns/luasrc/view/cjdns/value.htm
@@ -0,0 +1,35 @@
+<%+cbi/valueheader%>
+	<input type="<%=self.password and 'password" class="cbi-input-password' or 'text" class="cbi-input-text' %>" onchange="cbi_d_update(this.id)"<%=
+		attr("name", cbid) .. attr("id", cbid) .. attr("value", self:cfgvalue(section) or self.default) ..
+		ifattr(self.size, "size") .. ifattr(self.placeholder, "placeholder")
+	%> style="width: auto" />
+	<% if self.password then %><img src="<%=resource%>/cbi/reload.gif" style="vertical-align:middle" title="<%:Reveal/hide password%>" onclick="var e = document.getElementById('<%=cbid%>'); e.type = (e.type=='password') ? 'text' : 'password';" /><% end %>
+	<% if #self.keylist > 0 or self.datatype then -%>
+	<script type="text/javascript">//<![CDATA[
+		<% if #self.keylist > 0 then -%>
+		cbi_combobox_init('<%=cbid%>', {
+		<%-
+			for i, k in ipairs(self.keylist) do
+		-%>
+			<%-=string.format("%q", k) .. ":" .. string.format("%q", self.vallist[i])-%>
+			<%-if i<#self.keylist then-%>,<%-end-%>
+		<%-
+			end
+		-%>
+		}, '<%- if not self.rmempty and not self.optional then -%>
+			<%-: -- Please choose -- -%>
+			<%- elseif self.placeholder then -%>
+			<%-= pcdata(self.placeholder) -%>
+		<%- end -%>', '
+		<%- if self.combobox_manual then -%>
+			<%-=self.combobox_manual-%>
+		<%- else -%>
+			<%-: -- custom -- -%>
+		<%- end -%>');
+		<%- end %>
+		<% if self.datatype then -%>
+		cbi_validate_field('<%=cbid%>', <%=tostring((self.optional or self.rmempty) == true)%>, '<%=self.datatype:gsub("'", "\\'")%>');
+		<%- end %>
+	//]]></script>
+	<% end -%>
+<%+cbi/valuefooter%>

From 94c5d19efaa9269f184619a54e616e663c3b20bc Mon Sep 17 00:00:00 2001
From: Hans Dedecker <hans.dedecker@technicolor.com>
Date: Mon, 20 Apr 2015 18:26:20 +0200
Subject: [PATCH 074/368] nat46: Refuse link local address as implicit source
 in 464xlat

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
---
 nat46/Makefile         |  2 +-
 nat46/src/464xlatcfg.c | 40 ++++++++++++++++++++++++++++++----------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/nat46/Makefile b/nat46/Makefile
index 4cbc494..3fa8b32 100644
--- a/nat46/Makefile
+++ b/nat46/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=nat46
-PKG_VERSION:=3
+PKG_VERSION:=4
 PKG_RELEASE:=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
diff --git a/nat46/src/464xlatcfg.c b/nat46/src/464xlatcfg.c
index 1d9466e..f184616 100644
--- a/nat46/src/464xlatcfg.c
+++ b/nat46/src/464xlatcfg.c
@@ -71,19 +71,39 @@ int main(int argc, const char *argv[])
 		freeaddrinfo(res);
 	}
 		
-	struct sockaddr_in6 saddr = {.sin6_family = AF_INET6, .sin6_addr = {{{0x20, 0x01, 0x0d, 0xb8}}}};
-	socklen_t saddrlen = sizeof(saddr);
-	int sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
-	struct icmp6_filter filt;
-	ICMP6_FILTER_SETBLOCKALL(&filt);
-	setsockopt(sock, IPPROTO_ICMPV6, ICMP6_FILTER, &filt, sizeof(filt));
-	setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, argv[2], strlen(argv[2]));
-	if (connect(sock, (struct sockaddr*)&saddr, sizeof(saddr)) ||
-			getsockname(sock, (struct sockaddr*)&saddr, &saddrlen))
-		return 3;
+	int i = 0;
+	int sock;
+	struct sockaddr_in6 saddr;
+
+	do {
+		socklen_t saddrlen = sizeof(saddr);
+		struct icmp6_filter filt;
+
+		sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
+		ICMP6_FILTER_SETBLOCKALL(&filt);
+		setsockopt(sock, IPPROTO_ICMPV6, ICMP6_FILTER, &filt, sizeof(filt));
+		setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, argv[2], strlen(argv[2]));
+		memset(&saddr, 0, sizeof(saddr));
+		saddr.sin6_family = AF_INET6;
+		saddr.sin6_addr.s6_addr32[0] = htonl(0x2001);
+		saddr.sin6_addr.s6_addr32[1] = htonl(0xdb8);
+		if (connect(sock, (struct sockaddr*)&saddr, sizeof(saddr)) ||
+				getsockname(sock, (struct sockaddr*)&saddr, &saddrlen))
+			return 3;
+
+		if (!IN6_IS_ADDR_LINKLOCAL(&saddr.sin6_addr) || argv[5])
+			break;
+
+		close(sock);
+		sleep(3);
+		i++;
+	} while (i < 3);
 	
 	struct ipv6_mreq mreq = {saddr.sin6_addr, if_nametoindex(argv[2])};
 	if (!argv[5]) {
+		if (IN6_IS_ADDR_LINKLOCAL(&mreq.ipv6mr_multiaddr))
+			return 5;
+
 		srandom(mreq.ipv6mr_multiaddr.s6_addr32[0] ^ mreq.ipv6mr_multiaddr.s6_addr32[1] ^
 				mreq.ipv6mr_multiaddr.s6_addr32[2] ^ mreq.ipv6mr_multiaddr.s6_addr32[3]);
 		mreq.ipv6mr_multiaddr.s6_addr32[2] = random();

From b46e7f995f98cd8a669bbb08797ee5d7b9802fdb Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Tue, 21 Apr 2015 10:27:48 +0200
Subject: [PATCH 075/368] babels: bump and enable subtrees by default

Signed-off-by: Steven Barth <steven@midlink.org>
---
 babels/Makefile                                       |  4 ++--
 ...llow-routes-with-source-128-for-SAS-on-Linux.patch |  8 ++++----
 babels/patches/0002-ipv6-subtrees-default-on.patch    | 11 +++++++++++
 3 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 babels/patches/0002-ipv6-subtrees-default-on.patch

diff --git a/babels/Makefile b/babels/Makefile
index 164ff16..57b723d 100644
--- a/babels/Makefile
+++ b/babels/Makefile
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=babels
-PKG_SOURCE_VERSION:=8950d3b2f9a4799f8435c7165998c638dd0a98a8
-PKG_VERSION:=2015-04-10-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=1ba29b3e069908d41fd6e263d0d09cd5a551a644
+PKG_VERSION:=2015-04-14-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/jech/babeld.git
diff --git a/babels/patches/0001-Allow-routes-with-source-128-for-SAS-on-Linux.patch b/babels/patches/0001-Allow-routes-with-source-128-for-SAS-on-Linux.patch
index 7e9448c..ffcb987 100644
--- a/babels/patches/0001-Allow-routes-with-source-128-for-SAS-on-Linux.patch
+++ b/babels/patches/0001-Allow-routes-with-source-128-for-SAS-on-Linux.patch
@@ -24,7 +24,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
 
 --- a/kernel_netlink.c
 +++ b/kernel_netlink.c
-@@ -1242,8 +1242,8 @@ filter_kernel_routes(struct nlmsghdr *nh
+@@ -1243,8 +1243,8 @@ filter_kernel_routes(struct nlmsghdr *nh
      if(rc < 0)
          return 0;
  
@@ -35,7 +35,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
          return 0;
  
      /* Ignore default unreachable routes; no idea where they come from. */
-@@ -1944,7 +1944,7 @@ filter_kernel_rules(struct nlmsghdr *nh,
+@@ -1946,7 +1946,7 @@ filter_kernel_rules(struct nlmsghdr *nh,
      kdebugf("filter_rules: from %s prio %d table %d\n",
              format_prefix(src, src_plen), priority, table);
  
@@ -46,7 +46,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
      i = priority - src_table_prio;
 --- a/route.c
 +++ b/route.c
-@@ -901,12 +901,12 @@ update_route(const unsigned char *id,
+@@ -809,12 +809,12 @@ update_route(const unsigned char *id,
      if(memcmp(id, myid, 8) == 0)
          return NULL;
  
@@ -92,7 +92,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  void v4tov6(unsigned char *dst, const unsigned char *src);
 --- a/xroute.c
 +++ b/xroute.c
-@@ -266,7 +266,7 @@ check_xroutes(int send_updates)
+@@ -264,7 +264,7 @@ check_xroutes(int send_updates)
      /* Add any new routes */
  
      for(i = 0; i < numroutes; i++) {
diff --git a/babels/patches/0002-ipv6-subtrees-default-on.patch b/babels/patches/0002-ipv6-subtrees-default-on.patch
new file mode 100644
index 0000000..0cad972
--- /dev/null
+++ b/babels/patches/0002-ipv6-subtrees-default-on.patch
@@ -0,0 +1,11 @@
+--- a/babeld.c
++++ b/babeld.c
+@@ -60,7 +60,7 @@ int debug = 0;
+ 
+ int link_detect = 0;
+ int all_wireless = 0;
+-int has_ipv6_subtrees = 0;
++int has_ipv6_subtrees = 1;
+ int default_wireless_hello_interval = -1;
+ int default_wired_hello_interval = -1;
+ int resend_delay = -1;

From c5f795cc38cd79e688bba70fe1fad9b460c4bca7 Mon Sep 17 00:00:00 2001
From: Gabriel Kerneis <kerneis@google.com>
Date: Mon, 20 Apr 2015 10:47:49 +0200
Subject: [PATCH 076/368] babeld: tweak configuration for source-specific
 features

- Enable ipv6-subtrees by default.
- Add UCI options to configure source-specific filters.

Signed-off-by: Gabriel Kerneis <kerneis@google.com>
---
 babeld/Makefile            | 2 +-
 babeld/files/babeld.config | 8 ++++++--
 babeld/files/babeld.init   | 4 ++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/babeld/Makefile b/babeld/Makefile
index 1607b04..ba8d14d 100644
--- a/babeld/Makefile
+++ b/babeld/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=babeld
 PKG_VERSION:=1.6.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/files/
diff --git a/babeld/files/babeld.config b/babeld/files/babeld.config
index 1536596..fa22fd6 100644
--- a/babeld/files/babeld.config
+++ b/babeld/files/babeld.config
@@ -13,6 +13,9 @@ config general
 	# option 'debug' '1'
 	# option 'local_port' '33123'
 	# option 'log_file' '/var/log/babeld.log'
+	## Enable ipv6-subtrees by default since OpenWrt should ship with a
+	## recent enough kernel for it to work.
+	option 'ipv6_subtrees' 'true'
 	## This seems somewhat buggy on BB.  If you need only one
 	## import-table statement, "option import_table 42" should work.
 	# list 'import_table' '42'
@@ -54,11 +57,12 @@ config filter
 	option 'ignore'	'true'
 	# Type
 	option 'type'	'redistribute'
-	# Selectors: ip, eq, le, ge, neigh, id, proto, local, if
+	# Selectors: ip, eq, le, ge, src_ip, src_eq, src_le, src_ge, neigh, id,
+	# proto, local, if.
 	option 'ip'	'0.0.0.0/0'
 	option 'eq'	'0'
 	option 'proto'	'3'
-	# Action 
+	# Action (one of: allow, deny, metric XXX, src-prefix XXX).
 	option 'action'	'metric 128'
 
 # Notice that the 'local' selector is a boolean.
diff --git a/babeld/files/babeld.init b/babeld/files/babeld.init
index 164d967..ae1e678 100755
--- a/babeld/files/babeld.init
+++ b/babeld/files/babeld.init
@@ -127,6 +127,10 @@ babel_filter() {
 	append_parm "$cfg" 'eq' 'eq'
 	append_parm "$cfg" 'le' 'le'
 	append_parm "$cfg" 'ge' 'ge'
+	append_parm "$cfg" 'src_ip' 'src-ip'
+	append_parm "$cfg" 'src_eq' 'src-eq'
+	append_parm "$cfg" 'src_le' 'src-le'
+	append_parm "$cfg" 'src_ge' 'src-ge'
 	append_parm "$cfg" 'neigh' 'neigh'
 	append_parm "$cfg" 'id' 'id'
 	append_parm "$cfg" 'proto' 'proto'

From f5eb74fa4d1d16336087bd9578420a17848f442b Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Tue, 21 Apr 2015 13:18:00 +0200
Subject: [PATCH 077/368] cjdns: support libc other than uClibc

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 cjdns/Makefile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/cjdns/Makefile b/cjdns/Makefile
index 3253532..9744d7b 100644
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -36,8 +36,14 @@ endef
 define Build/Configure
 endef
 
+PKG_DO_VARS:=
+
 ifneq ($(CONFIG_KERNEL_SECCOMP_FILTER),y)
-PKG_DO_VARS:=Seccomp_NO=1
+PKG_DO_VARS+= Seccomp_NO=1
+endif
+
+ifneq ($(CONFIG_USE_UCLIBC),)
+PKG_DO_VARS+= UCLIBC=1
 endif
 
 define Build/Compile
@@ -47,7 +53,6 @@ define Build/Compile
 	LDFLAGS="$(TARGET_LDFLAGS)" \
 	SYSTEM="linux" \
 	TARGET_ARCH="$(CONFIG_ARCH)" \
-	UCLIBC=1 \
 	SSP_SUPPORT="$(CONFIG_SSP_SUPPORT)" \
 	$(PKG_DO_VARS) \
 	$(PKG_BUILD_DIR)/do

From 2a6a5d6084258dc4d1317bd9e22f5b7fe395b94d Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Sat, 25 Apr 2015 04:00:27 +0200
Subject: [PATCH 078/368] cjdns: parse lan ifname more gracefully

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 cjdns/files/cjdns.defaults | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cjdns/files/cjdns.defaults b/cjdns/files/cjdns.defaults
index fd48269..f6ca772 100644
--- a/cjdns/files/cjdns.defaults
+++ b/cjdns/files/cjdns.defaults
@@ -23,7 +23,7 @@ EOF
   fi
 
   # enable auto-peering on ethernet
-  uci show network.lan | grep type=bridge >/dev/null 2>&1
+  uci show network.lan | grep bridge >/dev/null 2>&1
   if [ $? -eq 0 ]; then
     # most routers will set up an ethernet bridge for the lan
     ifname="br-lan"

From aedfe045dab2cf01f9399635d099ea4e91f92520 Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Thu, 23 Apr 2015 04:33:13 +0200
Subject: [PATCH 079/368] cjdns: update source version and bump release

Use hyperboria/cjdns source and squash changes from meshbox:
422062d cjdns: update source version
17fedb6 cjdns: bump release
bc113ec cjdns: remove musl patch

This includes fixes to build on aarch64 and mips64 targets.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 cjdns/Makefile                         |  6 +++---
 cjdns/patches/010-fix-musl-build.patch | 29 --------------------------
 2 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 cjdns/patches/010-fix-musl-build.patch

diff --git a/cjdns/Makefile b/cjdns/Makefile
index 9744d7b..ca9d704 100644
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cjdns
 PKG_VERSION:=0.16
-PKG_RELEASE:=9
+PKG_RELEASE:=10
 
-PKG_SOURCE_URL:=https://github.com/cjdelisle/cjdns.git
+PKG_SOURCE_URL:=https://github.com/hyperboria/cjdns.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2138a1f6a94fc009958cde7b002c077a1eee929a
+PKG_SOURCE_VERSION:=55803286b9de8a935dbc86111e312c747ef78318
 PKG_LICENSE:=GPL-3.0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
diff --git a/cjdns/patches/010-fix-musl-build.patch b/cjdns/patches/010-fix-musl-build.patch
deleted file mode 100644
index aa5648d..0000000
--- a/cjdns/patches/010-fix-musl-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: cjdns-649e26c7d61ccc66c20e87e1e3d381f9ef0cfcb0/crypto/random/seed/LinuxRandomUuidSysctlRandomSeed.c
-===================================================================
---- cjdns-649e26c7d61ccc66c20e87e1e3d381f9ef0cfcb0.orig/crypto/random/seed/LinuxRandomUuidSysctlRandomSeed.c
-+++ cjdns-649e26c7d61ccc66c20e87e1e3d381f9ef0cfcb0/crypto/random/seed/LinuxRandomUuidSysctlRandomSeed.c
-@@ -18,6 +18,8 @@
- #include "util/Hex.h"
- 
- #include <unistd.h>
-+
-+#ifdef __GLIBC__
- #include <sys/sysctl.h>
- 
- static int getUUID(uint64_t output[2])
-@@ -42,6 +44,15 @@ static int get(struct RandomSeed* random
-     return 0;
- }
- 
-+#else
-+
-+static int get(struct RandomSeed* randomSeed, uint64_t output[8])
-+{
-+    return -1;
-+}
-+
-+#endif
-+
- struct RandomSeed* LinuxRandomUuidSysctlRandomSeed_new(struct Allocator* alloc)
- {
-     return Allocator_clone(alloc, (&(struct RandomSeed) {

From 1c40d0e54d060d21876f2264cfda4314d3711ef4 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Thu, 30 Apr 2015 08:24:02 +0200
Subject: [PATCH 080/368] hnetd: depend on ip

Signed-off-by: Steven Barth <steven@midlink.org>
---
 hnetd/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hnetd/Makefile b/hnetd/Makefile
index c497f61..0e6c9c4 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -37,7 +37,7 @@ define Package/hnetd/Default
   CATEGORY:=Network
   TITLE:=HNCP Homenet daemon - $(2)
   URL:=https://github.com/sbyx/hnetd
-  DEPENDS:=+odhcpd +odhcp6c +netifd $(3)
+  DEPENDS:=+odhcpd +odhcp6c +netifd +ip $(3)
   DEPENDS+=+@IPV6
   VARIANT:=$1
 endef

From 25d637576d44a5c1ab01b7895e92898d9cf1e8ca Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Thu, 30 Apr 2015 19:19:10 +0200
Subject: [PATCH 081/368] cjdns: uci-defaults: fix shell syntax error

uci-defaults script complained about
sh: missing ]
fix this by adding the missing whitespace which caused the error.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 cjdns/files/cjdns.defaults | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cjdns/files/cjdns.defaults b/cjdns/files/cjdns.defaults
index f6ca772..0624daf 100644
--- a/cjdns/files/cjdns.defaults
+++ b/cjdns/files/cjdns.defaults
@@ -18,7 +18,7 @@ EOF
 
   # make sure config is present (might fail for any reason)
   uci get cjdns.cjdns.ipv6 >/dev/null 2>&1
-  if [ $? -ne 0]; then
+  if [ $? -ne 0 ]; then
     exit 1
   fi
 

From e26942118bced52ead0ce753f3c9d931436110b0 Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Thu, 30 Apr 2015 19:26:47 +0200
Subject: [PATCH 082/368] cjdns: uci-defaults: work around missing lan
 interface

The current uci-defaults scripts assumes than a network interface named
'lan' always exists. Check if this is true before adding ETHInterface
section.
This is a temporary work-around until cjdrouteconf gets the Linux
interface from netifd via ubus...

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 cjdns/files/cjdns.defaults | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/cjdns/files/cjdns.defaults b/cjdns/files/cjdns.defaults
index 0624daf..f2baf6d 100644
--- a/cjdns/files/cjdns.defaults
+++ b/cjdns/files/cjdns.defaults
@@ -22,22 +22,24 @@ EOF
     exit 1
   fi
 
-  # enable auto-peering on ethernet
-  uci show network.lan | grep bridge >/dev/null 2>&1
+  # enable auto-peering on ethernet interface lan, if existing
+  uci get network.lan | grep interface >/dev/null 2>&1
   if [ $? -eq 0 ]; then
-    # most routers will set up an ethernet bridge for the lan
-    ifname="br-lan"
-  else
-    # docker containers don't have permission to create bridges by default,
-    # so we bind to the underlying interface instead (likely eth0)
-    ifname=`uci get network.lan.ifname`
-  fi
-  uci -q batch <<-EOF >/dev/null
-    add cjdns eth_interface
-    set cjdns.@eth_interface[-1].beacon=2
-    set cjdns.@eth_interface[-1].bind=$ifname
+    uci get network.lan.type | grep bridge >/dev/null 2>&1
+    if [ $? -eq 0 ]; then
+      # most routers will set up an ethernet bridge for the lan
+      ifname="br-lan"
+    else
+      # docker containers don't have permission to create bridges by default,
+      # so we bind to the underlying interface instead (likely eth0)
+      ifname=`uci get network.lan.ifname`
+    fi
+    uci -q batch <<-EOF >/dev/null
+      add cjdns eth_interface
+      set cjdns.@eth_interface[-1].beacon=2
+      set cjdns.@eth_interface[-1].bind=$ifname
 EOF
-
+  fi
   # set the tun interface name
   uci set cjdns.cjdns.tun_device=tuncjdns
 

From 1520babe9d5b2f8abed08245202cf7c4f3c2f0da Mon Sep 17 00:00:00 2001
From: Jernej Kos <jernej@kos.mx>
Date: Sat, 2 May 2015 19:33:57 +0200
Subject: [PATCH 083/368] babeld: Added missing $IPKG_INSTROOT.

Signed-off-by: Jernej Kos <jernej@kos.mx>
---
 babeld/files/babeld.init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babeld/files/babeld.init b/babeld/files/babeld.init
index ae1e678..585fc76 100755
--- a/babeld/files/babeld.init
+++ b/babeld/files/babeld.init
@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-. /lib/functions/network.sh
+. $IPKG_INSTROOT/lib/functions/network.sh
 
 START=70
 

From c63ccc4fa2fc7f552175101a5242ffe59a88b2ac Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Sun, 3 May 2015 21:22:07 +0200
Subject: [PATCH 084/368] cjdns: update source, bump release

Signed-off-by: Lars Gierth <larsg@systemli.org>
---
 cjdns/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cjdns/Makefile b/cjdns/Makefile
index ca9d704..ed34cbf 100644
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cjdns
 PKG_VERSION:=0.16
-PKG_RELEASE:=10
+PKG_RELEASE:=11
 
 PKG_SOURCE_URL:=https://github.com/hyperboria/cjdns.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=55803286b9de8a935dbc86111e312c747ef78318
+PKG_SOURCE_VERSION:=a5a1b16f5a4f2815ce3c0e234a24108cae0f9ad3
 PKG_LICENSE:=GPL-3.0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)

From 803cb649e204b6ea74d38e3eb28d35036337068d Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Tue, 5 May 2015 11:34:55 +0300
Subject: [PATCH 085/368] miniupnpd: Bumped to 1.9.20150430. Seems to work in
 my tests.

---
 miniupnpd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index 6add41a..f718746 100644
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
-PKG_VERSION:=1.9.20150307
+PKG_VERSION:=1.9.20150430
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=f91dc5647b1d2c13a82082a481a53e3d
+PKG_MD5SUM:=996ccae8aa2535a83ed4618c63080978
 
 PKG_MAINTAINER:=Markus Stenberg <fingon@iki.fi>
 PKG_LICENSE:=BSD-3-Clause

From 9e25fa70ffb28622dbf25ccd910bf9324d902375 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@open-mesh.com>
Date: Fri, 24 Apr 2015 16:19:21 +0200
Subject: [PATCH 086/368] alfred: Fix dependency to IPv6

alfred always requires IPv6 support in the kernel and not only when
"Enable IPv6 support in packages" is enabled.

Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
 alfred/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/alfred/Makefile b/alfred/Makefile
index dade218..8f6855b 100644
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -28,7 +28,7 @@ define Package/alfred
   SECTION:=net
   CATEGORY:=Network
   TITLE:=A.L.F.R.E.D. - Almighty Lightweight Fact Remote Exchange Daemon
-  DEPENDS:= +libc +IPV6:kmod-ipv6 +librt \
+  DEPENDS:= +libc +kmod-ipv6 +librt \
 	  +ALFRED_NEEDS_lua:lua \
 	  +ALFRED_NEEDS_libgps:libgps
 endef

From 038e3677f87021a5fc2fe6f4135e5c904269e9e4 Mon Sep 17 00:00:00 2001
From: Simon Wunderlich <sw@simonwunderlich.de>
Date: Tue, 5 May 2015 12:25:42 +0200
Subject: [PATCH 087/368] alfred: bump version to 2015.0

From the CHANGELOG:

 * add support to call commands after data was updated
 * automatic reduction of process capabilities when not needed anymore
 * allow printing of the data version number in the alfred client mode
 * various code cleanups
 * bugs squashed:
   - update of the version number when data was updated with different
     version number
   - tighten size check on received packet

Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
 alfred/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/alfred/Makefile b/alfred/Makefile
index 8f6855b..facf902 100644
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -11,9 +11,9 @@ include $(TOPDIR)/rules.mk
 # The latest alfred git hash in PKG_REV can be obtained from http://git.open-mesh.org/alfred.git
 #
 PKG_NAME:=alfred
-PKG_VERSION:=2014.4.0
+PKG_VERSION:=2015.0
 PKG_RELEASE:=0
-PKG_MD5SUM:=053cb5d9e7ca9384598e82944343dea2
+PKG_MD5SUM:=53e2436dbc506e69f9675b69385ae131
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From 98f8393d29ca01e67de5a5e16f96c6f29f4b7d1d Mon Sep 17 00:00:00 2001
From: Simon Wunderlich <sw@simonwunderlich.de>
Date: Tue, 5 May 2015 12:31:39 +0200
Subject: [PATCH 088/368] alfred: disable new alfred capability dropping by
 default

Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
 alfred/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/alfred/Makefile b/alfred/Makefile
index facf902..3fccbb9 100644
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -59,7 +59,8 @@ endef
 
 MAKE_ALFRED_FLAGS=\
 	CONFIG_ALFRED_VIS=$(if $(CONFIG_PACKAGE_ALFRED_VIS),y,n) \
-	CONFIG_ALFRED_GPSD=$(if $(CONFIG_PACKAGE_ALFRED_GPSD),y,n)
+	CONFIG_ALFRED_GPSD=$(if $(CONFIG_PACKAGE_ALFRED_GPSD),y,n) \
+	CONFIG_ALFRED_CAPABILITIES=n
 
 TARGET_CFLAGS  += -ffunction-sections -fdata-sections -flto
 TARGET_LDFLAGS += -Wl,--gc-sections -fuse-linker-plugin

From d0671bf308aa93dcc71d53475c8e61ae231543ba Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Tue, 5 May 2015 18:28:02 +0200
Subject: [PATCH 089/368] miniupnpd: remove libnfnetlink dependency

Signed-off-by: Steven Barth <steven@midlink.org>
---
 miniupnpd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index f718746..1eac6c1 100644
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/miniupnpd
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+iptables +libip4tc +IPV6:libip6tc +IPV6:ip6tables +libnfnetlink
+  DEPENDS:=+iptables +libip4tc +IPV6:libip6tc +IPV6:ip6tables
   TITLE:=Lightweight UPnP IGD, NAT-PMP & PCP daemon
   SUBMENU:=Firewall
   URL:=http://miniupnp.free.fr/
@@ -52,7 +52,7 @@ endef
 MAKE_FLAGS += \
 	TEST=0 \
 	LIBS="" \
-	CC="$(TARGET_CC) -DIPTABLES_143 -lnfnetlink -lip4tc $(if $(CONFIG_IPV6),-lip6tc)" \
+	CC="$(TARGET_CC) -DIPTABLES_143 -lip4tc $(if $(CONFIG_IPV6),-lip6tc)" \
 	CONFIG_OPTIONS="$(if $(CONFIG_IPV6),--ipv6) --leasefile" \
 	-f Makefile.linux \
 	miniupnpd

From 7994d1a9ead82a7c40e129cf3a7252bcd10df0f3 Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Mon, 11 May 2015 12:01:08 +0300
Subject: [PATCH 090/368] hnetd: Update to the latest.

---
 hnetd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hnetd/Makefile b/hnetd/Makefile
index 0e6c9c4..f10d3e9 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hnetd
-PKG_SOURCE_VERSION:=6a5348ca13ae257c02431df499e78b695049324f
-PKG_VERSION:=2015-04-17-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=56a0320a190548205ebc79483b029b9c78e4a0cd
+PKG_VERSION:=2015-05-11-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git

From b81b9a9dd425828b7facead89dcbebfa31468ad9 Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Tue, 12 May 2015 14:23:27 +0200
Subject: [PATCH 091/368] cjdns: update source, bump release

upstream changes:
3d879c0 typo in GET32()
f964d14 Fixed IpTunnel unaligned access, thanks Viric for pointing it out
a05ade4 attempt to fix a rare assertion failure
6f1fdd8 Fix a memory leak in InterfaceController.c

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 cjdns/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cjdns/Makefile b/cjdns/Makefile
index ed34cbf..3feb35e 100644
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cjdns
 PKG_VERSION:=0.16
-PKG_RELEASE:=11
+PKG_RELEASE:=12
 
 PKG_SOURCE_URL:=https://github.com/hyperboria/cjdns.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a5a1b16f5a4f2815ce3c0e234a24108cae0f9ad3
+PKG_SOURCE_VERSION:=2303ce6585f62f7e8d3cdb1983c0c8e08385ea68
 PKG_LICENSE:=GPL-3.0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)

From 031353c9ca77020217f06bb8f4ad161c57788d66 Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Wed, 13 May 2015 01:35:13 +0200
Subject: [PATCH 092/368] cjdns: add copyright notice to Makefile

Signed-off-by: Lars Gierth <larsg@systemli.org>
---
 cjdns/Makefile | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/cjdns/Makefile b/cjdns/Makefile
index 3feb35e..f272e90 100644
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -1,3 +1,19 @@
+#
+# Copyright (C) 2014,2015 Hyperboria.net
+#
+# You may redistribute this program and/or modify it under the terms of
+# the GNU General Public License as published by the Free Software Foundation,
+# either version 3 of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cjdns

From 83c9fdfe5b9b21d5a2aecfb5fc3d01896165cd7f Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Wed, 13 May 2015 01:36:03 +0200
Subject: [PATCH 093/368] luci-app-cjdns: add copyright notice to Makefile

Signed-off-by: Lars Gierth <larsg@systemli.org>
---
 luci-app-cjdns/Makefile | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/luci-app-cjdns/Makefile b/luci-app-cjdns/Makefile
index 34f18c9..aabfa17 100644
--- a/luci-app-cjdns/Makefile
+++ b/luci-app-cjdns/Makefile
@@ -1,3 +1,19 @@
+#
+# Copyright (C) 2014,2015 Hyperboria.net
+#
+# You may redistribute this program and/or modify it under the terms of
+# the GNU General Public License as published by the Free Software Foundation,
+# either version 3 of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-cjdns

From 2bab58cdcb38ab57095d64f8f216631027266a69 Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Tue, 12 May 2015 02:09:23 +0200
Subject: [PATCH 094/368] cjdns: add seccomp config flag

Signed-off-by: Lars Gierth <larsg@systemli.org>
---
 cjdns/lua/cjdns/uci.lua | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/cjdns/lua/cjdns/uci.lua b/cjdns/lua/cjdns/uci.lua
index 70c33bc..0127f44 100644
--- a/cjdns/lua/cjdns/uci.lua
+++ b/cjdns/lua/cjdns/uci.lua
@@ -10,7 +10,14 @@ common.uci = UCI
 -- @return table with configuration defaults
 function UCI.defaults()
   return {
-    security = { { exemptAngel = 1, setuser = "nobody" } },
+    security = {
+      { setuser = "nobody", keepNetAdmin = 1 },
+      { chroot = "/var/run/" },
+      { nofiles = 0 },
+      { noforks = 1 },
+      { seccomp = 0 },
+      { setupComplete = 1 }
+    },
     router = {
         ipTunnel = { outgoingConnections = {}, allowedConnections = {} },
         interface = { type = "TUNInterface" }
@@ -45,6 +52,12 @@ function UCI.get()
     obj.router.interface.tunDevice = config.tun_device
   end
 
+  for i,section in pairs(obj.security) do
+    if type(section.seccomp) == "number" then
+      obj.security[i].seccomp = tonumber(config.seccomp)
+    end
+  end
+
   cursor:foreach("cjdns", "iptunnel_outgoing", function(outgoing)
     table.insert(obj.router.ipTunnel.outgoingConnections, outgoing.public_key)
   end)
@@ -127,7 +140,7 @@ function UCI.set(obj)
     private_key = obj.privateKey,
     admin_password = obj.admin.password,
     admin_address = admin_address,
-    admin_port = admin_port,
+    admin_port = admin_port
   })
 
   if obj.router.interface.tunDevice then
@@ -136,6 +149,18 @@ function UCI.set(obj)
     })
   end
 
+  if obj.security then
+    for i,section in pairs(obj.security) do
+      for key,value in pairs(section) do
+        if key == "seccomp" then
+          UCI.cursor_section(cursor, "cjdns", "cjdns", "cjdns", {
+            seccomp = tonumber(value)
+          })
+        end
+      end
+    end
+  end
+
   if obj.router.ipTunnel.outgoingConnections then
     for i,public_key in pairs(obj.router.ipTunnel.outgoingConnections) do
       UCI.cursor_section(cursor, "cjdns", "iptunnel_outgoing", nil, {

From 3ef5c0caf4f1f2a023ff0b22742966ef77fbc467 Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Tue, 12 May 2015 02:10:22 +0200
Subject: [PATCH 095/368] luci-app-cjdns: add seccomp checkbox

Signed-off-by: Lars Gierth <larsg@systemli.org>
---
 luci-app-cjdns/luasrc/model/cbi/cjdns/settings.lua | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/luci-app-cjdns/luasrc/model/cbi/cjdns/settings.lua b/luci-app-cjdns/luasrc/model/cbi/cjdns/settings.lua
index bbe89df..d188915 100644
--- a/luci-app-cjdns/luasrc/model/cbi/cjdns/settings.lua
+++ b/luci-app-cjdns/luasrc/model/cbi/cjdns/settings.lua
@@ -33,6 +33,10 @@ apt.datatype = "port"
 apw = s:taboption("admin", Value, "admin_password", translate("Password"))
 apw.datatype = "string"
 
+-- Security
+s:tab("security", translate("Security"), translate("Functionality related to hardening the cjdroute process."))
+s:taboption("security", Flag, "seccomp", translate("SecComp sandboxing"))
+
 -- UDP Interfaces
 udp_interfaces = m:section(TypedSection, "udp_interface", translate("UDP Interfaces"),
   translate("These interfaces allow peering via public IP networks, such as the Internet, or many community-operated wireless networks. IPv6 addresses should be entered with square brackets, like so: <code>[2001::1]</code>."))

From 1689eab8501a9ec26066806c6cd6904ea09e6fd8 Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Wed, 13 May 2015 01:39:43 +0200
Subject: [PATCH 096/368] cjdns: bump release

Signed-off-by: Lars Gierth <larsg@systemli.org>
---
 cjdns/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cjdns/Makefile b/cjdns/Makefile
index f272e90..ebdde41 100644
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cjdns
 PKG_VERSION:=0.16
-PKG_RELEASE:=12
+PKG_RELEASE:=13
 
 PKG_SOURCE_URL:=https://github.com/hyperboria/cjdns.git
 PKG_SOURCE_PROTO:=git

From b917a9035a940333a8fbc117c04a2a643ea3b899 Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Wed, 13 May 2015 01:39:53 +0200
Subject: [PATCH 097/368] luci-app-cjdns: bump release

Signed-off-by: Lars Gierth <larsg@systemli.org>
---
 luci-app-cjdns/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/luci-app-cjdns/Makefile b/luci-app-cjdns/Makefile
index aabfa17..793b4ec 100644
--- a/luci-app-cjdns/Makefile
+++ b/luci-app-cjdns/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-cjdns
 PKG_VERSION:=1.3
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_LICENSE:=GPL-3.0
 

From aecf7641ca880effe7d2bce01723bf6fdd16aba8 Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Fri, 15 May 2015 21:05:29 +0200
Subject: [PATCH 098/368] cjdns: package test cases

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 cjdns/Makefile | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/cjdns/Makefile b/cjdns/Makefile
index ebdde41..63bc0da 100644
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -49,6 +49,20 @@ define Package/cjdns/description
 	of the security and scalability issues that plague existing networks.
 endef
 
+define Package/cjdns-tests
+	SECTION:=net
+	CATEGORY:=Network
+	SUBMENU:=Routing and Redirection
+	TITLE:=cjdns test cases
+	URL:=https://github.com/hyperboria/cjdns
+	MAINTAINER:=Lars Gierth <larsg@systemli.org>
+	DEPENDS:=+libpthread +librt
+endef
+
+define Package/cjdns-test/description
+	cjdns test cases
+endef
+
 define Build/Configure
 endef
 
@@ -118,4 +132,12 @@ if [ -z $${IPKG_INSTROOT} ] ; then
 fi
 endef
 
+define Package/cjdns-tests/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) \
+		$(PKG_BUILD_DIR)/build_linux/test_testcjdroute_c \
+		$(1)/usr/bin
+endef
+
 $(eval $(call BuildPackage,cjdns))
+$(eval $(call BuildPackage,cjdns-tests))

From 82d9002689937d9257b6d2536ca59d7b9b01c980 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Thu, 21 May 2015 08:22:37 +0200
Subject: [PATCH 099/368] babeld: add support for dynamic config files

Signed-off-by: Steven Barth <steven@midlink.org>
Signed-off-by: Markus Stenberg <markus.stenberg@iki.fi>
---
 babeld/files/babeld.init | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/babeld/files/babeld.init b/babeld/files/babeld.init
index 585fc76..797ba2f 100755
--- a/babeld/files/babeld.init
+++ b/babeld/files/babeld.init
@@ -7,6 +7,7 @@ START=70
 pidfile='/var/run/babeld.pid'
 CONFIGFILE='/var/etc/babeld.conf'
 OTHERCONFIGFILE="/etc/babeld.conf"
+OTHERCONFIGDIR="/tmp/babeld.d/"
 EXTRA_COMMANDS="status"
 EXTRA_HELP="        status Dump Babel's table to the log file."
 
@@ -204,8 +205,14 @@ babel_config_cb() {
 start() {
 	mkdir -p /var/lib
 	mkdir -p /var/etc
+	mkdir -p $OTHERCONFIGDIR
+
 	# Start by emptying the generated config file
 	>"$CONFIGFILE"
+	# Import dynamic config files
+	for f in $OTHERCONFIGDIR/*.conf; do
+		[ -f "$f" ] && cat $f >> $CONFIGFILE
+	done
 	# First load the whole config file, without callbacks, so that we are
 	# aware of all "ignore" options in the second pass.
 	config_load babeld

From b39fa42c62232ae9c5db8d2213dd740394c0fed0 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Thu, 21 May 2015 08:24:18 +0200
Subject: [PATCH 100/368] babeld: remove unnecessary librt linking & dependency

Signed-off-by: Steven Barth <steven@midlink.org>
Signed-off-by: Markus Stenberg <markus.stenberg@iki.fi>
---
 babeld/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/babeld/Makefile b/babeld/Makefile
index ba8d14d..4247d91 100644
--- a/babeld/Makefile
+++ b/babeld/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=babeld
 PKG_VERSION:=1.6.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/files/
@@ -25,7 +25,7 @@ define Package/babeld
   TITLE:=A loop-free distance-vector routing protocol
   URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/babel/
   MAINTAINER:=Gabriel Kerneis <gabriel@kerneis.info>
-  DEPENDS:=+kmod-ipv6 +librt
+  DEPENDS:=+kmod-ipv6
 endef
 
 define Package/babeld/description
@@ -45,6 +45,7 @@ endef
 
 MAKE_FLAGS+= \
 	CFLAGS="$(TARGET_CFLAGS)" \
+	LDLIBS="" \
 
 define Package/babeld/install
 	$(INSTALL_DIR) $(1)/usr/sbin

From ac643416dc6065554066574f147def8134556474 Mon Sep 17 00:00:00 2001
From: Gabriel Kerneis <kerneis@google.com>
Date: Thu, 21 May 2015 10:31:34 +0200
Subject: [PATCH 101/368] babeld: allow changing alternative configuration file
 and directory

Signed-off-by: Gabriel Kerneis <kerneis@google.com>
Signed-off-by: Markus Stenberg <markus.stenberg@iki.fi>
---
 babeld/files/babeld.config | 14 +++++++++-----
 babeld/files/babeld.init   |  9 ++++++++-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/babeld/files/babeld.config b/babeld/files/babeld.config
index fa22fd6..cb2a131 100644
--- a/babeld/files/babeld.config
+++ b/babeld/files/babeld.config
@@ -1,10 +1,10 @@
 package babeld
 
-# Configuration set in this file ends up in /var/etc/babeld.conf.
-# Babeld is told to use both /etc/babeld.conf and /var/etc/babeld.conf, so
-# you can use one or the other, or even both at the same time.  If an
-# option is defined in both files, the version in /var/etc/babeld.conf
-# takes precedence.
+# Babeld reads options from the following files (the last one takes precedence
+# if an option is defined in several places):
+# - the file defined by the option conf_file (default: /etc/babeld.conf),
+# - *.conf files in the directory defined by conf_dir (default: /tmp/babel.d/),
+# - this UCI configuration file.
 
 # See "man babeld" for all available options ("Global options").
 # Important: remember to use '_' instead of '-' in option names.
@@ -20,6 +20,10 @@ config general
 	## import-table statement, "option import_table 42" should work.
 	# list 'import_table' '42'
 	# list 'import_table' '100'
+	## Alternative configuration file and directory.
+	## See comment at the top of this file for more details.
+	# option 'conf_file' '/etc/babeld.conf'
+	# option 'conf_dir' '/tmp/babel.d/'
 
 config interface
 	## Remove this line to enable babeld on this interface
diff --git a/babeld/files/babeld.init b/babeld/files/babeld.init
index 797ba2f..6796a34 100755
--- a/babeld/files/babeld.init
+++ b/babeld/files/babeld.init
@@ -13,7 +13,7 @@ EXTRA_HELP="        status Dump Babel's table to the log file."
 
 # Options to ignore for the global section (old options that are translated
 # for backward compatibility with old configuration files)
-ignored_options="carrier_sense assume_wireless no_split_horizon random_router_id multicast_address port hello_interval wired_hello_interval smoothing_half_time duplication_priority local_server conf_file"
+ignored_options="carrier_sense assume_wireless no_split_horizon random_router_id multicast_address port hello_interval wired_hello_interval smoothing_half_time duplication_priority local_server conf_file conf_dir"
 
 # Append a line to the configuration file
 cfg_append() {
@@ -109,6 +109,13 @@ parse_old_global_options() {
 	[ "$_bool" -eq 1 ] && add_default_option "wired" "false"
 	config_get_bool _bool "$section" 'no_split_horizon' 0
 	[ "$_bool" -eq 1 ] && add_default_option "split_horizon" "false"
+        # Configure alternative configuration file and directory
+	local conf_file
+	config_get conf_file "$section" "conf_file"
+	[ -n "$conf_file" ] && OTHERCONFIGFILE="$conf_file"
+	local conf_dir
+	config_get conf_dir "$section" "conf_dir"
+	[ -n "$conf_dir" ] && OTHERCONFIGDIR="$conf_dir"
 }
 
 babel_filter() {

From 3c3d76bea9b439daed9ac0305a43f5367f646580 Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Thu, 21 May 2015 13:19:36 +0200
Subject: [PATCH 102/368] cjdns: update source, bump release

Fixes seccomp on ARM or musl-based builds, notable upstream changes:
a97c189 fix Hex_test unit test
4bceb72 seccomp: allow readv and writev syscalls (used by musl)
64f4791 seccomp: define GET_SYSCALL_NUM accessor macro
0102181 seccomp: allow gettimeofday syscall (required on ARM)
18979ee Add a check to prevent a rare assertion failure

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 cjdns/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cjdns/Makefile b/cjdns/Makefile
index 63bc0da..e023749 100644
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -18,11 +18,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cjdns
 PKG_VERSION:=0.16
-PKG_RELEASE:=13
+PKG_RELEASE:=14
 
 PKG_SOURCE_URL:=https://github.com/hyperboria/cjdns.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2303ce6585f62f7e8d3cdb1983c0c8e08385ea68
+PKG_SOURCE_VERSION:=a97c189b9181bf83ed44a9ab0ebc817882c60ffa
 PKG_LICENSE:=GPL-3.0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)

From 970ca6f0934d076a64f2859ef6e700f82575146a Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Thu, 28 May 2015 08:15:41 +0200
Subject: [PATCH 103/368] hnetd: bump to latest

Signed-off-by: Steven Barth <steven@midlink.org>
---
 hnetd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hnetd/Makefile b/hnetd/Makefile
index f10d3e9..ee3373a 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hnetd
-PKG_SOURCE_VERSION:=56a0320a190548205ebc79483b029b9c78e4a0cd
-PKG_VERSION:=2015-05-11-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=86da3551277dc5b21e9382233c3ce66a154ab670
+PKG_VERSION:=2015-05-28-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git

From 2abafe17e62edb3b1cbeff54915d4e87ee5463f7 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Thu, 28 May 2015 08:18:55 +0200
Subject: [PATCH 104/368] hnetd: switch to babeld instead of babels

Signed-off-by: Steven Barth <steven@midlink.org>
---
 hnetd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hnetd/Makefile b/hnetd/Makefile
index ee3373a..03c2db4 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -52,7 +52,7 @@ define Package/hnet-full
   URL:=https://github.com/sbyx/hnetd
   DEPENDS:=+hnetd-nossl +luci-app-hnet
   # Routing
-  DEPENDS+=+babels
+  DEPENDS+=+babeld
   # Service discovery
   DEPENDS+=+ohybridproxy
   # Distributed PCP support
@@ -66,7 +66,7 @@ define Package/hnet-full-secure
   URL:=https://github.com/sbyx/hnetd
   DEPENDS:=+hnetd-openssl +luci-app-hnet
   # Routing
-  DEPENDS+=+babels
+  DEPENDS+=+babeld
   # Service discovery
   DEPENDS+=+ohybridproxy
   # Distributed PCP support

From ef881054724b7336fc36c0d945d640b947984427 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Thu, 28 May 2015 08:20:35 +0200
Subject: [PATCH 105/368] babels: obsoleted by babeld

Signed-off-by: Steven Barth <steven@midlink.org>
---
 babels/Makefile                               |  69 --------
 babels/files/babeld.conf                      |  38 -----
 babels/files/babeld.config                    |  72 --------
 babels/files/babeld.init                      | 154 ------------------
 ...tes-with-source-128-for-SAS-on-Linux.patch | 103 ------------
 .../0002-ipv6-subtrees-default-on.patch       |  11 --
 6 files changed, 447 deletions(-)
 delete mode 100644 babels/Makefile
 delete mode 100644 babels/files/babeld.conf
 delete mode 100644 babels/files/babeld.config
 delete mode 100755 babels/files/babeld.init
 delete mode 100644 babels/patches/0001-Allow-routes-with-source-128-for-SAS-on-Linux.patch
 delete mode 100644 babels/patches/0002-ipv6-subtrees-default-on.patch

diff --git a/babels/Makefile b/babels/Makefile
deleted file mode 100644
index 57b723d..0000000
--- a/babels/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# Copyright (C) 2007-2009 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:=babels
-PKG_SOURCE_VERSION:=1ba29b3e069908d41fd6e263d0d09cd5a551a644
-PKG_VERSION:=2015-04-14-$(PKG_SOURCE_VERSION)
-PKG_RELEASE:=1
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/jech/babeld.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=MIT
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/babels
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Routing and Redirection
-  TITLE:=A loop-free distance-vector routing protocol (source-specific)
-  URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/babel/
-  MAINTAINER:=Steven Barth <cyrus@openwrt.org>
-  DEPENDS:=+kmod-ipv6
-endef
-
-define Package/babels/description
- Babel is a loop-avoiding distance-vector routing protocol roughly based
- on DSDV and AODV, but with provisions for link cost estimation and
- redistribution of routes from other routing protocols.
- While it is optimised for wireless mesh networks, Babel will also work
- efficiently on wired networks. It will generate between 1.2 and 2.4 times
- the amount of routing traffic that RIPng would generate, while
- never counting to infinity.
- This is experimental source routing branch, and should be only used if you
- know what you are doing.
-endef
-
-define Package/babels/conffiles
-/etc/babeld.conf
-/etc/config/babeld
-endef
-
-MAKE_FLAGS+= \
-	CFLAGS="$(TARGET_CFLAGS) -DIPV6_SUBTREES" \
-	LDLIBS="" \
-
-define Package/babels/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/babeld $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) ./files/babeld.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/babeld.config $(1)/etc/config/babeld
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/babeld.init $(1)/etc/init.d/babeld
-endef
-
-define Build/Compile
-	echo "#define BABEL_VERSION \"$(PKG_SOURCE_SUBDIR)\"" > $(PKG_BUILD_DIR)/version.h
-	$(call Build/Compile/Default)
-endef
-
-$(eval $(call BuildPackage,babels))
diff --git a/babels/files/babeld.conf b/babels/files/babeld.conf
deleted file mode 100644
index 746139d..0000000
--- a/babels/files/babeld.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-# babel config file
-#
-# This config file simply documents sample entries. 
-# "redistribute" means: redistribute routes from other routing protocols
-# into babel. "local" means addresses assigned to local interfaces.
-#
-# You do not need to edit this file: you can use /etc/config/babeld
-# instead (sections "interface" and "filter").  Both files can be used
-# simultaneously (the rules of this file are executed first).
-
-# the default rules are:
-#
-## redistribute local 
-## redistribute deny
-#
-# this says, redistribute local addresses but no other routes
-
-
-# redistribute IPv4 default route into babel 
-## redistribute local ip 0.0.0.0/0 le 0 metric 128
-
-# same but for IPv6
-## redistribute local ip ::/0 le 0 metric 128
-
-
-# don't redistribute all local addresses, only selected ones
-# after the first line, the "deny" rules kicks in. After the "deny"
-# no redistribute local rules are going to match
-## redistribute local ip 192.160.4.0/24 
-## redistribute local deny
-
-
-# Babel refuses to redistribute routes with a protocol number of "boot";
-# this is standard practice, and means that you cannot easily
-# redistribute the default route installed by dhcp.  It is however
-# possible to redistribute such route by explicitly specifying "proto 3"
-# on the redistribute line.
-## redistribute ip 0.0.0.0/0 le 0 proto 3 metric 128
diff --git a/babels/files/babeld.config b/babels/files/babeld.config
deleted file mode 100644
index a4f00e6..0000000
--- a/babels/files/babeld.config
+++ /dev/null
@@ -1,72 +0,0 @@
-package babeld
-
-config general
-	# option 'multicast_address' 'ff02:0:0:0:0:0:1:6'
-	# option 'port' '6696'
-	# option 'state_file' '/var/lib/babel-state'
-	# option 'hello_interval' '4'
-	# option 'wired_hello_interval' '20'
-	# option 'diversity' '0,128'
-	# option 'smoothing_half_time' '4'
-	# option 'kernel_priority' '0'
-	# Do not use this option unless you know what you are doing, as it can
-	# cause persistent route flapping.
-	## option 'duplication_priority' '0'
-	# option 'carrier_sense' 'false'
-	# option 'assume_wireless' 'false'
-	# option 'no_split_horizon' 'false'
-	# option 'debug' '0'
-	# Listen for connections from a front-end, e.g. on port 33123.
-	## option 'local_server' '33123'
-	# option 'random_router_id' 'false'
-	# Keep unfeasible routes
-	## option 'keep_unfeasible' 'false'
-	# Use the given kernel routing table for routes inserted by babeld.
-	## option 'export_table' '0'
-	# Export routes from the given kernel routing tables.
-	## list 'import_table' '0'
-	## list 'import_table' '42'
-	# The configuration file is not necessary since you can do everything
-	# from this file.
-	# option 'conf_file' '/etc/babeld.conf'
-	# option 'log_file' '/var/log/babeld.log'
-
-# You can use aliases (like lan, wlan) or real names (like eth0.0).
-# If you use an alias, it must be already defined when babeld starts.
-# Otherwise, the name is taken literally and the interface can be
-# brought up later (useful for tunnels for instance).
-config interface wlan
-	# Remove this line to enable babeld on this interface
-	option 'ignore' 'true'
-	# option 'wired' 'auto'
-	# option 'link_quality' 'auto'
-	# option 'split_horizon' 'auto'
-	# The default is 96 for wired interfaces, and 256 for wireless ones
-	## option 'rxcost' '256'
-	# The default is specified with the -h and -H command-line flags.
-	## option 'hello_interval' '4'
-	# This can be set to a fairly large  value,  unless significant
-	# packet loss is expected.  The default is four times the hello
-	# interval.
-	## option 'update_interval' '16'
-
-config interface lan
-	option 'ignore' 'true'
-
-# A filter consists in a type ('in', 'out' or 'redistribute'), an action
-# ('allow', 'deny' or 'metric xxx') and a set of selectors ('ip', 'eq',
-# etc.).  See /etc/babeld.conf for more details.
-# Here is a sample filter wich redistributes the default route if its
-# protocol number is "boot", e.g. when it installed by dhcp.  It is
-# disabled by default.
-config filter
-	option 'ignore' 'true'
-	# Type
-	option 'type' 'redistribute'
-	# Selectors: ip, eq, le, ge, neigh, id, proto, local, if
-	option 'ip' '0.0.0.0/0' 
-	option 'le' '0'
-	option 'proto' '3'
-	# Action 
-	option 'action' 'metric 128'
-
diff --git a/babels/files/babeld.init b/babels/files/babeld.init
deleted file mode 100755
index 4af7eea..0000000
--- a/babels/files/babeld.init
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=70
-
-pidfile='/var/run/babeld.pid'
-EXTRA_COMMANDS="status"
-EXTRA_HELP="        status Dump Babel's table to the log file."
-
-listen_ifname() {
-	local ifname=$(uci_get_state network "$1" ifname "$1")
-	local switch="$2"
-	append args "$switch $ifname"
-	append interfaces "$ifname"
-}
-
-append_ifname() {
-	local section="$1"
-	local option="$2"
-	local switch="$3"
-	local _name
-	config_get _name "$section" "$option"
-	[ -z "$_name" ] && return 0
-	local ifname=$(uci_get_state network "$_name" ifname "$_name")
-	append args "$switch $ifname"
-}
-
-append_bool() {
-	local section="$1"
-	local option="$2"
-	local value="$3"
-	local _loctmp
-	config_get_bool _loctmp "$section" "$option" 0
-	[ "$_loctmp" -gt 0 ] && append args "$value"
-}
-
-append_switch() {
-	local value="$1"
-	local switch="$2"
-	append args "$switch $value"
-}
-
-append_parm() {
-	local section="$1"
-	local option="$2"
-	local switch="$3"
-	local _loctmp
-	config_get _loctmp "$section" "$option"
-	[ -z "$_loctmp" ] && return 0
-	append args "$switch $_loctmp"
-}
-
-babel_filter() {
-	local cfg="$1"
-	local _loctmp
-
-	local _ignored
-	config_get_bool _ignored "$cfg" 'ignore' 0
-	[ "$_ignored" -eq 1 ] && return 0
-	
-	append args "-C '"
-
-	append_parm "$cfg" 'type' ''
-
-	append_bool "$cfg" 'local' 'local'
-
-	append_parm "$cfg" 'ip' 'ip'
-	append_parm "$cfg" 'eq' 'eq'
-	append_parm "$cfg" 'le' 'le'
-	append_parm "$cfg" 'ge' 'ge'
-	append_parm "$cfg" 'src_ip' 'src-ip'
-	append_parm "$cfg" 'src_eq' 'src-eq'
-	append_parm "$cfg" 'src_le' 'src-le'
-	append_parm "$cfg" 'src_ge' 'src-ge'
-	append_parm "$cfg" 'neigh' 'neigh'
-	append_parm "$cfg" 'id' 'id'
-	append_parm "$cfg" 'proto' 'proto'
-
-	append_ifname "$cfg" 'if' 'if'
-
-	append_parm "$cfg" 'action' ''
-
-	append args ' ' "'"
-}
-
-babel_addif() {
-	local cfg="$1"
-
-	local _ignored
-	config_get_bool _ignored "$cfg" 'ignore' 0
-	[ "$_ignored" -eq 1 ] && return 0
-	
-	listen_ifname "$cfg" "-C 'interface"
-
-	append_parm "$cfg" 'wired' 'wired'
-	append_parm "$cfg" 'link_quality' 'link-quality'
-	append_parm "$cfg" 'split_horizon' 'split-horizon'
-	append_parm "$cfg" 'rxcost' 'rxcost'
-	append_parm "$cfg" 'hello_interval' 'hello-interval'
-	append_parm "$cfg" 'update_interval' 'update-interval'
-
-	append args ' ' "'"
-}
-
-babel_config() {
-	local cfg="$1"
-
-	append_bool "$cfg" 'carrier_sense' '-l'
-	append_bool "$cfg" 'assume_wireless' '-w'
-	append_bool "$cfg" 'no_split_horizon' '-s'
-	append_bool "$cfg" 'keep_unfeasible' '-u'
-	append_bool "$cfg" 'random_router_id' '-r'
-
-	append_parm "$cfg" 'multicast_address' '-m'
-	append_parm "$cfg" 'port' '-p'
-	append_parm "$cfg" 'state_file' '-S'
-	append_parm "$cfg" 'hello_interval' '-h'
-	append_parm "$cfg" 'wired_hello_interval' '-H'
-	append_parm "$cfg" 'diversity' '-z'
-	append_parm "$cfg" 'smoothing_half_time' '-M'
-	append_parm "$cfg" 'kernel_priority' '-k'
-	append_parm "$cfg" 'duplication_priority' '-A'
-	append_parm "$cfg" 'debug' '-d'
-	append_parm "$cfg" 'local_server' '-g'
-	append_parm "$cfg" 'export_table' '-t'
-	config_list_foreach "$cfg" 'import_table' append_switch '-T'
-	append_parm "$cfg" 'conf_file' '-c'
-	append_parm "$cfg" 'log_file' '-L'
-}
-
-start() {
-	mkdir -p /var/lib
-	config_load babeld
-	unset args
-	unset interfaces
-	config_foreach babel_config general
-	config_foreach babel_addif interface
-	config_foreach babel_filter filter
-	[ -z "$interfaces" ] && return 0
-	eval "/usr/sbin/babeld -D -I $pidfile $args $interfaces"
-}
-
-stop() {
-	[ -f "$pidfile" ] && kill $(cat $pidfile)
-  # avoid race-condition on restart: wait for
-  # babeld to die for real.
-  [ -f "$pidfile" ] && sleep 1
-  [ -f "$pidfile" ] && sleep 1
-  [ -f "$pidfile" ] && sleep 1
-  [ -f "$pidfile" ] && exit 42
-}
-
-status() {
-	[ -f "$pidfile" ] && kill -USR1 $(cat $pidfile)
-}
diff --git a/babels/patches/0001-Allow-routes-with-source-128-for-SAS-on-Linux.patch b/babels/patches/0001-Allow-routes-with-source-128-for-SAS-on-Linux.patch
deleted file mode 100644
index ffcb987..0000000
--- a/babels/patches/0001-Allow-routes-with-source-128-for-SAS-on-Linux.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 3fdbb1f797ee9fe9260af92f5d7ea760684cd271 Mon Sep 17 00:00:00 2001
-From: Steven Barth <steven@midlink.org>
-Date: Tue, 18 Feb 2014 13:18:32 +0100
-Subject: [PATCH] Allow routes with source ::/128 for SAS on Linux
-
-Linux uses the source-address :: (unspecified) to lookup routes in the
-routing table for connections that are not bound to a specific source
-address (e.g. ping6 2001:db8::1). If all default routes are
-source-restricted a command like above will result in a "Permission
-denied" error and no packets are being sent. Adding a default route with
-source ::/128 avoids this issue.
-
-This patch excludes ::/128 from the "martian_prefix" check for source
-prefixes and thus allows such auxiliary routes to be distributed.
-
-Signed-off-by: Steven Barth <cyrus@openwrt.org>
----
- kernel_netlink.c | 4 ++--
- route.c          | 4 ++--
- util.c           | 4 ++--
- util.h           | 2 +-
- xroute.c         | 2 +-
- 5 files changed, 8 insertions(+), 8 deletions(-)
-
---- a/kernel_netlink.c
-+++ b/kernel_netlink.c
-@@ -1243,8 +1243,8 @@ filter_kernel_routes(struct nlmsghdr *nh
-     if(rc < 0)
-         return 0;
- 
--    if(martian_prefix(current_route->prefix, current_route->plen) ||
--       martian_prefix(current_route->src_prefix, current_route->src_plen))
-+    if(martian_prefix(current_route->prefix, current_route->plen, 0) ||
-+       martian_prefix(current_route->src_prefix, current_route->src_plen, 1))
-         return 0;
- 
-     /* Ignore default unreachable routes; no idea where they come from. */
-@@ -1946,7 +1946,7 @@ filter_kernel_rules(struct nlmsghdr *nh,
-     kdebugf("filter_rules: from %s prio %d table %d\n",
-             format_prefix(src, src_plen), priority, table);
- 
--    if(martian_prefix(src, src_plen) || !has_priority)
-+    if(martian_prefix(src, src_plen, 1) || !has_priority)
-         return 0;
- 
-     i = priority - src_table_prio;
---- a/route.c
-+++ b/route.c
-@@ -809,12 +809,12 @@ update_route(const unsigned char *id,
-     if(memcmp(id, myid, 8) == 0)
-         return NULL;
- 
--    if(martian_prefix(prefix, plen)) {
-+    if(martian_prefix(prefix, plen, 0)) {
-         fprintf(stderr, "Rejecting martian route to %s through %s.\n",
-                 format_prefix(prefix, plen), format_address(nexthop));
-         return NULL;
-     }
--    if(src_plen != 0 && martian_prefix(src_prefix, src_plen)) {
-+    if(src_plen != 0 && martian_prefix(src_prefix, src_plen, 1)) {
-         fprintf(stderr, "Rejecting martian route to %s from %s through %s.\n",
-                 format_prefix(prefix, plen),
-                 format_prefix(src_prefix, src_plen), format_eui64(id));
---- a/util.c
-+++ b/util.c
-@@ -437,13 +437,13 @@ wait_for_fd(int direction, int fd, int m
- }
- 
- int
--martian_prefix(const unsigned char *prefix, int plen)
-+martian_prefix(const unsigned char *prefix, int plen, int is_source)
- {
-     return
-         (plen >= 8 && prefix[0] == 0xFF) ||
-         (plen >= 10 && prefix[0] == 0xFE && (prefix[1] & 0xC0) == 0x80) ||
-         (plen >= 128 && memcmp(prefix, zeroes, 15) == 0 &&
--         (prefix[15] == 0 || prefix[15] == 1)) ||
-+         ((prefix[15] == 0 && !is_source) || prefix[15] == 1)) ||
-         (plen >= 96 && v4mapped(prefix) &&
-          ((plen >= 104 && (prefix[12] == 127 || prefix[12] == 0)) ||
-           (plen >= 100 && (prefix[12] & 0xE0) == 0xE0)));
---- a/util.h
-+++ b/util.h
-@@ -106,7 +106,7 @@ int parse_net(const char *net, unsigned
-               int *af_r);
- int parse_eui64(const char *eui, unsigned char *eui_r);
- int wait_for_fd(int direction, int fd, int msecs);
--int martian_prefix(const unsigned char *prefix, int plen) ATTRIBUTE ((pure));
-+int martian_prefix(const unsigned char *prefix, int plen, int is_source) ATTRIBUTE ((pure));
- int linklocal(const unsigned char *address) ATTRIBUTE ((pure));
- int v4mapped(const unsigned char *address) ATTRIBUTE ((pure));
- void v4tov6(unsigned char *dst, const unsigned char *src);
---- a/xroute.c
-+++ b/xroute.c
-@@ -264,7 +264,7 @@ check_xroutes(int send_updates)
-     /* Add any new routes */
- 
-     for(i = 0; i < numroutes; i++) {
--        if(martian_prefix(routes[i].prefix, routes[i].plen))
-+        if(martian_prefix(routes[i].prefix, routes[i].plen, 0))
-             continue;
-         metric = redistribute_filter(routes[i].prefix, routes[i].plen,
-                                      routes[i].src_prefix, routes[i].src_plen,
diff --git a/babels/patches/0002-ipv6-subtrees-default-on.patch b/babels/patches/0002-ipv6-subtrees-default-on.patch
deleted file mode 100644
index 0cad972..0000000
--- a/babels/patches/0002-ipv6-subtrees-default-on.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/babeld.c
-+++ b/babeld.c
-@@ -60,7 +60,7 @@ int debug = 0;
- 
- int link_detect = 0;
- int all_wireless = 0;
--int has_ipv6_subtrees = 0;
-+int has_ipv6_subtrees = 1;
- int default_wireless_hello_interval = -1;
- int default_wired_hello_interval = -1;
- int resend_delay = -1;

From 62275acf212cfb060e85366af2fac1432787ff4f Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Sat, 30 May 2015 13:40:06 +0200
Subject: [PATCH 106/368] alfred: wait for batmanif and interface, ignore
 batmanif if it is set to 'none'

---
 alfred/files/alfred.init | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/alfred/files/alfred.init b/alfred/files/alfred.init
index b777b53..b3b068a 100755
--- a/alfred/files/alfred.init
+++ b/alfred/files/alfred.init
@@ -16,10 +16,27 @@ pid_file_alfred="/var/run/alfred.pid"
 pid_file_vis="/var/run/batadv-vis.pid"
 enable=0
 vis_enable=0
-batmanif=""
 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=""
@@ -41,6 +58,12 @@ alfred_start()
 	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
 
@@ -64,20 +87,6 @@ start()
 		exit 0
 	fi
 
-	mesh_dir="/sys/class/net/$batmanif/mesh/"
-	if ! [ -d "$mesh_dir" ] ; then
-		timeout=30
-		echo "${initscript}: waiting $timeout secs for $batmanif interface..."
-		for i in $(seq $timeout); do
-			sleep 1
-			[ -d "$mesh_dir" ] && break
-			if [ $i == $timeout ] ; then
-				echo "${initscript}: $batmanif not detected, alfred not starting."
-				exit 1
-			fi
-		done
-	fi
-
 	echo "${initscript}: starting alfred"
 	SERVICE_PID_FILE="$pid_file_alfred"
 	service_start /usr/sbin/alfred ${alfred_args}

From a251e8fb2a89b1d893c2797a8d2571308d340740 Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Sun, 31 May 2015 10:39:59 +0200
Subject: [PATCH 107/368] alfred: fix whitespaces

---
 alfred/files/alfred.init | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/alfred/files/alfred.init b/alfred/files/alfred.init
index b3b068a..5ce06c0 100755
--- a/alfred/files/alfred.init
+++ b/alfred/files/alfred.init
@@ -67,11 +67,11 @@ alfred_start()
 	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 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
 

From 570c595e326b54fd3bc920034d01d9393a968c54 Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Fri, 5 Jun 2015 10:50:31 +0200
Subject: [PATCH 108/368] bmx6: bump to latest (--tunnel and --redistTable
 fixing) version

---
 bmx6/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bmx6/Makefile b/bmx6/Makefile
index 727de09..ab91310 100644
--- a/bmx6/Makefile
+++ b/bmx6/Makefile
@@ -31,8 +31,8 @@ PKG_SOURCE_PROTO:=git
 #PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
 PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 
-PKG_REV:=6a6195e46bf15ed58d75bdec14c2941aca31fc3f
-PKG_VERSION:=r2014112401
+PKG_REV:=b6107880b5460625b7ce9359dbeac0cfe863f58c
+PKG_VERSION:=r2015060501
 PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 

From d7b3bbc896301fa563d589bd0d6fd8ece1f7da0d Mon Sep 17 00:00:00 2001
From: Bastian Bittorf <bittorf@bluebottle.com>
Date: Mon, 8 Jun 2015 09:27:56 +0200
Subject: [PATCH 109/368] olsrd: bump to new release 0.9.0

see: https://lists.olsr.org/pipermail/olsr-dev/2015-June/007598.html

"Everyone using olsrd v1 is strongly urged to upgrade, especially people
using Smart-Gateway.

In this release the Multi-Smart-Gateway additions are declared stable.

Also, Smart-Gateway timeouts are now implemented, which is a major fix
to the Smart-Gateway system. These timeouts were missing ever since its
first implementation." (Ferry Huberts)
---
 olsrd/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/olsrd/Makefile b/olsrd/Makefile
index 362e922..3999d3c 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
-PKG_VERSION:=0.6.8
-PKG_RELEASE:=2
+PKG_VERSION:=0.9.0
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6
+PKG_SOURCE_URL:=http://www.olsr.org/releases/0.9
 
-PKG_MD5SUM:=feabdd611391dcb30af5795e834cc258
+PKG_MD5SUM:=65376afff4fc4963fcaf1aa0ad8185d4
 PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=BSD-3-Clause
 

From 45fc164df8db21c32015ba71b6fe599665b656b6 Mon Sep 17 00:00:00 2001
From: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
Date: Mon, 8 Jun 2015 10:02:13 +0200
Subject: [PATCH 110/368] Add v0.8.2 OONF build files

---
 oonf-dlep-proxy/Makefile                 |  67 ++++++++++++
 oonf-dlep-proxy/files/dlep_proxy.hotplug |  12 +++
 oonf-dlep-proxy/files/dlep_proxy.init    | 124 +++++++++++++++++++++++
 oonf-dlep-proxy/files/dlep_proxy.uci     |  24 +++++
 oonf-dlep-radio/Makefile                 |  67 ++++++++++++
 oonf-dlep-radio/files/dlep_radio.hotplug |  12 +++
 oonf-dlep-radio/files/dlep_radio.init    | 124 +++++++++++++++++++++++
 oonf-dlep-radio/files/dlep_radio.uci     |  24 +++++
 oonf-olsrd2/Makefile                     |  67 ++++++++++++
 oonf-olsrd2/files/olsrd2.hotplug         |  12 +++
 oonf-olsrd2/files/olsrd2.init            | 124 +++++++++++++++++++++++
 oonf-olsrd2/files/olsrd2.uci             |  40 ++++++++
 12 files changed, 697 insertions(+)
 create mode 100644 oonf-dlep-proxy/Makefile
 create mode 100755 oonf-dlep-proxy/files/dlep_proxy.hotplug
 create mode 100755 oonf-dlep-proxy/files/dlep_proxy.init
 create mode 100644 oonf-dlep-proxy/files/dlep_proxy.uci
 create mode 100644 oonf-dlep-radio/Makefile
 create mode 100755 oonf-dlep-radio/files/dlep_radio.hotplug
 create mode 100755 oonf-dlep-radio/files/dlep_radio.init
 create mode 100644 oonf-dlep-radio/files/dlep_radio.uci
 create mode 100644 oonf-olsrd2/Makefile
 create mode 100755 oonf-olsrd2/files/olsrd2.hotplug
 create mode 100755 oonf-olsrd2/files/olsrd2.init
 create mode 100644 oonf-olsrd2/files/olsrd2.uci

diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
new file mode 100644
index 0000000..d84eeb3
--- /dev/null
+++ b/oonf-dlep-proxy/Makefile
@@ -0,0 +1,67 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=oonf-dlep-proxy
+PKG_VERSION:=0.8.2
+PKG_REV:=3ff448e33f1ea9dde8c74397028067caf3c65406
+PKG_RELEASE:=$(PKG_REV)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://olsr.org/git/oonf.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=$(PKG_REV)
+
+CMAKE_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \
+              -D OONF_LOGGING_LEVEL:String=debug \
+              -D OONF_NO_TESTING:Bool=true \
+              -D UCI:Bool=true \
+              -D OONF_APP_DEFAULT_CFG_HANDLER:String=uci \
+              -D OONF_STATIC_PLUGINS:String="class;clock;interface;layer2;packet_socket;socket;stream_socket;telnet;timer;viewer;os_clock;os_socket;os_interface;os_system;nl80211_listener;layer2info;systeminfo;cfg_uciloader;cfg_compact;dlep_proxy" \
+              -D OONF_LIB_GIT:String=v$(PKG_VERSION)-archive \
+              -D OONF_VERSION:String=$(PKG_VERSION) \
+              -D INSTALL_LIB_DIR:Path=lib/oonf \
+              -D INSTALL_INCLUDE_DIR:Path=include/oonf \
+              -D INSTALL_CMAKE_DIR:Path=lib/oonf \
+              -D CMAKE_PREFIX_PATH=$(STAGING_DIR)/usr
+
+define Package/oonf-git/template
+	SECTION:=net
+	CATEGORY:=Network
+	MAINTAINER:=Henning Rogge <hrogge@gmail.com>
+	SUBMENU:=OLSR.org network framework
+	URL:=http://www.olsr.org/
+endef
+
+define Package/oonf-dlep-proxy
+	$(call Package/oonf-git/template) 
+	TITLE:= Build DLEP Radio+Router Agent
+	DEPENDS:=+librt +libnl-tiny +libuci
+	VERSION:=$(PKG_VERSION)
+endef
+
+Build/Compile=$(call Build/Compile/Default,dlep_radio_static)
+Build/Install=
+
+define Build/Install
+	$(INSTALL_BIN) -D $(PKG_BUILD_DIR)/$(MAKE_PATH)/dlep_radio_static $(PKG_INSTALL_DIR)/usr/sbin/dlep_proxy;
+endef
+
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include -I${STAGING_DIR}/usr/include/libnl-tiny
+
+define Package/oonf-dlep-proxy/install
+	$(INSTALL_BIN)  -D $(PKG_BUILD_DIR)/dlep_radio_static $(1)/usr/sbin/dlep_proxy
+	$(INSTALL_BIN)  -D ./files/dlep_proxy.init            $(1)/etc/init.d/dlep_proxy
+	$(INSTALL_BIN)  -D ./files/dlep_proxy.hotplug         $(1)/etc/hotplug.d/iface/50-dlep_proxy
+	$(INSTALL_DATA) -D ./files/dlep_proxy.uci             $(1)/etc/config/dlep_proxy
+endef
+
+define Package/oonf-dlep-proxy/conffiles
+/etc/config/dlep_proxy
+endef
+
+$(eval $(call BuildPackage,oonf-dlep-proxy))
diff --git a/oonf-dlep-proxy/files/dlep_proxy.hotplug b/oonf-dlep-proxy/files/dlep_proxy.hotplug
new file mode 100755
index 0000000..e42e646
--- /dev/null
+++ b/oonf-dlep-proxy/files/dlep_proxy.hotplug
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+daemon=dlep_proxy
+
+case "$ACTION" in
+	ifup)
+		. /etc/rc.common /etc/init.d/${daemon} enabled && {
+			logger -t '${daemon}[hotplug]' -p daemon.info 'reloading configuration'
+			. /etc/rc.common /etc/init.d/${daemon} reload
+		}
+	;;
+esac
diff --git a/oonf-dlep-proxy/files/dlep_proxy.init b/oonf-dlep-proxy/files/dlep_proxy.init
new file mode 100755
index 0000000..fddbf01
--- /dev/null
+++ b/oonf-dlep-proxy/files/dlep_proxy.init
@@ -0,0 +1,124 @@
+#!/bin/sh /etc/rc.common
+
+START=82
+
+daemon=dlep_proxy
+
+. /usr/share/libubox/jshn.sh
+
+oonf_log()
+{
+  logger -s -t ${daemon} -p daemon.info "$1"
+}
+
+oonf_get_layer3_device()
+{
+  local interface="$1"  # e.g. 'mywifi'
+  local status dev proto
+  local query="{ \"interface\" : \"$interface\" }"
+
+  status="$( ubus -S call network.interface status "$query" )" && {
+    json_load "$status"
+    json_get_var 'dev' l3_device
+    json_get_var 'proto' proto
+    case "$proto" in
+      pppoe)
+        # TODO: otherwise it segfaults
+        oonf_log "refusing to add '$interface', because of proto '$proto'"
+      ;;
+      *)
+        echo "$dev" # e.g. 'wlan0-1'
+      ;;
+    esac
+  }
+}
+
+oonf_add_devices_to_configuration()
+{
+  local i=0
+  local device_name= section= interface= single_interface=
+
+  # make a copy of configuration and
+  # add a 'name' (physical name) for all
+  # 'interface-names' (e.g. mywifi)
+  #
+  # olsrd2.@interface[2]=interface
+  # olsrd2.@interface[2].ifname='wan lan wlanadhoc wlanadhocRADIO1'
+
+  # /var is in ramdisc/tmpfs
+  cp /etc/config/${daemon} /var/etc/${daemon}_dev
+
+  while section="$( uci -q -c /etc/config get "${daemon}.@[$i]" )"; do {
+    echo "section: $section"
+
+    interface="$( uci -q -c /etc/config get "${daemon}.@[$i].ifname" )" || {
+      i=$(( $i + 1 ))
+      continue
+    }
+
+    case "$( uci -q get "${daemon}.@[$i].ignore" )" in
+      1|on|true|enabled|yes)
+        oonf_log "removing/ignore section '$section'"
+        uci -q -c /var/etc delete "${daemon}_dev.@[$j]"
+        i=$(( $i + 1 ))
+
+        continue
+      ;;
+    esac
+
+    for single_interface in $interface; do {
+      device_name="$( oonf_get_layer3_device "$single_interface" )"
+
+      echo "Interface: $single_interface = $device_name"
+
+      if [ ! -z "$device_name" ]
+      then
+        # add option 'name' for 'ifname' (e.g. 'mywifi')
+        uci -q -c /var/etc add_list "${daemon}_dev.@[$i].name=$device_name"
+      fi
+    } done
+    i=$(( $i + 1 ))
+  } done
+
+  uci -q -c /var/etc commit ${daemon}_dev
+
+  oonf_log "wrote '/var/etc/${daemon}_dev'"
+}
+
+oonf_reread_config()
+{
+  local pid
+  local pidfile='/var/run/${daemon}.pid'
+
+  if   [ -e "$pidfile" ]; then
+    read pid <"$pidfile"
+  elif pidfile="$( uci -q get '${daemon}.@global[0].pidfile' )"; then
+    read pid <"$pidfile"
+  fi
+
+  # if empty, ask kernel
+  pid="${pid:-$( pidof ${daemon} )}"
+
+  [ -n "$pid" ] && kill -SIGHUP $pid
+}
+
+start()
+{
+  oonf_add_devices_to_configuration
+
+  # produce coredumps
+  ulimit -c unlimited
+
+  service_start /usr/sbin/${daemon} --set global.fork=true --load uci:///var/etc/${daemon}_dev
+}
+
+stop()
+{
+  service_stop /usr/sbin/${daemon}
+}
+
+reload()
+{
+  oonf_add_devices_to_configuration
+  oonf_reread_config
+}
diff --git a/oonf-dlep-proxy/files/dlep_proxy.uci b/oonf-dlep-proxy/files/dlep_proxy.uci
new file mode 100644
index 0000000..72a4d7d
--- /dev/null
+++ b/oonf-dlep-proxy/files/dlep_proxy.uci
@@ -0,0 +1,24 @@
+config global
+	option 'failfast'	'no'
+	option 'pidfile'	'/var/run/dlep_proxy.pid'
+	option 'lockfile'	'/var/lock/dlep_proxy'
+
+config log
+	option 'syslog'		'true'
+	option 'stderr'		'true'
+#	option 'file'		'/var/log/dlep_proxy.log'
+#	option 'info'		'all'
+#	option 'debug'		'all'
+
+config telnet
+#	option 'port' '2009'
+
+#config dlep_radio
+#  list 'name' 'eth0'
+#  option 'datapath_if' 'eth1'
+#  option 'not_proxied' 'false'
+#  option 'proxied' 'true'
+
+#config dlep-router
+#  list 'name' 'eth0'
+#  option 'datapath_if' 'eth0'
diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
new file mode 100644
index 0000000..72d8721
--- /dev/null
+++ b/oonf-dlep-radio/Makefile
@@ -0,0 +1,67 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=oonf-dlep-radio
+PKG_VERSION:=0.8.2
+PKG_REV:=3ff448e33f1ea9dde8c74397028067caf3c65406
+PKG_RELEASE:=$(PKG_REV)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://olsr.org/git/oonf.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=$(PKG_REV)
+
+CMAKE_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \
+              -D OONF_LOGGING_LEVEL:String=debug \
+              -D OONF_NO_TESTING:Bool=true \
+              -D UCI:Bool=true \
+              -D OONF_APP_DEFAULT_CFG_HANDLER:String=uci \
+              -D OONF_STATIC_PLUGINS:String="class;clock;interface;layer2;packet_socket;socket;stream_socket;telnet;timer;viewer;os_clock;os_socket;os_interface;os_system;nl80211_listener;layer2info;systeminfo;cfg_uciloader;cfg_compact;dlep_radio" \
+              -D OONF_LIB_GIT:String=v$(PKG_VERSION)-archive \
+              -D OONF_VERSION:String=$(PKG_VERSION) \
+              -D INSTALL_LIB_DIR:Path=lib/oonf \
+              -D INSTALL_INCLUDE_DIR:Path=include/oonf \
+              -D INSTALL_CMAKE_DIR:Path=lib/oonf \
+              -D CMAKE_PREFIX_PATH=$(STAGING_DIR)/usr
+
+define Package/oonf-git/template
+	SECTION:=net
+	CATEGORY:=Network
+	MAINTAINER:=Henning Rogge <hrogge@gmail.com>
+	SUBMENU:=OLSR.org network framework
+	URL:=http://www.olsr.org/
+endef
+
+define Package/oonf-dlep-radio
+	$(call Package/oonf-git/template) 
+	TITLE:= Build DLEP Radio Agent
+	DEPENDS:=+librt +libnl-tiny +libuci
+	VERSION:=$(PKG_VERSION)
+endef
+
+Build/Compile=$(call Build/Compile/Default,dlep_radio_static)
+Build/Install=
+
+define Build/Install
+	$(INSTALL_BIN) -D $(PKG_BUILD_DIR)/$(MAKE_PATH)/dlep_radio_static $(PKG_INSTALL_DIR)/usr/sbin/dlep_radio;
+endef
+
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include -I${STAGING_DIR}/usr/include/libnl-tiny
+
+define Package/oonf-dlep-radio/install
+	$(INSTALL_BIN)  -D $(PKG_BUILD_DIR)/dlep_radio_static $(1)/usr/sbin/dlep_radio
+	$(INSTALL_BIN)  -D ./files/dlep_radio.init            $(1)/etc/init.d/dlep_radio
+	$(INSTALL_BIN)  -D ./files/dlep_radio.hotplug         $(1)/etc/hotplug.d/iface/50-dlep_radio
+	$(INSTALL_DATA) -D ./files/dlep_radio.uci             $(1)/etc/config/dlep_radio
+endef
+
+define Package/oonf-dlep-radio/conffiles
+/etc/config/dlep_radio
+endef
+
+$(eval $(call BuildPackage,oonf-dlep-radio))
diff --git a/oonf-dlep-radio/files/dlep_radio.hotplug b/oonf-dlep-radio/files/dlep_radio.hotplug
new file mode 100755
index 0000000..87d1dbe
--- /dev/null
+++ b/oonf-dlep-radio/files/dlep_radio.hotplug
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+daemon=dlep_radio
+
+case "$ACTION" in
+	ifup)
+		. /etc/rc.common /etc/init.d/${daemon} enabled && {
+			logger -t '${daemon}[hotplug]' -p daemon.info 'reloading configuration'
+			. /etc/rc.common /etc/init.d/${daemon} reload
+		}
+	;;
+esac
diff --git a/oonf-dlep-radio/files/dlep_radio.init b/oonf-dlep-radio/files/dlep_radio.init
new file mode 100755
index 0000000..be22ed1
--- /dev/null
+++ b/oonf-dlep-radio/files/dlep_radio.init
@@ -0,0 +1,124 @@
+#!/bin/sh /etc/rc.common
+
+START=82
+
+daemon=dlep_radio
+
+. /usr/share/libubox/jshn.sh
+
+oonf_log()
+{
+  logger -s -t ${daemon} -p daemon.info "$1"
+}
+
+oonf_get_layer3_device()
+{
+  local interface="$1"  # e.g. 'mywifi'
+  local status dev proto
+  local query="{ \"interface\" : \"$interface\" }"
+
+  status="$( ubus -S call network.interface status "$query" )" && {
+    json_load "$status"
+    json_get_var 'dev' l3_device
+    json_get_var 'proto' proto
+    case "$proto" in
+      pppoe)
+        # TODO: otherwise it segfaults
+        oonf_log "refusing to add '$interface', because of proto '$proto'"
+      ;;
+      *)
+        echo "$dev" # e.g. 'wlan0-1'
+      ;;
+    esac
+  }
+}
+
+oonf_add_devices_to_configuration()
+{
+  local i=0
+  local device_name= section= interface= single_interface=
+
+  # make a copy of configuration and
+  # add a 'name' (physical name) for all
+  # 'interface-names' (e.g. mywifi)
+  #
+  # olsrd2.@interface[2]=interface
+  # olsrd2.@interface[2].ifname='wan lan wlanadhoc wlanadhocRADIO1'
+
+  # /var is in ramdisc/tmpfs
+  cp /etc/config/${daemon} /var/etc/${daemon}_dev
+
+  while section="$( uci -q -c /etc/config get "${daemon}.@[$i]" )"; do {
+    echo "section: $section"
+
+    interface="$( uci -q -c /etc/config get "${daemon}.@[$i].ifname" )" || {
+      i=$(( $i + 1 ))
+      continue
+    }
+
+    case "$( uci -q get "${daemon}.@[$i].ignore" )" in
+      1|on|true|enabled|yes)
+        oonf_log "removing/ignore section '$section'"
+        uci -q -c /var/etc delete "${daemon}_dev.@[$j]"
+        i=$(( $i + 1 ))
+
+        continue
+      ;;
+    esac
+
+    for single_interface in $interface; do {
+      device_name="$( oonf_get_layer3_device "$single_interface" )"
+
+      echo "Interface: $single_interface = $device_name"
+
+      if [ ! -z "$device_name" ]
+      then
+        # add option 'name' for 'ifname' (e.g. 'mywifi')
+        uci -q -c /var/etc add_list "${daemon}_dev.@[$i].name=$device_name"
+      fi
+    } done
+    i=$(( $i + 1 ))
+  } done
+
+  uci -q -c /var/etc commit ${daemon}_dev
+
+  oonf_log "wrote '/var/etc/${daemon}_dev'"
+}
+
+oonf_reread_config()
+{
+  local pid
+  local pidfile='/var/run/${daemon}.pid'
+
+  if   [ -e "$pidfile" ]; then
+    read pid <"$pidfile"
+  elif pidfile="$( uci -q get '${daemon}.@global[0].pidfile' )"; then
+    read pid <"$pidfile"
+  fi
+
+  # if empty, ask kernel
+  pid="${pid:-$( pidof ${daemon} )}"
+
+  [ -n "$pid" ] && kill -SIGHUP $pid
+}
+
+start()
+{
+  oonf_add_devices_to_configuration
+
+  # produce coredumps
+  ulimit -c unlimited
+
+  service_start /usr/sbin/${daemon} --set global.fork=true --load uci:///var/etc/${daemon}_dev
+}
+
+stop()
+{
+  service_stop /usr/sbin/${daemon}
+}
+
+reload()
+{
+  oonf_add_devices_to_configuration
+  oonf_reread_config
+}
diff --git a/oonf-dlep-radio/files/dlep_radio.uci b/oonf-dlep-radio/files/dlep_radio.uci
new file mode 100644
index 0000000..2f1ac9b
--- /dev/null
+++ b/oonf-dlep-radio/files/dlep_radio.uci
@@ -0,0 +1,24 @@
+config global
+	option 'failfast' 'no'
+	option 'pidfile'  '/var/run/dlep_radio.pid'
+	option 'lockfile' '/var/lock/dlep_radio'
+
+config log
+	option 'syslog'   'true'
+	option 'stderr'   'true'
+#	option 'file'		  '/var/log/dlep_radio.log'
+#	option 'info'     'all'
+#	option 'debug'    'all'
+
+config telnet
+#	option 'port' '2009'
+
+config dlep_radio
+  list   'name'        'wlan0'
+  option 'datapath_if' 'br-lan'
+  option 'not_proxied' 'false'
+  option 'proxied'     'true'
+
+config nl80211_listener
+  option 'if'          'wlan0'
+  option 'interval'    '1.0'
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
new file mode 100644
index 0000000..005905e
--- /dev/null
+++ b/oonf-olsrd2/Makefile
@@ -0,0 +1,67 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=oonf-olsrd2
+PKG_VERSION:=0.8.2
+PKG_REV:=3ff448e33f1ea9dde8c74397028067caf3c65406
+PKG_RELEASE:=$(PKG_REV)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://olsr.org/git/oonf.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=$(PKG_REV)
+
+CMAKE_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \
+              -D OONF_LOGGING_LEVEL:String=debug \
+              -D OONF_NO_TESTING:Bool=true \
+              -D UCI:Bool=true \
+              -D OONF_APP_DEFAULT_CFG_HANDLER:String=uci \
+              -D OONF_STATIC_PLUGINS:String="class;clock;duplicate_set;interface;layer2;packet_socket;rfc5444;socket;stream_socket;telnet;timer;viewer;os_clock;os_socket;os_interface;os_routing;os_system;nhdp;olsrv2;ff_dat_metric;neighbor_probing;nl80211_listener;link_config;layer2info;systeminfo;cfg_uciloader;cfg_compact;nhdpinfo;olsrv2info;json_for_networks" \
+              -D OONF_LIB_GIT:String=v$(PKG_VERSION)-archive \
+              -D OONF_VERSION:String=$(PKG_VERSION) \
+              -D INSTALL_LIB_DIR:Path=lib/oonf \
+              -D INSTALL_INCLUDE_DIR:Path=include/oonf \
+              -D INSTALL_CMAKE_DIR:Path=lib/oonf \
+              -D CMAKE_PREFIX_PATH=$(STAGING_DIR)/usr
+
+define Package/oonf-git/template
+	SECTION:=net
+	CATEGORY:=Network
+	MAINTAINER:=Henning Rogge <hrogge@gmail.com>
+	SUBMENU:=OLSR.org network framework
+	URL:=http://www.olsr.org/
+endef
+
+define Package/oonf-olsrd2
+	$(call Package/oonf-git/template) 
+	TITLE:= Build Olsrd V2 Routing Agent
+	DEPENDS:=+librt +libnl-tiny +libuci
+	VERSION:=$(PKG_VERSION)
+endef
+
+Build/Compile=$(call Build/Compile/Default,olsrd2_static)
+Build/Install=
+
+define Build/Install
+	$(INSTALL_BIN) -D $(PKG_BUILD_DIR)/$(MAKE_PATH)/olsrd2_static $(PKG_INSTALL_DIR)/usr/sbin/olsrd2;
+endef
+
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include -I${STAGING_DIR}/usr/include/libnl-tiny
+
+define Package/oonf-olsrd2/install
+	$(INSTALL_BIN)  -D $(PKG_BUILD_DIR)/olsrd2_static $(1)/usr/sbin/olsrd2
+	$(INSTALL_BIN)  -D ./files/olsrd2.init            $(1)/etc/init.d/olsrd2
+	$(INSTALL_BIN)  -D ./files/olsrd2.hotplug         $(1)/etc/hotplug.d/iface/50-olsrd2
+	$(INSTALL_DATA) -D ./files/olsrd2.uci             $(1)/etc/config/olsrd2
+endef
+
+define Package/oonf-olsrd2/conffiles
+/etc/config/olsrd2
+endef
+
+$(eval $(call BuildPackage,oonf-olsrd2))
diff --git a/oonf-olsrd2/files/olsrd2.hotplug b/oonf-olsrd2/files/olsrd2.hotplug
new file mode 100755
index 0000000..a67de86
--- /dev/null
+++ b/oonf-olsrd2/files/olsrd2.hotplug
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+daemon=olsrd2
+
+case "$ACTION" in
+	ifup)
+		. /etc/rc.common /etc/init.d/${daemon} enabled && {
+			logger -t '${daemon}[hotplug]' -p daemon.info 'reloading configuration'
+			. /etc/rc.common /etc/init.d/${daemon} reload
+		}
+	;;
+esac
diff --git a/oonf-olsrd2/files/olsrd2.init b/oonf-olsrd2/files/olsrd2.init
new file mode 100755
index 0000000..3f3b667
--- /dev/null
+++ b/oonf-olsrd2/files/olsrd2.init
@@ -0,0 +1,124 @@
+#!/bin/sh /etc/rc.common
+
+START=82
+
+daemon=olsrd2
+
+. /usr/share/libubox/jshn.sh
+
+oonf_log()
+{
+  logger -s -t ${daemon} -p daemon.info "$1"
+}
+
+oonf_get_layer3_device()
+{
+  local interface="$1"  # e.g. 'mywifi'
+  local status dev proto
+  local query="{ \"interface\" : \"$interface\" }"
+
+  status="$( ubus -S call network.interface status "$query" )" && {
+    json_load "$status"
+    json_get_var 'dev' l3_device
+    json_get_var 'proto' proto
+    case "$proto" in
+      pppoe)
+        # TODO: otherwise it segfaults
+        oonf_log "refusing to add '$interface', because of proto '$proto'"
+      ;;
+      *)
+        echo "$dev" # e.g. 'wlan0-1'
+      ;;
+    esac
+  }
+}
+
+oonf_add_devices_to_configuration()
+{
+  local i=0
+  local device_name= section= interface= single_interface=
+
+  # make a copy of configuration and
+  # add a 'name' (physical name) for all
+  # 'interface-names' (e.g. mywifi)
+  #
+  # olsrd2.@interface[2]=interface
+  # olsrd2.@interface[2].ifname='wan lan wlanadhoc wlanadhocRADIO1'
+
+  # /var is in ramdisc/tmpfs
+  cp /etc/config/${daemon} /var/etc/${daemon}_dev
+
+  while section="$( uci -q -c /etc/config get "${daemon}.@[$i]" )"; do {
+    echo "section: $section"
+
+    interface="$( uci -q -c /etc/config get "${daemon}.@[$i].ifname" )" || {
+      i=$(( $i + 1 ))
+      continue
+    }
+
+    case "$( uci -q get "${daemon}.@[$i].ignore" )" in
+      1|on|true|enabled|yes)
+        oonf_log "removing/ignore section '$section'"
+        uci -q -c /var/etc delete "${daemon}_dev.@[$j]"
+        i=$(( $i + 1 ))
+
+        continue
+      ;;
+    esac
+
+    for single_interface in $interface; do {
+      device_name="$( oonf_get_layer3_device "$single_interface" )"
+
+      echo "Interface: $single_interface = $device_name"
+
+      if [ ! -z "$device_name" ]
+      then
+        # add option 'name' for 'ifname' (e.g. 'mywifi')
+        uci -q -c /var/etc add_list "${daemon}_dev.@[$i].name=$device_name"
+      fi
+    } done
+    i=$(( $i + 1 ))
+  } done
+
+  uci -q -c /var/etc commit ${daemon}_dev
+
+  oonf_log "wrote '/var/etc/${daemon}_dev'"
+}
+
+oonf_reread_config()
+{
+  local pid
+  local pidfile='/var/run/${daemon}.pid'
+
+  if   [ -e "$pidfile" ]; then
+    read pid <"$pidfile"
+  elif pidfile="$( uci -q get '${daemon}.@global[0].pidfile' )"; then
+    read pid <"$pidfile"
+  fi
+
+  # if empty, ask kernel
+  pid="${pid:-$( pidof ${daemon} )}"
+
+  [ -n "$pid" ] && kill -SIGHUP $pid
+}
+
+start()
+{
+  oonf_add_devices_to_configuration
+
+  # produce coredumps
+  ulimit -c unlimited
+
+  service_start /usr/sbin/${daemon} --set global.fork=true --load uci:///var/etc/${daemon}_dev
+}
+
+stop()
+{
+  service_stop /usr/sbin/${daemon}
+}
+
+reload()
+{
+  oonf_add_devices_to_configuration
+  oonf_reread_config
+}
diff --git a/oonf-olsrd2/files/olsrd2.uci b/oonf-olsrd2/files/olsrd2.uci
new file mode 100644
index 0000000..9df4c7e
--- /dev/null
+++ b/oonf-olsrd2/files/olsrd2.uci
@@ -0,0 +1,40 @@
+config global
+	option 'failfast'	'no'
+	option 'pidfile'	'/var/run/olsrd2.pid'
+	option 'lockfile'	'/var/lock/olsrd2'
+
+config log
+	option 'syslog'		'true'
+	option 'stderr'		'true'
+#	option 'file'		'/var/log/olsrd2.log'
+#	option 'info'		'all'
+#	option 'debug'		'all'
+
+config telnet
+#	option 'port' '2009'
+
+config olsrv2
+# list 'lan' '::/0'
+# list 'lan' '0.0.0.0/0'
+
+config interface
+	option 'ifname' 'loopback'
+
+config interface
+	list 'ifname' 'WIFI'
+	list 'ifname' 'wlanadhoc'
+	list 'ifname' 'wlanadhocRADIO1'
+
+config interface
+	list 'ifname' 'wan'
+	option 'ignore' '1'
+#	option 'rx_bitrate' '100M'
+#	option 'tx_bitrate' '100M'
+#	option 'signal' '-20'
+
+config interface
+	list 'ifname' 'lan'
+	option 'ignore' '1'
+#	option 'rx_bitrate' '1G'
+#	option 'tx_bitrate' '1G'
+#	option 'signal' '-10'

From 5b541ca8aae71a2dfe01d5cfe5d728a761ce6ffb Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Tue, 9 Jun 2015 08:43:56 +0200
Subject: [PATCH 111/368] hnetd: stability improvements

Signed-off-by: Steven Barth <steven@midlink.org>
---
 hnetd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hnetd/Makefile b/hnetd/Makefile
index 03c2db4..bc69dc8 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hnetd
-PKG_SOURCE_VERSION:=86da3551277dc5b21e9382233c3ce66a154ab670
-PKG_VERSION:=2015-05-28-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=161577ac28741f70794f67539d8994ff0fbd713e
+PKG_VERSION:=2015-06-09-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git

From 4dc2c500ffde0e248dbc83e5bd904ec0c9af0c42 Mon Sep 17 00:00:00 2001
From: Marek Lindner <mareklindner@neomailbox.ch>
Date: Tue, 9 Jun 2015 22:11:41 +0800
Subject: [PATCH 112/368] batman-adv: upgrade package to latest release 2015.0

Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
 batman-adv/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 6909ba8..8a932aa 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
 
-PKG_VERSION:=2014.4.0
+PKG_VERSION:=2015.0
 PKG_RELEASE:=1
-PKG_MD5SUM:=b1518e84ce530883d224c6ca4c673ce8
+PKG_MD5SUM:=178b082266a8bfb3041178a0c821d843
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From aca8cb6ee36812f05aacba48602666abbd02d0d6 Mon Sep 17 00:00:00 2001
From: Marek Lindner <mareklindner@neomailbox.ch>
Date: Tue, 9 Jun 2015 22:12:34 +0800
Subject: [PATCH 113/368] batman-adv: upgrade package to latest release 2015.0

Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
 batctl/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/batctl/Makefile b/batctl/Makefile
index 48407e9..74bb384 100644
--- a/batctl/Makefile
+++ b/batctl/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batctl
 
-PKG_VERSION:=2014.4.0
+PKG_VERSION:=2015.0
 PKG_RELEASE:=1
-PKG_MD5SUM:=f3a14565699313258ee6ba3de783eb0a
+PKG_MD5SUM:=d28ad89d71888ad6b99a1f6b30c9d47c
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From 4c2234b2eace186d235e9fb24ff5cb6bfa10c7c8 Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Mon, 15 Jun 2015 11:12:41 +0300
Subject: [PATCH 114/368] miniupnpd: Bump to 1.9.20150609.

---
 miniupnpd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index 1eac6c1..0abe480 100644
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
-PKG_VERSION:=1.9.20150430
+PKG_VERSION:=1.9.20150609
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=996ccae8aa2535a83ed4618c63080978
+PKG_MD5SUM:=01ee891286683891240a29b7272d790e
 
 PKG_MAINTAINER:=Markus Stenberg <fingon@iki.fi>
 PKG_LICENSE:=BSD-3-Clause

From b760a5e09d5a2ba3a4de5a19258ebdbb3d9cf846 Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Tue, 16 Jun 2015 15:19:15 +0200
Subject: [PATCH 115/368] bmx6: bump to latest (auto tunOutTimeout) version

---
 bmx6/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bmx6/Makefile b/bmx6/Makefile
index ab91310..4ac6af4 100644
--- a/bmx6/Makefile
+++ b/bmx6/Makefile
@@ -31,8 +31,8 @@ PKG_SOURCE_PROTO:=git
 #PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
 PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 
-PKG_REV:=b6107880b5460625b7ce9359dbeac0cfe863f58c
-PKG_VERSION:=r2015060501
+PKG_REV:=8f26909e8808ed7fab0359afc15a3e44563fbd40
+PKG_VERSION:=r2015061604
 PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 
@@ -49,7 +49,7 @@ TARGET_CFLAGS += $(FPIC)
 MAKE_ARGS += \
 	EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DNO_DEBUG_ALL -DNO_DEBUG_DUMP" \
 	EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib " \
-	REVISION_VERSION="$(PKG_REV)" \
+	GIT_REV="$(PKG_REV)" \
 	CC="$(TARGET_CC)" \
 	INSTALL_DIR="$(PKG_INSTALL_DIR)" \
 	STRIP="/bin/false" \

From 2a636973ebddacbbe50dda8bb837bbc720e99a51 Mon Sep 17 00:00:00 2001
From: Gabriel Kerneis <kerneis@google.com>
Date: Wed, 17 Jun 2015 10:56:44 +0200
Subject: [PATCH 116/368] babeld: bump to 1.6.1

16 June 2015: babeld-1.6.1.
  * Fixed a buffer overflow in zone_equal.  This is probably not
    exploitable, but might cause incorrect routing tables in the presence
    of source-specific routing.
  * Added support for defaulting ipv6-subtrees automatically based on the
    kernel version.
  * Fixed compilation under musl.

Signed-off-by: Gabriel Kerneis <kerneis@google.com>
---
 babeld/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/babeld/Makefile b/babeld/Makefile
index 4247d91..ec1d247 100644
--- a/babeld/Makefile
+++ b/babeld/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=babeld
-PKG_VERSION:=1.6.0
-PKG_RELEASE:=3
+PKG_VERSION:=1.6.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/files/
-PKG_MD5SUM:=b0602a6124ddafb37225bd1a2d8abb13
+PKG_MD5SUM:=74290f6c3678f314c79bdc0ab99d9f22
 PKG_LICENSE:=MIT
 
 include $(INCLUDE_DIR)/package.mk

From 09beed4a4aa120f3f5a505c8763caa03510a0372 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Wed, 17 Jun 2015 10:47:00 +0200
Subject: [PATCH 117/368] hnetd: stability improvements

Signed-off-by: Steven Barth <steven@midlink.org>
---
 hnetd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hnetd/Makefile b/hnetd/Makefile
index bc69dc8..ec29487 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hnetd
-PKG_SOURCE_VERSION:=161577ac28741f70794f67539d8994ff0fbd713e
-PKG_VERSION:=2015-06-09-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=18ee17f3d18a4c0159e53e0716831bf2fbe506cd
+PKG_VERSION:=2015-06-17-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git

From 898cc963d6320948cb84005caf5695a55d33c2ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
Date: Wed, 17 Jun 2015 19:51:26 +0200
Subject: [PATCH 118/368] mcproxy: fix build with musl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 mcproxy/Makefile                                              | 2 +-
 .../patches/{0002-uclibc-rm-stoi.patch => 0002-rm-stoi.patch} | 0
 ...ibc-add-sourcefilter.patch => 0003-add-sourcefilter.patch} | 4 ++--
 .../{0004-uclibc-add-defs.patch => 0004-add-defs.patch}       | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename mcproxy/patches/{0002-uclibc-rm-stoi.patch => 0002-rm-stoi.patch} (100%)
 rename mcproxy/patches/{0003-uclibc-add-sourcefilter.patch => 0003-add-sourcefilter.patch} (99%)
 rename mcproxy/patches/{0004-uclibc-add-defs.patch => 0004-add-defs.patch} (80%)

diff --git a/mcproxy/Makefile b/mcproxy/Makefile
index be96bc7..c155055 100644
--- a/mcproxy/Makefile
+++ b/mcproxy/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=mcproxy
 PKG_SOURCE_VERSION:=b7bd2d0809a0d1f177181c361b9a6c83e193b79a
 PKG_VERSION:=2014-12-31-$(PKG_SOURCE_VERSION)
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/mcproxy/mcproxy.git
diff --git a/mcproxy/patches/0002-uclibc-rm-stoi.patch b/mcproxy/patches/0002-rm-stoi.patch
similarity index 100%
rename from mcproxy/patches/0002-uclibc-rm-stoi.patch
rename to mcproxy/patches/0002-rm-stoi.patch
diff --git a/mcproxy/patches/0003-uclibc-add-sourcefilter.patch b/mcproxy/patches/0003-add-sourcefilter.patch
similarity index 99%
rename from mcproxy/patches/0003-uclibc-add-sourcefilter.patch
rename to mcproxy/patches/0003-add-sourcefilter.patch
index 7c4e90c..2f64975 100644
--- a/mcproxy/patches/0003-uclibc-add-sourcefilter.patch
+++ b/mcproxy/patches/0003-add-sourcefilter.patch
@@ -4,9 +4,9 @@
  #include <numeric>
  #include <unistd.h>
  
-+#ifdef __UCLIBC__
++#ifndef __GLIBC__
 +#include "sourcefilter.cpp"
-+#endif /* __UCLIBC__ */
++#endif /* __GLIBC__ */
 +
  std::string ipAddrResolver(std::string ipAddr)
  {
diff --git a/mcproxy/patches/0004-uclibc-add-defs.patch b/mcproxy/patches/0004-add-defs.patch
similarity index 80%
rename from mcproxy/patches/0004-uclibc-add-defs.patch
rename to mcproxy/patches/0004-add-defs.patch
index 022cb02..a1105c9 100644
--- a/mcproxy/patches/0004-uclibc-add-defs.patch
+++ b/mcproxy/patches/0004-add-defs.patch
@@ -3,9 +3,9 @@
 @@ -38,6 +38,8 @@
  #include <unistd.h>
  
- #ifdef __UCLIBC__
+ #ifndef __GLIBC__
 +#define IP_MULTICAST_ALL 49
 +
  #include "sourcefilter.cpp"
- #endif /* __UCLIBC__ */
+ #endif /* __GLIBC__ */
  

From 2c58742f63e3be9c01b36fff8a035885e71fa331 Mon Sep 17 00:00:00 2001
From: Bastian Bittorf <bittorf@bluebottle.com>
Date: Thu, 18 Jun 2015 20:08:31 +0200
Subject: [PATCH 119/368] olsrd: bump to version 0.9.1 (bugfixes)

We did a bug-fix release of olsrd v1.
It fixes a route-recalculation issue and at least one crash.

Everyone using olsrd v1 is strongly urged to upgrade, especially people
using Smart-Gateway.

The shortlog is appended.

0.9.0.1 -------------------------------------------------------------------

Ferry Huberts (3):
      neighbors: signal link changes when deleting a neighbor
      jsoninfo: do not output smart-gateway info when not enabled.
      txtinfo: do not output smart-gateway info when not enabled.

Henning Rogge (2):
      Update version after release of v0.9.0
      Release v0.9.0.1
---
 olsrd/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/olsrd/Makefile b/olsrd/Makefile
index 3999d3c..a72dd84 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
-PKG_VERSION:=0.9.0
-PKG_RELEASE:=3
+PKG_VERSION:=0.9.1
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.9
 
-PKG_MD5SUM:=65376afff4fc4963fcaf1aa0ad8185d4
+PKG_MD5SUM:=5dec2c08e7bbec6789af7279e7aafc6c
 PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=BSD-3-Clause
 

From fcf34a758ee90cdf3c03c39cc2e52f91388c5799 Mon Sep 17 00:00:00 2001
From: Bastian Bittorf <bittorf@bluebottle.com>
Date: Fri, 19 Jun 2015 13:19:57 +0200
Subject: [PATCH 120/368] olsrd: Makefile version typo: 0.9.1 -> 0.9.0.1

---
 olsrd/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/olsrd/Makefile b/olsrd/Makefile
index a72dd84..02adc92 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
-PKG_VERSION:=0.9.1
+PKG_VERSION:=0.9.0.1
 PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

From 54b696ef529eb45859370dd996a8ff2f64b75bd3 Mon Sep 17 00:00:00 2001
From: Marek Lindner <mareklindner@neomailbox.ch>
Date: Sun, 21 Jun 2015 19:04:04 +0800
Subject: [PATCH 121/368] batman-adv: 2015.0 bugfixes & stability updates

Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
 ...d-u32-overflow-during-gateway-select.patch |  42 +++
 ...n-adv-avoid-DAT-to-mess-up-LAN-state.patch |  74 +++++
 ...v-Make-DAT-capability-changes-atomic.patch |  54 ++++
 ...dv-Make-NC-capability-changes-atomic.patch |  40 +++
 ...dv-Make-TT-capability-changes-atomic.patch |  60 +++++
 ...Make-MCAST-capability-changes-atomic.patch |  50 ++++
 ...otential-synchronization-issues-in-m.patch | 254 ++++++++++++++++++
 ...ompile-error-on-deactivated-MCAST-fe.patch |  58 ++++
 ...ernel-crash-due-to-missing-NULL-chec.patch |  93 +++++++
 ...ct-tt_local_entry-from-concurrent-de.patch |  55 ++++
 10 files changed, 780 insertions(+)
 create mode 100644 batman-adv/patches/0001-batman-adv-Avoid-u32-overflow-during-gateway-select.patch
 create mode 100644 batman-adv/patches/0002-batman-adv-avoid-DAT-to-mess-up-LAN-state.patch
 create mode 100644 batman-adv/patches/0003-batman-adv-Make-DAT-capability-changes-atomic.patch
 create mode 100644 batman-adv/patches/0004-batman-adv-Make-NC-capability-changes-atomic.patch
 create mode 100644 batman-adv/patches/0005-batman-adv-Make-TT-capability-changes-atomic.patch
 create mode 100644 batman-adv/patches/0006-batman-adv-Make-MCAST-capability-changes-atomic.patch
 create mode 100644 batman-adv/patches/0007-batman-adv-Fix-potential-synchronization-issues-in-m.patch
 create mode 100644 batman-adv/patches/0008-batman-adv-Fix-compile-error-on-deactivated-MCAST-fe.patch
 create mode 100644 batman-adv/patches/0009-batman-adv-fix-kernel-crash-due-to-missing-NULL-chec.patch
 create mode 100644 batman-adv/patches/0010-batman-adv-protect-tt_local_entry-from-concurrent-de.patch

diff --git a/batman-adv/patches/0001-batman-adv-Avoid-u32-overflow-during-gateway-select.patch b/batman-adv/patches/0001-batman-adv-Avoid-u32-overflow-during-gateway-select.patch
new file mode 100644
index 0000000..2955e75
--- /dev/null
+++ b/batman-adv/patches/0001-batman-adv-Avoid-u32-overflow-during-gateway-select.patch
@@ -0,0 +1,42 @@
+From f63c54bba31d2c86269982fd8efdfb618f1daabe Mon Sep 17 00:00:00 2001
+From: Ruben Wisniewski <ruben@freifunk-nrw.de>
+Date: Tue, 26 May 2015 18:34:27 +0200
+Subject: [PATCH 01/10] batman-adv: Avoid u32 overflow during gateway select
+
+The gateway selection based on fast connections is using a single value
+calculated from the average tq (0-255) and the download bandwidth (in
+100Kibit). The formula for the first step (tq ** 2 * 10000 * bandwidth)
+tends to overflow a u32 with low bandwidth settings like 50 [100KiBit]
+and a tq value of over 92.
+
+Changing this to a 64 bit unsigned integer allows to support a
+bandwidth_down with up to ~2.8e10 [100KiBit] and a perfect tq of 255. This
+is ~6.6 times higher than the maximum possible value of the gateway
+announcement TVLV.
+
+This problem only affects the non-default gw_sel_class 1.
+
+Signed-off-by: Ruben Wisniewsi <ruben@vfn-nrw.de>
+[sven@narfation.org: rewritten commit message, changed to kernel type]
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ gateway_client.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gateway_client.c b/gateway_client.c
+index a85eaca..3f32357 100644
+--- a/gateway_client.c
++++ b/gateway_client.c
+@@ -133,7 +133,7 @@ batadv_gw_get_best_gw_node(struct batadv_priv *bat_priv)
+ 	struct batadv_neigh_node *router;
+ 	struct batadv_neigh_ifinfo *router_ifinfo;
+ 	struct batadv_gw_node *gw_node, *curr_gw = NULL;
+-	uint32_t max_gw_factor = 0, tmp_gw_factor = 0;
++	uint64_t max_gw_factor = 0, tmp_gw_factor = 0;
+ 	uint32_t gw_divisor;
+ 	uint8_t max_tq = 0;
+ 	uint8_t tq_avg;
+-- 
+2.1.4
+
diff --git a/batman-adv/patches/0002-batman-adv-avoid-DAT-to-mess-up-LAN-state.patch b/batman-adv/patches/0002-batman-adv-avoid-DAT-to-mess-up-LAN-state.patch
new file mode 100644
index 0000000..bdc0d4a
--- /dev/null
+++ b/batman-adv/patches/0002-batman-adv-avoid-DAT-to-mess-up-LAN-state.patch
@@ -0,0 +1,74 @@
+From 9bbd794030657fe0d38590cd67d4801b989cebf9 Mon Sep 17 00:00:00 2001
+From: Antonio Quartulli <antonio@meshcoding.com>
+Date: Mon, 1 Jun 2015 17:29:57 +0200
+Subject: [PATCH 02/10] batman-adv: avoid DAT to mess up LAN state
+
+When a node running DAT receives an ARP request from the LAN for the
+first time, it is likely that this node will request the ARP entry
+through the distributed ARP table (DAT) in the mesh.
+
+Once a DAT reply is received the asking node must check if the MAC
+address for which the IP address has been asked is local. If it is, the
+node must drop the ARP reply bceause the client should have replied on
+its own locally.
+
+Forwarding this reply means fooling any L2 bridge (e.g. Ethernet
+switches) lying between the batman-adv node and the LAN. This happens
+because the L2 bridge will think that the client sending the ARP reply
+lies somewhere in the mesh, while this node is sitting in the same LAN.
+
+Reported-by: Simon Wunderlich <sw@simonwunderlich.de>
+Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ distributed-arp-table.c | 18 +++++++++++++-----
+ 1 file changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/distributed-arp-table.c b/distributed-arp-table.c
+index da1742d..0d791dc 100644
+--- a/distributed-arp-table.c
++++ b/distributed-arp-table.c
+@@ -1107,6 +1107,9 @@ void batadv_dat_snoop_outgoing_arp_reply(struct batadv_priv *bat_priv,
+  * @bat_priv: the bat priv with all the soft interface information
+  * @skb: packet to check
+  * @hdr_size: size of the encapsulation header
++ *
++ * Returns true if the packet was snooped and consumed by DAT. False if the
++ * packet has to be delivered to the interface
+  */
+ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv,
+ 					 struct sk_buff *skb, int hdr_size)
+@@ -1114,7 +1117,7 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv,
+ 	uint16_t type;
+ 	__be32 ip_src, ip_dst;
+ 	uint8_t *hw_src, *hw_dst;
+-	bool ret = false;
++	bool dropped = false;
+ 	unsigned short vid;
+ 
+ 	if (!atomic_read(&bat_priv->distributed_arp_table))
+@@ -1143,12 +1146,17 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv,
+ 	/* if this REPLY is directed to a client of mine, let's deliver the
+ 	 * packet to the interface
+ 	 */
+-	ret = !batadv_is_my_client(bat_priv, hw_dst, vid);
++	dropped = !batadv_is_my_client(bat_priv, hw_dst, vid);
++
++	/* if this REPLY is sent on behalf of a client of mine, let's drop the
++	 * packet because the client will reply by itself
++	 */
++	dropped |= batadv_is_my_client(bat_priv, hw_src, vid);
+ out:
+-	if (ret)
++	if (dropped)
+ 		kfree_skb(skb);
+-	/* if ret == false -> packet has to be delivered to the interface */
+-	return ret;
++	/* if dropped == false -> deliver to the interface */
++	return dropped;
+ }
+ 
+ /**
+-- 
+2.1.4
+
diff --git a/batman-adv/patches/0003-batman-adv-Make-DAT-capability-changes-atomic.patch b/batman-adv/patches/0003-batman-adv-Make-DAT-capability-changes-atomic.patch
new file mode 100644
index 0000000..aa8718a
--- /dev/null
+++ b/batman-adv/patches/0003-batman-adv-Make-DAT-capability-changes-atomic.patch
@@ -0,0 +1,54 @@
+From bfd0fbaef270ac4ed8e4457a38ef8d91190c0540 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
+Date: Tue, 16 Jun 2015 17:10:22 +0200
+Subject: [PATCH 03/10] batman-adv: Make DAT capability changes atomic
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Bitwise OR/AND assignments in C aren't guaranteed to be atomic. One
+OGM handler might undo the set/clear of a specific bit from another
+handler run in between.
+
+Fix this by using the atomic set_bit()/clear_bit() functions.
+
+Fixes: 2b1c07b918d2 ("batman-adv: tvlv - add distributed arp table container")
+Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ distributed-arp-table.c | 4 ++--
+ types.h                 | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/distributed-arp-table.c b/distributed-arp-table.c
+index 0d791dc..b2cc19b 100644
+--- a/distributed-arp-table.c
++++ b/distributed-arp-table.c
+@@ -682,9 +682,9 @@ static void batadv_dat_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
+ 					   uint16_t tvlv_value_len)
+ {
+ 	if (flags & BATADV_TVLV_HANDLER_OGM_CIFNOTFND)
+-		orig->capabilities &= ~BATADV_ORIG_CAPA_HAS_DAT;
++		clear_bit(BATADV_ORIG_CAPA_HAS_DAT, &orig->capabilities);
+ 	else
+-		orig->capabilities |= BATADV_ORIG_CAPA_HAS_DAT;
++		set_bit(BATADV_ORIG_CAPA_HAS_DAT, &orig->capabilities);
+ }
+ 
+ /**
+diff --git a/types.h b/types.h
+index 28f2461..e33b5aa 100644
+--- a/types.h
++++ b/types.h
+@@ -256,7 +256,7 @@ struct batadv_orig_node {
+ 	struct hlist_node mcast_want_all_ipv4_node;
+ 	struct hlist_node mcast_want_all_ipv6_node;
+ #endif
+-	uint8_t capabilities;
++	unsigned long capabilities;
+ 	uint8_t capa_initialized;
+ 	atomic_t last_ttvn;
+ 	unsigned char *tt_buff;
+-- 
+2.1.4
+
diff --git a/batman-adv/patches/0004-batman-adv-Make-NC-capability-changes-atomic.patch b/batman-adv/patches/0004-batman-adv-Make-NC-capability-changes-atomic.patch
new file mode 100644
index 0000000..55996a9
--- /dev/null
+++ b/batman-adv/patches/0004-batman-adv-Make-NC-capability-changes-atomic.patch
@@ -0,0 +1,40 @@
+From 586df9e2537b51c0df7ce99576c3cee1681b64de Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
+Date: Tue, 16 Jun 2015 17:10:23 +0200
+Subject: [PATCH 04/10] batman-adv: Make NC capability changes atomic
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Bitwise OR/AND assignments in C aren't guaranteed to be atomic. One
+OGM handler might undo the set/clear of a specific bit from another
+handler run in between.
+
+Fix this by using the atomic set_bit()/clear_bit() functions.
+
+Fixes: 7dd9d8992b0c ("batman-adv: tvlv - add network coding container")
+Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ network-coding.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/network-coding.c b/network-coding.c
+index 89e1d47..3ce493e 100644
+--- a/network-coding.c
++++ b/network-coding.c
+@@ -105,9 +105,9 @@ static void batadv_nc_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
+ 					  uint16_t tvlv_value_len)
+ {
+ 	if (flags & BATADV_TVLV_HANDLER_OGM_CIFNOTFND)
+-		orig->capabilities &= ~BATADV_ORIG_CAPA_HAS_NC;
++		clear_bit(BATADV_ORIG_CAPA_HAS_NC, &orig->capabilities);
+ 	else
+-		orig->capabilities |= BATADV_ORIG_CAPA_HAS_NC;
++		set_bit(BATADV_ORIG_CAPA_HAS_NC, &orig->capabilities);
+ }
+ 
+ /**
+-- 
+2.1.4
+
diff --git a/batman-adv/patches/0005-batman-adv-Make-TT-capability-changes-atomic.patch b/batman-adv/patches/0005-batman-adv-Make-TT-capability-changes-atomic.patch
new file mode 100644
index 0000000..788cf32
--- /dev/null
+++ b/batman-adv/patches/0005-batman-adv-Make-TT-capability-changes-atomic.patch
@@ -0,0 +1,60 @@
+From a51fa16ecf3f079518baaa56bffae343bd5694f0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
+Date: Tue, 16 Jun 2015 17:10:24 +0200
+Subject: [PATCH 05/10] batman-adv: Make TT capability changes atomic
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Bitwise OR/AND assignments in C aren't guaranteed to be atomic. One
+OGM handler might undo the set/clear of a specific bit from another
+handler run in between.
+
+Fix this by using the atomic set_bit()/clear_bit() functions.
+
+Fixes: 5d2121af6d31 ("batman-adv: introduce capability initialization bitfield")
+Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ translation-table.c | 4 ++--
+ types.h             | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/translation-table.c b/translation-table.c
+index b098e53..e95a424 100644
+--- a/translation-table.c
++++ b/translation-table.c
+@@ -1843,7 +1843,7 @@ void batadv_tt_global_del_orig(struct batadv_priv *bat_priv,
+ 		}
+ 		spin_unlock_bh(list_lock);
+ 	}
+-	orig_node->capa_initialized &= ~BATADV_ORIG_CAPA_HAS_TT;
++	clear_bit(BATADV_ORIG_CAPA_HAS_TT, &orig_node->capa_initialized);
+ }
+ 
+ static bool batadv_tt_global_to_purge(struct batadv_tt_global_entry *tt_global,
+@@ -2802,7 +2802,7 @@ static void _batadv_tt_update_changes(struct batadv_priv *bat_priv,
+ 				return;
+ 		}
+ 	}
+-	orig_node->capa_initialized |= BATADV_ORIG_CAPA_HAS_TT;
++	set_bit(BATADV_ORIG_CAPA_HAS_TT, &orig_node->capa_initialized);
+ }
+ 
+ static void batadv_tt_fill_gtable(struct batadv_priv *bat_priv,
+diff --git a/types.h b/types.h
+index e33b5aa..c6ec558 100644
+--- a/types.h
++++ b/types.h
+@@ -257,7 +257,7 @@ struct batadv_orig_node {
+ 	struct hlist_node mcast_want_all_ipv6_node;
+ #endif
+ 	unsigned long capabilities;
+-	uint8_t capa_initialized;
++	unsigned long capa_initialized;
+ 	atomic_t last_ttvn;
+ 	unsigned char *tt_buff;
+ 	int16_t tt_buff_len;
+-- 
+2.1.4
+
diff --git a/batman-adv/patches/0006-batman-adv-Make-MCAST-capability-changes-atomic.patch b/batman-adv/patches/0006-batman-adv-Make-MCAST-capability-changes-atomic.patch
new file mode 100644
index 0000000..7876e28
--- /dev/null
+++ b/batman-adv/patches/0006-batman-adv-Make-MCAST-capability-changes-atomic.patch
@@ -0,0 +1,50 @@
+From 201a54ba710ab7f40b82ad3c109f702c47d0761f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
+Date: Tue, 16 Jun 2015 17:10:25 +0200
+Subject: [PATCH 06/10] batman-adv: Make MCAST capability changes atomic
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Bitwise OR/AND assignments in C aren't guaranteed to be atomic. One
+OGM handler might undo the set/clear of a specific bit from another
+handler run in between.
+
+Fix this by using the atomic set_bit()/clear_bit() functions.
+
+Fixes: 77ec494490d6 ("batman-adv: Announce new capability via multicast TVLV")
+Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ multicast.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/multicast.c b/multicast.c
+index 09f2838..00612bf 100644
+--- a/multicast.c
++++ b/multicast.c
+@@ -684,7 +684,7 @@ static void batadv_mcast_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
+ 	    !(orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST)) {
+ 		if (orig_initialized)
+ 			atomic_dec(&bat_priv->mcast.num_disabled);
+-		orig->capabilities |= BATADV_ORIG_CAPA_HAS_MCAST;
++		set_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities);
+ 	/* If mcast support is being switched off or if this is an initial
+ 	 * OGM without mcast support then increase the disabled mcast
+ 	 * node counter.
+@@ -693,10 +693,10 @@ static void batadv_mcast_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
+ 		   (orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST ||
+ 		    !orig_initialized)) {
+ 		atomic_inc(&bat_priv->mcast.num_disabled);
+-		orig->capabilities &= ~BATADV_ORIG_CAPA_HAS_MCAST;
++		clear_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities);
+ 	}
+ 
+-	orig->capa_initialized |= BATADV_ORIG_CAPA_HAS_MCAST;
++	set_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capa_initialized);
+ 
+ 	if (orig_mcast_enabled && tvlv_value &&
+ 	    (tvlv_value_len >= sizeof(mcast_flags)))
+-- 
+2.1.4
+
diff --git a/batman-adv/patches/0007-batman-adv-Fix-potential-synchronization-issues-in-m.patch b/batman-adv/patches/0007-batman-adv-Fix-potential-synchronization-issues-in-m.patch
new file mode 100644
index 0000000..2688efd
--- /dev/null
+++ b/batman-adv/patches/0007-batman-adv-Fix-potential-synchronization-issues-in-m.patch
@@ -0,0 +1,254 @@
+From 7f220ed1f063be00833bd34a013c8f3f45884031 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
+Date: Tue, 16 Jun 2015 17:10:26 +0200
+Subject: [PATCH 07/10] batman-adv: Fix potential synchronization issues in
+ mcast tvlv handler
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+So far the mcast tvlv handler did not anticipate the processing of
+multiple incoming OGMs from the same originator at the same time. This
+can lead to various issues:
+
+* Broken refcounting: For instance two mcast handlers might both assume
+  that an originator just got multicast capabilities and will together
+  wrongly decrease mcast.num_disabled by two, potentially leading to
+  an integer underflow.
+
+* Potential kernel panic on hlist_del_rcu(): Two mcast handlers might
+  one after another try to do an
+  hlist_del_rcu(&orig->mcast_want_all_*_node). The second one will
+  cause memory corruption / crashes.
+  (Reported by: Sven Eckelmann <sven@narfation.org>)
+
+Right in the beginning the code path makes assumptions about the current
+multicast related state of an originator and bases all updates on that. The
+easiest and least error prune way to fix the issues in this case is to
+serialize multiple mcast handler invocations with a spinlock.
+
+Fixes: 77ec494490d6 ("batman-adv: Announce new capability via multicast TVLV")
+Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ multicast.c  | 62 +++++++++++++++++++++++++++++++++++++++++++++++-------------
+ originator.c |  4 ++++
+ types.h      |  3 +++
+ 3 files changed, 56 insertions(+), 13 deletions(-)
+
+diff --git a/multicast.c b/multicast.c
+index 00612bf..b75bcc3 100644
+--- a/multicast.c
++++ b/multicast.c
+@@ -565,19 +565,26 @@ batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb,
+  *
+  * If the BATADV_MCAST_WANT_ALL_UNSNOOPABLES flag of this originator,
+  * orig, has toggled then this method updates counter and list accordingly.
++ *
++ * Caller needs to hold orig->mcast_handler_lock.
+  */
+ static void batadv_mcast_want_unsnoop_update(struct batadv_priv *bat_priv,
+ 					     struct batadv_orig_node *orig,
+ 					     uint8_t mcast_flags)
+ {
++	struct hlist_node *node = &orig->mcast_want_all_unsnoopables_node;
++	struct hlist_head *head = &bat_priv->mcast.want_all_unsnoopables_list;
++
+ 	/* switched from flag unset to set */
+ 	if (mcast_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES &&
+ 	    !(orig->mcast_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES)) {
+ 		atomic_inc(&bat_priv->mcast.num_want_all_unsnoopables);
+ 
+ 		spin_lock_bh(&bat_priv->mcast.want_lists_lock);
+-		hlist_add_head_rcu(&orig->mcast_want_all_unsnoopables_node,
+-				   &bat_priv->mcast.want_all_unsnoopables_list);
++		/* flag checks above + mcast_handler_lock prevents this */
++		BUG_ON(!hlist_unhashed(node));
++
++		hlist_add_head_rcu(node, head);
+ 		spin_unlock_bh(&bat_priv->mcast.want_lists_lock);
+ 	/* switched from flag set to unset */
+ 	} else if (!(mcast_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES) &&
+@@ -585,7 +592,10 @@ static void batadv_mcast_want_unsnoop_update(struct batadv_priv *bat_priv,
+ 		atomic_dec(&bat_priv->mcast.num_want_all_unsnoopables);
+ 
+ 		spin_lock_bh(&bat_priv->mcast.want_lists_lock);
+-		hlist_del_rcu(&orig->mcast_want_all_unsnoopables_node);
++		/* flag checks above + mcast_handler_lock prevents this */
++		BUG_ON(hlist_unhashed(node));
++
++		hlist_del_init_rcu(node);
+ 		spin_unlock_bh(&bat_priv->mcast.want_lists_lock);
+ 	}
+ }
+@@ -598,19 +608,26 @@ static void batadv_mcast_want_unsnoop_update(struct batadv_priv *bat_priv,
+  *
+  * If the BATADV_MCAST_WANT_ALL_IPV4 flag of this originator, orig, has
+  * toggled then this method updates counter and list accordingly.
++ *
++ * Caller needs to hold orig->mcast_handler_lock.
+  */
+ static void batadv_mcast_want_ipv4_update(struct batadv_priv *bat_priv,
+ 					  struct batadv_orig_node *orig,
+ 					  uint8_t mcast_flags)
+ {
++	struct hlist_node *node = &orig->mcast_want_all_ipv4_node;
++	struct hlist_head *head = &bat_priv->mcast.want_all_ipv4_list;
++
+ 	/* switched from flag unset to set */
+ 	if (mcast_flags & BATADV_MCAST_WANT_ALL_IPV4 &&
+ 	    !(orig->mcast_flags & BATADV_MCAST_WANT_ALL_IPV4)) {
+ 		atomic_inc(&bat_priv->mcast.num_want_all_ipv4);
+ 
+ 		spin_lock_bh(&bat_priv->mcast.want_lists_lock);
+-		hlist_add_head_rcu(&orig->mcast_want_all_ipv4_node,
+-				   &bat_priv->mcast.want_all_ipv4_list);
++		/* flag checks above + mcast_handler_lock prevents this */
++		BUG_ON(!hlist_unhashed(node));
++
++		hlist_add_head_rcu(node, head);
+ 		spin_unlock_bh(&bat_priv->mcast.want_lists_lock);
+ 	/* switched from flag set to unset */
+ 	} else if (!(mcast_flags & BATADV_MCAST_WANT_ALL_IPV4) &&
+@@ -618,7 +635,10 @@ static void batadv_mcast_want_ipv4_update(struct batadv_priv *bat_priv,
+ 		atomic_dec(&bat_priv->mcast.num_want_all_ipv4);
+ 
+ 		spin_lock_bh(&bat_priv->mcast.want_lists_lock);
+-		hlist_del_rcu(&orig->mcast_want_all_ipv4_node);
++		/* flag checks above + mcast_handler_lock prevents this */
++		BUG_ON(hlist_unhashed(node));
++
++		hlist_del_init_rcu(node);
+ 		spin_unlock_bh(&bat_priv->mcast.want_lists_lock);
+ 	}
+ }
+@@ -631,19 +651,26 @@ static void batadv_mcast_want_ipv4_update(struct batadv_priv *bat_priv,
+  *
+  * If the BATADV_MCAST_WANT_ALL_IPV6 flag of this originator, orig, has
+  * toggled then this method updates counter and list accordingly.
++ *
++ * Caller needs to hold orig->mcast_handler_lock.
+  */
+ static void batadv_mcast_want_ipv6_update(struct batadv_priv *bat_priv,
+ 					  struct batadv_orig_node *orig,
+ 					  uint8_t mcast_flags)
+ {
++	struct hlist_node *node = &orig->mcast_want_all_ipv6_node;
++	struct hlist_head *head = &bat_priv->mcast.want_all_ipv6_list;
++
+ 	/* switched from flag unset to set */
+ 	if (mcast_flags & BATADV_MCAST_WANT_ALL_IPV6 &&
+ 	    !(orig->mcast_flags & BATADV_MCAST_WANT_ALL_IPV6)) {
+ 		atomic_inc(&bat_priv->mcast.num_want_all_ipv6);
+ 
+ 		spin_lock_bh(&bat_priv->mcast.want_lists_lock);
+-		hlist_add_head_rcu(&orig->mcast_want_all_ipv6_node,
+-				   &bat_priv->mcast.want_all_ipv6_list);
++		/* flag checks above + mcast_handler_lock prevents this */
++		BUG_ON(!hlist_unhashed(node));
++
++		hlist_add_head_rcu(node, head);
+ 		spin_unlock_bh(&bat_priv->mcast.want_lists_lock);
+ 	/* switched from flag set to unset */
+ 	} else if (!(mcast_flags & BATADV_MCAST_WANT_ALL_IPV6) &&
+@@ -651,7 +678,10 @@ static void batadv_mcast_want_ipv6_update(struct batadv_priv *bat_priv,
+ 		atomic_dec(&bat_priv->mcast.num_want_all_ipv6);
+ 
+ 		spin_lock_bh(&bat_priv->mcast.want_lists_lock);
+-		hlist_del_rcu(&orig->mcast_want_all_ipv6_node);
++		/* flag checks above + mcast_handler_lock prevents this */
++		BUG_ON(hlist_unhashed(node));
++
++		hlist_del_init_rcu(node);
+ 		spin_unlock_bh(&bat_priv->mcast.want_lists_lock);
+ 	}
+ }
+@@ -674,6 +704,11 @@ static void batadv_mcast_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
+ 	uint8_t mcast_flags = BATADV_NO_FLAGS;
+ 	bool orig_initialized;
+ 
++	if (orig_mcast_enabled && tvlv_value &&
++	    (tvlv_value_len >= sizeof(mcast_flags)))
++		mcast_flags = *(uint8_t *)tvlv_value;
++
++	spin_lock_bh(&orig->mcast_handler_lock);
+ 	orig_initialized = orig->capa_initialized & BATADV_ORIG_CAPA_HAS_MCAST;
+ 
+ 	/* If mcast support is turned on decrease the disabled mcast node
+@@ -698,15 +733,12 @@ static void batadv_mcast_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
+ 
+ 	set_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capa_initialized);
+ 
+-	if (orig_mcast_enabled && tvlv_value &&
+-	    (tvlv_value_len >= sizeof(mcast_flags)))
+-		mcast_flags = *(uint8_t *)tvlv_value;
+-
+ 	batadv_mcast_want_unsnoop_update(bat_priv, orig, mcast_flags);
+ 	batadv_mcast_want_ipv4_update(bat_priv, orig, mcast_flags);
+ 	batadv_mcast_want_ipv6_update(bat_priv, orig, mcast_flags);
+ 
+ 	orig->mcast_flags = mcast_flags;
++	spin_unlock_bh(&orig->mcast_handler_lock);
+ }
+ 
+ /**
+@@ -740,6 +772,8 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig)
+ {
+ 	struct batadv_priv *bat_priv = orig->bat_priv;
+ 
++	spin_lock_bh(&orig->mcast_handler_lock);
++
+ 	if (!(orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST) &&
+ 	    orig->capa_initialized & BATADV_ORIG_CAPA_HAS_MCAST)
+ 		atomic_dec(&bat_priv->mcast.num_disabled);
+@@ -747,4 +781,6 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig)
+ 	batadv_mcast_want_unsnoop_update(bat_priv, orig, BATADV_NO_FLAGS);
+ 	batadv_mcast_want_ipv4_update(bat_priv, orig, BATADV_NO_FLAGS);
+ 	batadv_mcast_want_ipv6_update(bat_priv, orig, BATADV_NO_FLAGS);
++
++	spin_unlock_bh(&orig->mcast_handler_lock);
+ }
+diff --git a/originator.c b/originator.c
+index e3900e4..a2ba182 100644
+--- a/originator.c
++++ b/originator.c
+@@ -658,11 +658,15 @@ struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv,
+ 	INIT_HLIST_HEAD(&orig_node->neigh_list);
+ 	INIT_LIST_HEAD(&orig_node->vlan_list);
+ 	INIT_HLIST_HEAD(&orig_node->ifinfo_list);
++	INIT_HLIST_NODE(&orig_node->mcast_want_all_unsnoopables_node);
++	INIT_HLIST_NODE(&orig_node->mcast_want_all_ipv4_node);
++	INIT_HLIST_NODE(&orig_node->mcast_want_all_ipv6_node);
+ 	spin_lock_init(&orig_node->bcast_seqno_lock);
+ 	spin_lock_init(&orig_node->neigh_list_lock);
+ 	spin_lock_init(&orig_node->tt_buff_lock);
+ 	spin_lock_init(&orig_node->tt_lock);
+ 	spin_lock_init(&orig_node->vlan_list_lock);
++	spin_lock_init(&orig_node->mcast_handler_lock);
+ 
+ 	batadv_nc_init_orig(orig_node);
+ 
+diff --git a/types.h b/types.h
+index c6ec558..65dc6bf 100644
+--- a/types.h
++++ b/types.h
+@@ -204,6 +204,7 @@ struct batadv_orig_bat_iv {
+  * @batadv_dat_addr_t:  address of the orig node in the distributed hash
+  * @last_seen: time when last packet from this node was received
+  * @bcast_seqno_reset: time when the broadcast seqno window was reset
++ * @mcast_handler_lock: synchronizes mcast-capability and -flag changes
+  * @mcast_flags: multicast flags announced by the orig node
+  * @mcast_want_all_unsnoop_node: a list node for the
+  *  mcast.want_all_unsnoopables list
+@@ -251,6 +252,8 @@ struct batadv_orig_node {
+ 	unsigned long last_seen;
+ 	unsigned long bcast_seqno_reset;
+ #ifdef CONFIG_BATMAN_ADV_MCAST
++	/* synchronizes mcast tvlv specific orig changes */
++	spinlock_t mcast_handler_lock;
+ 	uint8_t mcast_flags;
+ 	struct hlist_node mcast_want_all_unsnoopables_node;
+ 	struct hlist_node mcast_want_all_ipv4_node;
+-- 
+2.1.4
+
diff --git a/batman-adv/patches/0008-batman-adv-Fix-compile-error-on-deactivated-MCAST-fe.patch b/batman-adv/patches/0008-batman-adv-Fix-compile-error-on-deactivated-MCAST-fe.patch
new file mode 100644
index 0000000..e0bfa70
--- /dev/null
+++ b/batman-adv/patches/0008-batman-adv-Fix-compile-error-on-deactivated-MCAST-fe.patch
@@ -0,0 +1,58 @@
+From 256776ef8562744f90ac9379364df4cf88291b49 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
+Date: Thu, 18 Jun 2015 06:47:19 +0200
+Subject: [PATCH 08/10] batman-adv: Fix compile error on deactivated MCAST
+ feature
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some members of "struct batadv_orig_node" are not available if compiling
+without the multicast optimizations feature.
+
+Fix this by moving their initialization into the right #ifdef's.
+
+Fixes: 7f220ed1f063 ("batman-adv: Fix potential synchronization issues in mcast tvlv handler")
+Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ originator.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/originator.c b/originator.c
+index a2ba182..a5276db 100644
+--- a/originator.c
++++ b/originator.c
+@@ -658,15 +658,11 @@ struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv,
+ 	INIT_HLIST_HEAD(&orig_node->neigh_list);
+ 	INIT_LIST_HEAD(&orig_node->vlan_list);
+ 	INIT_HLIST_HEAD(&orig_node->ifinfo_list);
+-	INIT_HLIST_NODE(&orig_node->mcast_want_all_unsnoopables_node);
+-	INIT_HLIST_NODE(&orig_node->mcast_want_all_ipv4_node);
+-	INIT_HLIST_NODE(&orig_node->mcast_want_all_ipv6_node);
+ 	spin_lock_init(&orig_node->bcast_seqno_lock);
+ 	spin_lock_init(&orig_node->neigh_list_lock);
+ 	spin_lock_init(&orig_node->tt_buff_lock);
+ 	spin_lock_init(&orig_node->tt_lock);
+ 	spin_lock_init(&orig_node->vlan_list_lock);
+-	spin_lock_init(&orig_node->mcast_handler_lock);
+ 
+ 	batadv_nc_init_orig(orig_node);
+ 
+@@ -682,8 +678,13 @@ struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv,
+ 	orig_node->last_seen = jiffies;
+ 	reset_time = jiffies - 1 - msecs_to_jiffies(BATADV_RESET_PROTECTION_MS);
+ 	orig_node->bcast_seqno_reset = reset_time;
++
+ #ifdef CONFIG_BATMAN_ADV_MCAST
+ 	orig_node->mcast_flags = BATADV_NO_FLAGS;
++	INIT_HLIST_NODE(&orig_node->mcast_want_all_unsnoopables_node);
++	INIT_HLIST_NODE(&orig_node->mcast_want_all_ipv4_node);
++	INIT_HLIST_NODE(&orig_node->mcast_want_all_ipv6_node);
++	spin_lock_init(&orig_node->mcast_handler_lock);
+ #endif
+ 
+ 	/* create a vlan object for the "untagged" LAN */
+-- 
+2.1.4
+
diff --git a/batman-adv/patches/0009-batman-adv-fix-kernel-crash-due-to-missing-NULL-chec.patch b/batman-adv/patches/0009-batman-adv-fix-kernel-crash-due-to-missing-NULL-chec.patch
new file mode 100644
index 0000000..0fc7f4e
--- /dev/null
+++ b/batman-adv/patches/0009-batman-adv-fix-kernel-crash-due-to-missing-NULL-chec.patch
@@ -0,0 +1,93 @@
+From 2c2dfd886a400057ccbc66f1507c94ed909d2a89 Mon Sep 17 00:00:00 2001
+From: Marek Lindner <mareklindner@neomailbox.ch>
+Date: Tue, 9 Jun 2015 21:24:36 +0800
+Subject: [PATCH 09/10] batman-adv: fix kernel crash due to missing NULL checks
+
+batadv_softif_vlan_get() may return NULL which has to be verified
+by the caller.
+
+Fixes: 9729d20 ("batman-adv: fix TT VLAN inconsistency on VLAN re-add")
+
+Reported-by: Ryan Thompson <ryan@eero.com>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+Acked-by: Antonio Quartulli <antonio@meshcoding.com>
+---
+ soft-interface.c    |  3 +++
+ translation-table.c | 19 +++++++++++++++----
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/soft-interface.c b/soft-interface.c
+index da89336..7841a4b 100644
+--- a/soft-interface.c
++++ b/soft-interface.c
+@@ -455,6 +455,9 @@ out:
+  */
+ void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *vlan)
+ {
++	if (!vlan)
++		return;
++
+ 	if (atomic_dec_and_test(&vlan->refcount)) {
+ 		spin_lock_bh(&vlan->bat_priv->softif_vlan_list_lock);
+ 		hlist_del_rcu(&vlan->list);
+diff --git a/translation-table.c b/translation-table.c
+index e95a424..807a4e6 100644
+--- a/translation-table.c
++++ b/translation-table.c
+@@ -26,6 +26,7 @@
+ #include "bridge_loop_avoidance.h"
+ #include "multicast.h"
+ 
++#include <linux/bug.h>
+ #include <linux/crc32c.h>
+ 
+ /* hash class keys */
+@@ -575,6 +576,9 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr,
+ 
+ 	/* increase the refcounter of the related vlan */
+ 	vlan = batadv_softif_vlan_get(bat_priv, vid);
++	if (WARN(!vlan, "adding TT local entry %pM to non-existent VLAN %d",
++		 addr, BATADV_PRINT_VID(vid)))
++		goto out;
+ 
+ 	batadv_dbg(BATADV_DBG_TT, bat_priv,
+ 		   "Creating new local tt entry: %pM (vid: %d, ttvn: %d)\n",
+@@ -1047,6 +1051,9 @@ uint16_t batadv_tt_local_remove(struct batadv_priv *bat_priv,
+ 
+ 	/* decrease the reference held for this vlan */
+ 	vlan = batadv_softif_vlan_get(bat_priv, vid);
++	if (!vlan)
++		goto out;
++
+ 	batadv_softif_vlan_free_ref(vlan);
+ 	batadv_softif_vlan_free_ref(vlan);
+ 
+@@ -1147,8 +1154,10 @@ static void batadv_tt_local_table_free(struct batadv_priv *bat_priv)
+ 			/* decrease the reference held for this vlan */
+ 			vlan = batadv_softif_vlan_get(bat_priv,
+ 						      tt_common_entry->vid);
+-			batadv_softif_vlan_free_ref(vlan);
+-			batadv_softif_vlan_free_ref(vlan);
++			if (vlan) {
++				batadv_softif_vlan_free_ref(vlan);
++				batadv_softif_vlan_free_ref(vlan);
++			}
+ 
+ 			batadv_tt_local_entry_free_ref(tt_local);
+ 		}
+@@ -3188,8 +3197,10 @@ static void batadv_tt_local_purge_pending_clients(struct batadv_priv *bat_priv)
+ 
+ 			/* decrease the reference held for this vlan */
+ 			vlan = batadv_softif_vlan_get(bat_priv, tt_common->vid);
+-			batadv_softif_vlan_free_ref(vlan);
+-			batadv_softif_vlan_free_ref(vlan);
++			if (vlan) {
++				batadv_softif_vlan_free_ref(vlan);
++				batadv_softif_vlan_free_ref(vlan);
++			}
+ 
+ 			batadv_tt_local_entry_free_ref(tt_local);
+ 		}
+-- 
+2.1.4
+
diff --git a/batman-adv/patches/0010-batman-adv-protect-tt_local_entry-from-concurrent-de.patch b/batman-adv/patches/0010-batman-adv-protect-tt_local_entry-from-concurrent-de.patch
new file mode 100644
index 0000000..ed90549
--- /dev/null
+++ b/batman-adv/patches/0010-batman-adv-protect-tt_local_entry-from-concurrent-de.patch
@@ -0,0 +1,55 @@
+From af912d77181f252e6fdd324592d006e30bc82909 Mon Sep 17 00:00:00 2001
+From: Marek Lindner <mareklindner@neomailbox.ch>
+Date: Wed, 17 Jun 2015 20:01:36 +0800
+Subject: [PATCH 10/10] batman-adv: protect tt_local_entry from concurrent
+ delete events
+
+The tt_local_entry deletion performed in batadv_tt_local_remove() was neither
+protecting against simultaneous deletes nor checking whether the element was
+still part of the list before calling hlist_del_rcu().
+
+Replacing the hlist_del_rcu() call with batadv_hash_remove() provides adequate
+protection via hash spinlocks as well as an is-element-still-in-hash check to
+avoid 'blind' hash removal.
+
+Fixes: 2443ba3 ("batman-adv: roaming handling mechanism redesign")
+
+Reported-by: alfonsname@web.de
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+Acked-by: Antonio Quartulli <antonio@meshcoding.com>
+---
+ translation-table.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/translation-table.c b/translation-table.c
+index 807a4e6..dfe8896 100644
+--- a/translation-table.c
++++ b/translation-table.c
+@@ -1019,6 +1019,7 @@ uint16_t batadv_tt_local_remove(struct batadv_priv *bat_priv,
+ 	struct batadv_tt_local_entry *tt_local_entry;
+ 	uint16_t flags, curr_flags = BATADV_NO_FLAGS;
+ 	struct batadv_softif_vlan *vlan;
++	void *tt_entry_exists;
+ 
+ 	tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr, vid);
+ 	if (!tt_local_entry)
+@@ -1046,7 +1047,15 @@ uint16_t batadv_tt_local_remove(struct batadv_priv *bat_priv,
+ 	 * immediately purge it
+ 	 */
+ 	batadv_tt_local_event(bat_priv, tt_local_entry, BATADV_TT_CLIENT_DEL);
+-	hlist_del_rcu(&tt_local_entry->common.hash_entry);
++
++	tt_entry_exists = batadv_hash_remove(bat_priv->tt.local_hash,
++					     batadv_compare_tt,
++					     batadv_choose_tt,
++					     &tt_local_entry->common);
++	if (!tt_entry_exists)
++		goto out;
++
++	/* extra call to free the local tt entry */
+ 	batadv_tt_local_entry_free_ref(tt_local_entry);
+ 
+ 	/* decrease the reference held for this vlan */
+-- 
+2.1.4
+

From 8618fb8ba6b403d2da58fb12cacfb967bdcc178b Mon Sep 17 00:00:00 2001
From: Marek Lindner <mareklindner@neomailbox.ch>
Date: Sun, 21 Jun 2015 19:06:29 +0800
Subject: [PATCH 122/368] batctl: musl build fixes

Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
 ...et-if_ether.h-instead-of-linux-if_et.patch | 66 +++++++++++++++++++
 ...l-Add-required-includes-to-all-files.patch | 54 +++++++++++++++
 2 files changed, 120 insertions(+)
 create mode 100644 batctl/patches/0001-batctl-use-netinet-if_ether.h-instead-of-linux-if_et.patch
 create mode 100644 batctl/patches/0002-batctl-Add-required-includes-to-all-files.patch

diff --git a/batctl/patches/0001-batctl-use-netinet-if_ether.h-instead-of-linux-if_et.patch b/batctl/patches/0001-batctl-use-netinet-if_ether.h-instead-of-linux-if_et.patch
new file mode 100644
index 0000000..db6f139
--- /dev/null
+++ b/batctl/patches/0001-batctl-use-netinet-if_ether.h-instead-of-linux-if_et.patch
@@ -0,0 +1,66 @@
+From 6423e3e5cdc1f79625dbf90ff6444b0ad8b02185 Mon Sep 17 00:00:00 2001
+From: Alex Suykov <alex.suykov@gmail.com>
+Date: Mon, 6 Apr 2015 17:29:13 +0300
+Subject: [PATCH] batctl: use netinet/if_ether.h instead of linux/if_ether.h
+
+musl does not allow including netinet/* and linux/* headers together.
+batctl includes netinet/if_ether.h indirectly via net/ethernet.h,
+so netinet/if_ether.h must be used instead of linux/if_ether.h.
+
+Signed-off-by: Alex Suykov <alex.suykov at gmail.com>
+Acked-by: Sven Eckelmann <sven@narfation.org>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ ping.c       | 2 +-
+ tcpdump.h    | 2 +-
+ traceroute.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/ping.c b/ping.c
+index bdca222..7880a82 100644
+--- a/ping.c
++++ b/ping.c
+@@ -34,7 +34,7 @@
+ #include <stdint.h>
+ #include <sys/select.h>
+ #include <sys/time.h>
+-#include <linux/if_ether.h>
++#include <netinet/if_ether.h>
+ 
+ #include "main.h"
+ #include "ping.h"
+diff --git a/tcpdump.h b/tcpdump.h
+index 5d936f2..3c9126c 100644
+--- a/tcpdump.h
++++ b/tcpdump.h
+@@ -23,7 +23,7 @@
+ #define _BATCTL_TCPDUMP_H
+ 
+ #include <netpacket/packet.h>
+-#include <linux/if_ether.h>
++#include <netinet/if_ether.h>
+ #include <net/if_arp.h>
+ #include <sys/types.h>
+ #include "main.h"
+diff --git a/traceroute.c b/traceroute.c
+index 4ebfec2..373fe90 100644
+--- a/traceroute.c
++++ b/traceroute.c
+@@ -22,13 +22,13 @@
+ 
+ 
+ #include <netinet/in.h>
++#include <netinet/if_ether.h>
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <string.h>
+-#include <linux/if_ether.h>
+ #include <stddef.h>
+ #include <sys/select.h>
+ #include <sys/time.h>
+-- 
+2.1.4
+
diff --git a/batctl/patches/0002-batctl-Add-required-includes-to-all-files.patch b/batctl/patches/0002-batctl-Add-required-includes-to-all-files.patch
new file mode 100644
index 0000000..cc2d176
--- /dev/null
+++ b/batctl/patches/0002-batctl-Add-required-includes-to-all-files.patch
@@ -0,0 +1,54 @@
+From fb51f72f3fe911103abe565ebe88b7545a18d963 Mon Sep 17 00:00:00 2001
+From: Sven Eckelmann <sven@narfation.org>
+Date: Fri, 17 Apr 2015 19:40:28 +0200
+Subject: [PATCH] batctl: Add required includes to all files
+
+The header files could not be build indepdent from each other. This is happened
+because headers didn't include the files for things they've used. This was
+problematic because the success of a build depended on the knowledge about the
+right order of local includes.
+
+Also source files were not including everything they've used explicitly.
+Instead they required that transitive includes are always stable. This is
+problematic because some transitive includes are not obvious, depend on config
+settings and may not be stable in the future.
+
+The order for include blocks are:
+
+ * primary headers (main.h and the *.h file of a *.c file)
+ * global linux headers
+ * required local headers
+ * extra forward declarations for pointers in function/struct declarations
+
+The only exceptions are linux/bitops.h and linux/if_ether.h in packet.h. This
+header file is shared with userspace applications like batctl and must
+therefore build together with userspace applications. The header linux/bitops.h
+is not part of the uapi headers and linux/if_ether.h conflicts with the musl
+implementation of netinet/if_ether.h. The maintainers rejected the use of
+__KERNEL__ preprocessor checks and thus these two headers are only in main.h.
+All files using packet.h first have to include main.h to work correctly.
+
+Reported-by: Markus Pargmann <mpa@pengutronix.de>
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ packet.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/packet.h b/packet.h
+index b81fbbf..7a9cb7a 100644
+--- a/packet.h
++++ b/packet.h
+@@ -18,6 +18,9 @@
+ #ifndef _NET_BATMAN_ADV_PACKET_H_
+ #define _NET_BATMAN_ADV_PACKET_H_
+ 
++#include <asm/byteorder.h>
++#include <linux/types.h>
++
+ /**
+  * enum batadv_packettype - types for batman-adv encapsulated packets
+  * @BATADV_IV_OGM: originator messages for B.A.T.M.A.N. IV
+-- 
+2.1.4
+

From 98d7598890e754e61bdd75a5b5b55d07c518a2b6 Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Tue, 23 Jun 2015 14:41:10 +0200
Subject: [PATCH 123/368] cjdns: update source, bump version

Signed-off-by: Lars Gierth <larsg@systemli.org>

Conflicts:
	cjdns/Makefile
---
 cjdns/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cjdns/Makefile b/cjdns/Makefile
index e023749..835af22 100644
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -18,11 +18,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cjdns
 PKG_VERSION:=0.16
-PKG_RELEASE:=14
+PKG_RELEASE:=15
 
 PKG_SOURCE_URL:=https://github.com/hyperboria/cjdns.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a97c189b9181bf83ed44a9ab0ebc817882c60ffa
+PKG_SOURCE_VERSION:=951581191997db0188b56d8b21c5216f7e6e2ee1
 PKG_LICENSE:=GPL-3.0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)

From fdd1fbf6e1605e8d76603c79be7e1c3d9e9148a2 Mon Sep 17 00:00:00 2001
From: Caleb James DeLisle <cjd@cjdns.fr>
Date: Tue, 23 Jun 2015 07:50:57 +0200
Subject: [PATCH 124/368] cjdns: fix build on mac osx

Signed-off-by: Lars Gierth <larsg@systemli.org>

Conflicts:
	cjdns/Makefile
---
 cjdns/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cjdns/Makefile b/cjdns/Makefile
index 835af22..36772cd 100644
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -79,11 +79,14 @@ endif
 define Build/Compile
 	CROSS="true" \
 	CC="$(TARGET_CC)" \
+	AR="$(TARGET_AR)" \
+	RANLIB="$(TARGET_RANLIB)" \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	LDFLAGS="$(TARGET_LDFLAGS)" \
 	SYSTEM="linux" \
 	TARGET_ARCH="$(CONFIG_ARCH)" \
 	SSP_SUPPORT="$(CONFIG_SSP_SUPPORT)" \
+	GYP_ADDITIONAL_ARGS="-f make-linux" \
 	$(PKG_DO_VARS) \
 	$(PKG_BUILD_DIR)/do
 endef

From d6715b0be254d05b30837176f22101e8fa7a04a7 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 26 Jun 2015 17:31:45 +0200
Subject: [PATCH 125/368] nodogsplash: fix musl compatiblity

 - Replace nonstandard `sys/unistd.h` includes with `unistd.h` ones
 - Add missing `fcntl.h` include to `libhttpd/protocol.c` in order to
   provide declarations for `open()`, `O_RDONLY` etc.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
---
 nodogsplash/Makefile                      |  4 +--
 nodogsplash/patches/100-musl-compat.patch | 43 +++++++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 nodogsplash/patches/100-musl-compat.patch

diff --git a/nodogsplash/Makefile b/nodogsplash/Makefile
index 38e8f2b..11fa5fc 100644
--- a/nodogsplash/Makefile
+++ b/nodogsplash/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 OpenWrt.org
+# Copyright (C) 2013-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=nodogsplash
 PKG_FIXUP:=autoreconf
 PKG_VERSION:=0.9_beta9.9.9
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/nodogsplash/patches/100-musl-compat.patch b/nodogsplash/patches/100-musl-compat.patch
new file mode 100644
index 0000000..bb186bc
--- /dev/null
+++ b/nodogsplash/patches/100-musl-compat.patch
@@ -0,0 +1,43 @@
+--- a/src/client_list.c
++++ b/src/client_list.c
+@@ -36,7 +36,7 @@
+ #include <pthread.h>
+ #include <sys/wait.h>
+ #include <sys/types.h>
+-#include <sys/unistd.h>
++#include <unistd.h>
+ 
+ #include <string.h>
+ 
+--- a/src/firewall.c
++++ b/src/firewall.c
+@@ -37,7 +37,7 @@
+ #include <pthread.h>
+ #include <sys/wait.h>
+ #include <sys/types.h>
+-#include <sys/unistd.h>
++#include <unistd.h>
+ 
+ #include <string.h>
+ 
+--- a/src/util.c
++++ b/src/util.c
+@@ -38,7 +38,7 @@
+ #include <pthread.h>
+ #include <sys/wait.h>
+ #include <sys/types.h>
+-#include <sys/unistd.h>
++#include <unistd.h>
+ #include <netinet/in.h>
+ #include <sys/ioctl.h>
+ #include <arpa/inet.h>
+--- a/libhttpd/protocol.c
++++ b/libhttpd/protocol.c
+@@ -25,6 +25,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <time.h>
++#include <fcntl.h>
+ 
+ #if defined(_WIN32) 
+ #else

From 8a0a7fa06d404b699c862a69a9bf0492ec9362d6 Mon Sep 17 00:00:00 2001
From: Marek Lindner <mareklindner@neomailbox.ch>
Date: Sun, 28 Jun 2015 22:18:13 +0800
Subject: [PATCH 126/368] batman-adv: 2015.0 bugfixes & stability updates

Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
 ...d-u32-overflow-during-gateway-select.patch |  2 +-
 ...n-adv-avoid-DAT-to-mess-up-LAN-state.patch |  2 +-
 ...v-Make-DAT-capability-changes-atomic.patch |  2 +-
 ...dv-Make-NC-capability-changes-atomic.patch |  2 +-
 ...dv-Make-TT-capability-changes-atomic.patch |  2 +-
 ...Make-MCAST-capability-changes-atomic.patch |  2 +-
 ...otential-synchronization-issues-in-m.patch |  2 +-
 ...ompile-error-on-deactivated-MCAST-fe.patch |  2 +-
 ...ernel-crash-due-to-missing-NULL-chec.patch |  2 +-
 ...ct-tt_local_entry-from-concurrent-de.patch |  2 +-
 ...tect-tt-request-from-double-deletion.patch | 58 +++++++++++++++++++
 ...alize-up-down-values-when-adding-a-g.patch | 42 ++++++++++++++
 ...e-broadcast-packets-scheduled-for-pu.patch | 32 ++++++++++
 13 files changed, 142 insertions(+), 10 deletions(-)
 create mode 100644 batman-adv/patches/0011-batman-adv-protect-tt-request-from-double-deletion.patch
 create mode 100644 batman-adv/patches/0012-batman-adv-initialize-up-down-values-when-adding-a-g.patch
 create mode 100644 batman-adv/patches/0013-batman-adv-remove-broadcast-packets-scheduled-for-pu.patch

diff --git a/batman-adv/patches/0001-batman-adv-Avoid-u32-overflow-during-gateway-select.patch b/batman-adv/patches/0001-batman-adv-Avoid-u32-overflow-during-gateway-select.patch
index 2955e75..19eb2fb 100644
--- a/batman-adv/patches/0001-batman-adv-Avoid-u32-overflow-during-gateway-select.patch
+++ b/batman-adv/patches/0001-batman-adv-Avoid-u32-overflow-during-gateway-select.patch
@@ -1,7 +1,7 @@
 From f63c54bba31d2c86269982fd8efdfb618f1daabe Mon Sep 17 00:00:00 2001
 From: Ruben Wisniewski <ruben@freifunk-nrw.de>
 Date: Tue, 26 May 2015 18:34:27 +0200
-Subject: [PATCH 01/10] batman-adv: Avoid u32 overflow during gateway select
+Subject: [PATCH 01/13] batman-adv: Avoid u32 overflow during gateway select
 
 The gateway selection based on fast connections is using a single value
 calculated from the average tq (0-255) and the download bandwidth (in
diff --git a/batman-adv/patches/0002-batman-adv-avoid-DAT-to-mess-up-LAN-state.patch b/batman-adv/patches/0002-batman-adv-avoid-DAT-to-mess-up-LAN-state.patch
index bdc0d4a..082c097 100644
--- a/batman-adv/patches/0002-batman-adv-avoid-DAT-to-mess-up-LAN-state.patch
+++ b/batman-adv/patches/0002-batman-adv-avoid-DAT-to-mess-up-LAN-state.patch
@@ -1,7 +1,7 @@
 From 9bbd794030657fe0d38590cd67d4801b989cebf9 Mon Sep 17 00:00:00 2001
 From: Antonio Quartulli <antonio@meshcoding.com>
 Date: Mon, 1 Jun 2015 17:29:57 +0200
-Subject: [PATCH 02/10] batman-adv: avoid DAT to mess up LAN state
+Subject: [PATCH 02/13] batman-adv: avoid DAT to mess up LAN state
 
 When a node running DAT receives an ARP request from the LAN for the
 first time, it is likely that this node will request the ARP entry
diff --git a/batman-adv/patches/0003-batman-adv-Make-DAT-capability-changes-atomic.patch b/batman-adv/patches/0003-batman-adv-Make-DAT-capability-changes-atomic.patch
index aa8718a..0f6ce8c 100644
--- a/batman-adv/patches/0003-batman-adv-Make-DAT-capability-changes-atomic.patch
+++ b/batman-adv/patches/0003-batman-adv-Make-DAT-capability-changes-atomic.patch
@@ -1,7 +1,7 @@
 From bfd0fbaef270ac4ed8e4457a38ef8d91190c0540 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
 Date: Tue, 16 Jun 2015 17:10:22 +0200
-Subject: [PATCH 03/10] batman-adv: Make DAT capability changes atomic
+Subject: [PATCH 03/13] batman-adv: Make DAT capability changes atomic
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/batman-adv/patches/0004-batman-adv-Make-NC-capability-changes-atomic.patch b/batman-adv/patches/0004-batman-adv-Make-NC-capability-changes-atomic.patch
index 55996a9..e69178e 100644
--- a/batman-adv/patches/0004-batman-adv-Make-NC-capability-changes-atomic.patch
+++ b/batman-adv/patches/0004-batman-adv-Make-NC-capability-changes-atomic.patch
@@ -1,7 +1,7 @@
 From 586df9e2537b51c0df7ce99576c3cee1681b64de Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
 Date: Tue, 16 Jun 2015 17:10:23 +0200
-Subject: [PATCH 04/10] batman-adv: Make NC capability changes atomic
+Subject: [PATCH 04/13] batman-adv: Make NC capability changes atomic
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/batman-adv/patches/0005-batman-adv-Make-TT-capability-changes-atomic.patch b/batman-adv/patches/0005-batman-adv-Make-TT-capability-changes-atomic.patch
index 788cf32..f41b775 100644
--- a/batman-adv/patches/0005-batman-adv-Make-TT-capability-changes-atomic.patch
+++ b/batman-adv/patches/0005-batman-adv-Make-TT-capability-changes-atomic.patch
@@ -1,7 +1,7 @@
 From a51fa16ecf3f079518baaa56bffae343bd5694f0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
 Date: Tue, 16 Jun 2015 17:10:24 +0200
-Subject: [PATCH 05/10] batman-adv: Make TT capability changes atomic
+Subject: [PATCH 05/13] batman-adv: Make TT capability changes atomic
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/batman-adv/patches/0006-batman-adv-Make-MCAST-capability-changes-atomic.patch b/batman-adv/patches/0006-batman-adv-Make-MCAST-capability-changes-atomic.patch
index 7876e28..99f9038 100644
--- a/batman-adv/patches/0006-batman-adv-Make-MCAST-capability-changes-atomic.patch
+++ b/batman-adv/patches/0006-batman-adv-Make-MCAST-capability-changes-atomic.patch
@@ -1,7 +1,7 @@
 From 201a54ba710ab7f40b82ad3c109f702c47d0761f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
 Date: Tue, 16 Jun 2015 17:10:25 +0200
-Subject: [PATCH 06/10] batman-adv: Make MCAST capability changes atomic
+Subject: [PATCH 06/13] batman-adv: Make MCAST capability changes atomic
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/batman-adv/patches/0007-batman-adv-Fix-potential-synchronization-issues-in-m.patch b/batman-adv/patches/0007-batman-adv-Fix-potential-synchronization-issues-in-m.patch
index 2688efd..2a2496e 100644
--- a/batman-adv/patches/0007-batman-adv-Fix-potential-synchronization-issues-in-m.patch
+++ b/batman-adv/patches/0007-batman-adv-Fix-potential-synchronization-issues-in-m.patch
@@ -1,7 +1,7 @@
 From 7f220ed1f063be00833bd34a013c8f3f45884031 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
 Date: Tue, 16 Jun 2015 17:10:26 +0200
-Subject: [PATCH 07/10] batman-adv: Fix potential synchronization issues in
+Subject: [PATCH 07/13] batman-adv: Fix potential synchronization issues in
  mcast tvlv handler
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
diff --git a/batman-adv/patches/0008-batman-adv-Fix-compile-error-on-deactivated-MCAST-fe.patch b/batman-adv/patches/0008-batman-adv-Fix-compile-error-on-deactivated-MCAST-fe.patch
index e0bfa70..eff8249 100644
--- a/batman-adv/patches/0008-batman-adv-Fix-compile-error-on-deactivated-MCAST-fe.patch
+++ b/batman-adv/patches/0008-batman-adv-Fix-compile-error-on-deactivated-MCAST-fe.patch
@@ -1,7 +1,7 @@
 From 256776ef8562744f90ac9379364df4cf88291b49 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
 Date: Thu, 18 Jun 2015 06:47:19 +0200
-Subject: [PATCH 08/10] batman-adv: Fix compile error on deactivated MCAST
+Subject: [PATCH 08/13] batman-adv: Fix compile error on deactivated MCAST
  feature
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
diff --git a/batman-adv/patches/0009-batman-adv-fix-kernel-crash-due-to-missing-NULL-chec.patch b/batman-adv/patches/0009-batman-adv-fix-kernel-crash-due-to-missing-NULL-chec.patch
index 0fc7f4e..c217a93 100644
--- a/batman-adv/patches/0009-batman-adv-fix-kernel-crash-due-to-missing-NULL-chec.patch
+++ b/batman-adv/patches/0009-batman-adv-fix-kernel-crash-due-to-missing-NULL-chec.patch
@@ -1,7 +1,7 @@
 From 2c2dfd886a400057ccbc66f1507c94ed909d2a89 Mon Sep 17 00:00:00 2001
 From: Marek Lindner <mareklindner@neomailbox.ch>
 Date: Tue, 9 Jun 2015 21:24:36 +0800
-Subject: [PATCH 09/10] batman-adv: fix kernel crash due to missing NULL checks
+Subject: [PATCH 09/13] batman-adv: fix kernel crash due to missing NULL checks
 
 batadv_softif_vlan_get() may return NULL which has to be verified
 by the caller.
diff --git a/batman-adv/patches/0010-batman-adv-protect-tt_local_entry-from-concurrent-de.patch b/batman-adv/patches/0010-batman-adv-protect-tt_local_entry-from-concurrent-de.patch
index ed90549..7dc83a7 100644
--- a/batman-adv/patches/0010-batman-adv-protect-tt_local_entry-from-concurrent-de.patch
+++ b/batman-adv/patches/0010-batman-adv-protect-tt_local_entry-from-concurrent-de.patch
@@ -1,7 +1,7 @@
 From af912d77181f252e6fdd324592d006e30bc82909 Mon Sep 17 00:00:00 2001
 From: Marek Lindner <mareklindner@neomailbox.ch>
 Date: Wed, 17 Jun 2015 20:01:36 +0800
-Subject: [PATCH 10/10] batman-adv: protect tt_local_entry from concurrent
+Subject: [PATCH 10/13] batman-adv: protect tt_local_entry from concurrent
  delete events
 
 The tt_local_entry deletion performed in batadv_tt_local_remove() was neither
diff --git a/batman-adv/patches/0011-batman-adv-protect-tt-request-from-double-deletion.patch b/batman-adv/patches/0011-batman-adv-protect-tt-request-from-double-deletion.patch
new file mode 100644
index 0000000..61da936
--- /dev/null
+++ b/batman-adv/patches/0011-batman-adv-protect-tt-request-from-double-deletion.patch
@@ -0,0 +1,58 @@
+From 9bac35c1e4fab662522371f81147963e19693409 Mon Sep 17 00:00:00 2001
+From: Marek Lindner <mareklindner@neomailbox.ch>
+Date: Mon, 22 Jun 2015 00:36:28 +0800
+Subject: [PATCH 11/13] batman-adv: protect tt request from double deletion
+
+The list_del() calls were changed to list_del_init() to prevent
+an accidental double deletion in batadv_tt_req_node_new().
+
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+Acked-by: Antonio Quartulli <antonio@meshcoding.com>
+---
+ translation-table.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/translation-table.c b/translation-table.c
+index dfe8896..b6c0f52 100644
+--- a/translation-table.c
++++ b/translation-table.c
+@@ -2194,7 +2194,7 @@ static void batadv_tt_req_list_free(struct batadv_priv *bat_priv)
+ 	spin_lock_bh(&bat_priv->tt.req_list_lock);
+ 
+ 	list_for_each_entry_safe(node, safe, &bat_priv->tt.req_list, list) {
+-		list_del(&node->list);
++		list_del_init(&node->list);
+ 		kfree(node);
+ 	}
+ 
+@@ -2230,7 +2230,7 @@ static void batadv_tt_req_purge(struct batadv_priv *bat_priv)
+ 	list_for_each_entry_safe(node, safe, &bat_priv->tt.req_list, list) {
+ 		if (batadv_has_timed_out(node->issued_at,
+ 					 BATADV_TT_REQUEST_TIMEOUT)) {
+-			list_del(&node->list);
++			list_del_init(&node->list);
+ 			kfree(node);
+ 		}
+ 	}
+@@ -2512,7 +2512,8 @@ out:
+ 		batadv_hardif_free_ref(primary_if);
+ 	if (ret && tt_req_node) {
+ 		spin_lock_bh(&bat_priv->tt.req_list_lock);
+-		list_del(&tt_req_node->list);
++		/* list_del_init() verifies tt_req_node still is in the list */
++		list_del_init(&tt_req_node->list);
+ 		spin_unlock_bh(&bat_priv->tt.req_list_lock);
+ 		kfree(tt_req_node);
+ 	}
+@@ -2949,7 +2950,7 @@ static void batadv_handle_tt_response(struct batadv_priv *bat_priv,
+ 	list_for_each_entry_safe(node, safe, &bat_priv->tt.req_list, list) {
+ 		if (!batadv_compare_eth(node->addr, resp_src))
+ 			continue;
+-		list_del(&node->list);
++		list_del_init(&node->list);
+ 		kfree(node);
+ 	}
+ 
+-- 
+2.1.4
+
diff --git a/batman-adv/patches/0012-batman-adv-initialize-up-down-values-when-adding-a-g.patch b/batman-adv/patches/0012-batman-adv-initialize-up-down-values-when-adding-a-g.patch
new file mode 100644
index 0000000..6338edc
--- /dev/null
+++ b/batman-adv/patches/0012-batman-adv-initialize-up-down-values-when-adding-a-g.patch
@@ -0,0 +1,42 @@
+From 3c92b633715b7eca80dc7a2347e0e4dbcce1f018 Mon Sep 17 00:00:00 2001
+From: Simon Wunderlich <simon@open-mesh.com>
+Date: Wed, 24 Jun 2015 14:50:19 +0200
+Subject: [PATCH 12/13] batman-adv: initialize up/down values when adding a
+ gateway
+
+Without this initialization, gateways which actually announce up/down
+bandwidth of 0/0 could be added. If these nodes get purged via
+_batadv_purge_orig() later, the gw_node structure does not get removed
+since batadv_gw_node_delete() updates the gw_node with up/down
+bandwidth of 0/0, and the updating function then discards the change
+and does not free gw_node.
+
+This results in leaking the gw_node structures, which references other
+structures: gw_node -> orig_node -> orig_node_ifinfo -> hardif. When
+removing the interface later, the open reference on the hardif may cause
+hangs with the infamous "unregister_netdevice: waiting for mesh1 to
+become free. Usage count = 1" message.
+
+Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
+Acked-by: Antonio Quartulli <antonio@meshcoding.com>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ gateway_client.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gateway_client.c b/gateway_client.c
+index 3f32357..d8e3ead 100644
+--- a/gateway_client.c
++++ b/gateway_client.c
+@@ -419,6 +419,8 @@ static void batadv_gw_node_add(struct batadv_priv *bat_priv,
+ 
+ 	INIT_HLIST_NODE(&gw_node->list);
+ 	gw_node->orig_node = orig_node;
++	gw_node->bandwidth_down = ntohl(gateway->bandwidth_down);
++	gw_node->bandwidth_up = ntohl(gateway->bandwidth_up);
+ 	atomic_set(&gw_node->refcount, 1);
+ 
+ 	spin_lock_bh(&bat_priv->gw.list_lock);
+-- 
+2.1.4
+
diff --git a/batman-adv/patches/0013-batman-adv-remove-broadcast-packets-scheduled-for-pu.patch b/batman-adv/patches/0013-batman-adv-remove-broadcast-packets-scheduled-for-pu.patch
new file mode 100644
index 0000000..da455e1
--- /dev/null
+++ b/batman-adv/patches/0013-batman-adv-remove-broadcast-packets-scheduled-for-pu.patch
@@ -0,0 +1,32 @@
+From 07bec2d4dec83f024baf166b95cf037be3a7eca5 Mon Sep 17 00:00:00 2001
+From: Simon Wunderlich <simon@open-mesh.com>
+Date: Wed, 24 Jun 2015 14:50:20 +0200
+Subject: [PATCH 13/13] batman-adv: remove broadcast packets scheduled for
+ purged outgoing if
+
+When an interface is purged, the broadcast packets scheduled for this
+interface should get purged as well.
+
+Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ send.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/send.c b/send.c
+index 23635bd..a7e84b2 100644
+--- a/send.c
++++ b/send.c
+@@ -598,7 +598,8 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv,
+ 		 * we delete only packets belonging to the given interface
+ 		 */
+ 		if ((hard_iface) &&
+-		    (forw_packet->if_incoming != hard_iface))
++		    (forw_packet->if_incoming != hard_iface) &&
++		    (forw_packet->if_outgoing != hard_iface))
+ 			continue;
+ 
+ 		spin_unlock_bh(&bat_priv->forw_bcast_list_lock);
+-- 
+2.1.4
+

From 859b1d95edd672d3ebe0910db991202705ae5e7b Mon Sep 17 00:00:00 2001
From: Henning Rogge <hrogge@gmail.com>
Date: Mon, 29 Jun 2015 21:00:03 +0200
Subject: [PATCH 127/368] Update OONF packages to v0.8.3

---
 oonf-dlep-proxy/Makefile | 4 ++--
 oonf-dlep-radio/Makefile | 4 ++--
 oonf-olsrd2/Makefile     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index d84eeb3..115380c 100644
--- a/oonf-dlep-proxy/Makefile
+++ b/oonf-dlep-proxy/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-proxy
-PKG_VERSION:=0.8.2
-PKG_REV:=3ff448e33f1ea9dde8c74397028067caf3c65406
+PKG_VERSION:=0.8.3
+PKG_REV:=a5ba0e6c093ff6c289a77ec9c3d04b5f94145e08
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index 72d8721..4eb6328 100644
--- a/oonf-dlep-radio/Makefile
+++ b/oonf-dlep-radio/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-radio
-PKG_VERSION:=0.8.2
-PKG_REV:=3ff448e33f1ea9dde8c74397028067caf3c65406
+PKG_VERSION:=0.8.3
+PKG_REV:=a5ba0e6c093ff6c289a77ec9c3d04b5f94145e08
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 005905e..9875491 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2
-PKG_VERSION:=0.8.2
-PKG_REV:=3ff448e33f1ea9dde8c74397028067caf3c65406
+PKG_VERSION:=0.8.3
+PKG_REV:=a5ba0e6c093ff6c289a77ec9c3d04b5f94145e08
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

From a8608be74ae365c8dd8263a89cdd2cf1ef83c9e5 Mon Sep 17 00:00:00 2001
From: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
Date: Tue, 30 Jun 2015 09:14:14 +0200
Subject: [PATCH 128/368] Fix name of netjson plugin on oonf-olsrd2 package

---
 oonf-olsrd2/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 9875491..2717441 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -21,7 +21,7 @@ CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \
               -D OONF_NO_TESTING:Bool=true \
               -D UCI:Bool=true \
               -D OONF_APP_DEFAULT_CFG_HANDLER:String=uci \
-              -D OONF_STATIC_PLUGINS:String="class;clock;duplicate_set;interface;layer2;packet_socket;rfc5444;socket;stream_socket;telnet;timer;viewer;os_clock;os_socket;os_interface;os_routing;os_system;nhdp;olsrv2;ff_dat_metric;neighbor_probing;nl80211_listener;link_config;layer2info;systeminfo;cfg_uciloader;cfg_compact;nhdpinfo;olsrv2info;json_for_networks" \
+              -D OONF_STATIC_PLUGINS:String="class;clock;duplicate_set;interface;layer2;packet_socket;rfc5444;socket;stream_socket;telnet;timer;viewer;os_clock;os_socket;os_interface;os_routing;os_system;nhdp;olsrv2;ff_dat_metric;neighbor_probing;nl80211_listener;link_config;layer2info;systeminfo;cfg_uciloader;cfg_compact;nhdpinfo;olsrv2info;netjsoninfo" \
               -D OONF_LIB_GIT:String=v$(PKG_VERSION)-archive \
               -D OONF_VERSION:String=$(PKG_VERSION) \
               -D INSTALL_LIB_DIR:Path=lib/oonf \

From 969d1cf56867751d577d08709da6f4c557203f99 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Tue, 30 Jun 2015 15:55:54 +0200
Subject: [PATCH 129/368] nat46: fix leak of conntrack entries, fix checksum
 calculation

Signed-off-by: Steven Barth <steven@midlink.org>
---
 nat46/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nat46/Makefile b/nat46/Makefile
index f30fbc9..24ecbef 100644
--- a/nat46/Makefile
+++ b/nat46/Makefile
@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=nat46
-PKG_VERSION:=4
+PKG_VERSION:=5
 PKG_RELEASE:=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=https://github.com/ayourtch/nat46.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ccbba8595d7ccbc2ccb1e7d81b420e9587f07fe5
+PKG_SOURCE_VERSION:=ead1fb8e1b9064f750a128e2d5a05244bb41c01d
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
 PKG_LICENSE:=GPL-2.0
 

From 6172dcef329e1b306149cded3340da8f28501266 Mon Sep 17 00:00:00 2001
From: Bastian Bittorf <bittorf@bluebottle.com>
Date: Wed, 1 Jul 2015 21:31:54 +0200
Subject: [PATCH 130/368] olsrd: 0.9.0.1 -> 0.9.0.2 (bugfix-release)

---
 olsrd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/olsrd/Makefile b/olsrd/Makefile
index 02adc92..4e8c7b0 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
-PKG_VERSION:=0.9.0.1
+PKG_VERSION:=0.9.0.2
 PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.9
 
-PKG_MD5SUM:=5dec2c08e7bbec6789af7279e7aafc6c
+PKG_MD5SUM:=8a2675c33990706cc291b59934024783
 PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=BSD-3-Clause
 

From 2e110ce133821000cc6aa7063ad293b57a607fc9 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Thu, 2 Jul 2015 20:53:38 +0200
Subject: [PATCH 131/368] nat46: fix netfilter references

Signed-off-by: Steven Barth <steven@midlink.org>
---
 nat46/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nat46/Makefile b/nat46/Makefile
index 24ecbef..65b92c2 100644
--- a/nat46/Makefile
+++ b/nat46/Makefile
@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=nat46
-PKG_VERSION:=5
+PKG_VERSION:=6
 PKG_RELEASE:=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=https://github.com/ayourtch/nat46.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ead1fb8e1b9064f750a128e2d5a05244bb41c01d
+PKG_SOURCE_VERSION:=8ff2ae59ec9840a7b8b45f976c51cae80abe0226
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
 PKG_LICENSE:=GPL-2.0
 

From 0ead547ab9b5e6489fce702123fb5742d803898f Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Fri, 3 Jul 2015 07:22:40 +0300
Subject: [PATCH 132/368] hnetd: Bump. Some corner case fixes + dncp-07/hncp-07
 compatibility (more or less).

---
 hnetd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hnetd/Makefile b/hnetd/Makefile
index ec29487..fe53c21 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hnetd
-PKG_SOURCE_VERSION:=18ee17f3d18a4c0159e53e0716831bf2fbe506cd
-PKG_VERSION:=2015-06-17-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=23d6a843f9960c4777ad42909611bec526513d61
+PKG_VERSION:=2015-07-02-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git

From 96867471b7ae536e59a9d7298d419cea504f46dc Mon Sep 17 00:00:00 2001
From: Marek Lindner <mareklindner@neomailbox.ch>
Date: Tue, 7 Jul 2015 16:51:36 +0800
Subject: [PATCH 133/368] batman-adv: 2015.0 bugfixes & stability updates

Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
 ...d-u32-overflow-during-gateway-select.patch |  2 +-
 ...n-adv-avoid-DAT-to-mess-up-LAN-state.patch |  2 +-
 ...v-Make-DAT-capability-changes-atomic.patch |  2 +-
 ...dv-Make-NC-capability-changes-atomic.patch |  2 +-
 ...dv-Make-TT-capability-changes-atomic.patch |  2 +-
 ...Make-MCAST-capability-changes-atomic.patch |  2 +-
 ...otential-synchronization-issues-in-m.patch |  2 +-
 ...ompile-error-on-deactivated-MCAST-fe.patch |  2 +-
 ...ernel-crash-due-to-missing-NULL-chec.patch |  2 +-
 ...ct-tt_local_entry-from-concurrent-de.patch |  2 +-
 ...tect-tt-request-from-double-deletion.patch |  2 +-
 ...alize-up-down-values-when-adding-a-g.patch |  2 +-
 ...e-broadcast-packets-scheduled-for-pu.patch |  2 +-
 ...-adv-Fix-broken-DAT-capability-check.patch | 53 ++++++++++++
 ...n-adv-Fix-broken-NC-capability-check.patch | 53 ++++++++++++
 ...n-adv-Fix-broken-TT-capability-check.patch | 54 ++++++++++++
 ...dv-Fix-broken-MCAST-capability-check.patch | 82 +++++++++++++++++++
 17 files changed, 255 insertions(+), 13 deletions(-)
 create mode 100644 batman-adv/patches/0014-batman-adv-Fix-broken-DAT-capability-check.patch
 create mode 100644 batman-adv/patches/0015-batman-adv-Fix-broken-NC-capability-check.patch
 create mode 100644 batman-adv/patches/0016-batman-adv-Fix-broken-TT-capability-check.patch
 create mode 100644 batman-adv/patches/0017-batman-adv-Fix-broken-MCAST-capability-check.patch

diff --git a/batman-adv/patches/0001-batman-adv-Avoid-u32-overflow-during-gateway-select.patch b/batman-adv/patches/0001-batman-adv-Avoid-u32-overflow-during-gateway-select.patch
index 19eb2fb..b7232e7 100644
--- a/batman-adv/patches/0001-batman-adv-Avoid-u32-overflow-during-gateway-select.patch
+++ b/batman-adv/patches/0001-batman-adv-Avoid-u32-overflow-during-gateway-select.patch
@@ -1,7 +1,7 @@
 From f63c54bba31d2c86269982fd8efdfb618f1daabe Mon Sep 17 00:00:00 2001
 From: Ruben Wisniewski <ruben@freifunk-nrw.de>
 Date: Tue, 26 May 2015 18:34:27 +0200
-Subject: [PATCH 01/13] batman-adv: Avoid u32 overflow during gateway select
+Subject: [PATCH 01/17] batman-adv: Avoid u32 overflow during gateway select
 
 The gateway selection based on fast connections is using a single value
 calculated from the average tq (0-255) and the download bandwidth (in
diff --git a/batman-adv/patches/0002-batman-adv-avoid-DAT-to-mess-up-LAN-state.patch b/batman-adv/patches/0002-batman-adv-avoid-DAT-to-mess-up-LAN-state.patch
index 082c097..b335f4f 100644
--- a/batman-adv/patches/0002-batman-adv-avoid-DAT-to-mess-up-LAN-state.patch
+++ b/batman-adv/patches/0002-batman-adv-avoid-DAT-to-mess-up-LAN-state.patch
@@ -1,7 +1,7 @@
 From 9bbd794030657fe0d38590cd67d4801b989cebf9 Mon Sep 17 00:00:00 2001
 From: Antonio Quartulli <antonio@meshcoding.com>
 Date: Mon, 1 Jun 2015 17:29:57 +0200
-Subject: [PATCH 02/13] batman-adv: avoid DAT to mess up LAN state
+Subject: [PATCH 02/17] batman-adv: avoid DAT to mess up LAN state
 
 When a node running DAT receives an ARP request from the LAN for the
 first time, it is likely that this node will request the ARP entry
diff --git a/batman-adv/patches/0003-batman-adv-Make-DAT-capability-changes-atomic.patch b/batman-adv/patches/0003-batman-adv-Make-DAT-capability-changes-atomic.patch
index 0f6ce8c..4152a52 100644
--- a/batman-adv/patches/0003-batman-adv-Make-DAT-capability-changes-atomic.patch
+++ b/batman-adv/patches/0003-batman-adv-Make-DAT-capability-changes-atomic.patch
@@ -1,7 +1,7 @@
 From bfd0fbaef270ac4ed8e4457a38ef8d91190c0540 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
 Date: Tue, 16 Jun 2015 17:10:22 +0200
-Subject: [PATCH 03/13] batman-adv: Make DAT capability changes atomic
+Subject: [PATCH 03/17] batman-adv: Make DAT capability changes atomic
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/batman-adv/patches/0004-batman-adv-Make-NC-capability-changes-atomic.patch b/batman-adv/patches/0004-batman-adv-Make-NC-capability-changes-atomic.patch
index e69178e..935a6cd 100644
--- a/batman-adv/patches/0004-batman-adv-Make-NC-capability-changes-atomic.patch
+++ b/batman-adv/patches/0004-batman-adv-Make-NC-capability-changes-atomic.patch
@@ -1,7 +1,7 @@
 From 586df9e2537b51c0df7ce99576c3cee1681b64de Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
 Date: Tue, 16 Jun 2015 17:10:23 +0200
-Subject: [PATCH 04/13] batman-adv: Make NC capability changes atomic
+Subject: [PATCH 04/17] batman-adv: Make NC capability changes atomic
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/batman-adv/patches/0005-batman-adv-Make-TT-capability-changes-atomic.patch b/batman-adv/patches/0005-batman-adv-Make-TT-capability-changes-atomic.patch
index f41b775..c6e9078 100644
--- a/batman-adv/patches/0005-batman-adv-Make-TT-capability-changes-atomic.patch
+++ b/batman-adv/patches/0005-batman-adv-Make-TT-capability-changes-atomic.patch
@@ -1,7 +1,7 @@
 From a51fa16ecf3f079518baaa56bffae343bd5694f0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
 Date: Tue, 16 Jun 2015 17:10:24 +0200
-Subject: [PATCH 05/13] batman-adv: Make TT capability changes atomic
+Subject: [PATCH 05/17] batman-adv: Make TT capability changes atomic
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/batman-adv/patches/0006-batman-adv-Make-MCAST-capability-changes-atomic.patch b/batman-adv/patches/0006-batman-adv-Make-MCAST-capability-changes-atomic.patch
index 99f9038..d1d7beb 100644
--- a/batman-adv/patches/0006-batman-adv-Make-MCAST-capability-changes-atomic.patch
+++ b/batman-adv/patches/0006-batman-adv-Make-MCAST-capability-changes-atomic.patch
@@ -1,7 +1,7 @@
 From 201a54ba710ab7f40b82ad3c109f702c47d0761f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
 Date: Tue, 16 Jun 2015 17:10:25 +0200
-Subject: [PATCH 06/13] batman-adv: Make MCAST capability changes atomic
+Subject: [PATCH 06/17] batman-adv: Make MCAST capability changes atomic
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/batman-adv/patches/0007-batman-adv-Fix-potential-synchronization-issues-in-m.patch b/batman-adv/patches/0007-batman-adv-Fix-potential-synchronization-issues-in-m.patch
index 2a2496e..66d61b3 100644
--- a/batman-adv/patches/0007-batman-adv-Fix-potential-synchronization-issues-in-m.patch
+++ b/batman-adv/patches/0007-batman-adv-Fix-potential-synchronization-issues-in-m.patch
@@ -1,7 +1,7 @@
 From 7f220ed1f063be00833bd34a013c8f3f45884031 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
 Date: Tue, 16 Jun 2015 17:10:26 +0200
-Subject: [PATCH 07/13] batman-adv: Fix potential synchronization issues in
+Subject: [PATCH 07/17] batman-adv: Fix potential synchronization issues in
  mcast tvlv handler
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
diff --git a/batman-adv/patches/0008-batman-adv-Fix-compile-error-on-deactivated-MCAST-fe.patch b/batman-adv/patches/0008-batman-adv-Fix-compile-error-on-deactivated-MCAST-fe.patch
index eff8249..c854522 100644
--- a/batman-adv/patches/0008-batman-adv-Fix-compile-error-on-deactivated-MCAST-fe.patch
+++ b/batman-adv/patches/0008-batman-adv-Fix-compile-error-on-deactivated-MCAST-fe.patch
@@ -1,7 +1,7 @@
 From 256776ef8562744f90ac9379364df4cf88291b49 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
 Date: Thu, 18 Jun 2015 06:47:19 +0200
-Subject: [PATCH 08/13] batman-adv: Fix compile error on deactivated MCAST
+Subject: [PATCH 08/17] batman-adv: Fix compile error on deactivated MCAST
  feature
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
diff --git a/batman-adv/patches/0009-batman-adv-fix-kernel-crash-due-to-missing-NULL-chec.patch b/batman-adv/patches/0009-batman-adv-fix-kernel-crash-due-to-missing-NULL-chec.patch
index c217a93..3e19c0e 100644
--- a/batman-adv/patches/0009-batman-adv-fix-kernel-crash-due-to-missing-NULL-chec.patch
+++ b/batman-adv/patches/0009-batman-adv-fix-kernel-crash-due-to-missing-NULL-chec.patch
@@ -1,7 +1,7 @@
 From 2c2dfd886a400057ccbc66f1507c94ed909d2a89 Mon Sep 17 00:00:00 2001
 From: Marek Lindner <mareklindner@neomailbox.ch>
 Date: Tue, 9 Jun 2015 21:24:36 +0800
-Subject: [PATCH 09/13] batman-adv: fix kernel crash due to missing NULL checks
+Subject: [PATCH 09/17] batman-adv: fix kernel crash due to missing NULL checks
 
 batadv_softif_vlan_get() may return NULL which has to be verified
 by the caller.
diff --git a/batman-adv/patches/0010-batman-adv-protect-tt_local_entry-from-concurrent-de.patch b/batman-adv/patches/0010-batman-adv-protect-tt_local_entry-from-concurrent-de.patch
index 7dc83a7..5cc27ee 100644
--- a/batman-adv/patches/0010-batman-adv-protect-tt_local_entry-from-concurrent-de.patch
+++ b/batman-adv/patches/0010-batman-adv-protect-tt_local_entry-from-concurrent-de.patch
@@ -1,7 +1,7 @@
 From af912d77181f252e6fdd324592d006e30bc82909 Mon Sep 17 00:00:00 2001
 From: Marek Lindner <mareklindner@neomailbox.ch>
 Date: Wed, 17 Jun 2015 20:01:36 +0800
-Subject: [PATCH 10/13] batman-adv: protect tt_local_entry from concurrent
+Subject: [PATCH 10/17] batman-adv: protect tt_local_entry from concurrent
  delete events
 
 The tt_local_entry deletion performed in batadv_tt_local_remove() was neither
diff --git a/batman-adv/patches/0011-batman-adv-protect-tt-request-from-double-deletion.patch b/batman-adv/patches/0011-batman-adv-protect-tt-request-from-double-deletion.patch
index 61da936..dd0e26f 100644
--- a/batman-adv/patches/0011-batman-adv-protect-tt-request-from-double-deletion.patch
+++ b/batman-adv/patches/0011-batman-adv-protect-tt-request-from-double-deletion.patch
@@ -1,7 +1,7 @@
 From 9bac35c1e4fab662522371f81147963e19693409 Mon Sep 17 00:00:00 2001
 From: Marek Lindner <mareklindner@neomailbox.ch>
 Date: Mon, 22 Jun 2015 00:36:28 +0800
-Subject: [PATCH 11/13] batman-adv: protect tt request from double deletion
+Subject: [PATCH 11/17] batman-adv: protect tt request from double deletion
 
 The list_del() calls were changed to list_del_init() to prevent
 an accidental double deletion in batadv_tt_req_node_new().
diff --git a/batman-adv/patches/0012-batman-adv-initialize-up-down-values-when-adding-a-g.patch b/batman-adv/patches/0012-batman-adv-initialize-up-down-values-when-adding-a-g.patch
index 6338edc..04b3758 100644
--- a/batman-adv/patches/0012-batman-adv-initialize-up-down-values-when-adding-a-g.patch
+++ b/batman-adv/patches/0012-batman-adv-initialize-up-down-values-when-adding-a-g.patch
@@ -1,7 +1,7 @@
 From 3c92b633715b7eca80dc7a2347e0e4dbcce1f018 Mon Sep 17 00:00:00 2001
 From: Simon Wunderlich <simon@open-mesh.com>
 Date: Wed, 24 Jun 2015 14:50:19 +0200
-Subject: [PATCH 12/13] batman-adv: initialize up/down values when adding a
+Subject: [PATCH 12/17] batman-adv: initialize up/down values when adding a
  gateway
 
 Without this initialization, gateways which actually announce up/down
diff --git a/batman-adv/patches/0013-batman-adv-remove-broadcast-packets-scheduled-for-pu.patch b/batman-adv/patches/0013-batman-adv-remove-broadcast-packets-scheduled-for-pu.patch
index da455e1..b7a27ef 100644
--- a/batman-adv/patches/0013-batman-adv-remove-broadcast-packets-scheduled-for-pu.patch
+++ b/batman-adv/patches/0013-batman-adv-remove-broadcast-packets-scheduled-for-pu.patch
@@ -1,7 +1,7 @@
 From 07bec2d4dec83f024baf166b95cf037be3a7eca5 Mon Sep 17 00:00:00 2001
 From: Simon Wunderlich <simon@open-mesh.com>
 Date: Wed, 24 Jun 2015 14:50:20 +0200
-Subject: [PATCH 13/13] batman-adv: remove broadcast packets scheduled for
+Subject: [PATCH 13/17] batman-adv: remove broadcast packets scheduled for
  purged outgoing if
 
 When an interface is purged, the broadcast packets scheduled for this
diff --git a/batman-adv/patches/0014-batman-adv-Fix-broken-DAT-capability-check.patch b/batman-adv/patches/0014-batman-adv-Fix-broken-DAT-capability-check.patch
new file mode 100644
index 0000000..bffabb3
--- /dev/null
+++ b/batman-adv/patches/0014-batman-adv-Fix-broken-DAT-capability-check.patch
@@ -0,0 +1,53 @@
+From de4666781c5a64cd55aa6688f77de95f8f66b2c0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
+Date: Fri, 3 Jul 2015 18:29:56 +0200
+Subject: [PATCH 14/17] batman-adv: Fix broken DAT capability check
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The introduction of set_bit() and clear_bit() calls in batman-adv
+wrongly passed bitmasks and not the bit numbers to these functions.
+This leads to broken capability checks.
+
+Fixing this by making the capability enum a non-bitmasked one and by
+that passing non-masked values to set_bit()/clear_bit().
+
+Fixes: bfd0fbaef270 ("batman-adv: Make DAT capability changes atomic")
+Reported-by: Def <def@laposte.net>
+Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ distributed-arp-table.c | 2 +-
+ types.h                 | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/distributed-arp-table.c b/distributed-arp-table.c
+index b2cc19b..c0c514d 100644
+--- a/distributed-arp-table.c
++++ b/distributed-arp-table.c
+@@ -422,7 +422,7 @@ static bool batadv_is_orig_node_eligible(struct batadv_dat_candidate *res,
+ 	int j;
+ 
+ 	/* check if orig node candidate is running DAT */
+-	if (!(candidate->capabilities & BATADV_ORIG_CAPA_HAS_DAT))
++	if (!(test_bit(BATADV_ORIG_CAPA_HAS_DAT, &candidate->capabilities)))
+ 		goto out;
+ 
+ 	/* Check if this node has already been selected... */
+diff --git a/types.h b/types.h
+index 65dc6bf..08a6343 100644
+--- a/types.h
++++ b/types.h
+@@ -299,7 +299,7 @@ struct batadv_orig_node {
+  *  (= orig node announces a tvlv of type BATADV_TVLV_MCAST)
+  */
+ enum batadv_orig_capabilities {
+-	BATADV_ORIG_CAPA_HAS_DAT = BIT(0),
++	BATADV_ORIG_CAPA_HAS_DAT,
+ 	BATADV_ORIG_CAPA_HAS_NC = BIT(1),
+ 	BATADV_ORIG_CAPA_HAS_TT = BIT(2),
+ 	BATADV_ORIG_CAPA_HAS_MCAST = BIT(3),
+-- 
+2.1.4
+
diff --git a/batman-adv/patches/0015-batman-adv-Fix-broken-NC-capability-check.patch b/batman-adv/patches/0015-batman-adv-Fix-broken-NC-capability-check.patch
new file mode 100644
index 0000000..86ecd92
--- /dev/null
+++ b/batman-adv/patches/0015-batman-adv-Fix-broken-NC-capability-check.patch
@@ -0,0 +1,53 @@
+From dfb27e75b5586e356e88b9d827d772a6cbdf3cc1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
+Date: Fri, 3 Jul 2015 18:29:57 +0200
+Subject: [PATCH 15/17] batman-adv: Fix broken NC capability check
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The introduction of set_bit() and clear_bit() calls in batman-adv
+wrongly passed bitmasks and not the bit numbers to these functions.
+This leads to broken capability checks.
+
+Fixing this by making the capability enum a non-bitmasked one and by
+that passing non-masked values to set_bit()/clear_bit().
+
+Fixes: 586df9e2537b ("batman-adv: Make NC capability changes atomic")
+Reported-by: Def <def@laposte.net>
+Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ network-coding.c | 2 +-
+ types.h          | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/network-coding.c b/network-coding.c
+index 3ce493e..0309c2c 100644
+--- a/network-coding.c
++++ b/network-coding.c
+@@ -871,7 +871,7 @@ void batadv_nc_update_nc_node(struct batadv_priv *bat_priv,
+ 		goto out;
+ 
+ 	/* check if orig node is network coding enabled */
+-	if (!(orig_node->capabilities & BATADV_ORIG_CAPA_HAS_NC))
++	if (!(test_bit(BATADV_ORIG_CAPA_HAS_NC, &orig_node->capabilities)))
+ 		goto out;
+ 
+ 	/* accept ogms from 'good' neighbors and single hop neighbors */
+diff --git a/types.h b/types.h
+index 08a6343..cb7ccb1 100644
+--- a/types.h
++++ b/types.h
+@@ -300,7 +300,7 @@ struct batadv_orig_node {
+  */
+ enum batadv_orig_capabilities {
+ 	BATADV_ORIG_CAPA_HAS_DAT,
+-	BATADV_ORIG_CAPA_HAS_NC = BIT(1),
++	BATADV_ORIG_CAPA_HAS_NC,
+ 	BATADV_ORIG_CAPA_HAS_TT = BIT(2),
+ 	BATADV_ORIG_CAPA_HAS_MCAST = BIT(3),
+ };
+-- 
+2.1.4
+
diff --git a/batman-adv/patches/0016-batman-adv-Fix-broken-TT-capability-check.patch b/batman-adv/patches/0016-batman-adv-Fix-broken-TT-capability-check.patch
new file mode 100644
index 0000000..5295026
--- /dev/null
+++ b/batman-adv/patches/0016-batman-adv-Fix-broken-TT-capability-check.patch
@@ -0,0 +1,54 @@
+From a4824ffaa200050a0b3e68101ebe074a7c45b7d5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
+Date: Fri, 3 Jul 2015 18:29:58 +0200
+Subject: [PATCH 16/17] batman-adv: Fix broken TT capability check
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The introduction of set_bit() and clear_bit() calls in batman-adv
+wrongly passed bitmasks and not the bit numbers to these functions.
+This leads to broken capability checks.
+
+Fixing this by making the capability enum a non-bitmasked one and by
+that passing non-masked values to set_bit()/clear_bit().
+
+Fixes: a51fa16ecf3f ("batman-adv: Make TT capability changes atomic")
+Reported-by: Def <def@laposte.net>
+Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ translation-table.c | 3 ++-
+ types.h             | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/translation-table.c b/translation-table.c
+index b6c0f52..d73b103 100644
+--- a/translation-table.c
++++ b/translation-table.c
+@@ -3323,7 +3323,8 @@ static void batadv_tt_update_orig(struct batadv_priv *bat_priv,
+ 	bool has_tt_init;
+ 
+ 	tt_vlan = (struct batadv_tvlv_tt_vlan_data *)tt_buff;
+-	has_tt_init = orig_node->capa_initialized & BATADV_ORIG_CAPA_HAS_TT;
++	has_tt_init = test_bit(BATADV_ORIG_CAPA_HAS_TT,
++			       &orig_node->capa_initialized);
+ 
+ 	/* orig table not initialised AND first diff is in the OGM OR the ttvn
+ 	 * increased by one -> we can apply the attached changes
+diff --git a/types.h b/types.h
+index cb7ccb1..6f4486c 100644
+--- a/types.h
++++ b/types.h
+@@ -301,7 +301,7 @@ struct batadv_orig_node {
+ enum batadv_orig_capabilities {
+ 	BATADV_ORIG_CAPA_HAS_DAT,
+ 	BATADV_ORIG_CAPA_HAS_NC,
+-	BATADV_ORIG_CAPA_HAS_TT = BIT(2),
++	BATADV_ORIG_CAPA_HAS_TT,
+ 	BATADV_ORIG_CAPA_HAS_MCAST = BIT(3),
+ };
+ 
+-- 
+2.1.4
+
diff --git a/batman-adv/patches/0017-batman-adv-Fix-broken-MCAST-capability-check.patch b/batman-adv/patches/0017-batman-adv-Fix-broken-MCAST-capability-check.patch
new file mode 100644
index 0000000..8930543
--- /dev/null
+++ b/batman-adv/patches/0017-batman-adv-Fix-broken-MCAST-capability-check.patch
@@ -0,0 +1,82 @@
+From 1798ad3fb6ba72f8c6f96024b27ad27193648787 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
+Date: Fri, 3 Jul 2015 18:29:59 +0200
+Subject: [PATCH 17/17] batman-adv: Fix broken MCAST capability check
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The introduction of set_bit() and clear_bit() calls in batman-adv
+wrongly passed bitmasks and not the bit numbers to these functions.
+This leads to broken capability checks.
+
+Fixing this by making the capability enum a non-bitmasked one and by
+that passing non-masked values to set_bit()/clear_bit().
+
+Fixes: 201a54ba710a ("batman-adv: Make MCAST capability changes atomic")
+Reported-by: Def <def@laposte.net>
+Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ multicast.c | 11 ++++++-----
+ types.h     |  2 +-
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/multicast.c b/multicast.c
+index b75bcc3..ee8317f 100644
+--- a/multicast.c
++++ b/multicast.c
+@@ -709,14 +709,15 @@ static void batadv_mcast_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
+ 		mcast_flags = *(uint8_t *)tvlv_value;
+ 
+ 	spin_lock_bh(&orig->mcast_handler_lock);
+-	orig_initialized = orig->capa_initialized & BATADV_ORIG_CAPA_HAS_MCAST;
++	orig_initialized = test_bit(BATADV_ORIG_CAPA_HAS_MCAST,
++				    &orig->capa_initialized);
+ 
+ 	/* If mcast support is turned on decrease the disabled mcast node
+ 	 * counter only if we had increased it for this node before. If this
+ 	 * is a completely new orig_node no need to decrease the counter.
+ 	 */
+ 	if (orig_mcast_enabled &&
+-	    !(orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST)) {
++	    !(test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities))) {
+ 		if (orig_initialized)
+ 			atomic_dec(&bat_priv->mcast.num_disabled);
+ 		set_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities);
+@@ -725,7 +726,7 @@ static void batadv_mcast_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
+ 	 * node counter.
+ 	 */
+ 	} else if (!orig_mcast_enabled &&
+-		   (orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST ||
++		   (test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities) ||
+ 		    !orig_initialized)) {
+ 		atomic_inc(&bat_priv->mcast.num_disabled);
+ 		clear_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities);
+@@ -774,8 +775,8 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig)
+ 
+ 	spin_lock_bh(&orig->mcast_handler_lock);
+ 
+-	if (!(orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST) &&
+-	    orig->capa_initialized & BATADV_ORIG_CAPA_HAS_MCAST)
++	if (!(test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities)) &&
++	    test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capa_initialized))
+ 		atomic_dec(&bat_priv->mcast.num_disabled);
+ 
+ 	batadv_mcast_want_unsnoop_update(bat_priv, orig, BATADV_NO_FLAGS);
+diff --git a/types.h b/types.h
+index 6f4486c..3baf595 100644
+--- a/types.h
++++ b/types.h
+@@ -302,7 +302,7 @@ enum batadv_orig_capabilities {
+ 	BATADV_ORIG_CAPA_HAS_DAT,
+ 	BATADV_ORIG_CAPA_HAS_NC,
+ 	BATADV_ORIG_CAPA_HAS_TT,
+-	BATADV_ORIG_CAPA_HAS_MCAST = BIT(3),
++	BATADV_ORIG_CAPA_HAS_MCAST,
+ };
+ 
+ /**
+-- 
+2.1.4
+

From ba83ed36057eaf7909f63e1ff63616b8624987e2 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Fri, 10 Jul 2015 08:26:12 +0200
Subject: [PATCH 134/368] hnetd: fix issues on 32-bit platforms

Signed-off-by: Steven Barth <steven@midlink.org>
---
 hnetd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hnetd/Makefile b/hnetd/Makefile
index fe53c21..b9fe825 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hnetd
-PKG_SOURCE_VERSION:=23d6a843f9960c4777ad42909611bec526513d61
-PKG_VERSION:=2015-07-02-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=ea2bd2bc2d8e617efca4b27fbf1c5c3c8ad09ad9
+PKG_VERSION:=2015-07-10-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git

From 6c78c2ac2cb9ec3be25e68b1cef7b2e2e0e4a346 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Fri, 10 Jul 2015 08:26:25 +0200
Subject: [PATCH 135/368] minimalist-pcpproxy: fix uci call in default-script

Signed-off-by: Steven Barth <steven@midlink.org>
---
 minimalist-pcproxy/files/minimalist-pcproxy.defaults | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/minimalist-pcproxy/files/minimalist-pcproxy.defaults b/minimalist-pcproxy/files/minimalist-pcproxy.defaults
index a29d7b3..7537f8a 100644
--- a/minimalist-pcproxy/files/minimalist-pcproxy.defaults
+++ b/minimalist-pcproxy/files/minimalist-pcproxy.defaults
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ `uci get -q upnpd.config._pcproxy_configured` = "1" ]
+if [ `uci -q get upnpd.config._pcproxy_configured` = "1" ]
 then
     exit
 fi

From 7d4e4fe21d6a7315c86fb070f2aac422f3334920 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Wed, 15 Jul 2015 08:28:32 +0200
Subject: [PATCH 136/368] miniupnpd: shorten OS name to silence SSDP warnings

Signed-off-by: Steven Barth <steven@midlink.org>
---
 miniupnpd/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index 0abe480..1822926 100644
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -46,7 +46,7 @@ endef
 
 define Build/Prepare
 	$(call Build/Prepare/Default)
-	echo "OpenWrt/$(OPENWRTVERSION)" | tr \(\)\  _ >$(PKG_BUILD_DIR)/os.openwrt
+	echo "OpenWrt" | tr \(\)\  _ >$(PKG_BUILD_DIR)/os.openwrt
 endef
 
 MAKE_FLAGS += \

From 36efb8629fd5388615e9eb24e8fe9d334a0b88bb Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Tue, 21 Jul 2015 14:24:09 +0200
Subject: [PATCH 137/368] initial BMX7 package

---
 bmx7/Makefile                 | 156 ++++++++++++++++++++++++++++++++++
 bmx7/files/etc/config/bmx6    |  48 +++++++++++
 bmx7/files/etc/init.d/bmx6    |  41 +++++++++
 bmx7/patches/001-json-c.patch |  13 +++
 4 files changed, 258 insertions(+)
 create mode 100644 bmx7/Makefile
 create mode 100644 bmx7/files/etc/config/bmx6
 create mode 100755 bmx7/files/etc/init.d/bmx6
 create mode 100644 bmx7/patches/001-json-c.patch

diff --git a/bmx7/Makefile b/bmx7/Makefile
new file mode 100644
index 0000000..e611ffa
--- /dev/null
+++ b/bmx7/Makefile
@@ -0,0 +1,156 @@
+#    Copyright (C) 2011 Fundacio Privada per a la Xarxa Oberta, Lliure i Neutral guifi.net
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#    The full GNU General Public License is included in this distribution in
+#    the file called "COPYING".
+#
+# Contibutors:
+#	Axel Neumann, Simó Albert i Beltran, Pau Escrich
+#
+
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=bmx7
+
+PKG_SOURCE_PROTO:=git
+
+#PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
+PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
+#PKG_SOURCE_URL:=file:///home/neumann/bmx6/bmx6.git
+
+PKG_REV:=2865a2fe21e6dae00b43b3b91ba0625af9757c09
+PKG_VERSION:=r2015072121
+PKG_RELEASE:=4
+PKG_LICENSE:=GPL-2.0
+
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
+
+include $(INCLUDE_DIR)/package.mk
+
+TARGET_CFLAGS += $(FPIC)
+
+MAKE_ARGS += \
+        EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DCRYPTLIB=POLARSSL_1_3_4 -DCORE_LIMIT=20000 -DTRAFFIC_DUMP -DDEBUG_MALLOC" \
+        EXTRA_LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib " \
+        GIT_REV="$(PKG_REV)" \
+        CC="$(TARGET_CC)" \
+        INSTALL_DIR="$(PKG_INSTALL_DIR)" \
+        STRIP="/bin/false" \
+        build_all
+
+define Package/bmx7/Default
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Routing and Redirection
+  TITLE:=BMX7 layer 3 routing daemon
+  URL:=http://bmx6.net/
+  MAINTAINER:=Axel Neumann <neumann@cgws.de>
+  DEPENDS:=+zlib +libpolarssl +kmod-ip6-tunnel +kmod-iptunnel6 +kmod-tun @!bmx6
+endef
+
+define Package/bmx7/description
+BMX7 layer 3 routing daemon supporting IPv6, and IPv4 over IPv6
+endef
+
+define Package/bmx7
+  $(call Package/bmx7/Default)
+  MENU:=1
+endef
+
+define Package/bmx7-uci-config
+  $(call Package/bmx7/Default)
+  DEPENDS:=bmx7 +libuci
+  TITLE:=configuration plugin based on uci (recommended!)
+endef
+
+define Package/bmx7-json
+  $(call Package/bmx7/Default)
+  DEPENDS:=bmx7 +libjson-c
+  TITLE:=json plugin based on json-c
+endef
+
+define Package/bmx7-sms
+  $(call Package/bmx7/Default)
+  DEPENDS:=bmx7
+  TITLE:=sms plugin
+endef
+
+#define Package/bmx7-quagga
+#  $(call Package/bmx7/Default)
+#  DEPENDS:=bmx7 +qmp-quagga @BROKEN
+#  TITLE:=bmx7 quagga plugin to redistribute/export routes (needs manet/bmx patched quagga 0.99.21)
+#endef
+
+define Package/bmx7-table
+  $(call Package/bmx7/Default)
+  DEPENDS:=bmx7
+  TITLE:=bmx7 table plugin to automatically announce routing-table routes via ip6ip tunnels
+endef
+
+define Build/Configure
+	mkdir -p $(PKG_INSTALL_DIR)
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS)
+endef
+
+define Package/bmx7/install
+	$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bmx6 $(1)/usr/sbin/bmx6
+endef
+
+define Package/bmx7-uci-config/conffiles
+/etc/config/bmx6
+endef
+
+define Package/bmx7-uci-config/install
+	$(INSTALL_DIR) $(1)/usr/lib $(1)/etc/config $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_uci_config/bmx6_config.so $(1)/usr/lib/bmx6_config.so
+	$(INSTALL_BIN) ./files/etc/init.d/bmx6 $(1)/etc/init.d/bmx6
+	$(INSTALL_DATA) ./files/etc/config/bmx6 $(1)/etc/config/bmx6
+endef
+
+define Package/bmx7-json/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_json/bmx6_json.so $(1)/usr/lib/bmx6_json.so
+endef
+
+define Package/bmx7-sms/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_sms/bmx6_sms.so $(1)/usr/lib/bmx6_sms.so
+endef
+
+define Package/bmx7-table/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_table/bmx6_table.so $(1)/usr/lib/bmx6_table.so
+endef
+
+#define Package/bmx7-quagga/install
+#	$(INSTALL_DIR) $(1)/usr/lib
+#	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_quagga/bmx6_quagga.so $(1)/usr/lib/bmx6_quagga.so
+#endef
+
+$(eval $(call BuildPackage,bmx7))
+$(eval $(call BuildPackage,bmx7-uci-config))
+$(eval $(call BuildPackage,bmx7-json))
+$(eval $(call BuildPackage,bmx7-sms))
+#$(eval $(call BuildPackage,bmx7-quagga))
+$(eval $(call BuildPackage,bmx7-table))
diff --git a/bmx7/files/etc/config/bmx6 b/bmx7/files/etc/config/bmx6
new file mode 100644
index 0000000..5f7af9d
--- /dev/null
+++ b/bmx7/files/etc/config/bmx6
@@ -0,0 +1,48 @@
+
+# for more information:
+# http://bmx6.net/projects/bmx6/wiki
+# options execute: bmx6 --help
+
+config 'bmx6' 'general'
+#       option 'runtimeDir' '/var/run/bmx6'
+
+
+#config 'plugin'
+#        option 'plugin' 'bmx6_config.so'
+
+#config 'plugin'
+#        option 'plugin' 'bmx6_json.so'
+
+#config 'plugin'
+#        option 'plugin' 'bmx6_table.so'
+
+#config 'plugin'
+#        option 'plugin' 'bmx6_sms.so'
+
+
+config 'dev' 'mesh_1'
+        option 'dev' 'br-lan'
+
+config 'dev' 'mesh_2'
+        option 'dev' 'wlan0'
+
+config 'tunDev' default
+        option 'tunDev' 'default'
+        option 'tun6Address' '2012:0:0:6666::1/64'
+        option 'tun4Address' '10.66.66.1/24'
+
+
+#config 'tunOut'
+#        option 'tunOut' 'ip6'
+#        option 'network' '2012::/16'
+#        option 'exportDistance' '0'
+
+#config 'tunOut'
+#        option 'tunOut' 'ip4'
+#        option 'network' '10.0.0.0/9'
+#        option 'minPrefixLen' '27'
+
+
+
+
+
diff --git a/bmx7/files/etc/init.d/bmx6 b/bmx7/files/etc/init.d/bmx6
new file mode 100755
index 0000000..cb2d5b3
--- /dev/null
+++ b/bmx7/files/etc/init.d/bmx6
@@ -0,0 +1,41 @@
+#!/bin/sh /etc/rc.common
+#    Copyright (C) 2011 Fundacio Privada per a la Xarxa Oberta, Lliure i Neutral guifi.net
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#    The full GNU General Public License is included in this distribution in
+#    the file called "COPYING".
+
+START=91
+
+BIN=/usr/sbin/bmx6
+CONF=/etc/config/bmx6
+PID=/var/run/bmx6/pid
+
+
+start() {
+	cd /root/
+	while pgrep -f mac80211.sh ; do sleep 1; done
+	ulimit -c 20000
+	$BIN -f $CONF -d0 > /dev/null &
+}
+
+stop() {
+	start-stop-daemon -p $PID -K
+}
+
+restart() {
+	stop; sleep 3; start
+}
diff --git a/bmx7/patches/001-json-c.patch b/bmx7/patches/001-json-c.patch
new file mode 100644
index 0000000..5d29dae
--- /dev/null
+++ b/bmx7/patches/001-json-c.patch
@@ -0,0 +1,13 @@
+Index: bmx6-r2014112401/lib/bmx6_json/json.c
+===================================================================
+--- bmx6-r2014112401.orig/lib/bmx6_json/json.c
++++ bmx6-r2014112401/lib/bmx6_json/json.c
+@@ -27,7 +27,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <stdint.h>
+-#include <json/json.h>
++#include <json-c/json.h>
+ //#include <dirent.h>
+ //#include <sys/inotify.h>
+ 

From c5a8562599ecea81a014ed8f714d61b29e12df55 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Tue, 28 Jul 2015 12:06:25 +0200
Subject: [PATCH 138/368] hnetd: bump and add tunneling support

Signed-off-by: Steven Barth <steven@midlink.org>
---
 hnetd/Makefile         | 32 ++++++++++++++++++++++++++------
 hnetd/files/hnetd.init |  3 +++
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/hnetd/Makefile b/hnetd/Makefile
index b9fe825..03e3fb9 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hnetd
-PKG_SOURCE_VERSION:=ea2bd2bc2d8e617efca4b27fbf1c5c3c8ad09ad9
-PKG_VERSION:=2015-07-10-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=a6b4b6f1f5d38646fa11064cf7394719e048bc87
+PKG_VERSION:=2015-07-28-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
@@ -37,7 +37,7 @@ define Package/hnetd/Default
   CATEGORY:=Network
   TITLE:=HNCP Homenet daemon - $(2)
   URL:=https://github.com/sbyx/hnetd
-  DEPENDS:=+odhcpd +odhcp6c +netifd +ip $(3)
+  DEPENDS:=+odhcpd +odhcp6c +netifd $(3)
   DEPENDS+=+@IPV6
   VARIANT:=$1
 endef
@@ -50,7 +50,7 @@ define Package/hnet-full
   CATEGORY:=Network
   TITLE:=HNCP Homenet metapackage
   URL:=https://github.com/sbyx/hnetd
-  DEPENDS:=+hnetd-nossl +luci-app-hnet
+  DEPENDS:=+hnetd-nossl +luci-app-hnet +ip
   # Routing
   DEPENDS+=+babeld
   # Service discovery
@@ -62,9 +62,23 @@ endef
 define Package/hnet-full-secure
   SECTION:=net
   CATEGORY:=Network
-  TITLE:=HNCP Homenet metapackage
+  TITLE:=HNCP Homenet metapackage (w/ SSL)
   URL:=https://github.com/sbyx/hnetd
-  DEPENDS:=+hnetd-openssl +luci-app-hnet
+  DEPENDS:=+hnetd-openssl +luci-app-hnet +ip
+  # Routing
+  DEPENDS+=+babeld
+  # Service discovery
+  DEPENDS+=+ohybridproxy
+  # Distributed PCP support
+  DEPENDS+=+miniupnpd +minimalist-pcproxy
+endef
+
+define Package/hnet-full-l2tp
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=HNCP Homenet metapackage (w/ L2TP)
+  URL:=https://github.com/sbyx/hnetd
+  DEPENDS:=+hnetd-nossl +luci-app-hnet +ip-full +kmod-l2tp-eth
   # Routing
   DEPENDS+=+babeld
   # Service discovery
@@ -116,6 +130,11 @@ define Package/hnet-full-secure/install
 	true
 endef
 
+define Package/hnet-full-l2tp/install
+	$(INSTALL_DIR) $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/generic/tunnel.script $(1)/usr/sbin/hnetd-tunnel
+endef
+
 define Package/luci-app-hnet/install
 	$(INSTALL_DIR) $(1)/usr/lib/lua/luci
 	$(INSTALL_DIR) $(1)/www
@@ -137,4 +156,5 @@ $(eval $(call BuildPackage,hnetd-nossl))
 $(eval $(call BuildPackage,hnetd-openssl))
 $(eval $(call BuildPackage,hnet-full))
 $(eval $(call BuildPackage,hnet-full-secure))
+$(eval $(call BuildPackage,hnet-full-l2tp))
 $(eval $(call BuildPackage,luci-app-hnet))
diff --git a/hnetd/files/hnetd.init b/hnetd/files/hnetd.init
index 6d7d0ec..6b98b8c 100644
--- a/hnetd/files/hnetd.init
+++ b/hnetd/files/hnetd.init
@@ -51,6 +51,9 @@ start_service() {
     # Routing script
     procd_append_param command -r /usr/sbin/hnetd-routing
 
+    [ -x /usr/sbin/hnetd-tunnel ] && \
+         procd_append_param command -t /usr/sbin/hnetd-tunnel
+
     # Prefix assignment (pa)
     config_get val pa ip4prefix
     [ -n "$val" ] && procd_append_param command --ip4prefix $val

From 793495fba386064ef902d8235f0c63dee5258da5 Mon Sep 17 00:00:00 2001
From: Henning Rogge <hrogge@gmail.com>
Date: Thu, 30 Jul 2015 17:03:16 +0200
Subject: [PATCH 139/368] Update OONF packages to 0.9.0

---
 oonf-dlep-proxy/Makefile | 4 ++--
 oonf-dlep-radio/Makefile | 4 ++--
 oonf-olsrd2/Makefile     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index 115380c..1f69065 100644
--- a/oonf-dlep-proxy/Makefile
+++ b/oonf-dlep-proxy/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-proxy
-PKG_VERSION:=0.8.3
-PKG_REV:=a5ba0e6c093ff6c289a77ec9c3d04b5f94145e08
+PKG_VERSION:=0.9.0
+PKG_REV:=2e367c28fa80aa1c2841c78e296ba946afb2476f
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index 4eb6328..008384e 100644
--- a/oonf-dlep-radio/Makefile
+++ b/oonf-dlep-radio/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-radio
-PKG_VERSION:=0.8.3
-PKG_REV:=a5ba0e6c093ff6c289a77ec9c3d04b5f94145e08
+PKG_VERSION:=0.9.0
+PKG_REV:=2e367c28fa80aa1c2841c78e296ba946afb2476f
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 2717441..4cd92a3 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2
-PKG_VERSION:=0.8.3
-PKG_REV:=a5ba0e6c093ff6c289a77ec9c3d04b5f94145e08
+PKG_VERSION:=0.9.0
+PKG_REV:=2e367c28fa80aa1c2841c78e296ba946afb2476f
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

From ba4f448870bd5c47d3d0e156cb738ae816fcad2b Mon Sep 17 00:00:00 2001
From: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
Date: Fri, 31 Jul 2015 08:55:51 +0200
Subject: [PATCH 140/368] Update to oonf v0.9.1

---
 oonf-dlep-proxy/Makefile | 4 ++--
 oonf-dlep-radio/Makefile | 4 ++--
 oonf-olsrd2/Makefile     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index 1f69065..1f4f311 100644
--- a/oonf-dlep-proxy/Makefile
+++ b/oonf-dlep-proxy/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-proxy
-PKG_VERSION:=0.9.0
-PKG_REV:=2e367c28fa80aa1c2841c78e296ba946afb2476f
+PKG_VERSION:=0.9.1
+PKG_REV:=5c2d56765f72572b0c970395604eee2218847e67
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index 008384e..9973819 100644
--- a/oonf-dlep-radio/Makefile
+++ b/oonf-dlep-radio/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-radio
-PKG_VERSION:=0.9.0
-PKG_REV:=2e367c28fa80aa1c2841c78e296ba946afb2476f
+PKG_VERSION:=0.9.1
+PKG_REV:=5c2d56765f72572b0c970395604eee2218847e67
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 4cd92a3..6749586 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2
-PKG_VERSION:=0.9.0
-PKG_REV:=2e367c28fa80aa1c2841c78e296ba946afb2476f
+PKG_VERSION:=0.9.1
+PKG_REV:=5c2d56765f72572b0c970395604eee2218847e67
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

From 8afb34944bf61d55b9f221f7db8d662175d00c5c Mon Sep 17 00:00:00 2001
From: Henning Rogge <hrogge@gmail.com>
Date: Sat, 1 Aug 2015 09:22:46 +0200
Subject: [PATCH 141/368] Update to 0.9.1-r1 release for better openwrt startup
 script

---
 oonf-dlep-proxy/Makefile | 4 ++--
 oonf-dlep-radio/Makefile | 4 ++--
 oonf-olsrd2/Makefile     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index 1f4f311..9a6cd2f 100644
--- a/oonf-dlep-proxy/Makefile
+++ b/oonf-dlep-proxy/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-proxy
-PKG_VERSION:=0.9.1
-PKG_REV:=5c2d56765f72572b0c970395604eee2218847e67
+PKG_VERSION:=0.9.1-r1
+PKG_REV:=eab3845089bc2410a3c115fb8274572b16a0e47d
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index 9973819..4fb9124 100644
--- a/oonf-dlep-radio/Makefile
+++ b/oonf-dlep-radio/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-radio
-PKG_VERSION:=0.9.1
-PKG_REV:=5c2d56765f72572b0c970395604eee2218847e67
+PKG_VERSION:=0.9.1-r1
+PKG_REV:=eab3845089bc2410a3c115fb8274572b16a0e47d
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 6749586..4651f94 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2
-PKG_VERSION:=0.9.1
-PKG_REV:=5c2d56765f72572b0c970395604eee2218847e67
+PKG_VERSION:=0.9.1-r1
+PKG_REV:=eab3845089bc2410a3c115fb8274572b16a0e47d
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

From 67c4672c0d79cafd72d8326ffe59faf60f2a237f Mon Sep 17 00:00:00 2001
From: Manuel Munz <munz@comuno.net>
Date: Sat, 1 Aug 2015 20:11:39 +0200
Subject: [PATCH 142/368] make ipv6only plugin option boolean. Without this,
 the value will be written as '0' or '1' to the generated configs while it
 should be 'no' or 'yes'

---
 olsrd/files/olsrd.init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/olsrd/files/olsrd.init b/olsrd/files/olsrd.init
index 5bee27a..3ced911 100644
--- a/olsrd/files/olsrd.init
+++ b/olsrd/files/olsrd.init
@@ -8,7 +8,7 @@ SERVICE_WRITE_PID=1
 
 OLSRD_OLSRD_SCHEMA='ignore:internal config_file:internal DebugLevel=0 AllowNoInt=yes'
 OLSRD_IPCCONNECT_SCHEMA='ignore:internal Host:list Net:list2'
-OLSRD_LOADPLUGIN_SCHEMA='ignore:internal library:internal Host4:list Net4:list2 Host:list Net:list2 Host6:list Net6:list2 Ping:list redistribute:list NonOlsrIf:list name:list lat lon latlon_infile HNA:list2 hosts:list2'
+OLSRD_LOADPLUGIN_SCHEMA='ignore:internal library:internal Host4:list Net4:list2 Host:list Net:list2 Host6:list Net6:list2 Ping:list redistribute:list NonOlsrIf:list name:list lat lon latlon_infile HNA:list2 hosts:list2 ipv6only:bool'
 OLSRD_INTERFACE_SCHEMA='ignore:internal interface:internal AutoDetectChanges:bool LinkQualityMult:list2'
 OLSRD_INTERFACE_DEFAULTS_SCHEMA='AutoDetectChanges:bool'
 

From 64ceee8d87b6c2936a772ca0b5734754f7ae9ed5 Mon Sep 17 00:00:00 2001
From: Hans Dedecker <hans.dedecker@technicolor.com>
Date: Tue, 4 Aug 2015 14:39:53 +0200
Subject: [PATCH 143/368] nat46: Fix 464xlat interface teardown

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
---
 nat46/files/464xlat.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nat46/files/464xlat.sh b/nat46/files/464xlat.sh
index 8154f7f..3fbca5c 100755
--- a/nat46/files/464xlat.sh
+++ b/nat46/files/464xlat.sh
@@ -84,7 +84,7 @@ proto_464xlat_setup() {
 }
 
 proto_464xlat_teardown() {
-	464xlatcfg "464xlat-$1"
+	464xlatcfg "464-$1"
 }
 
 proto_464xlat_init_config() {

From 8e12b6fd3e7763ed0440b5521bc5031ac756b521 Mon Sep 17 00:00:00 2001
From: Hans Dedecker <hans.dedecker@technicolor.com>
Date: Tue, 4 Aug 2015 14:45:15 +0200
Subject: [PATCH 144/368] nat46: Remove unnecessary 464xlat wan forwarding rule

Remove unnecessary 464xlat wan forwarding firewall rule with as
outgoing interface the 464xlat interface and as destination the
local IPv6 464xlat address as it's never hit.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
---
 nat46/files/464xlat.sh | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/nat46/files/464xlat.sh b/nat46/files/464xlat.sh
index 3fbca5c..2ec1094 100755
--- a/nat46/files/464xlat.sh
+++ b/nat46/files/464xlat.sh
@@ -67,16 +67,6 @@ proto_464xlat_setup() {
 	  		json_add_string src_ip $ip6addr
 	  		json_add_string target ACCEPT
 	  	json_close_object
-	  	json_add_object ""
-	  		json_add_string type rule
-	  		json_add_string family inet6
-	  		json_add_string proto all
-	  		json_add_string direction out
-			json_add_string dest "$zone"
-			json_add_string src "$zone"
-	  		json_add_string dest_ip $ip6addr
-	  		json_add_string target ACCEPT
-	  	json_close_object
 	json_close_array
 	proto_close_data
 

From ad556e87598f9b2a1561900b882f385137ff85e4 Mon Sep 17 00:00:00 2001
From: Simon Wunderlich <sw@simonwunderlich.de>
Date: Tue, 4 Aug 2015 17:57:43 +0200
Subject: [PATCH 145/368] alfred: bump version to 2015.1

From the CHANGELOG:

 * add support to run on interfaces with multiple link-local addresses
 * various code cleanups
 * bugs squashed:
   - reduce of maximum payload size to always fit into UDP datagrams

Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
 alfred/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/alfred/Makefile b/alfred/Makefile
index 3fccbb9..8f49b5a 100644
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -11,9 +11,9 @@ include $(TOPDIR)/rules.mk
 # The latest alfred git hash in PKG_REV can be obtained from http://git.open-mesh.org/alfred.git
 #
 PKG_NAME:=alfred
-PKG_VERSION:=2015.0
+PKG_VERSION:=2015.1
 PKG_RELEASE:=0
-PKG_MD5SUM:=53e2436dbc506e69f9675b69385ae131
+PKG_MD5SUM:=fcce70cd8da764ee91c8cd2cbfa14362
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From 99a3f8dcb578505ce12ae0714a18a34189a7dc26 Mon Sep 17 00:00:00 2001
From: Marek Lindner <mareklindner@neomailbox.ch>
Date: Wed, 5 Aug 2015 02:54:06 +0800
Subject: [PATCH 146/368] batman-adv: upgrade package to latest release 2015.1

Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
 batman-adv/Makefile                           |   8 +-
 ...ower-layer-header-length-to-headroom.patch |  88 ++++++
 ...d-u32-overflow-during-gateway-select.patch |  42 ---
 ...n-adv-avoid-DAT-to-mess-up-LAN-state.patch |  74 -----
 ...v-Make-DAT-capability-changes-atomic.patch |  54 ----
 ...dv-Make-NC-capability-changes-atomic.patch |  40 ---
 ...dv-Make-TT-capability-changes-atomic.patch |  60 -----
 ...Make-MCAST-capability-changes-atomic.patch |  50 ----
 ...otential-synchronization-issues-in-m.patch | 254 ------------------
 ...ompile-error-on-deactivated-MCAST-fe.patch |  58 ----
 ...ernel-crash-due-to-missing-NULL-chec.patch |  93 -------
 ...ct-tt_local_entry-from-concurrent-de.patch |  55 ----
 ...tect-tt-request-from-double-deletion.patch |  58 ----
 ...alize-up-down-values-when-adding-a-g.patch |  42 ---
 ...e-broadcast-packets-scheduled-for-pu.patch |  32 ---
 ...-adv-Fix-broken-DAT-capability-check.patch |  53 ----
 ...n-adv-Fix-broken-NC-capability-check.patch |  53 ----
 ...n-adv-Fix-broken-TT-capability-check.patch |  54 ----
 ...dv-Fix-broken-MCAST-capability-check.patch |  82 ------
 19 files changed, 92 insertions(+), 1158 deletions(-)
 create mode 100644 batman-adv/patches/0001-batman-adv-Add-lower-layer-header-length-to-headroom.patch
 delete mode 100644 batman-adv/patches/0001-batman-adv-Avoid-u32-overflow-during-gateway-select.patch
 delete mode 100644 batman-adv/patches/0002-batman-adv-avoid-DAT-to-mess-up-LAN-state.patch
 delete mode 100644 batman-adv/patches/0003-batman-adv-Make-DAT-capability-changes-atomic.patch
 delete mode 100644 batman-adv/patches/0004-batman-adv-Make-NC-capability-changes-atomic.patch
 delete mode 100644 batman-adv/patches/0005-batman-adv-Make-TT-capability-changes-atomic.patch
 delete mode 100644 batman-adv/patches/0006-batman-adv-Make-MCAST-capability-changes-atomic.patch
 delete mode 100644 batman-adv/patches/0007-batman-adv-Fix-potential-synchronization-issues-in-m.patch
 delete mode 100644 batman-adv/patches/0008-batman-adv-Fix-compile-error-on-deactivated-MCAST-fe.patch
 delete mode 100644 batman-adv/patches/0009-batman-adv-fix-kernel-crash-due-to-missing-NULL-chec.patch
 delete mode 100644 batman-adv/patches/0010-batman-adv-protect-tt_local_entry-from-concurrent-de.patch
 delete mode 100644 batman-adv/patches/0011-batman-adv-protect-tt-request-from-double-deletion.patch
 delete mode 100644 batman-adv/patches/0012-batman-adv-initialize-up-down-values-when-adding-a-g.patch
 delete mode 100644 batman-adv/patches/0013-batman-adv-remove-broadcast-packets-scheduled-for-pu.patch
 delete mode 100644 batman-adv/patches/0014-batman-adv-Fix-broken-DAT-capability-check.patch
 delete mode 100644 batman-adv/patches/0015-batman-adv-Fix-broken-NC-capability-check.patch
 delete mode 100644 batman-adv/patches/0016-batman-adv-Fix-broken-TT-capability-check.patch
 delete mode 100644 batman-adv/patches/0017-batman-adv-Fix-broken-MCAST-capability-check.patch

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 8a932aa..7e43de4 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
 
-PKG_VERSION:=2015.0
+PKG_VERSION:=2015.1
 PKG_RELEASE:=1
-PKG_MD5SUM:=178b082266a8bfb3041178a0c821d843
+PKG_MD5SUM:=45f98d315b4290dc208e01190193c514
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
@@ -29,7 +29,7 @@ define KernelPackage/batman-adv
   SUBMENU:=Network Support
   DEPENDS:=+KMOD_BATMAN_ADV_BLA:kmod-lib-crc16 +kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c
   TITLE:=B.A.T.M.A.N. Adv
-  FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(PKG_BUILD_DIR)/net/batman-adv/batman-adv.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,batman-adv)
 endef
 
@@ -65,7 +65,7 @@ MAKE_BATMAN_ADV_ARGS += \
 define Build/Prepare
 	$(call Build/Prepare/Default)
 	$(SED) '/#define _NET_BATMAN_ADV_MAIN_H_/a\#undef CONFIG_MODULE_STRIPPED' \
-		$(PKG_BUILD_DIR)/main.h
+		$(PKG_BUILD_DIR)/net/batman-adv/main.h
 endef
 
 define Build/Compile
diff --git a/batman-adv/patches/0001-batman-adv-Add-lower-layer-header-length-to-headroom.patch b/batman-adv/patches/0001-batman-adv-Add-lower-layer-header-length-to-headroom.patch
new file mode 100644
index 0000000..c5adedb
--- /dev/null
+++ b/batman-adv/patches/0001-batman-adv-Add-lower-layer-header-length-to-headroom.patch
@@ -0,0 +1,88 @@
+batman-adv: Add lower layer header length to headroom
+
+The maximum of hard_header_len and needed_headroom of all slave interfaces
+of a batman-adv device must be used to define the batman-adv device
+headroom/header_len. This is required to avoid too small headroom problems
+when these slave devices try to send the encapsulated packet.
+
+The batman-adv therefore uses:
+
+	needed_headroom = max(0, dev[0].needed_headroom, ...,
+			      dev[n].needed_headroom)
+	hard_header_len = max(ETH_HLEN, dev[0].hard_header_len, ...,
+			      dev[n].hard_header_len) + ETH_HLEN +
+			  max(sizeof(batadv_*cast_packet))
+
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+---
+ net/batman-adv/hard-interface.c | 33 +++++++++++++++++++++++++++++++++
+ net/batman-adv/soft-interface.c |  2 +-
+ 2 files changed, 34 insertions(+), 1 deletion(-)
+
+diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
+index f4a15d2e5eaf..a501aae1077b 100644
+--- a/net/batman-adv/hard-interface.c
++++ b/net/batman-adv/hard-interface.c
+@@ -252,12 +252,45 @@ static void batadv_check_known_mac_addr(const struct net_device *net_dev)
+ 	rcu_read_unlock();
+ }
+ 
++/**
++ * batadv_hardif_recalc_headroom() - Recalculate skbuff headroom parameters
++ * @soft_iface: netdev struct of the mesh interface
++ */
++static void batadv_hardif_recalc_headroom(struct net_device *soft_iface)
++{
++	const struct batadv_hard_iface *hard_iface;
++	unsigned short hard_header_len = ETH_HLEN;
++	unsigned short needed_headroom = 0;
++
++	rcu_read_lock();
++	list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
++		if ((hard_iface->if_status != BATADV_IF_ACTIVE) &&
++		    (hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED))
++			continue;
++
++		if (hard_iface->soft_iface != soft_iface)
++			continue;
++
++		hard_header_len = max_t(unsigned short, hard_header_len,
++					hard_iface->net_dev->hard_header_len);
++
++		needed_headroom = max_t(unsigned short, needed_headroom,
++					hard_iface->net_dev->needed_headroom);
++	}
++	rcu_read_unlock();
++
++	soft_iface->needed_headroom = needed_headroom;
++	soft_iface->hard_header_len = hard_header_len + batadv_max_header_len();
++}
++
+ int batadv_hardif_min_mtu(struct net_device *soft_iface)
+ {
+ 	struct batadv_priv *bat_priv = netdev_priv(soft_iface);
+ 	const struct batadv_hard_iface *hard_iface;
+ 	int min_mtu = INT_MAX;
+ 
++	batadv_hardif_recalc_headroom(soft_iface);
++
+ 	rcu_read_lock();
+ 	list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
+ 		if ((hard_iface->if_status != BATADV_IF_ACTIVE) &&
+diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
+index 36b23f31df2a..b4c110791203 100644
+--- a/net/batman-adv/soft-interface.c
++++ b/net/batman-adv/soft-interface.c
+@@ -948,7 +948,7 @@ static void batadv_softif_init_early(struct net_device *dev)
+ 	 */
+ 	dev->mtu = ETH_DATA_LEN;
+ 	/* reserve more space in the skbuff for our header */
+-	dev->hard_header_len = batadv_max_header_len();
++	dev->hard_header_len = ETH_HLEN + batadv_max_header_len();
+ 
+ 	/* generate random address */
+ 	eth_hw_addr_random(dev);
+-- 
+2.5.0
+
+
diff --git a/batman-adv/patches/0001-batman-adv-Avoid-u32-overflow-during-gateway-select.patch b/batman-adv/patches/0001-batman-adv-Avoid-u32-overflow-during-gateway-select.patch
deleted file mode 100644
index b7232e7..0000000
--- a/batman-adv/patches/0001-batman-adv-Avoid-u32-overflow-during-gateway-select.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From f63c54bba31d2c86269982fd8efdfb618f1daabe Mon Sep 17 00:00:00 2001
-From: Ruben Wisniewski <ruben@freifunk-nrw.de>
-Date: Tue, 26 May 2015 18:34:27 +0200
-Subject: [PATCH 01/17] batman-adv: Avoid u32 overflow during gateway select
-
-The gateway selection based on fast connections is using a single value
-calculated from the average tq (0-255) and the download bandwidth (in
-100Kibit). The formula for the first step (tq ** 2 * 10000 * bandwidth)
-tends to overflow a u32 with low bandwidth settings like 50 [100KiBit]
-and a tq value of over 92.
-
-Changing this to a 64 bit unsigned integer allows to support a
-bandwidth_down with up to ~2.8e10 [100KiBit] and a perfect tq of 255. This
-is ~6.6 times higher than the maximum possible value of the gateway
-announcement TVLV.
-
-This problem only affects the non-default gw_sel_class 1.
-
-Signed-off-by: Ruben Wisniewsi <ruben@vfn-nrw.de>
-[sven@narfation.org: rewritten commit message, changed to kernel type]
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- gateway_client.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gateway_client.c b/gateway_client.c
-index a85eaca..3f32357 100644
---- a/gateway_client.c
-+++ b/gateway_client.c
-@@ -133,7 +133,7 @@ batadv_gw_get_best_gw_node(struct batadv_priv *bat_priv)
- 	struct batadv_neigh_node *router;
- 	struct batadv_neigh_ifinfo *router_ifinfo;
- 	struct batadv_gw_node *gw_node, *curr_gw = NULL;
--	uint32_t max_gw_factor = 0, tmp_gw_factor = 0;
-+	uint64_t max_gw_factor = 0, tmp_gw_factor = 0;
- 	uint32_t gw_divisor;
- 	uint8_t max_tq = 0;
- 	uint8_t tq_avg;
--- 
-2.1.4
-
diff --git a/batman-adv/patches/0002-batman-adv-avoid-DAT-to-mess-up-LAN-state.patch b/batman-adv/patches/0002-batman-adv-avoid-DAT-to-mess-up-LAN-state.patch
deleted file mode 100644
index b335f4f..0000000
--- a/batman-adv/patches/0002-batman-adv-avoid-DAT-to-mess-up-LAN-state.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 9bbd794030657fe0d38590cd67d4801b989cebf9 Mon Sep 17 00:00:00 2001
-From: Antonio Quartulli <antonio@meshcoding.com>
-Date: Mon, 1 Jun 2015 17:29:57 +0200
-Subject: [PATCH 02/17] batman-adv: avoid DAT to mess up LAN state
-
-When a node running DAT receives an ARP request from the LAN for the
-first time, it is likely that this node will request the ARP entry
-through the distributed ARP table (DAT) in the mesh.
-
-Once a DAT reply is received the asking node must check if the MAC
-address for which the IP address has been asked is local. If it is, the
-node must drop the ARP reply bceause the client should have replied on
-its own locally.
-
-Forwarding this reply means fooling any L2 bridge (e.g. Ethernet
-switches) lying between the batman-adv node and the LAN. This happens
-because the L2 bridge will think that the client sending the ARP reply
-lies somewhere in the mesh, while this node is sitting in the same LAN.
-
-Reported-by: Simon Wunderlich <sw@simonwunderlich.de>
-Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- distributed-arp-table.c | 18 +++++++++++++-----
- 1 file changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/distributed-arp-table.c b/distributed-arp-table.c
-index da1742d..0d791dc 100644
---- a/distributed-arp-table.c
-+++ b/distributed-arp-table.c
-@@ -1107,6 +1107,9 @@ void batadv_dat_snoop_outgoing_arp_reply(struct batadv_priv *bat_priv,
-  * @bat_priv: the bat priv with all the soft interface information
-  * @skb: packet to check
-  * @hdr_size: size of the encapsulation header
-+ *
-+ * Returns true if the packet was snooped and consumed by DAT. False if the
-+ * packet has to be delivered to the interface
-  */
- bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv,
- 					 struct sk_buff *skb, int hdr_size)
-@@ -1114,7 +1117,7 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv,
- 	uint16_t type;
- 	__be32 ip_src, ip_dst;
- 	uint8_t *hw_src, *hw_dst;
--	bool ret = false;
-+	bool dropped = false;
- 	unsigned short vid;
- 
- 	if (!atomic_read(&bat_priv->distributed_arp_table))
-@@ -1143,12 +1146,17 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv,
- 	/* if this REPLY is directed to a client of mine, let's deliver the
- 	 * packet to the interface
- 	 */
--	ret = !batadv_is_my_client(bat_priv, hw_dst, vid);
-+	dropped = !batadv_is_my_client(bat_priv, hw_dst, vid);
-+
-+	/* if this REPLY is sent on behalf of a client of mine, let's drop the
-+	 * packet because the client will reply by itself
-+	 */
-+	dropped |= batadv_is_my_client(bat_priv, hw_src, vid);
- out:
--	if (ret)
-+	if (dropped)
- 		kfree_skb(skb);
--	/* if ret == false -> packet has to be delivered to the interface */
--	return ret;
-+	/* if dropped == false -> deliver to the interface */
-+	return dropped;
- }
- 
- /**
--- 
-2.1.4
-
diff --git a/batman-adv/patches/0003-batman-adv-Make-DAT-capability-changes-atomic.patch b/batman-adv/patches/0003-batman-adv-Make-DAT-capability-changes-atomic.patch
deleted file mode 100644
index 4152a52..0000000
--- a/batman-adv/patches/0003-batman-adv-Make-DAT-capability-changes-atomic.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From bfd0fbaef270ac4ed8e4457a38ef8d91190c0540 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
-Date: Tue, 16 Jun 2015 17:10:22 +0200
-Subject: [PATCH 03/17] batman-adv: Make DAT capability changes atomic
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Bitwise OR/AND assignments in C aren't guaranteed to be atomic. One
-OGM handler might undo the set/clear of a specific bit from another
-handler run in between.
-
-Fix this by using the atomic set_bit()/clear_bit() functions.
-
-Fixes: 2b1c07b918d2 ("batman-adv: tvlv - add distributed arp table container")
-Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- distributed-arp-table.c | 4 ++--
- types.h                 | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/distributed-arp-table.c b/distributed-arp-table.c
-index 0d791dc..b2cc19b 100644
---- a/distributed-arp-table.c
-+++ b/distributed-arp-table.c
-@@ -682,9 +682,9 @@ static void batadv_dat_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
- 					   uint16_t tvlv_value_len)
- {
- 	if (flags & BATADV_TVLV_HANDLER_OGM_CIFNOTFND)
--		orig->capabilities &= ~BATADV_ORIG_CAPA_HAS_DAT;
-+		clear_bit(BATADV_ORIG_CAPA_HAS_DAT, &orig->capabilities);
- 	else
--		orig->capabilities |= BATADV_ORIG_CAPA_HAS_DAT;
-+		set_bit(BATADV_ORIG_CAPA_HAS_DAT, &orig->capabilities);
- }
- 
- /**
-diff --git a/types.h b/types.h
-index 28f2461..e33b5aa 100644
---- a/types.h
-+++ b/types.h
-@@ -256,7 +256,7 @@ struct batadv_orig_node {
- 	struct hlist_node mcast_want_all_ipv4_node;
- 	struct hlist_node mcast_want_all_ipv6_node;
- #endif
--	uint8_t capabilities;
-+	unsigned long capabilities;
- 	uint8_t capa_initialized;
- 	atomic_t last_ttvn;
- 	unsigned char *tt_buff;
--- 
-2.1.4
-
diff --git a/batman-adv/patches/0004-batman-adv-Make-NC-capability-changes-atomic.patch b/batman-adv/patches/0004-batman-adv-Make-NC-capability-changes-atomic.patch
deleted file mode 100644
index 935a6cd..0000000
--- a/batman-adv/patches/0004-batman-adv-Make-NC-capability-changes-atomic.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 586df9e2537b51c0df7ce99576c3cee1681b64de Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
-Date: Tue, 16 Jun 2015 17:10:23 +0200
-Subject: [PATCH 04/17] batman-adv: Make NC capability changes atomic
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Bitwise OR/AND assignments in C aren't guaranteed to be atomic. One
-OGM handler might undo the set/clear of a specific bit from another
-handler run in between.
-
-Fix this by using the atomic set_bit()/clear_bit() functions.
-
-Fixes: 7dd9d8992b0c ("batman-adv: tvlv - add network coding container")
-Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- network-coding.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/network-coding.c b/network-coding.c
-index 89e1d47..3ce493e 100644
---- a/network-coding.c
-+++ b/network-coding.c
-@@ -105,9 +105,9 @@ static void batadv_nc_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
- 					  uint16_t tvlv_value_len)
- {
- 	if (flags & BATADV_TVLV_HANDLER_OGM_CIFNOTFND)
--		orig->capabilities &= ~BATADV_ORIG_CAPA_HAS_NC;
-+		clear_bit(BATADV_ORIG_CAPA_HAS_NC, &orig->capabilities);
- 	else
--		orig->capabilities |= BATADV_ORIG_CAPA_HAS_NC;
-+		set_bit(BATADV_ORIG_CAPA_HAS_NC, &orig->capabilities);
- }
- 
- /**
--- 
-2.1.4
-
diff --git a/batman-adv/patches/0005-batman-adv-Make-TT-capability-changes-atomic.patch b/batman-adv/patches/0005-batman-adv-Make-TT-capability-changes-atomic.patch
deleted file mode 100644
index c6e9078..0000000
--- a/batman-adv/patches/0005-batman-adv-Make-TT-capability-changes-atomic.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From a51fa16ecf3f079518baaa56bffae343bd5694f0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
-Date: Tue, 16 Jun 2015 17:10:24 +0200
-Subject: [PATCH 05/17] batman-adv: Make TT capability changes atomic
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Bitwise OR/AND assignments in C aren't guaranteed to be atomic. One
-OGM handler might undo the set/clear of a specific bit from another
-handler run in between.
-
-Fix this by using the atomic set_bit()/clear_bit() functions.
-
-Fixes: 5d2121af6d31 ("batman-adv: introduce capability initialization bitfield")
-Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- translation-table.c | 4 ++--
- types.h             | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/translation-table.c b/translation-table.c
-index b098e53..e95a424 100644
---- a/translation-table.c
-+++ b/translation-table.c
-@@ -1843,7 +1843,7 @@ void batadv_tt_global_del_orig(struct batadv_priv *bat_priv,
- 		}
- 		spin_unlock_bh(list_lock);
- 	}
--	orig_node->capa_initialized &= ~BATADV_ORIG_CAPA_HAS_TT;
-+	clear_bit(BATADV_ORIG_CAPA_HAS_TT, &orig_node->capa_initialized);
- }
- 
- static bool batadv_tt_global_to_purge(struct batadv_tt_global_entry *tt_global,
-@@ -2802,7 +2802,7 @@ static void _batadv_tt_update_changes(struct batadv_priv *bat_priv,
- 				return;
- 		}
- 	}
--	orig_node->capa_initialized |= BATADV_ORIG_CAPA_HAS_TT;
-+	set_bit(BATADV_ORIG_CAPA_HAS_TT, &orig_node->capa_initialized);
- }
- 
- static void batadv_tt_fill_gtable(struct batadv_priv *bat_priv,
-diff --git a/types.h b/types.h
-index e33b5aa..c6ec558 100644
---- a/types.h
-+++ b/types.h
-@@ -257,7 +257,7 @@ struct batadv_orig_node {
- 	struct hlist_node mcast_want_all_ipv6_node;
- #endif
- 	unsigned long capabilities;
--	uint8_t capa_initialized;
-+	unsigned long capa_initialized;
- 	atomic_t last_ttvn;
- 	unsigned char *tt_buff;
- 	int16_t tt_buff_len;
--- 
-2.1.4
-
diff --git a/batman-adv/patches/0006-batman-adv-Make-MCAST-capability-changes-atomic.patch b/batman-adv/patches/0006-batman-adv-Make-MCAST-capability-changes-atomic.patch
deleted file mode 100644
index d1d7beb..0000000
--- a/batman-adv/patches/0006-batman-adv-Make-MCAST-capability-changes-atomic.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 201a54ba710ab7f40b82ad3c109f702c47d0761f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
-Date: Tue, 16 Jun 2015 17:10:25 +0200
-Subject: [PATCH 06/17] batman-adv: Make MCAST capability changes atomic
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Bitwise OR/AND assignments in C aren't guaranteed to be atomic. One
-OGM handler might undo the set/clear of a specific bit from another
-handler run in between.
-
-Fix this by using the atomic set_bit()/clear_bit() functions.
-
-Fixes: 77ec494490d6 ("batman-adv: Announce new capability via multicast TVLV")
-Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- multicast.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/multicast.c b/multicast.c
-index 09f2838..00612bf 100644
---- a/multicast.c
-+++ b/multicast.c
-@@ -684,7 +684,7 @@ static void batadv_mcast_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
- 	    !(orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST)) {
- 		if (orig_initialized)
- 			atomic_dec(&bat_priv->mcast.num_disabled);
--		orig->capabilities |= BATADV_ORIG_CAPA_HAS_MCAST;
-+		set_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities);
- 	/* If mcast support is being switched off or if this is an initial
- 	 * OGM without mcast support then increase the disabled mcast
- 	 * node counter.
-@@ -693,10 +693,10 @@ static void batadv_mcast_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
- 		   (orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST ||
- 		    !orig_initialized)) {
- 		atomic_inc(&bat_priv->mcast.num_disabled);
--		orig->capabilities &= ~BATADV_ORIG_CAPA_HAS_MCAST;
-+		clear_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities);
- 	}
- 
--	orig->capa_initialized |= BATADV_ORIG_CAPA_HAS_MCAST;
-+	set_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capa_initialized);
- 
- 	if (orig_mcast_enabled && tvlv_value &&
- 	    (tvlv_value_len >= sizeof(mcast_flags)))
--- 
-2.1.4
-
diff --git a/batman-adv/patches/0007-batman-adv-Fix-potential-synchronization-issues-in-m.patch b/batman-adv/patches/0007-batman-adv-Fix-potential-synchronization-issues-in-m.patch
deleted file mode 100644
index 66d61b3..0000000
--- a/batman-adv/patches/0007-batman-adv-Fix-potential-synchronization-issues-in-m.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-From 7f220ed1f063be00833bd34a013c8f3f45884031 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
-Date: Tue, 16 Jun 2015 17:10:26 +0200
-Subject: [PATCH 07/17] batman-adv: Fix potential synchronization issues in
- mcast tvlv handler
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-So far the mcast tvlv handler did not anticipate the processing of
-multiple incoming OGMs from the same originator at the same time. This
-can lead to various issues:
-
-* Broken refcounting: For instance two mcast handlers might both assume
-  that an originator just got multicast capabilities and will together
-  wrongly decrease mcast.num_disabled by two, potentially leading to
-  an integer underflow.
-
-* Potential kernel panic on hlist_del_rcu(): Two mcast handlers might
-  one after another try to do an
-  hlist_del_rcu(&orig->mcast_want_all_*_node). The second one will
-  cause memory corruption / crashes.
-  (Reported by: Sven Eckelmann <sven@narfation.org>)
-
-Right in the beginning the code path makes assumptions about the current
-multicast related state of an originator and bases all updates on that. The
-easiest and least error prune way to fix the issues in this case is to
-serialize multiple mcast handler invocations with a spinlock.
-
-Fixes: 77ec494490d6 ("batman-adv: Announce new capability via multicast TVLV")
-Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- multicast.c  | 62 +++++++++++++++++++++++++++++++++++++++++++++++-------------
- originator.c |  4 ++++
- types.h      |  3 +++
- 3 files changed, 56 insertions(+), 13 deletions(-)
-
-diff --git a/multicast.c b/multicast.c
-index 00612bf..b75bcc3 100644
---- a/multicast.c
-+++ b/multicast.c
-@@ -565,19 +565,26 @@ batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb,
-  *
-  * If the BATADV_MCAST_WANT_ALL_UNSNOOPABLES flag of this originator,
-  * orig, has toggled then this method updates counter and list accordingly.
-+ *
-+ * Caller needs to hold orig->mcast_handler_lock.
-  */
- static void batadv_mcast_want_unsnoop_update(struct batadv_priv *bat_priv,
- 					     struct batadv_orig_node *orig,
- 					     uint8_t mcast_flags)
- {
-+	struct hlist_node *node = &orig->mcast_want_all_unsnoopables_node;
-+	struct hlist_head *head = &bat_priv->mcast.want_all_unsnoopables_list;
-+
- 	/* switched from flag unset to set */
- 	if (mcast_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES &&
- 	    !(orig->mcast_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES)) {
- 		atomic_inc(&bat_priv->mcast.num_want_all_unsnoopables);
- 
- 		spin_lock_bh(&bat_priv->mcast.want_lists_lock);
--		hlist_add_head_rcu(&orig->mcast_want_all_unsnoopables_node,
--				   &bat_priv->mcast.want_all_unsnoopables_list);
-+		/* flag checks above + mcast_handler_lock prevents this */
-+		BUG_ON(!hlist_unhashed(node));
-+
-+		hlist_add_head_rcu(node, head);
- 		spin_unlock_bh(&bat_priv->mcast.want_lists_lock);
- 	/* switched from flag set to unset */
- 	} else if (!(mcast_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES) &&
-@@ -585,7 +592,10 @@ static void batadv_mcast_want_unsnoop_update(struct batadv_priv *bat_priv,
- 		atomic_dec(&bat_priv->mcast.num_want_all_unsnoopables);
- 
- 		spin_lock_bh(&bat_priv->mcast.want_lists_lock);
--		hlist_del_rcu(&orig->mcast_want_all_unsnoopables_node);
-+		/* flag checks above + mcast_handler_lock prevents this */
-+		BUG_ON(hlist_unhashed(node));
-+
-+		hlist_del_init_rcu(node);
- 		spin_unlock_bh(&bat_priv->mcast.want_lists_lock);
- 	}
- }
-@@ -598,19 +608,26 @@ static void batadv_mcast_want_unsnoop_update(struct batadv_priv *bat_priv,
-  *
-  * If the BATADV_MCAST_WANT_ALL_IPV4 flag of this originator, orig, has
-  * toggled then this method updates counter and list accordingly.
-+ *
-+ * Caller needs to hold orig->mcast_handler_lock.
-  */
- static void batadv_mcast_want_ipv4_update(struct batadv_priv *bat_priv,
- 					  struct batadv_orig_node *orig,
- 					  uint8_t mcast_flags)
- {
-+	struct hlist_node *node = &orig->mcast_want_all_ipv4_node;
-+	struct hlist_head *head = &bat_priv->mcast.want_all_ipv4_list;
-+
- 	/* switched from flag unset to set */
- 	if (mcast_flags & BATADV_MCAST_WANT_ALL_IPV4 &&
- 	    !(orig->mcast_flags & BATADV_MCAST_WANT_ALL_IPV4)) {
- 		atomic_inc(&bat_priv->mcast.num_want_all_ipv4);
- 
- 		spin_lock_bh(&bat_priv->mcast.want_lists_lock);
--		hlist_add_head_rcu(&orig->mcast_want_all_ipv4_node,
--				   &bat_priv->mcast.want_all_ipv4_list);
-+		/* flag checks above + mcast_handler_lock prevents this */
-+		BUG_ON(!hlist_unhashed(node));
-+
-+		hlist_add_head_rcu(node, head);
- 		spin_unlock_bh(&bat_priv->mcast.want_lists_lock);
- 	/* switched from flag set to unset */
- 	} else if (!(mcast_flags & BATADV_MCAST_WANT_ALL_IPV4) &&
-@@ -618,7 +635,10 @@ static void batadv_mcast_want_ipv4_update(struct batadv_priv *bat_priv,
- 		atomic_dec(&bat_priv->mcast.num_want_all_ipv4);
- 
- 		spin_lock_bh(&bat_priv->mcast.want_lists_lock);
--		hlist_del_rcu(&orig->mcast_want_all_ipv4_node);
-+		/* flag checks above + mcast_handler_lock prevents this */
-+		BUG_ON(hlist_unhashed(node));
-+
-+		hlist_del_init_rcu(node);
- 		spin_unlock_bh(&bat_priv->mcast.want_lists_lock);
- 	}
- }
-@@ -631,19 +651,26 @@ static void batadv_mcast_want_ipv4_update(struct batadv_priv *bat_priv,
-  *
-  * If the BATADV_MCAST_WANT_ALL_IPV6 flag of this originator, orig, has
-  * toggled then this method updates counter and list accordingly.
-+ *
-+ * Caller needs to hold orig->mcast_handler_lock.
-  */
- static void batadv_mcast_want_ipv6_update(struct batadv_priv *bat_priv,
- 					  struct batadv_orig_node *orig,
- 					  uint8_t mcast_flags)
- {
-+	struct hlist_node *node = &orig->mcast_want_all_ipv6_node;
-+	struct hlist_head *head = &bat_priv->mcast.want_all_ipv6_list;
-+
- 	/* switched from flag unset to set */
- 	if (mcast_flags & BATADV_MCAST_WANT_ALL_IPV6 &&
- 	    !(orig->mcast_flags & BATADV_MCAST_WANT_ALL_IPV6)) {
- 		atomic_inc(&bat_priv->mcast.num_want_all_ipv6);
- 
- 		spin_lock_bh(&bat_priv->mcast.want_lists_lock);
--		hlist_add_head_rcu(&orig->mcast_want_all_ipv6_node,
--				   &bat_priv->mcast.want_all_ipv6_list);
-+		/* flag checks above + mcast_handler_lock prevents this */
-+		BUG_ON(!hlist_unhashed(node));
-+
-+		hlist_add_head_rcu(node, head);
- 		spin_unlock_bh(&bat_priv->mcast.want_lists_lock);
- 	/* switched from flag set to unset */
- 	} else if (!(mcast_flags & BATADV_MCAST_WANT_ALL_IPV6) &&
-@@ -651,7 +678,10 @@ static void batadv_mcast_want_ipv6_update(struct batadv_priv *bat_priv,
- 		atomic_dec(&bat_priv->mcast.num_want_all_ipv6);
- 
- 		spin_lock_bh(&bat_priv->mcast.want_lists_lock);
--		hlist_del_rcu(&orig->mcast_want_all_ipv6_node);
-+		/* flag checks above + mcast_handler_lock prevents this */
-+		BUG_ON(hlist_unhashed(node));
-+
-+		hlist_del_init_rcu(node);
- 		spin_unlock_bh(&bat_priv->mcast.want_lists_lock);
- 	}
- }
-@@ -674,6 +704,11 @@ static void batadv_mcast_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
- 	uint8_t mcast_flags = BATADV_NO_FLAGS;
- 	bool orig_initialized;
- 
-+	if (orig_mcast_enabled && tvlv_value &&
-+	    (tvlv_value_len >= sizeof(mcast_flags)))
-+		mcast_flags = *(uint8_t *)tvlv_value;
-+
-+	spin_lock_bh(&orig->mcast_handler_lock);
- 	orig_initialized = orig->capa_initialized & BATADV_ORIG_CAPA_HAS_MCAST;
- 
- 	/* If mcast support is turned on decrease the disabled mcast node
-@@ -698,15 +733,12 @@ static void batadv_mcast_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
- 
- 	set_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capa_initialized);
- 
--	if (orig_mcast_enabled && tvlv_value &&
--	    (tvlv_value_len >= sizeof(mcast_flags)))
--		mcast_flags = *(uint8_t *)tvlv_value;
--
- 	batadv_mcast_want_unsnoop_update(bat_priv, orig, mcast_flags);
- 	batadv_mcast_want_ipv4_update(bat_priv, orig, mcast_flags);
- 	batadv_mcast_want_ipv6_update(bat_priv, orig, mcast_flags);
- 
- 	orig->mcast_flags = mcast_flags;
-+	spin_unlock_bh(&orig->mcast_handler_lock);
- }
- 
- /**
-@@ -740,6 +772,8 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig)
- {
- 	struct batadv_priv *bat_priv = orig->bat_priv;
- 
-+	spin_lock_bh(&orig->mcast_handler_lock);
-+
- 	if (!(orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST) &&
- 	    orig->capa_initialized & BATADV_ORIG_CAPA_HAS_MCAST)
- 		atomic_dec(&bat_priv->mcast.num_disabled);
-@@ -747,4 +781,6 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig)
- 	batadv_mcast_want_unsnoop_update(bat_priv, orig, BATADV_NO_FLAGS);
- 	batadv_mcast_want_ipv4_update(bat_priv, orig, BATADV_NO_FLAGS);
- 	batadv_mcast_want_ipv6_update(bat_priv, orig, BATADV_NO_FLAGS);
-+
-+	spin_unlock_bh(&orig->mcast_handler_lock);
- }
-diff --git a/originator.c b/originator.c
-index e3900e4..a2ba182 100644
---- a/originator.c
-+++ b/originator.c
-@@ -658,11 +658,15 @@ struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv,
- 	INIT_HLIST_HEAD(&orig_node->neigh_list);
- 	INIT_LIST_HEAD(&orig_node->vlan_list);
- 	INIT_HLIST_HEAD(&orig_node->ifinfo_list);
-+	INIT_HLIST_NODE(&orig_node->mcast_want_all_unsnoopables_node);
-+	INIT_HLIST_NODE(&orig_node->mcast_want_all_ipv4_node);
-+	INIT_HLIST_NODE(&orig_node->mcast_want_all_ipv6_node);
- 	spin_lock_init(&orig_node->bcast_seqno_lock);
- 	spin_lock_init(&orig_node->neigh_list_lock);
- 	spin_lock_init(&orig_node->tt_buff_lock);
- 	spin_lock_init(&orig_node->tt_lock);
- 	spin_lock_init(&orig_node->vlan_list_lock);
-+	spin_lock_init(&orig_node->mcast_handler_lock);
- 
- 	batadv_nc_init_orig(orig_node);
- 
-diff --git a/types.h b/types.h
-index c6ec558..65dc6bf 100644
---- a/types.h
-+++ b/types.h
-@@ -204,6 +204,7 @@ struct batadv_orig_bat_iv {
-  * @batadv_dat_addr_t:  address of the orig node in the distributed hash
-  * @last_seen: time when last packet from this node was received
-  * @bcast_seqno_reset: time when the broadcast seqno window was reset
-+ * @mcast_handler_lock: synchronizes mcast-capability and -flag changes
-  * @mcast_flags: multicast flags announced by the orig node
-  * @mcast_want_all_unsnoop_node: a list node for the
-  *  mcast.want_all_unsnoopables list
-@@ -251,6 +252,8 @@ struct batadv_orig_node {
- 	unsigned long last_seen;
- 	unsigned long bcast_seqno_reset;
- #ifdef CONFIG_BATMAN_ADV_MCAST
-+	/* synchronizes mcast tvlv specific orig changes */
-+	spinlock_t mcast_handler_lock;
- 	uint8_t mcast_flags;
- 	struct hlist_node mcast_want_all_unsnoopables_node;
- 	struct hlist_node mcast_want_all_ipv4_node;
--- 
-2.1.4
-
diff --git a/batman-adv/patches/0008-batman-adv-Fix-compile-error-on-deactivated-MCAST-fe.patch b/batman-adv/patches/0008-batman-adv-Fix-compile-error-on-deactivated-MCAST-fe.patch
deleted file mode 100644
index c854522..0000000
--- a/batman-adv/patches/0008-batman-adv-Fix-compile-error-on-deactivated-MCAST-fe.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 256776ef8562744f90ac9379364df4cf88291b49 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
-Date: Thu, 18 Jun 2015 06:47:19 +0200
-Subject: [PATCH 08/17] batman-adv: Fix compile error on deactivated MCAST
- feature
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some members of "struct batadv_orig_node" are not available if compiling
-without the multicast optimizations feature.
-
-Fix this by moving their initialization into the right #ifdef's.
-
-Fixes: 7f220ed1f063 ("batman-adv: Fix potential synchronization issues in mcast tvlv handler")
-Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- originator.c | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/originator.c b/originator.c
-index a2ba182..a5276db 100644
---- a/originator.c
-+++ b/originator.c
-@@ -658,15 +658,11 @@ struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv,
- 	INIT_HLIST_HEAD(&orig_node->neigh_list);
- 	INIT_LIST_HEAD(&orig_node->vlan_list);
- 	INIT_HLIST_HEAD(&orig_node->ifinfo_list);
--	INIT_HLIST_NODE(&orig_node->mcast_want_all_unsnoopables_node);
--	INIT_HLIST_NODE(&orig_node->mcast_want_all_ipv4_node);
--	INIT_HLIST_NODE(&orig_node->mcast_want_all_ipv6_node);
- 	spin_lock_init(&orig_node->bcast_seqno_lock);
- 	spin_lock_init(&orig_node->neigh_list_lock);
- 	spin_lock_init(&orig_node->tt_buff_lock);
- 	spin_lock_init(&orig_node->tt_lock);
- 	spin_lock_init(&orig_node->vlan_list_lock);
--	spin_lock_init(&orig_node->mcast_handler_lock);
- 
- 	batadv_nc_init_orig(orig_node);
- 
-@@ -682,8 +678,13 @@ struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv,
- 	orig_node->last_seen = jiffies;
- 	reset_time = jiffies - 1 - msecs_to_jiffies(BATADV_RESET_PROTECTION_MS);
- 	orig_node->bcast_seqno_reset = reset_time;
-+
- #ifdef CONFIG_BATMAN_ADV_MCAST
- 	orig_node->mcast_flags = BATADV_NO_FLAGS;
-+	INIT_HLIST_NODE(&orig_node->mcast_want_all_unsnoopables_node);
-+	INIT_HLIST_NODE(&orig_node->mcast_want_all_ipv4_node);
-+	INIT_HLIST_NODE(&orig_node->mcast_want_all_ipv6_node);
-+	spin_lock_init(&orig_node->mcast_handler_lock);
- #endif
- 
- 	/* create a vlan object for the "untagged" LAN */
--- 
-2.1.4
-
diff --git a/batman-adv/patches/0009-batman-adv-fix-kernel-crash-due-to-missing-NULL-chec.patch b/batman-adv/patches/0009-batman-adv-fix-kernel-crash-due-to-missing-NULL-chec.patch
deleted file mode 100644
index 3e19c0e..0000000
--- a/batman-adv/patches/0009-batman-adv-fix-kernel-crash-due-to-missing-NULL-chec.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 2c2dfd886a400057ccbc66f1507c94ed909d2a89 Mon Sep 17 00:00:00 2001
-From: Marek Lindner <mareklindner@neomailbox.ch>
-Date: Tue, 9 Jun 2015 21:24:36 +0800
-Subject: [PATCH 09/17] batman-adv: fix kernel crash due to missing NULL checks
-
-batadv_softif_vlan_get() may return NULL which has to be verified
-by the caller.
-
-Fixes: 9729d20 ("batman-adv: fix TT VLAN inconsistency on VLAN re-add")
-
-Reported-by: Ryan Thompson <ryan@eero.com>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
-Acked-by: Antonio Quartulli <antonio@meshcoding.com>
----
- soft-interface.c    |  3 +++
- translation-table.c | 19 +++++++++++++++----
- 2 files changed, 18 insertions(+), 4 deletions(-)
-
-diff --git a/soft-interface.c b/soft-interface.c
-index da89336..7841a4b 100644
---- a/soft-interface.c
-+++ b/soft-interface.c
-@@ -455,6 +455,9 @@ out:
-  */
- void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *vlan)
- {
-+	if (!vlan)
-+		return;
-+
- 	if (atomic_dec_and_test(&vlan->refcount)) {
- 		spin_lock_bh(&vlan->bat_priv->softif_vlan_list_lock);
- 		hlist_del_rcu(&vlan->list);
-diff --git a/translation-table.c b/translation-table.c
-index e95a424..807a4e6 100644
---- a/translation-table.c
-+++ b/translation-table.c
-@@ -26,6 +26,7 @@
- #include "bridge_loop_avoidance.h"
- #include "multicast.h"
- 
-+#include <linux/bug.h>
- #include <linux/crc32c.h>
- 
- /* hash class keys */
-@@ -575,6 +576,9 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr,
- 
- 	/* increase the refcounter of the related vlan */
- 	vlan = batadv_softif_vlan_get(bat_priv, vid);
-+	if (WARN(!vlan, "adding TT local entry %pM to non-existent VLAN %d",
-+		 addr, BATADV_PRINT_VID(vid)))
-+		goto out;
- 
- 	batadv_dbg(BATADV_DBG_TT, bat_priv,
- 		   "Creating new local tt entry: %pM (vid: %d, ttvn: %d)\n",
-@@ -1047,6 +1051,9 @@ uint16_t batadv_tt_local_remove(struct batadv_priv *bat_priv,
- 
- 	/* decrease the reference held for this vlan */
- 	vlan = batadv_softif_vlan_get(bat_priv, vid);
-+	if (!vlan)
-+		goto out;
-+
- 	batadv_softif_vlan_free_ref(vlan);
- 	batadv_softif_vlan_free_ref(vlan);
- 
-@@ -1147,8 +1154,10 @@ static void batadv_tt_local_table_free(struct batadv_priv *bat_priv)
- 			/* decrease the reference held for this vlan */
- 			vlan = batadv_softif_vlan_get(bat_priv,
- 						      tt_common_entry->vid);
--			batadv_softif_vlan_free_ref(vlan);
--			batadv_softif_vlan_free_ref(vlan);
-+			if (vlan) {
-+				batadv_softif_vlan_free_ref(vlan);
-+				batadv_softif_vlan_free_ref(vlan);
-+			}
- 
- 			batadv_tt_local_entry_free_ref(tt_local);
- 		}
-@@ -3188,8 +3197,10 @@ static void batadv_tt_local_purge_pending_clients(struct batadv_priv *bat_priv)
- 
- 			/* decrease the reference held for this vlan */
- 			vlan = batadv_softif_vlan_get(bat_priv, tt_common->vid);
--			batadv_softif_vlan_free_ref(vlan);
--			batadv_softif_vlan_free_ref(vlan);
-+			if (vlan) {
-+				batadv_softif_vlan_free_ref(vlan);
-+				batadv_softif_vlan_free_ref(vlan);
-+			}
- 
- 			batadv_tt_local_entry_free_ref(tt_local);
- 		}
--- 
-2.1.4
-
diff --git a/batman-adv/patches/0010-batman-adv-protect-tt_local_entry-from-concurrent-de.patch b/batman-adv/patches/0010-batman-adv-protect-tt_local_entry-from-concurrent-de.patch
deleted file mode 100644
index 5cc27ee..0000000
--- a/batman-adv/patches/0010-batman-adv-protect-tt_local_entry-from-concurrent-de.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From af912d77181f252e6fdd324592d006e30bc82909 Mon Sep 17 00:00:00 2001
-From: Marek Lindner <mareklindner@neomailbox.ch>
-Date: Wed, 17 Jun 2015 20:01:36 +0800
-Subject: [PATCH 10/17] batman-adv: protect tt_local_entry from concurrent
- delete events
-
-The tt_local_entry deletion performed in batadv_tt_local_remove() was neither
-protecting against simultaneous deletes nor checking whether the element was
-still part of the list before calling hlist_del_rcu().
-
-Replacing the hlist_del_rcu() call with batadv_hash_remove() provides adequate
-protection via hash spinlocks as well as an is-element-still-in-hash check to
-avoid 'blind' hash removal.
-
-Fixes: 2443ba3 ("batman-adv: roaming handling mechanism redesign")
-
-Reported-by: alfonsname@web.de
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
-Acked-by: Antonio Quartulli <antonio@meshcoding.com>
----
- translation-table.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/translation-table.c b/translation-table.c
-index 807a4e6..dfe8896 100644
---- a/translation-table.c
-+++ b/translation-table.c
-@@ -1019,6 +1019,7 @@ uint16_t batadv_tt_local_remove(struct batadv_priv *bat_priv,
- 	struct batadv_tt_local_entry *tt_local_entry;
- 	uint16_t flags, curr_flags = BATADV_NO_FLAGS;
- 	struct batadv_softif_vlan *vlan;
-+	void *tt_entry_exists;
- 
- 	tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr, vid);
- 	if (!tt_local_entry)
-@@ -1046,7 +1047,15 @@ uint16_t batadv_tt_local_remove(struct batadv_priv *bat_priv,
- 	 * immediately purge it
- 	 */
- 	batadv_tt_local_event(bat_priv, tt_local_entry, BATADV_TT_CLIENT_DEL);
--	hlist_del_rcu(&tt_local_entry->common.hash_entry);
-+
-+	tt_entry_exists = batadv_hash_remove(bat_priv->tt.local_hash,
-+					     batadv_compare_tt,
-+					     batadv_choose_tt,
-+					     &tt_local_entry->common);
-+	if (!tt_entry_exists)
-+		goto out;
-+
-+	/* extra call to free the local tt entry */
- 	batadv_tt_local_entry_free_ref(tt_local_entry);
- 
- 	/* decrease the reference held for this vlan */
--- 
-2.1.4
-
diff --git a/batman-adv/patches/0011-batman-adv-protect-tt-request-from-double-deletion.patch b/batman-adv/patches/0011-batman-adv-protect-tt-request-from-double-deletion.patch
deleted file mode 100644
index dd0e26f..0000000
--- a/batman-adv/patches/0011-batman-adv-protect-tt-request-from-double-deletion.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 9bac35c1e4fab662522371f81147963e19693409 Mon Sep 17 00:00:00 2001
-From: Marek Lindner <mareklindner@neomailbox.ch>
-Date: Mon, 22 Jun 2015 00:36:28 +0800
-Subject: [PATCH 11/17] batman-adv: protect tt request from double deletion
-
-The list_del() calls were changed to list_del_init() to prevent
-an accidental double deletion in batadv_tt_req_node_new().
-
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
-Acked-by: Antonio Quartulli <antonio@meshcoding.com>
----
- translation-table.c | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/translation-table.c b/translation-table.c
-index dfe8896..b6c0f52 100644
---- a/translation-table.c
-+++ b/translation-table.c
-@@ -2194,7 +2194,7 @@ static void batadv_tt_req_list_free(struct batadv_priv *bat_priv)
- 	spin_lock_bh(&bat_priv->tt.req_list_lock);
- 
- 	list_for_each_entry_safe(node, safe, &bat_priv->tt.req_list, list) {
--		list_del(&node->list);
-+		list_del_init(&node->list);
- 		kfree(node);
- 	}
- 
-@@ -2230,7 +2230,7 @@ static void batadv_tt_req_purge(struct batadv_priv *bat_priv)
- 	list_for_each_entry_safe(node, safe, &bat_priv->tt.req_list, list) {
- 		if (batadv_has_timed_out(node->issued_at,
- 					 BATADV_TT_REQUEST_TIMEOUT)) {
--			list_del(&node->list);
-+			list_del_init(&node->list);
- 			kfree(node);
- 		}
- 	}
-@@ -2512,7 +2512,8 @@ out:
- 		batadv_hardif_free_ref(primary_if);
- 	if (ret && tt_req_node) {
- 		spin_lock_bh(&bat_priv->tt.req_list_lock);
--		list_del(&tt_req_node->list);
-+		/* list_del_init() verifies tt_req_node still is in the list */
-+		list_del_init(&tt_req_node->list);
- 		spin_unlock_bh(&bat_priv->tt.req_list_lock);
- 		kfree(tt_req_node);
- 	}
-@@ -2949,7 +2950,7 @@ static void batadv_handle_tt_response(struct batadv_priv *bat_priv,
- 	list_for_each_entry_safe(node, safe, &bat_priv->tt.req_list, list) {
- 		if (!batadv_compare_eth(node->addr, resp_src))
- 			continue;
--		list_del(&node->list);
-+		list_del_init(&node->list);
- 		kfree(node);
- 	}
- 
--- 
-2.1.4
-
diff --git a/batman-adv/patches/0012-batman-adv-initialize-up-down-values-when-adding-a-g.patch b/batman-adv/patches/0012-batman-adv-initialize-up-down-values-when-adding-a-g.patch
deleted file mode 100644
index 04b3758..0000000
--- a/batman-adv/patches/0012-batman-adv-initialize-up-down-values-when-adding-a-g.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 3c92b633715b7eca80dc7a2347e0e4dbcce1f018 Mon Sep 17 00:00:00 2001
-From: Simon Wunderlich <simon@open-mesh.com>
-Date: Wed, 24 Jun 2015 14:50:19 +0200
-Subject: [PATCH 12/17] batman-adv: initialize up/down values when adding a
- gateway
-
-Without this initialization, gateways which actually announce up/down
-bandwidth of 0/0 could be added. If these nodes get purged via
-_batadv_purge_orig() later, the gw_node structure does not get removed
-since batadv_gw_node_delete() updates the gw_node with up/down
-bandwidth of 0/0, and the updating function then discards the change
-and does not free gw_node.
-
-This results in leaking the gw_node structures, which references other
-structures: gw_node -> orig_node -> orig_node_ifinfo -> hardif. When
-removing the interface later, the open reference on the hardif may cause
-hangs with the infamous "unregister_netdevice: waiting for mesh1 to
-become free. Usage count = 1" message.
-
-Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
-Acked-by: Antonio Quartulli <antonio@meshcoding.com>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- gateway_client.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gateway_client.c b/gateway_client.c
-index 3f32357..d8e3ead 100644
---- a/gateway_client.c
-+++ b/gateway_client.c
-@@ -419,6 +419,8 @@ static void batadv_gw_node_add(struct batadv_priv *bat_priv,
- 
- 	INIT_HLIST_NODE(&gw_node->list);
- 	gw_node->orig_node = orig_node;
-+	gw_node->bandwidth_down = ntohl(gateway->bandwidth_down);
-+	gw_node->bandwidth_up = ntohl(gateway->bandwidth_up);
- 	atomic_set(&gw_node->refcount, 1);
- 
- 	spin_lock_bh(&bat_priv->gw.list_lock);
--- 
-2.1.4
-
diff --git a/batman-adv/patches/0013-batman-adv-remove-broadcast-packets-scheduled-for-pu.patch b/batman-adv/patches/0013-batman-adv-remove-broadcast-packets-scheduled-for-pu.patch
deleted file mode 100644
index b7a27ef..0000000
--- a/batman-adv/patches/0013-batman-adv-remove-broadcast-packets-scheduled-for-pu.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 07bec2d4dec83f024baf166b95cf037be3a7eca5 Mon Sep 17 00:00:00 2001
-From: Simon Wunderlich <simon@open-mesh.com>
-Date: Wed, 24 Jun 2015 14:50:20 +0200
-Subject: [PATCH 13/17] batman-adv: remove broadcast packets scheduled for
- purged outgoing if
-
-When an interface is purged, the broadcast packets scheduled for this
-interface should get purged as well.
-
-Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- send.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/send.c b/send.c
-index 23635bd..a7e84b2 100644
---- a/send.c
-+++ b/send.c
-@@ -598,7 +598,8 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv,
- 		 * we delete only packets belonging to the given interface
- 		 */
- 		if ((hard_iface) &&
--		    (forw_packet->if_incoming != hard_iface))
-+		    (forw_packet->if_incoming != hard_iface) &&
-+		    (forw_packet->if_outgoing != hard_iface))
- 			continue;
- 
- 		spin_unlock_bh(&bat_priv->forw_bcast_list_lock);
--- 
-2.1.4
-
diff --git a/batman-adv/patches/0014-batman-adv-Fix-broken-DAT-capability-check.patch b/batman-adv/patches/0014-batman-adv-Fix-broken-DAT-capability-check.patch
deleted file mode 100644
index bffabb3..0000000
--- a/batman-adv/patches/0014-batman-adv-Fix-broken-DAT-capability-check.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From de4666781c5a64cd55aa6688f77de95f8f66b2c0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
-Date: Fri, 3 Jul 2015 18:29:56 +0200
-Subject: [PATCH 14/17] batman-adv: Fix broken DAT capability check
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The introduction of set_bit() and clear_bit() calls in batman-adv
-wrongly passed bitmasks and not the bit numbers to these functions.
-This leads to broken capability checks.
-
-Fixing this by making the capability enum a non-bitmasked one and by
-that passing non-masked values to set_bit()/clear_bit().
-
-Fixes: bfd0fbaef270 ("batman-adv: Make DAT capability changes atomic")
-Reported-by: Def <def@laposte.net>
-Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- distributed-arp-table.c | 2 +-
- types.h                 | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/distributed-arp-table.c b/distributed-arp-table.c
-index b2cc19b..c0c514d 100644
---- a/distributed-arp-table.c
-+++ b/distributed-arp-table.c
-@@ -422,7 +422,7 @@ static bool batadv_is_orig_node_eligible(struct batadv_dat_candidate *res,
- 	int j;
- 
- 	/* check if orig node candidate is running DAT */
--	if (!(candidate->capabilities & BATADV_ORIG_CAPA_HAS_DAT))
-+	if (!(test_bit(BATADV_ORIG_CAPA_HAS_DAT, &candidate->capabilities)))
- 		goto out;
- 
- 	/* Check if this node has already been selected... */
-diff --git a/types.h b/types.h
-index 65dc6bf..08a6343 100644
---- a/types.h
-+++ b/types.h
-@@ -299,7 +299,7 @@ struct batadv_orig_node {
-  *  (= orig node announces a tvlv of type BATADV_TVLV_MCAST)
-  */
- enum batadv_orig_capabilities {
--	BATADV_ORIG_CAPA_HAS_DAT = BIT(0),
-+	BATADV_ORIG_CAPA_HAS_DAT,
- 	BATADV_ORIG_CAPA_HAS_NC = BIT(1),
- 	BATADV_ORIG_CAPA_HAS_TT = BIT(2),
- 	BATADV_ORIG_CAPA_HAS_MCAST = BIT(3),
--- 
-2.1.4
-
diff --git a/batman-adv/patches/0015-batman-adv-Fix-broken-NC-capability-check.patch b/batman-adv/patches/0015-batman-adv-Fix-broken-NC-capability-check.patch
deleted file mode 100644
index 86ecd92..0000000
--- a/batman-adv/patches/0015-batman-adv-Fix-broken-NC-capability-check.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From dfb27e75b5586e356e88b9d827d772a6cbdf3cc1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
-Date: Fri, 3 Jul 2015 18:29:57 +0200
-Subject: [PATCH 15/17] batman-adv: Fix broken NC capability check
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The introduction of set_bit() and clear_bit() calls in batman-adv
-wrongly passed bitmasks and not the bit numbers to these functions.
-This leads to broken capability checks.
-
-Fixing this by making the capability enum a non-bitmasked one and by
-that passing non-masked values to set_bit()/clear_bit().
-
-Fixes: 586df9e2537b ("batman-adv: Make NC capability changes atomic")
-Reported-by: Def <def@laposte.net>
-Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- network-coding.c | 2 +-
- types.h          | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/network-coding.c b/network-coding.c
-index 3ce493e..0309c2c 100644
---- a/network-coding.c
-+++ b/network-coding.c
-@@ -871,7 +871,7 @@ void batadv_nc_update_nc_node(struct batadv_priv *bat_priv,
- 		goto out;
- 
- 	/* check if orig node is network coding enabled */
--	if (!(orig_node->capabilities & BATADV_ORIG_CAPA_HAS_NC))
-+	if (!(test_bit(BATADV_ORIG_CAPA_HAS_NC, &orig_node->capabilities)))
- 		goto out;
- 
- 	/* accept ogms from 'good' neighbors and single hop neighbors */
-diff --git a/types.h b/types.h
-index 08a6343..cb7ccb1 100644
---- a/types.h
-+++ b/types.h
-@@ -300,7 +300,7 @@ struct batadv_orig_node {
-  */
- enum batadv_orig_capabilities {
- 	BATADV_ORIG_CAPA_HAS_DAT,
--	BATADV_ORIG_CAPA_HAS_NC = BIT(1),
-+	BATADV_ORIG_CAPA_HAS_NC,
- 	BATADV_ORIG_CAPA_HAS_TT = BIT(2),
- 	BATADV_ORIG_CAPA_HAS_MCAST = BIT(3),
- };
--- 
-2.1.4
-
diff --git a/batman-adv/patches/0016-batman-adv-Fix-broken-TT-capability-check.patch b/batman-adv/patches/0016-batman-adv-Fix-broken-TT-capability-check.patch
deleted file mode 100644
index 5295026..0000000
--- a/batman-adv/patches/0016-batman-adv-Fix-broken-TT-capability-check.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From a4824ffaa200050a0b3e68101ebe074a7c45b7d5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
-Date: Fri, 3 Jul 2015 18:29:58 +0200
-Subject: [PATCH 16/17] batman-adv: Fix broken TT capability check
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The introduction of set_bit() and clear_bit() calls in batman-adv
-wrongly passed bitmasks and not the bit numbers to these functions.
-This leads to broken capability checks.
-
-Fixing this by making the capability enum a non-bitmasked one and by
-that passing non-masked values to set_bit()/clear_bit().
-
-Fixes: a51fa16ecf3f ("batman-adv: Make TT capability changes atomic")
-Reported-by: Def <def@laposte.net>
-Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- translation-table.c | 3 ++-
- types.h             | 2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/translation-table.c b/translation-table.c
-index b6c0f52..d73b103 100644
---- a/translation-table.c
-+++ b/translation-table.c
-@@ -3323,7 +3323,8 @@ static void batadv_tt_update_orig(struct batadv_priv *bat_priv,
- 	bool has_tt_init;
- 
- 	tt_vlan = (struct batadv_tvlv_tt_vlan_data *)tt_buff;
--	has_tt_init = orig_node->capa_initialized & BATADV_ORIG_CAPA_HAS_TT;
-+	has_tt_init = test_bit(BATADV_ORIG_CAPA_HAS_TT,
-+			       &orig_node->capa_initialized);
- 
- 	/* orig table not initialised AND first diff is in the OGM OR the ttvn
- 	 * increased by one -> we can apply the attached changes
-diff --git a/types.h b/types.h
-index cb7ccb1..6f4486c 100644
---- a/types.h
-+++ b/types.h
-@@ -301,7 +301,7 @@ struct batadv_orig_node {
- enum batadv_orig_capabilities {
- 	BATADV_ORIG_CAPA_HAS_DAT,
- 	BATADV_ORIG_CAPA_HAS_NC,
--	BATADV_ORIG_CAPA_HAS_TT = BIT(2),
-+	BATADV_ORIG_CAPA_HAS_TT,
- 	BATADV_ORIG_CAPA_HAS_MCAST = BIT(3),
- };
- 
--- 
-2.1.4
-
diff --git a/batman-adv/patches/0017-batman-adv-Fix-broken-MCAST-capability-check.patch b/batman-adv/patches/0017-batman-adv-Fix-broken-MCAST-capability-check.patch
deleted file mode 100644
index 8930543..0000000
--- a/batman-adv/patches/0017-batman-adv-Fix-broken-MCAST-capability-check.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 1798ad3fb6ba72f8c6f96024b27ad27193648787 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
-Date: Fri, 3 Jul 2015 18:29:59 +0200
-Subject: [PATCH 17/17] batman-adv: Fix broken MCAST capability check
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The introduction of set_bit() and clear_bit() calls in batman-adv
-wrongly passed bitmasks and not the bit numbers to these functions.
-This leads to broken capability checks.
-
-Fixing this by making the capability enum a non-bitmasked one and by
-that passing non-masked values to set_bit()/clear_bit().
-
-Fixes: 201a54ba710a ("batman-adv: Make MCAST capability changes atomic")
-Reported-by: Def <def@laposte.net>
-Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- multicast.c | 11 ++++++-----
- types.h     |  2 +-
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/multicast.c b/multicast.c
-index b75bcc3..ee8317f 100644
---- a/multicast.c
-+++ b/multicast.c
-@@ -709,14 +709,15 @@ static void batadv_mcast_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
- 		mcast_flags = *(uint8_t *)tvlv_value;
- 
- 	spin_lock_bh(&orig->mcast_handler_lock);
--	orig_initialized = orig->capa_initialized & BATADV_ORIG_CAPA_HAS_MCAST;
-+	orig_initialized = test_bit(BATADV_ORIG_CAPA_HAS_MCAST,
-+				    &orig->capa_initialized);
- 
- 	/* If mcast support is turned on decrease the disabled mcast node
- 	 * counter only if we had increased it for this node before. If this
- 	 * is a completely new orig_node no need to decrease the counter.
- 	 */
- 	if (orig_mcast_enabled &&
--	    !(orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST)) {
-+	    !(test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities))) {
- 		if (orig_initialized)
- 			atomic_dec(&bat_priv->mcast.num_disabled);
- 		set_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities);
-@@ -725,7 +726,7 @@ static void batadv_mcast_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
- 	 * node counter.
- 	 */
- 	} else if (!orig_mcast_enabled &&
--		   (orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST ||
-+		   (test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities) ||
- 		    !orig_initialized)) {
- 		atomic_inc(&bat_priv->mcast.num_disabled);
- 		clear_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities);
-@@ -774,8 +775,8 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig)
- 
- 	spin_lock_bh(&orig->mcast_handler_lock);
- 
--	if (!(orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST) &&
--	    orig->capa_initialized & BATADV_ORIG_CAPA_HAS_MCAST)
-+	if (!(test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities)) &&
-+	    test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capa_initialized))
- 		atomic_dec(&bat_priv->mcast.num_disabled);
- 
- 	batadv_mcast_want_unsnoop_update(bat_priv, orig, BATADV_NO_FLAGS);
-diff --git a/types.h b/types.h
-index 6f4486c..3baf595 100644
---- a/types.h
-+++ b/types.h
-@@ -302,7 +302,7 @@ enum batadv_orig_capabilities {
- 	BATADV_ORIG_CAPA_HAS_DAT,
- 	BATADV_ORIG_CAPA_HAS_NC,
- 	BATADV_ORIG_CAPA_HAS_TT,
--	BATADV_ORIG_CAPA_HAS_MCAST = BIT(3),
-+	BATADV_ORIG_CAPA_HAS_MCAST,
- };
- 
- /**
--- 
-2.1.4
-

From 7ddd4320c244bf501a0695d47b2c0c5aed771a30 Mon Sep 17 00:00:00 2001
From: Marek Lindner <mareklindner@neomailbox.ch>
Date: Wed, 5 Aug 2015 02:56:49 +0800
Subject: [PATCH 147/368] batctl: upgrade package to latest release 2015.1

Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
 batctl/Makefile                               |  4 +-
 ...et-if_ether.h-instead-of-linux-if_et.patch | 66 -------------------
 ...l-Add-required-includes-to-all-files.patch | 54 ---------------
 3 files changed, 2 insertions(+), 122 deletions(-)
 delete mode 100644 batctl/patches/0001-batctl-use-netinet-if_ether.h-instead-of-linux-if_et.patch
 delete mode 100644 batctl/patches/0002-batctl-Add-required-includes-to-all-files.patch

diff --git a/batctl/Makefile b/batctl/Makefile
index 74bb384..8cf2d17 100644
--- a/batctl/Makefile
+++ b/batctl/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batctl
 
-PKG_VERSION:=2015.0
+PKG_VERSION:=2015.1
 PKG_RELEASE:=1
-PKG_MD5SUM:=d28ad89d71888ad6b99a1f6b30c9d47c
+PKG_MD5SUM:=3db00af0b3cf55136babe06aa666e15f
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
diff --git a/batctl/patches/0001-batctl-use-netinet-if_ether.h-instead-of-linux-if_et.patch b/batctl/patches/0001-batctl-use-netinet-if_ether.h-instead-of-linux-if_et.patch
deleted file mode 100644
index db6f139..0000000
--- a/batctl/patches/0001-batctl-use-netinet-if_ether.h-instead-of-linux-if_et.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 6423e3e5cdc1f79625dbf90ff6444b0ad8b02185 Mon Sep 17 00:00:00 2001
-From: Alex Suykov <alex.suykov@gmail.com>
-Date: Mon, 6 Apr 2015 17:29:13 +0300
-Subject: [PATCH] batctl: use netinet/if_ether.h instead of linux/if_ether.h
-
-musl does not allow including netinet/* and linux/* headers together.
-batctl includes netinet/if_ether.h indirectly via net/ethernet.h,
-so netinet/if_ether.h must be used instead of linux/if_ether.h.
-
-Signed-off-by: Alex Suykov <alex.suykov at gmail.com>
-Acked-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- ping.c       | 2 +-
- tcpdump.h    | 2 +-
- traceroute.c | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/ping.c b/ping.c
-index bdca222..7880a82 100644
---- a/ping.c
-+++ b/ping.c
-@@ -34,7 +34,7 @@
- #include <stdint.h>
- #include <sys/select.h>
- #include <sys/time.h>
--#include <linux/if_ether.h>
-+#include <netinet/if_ether.h>
- 
- #include "main.h"
- #include "ping.h"
-diff --git a/tcpdump.h b/tcpdump.h
-index 5d936f2..3c9126c 100644
---- a/tcpdump.h
-+++ b/tcpdump.h
-@@ -23,7 +23,7 @@
- #define _BATCTL_TCPDUMP_H
- 
- #include <netpacket/packet.h>
--#include <linux/if_ether.h>
-+#include <netinet/if_ether.h>
- #include <net/if_arp.h>
- #include <sys/types.h>
- #include "main.h"
-diff --git a/traceroute.c b/traceroute.c
-index 4ebfec2..373fe90 100644
---- a/traceroute.c
-+++ b/traceroute.c
-@@ -22,13 +22,13 @@
- 
- 
- #include <netinet/in.h>
-+#include <netinet/if_ether.h>
- #include <errno.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <string.h>
--#include <linux/if_ether.h>
- #include <stddef.h>
- #include <sys/select.h>
- #include <sys/time.h>
--- 
-2.1.4
-
diff --git a/batctl/patches/0002-batctl-Add-required-includes-to-all-files.patch b/batctl/patches/0002-batctl-Add-required-includes-to-all-files.patch
deleted file mode 100644
index cc2d176..0000000
--- a/batctl/patches/0002-batctl-Add-required-includes-to-all-files.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From fb51f72f3fe911103abe565ebe88b7545a18d963 Mon Sep 17 00:00:00 2001
-From: Sven Eckelmann <sven@narfation.org>
-Date: Fri, 17 Apr 2015 19:40:28 +0200
-Subject: [PATCH] batctl: Add required includes to all files
-
-The header files could not be build indepdent from each other. This is happened
-because headers didn't include the files for things they've used. This was
-problematic because the success of a build depended on the knowledge about the
-right order of local includes.
-
-Also source files were not including everything they've used explicitly.
-Instead they required that transitive includes are always stable. This is
-problematic because some transitive includes are not obvious, depend on config
-settings and may not be stable in the future.
-
-The order for include blocks are:
-
- * primary headers (main.h and the *.h file of a *.c file)
- * global linux headers
- * required local headers
- * extra forward declarations for pointers in function/struct declarations
-
-The only exceptions are linux/bitops.h and linux/if_ether.h in packet.h. This
-header file is shared with userspace applications like batctl and must
-therefore build together with userspace applications. The header linux/bitops.h
-is not part of the uapi headers and linux/if_ether.h conflicts with the musl
-implementation of netinet/if_ether.h. The maintainers rejected the use of
-__KERNEL__ preprocessor checks and thus these two headers are only in main.h.
-All files using packet.h first have to include main.h to work correctly.
-
-Reported-by: Markus Pargmann <mpa@pengutronix.de>
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- packet.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/packet.h b/packet.h
-index b81fbbf..7a9cb7a 100644
---- a/packet.h
-+++ b/packet.h
-@@ -18,6 +18,9 @@
- #ifndef _NET_BATMAN_ADV_PACKET_H_
- #define _NET_BATMAN_ADV_PACKET_H_
- 
-+#include <asm/byteorder.h>
-+#include <linux/types.h>
-+
- /**
-  * enum batadv_packettype - types for batman-adv encapsulated packets
-  * @BATADV_IV_OGM: originator messages for B.A.T.M.A.N. IV
--- 
-2.1.4
-

From 2a34bedcec526f58777e7fc183d47a7b5fda8c8f Mon Sep 17 00:00:00 2001
From: Henning Rogge <hrogge@gmail.com>
Date: Thu, 6 Aug 2015 21:59:14 +0200
Subject: [PATCH 148/368] Unified Openwrt startup scripts for OONF

---
 oonf-dlep-proxy/Makefile                 |   4 +-
 oonf-dlep-proxy/files/dlep_proxy.hotplug |  11 +-
 oonf-dlep-proxy/files/dlep_proxy.init    | 122 +----------------------
 oonf-dlep-radio/Makefile                 |   4 +-
 oonf-dlep-radio/files/dlep_radio.hotplug |  11 +-
 oonf-dlep-radio/files/dlep_radio.init    | 122 +----------------------
 oonf-init-scripts/Makefile               |  36 +++++++
 oonf-init-scripts/files/oonf_hotplug.sh  |  10 ++
 oonf-init-scripts/files/oonf_init.sh     | 120 ++++++++++++++++++++++
 oonf-olsrd2/Makefile                     |   4 +-
 oonf-olsrd2/files/olsrd2.hotplug         |  11 +-
 oonf-olsrd2/files/olsrd2.init            | 122 +----------------------
 12 files changed, 184 insertions(+), 393 deletions(-)
 create mode 100644 oonf-init-scripts/Makefile
 create mode 100755 oonf-init-scripts/files/oonf_hotplug.sh
 create mode 100755 oonf-init-scripts/files/oonf_init.sh

diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index 9a6cd2f..3f02c5d 100644
--- a/oonf-dlep-proxy/Makefile
+++ b/oonf-dlep-proxy/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-proxy
-PKG_VERSION:=0.9.1-r1
+PKG_VERSION:=0.9.1-r2
 PKG_REV:=eab3845089bc2410a3c115fb8274572b16a0e47d
 PKG_RELEASE:=$(PKG_REV)
 
@@ -40,7 +40,7 @@ endef
 define Package/oonf-dlep-proxy
 	$(call Package/oonf-git/template) 
 	TITLE:= Build DLEP Radio+Router Agent
-	DEPENDS:=+librt +libnl-tiny +libuci
+	DEPENDS:=+librt +libnl-tiny +libuci +oonf-init-scripts
 	VERSION:=$(PKG_VERSION)
 endef
 
diff --git a/oonf-dlep-proxy/files/dlep_proxy.hotplug b/oonf-dlep-proxy/files/dlep_proxy.hotplug
index e42e646..3ebe1b7 100755
--- a/oonf-dlep-proxy/files/dlep_proxy.hotplug
+++ b/oonf-dlep-proxy/files/dlep_proxy.hotplug
@@ -1,12 +1,5 @@
 #!/bin/sh
 
-daemon=dlep_proxy
+DAEMON='dlep_proxy'
 
-case "$ACTION" in
-	ifup)
-		. /etc/rc.common /etc/init.d/${daemon} enabled && {
-			logger -t '${daemon}[hotplug]' -p daemon.info 'reloading configuration'
-			. /etc/rc.common /etc/init.d/${daemon} reload
-		}
-	;;
-esac
+. /lib/functions/oonf_hotplug.sh
diff --git a/oonf-dlep-proxy/files/dlep_proxy.init b/oonf-dlep-proxy/files/dlep_proxy.init
index fddbf01..c47ff84 100755
--- a/oonf-dlep-proxy/files/dlep_proxy.init
+++ b/oonf-dlep-proxy/files/dlep_proxy.init
@@ -1,124 +1,6 @@
 #!/bin/sh /etc/rc.common
 
 START=82
+DAEMON='dlep_proxy'
 
-daemon=dlep_proxy
-
-. /usr/share/libubox/jshn.sh
-
-oonf_log()
-{
-  logger -s -t ${daemon} -p daemon.info "$1"
-}
-
-oonf_get_layer3_device()
-{
-  local interface="$1"  # e.g. 'mywifi'
-  local status dev proto
-  local query="{ \"interface\" : \"$interface\" }"
-
-  status="$( ubus -S call network.interface status "$query" )" && {
-    json_load "$status"
-    json_get_var 'dev' l3_device
-    json_get_var 'proto' proto
-    case "$proto" in
-      pppoe)
-        # TODO: otherwise it segfaults
-        oonf_log "refusing to add '$interface', because of proto '$proto'"
-      ;;
-      *)
-        echo "$dev" # e.g. 'wlan0-1'
-      ;;
-    esac
-  }
-}
-
-oonf_add_devices_to_configuration()
-{
-  local i=0
-  local device_name= section= interface= single_interface=
-
-  # make a copy of configuration and
-  # add a 'name' (physical name) for all
-  # 'interface-names' (e.g. mywifi)
-  #
-  # olsrd2.@interface[2]=interface
-  # olsrd2.@interface[2].ifname='wan lan wlanadhoc wlanadhocRADIO1'
-
-  # /var is in ramdisc/tmpfs
-  cp /etc/config/${daemon} /var/etc/${daemon}_dev
-
-  while section="$( uci -q -c /etc/config get "${daemon}.@[$i]" )"; do {
-    echo "section: $section"
-
-    interface="$( uci -q -c /etc/config get "${daemon}.@[$i].ifname" )" || {
-      i=$(( $i + 1 ))
-      continue
-    }
-
-    case "$( uci -q get "${daemon}.@[$i].ignore" )" in
-      1|on|true|enabled|yes)
-        oonf_log "removing/ignore section '$section'"
-        uci -q -c /var/etc delete "${daemon}_dev.@[$j]"
-        i=$(( $i + 1 ))
-
-        continue
-      ;;
-    esac
-
-    for single_interface in $interface; do {
-      device_name="$( oonf_get_layer3_device "$single_interface" )"
-
-      echo "Interface: $single_interface = $device_name"
-
-      if [ ! -z "$device_name" ]
-      then
-        # add option 'name' for 'ifname' (e.g. 'mywifi')
-        uci -q -c /var/etc add_list "${daemon}_dev.@[$i].name=$device_name"
-      fi
-    } done
-    i=$(( $i + 1 ))
-  } done
-
-  uci -q -c /var/etc commit ${daemon}_dev
-
-  oonf_log "wrote '/var/etc/${daemon}_dev'"
-}
-
-oonf_reread_config()
-{
-  local pid
-  local pidfile='/var/run/${daemon}.pid'
-
-  if   [ -e "$pidfile" ]; then
-    read pid <"$pidfile"
-  elif pidfile="$( uci -q get '${daemon}.@global[0].pidfile' )"; then
-    read pid <"$pidfile"
-  fi
-
-  # if empty, ask kernel
-  pid="${pid:-$( pidof ${daemon} )}"
-
-  [ -n "$pid" ] && kill -SIGHUP $pid
-}
-
-start()
-{
-  oonf_add_devices_to_configuration
-
-  # produce coredumps
-  ulimit -c unlimited
-
-  service_start /usr/sbin/${daemon} --set global.fork=true --load uci:///var/etc/${daemon}_dev
-}
-
-stop()
-{
-  service_stop /usr/sbin/${daemon}
-}
-
-reload()
-{
-  oonf_add_devices_to_configuration
-  oonf_reread_config
-}
+. /lib/functions/oonf_init.sh
diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index 4fb9124..f0db64f 100644
--- a/oonf-dlep-radio/Makefile
+++ b/oonf-dlep-radio/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-radio
-PKG_VERSION:=0.9.1-r1
+PKG_VERSION:=0.9.1-r2
 PKG_REV:=eab3845089bc2410a3c115fb8274572b16a0e47d
 PKG_RELEASE:=$(PKG_REV)
 
@@ -40,7 +40,7 @@ endef
 define Package/oonf-dlep-radio
 	$(call Package/oonf-git/template) 
 	TITLE:= Build DLEP Radio Agent
-	DEPENDS:=+librt +libnl-tiny +libuci
+	DEPENDS:=+librt +libnl-tiny +libuci +oonf-init-scripts
 	VERSION:=$(PKG_VERSION)
 endef
 
diff --git a/oonf-dlep-radio/files/dlep_radio.hotplug b/oonf-dlep-radio/files/dlep_radio.hotplug
index 87d1dbe..b7146a4 100755
--- a/oonf-dlep-radio/files/dlep_radio.hotplug
+++ b/oonf-dlep-radio/files/dlep_radio.hotplug
@@ -1,12 +1,5 @@
 #!/bin/sh
 
-daemon=dlep_radio
+DAEMON='dlep_radio'
 
-case "$ACTION" in
-	ifup)
-		. /etc/rc.common /etc/init.d/${daemon} enabled && {
-			logger -t '${daemon}[hotplug]' -p daemon.info 'reloading configuration'
-			. /etc/rc.common /etc/init.d/${daemon} reload
-		}
-	;;
-esac
+. /lib/functions/oonf_hotplug.sh
diff --git a/oonf-dlep-radio/files/dlep_radio.init b/oonf-dlep-radio/files/dlep_radio.init
index be22ed1..c660a21 100755
--- a/oonf-dlep-radio/files/dlep_radio.init
+++ b/oonf-dlep-radio/files/dlep_radio.init
@@ -1,124 +1,6 @@
 #!/bin/sh /etc/rc.common
 
 START=82
+DAEMON='dlep_radio'
 
-daemon=dlep_radio
-
-. /usr/share/libubox/jshn.sh
-
-oonf_log()
-{
-  logger -s -t ${daemon} -p daemon.info "$1"
-}
-
-oonf_get_layer3_device()
-{
-  local interface="$1"  # e.g. 'mywifi'
-  local status dev proto
-  local query="{ \"interface\" : \"$interface\" }"
-
-  status="$( ubus -S call network.interface status "$query" )" && {
-    json_load "$status"
-    json_get_var 'dev' l3_device
-    json_get_var 'proto' proto
-    case "$proto" in
-      pppoe)
-        # TODO: otherwise it segfaults
-        oonf_log "refusing to add '$interface', because of proto '$proto'"
-      ;;
-      *)
-        echo "$dev" # e.g. 'wlan0-1'
-      ;;
-    esac
-  }
-}
-
-oonf_add_devices_to_configuration()
-{
-  local i=0
-  local device_name= section= interface= single_interface=
-
-  # make a copy of configuration and
-  # add a 'name' (physical name) for all
-  # 'interface-names' (e.g. mywifi)
-  #
-  # olsrd2.@interface[2]=interface
-  # olsrd2.@interface[2].ifname='wan lan wlanadhoc wlanadhocRADIO1'
-
-  # /var is in ramdisc/tmpfs
-  cp /etc/config/${daemon} /var/etc/${daemon}_dev
-
-  while section="$( uci -q -c /etc/config get "${daemon}.@[$i]" )"; do {
-    echo "section: $section"
-
-    interface="$( uci -q -c /etc/config get "${daemon}.@[$i].ifname" )" || {
-      i=$(( $i + 1 ))
-      continue
-    }
-
-    case "$( uci -q get "${daemon}.@[$i].ignore" )" in
-      1|on|true|enabled|yes)
-        oonf_log "removing/ignore section '$section'"
-        uci -q -c /var/etc delete "${daemon}_dev.@[$j]"
-        i=$(( $i + 1 ))
-
-        continue
-      ;;
-    esac
-
-    for single_interface in $interface; do {
-      device_name="$( oonf_get_layer3_device "$single_interface" )"
-
-      echo "Interface: $single_interface = $device_name"
-
-      if [ ! -z "$device_name" ]
-      then
-        # add option 'name' for 'ifname' (e.g. 'mywifi')
-        uci -q -c /var/etc add_list "${daemon}_dev.@[$i].name=$device_name"
-      fi
-    } done
-    i=$(( $i + 1 ))
-  } done
-
-  uci -q -c /var/etc commit ${daemon}_dev
-
-  oonf_log "wrote '/var/etc/${daemon}_dev'"
-}
-
-oonf_reread_config()
-{
-  local pid
-  local pidfile='/var/run/${daemon}.pid'
-
-  if   [ -e "$pidfile" ]; then
-    read pid <"$pidfile"
-  elif pidfile="$( uci -q get '${daemon}.@global[0].pidfile' )"; then
-    read pid <"$pidfile"
-  fi
-
-  # if empty, ask kernel
-  pid="${pid:-$( pidof ${daemon} )}"
-
-  [ -n "$pid" ] && kill -SIGHUP $pid
-}
-
-start()
-{
-  oonf_add_devices_to_configuration
-
-  # produce coredumps
-  ulimit -c unlimited
-
-  service_start /usr/sbin/${daemon} --set global.fork=true --load uci:///var/etc/${daemon}_dev
-}
-
-stop()
-{
-  service_stop /usr/sbin/${daemon}
-}
-
-reload()
-{
-  oonf_add_devices_to_configuration
-  oonf_reread_config
-}
+. /lib/functions/oonf_init.sh
diff --git a/oonf-init-scripts/Makefile b/oonf-init-scripts/Makefile
new file mode 100644
index 0000000..fd1aa06
--- /dev/null
+++ b/oonf-init-scripts/Makefile
@@ -0,0 +1,36 @@
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=oonf-init-scripts
+PKG_VERSION:=0.9.1-r2
+PKG_RELEASE:=1
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/oonf-init-scripts
+	SECTION:=net
+	CATEGORY:=Network
+	MAINTAINER:=Henning Rogge <hrogge@gmail.com>
+	SUBMENU:=OLSR.org network framework
+	URL:=http://www.olsr.org/
+	TITLE:= Common OONF startup scripts
+	VERSION:=$(PKG_VERSION)
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/oonf-init-scripts/install
+	$(INSTALL_BIN)  -D ./files/oonf_init.sh            $(1)/lib/functions/oonf_init.sh
+	$(INSTALL_BIN)  -D ./files/oonf_hotplug.sh         $(1)/lib/functions/oonf_hotplug.sh
+endef
+
+$(eval $(call BuildPackage,oonf-init-scripts))
diff --git a/oonf-init-scripts/files/oonf_hotplug.sh b/oonf-init-scripts/files/oonf_hotplug.sh
new file mode 100755
index 0000000..b230b94
--- /dev/null
+++ b/oonf-init-scripts/files/oonf_hotplug.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+case "${ACTION}" in
+	ifup)
+		. /etc/rc.common /etc/init.d/${DAEMON} enabled && {
+			logger -t '${DAEMON}[hotplug]' -p daemon.info 'reloading configuration'
+			. /etc/rc.common /etc/init.d/${DAEMON} reload
+		}
+	;;
+esac
diff --git a/oonf-init-scripts/files/oonf_init.sh b/oonf-init-scripts/files/oonf_init.sh
new file mode 100755
index 0000000..1c7b414
--- /dev/null
+++ b/oonf-init-scripts/files/oonf_init.sh
@@ -0,0 +1,120 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+
+oonf_log()
+{
+  logger -s -t ${DAEMON} -p daemon.info "${1}"
+}
+
+oonf_get_layer3_device()
+{
+  local interface="${1}"  # e.g. 'mywifi'
+  local status dev proto
+  local query="{ \"interface\" : \"${interface}\" }"
+
+  status="$( ubus -S call network.interface status "${query}" )" && {
+    json_load "${status}"
+    json_get_var 'dev' l3_device
+    json_get_var 'proto' proto
+    case "${proto}" in
+      pppoe)
+        # TODO: otherwise it segfaults
+        oonf_log "refusing to add '$interface', because of proto '${proto}'"
+      ;;
+      *)
+        echo "${dev}" # e.g. 'wlan0-1'
+      ;;
+    esac
+  }
+}
+
+oonf_add_devices_to_configuration()
+{
+  local i=0
+  local device_name= section= interface= single_interface=
+
+  # make a copy of configuration and
+  # add a 'name' (physical name) for all
+  # 'interface-names' (e.g. mywifi)
+  #
+  # olsrd2.@interface[2]=interface
+  # olsrd2.@interface[2].ifname='wan lan wlanadhoc wlanadhocRADIO1'
+
+  # /var is in ramdisc/tmpfs
+  uci export ${DAEMON} >"/var/etc/${DAEMON}_dev"
+
+  while section="$( uci -q -c /etc/config get "${DAEMON}.@[${i}]" )"; do {
+    echo "section: ${section}"
+
+    interface="$( uci -q -c /etc/config get "${DAEMON}.@[${i}].ifname" )" || {
+      i=$(( i + 1 ))
+      continue
+    }
+
+    case "$( uci -q get "${DAEMON}.@[${i}].ignore" )" in
+      1|on|true|enabled|yes)
+        oonf_log "removing/ignore section '$section'"
+        uci -q -c /var/etc delete "${DAEMON}_dev.@[${j}]"
+        i=$(( i + 1 ))
+
+        continue
+      ;;
+    esac
+
+    for single_interface in ${interface}; do {
+      device_name="$( oonf_get_layer3_device "${single_interface}" )"
+
+      echo "Interface: ${single_interface} = ${device_name}"
+
+      if [ ! -z "${device_name}" ]
+      then
+        # add option 'name' for 'ifname' (e.g. 'mywifi')
+        uci -q -c /var/etc add_list "${DAEMON}_dev.@[${i}].name=${device_name}"
+      fi
+    } done
+    i=$(( $i + 1 ))
+  } done
+
+  uci -q -c /var/etc commit "${DAEMON}_dev"
+
+  oonf_log "wrote '/var/etc/${DAEMON}_dev'"
+}
+
+oonf_reread_config()
+{
+  local pid
+  local pidfile="/var/run/${DAEMON}.pid"
+
+  if   [ -e "${pidfile}" ]; then
+    read pid <"${pidfile}"
+  elif pidfile="$( uci -q get "${DAEMON}.@global[0].pidfile" )"; then
+    read pid <"${pidfile}"
+  fi
+
+  # if empty, ask kernel
+  pid="${pid:-$( pidof ${DAEMON} )}"
+
+  [ -n "${pid}" ] && kill -SIGHUP ${pid}
+}
+
+start()
+{
+  oonf_add_devices_to_configuration
+
+  # produce coredumps
+  ulimit -c unlimited
+
+  service_start /usr/sbin/${DAEMON} --set global.fork=true --load uci:///var/etc/${DAEMON}_dev
+}
+
+stop()
+{
+  service_stop /usr/sbin/${DAEMON}
+}
+
+reload()
+{
+  oonf_add_devices_to_configuration
+  oonf_reread_config
+}
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 4651f94..9c23ac7 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2
-PKG_VERSION:=0.9.1-r1
+PKG_VERSION:=0.9.1-r2
 PKG_REV:=eab3845089bc2410a3c115fb8274572b16a0e47d
 PKG_RELEASE:=$(PKG_REV)
 
@@ -40,7 +40,7 @@ endef
 define Package/oonf-olsrd2
 	$(call Package/oonf-git/template) 
 	TITLE:= Build Olsrd V2 Routing Agent
-	DEPENDS:=+librt +libnl-tiny +libuci
+	DEPENDS:=+librt +libnl-tiny +libuci +oonf-init-scripts
 	VERSION:=$(PKG_VERSION)
 endef
 
diff --git a/oonf-olsrd2/files/olsrd2.hotplug b/oonf-olsrd2/files/olsrd2.hotplug
index a67de86..3a277ce 100755
--- a/oonf-olsrd2/files/olsrd2.hotplug
+++ b/oonf-olsrd2/files/olsrd2.hotplug
@@ -1,12 +1,5 @@
 #!/bin/sh
 
-daemon=olsrd2
+DAEMON='olsrd2'
 
-case "$ACTION" in
-	ifup)
-		. /etc/rc.common /etc/init.d/${daemon} enabled && {
-			logger -t '${daemon}[hotplug]' -p daemon.info 'reloading configuration'
-			. /etc/rc.common /etc/init.d/${daemon} reload
-		}
-	;;
-esac
+. /lib/functions/oonf_hotplug.sh
diff --git a/oonf-olsrd2/files/olsrd2.init b/oonf-olsrd2/files/olsrd2.init
index 3f3b667..debae98 100755
--- a/oonf-olsrd2/files/olsrd2.init
+++ b/oonf-olsrd2/files/olsrd2.init
@@ -1,124 +1,6 @@
 #!/bin/sh /etc/rc.common
 
 START=82
+DAEMON='olsrd2'
 
-daemon=olsrd2
-
-. /usr/share/libubox/jshn.sh
-
-oonf_log()
-{
-  logger -s -t ${daemon} -p daemon.info "$1"
-}
-
-oonf_get_layer3_device()
-{
-  local interface="$1"  # e.g. 'mywifi'
-  local status dev proto
-  local query="{ \"interface\" : \"$interface\" }"
-
-  status="$( ubus -S call network.interface status "$query" )" && {
-    json_load "$status"
-    json_get_var 'dev' l3_device
-    json_get_var 'proto' proto
-    case "$proto" in
-      pppoe)
-        # TODO: otherwise it segfaults
-        oonf_log "refusing to add '$interface', because of proto '$proto'"
-      ;;
-      *)
-        echo "$dev" # e.g. 'wlan0-1'
-      ;;
-    esac
-  }
-}
-
-oonf_add_devices_to_configuration()
-{
-  local i=0
-  local device_name= section= interface= single_interface=
-
-  # make a copy of configuration and
-  # add a 'name' (physical name) for all
-  # 'interface-names' (e.g. mywifi)
-  #
-  # olsrd2.@interface[2]=interface
-  # olsrd2.@interface[2].ifname='wan lan wlanadhoc wlanadhocRADIO1'
-
-  # /var is in ramdisc/tmpfs
-  cp /etc/config/${daemon} /var/etc/${daemon}_dev
-
-  while section="$( uci -q -c /etc/config get "${daemon}.@[$i]" )"; do {
-    echo "section: $section"
-
-    interface="$( uci -q -c /etc/config get "${daemon}.@[$i].ifname" )" || {
-      i=$(( $i + 1 ))
-      continue
-    }
-
-    case "$( uci -q get "${daemon}.@[$i].ignore" )" in
-      1|on|true|enabled|yes)
-        oonf_log "removing/ignore section '$section'"
-        uci -q -c /var/etc delete "${daemon}_dev.@[$j]"
-        i=$(( $i + 1 ))
-
-        continue
-      ;;
-    esac
-
-    for single_interface in $interface; do {
-      device_name="$( oonf_get_layer3_device "$single_interface" )"
-
-      echo "Interface: $single_interface = $device_name"
-
-      if [ ! -z "$device_name" ]
-      then
-        # add option 'name' for 'ifname' (e.g. 'mywifi')
-        uci -q -c /var/etc add_list "${daemon}_dev.@[$i].name=$device_name"
-      fi
-    } done
-    i=$(( $i + 1 ))
-  } done
-
-  uci -q -c /var/etc commit ${daemon}_dev
-
-  oonf_log "wrote '/var/etc/${daemon}_dev'"
-}
-
-oonf_reread_config()
-{
-  local pid
-  local pidfile='/var/run/${daemon}.pid'
-
-  if   [ -e "$pidfile" ]; then
-    read pid <"$pidfile"
-  elif pidfile="$( uci -q get '${daemon}.@global[0].pidfile' )"; then
-    read pid <"$pidfile"
-  fi
-
-  # if empty, ask kernel
-  pid="${pid:-$( pidof ${daemon} )}"
-
-  [ -n "$pid" ] && kill -SIGHUP $pid
-}
-
-start()
-{
-  oonf_add_devices_to_configuration
-
-  # produce coredumps
-  ulimit -c unlimited
-
-  service_start /usr/sbin/${daemon} --set global.fork=true --load uci:///var/etc/${daemon}_dev
-}
-
-stop()
-{
-  service_stop /usr/sbin/${daemon}
-}
-
-reload()
-{
-  oonf_add_devices_to_configuration
-  oonf_reread_config
-}
+. /lib/functions/oonf_init.sh

From 5bcc48d5d032dd53ae58d03014b59e879eec2c3f Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Fri, 7 Aug 2015 13:33:59 +0200
Subject: [PATCH 149/368] [bmx7] update to latest semtor-branch version

---
 bmx7/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bmx7/Makefile b/bmx7/Makefile
index e611ffa..9f2e937 100644
--- a/bmx7/Makefile
+++ b/bmx7/Makefile
@@ -32,8 +32,8 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 #PKG_SOURCE_URL:=file:///home/neumann/bmx6/bmx6.git
 
-PKG_REV:=2865a2fe21e6dae00b43b3b91ba0625af9757c09
-PKG_VERSION:=r2015072121
+PKG_REV:=c893847b458294e4559b8523f3397fbee4b32a8f
+PKG_VERSION:=r2015080722
 PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 

From cfefe9fccae2332d147fd9bae7c72d15a42d1982 Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Fri, 7 Aug 2015 20:42:49 +0200
Subject: [PATCH 150/368] [bmx6] update to latest bmx6-master branch (fix rule
 corruption on the fly)

---
 bmx6/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bmx6/Makefile b/bmx6/Makefile
index 4ac6af4..425c298 100644
--- a/bmx6/Makefile
+++ b/bmx6/Makefile
@@ -31,8 +31,8 @@ PKG_SOURCE_PROTO:=git
 #PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
 PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 
-PKG_REV:=8f26909e8808ed7fab0359afc15a3e44563fbd40
-PKG_VERSION:=r2015061604
+PKG_REV:=2a87b770d3f9c254e3927dc159e2f425f2e0e83a
+PKG_VERSION:=r2015080701
 PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 

From c40c8024eed8ed5dfd35c211a1af4a87c9f157a3 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 9 Aug 2015 18:03:28 +0200
Subject: [PATCH 151/368] alfred: not only wait for the interface, but also a
 link-local address

Changes between alfred 2015.0 and 2015.1 cause alfred to print an error
and exit when the interface to bind to is not completely set up (has no
non-tentative link-local address). As a workaround, wait for such an
address by reading /proc/net/if_inet6 before alfred is started.

In the long term, it would be nice to make alfred more robust against
missing interfaces (allowing alfred to start without the interface
existing, and keeping it working even when the interface is removed and
re-added while alfred is running).

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
---
 alfred/files/alfred.init | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/alfred/files/alfred.init b/alfred/files/alfred.init
index 5ce06c0..4c9a9e1 100755
--- a/alfred/files/alfred.init
+++ b/alfred/files/alfred.init
@@ -37,6 +37,31 @@ wait_for_dir()
 	fi
 }
 
+wait_for_ll_address()
+{
+	local iface="$1"
+	local timeout=30
+
+	echo "${initscript}: waiting $timeout secs for $iface address..."
+	for i in $(seq $timeout); do
+		# We look for
+		# - the link-local address (starts with fe80)
+		# - without tentative flag (bit 0x40 in the flags field; the first char of the flags field begins 38 columns after the fe80 prefix
+		# - on interface $iface
+		if awk '
+			BEGIN { RET=1 }
+			/^fe80.{37} [012389ab]/ { if ($6 == "'"$iface"'") RET=0 }
+			END { exit RET }
+		' /proc/net/if_inet6; then
+			return
+		fi
+		sleep 1
+	done
+
+	echo "${initscript}: $iface address not detected, alfred not starting."
+	exit 1
+}
+
 alfred_start()
 {
 	local args=""
@@ -62,7 +87,7 @@ alfred_start()
 		wait_for_dir "$batmanif" "/sys/class/net/$batmanif/mesh"
 	fi
 
-	wait_for_dir "$interface" "/sys/class/net/$interface/"
+	wait_for_ll_address "$interface"
 
 	append alfred_args "$args"
 	enable=1

From b05d89c99063be58fa6d74ad0500bdb92305cf1e Mon Sep 17 00:00:00 2001
From: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
Date: Mon, 10 Aug 2015 13:52:08 +0200
Subject: [PATCH 152/368] OONF Init script fix for the case that /var/etc does
 not exist

---
 oonf-init-scripts/Makefile           | 2 +-
 oonf-init-scripts/files/oonf_init.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/oonf-init-scripts/Makefile b/oonf-init-scripts/Makefile
index fd1aa06..8bfbf6e 100644
--- a/oonf-init-scripts/Makefile
+++ b/oonf-init-scripts/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=oonf-init-scripts
-PKG_VERSION:=0.9.1-r2
+PKG_VERSION:=0.9.1-r3
 PKG_RELEASE:=1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
diff --git a/oonf-init-scripts/files/oonf_init.sh b/oonf-init-scripts/files/oonf_init.sh
index 1c7b414..8a1bacf 100755
--- a/oonf-init-scripts/files/oonf_init.sh
+++ b/oonf-init-scripts/files/oonf_init.sh
@@ -42,6 +42,7 @@ oonf_add_devices_to_configuration()
   # olsrd2.@interface[2].ifname='wan lan wlanadhoc wlanadhocRADIO1'
 
   # /var is in ramdisc/tmpfs
+  mkdir -p /var/etc
   uci export ${DAEMON} >"/var/etc/${DAEMON}_dev"
 
   while section="$( uci -q -c /etc/config get "${DAEMON}.@[${i}]" )"; do {

From 8878923d37121551bba14b743bbe30873e5734b1 Mon Sep 17 00:00:00 2001
From: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
Date: Wed, 12 Aug 2015 15:56:31 +0200
Subject: [PATCH 153/368] Move OONF temporary config to /var/run

---
 oonf-init-scripts/files/oonf_init.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/oonf-init-scripts/files/oonf_init.sh b/oonf-init-scripts/files/oonf_init.sh
index 8a1bacf..8ab5b3b 100755
--- a/oonf-init-scripts/files/oonf_init.sh
+++ b/oonf-init-scripts/files/oonf_init.sh
@@ -42,8 +42,7 @@ oonf_add_devices_to_configuration()
   # olsrd2.@interface[2].ifname='wan lan wlanadhoc wlanadhocRADIO1'
 
   # /var is in ramdisc/tmpfs
-  mkdir -p /var/etc
-  uci export ${DAEMON} >"/var/etc/${DAEMON}_dev"
+  uci export ${DAEMON} >"/var/run/${DAEMON}_dev"
 
   while section="$( uci -q -c /etc/config get "${DAEMON}.@[${i}]" )"; do {
     echo "section: ${section}"
@@ -56,7 +55,7 @@ oonf_add_devices_to_configuration()
     case "$( uci -q get "${DAEMON}.@[${i}].ignore" )" in
       1|on|true|enabled|yes)
         oonf_log "removing/ignore section '$section'"
-        uci -q -c /var/etc delete "${DAEMON}_dev.@[${j}]"
+        uci -q -c /var/run delete "${DAEMON}_dev.@[${j}]"
         i=$(( i + 1 ))
 
         continue
@@ -71,15 +70,15 @@ oonf_add_devices_to_configuration()
       if [ ! -z "${device_name}" ]
       then
         # add option 'name' for 'ifname' (e.g. 'mywifi')
-        uci -q -c /var/etc add_list "${DAEMON}_dev.@[${i}].name=${device_name}"
+        uci -q -c /var/run add_list "${DAEMON}_dev.@[${i}].name=${device_name}"
       fi
     } done
     i=$(( $i + 1 ))
   } done
 
-  uci -q -c /var/etc commit "${DAEMON}_dev"
+  uci -q -c /var/run commit "${DAEMON}_dev"
 
-  oonf_log "wrote '/var/etc/${DAEMON}_dev'"
+  oonf_log "wrote '/var/run/${DAEMON}_dev'"
 }
 
 oonf_reread_config()
@@ -106,7 +105,7 @@ start()
   # produce coredumps
   ulimit -c unlimited
 
-  service_start /usr/sbin/${DAEMON} --set global.fork=true --load uci:///var/etc/${DAEMON}_dev
+  service_start /usr/sbin/${DAEMON} --set global.fork=true --load uci:///var/run/${DAEMON}_dev
 }
 
 stop()

From 234c9d97a6f912825477cc266c40ed84fc5bdf09 Mon Sep 17 00:00:00 2001
From: Nils Schneider <nils@nilsschneider.net>
Date: Sun, 16 Aug 2015 18:50:02 +0200
Subject: [PATCH 154/368] babeld: fix parsing of list import_table

When parsing list options using config_load option_cb will be called
with additional options ending in _ITEM$x and _LENGTH. This ignores any
option containing _LENGTH or _ITEM as they can't possible be a valid
babeld option making a config like

    config general
        list import_table 23
        list import_table 42

work.

Signed-off-by: Nils Schneider <nils@nilsschneider.net>
---
 babeld/files/babeld.config | 2 --
 babeld/files/babeld.init   | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/babeld/files/babeld.config b/babeld/files/babeld.config
index cb2a131..0073f73 100644
--- a/babeld/files/babeld.config
+++ b/babeld/files/babeld.config
@@ -16,8 +16,6 @@ config general
 	## Enable ipv6-subtrees by default since OpenWrt should ship with a
 	## recent enough kernel for it to work.
 	option 'ipv6_subtrees' 'true'
-	## This seems somewhat buggy on BB.  If you need only one
-	## import-table statement, "option import_table 42" should work.
 	# list 'import_table' '42'
 	# list 'import_table' '100'
 	## Alternative configuration file and directory.
diff --git a/babeld/files/babeld.init b/babeld/files/babeld.init
index 6796a34..21ae4be 100755
--- a/babeld/files/babeld.init
+++ b/babeld/files/babeld.init
@@ -166,6 +166,9 @@ babel_config_cb() {
 			local value="$2"
 			# Ignore old options
 			list_contains ignored_options "$option" && return
+			# Skip lists. They will be taken care of by list_cb
+			test "${option#*_ITEM}" != "$option" && return
+			test "${option#*_LENGTH}" != "$option" && return
 			cfg_append "${option//_/-} $value"
 		}
 	;;

From 600b9681a782f796858229b3519267f3810610a2 Mon Sep 17 00:00:00 2001
From: Oryon <pierre@darou.fr>
Date: Tue, 18 Aug 2015 05:28:32 -0700
Subject: [PATCH 155/368] pimbd: First package release

---
 pimbd/Makefile              | 48 +++++++++++++++++++++++++++++++++++++
 pimbd/files/firewall-uci.sh | 22 +++++++++++++++++
 pimbd/files/pimbd.init      | 21 ++++++++++++++++
 3 files changed, 91 insertions(+)
 create mode 100644 pimbd/Makefile
 create mode 100644 pimbd/files/firewall-uci.sh
 create mode 100644 pimbd/files/pimbd.init

diff --git a/pimbd/Makefile b/pimbd/Makefile
new file mode 100644
index 0000000..55aec74
--- /dev/null
+++ b/pimbd/Makefile
@@ -0,0 +1,48 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=pimbd
+PKG_SOURCE_VERSION:=68f5fc803119e4b33a88b35c096f4d6ac28b6de5
+PKG_VERSION:=2015-08-18-$(PKG_SOURCE_VERSION)
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/Oryon/pimbd.git
+PKG_MAINTAINER:=Pierre Pfister <pierre.pfister@darou.fr>
+PKG_LICENSE:=Apache-2.0
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+# Spammy debug builds for now
+CMAKE_OPTIONS += -DL_LEVEL=7
+
+define Package/pimbd
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=PIM BIDIR daemon
+  URL:=https://github.com/Oryon/pimbd.git
+  DEPENDS+=+@IPV6
+  DEPENDS+=netifd
+endef
+
+define Package/pimbd/description
+This package provides a daemon which implements the Protocol Independent
+Multicast BIDIR routing protocol. Note that a routing protocol must be 
+installed and running in order for PIM to function.
+endef
+
+define Package/pimbd/install
+	$(INSTALL_DIR) $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/pimbd $(1)/usr/sbin/pimbd
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/generic/pimbc.sh $(1)/usr/sbin/pimbc
+	ln -s pimbd $(1)/usr/sbin/pimb-ipc
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/pimbd.init $(1)/etc/init.d/pimbd
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) files/firewall-uci.sh $(1)/etc/uci-defaults/99_pimbd_firewall
+endef
+
+$(eval $(call BuildPackage,pimbd))
diff --git a/pimbd/files/firewall-uci.sh b/pimbd/files/firewall-uci.sh
new file mode 100644
index 0000000..5ee20b3
--- /dev/null
+++ b/pimbd/files/firewall-uci.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+pim_rule () {
+uci -q batch <<-EOT
+	delete firewall.$1
+	set firewall.$1=rule
+	set firewall.$1.name='$2 multicast forward for $3'
+	set firewall.$1.src='*'
+	set firewall.$1.dest='*'
+	set firewall.$1.family='$2'
+	set firewall.$1.proto='udp'
+	set firewall.$1.dest_ip='$3'
+	set firewall.$1.target='ACCEPT'
+EOT
+}
+
+pim_rule pimbd4 ipv4 224.0.0.0/4
+pim_rule pimbd6 ipv6 ff00::/8
+uci commit firewall
+
+exit 0
+
diff --git a/pimbd/files/pimbd.init b/pimbd/files/pimbd.init
new file mode 100644
index 0000000..20b27bd
--- /dev/null
+++ b/pimbd/files/pimbd.init
@@ -0,0 +1,21 @@
+#!/bin/sh /etc/rc.common
+
+START=90
+STOP=10
+USE_PROCD=1
+
+start_service() {
+    . /lib/functions.sh
+    . /lib/functions/network.sh
+    config_load pimb
+
+    procd_open_instance
+    procd_set_param command /usr/sbin/pimbd
+    procd_append_param command -S
+    procd_append_param command -L 6
+
+    procd_set_param respawn
+    procd_close_instance
+}
+
+

From cad0d08ade73c029e3fe9f9903e436e8aebbf8a5 Mon Sep 17 00:00:00 2001
From: Oryon <pierre@darou.fr>
Date: Tue, 18 Aug 2015 08:42:48 -0700
Subject: [PATCH 156/368] hnetd: Enable multicast support when pimbd is present

---
 hnetd/Makefile         | 5 +++--
 hnetd/files/hnetd.init | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/hnetd/Makefile b/hnetd/Makefile
index 03e3fb9..dbeb586 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hnetd
-PKG_SOURCE_VERSION:=a6b4b6f1f5d38646fa11064cf7394719e048bc87
-PKG_VERSION:=2015-07-28-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=b5a03142135c9ab2680027d1fd8c149d2c46e74b
+PKG_VERSION:=2015-08-18-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
@@ -120,6 +120,7 @@ define Package/hnetd-$(BUILD_VARIANT)/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/generic/hnetd-routing $(1)/usr/sbin/hnetd-routing
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) ./files/hnetd.defaults $(1)/etc/uci-defaults/x-hnetd.defaults
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/generic/multicast.script $(1)/usr/sbin/hnet-multicast
 endef
 
 define Package/hnet-full/install
diff --git a/hnetd/files/hnetd.init b/hnetd/files/hnetd.init
index 6b98b8c..c4419ee 100644
--- a/hnetd/files/hnetd.init
+++ b/hnetd/files/hnetd.init
@@ -14,6 +14,7 @@ OHP_SCRIPT=/usr/sbin/hnetd-ohp-script
 OHP_BINARY=/usr/sbin/ohybridproxy
 PCP_SCRIPT=/usr/sbin/hnetd-pcp-script
 PCP_BINARY=/usr/sbin/minimalist-pcproxy
+MULTICAST_SCRIPT=/usr/sbin/hnet-multicast
 
 start_service() {
     . /lib/functions.sh
@@ -37,6 +38,12 @@ start_service() {
             procd_append_param command -n "$HOSTNAME"
         fi
     fi
+	
+    # Enable multicast if present and installed
+    if [ -f "$MULTICAST_SCRIPT" ]
+    then
+        $MULTICAST_SCRIPT status && procd_append_param command -M "$MULTICAST_SCRIPT"
+    fi
 
     # Enable PCP, if it's present
     if [ -f $PCP_BINARY -a -f $PCP_SCRIPT ]

From b7a256e71b69f572218b1b77b65473f6b2ffa11c Mon Sep 17 00:00:00 2001
From: Dirk Neukirchen <dirkneukirchen@web.de>
Date: Mon, 15 Jun 2015 12:36:55 +0200
Subject: [PATCH 157/368] bird: explicitly set C standard

fixes gcc5 compile

compile error was:
cf-lex.o: In function `add_tail':
cf-lex.c:(.text+0x2d1): multiple definition of `add_tail'
cf-parse.tab.o:cf-parse.tab.c:(.text+0x1f9): first defined here

Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>
---
 bird/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bird/Makefile b/bird/Makefile
index 5f8200c..eeb5106 100644
--- a/bird/Makefile
+++ b/bird/Makefile
@@ -161,6 +161,8 @@ endef
 
 CONFIGURE_ARGS += --with-linux-headers="$(LINUX_DIR)"
 
+TARGET_CFLAGS+=-std=gnu89
+
 define Build/Template
 
 $(STAMP_BUILT)-$(2): $(STAMP_PREPARED)

From 314186661d797f9fc8f6aaa6e3ddab80c28fa75f Mon Sep 17 00:00:00 2001
From: Oryon <pierre@darou.fr>
Date: Fri, 21 Aug 2015 05:12:23 -0700
Subject: [PATCH 158/368] hnetd: Adding wifi autoconf PoC

---
 hnetd/Makefile          |  5 +++--
 hnetd/files/hnet.config |  8 ++++++++
 hnetd/files/hnetd.init  | 12 ++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/hnetd/Makefile b/hnetd/Makefile
index dbeb586..896d848 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hnetd
-PKG_SOURCE_VERSION:=b5a03142135c9ab2680027d1fd8c149d2c46e74b
-PKG_VERSION:=2015-08-18-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=345fb74504249cee5d02b2349ccaaef118523118
+PKG_VERSION:=2015-08-21-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
@@ -121,6 +121,7 @@ define Package/hnetd-$(BUILD_VARIANT)/install
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) ./files/hnetd.defaults $(1)/etc/uci-defaults/x-hnetd.defaults
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/generic/multicast.script $(1)/usr/sbin/hnet-multicast
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/openwrt/autowifi.script $(1)/usr/sbin/autowifi
 endef
 
 define Package/hnet-full/install
diff --git a/hnetd/files/hnet.config b/hnetd/files/hnet.config
index 6ac396f..aba765f 100644
--- a/hnetd/files/hnet.config
+++ b/hnetd/files/hnet.config
@@ -18,3 +18,11 @@ config pa pa
 config sd sd
 #	option router_name openwrt
 #	option domain_name home.
+
+
+# Wifi allows for very basic wifi autoconfiguration
+# Warning: This feature is unstable
+config wifi wifi
+#	option enable 0
+#       option ssid ssidtest
+#       option password test
diff --git a/hnetd/files/hnetd.init b/hnetd/files/hnetd.init
index c4419ee..742de48 100644
--- a/hnetd/files/hnetd.init
+++ b/hnetd/files/hnetd.init
@@ -15,6 +15,7 @@ OHP_BINARY=/usr/sbin/ohybridproxy
 PCP_SCRIPT=/usr/sbin/hnetd-pcp-script
 PCP_BINARY=/usr/sbin/minimalist-pcproxy
 MULTICAST_SCRIPT=/usr/sbin/hnet-multicast
+WIFI_SCRIPT=/usr/sbin/autowifi
 
 start_service() {
     . /lib/functions.sh
@@ -45,6 +46,17 @@ start_service() {
         $MULTICAST_SCRIPT status && procd_append_param command -M "$MULTICAST_SCRIPT"
     fi
 
+    config_get enableval wifi enable
+    if [ -f "$WIFI_SCRIPT" -a "$enableval" = "1" ]; then
+        wifiopt=$WIFI_SCRIPT
+        config_get ssidval wifi ssid
+        config_get passval wifi password
+        if [ -n "$ssidval" -a -n "$passval"  ]; then
+            wifiopt=${wifiopt},${ssidval}:${passval}
+        fi
+        procd_append_param command -w "$wifiopt"
+    fi
+
     # Enable PCP, if it's present
     if [ -f $PCP_BINARY -a -f $PCP_SCRIPT ]
     then

From 9e7231781c5ba220c1bc1aef6a0393f70e31a145 Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Fri, 21 Aug 2015 17:26:01 +0200
Subject: [PATCH 159/368] update to latest bmx6-master branch (fix: ignore
 profiling probes if out of range)

---
 bmx7/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bmx7/Makefile b/bmx7/Makefile
index 9f2e937..7e8d6a9 100644
--- a/bmx7/Makefile
+++ b/bmx7/Makefile
@@ -32,8 +32,8 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 #PKG_SOURCE_URL:=file:///home/neumann/bmx6/bmx6.git
 
-PKG_REV:=c893847b458294e4559b8523f3397fbee4b32a8f
-PKG_VERSION:=r2015080722
+PKG_REV:=ecfb56ca08af8dbd8004b62b4c8b1966023c9a57
+PKG_VERSION:=r2015082101
 PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 

From 444888b4bd7843084e9aa299fc4d36598b26faca Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Wed, 2 Sep 2015 12:35:37 +0300
Subject: [PATCH 160/368] hnetd: Now disable in dnsmasq both rebind_protection
 and boguspriv by default, so that IPv4 naming works 'as expected' with
 multiple routers without user configuration.

---
 hnetd/files/hnetd.defaults | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/hnetd/files/hnetd.defaults b/hnetd/files/hnetd.defaults
index 8dc7871..f9ed705 100644
--- a/hnetd/files/hnetd.defaults
+++ b/hnetd/files/hnetd.defaults
@@ -1,7 +1,14 @@
 #!/bin/sh
 
+# Why we tune dnsmasq?
+# localservice=0 => other hnetd instances can query for local names
+# rebind_protection=0 => accept RFC1918 names from the other hnetd instances
+# boguspriv=0 => allow reverse resolution of RFC1918 w/o local hosts entries
+
 uci batch <<EOF
 set dhcp.odhcpd.maindhcp=1
 set dhcp.@dnsmasq[0].localservice=0
+set dhcp.@dnsmasq[0].rebind_protection=0
+set dhcp.@dnsmasq[0].boguspriv=0
 commit dhcp
 EOF

From d34224e9f0440420e5e6813e3ebc1cd7bf1ba513 Mon Sep 17 00:00:00 2001
From: Marek Lindner <mareklindner@neomailbox.ch>
Date: Sun, 6 Sep 2015 16:53:06 +0800
Subject: [PATCH 161/368] batman-adv: 2015.1 bugfixes & stability updates

Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
 ...ower-layer-header-length-to-headroom.patch |  88 ---------------
 ...-access-unregistered-net_device-obje.patch |  46 ++++++++
 ...ower-layer-needed_-head-tail-room-to.patch | 101 ++++++++++++++++++
 ...emory-leak-on-tt-add-with-invalid-vl.patch |  43 ++++++++
 ...e-unnecessary-braces-for-test_bit-in.patch |  32 ++++++
 ...e-unnecessary-braces-for-test_bit-in.patch |  32 ++++++
 ...e-unnecessary-braces-for-test_bit-in.patch |  41 +++++++
 ...ix-speedy-join-for-DAT-cache-replies.patch |  58 ++++++++++
 ...-avoid-keeping-false-temporary-entry.patch |  51 +++++++++
 ...ect-local-excess-vlans-in-TT-request.patch |  55 ++++++++++
 10 files changed, 459 insertions(+), 88 deletions(-)
 delete mode 100644 batman-adv/patches/0001-batman-adv-Add-lower-layer-header-length-to-headroom.patch
 create mode 100644 batman-adv/patches/0001-batman-adv-don-t-access-unregistered-net_device-obje.patch
 create mode 100644 batman-adv/patches/0002-batman-adv-Add-lower-layer-needed_-head-tail-room-to.patch
 create mode 100644 batman-adv/patches/0003-batman-adv-Fix-memory-leak-on-tt-add-with-invalid-vl.patch
 create mode 100644 batman-adv/patches/0004-batman-adv-Remove-unnecessary-braces-for-test_bit-in.patch
 create mode 100644 batman-adv/patches/0005-batman-adv-Remove-unnecessary-braces-for-test_bit-in.patch
 create mode 100644 batman-adv/patches/0006-batman-adv-Remove-unnecessary-braces-for-test_bit-in.patch
 create mode 100644 batman-adv/patches/0007-batman-adv-fix-speedy-join-for-DAT-cache-replies.patch
 create mode 100644 batman-adv/patches/0008-batman-adv-avoid-keeping-false-temporary-entry.patch
 create mode 100644 batman-adv/patches/0009-batman-adv-detect-local-excess-vlans-in-TT-request.patch

diff --git a/batman-adv/patches/0001-batman-adv-Add-lower-layer-header-length-to-headroom.patch b/batman-adv/patches/0001-batman-adv-Add-lower-layer-header-length-to-headroom.patch
deleted file mode 100644
index c5adedb..0000000
--- a/batman-adv/patches/0001-batman-adv-Add-lower-layer-header-length-to-headroom.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-batman-adv: Add lower layer header length to headroom
-
-The maximum of hard_header_len and needed_headroom of all slave interfaces
-of a batman-adv device must be used to define the batman-adv device
-headroom/header_len. This is required to avoid too small headroom problems
-when these slave devices try to send the encapsulated packet.
-
-The batman-adv therefore uses:
-
-	needed_headroom = max(0, dev[0].needed_headroom, ...,
-			      dev[n].needed_headroom)
-	hard_header_len = max(ETH_HLEN, dev[0].hard_header_len, ...,
-			      dev[n].hard_header_len) + ETH_HLEN +
-			  max(sizeof(batadv_*cast_packet))
-
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
----
- net/batman-adv/hard-interface.c | 33 +++++++++++++++++++++++++++++++++
- net/batman-adv/soft-interface.c |  2 +-
- 2 files changed, 34 insertions(+), 1 deletion(-)
-
-diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
-index f4a15d2e5eaf..a501aae1077b 100644
---- a/net/batman-adv/hard-interface.c
-+++ b/net/batman-adv/hard-interface.c
-@@ -252,12 +252,45 @@ static void batadv_check_known_mac_addr(const struct net_device *net_dev)
- 	rcu_read_unlock();
- }
- 
-+/**
-+ * batadv_hardif_recalc_headroom() - Recalculate skbuff headroom parameters
-+ * @soft_iface: netdev struct of the mesh interface
-+ */
-+static void batadv_hardif_recalc_headroom(struct net_device *soft_iface)
-+{
-+	const struct batadv_hard_iface *hard_iface;
-+	unsigned short hard_header_len = ETH_HLEN;
-+	unsigned short needed_headroom = 0;
-+
-+	rcu_read_lock();
-+	list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
-+		if ((hard_iface->if_status != BATADV_IF_ACTIVE) &&
-+		    (hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED))
-+			continue;
-+
-+		if (hard_iface->soft_iface != soft_iface)
-+			continue;
-+
-+		hard_header_len = max_t(unsigned short, hard_header_len,
-+					hard_iface->net_dev->hard_header_len);
-+
-+		needed_headroom = max_t(unsigned short, needed_headroom,
-+					hard_iface->net_dev->needed_headroom);
-+	}
-+	rcu_read_unlock();
-+
-+	soft_iface->needed_headroom = needed_headroom;
-+	soft_iface->hard_header_len = hard_header_len + batadv_max_header_len();
-+}
-+
- int batadv_hardif_min_mtu(struct net_device *soft_iface)
- {
- 	struct batadv_priv *bat_priv = netdev_priv(soft_iface);
- 	const struct batadv_hard_iface *hard_iface;
- 	int min_mtu = INT_MAX;
- 
-+	batadv_hardif_recalc_headroom(soft_iface);
-+
- 	rcu_read_lock();
- 	list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
- 		if ((hard_iface->if_status != BATADV_IF_ACTIVE) &&
-diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
-index 36b23f31df2a..b4c110791203 100644
---- a/net/batman-adv/soft-interface.c
-+++ b/net/batman-adv/soft-interface.c
-@@ -948,7 +948,7 @@ static void batadv_softif_init_early(struct net_device *dev)
- 	 */
- 	dev->mtu = ETH_DATA_LEN;
- 	/* reserve more space in the skbuff for our header */
--	dev->hard_header_len = batadv_max_header_len();
-+	dev->hard_header_len = ETH_HLEN + batadv_max_header_len();
- 
- 	/* generate random address */
- 	eth_hw_addr_random(dev);
--- 
-2.5.0
-
-
diff --git a/batman-adv/patches/0001-batman-adv-don-t-access-unregistered-net_device-obje.patch b/batman-adv/patches/0001-batman-adv-don-t-access-unregistered-net_device-obje.patch
new file mode 100644
index 0000000..75da6fb
--- /dev/null
+++ b/batman-adv/patches/0001-batman-adv-don-t-access-unregistered-net_device-obje.patch
@@ -0,0 +1,46 @@
+From 958aafba93c7e408237298c5b2c5d7c3e318402c Mon Sep 17 00:00:00 2001
+From: Antonio Quartulli <antonio@meshcoding.com>
+Date: Tue, 4 Aug 2015 22:26:19 +0200
+Subject: [PATCH 1/9] batman-adv: don't access unregistered net_device object
+
+In batadv_hardif_disable_interface() there is a call to
+batadv_softif_destroy_sysfs() which in turns invokes
+unregister_netdevice() on the soft_iface.
+After this point we cannot rely on the soft_iface object
+anymore because it might get free'd by the netdev periodic
+routine at any time.
+
+For this reason the netdev_upper_dev_unlink(.., soft_iface) call
+is moved before the invocation of batadv_softif_destroy_sysfs() so
+that we can be sure that the soft_iface object is still valid.
+
+Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ net/batman-adv/hard-interface.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
+index f4a15d2..0565b20 100644
+--- a/net/batman-adv/hard-interface.c
++++ b/net/batman-adv/hard-interface.c
+@@ -528,6 +528,8 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,
+ 	batadv_purge_outstanding_packets(bat_priv, hard_iface);
+ 	dev_put(hard_iface->soft_iface);
+ 
++	netdev_upper_dev_unlink(hard_iface->net_dev, hard_iface->soft_iface);
++
+ 	/* nobody uses this interface anymore */
+ 	if (!bat_priv->num_ifaces) {
+ 		batadv_gw_check_client_stop(bat_priv);
+@@ -536,7 +538,6 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,
+ 			batadv_softif_destroy_sysfs(hard_iface->soft_iface);
+ 	}
+ 
+-	netdev_upper_dev_unlink(hard_iface->net_dev, hard_iface->soft_iface);
+ 	hard_iface->soft_iface = NULL;
+ 	batadv_hardif_free_ref(hard_iface);
+ 
+-- 
+2.5.0
+
diff --git a/batman-adv/patches/0002-batman-adv-Add-lower-layer-needed_-head-tail-room-to.patch b/batman-adv/patches/0002-batman-adv-Add-lower-layer-needed_-head-tail-room-to.patch
new file mode 100644
index 0000000..681c4b2
--- /dev/null
+++ b/batman-adv/patches/0002-batman-adv-Add-lower-layer-needed_-head-tail-room-to.patch
@@ -0,0 +1,101 @@
+From e2b4301f4e2d3695ed2024880d2295223cb2f857 Mon Sep 17 00:00:00 2001
+From: Sven Eckelmann <sven@narfation.org>
+Date: Fri, 7 Aug 2015 19:28:42 +0200
+Subject: [PATCH 2/9] batman-adv: Add lower layer needed_(head|tail)room to own
+ ones
+
+The maximum of hard_header_len and maximum of all needed_(head|tail)room of
+all slave interfaces of a batman-adv device must be used to define the
+batman-adv device needed_(head|tail)room. This is required to avoid too
+small buffer problems when these slave devices try to send the encapsulated
+packet in a tx path without the possibility to resize the skbuff.
+
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ net/batman-adv/hard-interface.c | 41 +++++++++++++++++++++++++++++++++++++++++
+ net/batman-adv/soft-interface.c |  2 --
+ 2 files changed, 41 insertions(+), 2 deletions(-)
+
+diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
+index 0565b20..f11345e 100644
+--- a/net/batman-adv/hard-interface.c
++++ b/net/batman-adv/hard-interface.c
+@@ -252,6 +252,44 @@ static void batadv_check_known_mac_addr(const struct net_device *net_dev)
+ 	rcu_read_unlock();
+ }
+ 
++/**
++ * batadv_hardif_recalc_extra_skbroom() - Recalculate skbuff extra head/tailroom
++ * @soft_iface: netdev struct of the mesh interface
++ */
++static void batadv_hardif_recalc_extra_skbroom(struct net_device *soft_iface)
++{
++	const struct batadv_hard_iface *hard_iface;
++	unsigned short lower_header_len = ETH_HLEN;
++	unsigned short lower_headroom = 0;
++	unsigned short lower_tailroom = 0;
++	unsigned short needed_headroom;
++
++	rcu_read_lock();
++	list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
++		if (hard_iface->if_status == BATADV_IF_NOT_IN_USE)
++			continue;
++
++		if (hard_iface->soft_iface != soft_iface)
++			continue;
++
++		lower_header_len = max_t(unsigned short, lower_header_len,
++					 hard_iface->net_dev->hard_header_len);
++
++		lower_headroom = max_t(unsigned short, lower_headroom,
++				       hard_iface->net_dev->needed_headroom);
++
++		lower_tailroom = max_t(unsigned short, lower_tailroom,
++				       hard_iface->net_dev->needed_tailroom);
++	}
++	rcu_read_unlock();
++
++	needed_headroom = lower_headroom + (lower_header_len - ETH_HLEN);
++	needed_headroom += batadv_max_header_len();
++
++	soft_iface->needed_headroom = needed_headroom;
++	soft_iface->needed_tailroom = lower_tailroom;
++}
++
+ int batadv_hardif_min_mtu(struct net_device *soft_iface)
+ {
+ 	struct batadv_priv *bat_priv = netdev_priv(soft_iface);
+@@ -474,6 +512,8 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
+ 			   "Not using interface %s (retrying later): interface not active\n",
+ 			   hard_iface->net_dev->name);
+ 
++	batadv_hardif_recalc_extra_skbroom(soft_iface);
++
+ 	/* begin scheduling originator messages on that interface */
+ 	batadv_schedule_bat_ogm(hard_iface);
+ 
+@@ -529,6 +569,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,
+ 	dev_put(hard_iface->soft_iface);
+ 
+ 	netdev_upper_dev_unlink(hard_iface->net_dev, hard_iface->soft_iface);
++	batadv_hardif_recalc_extra_skbroom(hard_iface->soft_iface);
+ 
+ 	/* nobody uses this interface anymore */
+ 	if (!bat_priv->num_ifaces) {
+diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
+index 51cda3a..10f6448 100644
+--- a/net/batman-adv/soft-interface.c
++++ b/net/batman-adv/soft-interface.c
+@@ -947,8 +947,6 @@ static void batadv_softif_init_early(struct net_device *dev)
+ 	 * have not been initialized yet
+ 	 */
+ 	dev->mtu = ETH_DATA_LEN;
+-	/* reserve more space in the skbuff for our header */
+-	dev->hard_header_len = batadv_max_header_len();
+ 
+ 	/* generate random address */
+ 	eth_hw_addr_random(dev);
+-- 
+2.5.0
+
diff --git a/batman-adv/patches/0003-batman-adv-Fix-memory-leak-on-tt-add-with-invalid-vl.patch b/batman-adv/patches/0003-batman-adv-Fix-memory-leak-on-tt-add-with-invalid-vl.patch
new file mode 100644
index 0000000..8fc5f64
--- /dev/null
+++ b/batman-adv/patches/0003-batman-adv-Fix-memory-leak-on-tt-add-with-invalid-vl.patch
@@ -0,0 +1,43 @@
+From dba67bc80fbfe6a28fc3c1141cca1c556ab7e499 Mon Sep 17 00:00:00 2001
+From: Sven Eckelmann <sven@narfation.org>
+Date: Tue, 18 Aug 2015 13:37:01 +0200
+Subject: [PATCH 3/9] batman-adv: Fix memory leak on tt add with invalid vlan
+
+The object tt_local is allocated with kmalloc and not initialized when the
+function batadv_tt_local_add checks for the vlan. But this function can
+only cleanup the object when the (not yet initialized) reference counter of
+the object is 1. This is unlikely and thus the object would leak when the
+vlan could not be found.
+
+Instead the uninitialized object tt_local has to be freed manually and the
+pointer has to set to NULL to avoid calling the function which would try to
+decrement the reference counter of the not existing object.
+
+CID: 1316518
+Fixes: 354136bcc3c4 ("batman-adv: fix kernel crash due to missing NULL checks")
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ net/batman-adv/translation-table.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
+index 7986ec5..39283ff 100644
+--- a/net/batman-adv/translation-table.c
++++ b/net/batman-adv/translation-table.c
+@@ -595,8 +595,11 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr,
+ 	/* increase the refcounter of the related vlan */
+ 	vlan = batadv_softif_vlan_get(bat_priv, vid);
+ 	if (WARN(!vlan, "adding TT local entry %pM to non-existent VLAN %d",
+-		 addr, BATADV_PRINT_VID(vid)))
++		 addr, BATADV_PRINT_VID(vid))) {
++		kfree(tt_local);
++		tt_local = NULL;
+ 		goto out;
++	}
+ 
+ 	batadv_dbg(BATADV_DBG_TT, bat_priv,
+ 		   "Creating new local tt entry: %pM (vid: %d, ttvn: %d)\n",
+-- 
+2.5.0
+
diff --git a/batman-adv/patches/0004-batman-adv-Remove-unnecessary-braces-for-test_bit-in.patch b/batman-adv/patches/0004-batman-adv-Remove-unnecessary-braces-for-test_bit-in.patch
new file mode 100644
index 0000000..afe66a6
--- /dev/null
+++ b/batman-adv/patches/0004-batman-adv-Remove-unnecessary-braces-for-test_bit-in.patch
@@ -0,0 +1,32 @@
+From af3558688698479a56034f0fcbca164be2052aa8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
+Date: Fri, 14 Aug 2015 17:23:48 +0200
+Subject: [PATCH 4/9] batman-adv: Remove unnecessary braces for test_bit() in
+ DAT
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes: de466678 ("batman-adv: Fix broken DAT capability check")
+Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ net/batman-adv/distributed-arp-table.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
+index 1caf7d2..63243a3 100644
+--- a/net/batman-adv/distributed-arp-table.c
++++ b/net/batman-adv/distributed-arp-table.c
+@@ -453,7 +453,7 @@ static bool batadv_is_orig_node_eligible(struct batadv_dat_candidate *res,
+ 	int j;
+ 
+ 	/* check if orig node candidate is running DAT */
+-	if (!(test_bit(BATADV_ORIG_CAPA_HAS_DAT, &candidate->capabilities)))
++	if (!test_bit(BATADV_ORIG_CAPA_HAS_DAT, &candidate->capabilities))
+ 		goto out;
+ 
+ 	/* Check if this node has already been selected... */
+-- 
+2.5.0
+
diff --git a/batman-adv/patches/0005-batman-adv-Remove-unnecessary-braces-for-test_bit-in.patch b/batman-adv/patches/0005-batman-adv-Remove-unnecessary-braces-for-test_bit-in.patch
new file mode 100644
index 0000000..eecbdcd
--- /dev/null
+++ b/batman-adv/patches/0005-batman-adv-Remove-unnecessary-braces-for-test_bit-in.patch
@@ -0,0 +1,32 @@
+From 5abaf07b4c24ab2d7bd9b0c0de946b1ee5e946ff Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
+Date: Fri, 14 Aug 2015 17:23:49 +0200
+Subject: [PATCH 5/9] batman-adv: Remove unnecessary braces for test_bit() in
+ NC
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes: dfb27e75 ("batman-adv: Fix broken NC capability check")
+Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ net/batman-adv/network-coding.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c
+index 55a0b28..1a1f7e6 100644
+--- a/net/batman-adv/network-coding.c
++++ b/net/batman-adv/network-coding.c
+@@ -894,7 +894,7 @@ void batadv_nc_update_nc_node(struct batadv_priv *bat_priv,
+ 		goto out;
+ 
+ 	/* check if orig node is network coding enabled */
+-	if (!(test_bit(BATADV_ORIG_CAPA_HAS_NC, &orig_node->capabilities)))
++	if (!test_bit(BATADV_ORIG_CAPA_HAS_NC, &orig_node->capabilities))
+ 		goto out;
+ 
+ 	/* accept ogms from 'good' neighbors and single hop neighbors */
+-- 
+2.5.0
+
diff --git a/batman-adv/patches/0006-batman-adv-Remove-unnecessary-braces-for-test_bit-in.patch b/batman-adv/patches/0006-batman-adv-Remove-unnecessary-braces-for-test_bit-in.patch
new file mode 100644
index 0000000..a4b4292
--- /dev/null
+++ b/batman-adv/patches/0006-batman-adv-Remove-unnecessary-braces-for-test_bit-in.patch
@@ -0,0 +1,41 @@
+From d126204d0471e0972142697f36364443a0bbc9cc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
+Date: Fri, 14 Aug 2015 17:23:50 +0200
+Subject: [PATCH 6/9] batman-adv: Remove unnecessary braces for test_bit() in
+ MCAST
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes: 1798ad3f ("batman-adv: Fix broken MCAST capability check")
+Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ net/batman-adv/multicast.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c
+index 8bdd69f..4541f08 100644
+--- a/net/batman-adv/multicast.c
++++ b/net/batman-adv/multicast.c
+@@ -740,7 +740,7 @@ static void batadv_mcast_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
+ 	 * is a completely new orig_node no need to decrease the counter.
+ 	 */
+ 	if (orig_mcast_enabled &&
+-	    !(test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities))) {
++	    !test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities)) {
+ 		if (orig_initialized)
+ 			atomic_dec(&bat_priv->mcast.num_disabled);
+ 		set_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities);
+@@ -798,7 +798,7 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig)
+ 
+ 	spin_lock_bh(&orig->mcast_handler_lock);
+ 
+-	if (!(test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities)) &&
++	if (!test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities) &&
+ 	    test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capa_initialized))
+ 		atomic_dec(&bat_priv->mcast.num_disabled);
+ 
+-- 
+2.5.0
+
diff --git a/batman-adv/patches/0007-batman-adv-fix-speedy-join-for-DAT-cache-replies.patch b/batman-adv/patches/0007-batman-adv-fix-speedy-join-for-DAT-cache-replies.patch
new file mode 100644
index 0000000..d88508a
--- /dev/null
+++ b/batman-adv/patches/0007-batman-adv-fix-speedy-join-for-DAT-cache-replies.patch
@@ -0,0 +1,58 @@
+From 2decb5f1fef1484f1b7319aaf2f36b5492d8d943 Mon Sep 17 00:00:00 2001
+From: Simon Wunderlich <sw@simonwunderlich.de>
+Date: Wed, 2 Sep 2015 20:09:54 +0200
+Subject: [PATCH 7/9] batman-adv: fix speedy join for DAT cache replies
+
+DAT Cache replies are answered on behalf of other clients which are not
+connected to the answering originator. Therefore, we shouldn't add these
+clients to the answering originators TT table through speed join to
+avoid bogus entries.
+
+Reported-by: Alessandro Bolletta <alessandro@mediaspot.net>
+Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
+Acked-by: Antonio Quartulli <antonio@meshcoding.com>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ net/batman-adv/routing.c | 19 +++++++++++++++----
+ 1 file changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
+index c360c0c..96b5daa 100644
+--- a/net/batman-adv/routing.c
++++ b/net/batman-adv/routing.c
+@@ -836,6 +836,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,
+ 	uint8_t *orig_addr;
+ 	struct batadv_orig_node *orig_node = NULL;
+ 	int check, hdr_size = sizeof(*unicast_packet);
++	enum batadv_subtype subtype;
+ 	bool is4addr;
+ 
+ 	unicast_packet = (struct batadv_unicast_packet *)skb->data;
+@@ -863,10 +864,20 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,
+ 	/* packet for me */
+ 	if (batadv_is_my_mac(bat_priv, unicast_packet->dest)) {
+ 		if (is4addr) {
+-			batadv_dat_inc_counter(bat_priv,
+-					       unicast_4addr_packet->subtype);
+-			orig_addr = unicast_4addr_packet->src;
+-			orig_node = batadv_orig_hash_find(bat_priv, orig_addr);
++			subtype = unicast_4addr_packet->subtype;
++			batadv_dat_inc_counter(bat_priv, subtype);
++
++			/* Only payload data should be considered for speedy
++			 * join. For example, DAT also uses unicast 4addr
++			 * types, but those packets should not be considered
++			 * for speedy join, since the clients do not actually
++			 * reside at the sending originator.
++			 */
++			if (subtype == BATADV_P_DATA) {
++				orig_addr = unicast_4addr_packet->src;
++				orig_node = batadv_orig_hash_find(bat_priv,
++								  orig_addr);
++			}
+ 		}
+ 
+ 		if (batadv_dat_snoop_incoming_arp_request(bat_priv, skb,
+-- 
+2.5.0
+
diff --git a/batman-adv/patches/0008-batman-adv-avoid-keeping-false-temporary-entry.patch b/batman-adv/patches/0008-batman-adv-avoid-keeping-false-temporary-entry.patch
new file mode 100644
index 0000000..0e7dbab
--- /dev/null
+++ b/batman-adv/patches/0008-batman-adv-avoid-keeping-false-temporary-entry.patch
@@ -0,0 +1,51 @@
+From 4a73d7438dfb60c7ac82758875292bc14f363b45 Mon Sep 17 00:00:00 2001
+From: Simon Wunderlich <sw@simonwunderlich.de>
+Date: Wed, 2 Sep 2015 20:09:55 +0200
+Subject: [PATCH 8/9] batman-adv: avoid keeping false temporary entry
+
+In the case when a temporary entry is added first and a proper tt entry
+is added after that, the temporary tt entry is kept in the orig list.
+However the temporary flag is removed at this point, and therefore the
+purge function can not find this temporary entry anymore.
+
+Therefore, remove the previous temp entry before adding the new proper
+one.
+
+This case can happen if a client behind a given originator moves before
+the TT announcement is sent out. Other than that, this case can also be
+created by bogus or malicious payload frames for VLANs which are not
+existent on the sending originator.
+
+Reported-by: Alessandro Bolletta <alessandro@mediaspot.net>
+Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
+Acked-by: Antonio Quartulli <antonio@meshcoding.com>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ net/batman-adv/translation-table.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
+index 39283ff..9ac1a46 100644
+--- a/net/batman-adv/translation-table.c
++++ b/net/batman-adv/translation-table.c
+@@ -1419,9 +1419,15 @@ static bool batadv_tt_global_add(struct batadv_priv *bat_priv,
+ 		}
+ 
+ 		/* if the client was temporary added before receiving the first
+-		 * OGM announcing it, we have to clear the TEMP flag
++		 * OGM announcing it, we have to clear the TEMP flag. Also,
++		 * remove the previous temporary orig node and re-add it
++		 * if required. If the orig entry changed, the new one which
++		 * is a non-temporary entry is preferred.
+ 		 */
+-		common->flags &= ~BATADV_TT_CLIENT_TEMP;
++		if (common->flags & BATADV_TT_CLIENT_TEMP) {
++			batadv_tt_global_del_orig_list(tt_global_entry);
++			common->flags &= ~BATADV_TT_CLIENT_TEMP;
++		}
+ 
+ 		/* the change can carry possible "attribute" flags like the
+ 		 * TT_CLIENT_WIFI, therefore they have to be copied in the
+-- 
+2.5.0
+
diff --git a/batman-adv/patches/0009-batman-adv-detect-local-excess-vlans-in-TT-request.patch b/batman-adv/patches/0009-batman-adv-detect-local-excess-vlans-in-TT-request.patch
new file mode 100644
index 0000000..66e0dcf
--- /dev/null
+++ b/batman-adv/patches/0009-batman-adv-detect-local-excess-vlans-in-TT-request.patch
@@ -0,0 +1,55 @@
+From 2dd1d9f06ac1208b1921aa90d479c3940bc70b4f Mon Sep 17 00:00:00 2001
+From: Simon Wunderlich <sw@simonwunderlich.de>
+Date: Wed, 2 Sep 2015 20:09:56 +0200
+Subject: [PATCH 9/9] batman-adv: detect local excess vlans in TT request
+
+If the local representation of the global TT table of one originator has
+more VLAN entries than the respective TT update, there is some
+inconsistency present. By detecting and reporting this inconsistency,
+the global table gets updated and the excess VLAN will get removed in
+the process.
+
+Reported-by: Alessandro Bolletta <alessandro@mediaspot.net>
+Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
+Acked-by: Antonio Quartulli <antonio@meshcoding.com>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ net/batman-adv/translation-table.c | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
+index 9ac1a46..7e4657e 100644
+--- a/net/batman-adv/translation-table.c
++++ b/net/batman-adv/translation-table.c
+@@ -2394,8 +2394,8 @@ static bool batadv_tt_global_check_crc(struct batadv_orig_node *orig_node,
+ {
+ 	struct batadv_tvlv_tt_vlan_data *tt_vlan_tmp;
+ 	struct batadv_orig_node_vlan *vlan;
++	int i, orig_num_vlan;
+ 	uint32_t crc;
+-	int i;
+ 
+ 	/* check if each received CRC matches the locally stored one */
+ 	for (i = 0; i < num_vlan; i++) {
+@@ -2421,6 +2421,18 @@ static bool batadv_tt_global_check_crc(struct batadv_orig_node *orig_node,
+ 			return false;
+ 	}
+ 
++	/* check if any excess VLANs exist locally for the originator
++	 * which are not mentioned in the TVLV from the originator.
++	 */
++	rcu_read_lock();
++	orig_num_vlan = 0;
++	list_for_each_entry_rcu(vlan, &orig_node->vlan_list, list)
++		orig_num_vlan++;
++	rcu_read_unlock();
++
++	if (orig_num_vlan > num_vlan)
++		return false;
++
+ 	return true;
+ }
+ 
+-- 
+2.5.0
+

From ae62ce064247e93612013e56cd3a1816489f2d04 Mon Sep 17 00:00:00 2001
From: Henning Rogge <hrogge@gmail.com>
Date: Tue, 8 Sep 2015 18:25:55 +0200
Subject: [PATCH 162/368] update to v0.9.2

---
 oonf-dlep-proxy/Makefile | 4 ++--
 oonf-dlep-radio/Makefile | 4 ++--
 oonf-olsrd2/Makefile     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index 3f02c5d..ed9a52f 100644
--- a/oonf-dlep-proxy/Makefile
+++ b/oonf-dlep-proxy/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-proxy
-PKG_VERSION:=0.9.1-r2
-PKG_REV:=eab3845089bc2410a3c115fb8274572b16a0e47d
+PKG_VERSION:=0.9.2
+PKG_REV:=d1780791bd449f578a37a2b3103682169d9a01a9
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index f0db64f..aedf2da 100644
--- a/oonf-dlep-radio/Makefile
+++ b/oonf-dlep-radio/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-radio
-PKG_VERSION:=0.9.1-r2
-PKG_REV:=eab3845089bc2410a3c115fb8274572b16a0e47d
+PKG_VERSION:=0.9.2
+PKG_REV:=d1780791bd449f578a37a2b3103682169d9a01a9
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 9c23ac7..3cfd321 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2
-PKG_VERSION:=0.9.1-r2
-PKG_REV:=eab3845089bc2410a3c115fb8274572b16a0e47d
+PKG_VERSION:=0.9.2
+PKG_REV:=d1780791bd449f578a37a2b3103682169d9a01a9
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

From ffd8bfab23f1a68e6fb1aa7e4da4f0c721375c12 Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Tue, 8 Sep 2015 21:01:35 +0300
Subject: [PATCH 163/368] hnetd: Bump + removed rebind_protection disabling (as
 latest hnetd provides correct rebind-domain-ok option to dnsmasq
 dynamically).

---
 hnetd/Makefile             | 4 ++--
 hnetd/files/hnetd.defaults | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/hnetd/Makefile b/hnetd/Makefile
index 896d848..3e92239 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hnetd
-PKG_SOURCE_VERSION:=345fb74504249cee5d02b2349ccaaef118523118
-PKG_VERSION:=2015-08-21-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=c0b0c31b8fa4fbe47208e49685ccc9976532738a
+PKG_VERSION:=2015-09-08-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
diff --git a/hnetd/files/hnetd.defaults b/hnetd/files/hnetd.defaults
index f9ed705..5ca7388 100644
--- a/hnetd/files/hnetd.defaults
+++ b/hnetd/files/hnetd.defaults
@@ -2,13 +2,11 @@
 
 # Why we tune dnsmasq?
 # localservice=0 => other hnetd instances can query for local names
-# rebind_protection=0 => accept RFC1918 names from the other hnetd instances
 # boguspriv=0 => allow reverse resolution of RFC1918 w/o local hosts entries
 
 uci batch <<EOF
 set dhcp.odhcpd.maindhcp=1
 set dhcp.@dnsmasq[0].localservice=0
-set dhcp.@dnsmasq[0].rebind_protection=0
 set dhcp.@dnsmasq[0].boguspriv=0
 commit dhcp
 EOF

From 70db9d7197c9b5f113b10844197a7dd8d2ebaa92 Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Fri, 11 Sep 2015 20:16:37 +0200
Subject: [PATCH 164/368] [bmx7] performance fixes

---
 bmx7/Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bmx7/Makefile b/bmx7/Makefile
index 7e8d6a9..bd88599 100644
--- a/bmx7/Makefile
+++ b/bmx7/Makefile
@@ -32,8 +32,8 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 #PKG_SOURCE_URL:=file:///home/neumann/bmx6/bmx6.git
 
-PKG_REV:=ecfb56ca08af8dbd8004b62b4c8b1966023c9a57
-PKG_VERSION:=r2015082101
+PKG_REV:=4b21205c6873190b8e09e1dc3a4bd343b90ae174
+PKG_VERSION:=r2015091124
 PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 
@@ -47,12 +47,11 @@ include $(INCLUDE_DIR)/package.mk
 TARGET_CFLAGS += $(FPIC)
 
 MAKE_ARGS += \
-        EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DCRYPTLIB=POLARSSL_1_3_4 -DCORE_LIMIT=20000 -DTRAFFIC_DUMP -DDEBUG_MALLOC" \
+        EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DCRYPTLIB=POLARSSL_1_3_4 -DCORE_LIMIT=20000 -DTRAFFIC_DUMP -DNO_TRACE_FUNCTION_CALLS" \
         EXTRA_LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib " \
         GIT_REV="$(PKG_REV)" \
         CC="$(TARGET_CC)" \
         INSTALL_DIR="$(PKG_INSTALL_DIR)" \
-        STRIP="/bin/false" \
         build_all
 
 define Package/bmx7/Default

From b70ab6990a556385ee64dae7fd1a7c3c8dcc99ee Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Tue, 15 Sep 2015 11:53:49 +0300
Subject: [PATCH 165/368] hnetd: Bump, use DDZ script, and remove the
 OpenWrt-specific scripts as they match the ones in git repository anyway for
 pcp and ohp.

---
 hnetd/Makefile         |  9 ++++----
 hnetd/files/hnetd.init |  6 ++++++
 hnetd/files/ohp-script | 48 ------------------------------------------
 hnetd/files/pcp-script | 46 ----------------------------------------
 4 files changed, 11 insertions(+), 98 deletions(-)
 delete mode 100644 hnetd/files/ohp-script
 delete mode 100644 hnetd/files/pcp-script

diff --git a/hnetd/Makefile b/hnetd/Makefile
index 3e92239..df9e950 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hnetd
-PKG_SOURCE_VERSION:=c0b0c31b8fa4fbe47208e49685ccc9976532738a
-PKG_VERSION:=2015-09-08-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=d802317b77b02af7b5a6531d2eba1d2b790cac9a
+PKG_VERSION:=2015-09-15-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
@@ -115,8 +115,9 @@ define Package/hnetd-$(BUILD_VARIANT)/install
 	$(INSTALL_BIN) ./files/hnetd.init $(1)/etc/init.d/hnetd
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DATA) ./files/hnet.config $(1)/etc/config/hnet
-	$(INSTALL_BIN) ./files/ohp-script $(1)/usr/sbin/hnetd-ohp-script
-	$(INSTALL_BIN) ./files/pcp-script $(1)/usr/sbin/hnetd-pcp-script
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/generic/ohp.script $(1)/usr/sbin/hnetd-ohp-script
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/generic/ddz.script $(1)/usr/sbin/hnetd-ddz-script
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/generic/pcp.script $(1)/usr/sbin/hnetd-pcp-script
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/generic/hnetd-routing $(1)/usr/sbin/hnetd-routing
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) ./files/hnetd.defaults $(1)/etc/uci-defaults/x-hnetd.defaults
diff --git a/hnetd/files/hnetd.init b/hnetd/files/hnetd.init
index 742de48..3ca2c2e 100644
--- a/hnetd/files/hnetd.init
+++ b/hnetd/files/hnetd.init
@@ -12,6 +12,8 @@ DNSMASQ_DIR=/tmp/dnsmasq.d
 DNSMASQ_SCRIPT=/etc/init.d/dnsmasq
 OHP_SCRIPT=/usr/sbin/hnetd-ohp-script
 OHP_BINARY=/usr/sbin/ohybridproxy
+DDZ_SCRIPT=/usr/sbin/hnetd-ddz-script
+DDZ_BINARY=/usr/sbin/zonestitcher
 PCP_SCRIPT=/usr/sbin/hnetd-pcp-script
 PCP_BINARY=/usr/sbin/minimalist-pcproxy
 MULTICAST_SCRIPT=/usr/sbin/hnet-multicast
@@ -38,6 +40,10 @@ start_service() {
         then
             procd_append_param command -n "$HOSTNAME"
         fi
+        if [ -f $DDZ_BINARY ]
+        then
+            procd_append_param command -z $DDZ_SCRIPT
+        fi
     fi
 	
     # Enable multicast if present and installed
diff --git a/hnetd/files/ohp-script b/hnetd/files/ohp-script
deleted file mode 100644
index aebaa1d..0000000
--- a/hnetd/files/ohp-script
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh 
-#-*-sh-*-
-#
-# $Id: ohp-script $
-#
-# Author: Markus Stenberg <mstenber@cisco.com>
-#
-# Copyright (c) 2014 cisco Systems, Inc.
-#
-# Created:       Fri Jan 17 11:46:30 2014 mstenber
-# Last modified: Mon Feb  3 14:39:15 2014 mstenber
-# Edit time:     15 min
-#
-
-# This is minimalist init.d-like start/stop script for
-# ohybridproxy. However, as ohybridproxy receives it's configuration
-# via command line, the 'start' command is also equivalent to
-# 'restart', and has bunch of extra arguments..
-
-OHP=ohybridproxy
-
-start() {
-    $OHP $* &
-}
-
-stop() {
-    killall -9 $OHP
-}
-
-
-CMD=$1
-# For debugging purposes
-LOGNAME=`basename $0`
-echo "$*" | logger -t "$LOGNAME"
-case $CMD in
-  start)
-    shift
-    stop
-    start $*
-    ;;
-  stop)
-  stop
-    ;;
-  *)
-    echo "Only start [config]/stop supported"
-    exit 1
-  ;;
-esac
diff --git a/hnetd/files/pcp-script b/hnetd/files/pcp-script
deleted file mode 100644
index 88648d2..0000000
--- a/hnetd/files/pcp-script
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-#-*-sh-*-
-#
-# $Id: pcp-script $
-#
-# Author: Markus Stenberg <mstenber@cisco.com>
-#
-# Copyright (c) 2014 cisco Systems, Inc.
-#
-# Created:       Fri Jan 17 11:46:30 2014 mstenber
-# Last modified: Fri May 30 13:27:57 2014 mstenber
-# Edit time:     16 min
-#
-
-# Copied from ohp-script.. Same idea. Just prod minimalist-pcproxy as
-# needed, hoping the miniupnpd is taken care of by the system.
-
-PCP=minimalist-pcproxy
-
-start() {
-    $PCP $* &
-}
-
-stop() {
-    killall -9 $PCP
-}
-
-
-CMD=$1
-# For debugging purposes
-LOGNAME=`basename $0`
-echo "$*" | logger -t "$LOGNAME"
-case $CMD in
-  start)
-    shift
-    stop
-    start $*
-    ;;
-  stop)
-  stop
-    ;;
-  *)
-    echo "Only start [config]/stop supported"
-    exit 1
-  ;;
-esac

From 3b4de3e11226a12f29ccf333fc6a569ea0d48ff0 Mon Sep 17 00:00:00 2001
From: Saverio Proto <saverio.proto@switch.ch>
Date: Mon, 21 Sep 2015 10:40:34 +0200
Subject: [PATCH 166/368] olsrd: bump to version 0.9.0.3

---
 olsrd/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/olsrd/Makefile b/olsrd/Makefile
index 4e8c7b0..26b7de5 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
-PKG_VERSION:=0.9.0.2
-PKG_RELEASE:=4
+PKG_VERSION:=0.9.0.3
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.9
 
-PKG_MD5SUM:=8a2675c33990706cc291b59934024783
+PKG_MD5SUM:=fa5cf15c29c7ebd9b8425267676c7865
 PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=BSD-3-Clause
 

From 62103f4bc37cb882aa3b84fdcf24e670fc7f4999 Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Tue, 29 Sep 2015 12:08:51 +0300
Subject: [PATCH 167/368] hnetd: Bump to account for mismatched PATHs in trunk
 (leads to problems with busybox <> non-busybox ip).

---
 hnetd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hnetd/Makefile b/hnetd/Makefile
index df9e950..0e1a921 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hnetd
-PKG_SOURCE_VERSION:=d802317b77b02af7b5a6531d2eba1d2b790cac9a
-PKG_VERSION:=2015-09-15-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=a67835f479ca9d756128c3554e8d4c21feb03b1f
+PKG_VERSION:=2015-09-29-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git

From 441e5377330a7d9247ba54eff6d2871db033fdd7 Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Tue, 29 Sep 2015 12:09:08 +0300
Subject: [PATCH 168/368] miniupnpd: Bump to latest.

---
 miniupnpd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index 1822926..de3f006 100644
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
-PKG_VERSION:=1.9.20150609
+PKG_VERSION:=1.9.20150922
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=01ee891286683891240a29b7272d790e
+PKG_MD5SUM:=b25f163d2a5e7adf25b15e1935032332
 
 PKG_MAINTAINER:=Markus Stenberg <fingon@iki.fi>
 PKG_LICENSE:=BSD-3-Clause

From 5a56f9451f82207410f6b1a99bf097e6677e5354 Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Tue, 29 Sep 2015 13:11:01 +0300
Subject: [PATCH 169/368] ohybridproxy: Added zonestitcher sub-package.

Zonestitcher stitches multiple DNS zones into one, dynamically.
(e.g. query to A -> query B, C -> rewrite response back to A)
---
 ohybridproxy/Makefile | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/ohybridproxy/Makefile b/ohybridproxy/Makefile
index 1d96804..fd99c3e 100644
--- a/ohybridproxy/Makefile
+++ b/ohybridproxy/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ohybridproxy
-PKG_SOURCE_VERSION:=f2ba152799c481471ddc0213b3f98b1c143d97a3
-PKG_VERSION:=2015-01-12-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=b14767d48225aad9ea56ff3e5d6883550e0cf249
+PKG_VERSION:=2015-09-29-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
@@ -51,3 +51,24 @@ define Package/ohybridproxy/install
 endef
 
 $(eval $(call BuildPackage,ohybridproxy))
+
+define Package/zonestitcher
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=IP Addresses and Names
+  TITLE:=dynamically combine multiple DNS zones into one
+  URL:=https://github.com/sbyx/ohybridproxy
+  DEPENDS+=+libubox
+endef
+
+define Package/zonestitcher/description
+ This package provides a statically configured daemon for translating DNS
+ requests to Multicast DNS and back again.
+endef
+
+define Package/zonestitcher/install
+	$(INSTALL_DIR) $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/zonestitcher $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,zonestitcher))

From f4b5a5c6084ca327c54a339938854cc84100580a Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Tue, 29 Sep 2015 13:11:48 +0300
Subject: [PATCH 170/368] hnetd: Depend on zonestitcher (the scripts supported
 it already).

---
 hnetd/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hnetd/Makefile b/hnetd/Makefile
index 0e1a921..89953f4 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -54,7 +54,7 @@ define Package/hnet-full
   # Routing
   DEPENDS+=+babeld
   # Service discovery
-  DEPENDS+=+ohybridproxy
+  DEPENDS+=+ohybridproxy +zonestitcher
   # Distributed PCP support
   DEPENDS+=+miniupnpd +minimalist-pcproxy
 endef
@@ -68,7 +68,7 @@ define Package/hnet-full-secure
   # Routing
   DEPENDS+=+babeld
   # Service discovery
-  DEPENDS+=+ohybridproxy
+  DEPENDS+=+ohybridproxy +zonestitcher
   # Distributed PCP support
   DEPENDS+=+miniupnpd +minimalist-pcproxy
 endef
@@ -82,7 +82,7 @@ define Package/hnet-full-l2tp
   # Routing
   DEPENDS+=+babeld
   # Service discovery
-  DEPENDS+=+ohybridproxy
+  DEPENDS+=+ohybridproxy +zonestitcher
   # Distributed PCP support
   DEPENDS+=+miniupnpd +minimalist-pcproxy
 endef

From 44c37a848292ac8edfe4268f88ee869c168e0bfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
Date: Tue, 29 Sep 2015 16:23:51 +0200
Subject: [PATCH 171/368] bird: update to v1.5.0, add myself as maintaner
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 bird/Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bird/Makefile b/bird/Makefile
index 5f8200c..65f02d9 100644
--- a/bird/Makefile
+++ b/bird/Makefile
@@ -7,13 +7,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bird
-PKG_VERSION:=1.4.5
-PKG_RELEASE:=2
+PKG_VERSION:=1.5.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird
-PKG_MD5SUM:=a8e5e0a9129ce30fe6102c593bafb763
+PKG_MD5SUM:=330bde6372afa106abfe5a9737e471c1
 PKG_BUILD_DEPENDS:=libncurses libreadline
+PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
+
 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk

From 57b8c8726a481e86ab9f8a88f8fe6b27a03c3f2d Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Fri, 9 Oct 2015 16:53:21 +0200
Subject: [PATCH 172/368] cjdns: update source, bump version

---
 cjdns/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cjdns/Makefile b/cjdns/Makefile
index 36772cd..9acc3cc 100644
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -18,11 +18,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cjdns
 PKG_VERSION:=0.16
-PKG_RELEASE:=15
+PKG_RELEASE:=16
 
 PKG_SOURCE_URL:=https://github.com/hyperboria/cjdns.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=951581191997db0188b56d8b21c5216f7e6e2ee1
+PKG_SOURCE_VERSION:=b2484c8c1a695a103db9e75b7b4445252ff053d6
 PKG_LICENSE:=GPL-3.0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)

From 9b33760b99f87ea3ee472dbbdbd84d7b31304d90 Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Mon, 12 Oct 2015 18:30:49 +0200
Subject: [PATCH 173/368] [bmx7] update and isolated bmx7_tun plugin

---
 bmx7/Makefile              | 37 ++++++++++++++++++++++++++++++-------
 bmx7/files/etc/config/bmx6 | 19 +++++++++++++------
 2 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/bmx7/Makefile b/bmx7/Makefile
index bd88599..d402dfd 100644
--- a/bmx7/Makefile
+++ b/bmx7/Makefile
@@ -28,12 +28,12 @@ PKG_NAME:=bmx7
 
 PKG_SOURCE_PROTO:=git
 
+#PKG_SOURCE_URL:=file:///usr/src/bmx6/bmx6.git
 #PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
 PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
-#PKG_SOURCE_URL:=file:///home/neumann/bmx6/bmx6.git
 
-PKG_REV:=4b21205c6873190b8e09e1dc3a4bd343b90ae174
-PKG_VERSION:=r2015091124
+PKG_REV:=0ea28331abfca5ebd6fa6788505cfed073ae1005
+PKG_VERSION:=r2015101201
 PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 
@@ -61,7 +61,7 @@ define Package/bmx7/Default
   TITLE:=BMX7 layer 3 routing daemon
   URL:=http://bmx6.net/
   MAINTAINER:=Axel Neumann <neumann@cgws.de>
-  DEPENDS:=+zlib +libpolarssl +kmod-ip6-tunnel +kmod-iptunnel6 +kmod-tun @!bmx6
+  DEPENDS:=+zlib +libpolarssl @!bmx6
 endef
 
 define Package/bmx7/description
@@ -91,16 +91,22 @@ define Package/bmx7-sms
   TITLE:=sms plugin
 endef
 
+define Package/bmx7-tun
+  $(call Package/bmx7/Default)
+  DEPENDS:=bmx7 +kmod-ip6-tunnel +kmod-iptunnel6 +kmod-tun
+  TITLE:=ipip-based tunnel plugin (recommended!)
+endef
+
 #define Package/bmx7-quagga
 #  $(call Package/bmx7/Default)
-#  DEPENDS:=bmx7 +qmp-quagga @BROKEN
+#  DEPENDS:=bmx7 +bmx7-tun +qmp-quagga @BROKEN
 #  TITLE:=bmx7 quagga plugin to redistribute/export routes (needs manet/bmx patched quagga 0.99.21)
 #endef
 
 define Package/bmx7-table
   $(call Package/bmx7/Default)
-  DEPENDS:=bmx7
-  TITLE:=bmx7 table plugin to automatically announce routing-table routes via ip6ip tunnels
+  DEPENDS:=bmx7 +bmx7-tun
+  TITLE:=plugin to announce routes from tables via tunnels
 endef
 
 define Build/Configure
@@ -116,6 +122,17 @@ define Package/bmx7/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bmx6 $(1)/usr/sbin/bmx6
 endef
 
+define Package/bmx7/postinst
+#!/bin/sh
+# # check if we are on real system
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	if [ -f /etc/sysupgrade.conf ] && ! grep bmx6 /etc/sysupgrade.conf; then
+		echo /etc/bmx6 >> /etc/sysupgrade.conf
+        fi
+fi
+endef
+
+
 define Package/bmx7-uci-config/conffiles
 /etc/config/bmx6
 endef
@@ -137,6 +154,11 @@ define Package/bmx7-sms/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_sms/bmx6_sms.so $(1)/usr/lib/bmx6_sms.so
 endef
 
+define Package/bmx7-tun/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_tun/bmx6_tun.so $(1)/usr/lib/bmx6_tun.so
+endef
+
 define Package/bmx7-table/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_table/bmx6_table.so $(1)/usr/lib/bmx6_table.so
@@ -153,3 +175,4 @@ $(eval $(call BuildPackage,bmx7-json))
 $(eval $(call BuildPackage,bmx7-sms))
 #$(eval $(call BuildPackage,bmx7-quagga))
 $(eval $(call BuildPackage,bmx7-table))
+$(eval $(call BuildPackage,bmx7-tun))
diff --git a/bmx7/files/etc/config/bmx6 b/bmx7/files/etc/config/bmx6
index 5f7af9d..26d691c 100644
--- a/bmx7/files/etc/config/bmx6
+++ b/bmx7/files/etc/config/bmx6
@@ -13,8 +13,6 @@ config 'bmx6' 'general'
 #config 'plugin'
 #        option 'plugin' 'bmx6_json.so'
 
-#config 'plugin'
-#        option 'plugin' 'bmx6_table.so'
 
 #config 'plugin'
 #        option 'plugin' 'bmx6_sms.so'
@@ -26,10 +24,19 @@ config 'dev' 'mesh_1'
 config 'dev' 'mesh_2'
         option 'dev' 'wlan0'
 
-config 'tunDev' default
-        option 'tunDev' 'default'
-        option 'tun6Address' '2012:0:0:6666::1/64'
-        option 'tun4Address' '10.66.66.1/24'
+
+
+#config 'plugin'
+#        option 'plugin' 'bmx6_tun.so'
+
+#config 'plugin'
+#        option 'plugin' 'bmx6_table.so'
+
+
+#config 'tunDev' default
+#        option 'tunDev' 'default'
+#        option 'tun6Address' '2012:0:0:6666::1/64'
+#        option 'tun4Address' '10.66.66.1/24'
 
 
 #config 'tunOut'

From 263877ad8dd53e14c9f30c4cbb0e7fc421e5960e Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Wed, 11 Nov 2015 13:02:51 +0100
Subject: [PATCH 174/368] [bmx7] update source

---
 bmx7/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bmx7/Makefile b/bmx7/Makefile
index d402dfd..de0c580 100644
--- a/bmx7/Makefile
+++ b/bmx7/Makefile
@@ -32,8 +32,8 @@ PKG_SOURCE_PROTO:=git
 #PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
 PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 
-PKG_REV:=0ea28331abfca5ebd6fa6788505cfed073ae1005
-PKG_VERSION:=r2015101201
+PKG_REV:=b9f9322f67373402c3dd0212994512882a734f3b
+PKG_VERSION:=r2015111101
 PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 
@@ -65,7 +65,7 @@ define Package/bmx7/Default
 endef
 
 define Package/bmx7/description
-BMX7 layer 3 routing daemon supporting IPv6, and IPv4 over IPv6
+BMX7 routing daemon supporting securely-entrusted IPv6 (and IPv4in6) routing
 endef
 
 define Package/bmx7

From 9cafb0c9dc26d57b3a01e1faba5bd3684f50d910 Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Fri, 11 Dec 2015 13:50:19 +0200
Subject: [PATCH 175/368] ahcpd: Fixed kmod-ipv6 dependency.

---
 ahcpd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ahcpd/Makefile b/ahcpd/Makefile
index d4f8744..96b8475 100644
--- a/ahcpd/Makefile
+++ b/ahcpd/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2007-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -25,7 +25,7 @@ define Package/ahcpd
   TITLE:=Ad-Hoc Configuration Protocol daemon
   URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/ahcp/
   MAINTAINER:=Gabriel Kerneis <gabriel@kerneis.info>
-  DEPENDS:=+kmod-ipv6 +ip +librt
+  DEPENDS:=+@IPV6 +ip +librt
 endef
 
 define Package/ahcpd/description

From a0d7ff3f1a63fbe4ee2b4b79dece00b5710bfcf7 Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Fri, 11 Dec 2015 13:50:38 +0200
Subject: [PATCH 176/368] babeld: Fixed kmod-ipv6 dependency.

---
 babeld/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babeld/Makefile b/babeld/Makefile
index ec1d247..d4b609c 100644
--- a/babeld/Makefile
+++ b/babeld/Makefile
@@ -25,7 +25,7 @@ define Package/babeld
   TITLE:=A loop-free distance-vector routing protocol
   URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/babel/
   MAINTAINER:=Gabriel Kerneis <gabriel@kerneis.info>
-  DEPENDS:=+kmod-ipv6
+  DEPENDS:=+@IPV6
 endef
 
 define Package/babeld/description

From bcaa87776f2eb2eb54675b2dca152d23625089ad Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Fri, 11 Dec 2015 14:05:14 +0200
Subject: [PATCH 177/368] kmod-ipv6 => @IPV6.

---
 alfred/Makefile | 2 +-
 cjdns/Makefile  | 2 +-
 nat46/Makefile  | 4 ++--
 ndppd/Makefile  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/alfred/Makefile b/alfred/Makefile
index 8f49b5a..da4085e 100644
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -28,7 +28,7 @@ define Package/alfred
   SECTION:=net
   CATEGORY:=Network
   TITLE:=A.L.F.R.E.D. - Almighty Lightweight Fact Remote Exchange Daemon
-  DEPENDS:= +libc +kmod-ipv6 +librt \
+  DEPENDS:= +libc +@IPV6 +librt \
 	  +ALFRED_NEEDS_lua:lua \
 	  +ALFRED_NEEDS_libgps:libgps
 endef
diff --git a/cjdns/Makefile b/cjdns/Makefile
index 9acc3cc..824f378 100644
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -38,7 +38,7 @@ define Package/cjdns
 	TITLE:=Encrypted near-zero-conf mesh routing protocol
 	URL:=https://github.com/hyperboria/cjdns
 	MAINTAINER:=Lars Gierth <larsg@systemli.org>
-	DEPENDS:=+kmod-tun +kmod-ipv6 +libnl-tiny +libpthread +librt \
+	DEPENDS:=+kmod-tun +@IPV6 +libnl-tiny +libpthread +librt \
 		+libuci-lua +lua-bencode +dkjson +luasocket +lua-sha2
 endef
 
diff --git a/nat46/Makefile b/nat46/Makefile
index 65b92c2..dbe6e67 100644
--- a/nat46/Makefile
+++ b/nat46/Makefile
@@ -37,11 +37,11 @@ define Package/464xlat
 endef
 
 define KernelPackage/nat46
-  DEPENDS:=+kmod-ipv6
+  DEPENDS:=+@IPV6
   TITLE:=Stateless NAT46 translation kernel module
   SECTION:=kernel
   SUBMENU:=Network Support
-  FILES:=$(PKG_BUILD_DIR)/nat46/modules/nat46.ko 
+  FILES:=$(PKG_BUILD_DIR)/nat46/modules/nat46.ko
   AUTOLOAD:=$(call AutoLoad,33,nat46)
 endef
 
diff --git a/ndppd/Makefile b/ndppd/Makefile
index ebc764c..0d0a44a 100644
--- a/ndppd/Makefile
+++ b/ndppd/Makefile
@@ -32,7 +32,7 @@ define Package/ndppd
   TITLE:=NDP Proxy Daemon
   URL:=http://www.priv.nu/projects/ndppd/
   MAINTAINER:=Gabriel Kerneis <gabriel@kerneis.info>
-  DEPENDS:=+kmod-ipv6 $(CXX_DEPENDS)
+  DEPENDS:=+@IPV6 $(CXX_DEPENDS)
 endef
 
 define Package/ndppd/description

From 5cd413d16a802f0257cf92d0b5772d9b60863a3a Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Sat, 12 Dec 2015 00:25:10 +0200
Subject: [PATCH 178/368] Revert "kmod-ipv6 => @IPV6."

This reverts commit bcaa87776f2eb2eb54675b2dca152d23625089ad.

Caused circular dependencies; reverted for now. (kmod-ipv6 explicit
dependencies _should_ be eliminated though, but this is clearly not
the way.)
---
 alfred/Makefile | 2 +-
 cjdns/Makefile  | 2 +-
 nat46/Makefile  | 4 ++--
 ndppd/Makefile  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/alfred/Makefile b/alfred/Makefile
index da4085e..8f49b5a 100644
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -28,7 +28,7 @@ define Package/alfred
   SECTION:=net
   CATEGORY:=Network
   TITLE:=A.L.F.R.E.D. - Almighty Lightweight Fact Remote Exchange Daemon
-  DEPENDS:= +libc +@IPV6 +librt \
+  DEPENDS:= +libc +kmod-ipv6 +librt \
 	  +ALFRED_NEEDS_lua:lua \
 	  +ALFRED_NEEDS_libgps:libgps
 endef
diff --git a/cjdns/Makefile b/cjdns/Makefile
index 824f378..9acc3cc 100644
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -38,7 +38,7 @@ define Package/cjdns
 	TITLE:=Encrypted near-zero-conf mesh routing protocol
 	URL:=https://github.com/hyperboria/cjdns
 	MAINTAINER:=Lars Gierth <larsg@systemli.org>
-	DEPENDS:=+kmod-tun +@IPV6 +libnl-tiny +libpthread +librt \
+	DEPENDS:=+kmod-tun +kmod-ipv6 +libnl-tiny +libpthread +librt \
 		+libuci-lua +lua-bencode +dkjson +luasocket +lua-sha2
 endef
 
diff --git a/nat46/Makefile b/nat46/Makefile
index dbe6e67..65b92c2 100644
--- a/nat46/Makefile
+++ b/nat46/Makefile
@@ -37,11 +37,11 @@ define Package/464xlat
 endef
 
 define KernelPackage/nat46
-  DEPENDS:=+@IPV6
+  DEPENDS:=+kmod-ipv6
   TITLE:=Stateless NAT46 translation kernel module
   SECTION:=kernel
   SUBMENU:=Network Support
-  FILES:=$(PKG_BUILD_DIR)/nat46/modules/nat46.ko
+  FILES:=$(PKG_BUILD_DIR)/nat46/modules/nat46.ko 
   AUTOLOAD:=$(call AutoLoad,33,nat46)
 endef
 
diff --git a/ndppd/Makefile b/ndppd/Makefile
index 0d0a44a..ebc764c 100644
--- a/ndppd/Makefile
+++ b/ndppd/Makefile
@@ -32,7 +32,7 @@ define Package/ndppd
   TITLE:=NDP Proxy Daemon
   URL:=http://www.priv.nu/projects/ndppd/
   MAINTAINER:=Gabriel Kerneis <gabriel@kerneis.info>
-  DEPENDS:=+@IPV6 $(CXX_DEPENDS)
+  DEPENDS:=+kmod-ipv6 $(CXX_DEPENDS)
 endef
 
 define Package/ndppd/description

From e25839ae48cfdb44015be5f47d409182cea8c7d2 Mon Sep 17 00:00:00 2001
From: Simon Wunderlich <sw@simonwunderlich.de>
Date: Wed, 16 Dec 2015 18:46:28 +0100
Subject: [PATCH 179/368] alfred: bump version to 2015.2

From the CHANGELOG:

 * mention libcap in the README
 * Fix typos

Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
 alfred/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/alfred/Makefile b/alfred/Makefile
index 8f49b5a..504fddd 100644
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -11,9 +11,9 @@ include $(TOPDIR)/rules.mk
 # The latest alfred git hash in PKG_REV can be obtained from http://git.open-mesh.org/alfred.git
 #
 PKG_NAME:=alfred
-PKG_VERSION:=2015.1
+PKG_VERSION:=2015.2
 PKG_RELEASE:=0
-PKG_MD5SUM:=fcce70cd8da764ee91c8cd2cbfa14362
+PKG_MD5SUM:=e50bd17753f824fa24d3914259ab0395
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From 939123f5f4f521e8c6e65d54da055467a497a510 Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Mon, 21 Dec 2015 10:02:13 +0200
Subject: [PATCH 180/368] miniupnpd: Bump to 1.9.20151212.

---
 miniupnpd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index de3f006..1000929 100644
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
-PKG_VERSION:=1.9.20150922
+PKG_VERSION:=1.9.20151212
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=b25f163d2a5e7adf25b15e1935032332
+PKG_MD5SUM:=86465b35f711ca9982d48b34c094033a
 
 PKG_MAINTAINER:=Markus Stenberg <fingon@iki.fi>
 PKG_LICENSE:=BSD-3-Clause

From 0db26614ecdc60dfed4403374bc9e95586dd3d17 Mon Sep 17 00:00:00 2001
From: Marek Lindner <mareklindner@neomailbox.ch>
Date: Mon, 28 Dec 2015 07:50:16 +0800
Subject: [PATCH 181/368] batman-adv: upgrade package to latest release 2015.2

Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
 batman-adv/Makefile                           |   4 +-
 ...-access-unregistered-net_device-obje.patch |  46 --------
 ...ower-layer-needed_-head-tail-room-to.patch | 101 ------------------
 ...emory-leak-on-tt-add-with-invalid-vl.patch |  43 --------
 ...e-unnecessary-braces-for-test_bit-in.patch |  32 ------
 ...e-unnecessary-braces-for-test_bit-in.patch |  32 ------
 ...e-unnecessary-braces-for-test_bit-in.patch |  41 -------
 ...ix-speedy-join-for-DAT-cache-replies.patch |  58 ----------
 ...-avoid-keeping-false-temporary-entry.patch |  51 ---------
 ...ect-local-excess-vlans-in-TT-request.patch |  55 ----------
 10 files changed, 2 insertions(+), 461 deletions(-)
 delete mode 100644 batman-adv/patches/0001-batman-adv-don-t-access-unregistered-net_device-obje.patch
 delete mode 100644 batman-adv/patches/0002-batman-adv-Add-lower-layer-needed_-head-tail-room-to.patch
 delete mode 100644 batman-adv/patches/0003-batman-adv-Fix-memory-leak-on-tt-add-with-invalid-vl.patch
 delete mode 100644 batman-adv/patches/0004-batman-adv-Remove-unnecessary-braces-for-test_bit-in.patch
 delete mode 100644 batman-adv/patches/0005-batman-adv-Remove-unnecessary-braces-for-test_bit-in.patch
 delete mode 100644 batman-adv/patches/0006-batman-adv-Remove-unnecessary-braces-for-test_bit-in.patch
 delete mode 100644 batman-adv/patches/0007-batman-adv-fix-speedy-join-for-DAT-cache-replies.patch
 delete mode 100644 batman-adv/patches/0008-batman-adv-avoid-keeping-false-temporary-entry.patch
 delete mode 100644 batman-adv/patches/0009-batman-adv-detect-local-excess-vlans-in-TT-request.patch

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 7e43de4..c7bc9a0 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
 
-PKG_VERSION:=2015.1
+PKG_VERSION:=2015.2
 PKG_RELEASE:=1
-PKG_MD5SUM:=45f98d315b4290dc208e01190193c514
+PKG_MD5SUM:=68af764f9369b81edf19e3a720b6df7a
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
diff --git a/batman-adv/patches/0001-batman-adv-don-t-access-unregistered-net_device-obje.patch b/batman-adv/patches/0001-batman-adv-don-t-access-unregistered-net_device-obje.patch
deleted file mode 100644
index 75da6fb..0000000
--- a/batman-adv/patches/0001-batman-adv-don-t-access-unregistered-net_device-obje.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 958aafba93c7e408237298c5b2c5d7c3e318402c Mon Sep 17 00:00:00 2001
-From: Antonio Quartulli <antonio@meshcoding.com>
-Date: Tue, 4 Aug 2015 22:26:19 +0200
-Subject: [PATCH 1/9] batman-adv: don't access unregistered net_device object
-
-In batadv_hardif_disable_interface() there is a call to
-batadv_softif_destroy_sysfs() which in turns invokes
-unregister_netdevice() on the soft_iface.
-After this point we cannot rely on the soft_iface object
-anymore because it might get free'd by the netdev periodic
-routine at any time.
-
-For this reason the netdev_upper_dev_unlink(.., soft_iface) call
-is moved before the invocation of batadv_softif_destroy_sysfs() so
-that we can be sure that the soft_iface object is still valid.
-
-Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- net/batman-adv/hard-interface.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
-index f4a15d2..0565b20 100644
---- a/net/batman-adv/hard-interface.c
-+++ b/net/batman-adv/hard-interface.c
-@@ -528,6 +528,8 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,
- 	batadv_purge_outstanding_packets(bat_priv, hard_iface);
- 	dev_put(hard_iface->soft_iface);
- 
-+	netdev_upper_dev_unlink(hard_iface->net_dev, hard_iface->soft_iface);
-+
- 	/* nobody uses this interface anymore */
- 	if (!bat_priv->num_ifaces) {
- 		batadv_gw_check_client_stop(bat_priv);
-@@ -536,7 +538,6 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,
- 			batadv_softif_destroy_sysfs(hard_iface->soft_iface);
- 	}
- 
--	netdev_upper_dev_unlink(hard_iface->net_dev, hard_iface->soft_iface);
- 	hard_iface->soft_iface = NULL;
- 	batadv_hardif_free_ref(hard_iface);
- 
--- 
-2.5.0
-
diff --git a/batman-adv/patches/0002-batman-adv-Add-lower-layer-needed_-head-tail-room-to.patch b/batman-adv/patches/0002-batman-adv-Add-lower-layer-needed_-head-tail-room-to.patch
deleted file mode 100644
index 681c4b2..0000000
--- a/batman-adv/patches/0002-batman-adv-Add-lower-layer-needed_-head-tail-room-to.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From e2b4301f4e2d3695ed2024880d2295223cb2f857 Mon Sep 17 00:00:00 2001
-From: Sven Eckelmann <sven@narfation.org>
-Date: Fri, 7 Aug 2015 19:28:42 +0200
-Subject: [PATCH 2/9] batman-adv: Add lower layer needed_(head|tail)room to own
- ones
-
-The maximum of hard_header_len and maximum of all needed_(head|tail)room of
-all slave interfaces of a batman-adv device must be used to define the
-batman-adv device needed_(head|tail)room. This is required to avoid too
-small buffer problems when these slave devices try to send the encapsulated
-packet in a tx path without the possibility to resize the skbuff.
-
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- net/batman-adv/hard-interface.c | 41 +++++++++++++++++++++++++++++++++++++++++
- net/batman-adv/soft-interface.c |  2 --
- 2 files changed, 41 insertions(+), 2 deletions(-)
-
-diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
-index 0565b20..f11345e 100644
---- a/net/batman-adv/hard-interface.c
-+++ b/net/batman-adv/hard-interface.c
-@@ -252,6 +252,44 @@ static void batadv_check_known_mac_addr(const struct net_device *net_dev)
- 	rcu_read_unlock();
- }
- 
-+/**
-+ * batadv_hardif_recalc_extra_skbroom() - Recalculate skbuff extra head/tailroom
-+ * @soft_iface: netdev struct of the mesh interface
-+ */
-+static void batadv_hardif_recalc_extra_skbroom(struct net_device *soft_iface)
-+{
-+	const struct batadv_hard_iface *hard_iface;
-+	unsigned short lower_header_len = ETH_HLEN;
-+	unsigned short lower_headroom = 0;
-+	unsigned short lower_tailroom = 0;
-+	unsigned short needed_headroom;
-+
-+	rcu_read_lock();
-+	list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
-+		if (hard_iface->if_status == BATADV_IF_NOT_IN_USE)
-+			continue;
-+
-+		if (hard_iface->soft_iface != soft_iface)
-+			continue;
-+
-+		lower_header_len = max_t(unsigned short, lower_header_len,
-+					 hard_iface->net_dev->hard_header_len);
-+
-+		lower_headroom = max_t(unsigned short, lower_headroom,
-+				       hard_iface->net_dev->needed_headroom);
-+
-+		lower_tailroom = max_t(unsigned short, lower_tailroom,
-+				       hard_iface->net_dev->needed_tailroom);
-+	}
-+	rcu_read_unlock();
-+
-+	needed_headroom = lower_headroom + (lower_header_len - ETH_HLEN);
-+	needed_headroom += batadv_max_header_len();
-+
-+	soft_iface->needed_headroom = needed_headroom;
-+	soft_iface->needed_tailroom = lower_tailroom;
-+}
-+
- int batadv_hardif_min_mtu(struct net_device *soft_iface)
- {
- 	struct batadv_priv *bat_priv = netdev_priv(soft_iface);
-@@ -474,6 +512,8 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
- 			   "Not using interface %s (retrying later): interface not active\n",
- 			   hard_iface->net_dev->name);
- 
-+	batadv_hardif_recalc_extra_skbroom(soft_iface);
-+
- 	/* begin scheduling originator messages on that interface */
- 	batadv_schedule_bat_ogm(hard_iface);
- 
-@@ -529,6 +569,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,
- 	dev_put(hard_iface->soft_iface);
- 
- 	netdev_upper_dev_unlink(hard_iface->net_dev, hard_iface->soft_iface);
-+	batadv_hardif_recalc_extra_skbroom(hard_iface->soft_iface);
- 
- 	/* nobody uses this interface anymore */
- 	if (!bat_priv->num_ifaces) {
-diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
-index 51cda3a..10f6448 100644
---- a/net/batman-adv/soft-interface.c
-+++ b/net/batman-adv/soft-interface.c
-@@ -947,8 +947,6 @@ static void batadv_softif_init_early(struct net_device *dev)
- 	 * have not been initialized yet
- 	 */
- 	dev->mtu = ETH_DATA_LEN;
--	/* reserve more space in the skbuff for our header */
--	dev->hard_header_len = batadv_max_header_len();
- 
- 	/* generate random address */
- 	eth_hw_addr_random(dev);
--- 
-2.5.0
-
diff --git a/batman-adv/patches/0003-batman-adv-Fix-memory-leak-on-tt-add-with-invalid-vl.patch b/batman-adv/patches/0003-batman-adv-Fix-memory-leak-on-tt-add-with-invalid-vl.patch
deleted file mode 100644
index 8fc5f64..0000000
--- a/batman-adv/patches/0003-batman-adv-Fix-memory-leak-on-tt-add-with-invalid-vl.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From dba67bc80fbfe6a28fc3c1141cca1c556ab7e499 Mon Sep 17 00:00:00 2001
-From: Sven Eckelmann <sven@narfation.org>
-Date: Tue, 18 Aug 2015 13:37:01 +0200
-Subject: [PATCH 3/9] batman-adv: Fix memory leak on tt add with invalid vlan
-
-The object tt_local is allocated with kmalloc and not initialized when the
-function batadv_tt_local_add checks for the vlan. But this function can
-only cleanup the object when the (not yet initialized) reference counter of
-the object is 1. This is unlikely and thus the object would leak when the
-vlan could not be found.
-
-Instead the uninitialized object tt_local has to be freed manually and the
-pointer has to set to NULL to avoid calling the function which would try to
-decrement the reference counter of the not existing object.
-
-CID: 1316518
-Fixes: 354136bcc3c4 ("batman-adv: fix kernel crash due to missing NULL checks")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- net/batman-adv/translation-table.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
-index 7986ec5..39283ff 100644
---- a/net/batman-adv/translation-table.c
-+++ b/net/batman-adv/translation-table.c
-@@ -595,8 +595,11 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr,
- 	/* increase the refcounter of the related vlan */
- 	vlan = batadv_softif_vlan_get(bat_priv, vid);
- 	if (WARN(!vlan, "adding TT local entry %pM to non-existent VLAN %d",
--		 addr, BATADV_PRINT_VID(vid)))
-+		 addr, BATADV_PRINT_VID(vid))) {
-+		kfree(tt_local);
-+		tt_local = NULL;
- 		goto out;
-+	}
- 
- 	batadv_dbg(BATADV_DBG_TT, bat_priv,
- 		   "Creating new local tt entry: %pM (vid: %d, ttvn: %d)\n",
--- 
-2.5.0
-
diff --git a/batman-adv/patches/0004-batman-adv-Remove-unnecessary-braces-for-test_bit-in.patch b/batman-adv/patches/0004-batman-adv-Remove-unnecessary-braces-for-test_bit-in.patch
deleted file mode 100644
index afe66a6..0000000
--- a/batman-adv/patches/0004-batman-adv-Remove-unnecessary-braces-for-test_bit-in.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From af3558688698479a56034f0fcbca164be2052aa8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
-Date: Fri, 14 Aug 2015 17:23:48 +0200
-Subject: [PATCH 4/9] batman-adv: Remove unnecessary braces for test_bit() in
- DAT
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes: de466678 ("batman-adv: Fix broken DAT capability check")
-Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- net/batman-adv/distributed-arp-table.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
-index 1caf7d2..63243a3 100644
---- a/net/batman-adv/distributed-arp-table.c
-+++ b/net/batman-adv/distributed-arp-table.c
-@@ -453,7 +453,7 @@ static bool batadv_is_orig_node_eligible(struct batadv_dat_candidate *res,
- 	int j;
- 
- 	/* check if orig node candidate is running DAT */
--	if (!(test_bit(BATADV_ORIG_CAPA_HAS_DAT, &candidate->capabilities)))
-+	if (!test_bit(BATADV_ORIG_CAPA_HAS_DAT, &candidate->capabilities))
- 		goto out;
- 
- 	/* Check if this node has already been selected... */
--- 
-2.5.0
-
diff --git a/batman-adv/patches/0005-batman-adv-Remove-unnecessary-braces-for-test_bit-in.patch b/batman-adv/patches/0005-batman-adv-Remove-unnecessary-braces-for-test_bit-in.patch
deleted file mode 100644
index eecbdcd..0000000
--- a/batman-adv/patches/0005-batman-adv-Remove-unnecessary-braces-for-test_bit-in.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 5abaf07b4c24ab2d7bd9b0c0de946b1ee5e946ff Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
-Date: Fri, 14 Aug 2015 17:23:49 +0200
-Subject: [PATCH 5/9] batman-adv: Remove unnecessary braces for test_bit() in
- NC
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes: dfb27e75 ("batman-adv: Fix broken NC capability check")
-Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- net/batman-adv/network-coding.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c
-index 55a0b28..1a1f7e6 100644
---- a/net/batman-adv/network-coding.c
-+++ b/net/batman-adv/network-coding.c
-@@ -894,7 +894,7 @@ void batadv_nc_update_nc_node(struct batadv_priv *bat_priv,
- 		goto out;
- 
- 	/* check if orig node is network coding enabled */
--	if (!(test_bit(BATADV_ORIG_CAPA_HAS_NC, &orig_node->capabilities)))
-+	if (!test_bit(BATADV_ORIG_CAPA_HAS_NC, &orig_node->capabilities))
- 		goto out;
- 
- 	/* accept ogms from 'good' neighbors and single hop neighbors */
--- 
-2.5.0
-
diff --git a/batman-adv/patches/0006-batman-adv-Remove-unnecessary-braces-for-test_bit-in.patch b/batman-adv/patches/0006-batman-adv-Remove-unnecessary-braces-for-test_bit-in.patch
deleted file mode 100644
index a4b4292..0000000
--- a/batman-adv/patches/0006-batman-adv-Remove-unnecessary-braces-for-test_bit-in.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From d126204d0471e0972142697f36364443a0bbc9cc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
-Date: Fri, 14 Aug 2015 17:23:50 +0200
-Subject: [PATCH 6/9] batman-adv: Remove unnecessary braces for test_bit() in
- MCAST
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes: 1798ad3f ("batman-adv: Fix broken MCAST capability check")
-Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- net/batman-adv/multicast.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c
-index 8bdd69f..4541f08 100644
---- a/net/batman-adv/multicast.c
-+++ b/net/batman-adv/multicast.c
-@@ -740,7 +740,7 @@ static void batadv_mcast_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
- 	 * is a completely new orig_node no need to decrease the counter.
- 	 */
- 	if (orig_mcast_enabled &&
--	    !(test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities))) {
-+	    !test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities)) {
- 		if (orig_initialized)
- 			atomic_dec(&bat_priv->mcast.num_disabled);
- 		set_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities);
-@@ -798,7 +798,7 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig)
- 
- 	spin_lock_bh(&orig->mcast_handler_lock);
- 
--	if (!(test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities)) &&
-+	if (!test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities) &&
- 	    test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capa_initialized))
- 		atomic_dec(&bat_priv->mcast.num_disabled);
- 
--- 
-2.5.0
-
diff --git a/batman-adv/patches/0007-batman-adv-fix-speedy-join-for-DAT-cache-replies.patch b/batman-adv/patches/0007-batman-adv-fix-speedy-join-for-DAT-cache-replies.patch
deleted file mode 100644
index d88508a..0000000
--- a/batman-adv/patches/0007-batman-adv-fix-speedy-join-for-DAT-cache-replies.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 2decb5f1fef1484f1b7319aaf2f36b5492d8d943 Mon Sep 17 00:00:00 2001
-From: Simon Wunderlich <sw@simonwunderlich.de>
-Date: Wed, 2 Sep 2015 20:09:54 +0200
-Subject: [PATCH 7/9] batman-adv: fix speedy join for DAT cache replies
-
-DAT Cache replies are answered on behalf of other clients which are not
-connected to the answering originator. Therefore, we shouldn't add these
-clients to the answering originators TT table through speed join to
-avoid bogus entries.
-
-Reported-by: Alessandro Bolletta <alessandro@mediaspot.net>
-Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
-Acked-by: Antonio Quartulli <antonio@meshcoding.com>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- net/batman-adv/routing.c | 19 +++++++++++++++----
- 1 file changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
-index c360c0c..96b5daa 100644
---- a/net/batman-adv/routing.c
-+++ b/net/batman-adv/routing.c
-@@ -836,6 +836,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,
- 	uint8_t *orig_addr;
- 	struct batadv_orig_node *orig_node = NULL;
- 	int check, hdr_size = sizeof(*unicast_packet);
-+	enum batadv_subtype subtype;
- 	bool is4addr;
- 
- 	unicast_packet = (struct batadv_unicast_packet *)skb->data;
-@@ -863,10 +864,20 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,
- 	/* packet for me */
- 	if (batadv_is_my_mac(bat_priv, unicast_packet->dest)) {
- 		if (is4addr) {
--			batadv_dat_inc_counter(bat_priv,
--					       unicast_4addr_packet->subtype);
--			orig_addr = unicast_4addr_packet->src;
--			orig_node = batadv_orig_hash_find(bat_priv, orig_addr);
-+			subtype = unicast_4addr_packet->subtype;
-+			batadv_dat_inc_counter(bat_priv, subtype);
-+
-+			/* Only payload data should be considered for speedy
-+			 * join. For example, DAT also uses unicast 4addr
-+			 * types, but those packets should not be considered
-+			 * for speedy join, since the clients do not actually
-+			 * reside at the sending originator.
-+			 */
-+			if (subtype == BATADV_P_DATA) {
-+				orig_addr = unicast_4addr_packet->src;
-+				orig_node = batadv_orig_hash_find(bat_priv,
-+								  orig_addr);
-+			}
- 		}
- 
- 		if (batadv_dat_snoop_incoming_arp_request(bat_priv, skb,
--- 
-2.5.0
-
diff --git a/batman-adv/patches/0008-batman-adv-avoid-keeping-false-temporary-entry.patch b/batman-adv/patches/0008-batman-adv-avoid-keeping-false-temporary-entry.patch
deleted file mode 100644
index 0e7dbab..0000000
--- a/batman-adv/patches/0008-batman-adv-avoid-keeping-false-temporary-entry.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 4a73d7438dfb60c7ac82758875292bc14f363b45 Mon Sep 17 00:00:00 2001
-From: Simon Wunderlich <sw@simonwunderlich.de>
-Date: Wed, 2 Sep 2015 20:09:55 +0200
-Subject: [PATCH 8/9] batman-adv: avoid keeping false temporary entry
-
-In the case when a temporary entry is added first and a proper tt entry
-is added after that, the temporary tt entry is kept in the orig list.
-However the temporary flag is removed at this point, and therefore the
-purge function can not find this temporary entry anymore.
-
-Therefore, remove the previous temp entry before adding the new proper
-one.
-
-This case can happen if a client behind a given originator moves before
-the TT announcement is sent out. Other than that, this case can also be
-created by bogus or malicious payload frames for VLANs which are not
-existent on the sending originator.
-
-Reported-by: Alessandro Bolletta <alessandro@mediaspot.net>
-Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
-Acked-by: Antonio Quartulli <antonio@meshcoding.com>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- net/batman-adv/translation-table.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
-index 39283ff..9ac1a46 100644
---- a/net/batman-adv/translation-table.c
-+++ b/net/batman-adv/translation-table.c
-@@ -1419,9 +1419,15 @@ static bool batadv_tt_global_add(struct batadv_priv *bat_priv,
- 		}
- 
- 		/* if the client was temporary added before receiving the first
--		 * OGM announcing it, we have to clear the TEMP flag
-+		 * OGM announcing it, we have to clear the TEMP flag. Also,
-+		 * remove the previous temporary orig node and re-add it
-+		 * if required. If the orig entry changed, the new one which
-+		 * is a non-temporary entry is preferred.
- 		 */
--		common->flags &= ~BATADV_TT_CLIENT_TEMP;
-+		if (common->flags & BATADV_TT_CLIENT_TEMP) {
-+			batadv_tt_global_del_orig_list(tt_global_entry);
-+			common->flags &= ~BATADV_TT_CLIENT_TEMP;
-+		}
- 
- 		/* the change can carry possible "attribute" flags like the
- 		 * TT_CLIENT_WIFI, therefore they have to be copied in the
--- 
-2.5.0
-
diff --git a/batman-adv/patches/0009-batman-adv-detect-local-excess-vlans-in-TT-request.patch b/batman-adv/patches/0009-batman-adv-detect-local-excess-vlans-in-TT-request.patch
deleted file mode 100644
index 66e0dcf..0000000
--- a/batman-adv/patches/0009-batman-adv-detect-local-excess-vlans-in-TT-request.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 2dd1d9f06ac1208b1921aa90d479c3940bc70b4f Mon Sep 17 00:00:00 2001
-From: Simon Wunderlich <sw@simonwunderlich.de>
-Date: Wed, 2 Sep 2015 20:09:56 +0200
-Subject: [PATCH 9/9] batman-adv: detect local excess vlans in TT request
-
-If the local representation of the global TT table of one originator has
-more VLAN entries than the respective TT update, there is some
-inconsistency present. By detecting and reporting this inconsistency,
-the global table gets updated and the excess VLAN will get removed in
-the process.
-
-Reported-by: Alessandro Bolletta <alessandro@mediaspot.net>
-Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
-Acked-by: Antonio Quartulli <antonio@meshcoding.com>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- net/batman-adv/translation-table.c | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
-index 9ac1a46..7e4657e 100644
---- a/net/batman-adv/translation-table.c
-+++ b/net/batman-adv/translation-table.c
-@@ -2394,8 +2394,8 @@ static bool batadv_tt_global_check_crc(struct batadv_orig_node *orig_node,
- {
- 	struct batadv_tvlv_tt_vlan_data *tt_vlan_tmp;
- 	struct batadv_orig_node_vlan *vlan;
-+	int i, orig_num_vlan;
- 	uint32_t crc;
--	int i;
- 
- 	/* check if each received CRC matches the locally stored one */
- 	for (i = 0; i < num_vlan; i++) {
-@@ -2421,6 +2421,18 @@ static bool batadv_tt_global_check_crc(struct batadv_orig_node *orig_node,
- 			return false;
- 	}
- 
-+	/* check if any excess VLANs exist locally for the originator
-+	 * which are not mentioned in the TVLV from the originator.
-+	 */
-+	rcu_read_lock();
-+	orig_num_vlan = 0;
-+	list_for_each_entry_rcu(vlan, &orig_node->vlan_list, list)
-+		orig_num_vlan++;
-+	rcu_read_unlock();
-+
-+	if (orig_num_vlan > num_vlan)
-+		return false;
-+
- 	return true;
- }
- 
--- 
-2.5.0
-

From f8380b4136b2b030b3f7df233cb603214a953399 Mon Sep 17 00:00:00 2001
From: Marek Lindner <mareklindner@neomailbox.ch>
Date: Mon, 28 Dec 2015 08:20:47 +0800
Subject: [PATCH 182/368] batctl: upgrade package to latest release 2015.2

Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
 batctl/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/batctl/Makefile b/batctl/Makefile
index 8cf2d17..f6a0bc3 100644
--- a/batctl/Makefile
+++ b/batctl/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batctl
 
-PKG_VERSION:=2015.1
+PKG_VERSION:=2015.2
 PKG_RELEASE:=1
-PKG_MD5SUM:=3db00af0b3cf55136babe06aa666e15f
+PKG_MD5SUM:=5d93537cad47d7f7b047de85485befd9
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From dc39b5245e793b19256ca9a07540e7c415cf3f4c Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Thu, 14 Jan 2016 01:45:38 +0100
Subject: [PATCH 183/368] cjdns: update source

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 cjdns/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cjdns/Makefile b/cjdns/Makefile
index 9acc3cc..7cda33b 100644
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -17,12 +17,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cjdns
-PKG_VERSION:=0.16
-PKG_RELEASE:=16
+PKG_VERSION:=0.17
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=https://github.com/hyperboria/cjdns.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b2484c8c1a695a103db9e75b7b4445252ff053d6
+PKG_SOURCE_VERSION:=1cf53a812a9b19e5ce883c16d40ac183f61d43f6
 PKG_LICENSE:=GPL-3.0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)

From 72276f4ca6303ca590a51400c0e5d7ede699dc09 Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Thu, 14 Jan 2016 01:48:37 +0100
Subject: [PATCH 184/368] cjdns: depend on @IPV6 instead of kmod-ipv6

kmod-ipv6 was retired as IPv6 support is now built-in unless
explicitely disabled.
@IPV6 refers to CONFIG_IPV6 from menuconfig which is enabled by
default.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 cjdns/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cjdns/Makefile b/cjdns/Makefile
index 7cda33b..6f7a6af 100644
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -38,7 +38,7 @@ define Package/cjdns
 	TITLE:=Encrypted near-zero-conf mesh routing protocol
 	URL:=https://github.com/hyperboria/cjdns
 	MAINTAINER:=Lars Gierth <larsg@systemli.org>
-	DEPENDS:=+kmod-tun +kmod-ipv6 +libnl-tiny +libpthread +librt \
+	DEPENDS:=@IPV6 +kmod-tun +libnl-tiny +libpthread +librt \
 		+libuci-lua +lua-bencode +dkjson +luasocket +lua-sha2
 endef
 

From 3d25d7793535aa524fd3f09a71656fea30c3b73f Mon Sep 17 00:00:00 2001
From: Bastian Bittorf <bittorf@bluebottle.com>
Date: Thu, 14 Jan 2016 11:28:24 +0100
Subject: [PATCH 185/368] olsrd: convert Makefile for using 'git'

For easier fiddling with other versions, switch to git
This way one don't need to wait for a release-tarball.

Signed-off-by: Bastian Bittorf <bittorf@bluebottle.com>
---
 olsrd/Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/olsrd/Makefile b/olsrd/Makefile
index 26b7de5..16cf474 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -9,12 +9,15 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
 PKG_VERSION:=0.9.0.3
-PKG_RELEASE:=1
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.olsr.org/releases/0.9
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=http://olsr.org/git/olsrd.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=v0.9.0.3
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_MD5SUM:=
 
-PKG_MD5SUM:=fa5cf15c29c7ebd9b8425267676c7865
 PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=BSD-3-Clause
 

From 54db126c01fd06630d70fbafe7dc46ec645d19db Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Mon, 18 Jan 2016 13:36:10 +0100
Subject: [PATCH 186/368] bmx7: update source (fixing device memory leaks)

---
 bmx7/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bmx7/Makefile b/bmx7/Makefile
index de0c580..82006ee 100644
--- a/bmx7/Makefile
+++ b/bmx7/Makefile
@@ -32,8 +32,8 @@ PKG_SOURCE_PROTO:=git
 #PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
 PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 
-PKG_REV:=b9f9322f67373402c3dd0212994512882a734f3b
-PKG_VERSION:=r2015111101
+PKG_REV:=d0841d4bf42ae406cd5319a857dc294badb1ac8d
+PKG_VERSION:=r2016011801
 PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 

From 0e7b291a54f6f23e30ac5ceb1f43666af80408f1 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Tue, 19 Jan 2016 17:42:46 +0100
Subject: [PATCH 187/368] batman-adv: Switch to HTTPS version of links

open-mesh.org and its subdomains can only be accessed via HTTPS. HTTP-only
requests are currently redirected automatically to HTTPS but references
to it should be only https.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
 batman-adv/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index c7bc9a0..967a17b 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -15,7 +15,7 @@ PKG_RELEASE:=1
 PKG_MD5SUM:=68af764f9369b81edf19e3a720b6df7a
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
+PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
@@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 define KernelPackage/batman-adv
-  URL:=http://www.open-mesh.org/
+  URL:=https://www.open-mesh.org/
   MAINTAINER:=Marek Lindner <mareklindner@neomailbox.ch>
   SUBMENU:=Network Support
   DEPENDS:=+KMOD_BATMAN_ADV_BLA:kmod-lib-crc16 +kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c

From fbc1b1898fa4cb169a5b19dd2251def01b5528c6 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Tue, 19 Jan 2016 17:43:26 +0100
Subject: [PATCH 188/368] batctl: Switch to HTTPS version of links

open-mesh.org and its subdomains can only be accessed via HTTPS. HTTP-only
requests are currently redirected automatically to HTTPS but references
to it should be only https.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
 batctl/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/batctl/Makefile b/batctl/Makefile
index f6a0bc3..ca35d56 100644
--- a/batctl/Makefile
+++ b/batctl/Makefile
@@ -14,7 +14,7 @@ PKG_RELEASE:=1
 PKG_MD5SUM:=5d93537cad47d7f7b047de85485befd9
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
+PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
@@ -22,7 +22,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
 include $(INCLUDE_DIR)/package.mk
 
 define Package/batctl
-  URL:=http://www.open-mesh.org/
+  URL:=https://www.open-mesh.org/
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=+kmod-batman-adv +libnl-tiny +libc

From 53a921be2b70cc79d16ad63a2f4bdadb61b429f9 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@open-mesh.com>
Date: Tue, 19 Jan 2016 17:45:50 +0100
Subject: [PATCH 189/368] batman-adv: upgrade package to latest release 2016.0

Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
---
 batman-adv/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 967a17b..1eb6bbe 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
 
-PKG_VERSION:=2015.2
+PKG_VERSION:=2016.0
 PKG_RELEASE:=1
-PKG_MD5SUM:=68af764f9369b81edf19e3a720b6df7a
+PKG_MD5SUM:=5ab2b29a386d02c16019e469d3981d41
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From 968fcbf389a36a773f80960cdf7da048a42e110f Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@open-mesh.com>
Date: Tue, 19 Jan 2016 17:46:13 +0100
Subject: [PATCH 190/368] batctl: upgrade package to latest release 2016.0

Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
---
 batctl/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/batctl/Makefile b/batctl/Makefile
index ca35d56..9efec3e 100644
--- a/batctl/Makefile
+++ b/batctl/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batctl
 
-PKG_VERSION:=2015.2
+PKG_VERSION:=2016.0
 PKG_RELEASE:=1
-PKG_MD5SUM:=5d93537cad47d7f7b047de85485befd9
+PKG_MD5SUM:=03c9192ec52a01035602706f08b24740
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From 4be7520e9e50ee106a6193a590785e1e2380b64e Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@open-mesh.com>
Date: Tue, 19 Jan 2016 19:22:38 +0100
Subject: [PATCH 191/368] alfred: upgrade package to latest release 2016.0

Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
---
 alfred/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/alfred/Makefile b/alfred/Makefile
index 504fddd..a4742ce 100644
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -11,9 +11,9 @@ include $(TOPDIR)/rules.mk
 # The latest alfred git hash in PKG_REV can be obtained from http://git.open-mesh.org/alfred.git
 #
 PKG_NAME:=alfred
-PKG_VERSION:=2015.2
+PKG_VERSION:=2016.0
 PKG_RELEASE:=0
-PKG_MD5SUM:=e50bd17753f824fa24d3914259ab0395
+PKG_MD5SUM:=d5cc848f57f430a977e2f266d35d99c7
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From 20d0da8538ad110d1aac5985f84af6bf534b5956 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Tue, 19 Jan 2016 17:43:26 +0100
Subject: [PATCH 192/368] alfred: Switch to HTTPS version of links

open-mesh.org and its subdomains can only be accessed via HTTPS. HTTP-only
requests are currently redirected automatically to HTTPS but references
to it should be only https.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 alfred/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/alfred/Makefile b/alfred/Makefile
index a4742ce..76340bb 100644
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 #
-# The latest alfred git hash in PKG_REV can be obtained from http://git.open-mesh.org/alfred.git
+# The latest alfred git hash in PKG_REV can be obtained from https://git.open-mesh.org/alfred.git
 #
 PKG_NAME:=alfred
 PKG_VERSION:=2016.0
@@ -16,7 +16,7 @@ PKG_RELEASE:=0
 PKG_MD5SUM:=d5cc848f57f430a977e2f266d35d99c7
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
+PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
@@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk
 init-y := alfred
 
 define Package/alfred
-  URL:=http://www.open-mesh.org/
+  URL:=https://www.open-mesh.org/
   SECTION:=net
   CATEGORY:=Network
   TITLE:=A.L.F.R.E.D. - Almighty Lightweight Fact Remote Exchange Daemon

From b81ee0aa340ad88869ffeec251f9651e3582c943 Mon Sep 17 00:00:00 2001
From: sayuan <shiao.an.yuan@gmail.com>
Date: Thu, 21 Jan 2016 22:09:24 +0800
Subject: [PATCH 193/368] nodogsplash: fix init script

---
 nodogsplash/files/nodogsplash.init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nodogsplash/files/nodogsplash.init b/nodogsplash/files/nodogsplash.init
index 0712fa9..08f980a 100755
--- a/nodogsplash/files/nodogsplash.init
+++ b/nodogsplash/files/nodogsplash.init
@@ -152,7 +152,7 @@ generate_uci_config() {
 
   config_get val "$cfg" config
   if [ -n "$val" ] ; then
-    if [ -f "$val" ] ; then
+    if [ ! -f "$val" ] ; then
       nolog error "Configuration file '$file' doesn't exist"
       return 0
     fi

From d97d2f2990a098b5bd2a14a8ab75ff81913aef6e Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Sat, 6 Feb 2016 02:02:38 +0100
Subject: [PATCH 194/368] cjdns: fix dependency on git revision

Signed-off-by: Lars Gierth <larsg@systemli.org>
---
 cjdns/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cjdns/Makefile b/cjdns/Makefile
index 6f7a6af..a022622 100644
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -66,7 +66,7 @@ endef
 define Build/Configure
 endef
 
-PKG_DO_VARS:=
+PKG_DO_VARS:=CJDNS_RELEASE_VERSION=$(PKG_SOURCE_VERSION)
 
 ifneq ($(CONFIG_KERNEL_SECCOMP_FILTER),y)
 PKG_DO_VARS+= Seccomp_NO=1

From 2a8338559de5c4b077cde7a83f43f4700a17d5cc Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Sat, 6 Feb 2016 04:55:04 +0100
Subject: [PATCH 195/368] cjdns: update source, bump release

Signed-off-by: Lars Gierth <larsg@systemli.org>
---
 cjdns/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cjdns/Makefile b/cjdns/Makefile
index a022622..a81b491 100644
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -18,11 +18,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cjdns
 PKG_VERSION:=0.17
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_URL:=https://github.com/hyperboria/cjdns.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=1cf53a812a9b19e5ce883c16d40ac183f61d43f6
+PKG_SOURCE_VERSION:=40e87d9419c19063e772e39c7c59a8a8771c5ee8
 PKG_LICENSE:=GPL-3.0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)

From d7710561e8bef74710f7af1c7d82105f2f350480 Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Wed, 10 Feb 2016 15:27:07 +0100
Subject: [PATCH 196/368] bmx7: separate bmx7 namespace for binaries, libs,
 config, runtimedir, ...

---
 bmx7/Makefile                        | 43 +++++++++++-----------------
 bmx7/files/etc/config/{bmx6 => bmx7} | 19 ++++++------
 bmx7/files/etc/init.d/{bmx6 => bmx7} |  6 ++--
 bmx7/patches/001-json-c.patch        |  6 ++--
 4 files changed, 31 insertions(+), 43 deletions(-)
 rename bmx7/files/etc/config/{bmx6 => bmx7} (65%)
 rename bmx7/files/etc/init.d/{bmx6 => bmx7} (94%)

diff --git a/bmx7/Makefile b/bmx7/Makefile
index 82006ee..ca24f4f 100644
--- a/bmx7/Makefile
+++ b/bmx7/Makefile
@@ -28,12 +28,12 @@ PKG_NAME:=bmx7
 
 PKG_SOURCE_PROTO:=git
 
-#PKG_SOURCE_URL:=file:///usr/src/bmx6/bmx6.git
+PKG_SOURCE_URL:=file:///usr/src/bmx6/bmx6.git
 #PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
-PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
+#PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 
-PKG_REV:=d0841d4bf42ae406cd5319a857dc294badb1ac8d
-PKG_VERSION:=r2016011801
+PKG_REV:=0d2da286a19219caebf55a4234ab612fefac65ce
+PKG_VERSION:=r2016021001
 PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 
@@ -61,7 +61,7 @@ define Package/bmx7/Default
   TITLE:=BMX7 layer 3 routing daemon
   URL:=http://bmx6.net/
   MAINTAINER:=Axel Neumann <neumann@cgws.de>
-  DEPENDS:=+zlib +libpolarssl @!bmx6
+  DEPENDS:=+zlib +libpolarssl
 endef
 
 define Package/bmx7/description
@@ -97,12 +97,6 @@ define Package/bmx7-tun
   TITLE:=ipip-based tunnel plugin (recommended!)
 endef
 
-#define Package/bmx7-quagga
-#  $(call Package/bmx7/Default)
-#  DEPENDS:=bmx7 +bmx7-tun +qmp-quagga @BROKEN
-#  TITLE:=bmx7 quagga plugin to redistribute/export routes (needs manet/bmx patched quagga 0.99.21)
-#endef
-
 define Package/bmx7-table
   $(call Package/bmx7/Default)
   DEPENDS:=bmx7 +bmx7-tun
@@ -119,60 +113,55 @@ endef
 
 define Package/bmx7/install
 	$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bmx6 $(1)/usr/sbin/bmx6
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bmx7 $(1)/usr/sbin/bmx7
 endef
 
 define Package/bmx7/postinst
 #!/bin/sh
 # # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
-	if [ -f /etc/sysupgrade.conf ] && ! grep bmx6 /etc/sysupgrade.conf; then
-		echo /etc/bmx6 >> /etc/sysupgrade.conf
+	if [ -f /etc/sysupgrade.conf ] && ! grep bmx7 /etc/sysupgrade.conf; then
+		echo /etc/bmx7 >> /etc/sysupgrade.conf
         fi
 fi
 endef
 
 
 define Package/bmx7-uci-config/conffiles
-/etc/config/bmx6
+/etc/config/bmx7
 endef
 
 define Package/bmx7-uci-config/install
 	$(INSTALL_DIR) $(1)/usr/lib $(1)/etc/config $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_uci_config/bmx6_config.so $(1)/usr/lib/bmx6_config.so
-	$(INSTALL_BIN) ./files/etc/init.d/bmx6 $(1)/etc/init.d/bmx6
-	$(INSTALL_DATA) ./files/etc/config/bmx6 $(1)/etc/config/bmx6
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx7_uci_config/bmx7_config.so $(1)/usr/lib/bmx7_config.so
+	$(INSTALL_BIN) ./files/etc/init.d/bmx7 $(1)/etc/init.d/bmx7
+	$(INSTALL_DATA) ./files/etc/config/bmx7 $(1)/etc/config/bmx7
 endef
 
 define Package/bmx7-json/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_json/bmx6_json.so $(1)/usr/lib/bmx6_json.so
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx7_json/bmx7_json.so $(1)/usr/lib/bmx7_json.so
 endef
 
 define Package/bmx7-sms/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_sms/bmx6_sms.so $(1)/usr/lib/bmx6_sms.so
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx7_sms/bmx7_sms.so $(1)/usr/lib/bmx7_sms.so
 endef
 
 define Package/bmx7-tun/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_tun/bmx6_tun.so $(1)/usr/lib/bmx6_tun.so
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx7_tun/bmx7_tun.so $(1)/usr/lib/bmx7_tun.so
 endef
 
 define Package/bmx7-table/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_table/bmx6_table.so $(1)/usr/lib/bmx6_table.so
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx7_table/bmx7_table.so $(1)/usr/lib/bmx7_table.so
 endef
 
-#define Package/bmx7-quagga/install
-#	$(INSTALL_DIR) $(1)/usr/lib
-#	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_quagga/bmx6_quagga.so $(1)/usr/lib/bmx6_quagga.so
-#endef
 
 $(eval $(call BuildPackage,bmx7))
 $(eval $(call BuildPackage,bmx7-uci-config))
 $(eval $(call BuildPackage,bmx7-json))
 $(eval $(call BuildPackage,bmx7-sms))
-#$(eval $(call BuildPackage,bmx7-quagga))
 $(eval $(call BuildPackage,bmx7-table))
 $(eval $(call BuildPackage,bmx7-tun))
diff --git a/bmx7/files/etc/config/bmx6 b/bmx7/files/etc/config/bmx7
similarity index 65%
rename from bmx7/files/etc/config/bmx6
rename to bmx7/files/etc/config/bmx7
index 26d691c..7593ede 100644
--- a/bmx7/files/etc/config/bmx6
+++ b/bmx7/files/etc/config/bmx7
@@ -1,21 +1,20 @@
 
 # for more information:
 # http://bmx6.net/projects/bmx6/wiki
-# options execute: bmx6 --help
-
-config 'bmx6' 'general'
-#       option 'runtimeDir' '/var/run/bmx6'
+# options execute: bmx7 --help
 
+config 'bmx7' 'general'
+#       option 'runtimeDir' '/var/run/bmx7'
+#	option 'trustedNodesDir' '/etc/bmx7/trustedNodes'
 
 #config 'plugin'
-#        option 'plugin' 'bmx6_config.so'
+#        option 'plugin' 'bmx7_config.so'
 
 #config 'plugin'
-#        option 'plugin' 'bmx6_json.so'
-
+#        option 'plugin' 'bmx7_json.so'
 
 #config 'plugin'
-#        option 'plugin' 'bmx6_sms.so'
+#        option 'plugin' 'bmx7_sms.so'
 
 
 config 'dev' 'mesh_1'
@@ -27,10 +26,10 @@ config 'dev' 'mesh_2'
 
 
 #config 'plugin'
-#        option 'plugin' 'bmx6_tun.so'
+#        option 'plugin' 'bmx7_tun.so'
 
 #config 'plugin'
-#        option 'plugin' 'bmx6_table.so'
+#        option 'plugin' 'bmx7_table.so'
 
 
 #config 'tunDev' default
diff --git a/bmx7/files/etc/init.d/bmx6 b/bmx7/files/etc/init.d/bmx7
similarity index 94%
rename from bmx7/files/etc/init.d/bmx6
rename to bmx7/files/etc/init.d/bmx7
index cb2d5b3..6886739 100755
--- a/bmx7/files/etc/init.d/bmx6
+++ b/bmx7/files/etc/init.d/bmx7
@@ -20,9 +20,9 @@
 
 START=91
 
-BIN=/usr/sbin/bmx6
-CONF=/etc/config/bmx6
-PID=/var/run/bmx6/pid
+BIN=/usr/sbin/bmx7
+CONF=/etc/config/bmx7
+PID=/var/run/bmx7/pid
 
 
 start() {
diff --git a/bmx7/patches/001-json-c.patch b/bmx7/patches/001-json-c.patch
index 5d29dae..794bd9e 100644
--- a/bmx7/patches/001-json-c.patch
+++ b/bmx7/patches/001-json-c.patch
@@ -1,7 +1,7 @@
-Index: bmx6-r2014112401/lib/bmx6_json/json.c
+Index: bmx7-r2014112401/lib/bmx7_json/json.c
 ===================================================================
---- bmx6-r2014112401.orig/lib/bmx6_json/json.c
-+++ bmx6-r2014112401/lib/bmx6_json/json.c
+--- bmx7-r2014112401.orig/lib/bmx7_json/json.c
++++ bmx7-r2014112401/lib/bmx7_json/json.c
 @@ -27,7 +27,7 @@
  #include <unistd.h>
  #include <fcntl.h>

From 5c203e3e638fa67b0581bf27de92f2e6aa912445 Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Thu, 11 Feb 2016 07:17:01 +0100
Subject: [PATCH 197/368] bmx7: fix source url

---
 bmx7/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bmx7/Makefile b/bmx7/Makefile
index ca24f4f..4d31b59 100644
--- a/bmx7/Makefile
+++ b/bmx7/Makefile
@@ -28,12 +28,12 @@ PKG_NAME:=bmx7
 
 PKG_SOURCE_PROTO:=git
 
-PKG_SOURCE_URL:=file:///usr/src/bmx6/bmx6.git
+#PKG_SOURCE_URL:=file:///usr/src/bmx6/bmx6.git
 #PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
-#PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
+PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 
 PKG_REV:=0d2da286a19219caebf55a4234ab612fefac65ce
-PKG_VERSION:=r2016021001
+PKG_VERSION:=r2016021002
 PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 

From 8b767e9382faf2f1a0dde5802e0611a4ed8feabc Mon Sep 17 00:00:00 2001
From: Philipp Borgers <borgers@mi.fu-berlin.de>
Date: Fri, 12 Feb 2016 18:59:43 +0100
Subject: [PATCH 198/368] fix quoting of daemon name

The current quoting did not allow substitution and resulted in log messages with
the prefix "${DAEMON}[hotplug]".
---
 oonf-init-scripts/files/oonf_hotplug.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oonf-init-scripts/files/oonf_hotplug.sh b/oonf-init-scripts/files/oonf_hotplug.sh
index b230b94..e0002b3 100755
--- a/oonf-init-scripts/files/oonf_hotplug.sh
+++ b/oonf-init-scripts/files/oonf_hotplug.sh
@@ -3,7 +3,7 @@
 case "${ACTION}" in
 	ifup)
 		. /etc/rc.common /etc/init.d/${DAEMON} enabled && {
-			logger -t '${DAEMON}[hotplug]' -p daemon.info 'reloading configuration'
+			logger -t "${DAEMON}[hotplug]" -p daemon.info 'reloading configuration'
 			. /etc/rc.common /etc/init.d/${DAEMON} reload
 		}
 	;;

From 4af2fcd6470d4c326f05ee138c3e96750f1b72ba Mon Sep 17 00:00:00 2001
From: Gabriel Kerneis <kerneis@google.com>
Date: Fri, 12 Feb 2016 17:04:56 +0100
Subject: [PATCH 199/368] babeld: release 1.7.1

Signed-off-by: Gabriel Kerneis <kerneis@google.com>
---
 babeld/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/babeld/Makefile b/babeld/Makefile
index d4b609c..88a7886 100644
--- a/babeld/Makefile
+++ b/babeld/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=babeld
-PKG_VERSION:=1.6.1
+PKG_VERSION:=1.7.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/files/
-PKG_MD5SUM:=74290f6c3678f314c79bdc0ab99d9f22
+PKG_MD5SUM:=2f71794d4e67f8a5352164ce33611549
 PKG_LICENSE:=MIT
 
 include $(INCLUDE_DIR)/package.mk

From 258c3c57786787f00517118bd11ed64a91f47e36 Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Mon, 15 Feb 2016 23:06:50 +0100
Subject: [PATCH 200/368] bmx7: update source: fix bmx7_tun plugin Makefile and
 new --setTrustedNode options

---
 bmx7/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bmx7/Makefile b/bmx7/Makefile
index 4d31b59..665956a 100644
--- a/bmx7/Makefile
+++ b/bmx7/Makefile
@@ -32,8 +32,8 @@ PKG_SOURCE_PROTO:=git
 #PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
 PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 
-PKG_REV:=0d2da286a19219caebf55a4234ab612fefac65ce
-PKG_VERSION:=r2016021002
+PKG_REV:=60143a195478a98e73089566bbfde78cf193ed67
+PKG_VERSION:=r2016021505
 PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 

From 93fdb120de99369efa99ad99a1b8ff255c541eaa Mon Sep 17 00:00:00 2001
From: Pau Escrich <p4u@dabax.net>
Date: Tue, 16 Feb 2016 19:23:07 +0100
Subject: [PATCH 201/368] luci-app-bmx6: return if json problem detected

Signed-off-by: Bob Ham <rah@settrans.net>
---
 luci-app-bmx6/files/usr/lib/lua/luci/model/cbi/bmx6/main.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/luci-app-bmx6/files/usr/lib/lua/luci/model/cbi/bmx6/main.lua b/luci-app-bmx6/files/usr/lib/lua/luci/model/cbi/bmx6/main.lua
index d4e0745..8ff3520 100644
--- a/luci-app-bmx6/files/usr/lib/lua/luci/model/cbi/bmx6/main.lua
+++ b/luci-app-bmx6/files/usr/lib/lua/luci/model/cbi/bmx6/main.lua
@@ -27,7 +27,8 @@ m = Map("bmx6", "bmx6")
 -- Getting json and Checking if bmx6-json is avaiable
 local options = bmx6json.get("options")
 if options == nil or options.OPTIONS == nil then
-	 m.message = "bmx6-json plugin is not running or some mistake in luci-bmx6 configuration, check /etc/config/luci-bmx6"
+	m.message = "bmx6-json plugin is not running or some mistake in luci-bmx6 configuration, check /etc/config/luci-bmx6"
+	return m
 else
 	options = options.OPTIONS
 end

From 3001d0ab41e30b236b7cdbd0674963bec59d4181 Mon Sep 17 00:00:00 2001
From: Pau Escrich <p4u@dabax.net>
Date: Tue, 23 Feb 2016 12:58:32 +0100
Subject: [PATCH 202/368] [luci-app-bmx6] When drawing the network topology
 graph, try first wget-ssl

Signed-off-by: Pau Escrich <p4u@dabax.net>
---
 .../files/usr/lib/lua/luci/model/bmx6json.lua        | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/luci-app-bmx6/files/usr/lib/lua/luci/model/bmx6json.lua b/luci-app-bmx6/files/usr/lib/lua/luci/model/bmx6json.lua
index dfe9ab1..a4a8e43 100644
--- a/luci-app-bmx6/files/usr/lib/lua/luci/model/bmx6json.lua
+++ b/luci-app-bmx6/files/usr/lib/lua/luci/model/bmx6json.lua
@@ -112,12 +112,16 @@ function wget(url, timeout)
 	if pid == 0 then
 		rfd:close()
 		nixio.dup(wfd, nixio.stdout)
-
-		local candidates = { "/usr/bin/wget", "/bin/wget" }
+		-- candidates for wget, try first ones with SSL support
+		local candidates = {{"/usr/bin/wget-ssl",1},{"/usr/bin/wget",0},{"/bin/wget",0}}
 		local _, bin
 		for _, bin in ipairs(candidates) do
-			if nixiofs.access(bin, "x") then
-				nixio.exec(bin, "-q", "-O", "-", url)
+			if nixiofs.access(bin[1], "x") then
+				if bin[2] == 0 then
+					nixio.exec(bin[1], "-q", "-O", "-", url)
+				else
+					nixio.exec(bin[1], "--no-check-certificate", "-q", "-O", "-", url)
+				end
 			end
 		end
 		return

From 9c45d3e724b42b2412f005084eaf6d80e9fe13bd Mon Sep 17 00:00:00 2001
From: Henning Rogge <hrogge@gmail.com>
Date: Sun, 28 Feb 2016 21:31:24 +0100
Subject: [PATCH 203/368] OONF version 0.11.0

---
 oonf-dlep-proxy/Makefile | 4 ++--
 oonf-dlep-radio/Makefile | 4 ++--
 oonf-olsrd2/Makefile     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index ed9a52f..496b181 100644
--- a/oonf-dlep-proxy/Makefile
+++ b/oonf-dlep-proxy/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-proxy
-PKG_VERSION:=0.9.2
-PKG_REV:=d1780791bd449f578a37a2b3103682169d9a01a9
+PKG_VERSION:=0.11.0
+PKG_REV:=9846dd00aa766baa9d62d69ff8a1a323e5da2d68
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index aedf2da..e97441e 100644
--- a/oonf-dlep-radio/Makefile
+++ b/oonf-dlep-radio/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-radio
-PKG_VERSION:=0.9.2
-PKG_REV:=d1780791bd449f578a37a2b3103682169d9a01a9
+PKG_VERSION:=0.11.0
+PKG_REV:=9846dd00aa766baa9d62d69ff8a1a323e5da2d68
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 3cfd321..594e135 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2
-PKG_VERSION:=0.9.2
-PKG_REV:=d1780791bd449f578a37a2b3103682169d9a01a9
+PKG_VERSION:=0.11.0
+PKG_REV:=9846dd00aa766baa9d62d69ff8a1a323e5da2d68
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

From f5bb690ab56a03fd95d700b7988ee6cdc0eb72a8 Mon Sep 17 00:00:00 2001
From: Henning Rogge <hrogge@gmail.com>
Date: Mon, 29 Feb 2016 19:04:12 +0100
Subject: [PATCH 204/368] Forgot to change to switch from os_socket to os_fd
 for OONF

---
 oonf-dlep-proxy/Makefile | 2 +-
 oonf-dlep-radio/Makefile | 2 +-
 oonf-olsrd2/Makefile     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index 496b181..96790c5 100644
--- a/oonf-dlep-proxy/Makefile
+++ b/oonf-dlep-proxy/Makefile
@@ -21,7 +21,7 @@ CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \
               -D OONF_NO_TESTING:Bool=true \
               -D UCI:Bool=true \
               -D OONF_APP_DEFAULT_CFG_HANDLER:String=uci \
-              -D OONF_STATIC_PLUGINS:String="class;clock;interface;layer2;packet_socket;socket;stream_socket;telnet;timer;viewer;os_clock;os_socket;os_interface;os_system;nl80211_listener;layer2info;systeminfo;cfg_uciloader;cfg_compact;dlep_proxy" \
+              -D OONF_STATIC_PLUGINS:String="class;clock;interface;layer2;packet_socket;socket;stream_socket;telnet;timer;viewer;os_clock;os_fd;os_interface;os_system;nl80211_listener;layer2info;systeminfo;cfg_uciloader;cfg_compact;dlep_proxy" \
               -D OONF_LIB_GIT:String=v$(PKG_VERSION)-archive \
               -D OONF_VERSION:String=$(PKG_VERSION) \
               -D INSTALL_LIB_DIR:Path=lib/oonf \
diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index e97441e..1703013 100644
--- a/oonf-dlep-radio/Makefile
+++ b/oonf-dlep-radio/Makefile
@@ -21,7 +21,7 @@ CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \
               -D OONF_NO_TESTING:Bool=true \
               -D UCI:Bool=true \
               -D OONF_APP_DEFAULT_CFG_HANDLER:String=uci \
-              -D OONF_STATIC_PLUGINS:String="class;clock;interface;layer2;packet_socket;socket;stream_socket;telnet;timer;viewer;os_clock;os_socket;os_interface;os_system;nl80211_listener;layer2info;systeminfo;cfg_uciloader;cfg_compact;dlep_radio" \
+              -D OONF_STATIC_PLUGINS:String="class;clock;interface;layer2;packet_socket;socket;stream_socket;telnet;timer;viewer;os_clock;os_fd;os_interface;os_system;nl80211_listener;layer2info;systeminfo;cfg_uciloader;cfg_compact;dlep_radio" \
               -D OONF_LIB_GIT:String=v$(PKG_VERSION)-archive \
               -D OONF_VERSION:String=$(PKG_VERSION) \
               -D INSTALL_LIB_DIR:Path=lib/oonf \
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 594e135..0cbb30d 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -21,7 +21,7 @@ CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \
               -D OONF_NO_TESTING:Bool=true \
               -D UCI:Bool=true \
               -D OONF_APP_DEFAULT_CFG_HANDLER:String=uci \
-              -D OONF_STATIC_PLUGINS:String="class;clock;duplicate_set;interface;layer2;packet_socket;rfc5444;socket;stream_socket;telnet;timer;viewer;os_clock;os_socket;os_interface;os_routing;os_system;nhdp;olsrv2;ff_dat_metric;neighbor_probing;nl80211_listener;link_config;layer2info;systeminfo;cfg_uciloader;cfg_compact;nhdpinfo;olsrv2info;netjsoninfo" \
+              -D OONF_STATIC_PLUGINS:String="class;clock;duplicate_set;interface;layer2;packet_socket;rfc5444;socket;stream_socket;telnet;timer;viewer;os_clock;os_fd;os_interface;os_routing;os_system;nhdp;olsrv2;ff_dat_metric;neighbor_probing;nl80211_listener;link_config;layer2info;systeminfo;cfg_uciloader;cfg_compact;nhdpinfo;olsrv2info;netjsoninfo" \
               -D OONF_LIB_GIT:String=v$(PKG_VERSION)-archive \
               -D OONF_VERSION:String=$(PKG_VERSION) \
               -D INSTALL_LIB_DIR:Path=lib/oonf \

From f7ffb388b17fd327e85f7e0c386a9d175b14e44e Mon Sep 17 00:00:00 2001
From: Stefan Sperling <stsp@stsp.name>
Date: Thu, 3 Mar 2016 21:06:38 +0100
Subject: [PATCH 205/368] Fix '/etc/init.d/olsrd6 restart' breaks IPv4
 SmartGateway.

Restarting olsrd for IPv6 clears SmartGateway firewall rules for both IPv4
and IPv6, and does not restore the IPv4 rules. As a result, IPv4 SmartGateway
functionality is broken after /etc/init.d/olsrd6 restart.
---
 olsrd/files/olsrd.init | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/olsrd/files/olsrd.init b/olsrd/files/olsrd.init
index 3ced911..87d6821 100644
--- a/olsrd/files/olsrd.init
+++ b/olsrd/files/olsrd.init
@@ -703,16 +703,24 @@ olsrd_setup_smartgw_rules() {
 	IP6T=$(which ip6tables)
 
 	# Delete smartgw firewall rules first
-	for IPT in $IP4T $IP6T; do
-		while $IPT -D forwarding_rule -o tnl_+ -j ACCEPT 2> /dev/null; do :;done
+	if [ "$UCI_CONF_NAME" == "olsrd6" ]; then
+		while $IP6T -D forwarding_rule -o tnl_+ -j ACCEPT 2> /dev/null; do :;done
 		for IFACE in $wanifnames; do
-			while $IPT -D forwarding_rule -i tunl0 -o $IFACE -j ACCEPT 2> /dev/null; do :; done
+			while $IP6T -D forwarding_rule -i tunl0 -o $IFACE -j ACCEPT 2> /dev/null; do :; done
 		done
 		for IFACE in $ifsglobal; do
-			while $IPT -D input_rule -i $IFACE -p 4 -j ACCEPT 2> /dev/null; do :; done
+			while $IP6T -D input_rule -i $IFACE -p 4 -j ACCEPT 2> /dev/null; do :; done
 		done
-	done
-	while $IP4T -t nat -D postrouting_rule -o tnl_+ -j MASQUERADE 2> /dev/null; do :;done
+	else
+		while $IP4T -D forwarding_rule -o tnl_+ -j ACCEPT 2> /dev/null; do :;done
+		for IFACE in $wanifnames; do
+			while $IP4T -D forwarding_rule -i tunl0 -o $IFACE -j ACCEPT 2> /dev/null; do :; done
+		done
+		for IFACE in $ifsglobal; do
+			while $IP4T -D input_rule -i $IFACE -p 4 -j ACCEPT 2> /dev/null; do :; done
+		done
+		while $IP4T -t nat -D postrouting_rule -o tnl_+ -j MASQUERADE 2> /dev/null; do :;done
+	fi
 
 	if [ "$smartgateway" == "yes" ]; then
 		log "$funcname() Notice: Inserting firewall rules for SmartGateway"

From cde0b2f81312df3153e67b46295051b34dc3904e Mon Sep 17 00:00:00 2001
From: Stefan Sperling <stsp@stsp.name>
Date: Sun, 6 Mar 2016 09:03:44 +0100
Subject: [PATCH 206/368] Replace == operator in test with = operator.

Requested by bittorf in https://github.com/openwrt-routing/packages/pull/155
---
 olsrd/files/olsrd.init | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/olsrd/files/olsrd.init b/olsrd/files/olsrd.init
index 87d6821..43c7e67 100644
--- a/olsrd/files/olsrd.init
+++ b/olsrd/files/olsrd.init
@@ -397,7 +397,7 @@ olsrd_write_olsrd() {
 	[ "$OLSRD_COUNT" -gt 0 ] && return 0
 
 	config_get ipversion "$cfg" IpVersion
-	if [ "$UCI_CONF_NAME" == "olsrd6" ]; then
+	if [ "$UCI_CONF_NAME" = "olsrd6" ]; then
 	        OLSRD_OLSRD_SCHEMA="$OLSRD_OLSRD_SCHEMA IpVersion=6"
 	        if [ "$ipversion" = "6and4" ]; then
 		        error "IpVersion 6and4 not supported in olsrd6"
@@ -703,7 +703,7 @@ olsrd_setup_smartgw_rules() {
 	IP6T=$(which ip6tables)
 
 	# Delete smartgw firewall rules first
-	if [ "$UCI_CONF_NAME" == "olsrd6" ]; then
+	if [ "$UCI_CONF_NAME" = "olsrd6" ]; then
 		while $IP6T -D forwarding_rule -o tnl_+ -j ACCEPT 2> /dev/null; do :;done
 		for IFACE in $wanifnames; do
 			while $IP6T -D forwarding_rule -i tunl0 -o $IFACE -j ACCEPT 2> /dev/null; do :; done
@@ -722,10 +722,10 @@ olsrd_setup_smartgw_rules() {
 		while $IP4T -t nat -D postrouting_rule -o tnl_+ -j MASQUERADE 2> /dev/null; do :;done
 	fi
 
-	if [ "$smartgateway" == "yes" ]; then
+	if [ "$smartgateway" = "yes" ]; then
 		log "$funcname() Notice: Inserting firewall rules for SmartGateway"
-		if [ ! "$smartgatewayuplink" == "none" ]; then
-			if [ "$smartgatewayuplink" == "ipv4" ]; then
+		if [ ! "$smartgatewayuplink" = "none" ]; then
+			if [ "$smartgatewayuplink" = "ipv4" ]; then
 				# Allow everything to be forwarded to tnl_+ and use NAT for it
 				$IP4T -I forwarding_rule -o tnl_+ -j ACCEPT
 				$IP4T -t nat -I postrouting_rule -o tnl_+ -j MASQUERADE
@@ -739,7 +739,7 @@ olsrd_setup_smartgw_rules() {
 				for IFACE in $ifsglobal; do
 					$IP4T -I input_rule -i $IFACE -p 4 -j ACCEPT
 				done
-			elif [ "$smartgatewayuplink" == "ipv6" ]; then
+			elif [ "$smartgatewayuplink" = "ipv6" ]; then
 				$IP6T -I forwarding_rule -o tnl_+ -j ACCEPT
 				if [ "$nowan"="0" ]; then
 					for IFACE in $wanifnames; do

From 101c9c07f9f3d84387d6e4e7ca227326f6887044 Mon Sep 17 00:00:00 2001
From: Henning Rogge <hrogge@gmail.com>
Date: Sat, 12 Mar 2016 00:46:59 +0100
Subject: [PATCH 207/368] Update to OONF 0.11.1

---
 oonf-dlep-proxy/Makefile | 4 ++--
 oonf-dlep-radio/Makefile | 4 ++--
 oonf-olsrd2/Makefile     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index 96790c5..87fdb60 100644
--- a/oonf-dlep-proxy/Makefile
+++ b/oonf-dlep-proxy/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-proxy
-PKG_VERSION:=0.11.0
-PKG_REV:=9846dd00aa766baa9d62d69ff8a1a323e5da2d68
+PKG_VERSION:=0.11.1
+PKG_REV:=35a1f944074e4b832ca39cd9bcccec7f21e65fa9
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index 1703013..e4ab37f 100644
--- a/oonf-dlep-radio/Makefile
+++ b/oonf-dlep-radio/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-radio
-PKG_VERSION:=0.11.0
-PKG_REV:=9846dd00aa766baa9d62d69ff8a1a323e5da2d68
+PKG_VERSION:=0.11.1
+PKG_REV:=35a1f944074e4b832ca39cd9bcccec7f21e65fa9
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 0cbb30d..a5e7982 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2
-PKG_VERSION:=0.11.0
-PKG_REV:=9846dd00aa766baa9d62d69ff8a1a323e5da2d68
+PKG_VERSION:=0.11.1
+PKG_REV:=35a1f944074e4b832ca39cd9bcccec7f21e65fa9
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

From bbcd1922bf9098937ab60801cb7042e41a0d3f2d Mon Sep 17 00:00:00 2001
From: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
Date: Thu, 17 Mar 2016 14:11:18 +0100
Subject: [PATCH 208/368] Update to version 0.11.2

---
 oonf-dlep-proxy/Makefile | 4 ++--
 oonf-dlep-radio/Makefile | 4 ++--
 oonf-olsrd2/Makefile     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index 87fdb60..e40bab3 100644
--- a/oonf-dlep-proxy/Makefile
+++ b/oonf-dlep-proxy/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-proxy
-PKG_VERSION:=0.11.1
-PKG_REV:=35a1f944074e4b832ca39cd9bcccec7f21e65fa9
+PKG_VERSION:=0.11.2
+PKG_REV:=a9a789405a6e5ef321a801f5a96c0440f20c16ae
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index e4ab37f..0fb4901 100644
--- a/oonf-dlep-radio/Makefile
+++ b/oonf-dlep-radio/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-radio
-PKG_VERSION:=0.11.1
-PKG_REV:=35a1f944074e4b832ca39cd9bcccec7f21e65fa9
+PKG_VERSION:=0.11.2
+PKG_REV:=a9a789405a6e5ef321a801f5a96c0440f20c16ae
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index a5e7982..c9d2cee 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2
-PKG_VERSION:=0.11.1
-PKG_REV:=35a1f944074e4b832ca39cd9bcccec7f21e65fa9
+PKG_VERSION:=0.11.2
+PKG_REV:=a9a789405a6e5ef321a801f5a96c0440f20c16ae
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

From 8136a3603d656a1856372c8874e8451cbe209ebc Mon Sep 17 00:00:00 2001
From: Sven Roederer <devel-sven@geroedel.de>
Date: Fri, 18 Mar 2016 02:44:25 +0100
Subject: [PATCH 209/368] [olsr, oonf] change to new repo

---
 olsrd/Makefile           | 2 +-
 oonf-dlep-proxy/Makefile | 2 +-
 oonf-dlep-radio/Makefile | 2 +-
 oonf-olsrd2/Makefile     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/olsrd/Makefile b/olsrd/Makefile
index 16cf474..2c31cba 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=0.9.0.3
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://olsr.org/git/olsrd.git
+PKG_SOURCE_URL:=https://github.com/OLSR/olsrd.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=v0.9.0.3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index 87fdb60..05bd432 100644
--- a/oonf-dlep-proxy/Makefile
+++ b/oonf-dlep-proxy/Makefile
@@ -6,7 +6,7 @@ PKG_REV:=35a1f944074e4b832ca39cd9bcccec7f21e65fa9
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://olsr.org/git/oonf.git
+PKG_SOURCE_URL:=https://github.com/OLSR/OONF.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index e4ab37f..9b6a931 100644
--- a/oonf-dlep-radio/Makefile
+++ b/oonf-dlep-radio/Makefile
@@ -6,7 +6,7 @@ PKG_REV:=35a1f944074e4b832ca39cd9bcccec7f21e65fa9
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://olsr.org/git/oonf.git
+PKG_SOURCE_URL:=https://github.com/OLSR/OONF.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index a5e7982..fd578d6 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -6,7 +6,7 @@ PKG_REV:=35a1f944074e4b832ca39cd9bcccec7f21e65fa9
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://olsr.org/git/oonf.git
+PKG_SOURCE_URL:=https://github.com/OLSR/OONF.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)

From 8a7364f2578f07cce3d07b4a4f59a907bb65f8bf Mon Sep 17 00:00:00 2001
From: Sven Roederer <devel-sven@geroedel.de>
Date: Fri, 18 Mar 2016 08:51:39 +0100
Subject: [PATCH 210/368] olsrd: update (c)-header date

---
 olsrd/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/olsrd/Makefile b/olsrd/Makefile
index 2c31cba..e6f85f7 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2009-2012 OpenWrt.org
+# Copyright (C) 2009-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.

From 758d919870103d6fec6d0be29b0436e41f004257 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Thu, 21 Jan 2016 16:04:20 +0100
Subject: [PATCH 211/368] batman-adv: Use the mac80211 compat layer

BATMAN_V (in the upcoming release) will use structures from the mac80211
package. These structures can be incompatible to the structures defined in
the header of the kernel. This can lead to weird problems like stack
overflows or memory corruptions.

To avoid this, the batman-adv has to be compiled against the mac80211
headers instead of the kernel headers. But this requires that the
compatibility headers of compat-wireless are used. So the batman-adv
compatibility layer has (mostly) be removed and instead the
compat-wireless/mac80211 compat layer has to be used.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batman-adv/Makefile                        | 40 ++++++++++++-------
 batman-adv/patches/0000-compat-hacks.patch | 46 ++++++++++++++++++++++
 2 files changed, 72 insertions(+), 14 deletions(-)
 create mode 100644 batman-adv/patches/0000-compat-hacks.patch

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 1eb6bbe..6e24d4d 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -27,7 +27,7 @@ define KernelPackage/batman-adv
   URL:=https://www.open-mesh.org/
   MAINTAINER:=Marek Lindner <mareklindner@neomailbox.ch>
   SUBMENU:=Network Support
-  DEPENDS:=+KMOD_BATMAN_ADV_BLA:kmod-lib-crc16 +kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c
+  DEPENDS:=+KMOD_BATMAN_ADV_BLA:kmod-lib-crc16 +kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c +kmod-cfg80211
   TITLE:=B.A.T.M.A.N. Adv
   FILES:=$(PKG_BUILD_DIR)/net/batman-adv/batman-adv.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,batman-adv)
@@ -47,20 +47,36 @@ define Package/kmod-batman-adv/conffiles
 /etc/config/batman-adv
 endef
 
-MAKE_BATMAN_ADV_ARGS += \
-	CROSS_COMPILE="$(TARGET_CROSS)" \
-	KERNELPATH="$(LINUX_DIR)" \
-	ARCH="$(LINUX_KARCH)" \
-	PATH="$(TARGET_PATH)" \
-	SUBDIRS="$(PKG_BUILD_DIR)" \
-	PWD="$(PKG_BUILD_DIR)" \
-	LINUX_VERSION="$(LINUX_VERSION)" \
+PKG_EXTRA_KCONFIG:= \
+	CONFIG_BATMAN_ADV=m \
 	CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG),y,n) \
 	CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_KMOD_BATMAN_ADV_BLA),y,n) \
 	CONFIG_BATMAN_ADV_DAT=$(if $(CONFIG_KMOD_BATMAN_ADV_DAT),y,n) \
 	CONFIG_BATMAN_ADV_MCAST=$(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),y,n) \
 	CONFIG_BATMAN_ADV_NC=$(if $(CONFIG_KMOD_BATMAN_ADV_NC),y,n) \
-	REVISION="" all
+
+PKG_EXTRA_CFLAGS:= \
+	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \
+	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(PKG_EXTRA_KCONFIG)))) \
+
+NOSTDINC_FLAGS = \
+	-I$(PKG_BUILD_DIR)/net/batman-adv \
+	-I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \
+	-I$(STAGING_DIR)/usr/include/mac80211-backport \
+	-I$(STAGING_DIR)/usr/include/mac80211/uapi \
+	-I$(STAGING_DIR)/usr/include/mac80211 \
+	-include backport/backport.h
+
+define Build/Compile
+	+$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
+		ARCH="$(LINUX_KARCH)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		SUBDIRS="$(PKG_BUILD_DIR)/net/batman-adv" \
+		$(PKG_EXTRA_KCONFIG) \
+		EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS)" \
+		NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
+		modules
+endef
 
 define Build/Prepare
 	$(call Build/Prepare/Default)
@@ -68,10 +84,6 @@ define Build/Prepare
 		$(PKG_BUILD_DIR)/net/batman-adv/main.h
 endef
 
-define Build/Compile
-	$(MAKE) -C "$(PKG_BUILD_DIR)" $(MAKE_BATMAN_ADV_ARGS)
-endef
-
 define Build/Clean
         rm -rf $(BUILD_DIR)/$(PKG_NAME)/
 endef
diff --git a/batman-adv/patches/0000-compat-hacks.patch b/batman-adv/patches/0000-compat-hacks.patch
new file mode 100644
index 0000000..78bdc51
--- /dev/null
+++ b/batman-adv/patches/0000-compat-hacks.patch
@@ -0,0 +1,46 @@
+diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
+index 730cfa8..39e5694 100644
+--- a/net/batman-adv/hard-interface.c
++++ b/net/batman-adv/hard-interface.c
+@@ -47,6 +47,24 @@
+ #include "sysfs.h"
+ #include "translation-table.h"
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)
++
++#define dev_get_iflink(_net_dev) ((_net_dev)->iflink)
++
++#endif /* < KERNEL_VERSION(4, 1, 0) */
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)
++
++#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info) \
++	netdev_set_master(dev, upper_dev)
++
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0)
++
++#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info) \
++	netdev_master_upper_dev_link(dev, upper_dev)
++
++#endif /* < KERNEL_VERSION(4, 5, 0) */
++
+ /**
+  * batadv_hardif_release - release hard interface from lists and queue for
+  *  free after rcu grace period
+diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
+index 6c65de9..06d0330 100644
+--- a/net/batman-adv/soft-interface.c
++++ b/net/batman-adv/soft-interface.c
+@@ -60,6 +60,12 @@
+ #include "sysfs.h"
+ #include "translation-table.h"
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
++
++#define IFF_NO_QUEUE	0; dev->tx_queue_len = 0
++
++#endif /* < KERNEL_VERSION(4, 3, 0) */
++
+ static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd);
+ static void batadv_get_drvinfo(struct net_device *dev,
+ 			       struct ethtool_drvinfo *info);

From f8dd2baaa04e2a5fe50321920b3f456f896860d8 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Fri, 25 Mar 2016 10:44:07 +0100
Subject: [PATCH 212/368] batman-adv: Move compat-hacks to separate file

The content of this file should actually be included somehow in
backport.git so it will become part of the mac80211 package. Still keep
this for now in a separate file so it is easier to extract them.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batman-adv/Makefile                        |  4 +-
 batman-adv/files/compat-hacks.h            | 39 ++++++++++++++++++
 batman-adv/patches/0000-compat-hacks.patch | 46 ----------------------
 3 files changed, 42 insertions(+), 47 deletions(-)
 create mode 100644 batman-adv/files/compat-hacks.h
 delete mode 100644 batman-adv/patches/0000-compat-hacks.patch

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 6e24d4d..1c2aa39 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -65,7 +65,8 @@ NOSTDINC_FLAGS = \
 	-I$(STAGING_DIR)/usr/include/mac80211-backport \
 	-I$(STAGING_DIR)/usr/include/mac80211/uapi \
 	-I$(STAGING_DIR)/usr/include/mac80211 \
-	-include backport/backport.h
+	-include backport/backport.h \
+	-include $(PKG_BUILD_DIR)/compat-hacks.h
 
 define Build/Compile
 	+$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
@@ -80,6 +81,7 @@ endef
 
 define Build/Prepare
 	$(call Build/Prepare/Default)
+	$(CP) ./files/compat-hacks.h $(PKG_BUILD_DIR)/
 	$(SED) '/#define _NET_BATMAN_ADV_MAIN_H_/a\#undef CONFIG_MODULE_STRIPPED' \
 		$(PKG_BUILD_DIR)/net/batman-adv/main.h
 endef
diff --git a/batman-adv/files/compat-hacks.h b/batman-adv/files/compat-hacks.h
new file mode 100644
index 0000000..e95b64d
--- /dev/null
+++ b/batman-adv/files/compat-hacks.h
@@ -0,0 +1,39 @@
+/* Please avoid adding hacks here - instead add it to mac80211/backports.git */
+
+#include <linux/version.h>	/* LINUX_VERSION_CODE */
+#include <linux/types.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)
+
+#define dev_get_iflink(_net_dev) ((_net_dev)->iflink)
+
+#endif /* < KERNEL_VERSION(4, 1, 0) */
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)
+
+#include <linux/netdevice.h>
+
+#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info) ({\
+	BUILD_BUG_ON(upper_priv != NULL); \
+	BUILD_BUG_ON(upper_info != NULL); \
+	netdev_set_master(dev, upper_dev); \
+})
+
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0)
+
+#include <linux/netdevice.h>
+
+#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info) ({\
+	BUILD_BUG_ON(upper_priv != NULL); \
+	BUILD_BUG_ON(upper_info != NULL); \
+	netdev_master_upper_dev_link(dev, upper_dev); \
+})
+
+#endif /* < KERNEL_VERSION(4, 5, 0) */
+
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
+
+#define IFF_NO_QUEUE	0; dev->tx_queue_len = 0
+
+#endif /* < KERNEL_VERSION(4, 3, 0) */
diff --git a/batman-adv/patches/0000-compat-hacks.patch b/batman-adv/patches/0000-compat-hacks.patch
deleted file mode 100644
index 78bdc51..0000000
--- a/batman-adv/patches/0000-compat-hacks.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
-index 730cfa8..39e5694 100644
---- a/net/batman-adv/hard-interface.c
-+++ b/net/batman-adv/hard-interface.c
-@@ -47,6 +47,24 @@
- #include "sysfs.h"
- #include "translation-table.h"
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)
-+
-+#define dev_get_iflink(_net_dev) ((_net_dev)->iflink)
-+
-+#endif /* < KERNEL_VERSION(4, 1, 0) */
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)
-+
-+#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info) \
-+	netdev_set_master(dev, upper_dev)
-+
-+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0)
-+
-+#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info) \
-+	netdev_master_upper_dev_link(dev, upper_dev)
-+
-+#endif /* < KERNEL_VERSION(4, 5, 0) */
-+
- /**
-  * batadv_hardif_release - release hard interface from lists and queue for
-  *  free after rcu grace period
-diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
-index 6c65de9..06d0330 100644
---- a/net/batman-adv/soft-interface.c
-+++ b/net/batman-adv/soft-interface.c
-@@ -60,6 +60,12 @@
- #include "sysfs.h"
- #include "translation-table.h"
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
-+
-+#define IFF_NO_QUEUE	0; dev->tx_queue_len = 0
-+
-+#endif /* < KERNEL_VERSION(4, 3, 0) */
-+
- static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd);
- static void batadv_get_drvinfo(struct net_device *dev,
- 			       struct ethtool_drvinfo *info);

From 777797f8d9084ff5e33edee55a41925b047f6950 Mon Sep 17 00:00:00 2001
From: Tore Anderson <tore@fud.no>
Date: Sun, 10 Apr 2016 20:34:16 +0200
Subject: [PATCH 213/368] hnetd: support the ip4mode parameter

Add support for setting the "ip4mode" parameter (sbyx/hnetd@2953f5a) in
the "config pa pa" stanza of /etc/config/hnet.
---
 hnetd/files/hnet.config | 1 +
 hnetd/files/hnetd.init  | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/hnetd/files/hnet.config b/hnetd/files/hnet.config
index aba765f..0a8e770 100644
--- a/hnetd/files/hnet.config
+++ b/hnetd/files/hnet.config
@@ -11,6 +11,7 @@ config security security
 
 config pa pa
 #	option ip4prefix 10.0.0.0/8
+#	option ip4mode ifuplink
 #	option ulaprefix fd12:3456:789A::/48
 #	option ulamode off
 #	option persistent_store /etc/hnet-pa.store
diff --git a/hnetd/files/hnetd.init b/hnetd/files/hnetd.init
index 3ca2c2e..94cd6b8 100644
--- a/hnetd/files/hnetd.init
+++ b/hnetd/files/hnetd.init
@@ -83,6 +83,9 @@ start_service() {
     config_get val pa ip4prefix
     [ -n "$val" ] && procd_append_param command --ip4prefix $val
 
+    config_get val pa ip4mode
+    [ -n "$val" ] && procd_append_param command --ip4mode $val
+
     config_get val pa ulaprefix
     [ -n "$val" ] && procd_append_param command --ulaprefix $val
 

From f6f76e1541fb6dafa2a5f7f037fbe04aadfee110 Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Mon, 18 Apr 2016 22:07:15 +0200
Subject: [PATCH 214/368] nodogsplash: fix enable UsernameAuthentication

---
 nodogsplash/files/nodogsplash.init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nodogsplash/files/nodogsplash.init b/nodogsplash/files/nodogsplash.init
index 0712fa9..40e59f7 100755
--- a/nodogsplash/files/nodogsplash.init
+++ b/nodogsplash/files/nodogsplash.init
@@ -69,7 +69,7 @@ setup_user_authentication() {
 
   config_get val "$cfg" username
   if [ -n "$val" ] ; then
-    echo "UsernameAuthentication" >> $CONFIGFILE
+    echo "UsernameAuthentication 1" >> $CONFIGFILE
     echo "Username $val" >> $CONFIGFILE
   fi
 

From ee3db2964fcd0fc0a3a713db33c601758e2c8012 Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Mon, 18 Apr 2016 22:09:33 +0200
Subject: [PATCH 215/368] nodogsplash: fix enable PasswordAuthentication

---
 nodogsplash/files/nodogsplash.init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nodogsplash/files/nodogsplash.init b/nodogsplash/files/nodogsplash.init
index 40e59f7..1fa0c79 100755
--- a/nodogsplash/files/nodogsplash.init
+++ b/nodogsplash/files/nodogsplash.init
@@ -75,7 +75,7 @@ setup_user_authentication() {
 
   config_get val "$cfg" password
   if [ -n "$val" ] ; then
-    echo "PasswordAuthentication" >> $CONFIGFILE
+    echo "PasswordAuthentication 1" >> $CONFIGFILE
     echo "Password $val" >> $CONFIGFILE
   fi
 }

From 0e4d44f8ec7d4697436a5d8ec7837c675b80d636 Mon Sep 17 00:00:00 2001
From: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
Date: Tue, 19 Apr 2016 12:29:36 +0200
Subject: [PATCH 216/368] Update to OONF 0.11.3

---
 oonf-dlep-proxy/Makefile | 8 ++++----
 oonf-dlep-radio/Makefile | 8 ++++----
 oonf-olsrd2/Makefile     | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index e40bab3..4039680 100644
--- a/oonf-dlep-proxy/Makefile
+++ b/oonf-dlep-proxy/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-proxy
-PKG_VERSION:=0.11.2
-PKG_REV:=a9a789405a6e5ef321a801f5a96c0440f20c16ae
+PKG_VERSION:=0.11.3
+PKG_REV:=b4d7a2ae62895efda3f25efb66318f9316d4b6b8
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://olsr.org/git/oonf.git
+PKG_SOURCE_URL:=https://github.com/OLSR/OONF.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
@@ -38,7 +38,7 @@ define Package/oonf-git/template
 endef
 
 define Package/oonf-dlep-proxy
-	$(call Package/oonf-git/template) 
+	$(call Package/oonf-git/template)
 	TITLE:= Build DLEP Radio+Router Agent
 	DEPENDS:=+librt +libnl-tiny +libuci +oonf-init-scripts
 	VERSION:=$(PKG_VERSION)
diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index 0fb4901..3fb03f1 100644
--- a/oonf-dlep-radio/Makefile
+++ b/oonf-dlep-radio/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-radio
-PKG_VERSION:=0.11.2
-PKG_REV:=a9a789405a6e5ef321a801f5a96c0440f20c16ae
+PKG_VERSION:=0.11.3
+PKG_REV:=b4d7a2ae62895efda3f25efb66318f9316d4b6b8
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://olsr.org/git/oonf.git
+PKG_SOURCE_URL:=https://github.com/OLSR/OONF.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
@@ -38,7 +38,7 @@ define Package/oonf-git/template
 endef
 
 define Package/oonf-dlep-radio
-	$(call Package/oonf-git/template) 
+	$(call Package/oonf-git/template)
 	TITLE:= Build DLEP Radio Agent
 	DEPENDS:=+librt +libnl-tiny +libuci +oonf-init-scripts
 	VERSION:=$(PKG_VERSION)
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index c9d2cee..c80a341 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2
-PKG_VERSION:=0.11.2
-PKG_REV:=a9a789405a6e5ef321a801f5a96c0440f20c16ae
+PKG_VERSION:=0.11.3
+PKG_REV:=b4d7a2ae62895efda3f25efb66318f9316d4b6b8
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://olsr.org/git/oonf.git
+PKG_SOURCE_URL:=https://github.com/OLSR/OONF.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
@@ -38,7 +38,7 @@ define Package/oonf-git/template
 endef
 
 define Package/oonf-olsrd2
-	$(call Package/oonf-git/template) 
+	$(call Package/oonf-git/template)
 	TITLE:= Build Olsrd V2 Routing Agent
 	DEPENDS:=+librt +libnl-tiny +libuci +oonf-init-scripts
 	VERSION:=$(PKG_VERSION)

From 8aae02a7b1be3c7433fdee2a53fe50c6a68899fb Mon Sep 17 00:00:00 2001
From: Simon Wunderlich <sw@simonwunderlich.de>
Date: Thu, 21 Apr 2016 14:24:14 +0200
Subject: [PATCH 217/368] alfred: bump version to 2016.1

From the CHANGELOG:

 * add support for master servers to receive push_data packets with
   foreign source addresses
 * various code cleanups
 * bugs squashed:
   - ignore invalid EUI64 addresses

Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
 alfred/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/alfred/Makefile b/alfred/Makefile
index 76340bb..2e117b3 100644
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -11,9 +11,9 @@ include $(TOPDIR)/rules.mk
 # The latest alfred git hash in PKG_REV can be obtained from https://git.open-mesh.org/alfred.git
 #
 PKG_NAME:=alfred
-PKG_VERSION:=2016.0
+PKG_VERSION:=2016.1
 PKG_RELEASE:=0
-PKG_MD5SUM:=d5cc848f57f430a977e2f266d35d99c7
+PKG_MD5SUM:=0caefc13ba631cba93b84d7f5685e8d0
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From 0cdf3ba21c3d516f4ed9d1f0430d99c049b46628 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
Date: Thu, 21 Apr 2016 15:39:39 +0200
Subject: [PATCH 218/368] batman-adv: upgrade package to latest release 2016.1

Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
---
 batman-adv/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 1c2aa39..c071d7c 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
 
-PKG_VERSION:=2016.0
+PKG_VERSION:=2016.1
 PKG_RELEASE:=1
-PKG_MD5SUM:=5ab2b29a386d02c16019e469d3981d41
+PKG_MD5SUM:=8c8e449009b4d29512d26ee308960bb5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From 6363b1ddc5f73558ab94573b74cd4d3d600233ff Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
Date: Tue, 19 Jan 2016 12:40:10 +0100
Subject: [PATCH 219/368] batman-adv: Allow to select routing algorithm

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.eckelmann@open-mesh.com>
---
 batman-adv/files/lib/netifd/proto/batadv.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/batman-adv/files/lib/netifd/proto/batadv.sh b/batman-adv/files/lib/netifd/proto/batadv.sh
index 632a209..1e0c9d0 100644
--- a/batman-adv/files/lib/netifd/proto/batadv.sh
+++ b/batman-adv/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

From 4c3eecfac3ac73e63fae28a0d51def8e1cd5e261 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Thu, 11 Feb 2016 23:08:20 +0100
Subject: [PATCH 220/368] batman-adv: Add B.A.T.M.A.N. V support

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batman-adv/Config.in            |  4 ++++
 batman-adv/Makefile             |  1 +
 batman-adv/files/compat-hacks.h | 37 +++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/batman-adv/Config.in b/batman-adv/Config.in
index 86fc795..48092e7 100644
--- a/batman-adv/Config.in
+++ b/batman-adv/Config.in
@@ -24,3 +24,7 @@ config KMOD_BATMAN_ADV_NC
 	depends on PACKAGE_kmod-batman-adv
 	default n
 
+config KMOD_BATMAN_ADV_BATMAN_V
+	bool "enable batman v routing algorithm"
+	depends on PACKAGE_kmod-batman-adv
+	default n
diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index c071d7c..20664e1 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -54,6 +54,7 @@ PKG_EXTRA_KCONFIG:= \
 	CONFIG_BATMAN_ADV_DAT=$(if $(CONFIG_KMOD_BATMAN_ADV_DAT),y,n) \
 	CONFIG_BATMAN_ADV_MCAST=$(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),y,n) \
 	CONFIG_BATMAN_ADV_NC=$(if $(CONFIG_KMOD_BATMAN_ADV_NC),y,n) \
+	CONFIG_BATMAN_ADV_BATMAN_V=$(if $(CONFIG_KMOD_BATMAN_ADV_BATMAN_V),y,n) \
 
 PKG_EXTRA_CFLAGS:= \
 	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \
diff --git a/batman-adv/files/compat-hacks.h b/batman-adv/files/compat-hacks.h
index e95b64d..5126fc2 100644
--- a/batman-adv/files/compat-hacks.h
+++ b/batman-adv/files/compat-hacks.h
@@ -37,3 +37,40 @@
 #define IFF_NO_QUEUE	0; dev->tx_queue_len = 0
 
 #endif /* < KERNEL_VERSION(4, 3, 0) */
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
+
+#include <linux/ethtool.h>
+
+#define ethtool_link_ksettings batadv_ethtool_link_ksettings
+
+struct batadv_ethtool_link_ksettings {
+	struct {
+		__u32	speed;
+		__u8	duplex;
+	} base;
+};
+
+#define __ethtool_get_link_ksettings(__dev, __link_settings) \
+	batadv_ethtool_get_link_ksettings(__dev, __link_settings)
+
+static inline int
+batadv_ethtool_get_link_ksettings(struct net_device *dev,
+				  struct ethtool_link_ksettings *link_ksettings)
+{
+	struct ethtool_cmd cmd;
+	int ret;
+
+	memset(&cmd, 0, sizeof(cmd));
+	ret = __ethtool_get_settings(dev, &cmd);
+
+	if (ret != 0)
+		return ret;
+
+	link_ksettings->base.duplex = cmd.duplex;
+	link_ksettings->base.speed = ethtool_cmd_speed(&cmd);
+
+	return 0;
+}
+
+#endif /* < KERNEL_VERSION(4, 6, 0) */

From 2b5276e1044de351d222e4ba2343fa0b1a912589 Mon Sep 17 00:00:00 2001
From: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
Date: Mon, 25 Apr 2016 08:21:47 +0200
Subject: [PATCH 221/368] Update to OONF v0.11.4

---
 oonf-dlep-proxy/Makefile | 4 ++--
 oonf-dlep-radio/Makefile | 4 ++--
 oonf-olsrd2/Makefile     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index 4039680..e2cdccb 100644
--- a/oonf-dlep-proxy/Makefile
+++ b/oonf-dlep-proxy/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-proxy
-PKG_VERSION:=0.11.3
-PKG_REV:=b4d7a2ae62895efda3f25efb66318f9316d4b6b8
+PKG_VERSION:=0.11.4
+PKG_REV:=a7087466958d3af477fecf4ad8e412ccca33d4c7
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index 3fb03f1..b8e9762 100644
--- a/oonf-dlep-radio/Makefile
+++ b/oonf-dlep-radio/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-radio
-PKG_VERSION:=0.11.3
-PKG_REV:=b4d7a2ae62895efda3f25efb66318f9316d4b6b8
+PKG_VERSION:=0.11.4
+PKG_REV:=a7087466958d3af477fecf4ad8e412ccca33d4c7
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index c80a341..20ee3b2 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2
-PKG_VERSION:=0.11.3
-PKG_REV:=b4d7a2ae62895efda3f25efb66318f9316d4b6b8
+PKG_VERSION:=0.11.4
+PKG_REV:=a7087466958d3af477fecf4ad8e412ccca33d4c7
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

From fbc84445f76adb9efd7bab3d602be528071d53c6 Mon Sep 17 00:00:00 2001
From: Marek Lindner <mareklindner@neomailbox.ch>
Date: Mon, 25 Apr 2016 17:23:59 +0800
Subject: [PATCH 222/368] batctl: upgrade package to latest release 2016.1

Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
 batctl/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/batctl/Makefile b/batctl/Makefile
index 9efec3e..818e345 100644
--- a/batctl/Makefile
+++ b/batctl/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batctl
 
-PKG_VERSION:=2016.0
+PKG_VERSION:=2016.1
 PKG_RELEASE:=1
-PKG_MD5SUM:=03c9192ec52a01035602706f08b24740
+PKG_MD5SUM:=b98a6e3b45927315cd6d4efba4c1a1ff
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From 30dee5dc51e3aea1ead28ab9731b218574299afc Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Sun, 1 May 2016 17:03:21 +0200
Subject: [PATCH 223/368] bmx7: bump  to latest code version

---
 bmx7/Makefile | 38 +++++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/bmx7/Makefile b/bmx7/Makefile
index 665956a..b626bce 100644
--- a/bmx7/Makefile
+++ b/bmx7/Makefile
@@ -28,12 +28,12 @@ PKG_NAME:=bmx7
 
 PKG_SOURCE_PROTO:=git
 
+PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
+#PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 #PKG_SOURCE_URL:=file:///usr/src/bmx6/bmx6.git
-#PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
-PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 
-PKG_REV:=60143a195478a98e73089566bbfde78cf193ed67
-PKG_VERSION:=r2016021505
+PKG_REV:=b2e3f4439a4b676c2b9c13b82706907fabb67059
+PKG_VERSION:=r2016050108
 PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 
@@ -47,8 +47,8 @@ include $(INCLUDE_DIR)/package.mk
 TARGET_CFLAGS += $(FPIC)
 
 MAKE_ARGS += \
-        EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DCRYPTLIB=POLARSSL_1_3_4 -DCORE_LIMIT=20000 -DTRAFFIC_DUMP -DNO_TRACE_FUNCTION_CALLS" \
-        EXTRA_LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib " \
+        EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DCRYPTLIB=POLARSSL_1_3_4 -DCORE_LIMIT=20000 -DTRAFFIC_DUMP -DNO_TRACE_FUNCTION_CALLS -DBMX7_LIB_IWINFO" \
+        EXTRA_LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib -liwinfo" \
         GIT_REV="$(PKG_REV)" \
         CC="$(TARGET_CC)" \
         INSTALL_DIR="$(PKG_INSTALL_DIR)" \
@@ -61,7 +61,7 @@ define Package/bmx7/Default
   TITLE:=BMX7 layer 3 routing daemon
   URL:=http://bmx6.net/
   MAINTAINER:=Axel Neumann <neumann@cgws.de>
-  DEPENDS:=+zlib +libpolarssl
+  DEPENDS:=+zlib +libpolarssl +libiwinfo
 endef
 
 define Package/bmx7/description
@@ -79,6 +79,18 @@ define Package/bmx7-uci-config
   TITLE:=configuration plugin based on uci (recommended!)
 endef
 
+define Package/bmx7-iwinfo
+  $(call Package/bmx7/Default)
+  DEPENDS:=bmx7 +libiwinfo
+  TITLE:=link characteristics plugin based on libiwinfo
+endef
+
+define Package/bmx7-topology
+  $(call Package/bmx7/Default)
+  DEPENDS:=bmx7
+  TITLE:=topology plugin
+endef
+
 define Package/bmx7-json
   $(call Package/bmx7/Default)
   DEPENDS:=bmx7 +libjson-c
@@ -138,6 +150,16 @@ define Package/bmx7-uci-config/install
 	$(INSTALL_DATA) ./files/etc/config/bmx7 $(1)/etc/config/bmx7
 endef
 
+define Package/bmx7-iwinfo/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx7_iwinfo/bmx7_iwinfo.so $(1)/usr/lib/bmx7_iwinfo.so
+endef
+
+define Package/bmx7-topology/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx7_topology/bmx7_topology.so $(1)/usr/lib/bmx7_topology.so
+endef
+
 define Package/bmx7-json/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx7_json/bmx7_json.so $(1)/usr/lib/bmx7_json.so
@@ -161,6 +183,8 @@ endef
 
 $(eval $(call BuildPackage,bmx7))
 $(eval $(call BuildPackage,bmx7-uci-config))
+$(eval $(call BuildPackage,bmx7-iwinfo))
+$(eval $(call BuildPackage,bmx7-topology))
 $(eval $(call BuildPackage,bmx7-json))
 $(eval $(call BuildPackage,bmx7-sms))
 $(eval $(call BuildPackage,bmx7-table))

From d918b65774f59890398c98eebba7a826e15adf25 Mon Sep 17 00:00:00 2001
From: Roger Pueyo Centelles <roger.pueyo@guifi.net>
Date: Thu, 10 Mar 2016 00:56:35 +0100
Subject: [PATCH 224/368] [luci-app-bmx7] Create luci-app-bmx7 package
 structure including Makefile and COPYING license file

---
 luci-app-bmx7/COPYING  | 339 +++++++++++++++++++++++++++++++++++++++++
 luci-app-bmx7/Makefile |  60 ++++++++
 2 files changed, 399 insertions(+)
 create mode 100644 luci-app-bmx7/COPYING
 create mode 100644 luci-app-bmx7/Makefile

diff --git a/luci-app-bmx7/COPYING b/luci-app-bmx7/COPYING
new file mode 100644
index 0000000..d511905
--- /dev/null
+++ b/luci-app-bmx7/COPYING
@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/luci-app-bmx7/Makefile b/luci-app-bmx7/Makefile
new file mode 100644
index 0000000..2946849
--- /dev/null
+++ b/luci-app-bmx7/Makefile
@@ -0,0 +1,60 @@
+#    Copyright © 2011 Pau Escrich <pau@dabax.net>
+#    Contributors Roger Pueyo Centelles <roger.pueyo@guifi.net>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#    The full GNU General Public License is included in this distribution in
+#    the file called "COPYING".
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=luci-app-bmx7
+PKG_RELEASE:=0.0-alpha
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_LICENSE:=GPL-2.0+
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/luci-app-bmx7
+  SECTION:=luci
+  CATEGORY:=LuCI
+  SUBMENU:=3. Applications
+  TITLE:= LuCI support for BMX7
+  DEPENDS:=+luci-lib-json +luci-mod-admin-full +luci-lib-httpclient +bmx7
+  MAINTAINER:= Roger Pueyo Centelles <roger.pueyo@guifi.net>
+endef
+
+define Package/luci-app-bmx7/description
+	LuCI application for web-based configuration and visualization of the BMX7 routing daemon
+endef
+
+define Package/luci-app-bmx7/conffiles
+endef
+
+define Build/Prepare
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/luci-app-bmx7/install
+endef
+
+$(eval $(call BuildPackage,luci-app-bmx7))
+

From 1ee363fc224f9aa414165418e5cd0a94e7a45568 Mon Sep 17 00:00:00 2001
From: Roger Pueyo Centelles <roger.pueyo@guifi.net>
Date: Thu, 10 Mar 2016 11:17:33 +0100
Subject: [PATCH 225/368] [luci-app-bmx7] Add empty controller and default
 configurations for BMX7 LuCI

---
 luci-app-bmx7/files/etc/config/luci-bmx7      |  7 +++
 .../usr/lib/lua/luci/controller/bmx7.lua      | 50 +++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 luci-app-bmx7/files/etc/config/luci-bmx7
 create mode 100644 luci-app-bmx7/files/usr/lib/lua/luci/controller/bmx7.lua

diff --git a/luci-app-bmx7/files/etc/config/luci-bmx7 b/luci-app-bmx7/files/etc/config/luci-bmx7
new file mode 100644
index 0000000..46a7727
--- /dev/null
+++ b/luci-app-bmx7/files/etc/config/luci-bmx7
@@ -0,0 +1,7 @@
+config 'bmx7' 'luci'
+	option ignore '0'
+	option place 'admin network BMX7'
+	#option place 'qmp Mesh'
+	option position '3'
+	#option json 'http://127.0.0.1/cgi-bin/bmx7-info?'
+	option json 'exec:/www/cgi-bin/bmx7-info -s'
diff --git a/luci-app-bmx7/files/usr/lib/lua/luci/controller/bmx7.lua b/luci-app-bmx7/files/usr/lib/lua/luci/controller/bmx7.lua
new file mode 100644
index 0000000..a94b5e1
--- /dev/null
+++ b/luci-app-bmx7/files/usr/lib/lua/luci/controller/bmx7.lua
@@ -0,0 +1,50 @@
+--[[
+    Copyright (C) 2011 Pau Escrich <pau@dabax.net>
+    Contributors Jo-Philipp Wich <xm@subsignal.org>
+                 Roger Pueyo Centelles <roger.pueyo@guifi.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+    The full GNU General Public License is included in this distribution in
+    the file called "COPYING".
+--]]
+
+module("luci.controller.bmx7", package.seeall)
+
+function index()
+	local place = {}
+	local ucim = require "luci.model.uci"
+	local uci = ucim.cursor()
+
+	-- checking if ignore is on
+	if uci:get("luci-bmx7","luci","ignore") == "1" then
+		return nil
+	end
+
+	-- getting value from uci database
+	local uci_place = uci:get("luci-bmx7","luci","place")
+
+	-- default values
+	if uci_place == nil then
+		place = {"bmx7"}
+	else
+		local util = require "luci.util"
+		place = util.split(uci_place," ")
+	end
+
+	-- getting position of menu
+	local uci_position = uci:get("luci-bmx7","luci","position")
+
+end
\ No newline at end of file

From 8db0fb709d2062c4b2b430a7d61fdf2d6105b956 Mon Sep 17 00:00:00 2001
From: Roger Pueyo Centelles <roger.pueyo@guifi.net>
Date: Thu, 10 Mar 2016 11:21:12 +0100
Subject: [PATCH 226/368] [luci-app-bmx7] Add Status page menu entry

---
 .../files/usr/lib/lua/luci/controller/bmx7.lua | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/luci-app-bmx7/files/usr/lib/lua/luci/controller/bmx7.lua b/luci-app-bmx7/files/usr/lib/lua/luci/controller/bmx7.lua
index a94b5e1..e24c2a9 100644
--- a/luci-app-bmx7/files/usr/lib/lua/luci/controller/bmx7.lua
+++ b/luci-app-bmx7/files/usr/lib/lua/luci/controller/bmx7.lua
@@ -47,4 +47,20 @@ function index()
 	-- getting position of menu
 	local uci_position = uci:get("luci-bmx7","luci","position")
 
-end
\ No newline at end of file
+
+	---------------------------
+	-- Placing the pages in the menu
+	---------------------------
+
+	-- Status (default)
+	entry(place,call("action_status_j"),place[#place],tonumber(uci_position))
+
+	table.insert(place,"Status")
+	entry(place,call("action_status_j"),"Status",0)
+	table.remove(place)
+
+end
+
+function action_status_j()
+	luci.template.render("bmx7/status_j", {})
+end

From 8b4cc4e121e46a552e1f27d3220d4468c2d1b138 Mon Sep 17 00:00:00 2001
From: Roger Pueyo Centelles <roger.pueyo@guifi.net>
Date: Thu, 10 Mar 2016 11:28:10 +0100
Subject: [PATCH 227/368] [luci-app-bmx7] Add Status view page

---
 .../usr/lib/lua/luci/view/bmx7/status_j.htm   | 182 ++++++++++++++++++
 1 file changed, 182 insertions(+)
 create mode 100644 luci-app-bmx7/files/usr/lib/lua/luci/view/bmx7/status_j.htm

diff --git a/luci-app-bmx7/files/usr/lib/lua/luci/view/bmx7/status_j.htm b/luci-app-bmx7/files/usr/lib/lua/luci/view/bmx7/status_j.htm
new file mode 100644
index 0000000..c6920f9
--- /dev/null
+++ b/luci-app-bmx7/files/usr/lib/lua/luci/view/bmx7/status_j.htm
@@ -0,0 +1,182 @@
+<%+header%>
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript" src="<%=resource%>/bmx7/js/polling.js"></script>
+
+<style>
+	div.hideme{
+		display: none;
+	}
+
+	div.info{
+		background: #FFF;
+		border: solid 1px;
+		height: 80px;
+		display: block;
+		overflow: auto;
+	}
+
+	div.inforow{
+		text-align:left;
+		display:inline-block;
+		width:20%;
+		margin:5px;
+		vertical-align:top;
+	}
+
+	#extra-info ul { list-style: none outside none; margin-left: 0em; }
+</style>
+
+<div class="cbi-map">
+	<center>
+		<img src="<%=resource%>/bmx7/bmx7logo.png" />
+		<br />
+		<br />
+		A mesh routing protocol for Linux devices.<br />
+		Visit <a href="http://bmx6.net">bmx6.net</a> for more information.<br />
+		<br />
+	</center>
+
+<div class="cbi-map-descr"></div>
+
+<fieldset class="cbi-section">
+	<legend><%:Node configuration%></legend>
+	<table class="cbi-section-table" id="config_table">
+		<tr class="cbi-section-table-titles">
+			<th class="cbi-section-table-cell"><%:Short ID%></th>
+			<th class="cbi-section-table-cell"><%:Node name%></th>
+			<th class="cbi-section-table-cell"><%:Primary IPv6 address%></th>
+			<th class="cbi-section-table-cell"><%:Node key%></th>
+			<th class="cbi-section-table-cell"><%:BMX7 revision%></th>
+		</tr>
+		<tr class="cbi-section-table-row">
+			<td colspan="5"><em><br /><%:Collecting data...%></em></td>
+		</tr>
+	</table>
+</fieldset>
+
+<fieldset class="cbi-section">
+	<legend><%:Node status%></legend>
+	<table class="cbi-section-table" id="status_table">
+		<tr class="cbi-section-table-titles">
+			<th class="cbi-section-table-cell"><%:Nodes seen%></th>
+			<th class="cbi-section-table-cell"><%:Neighbours%></th>
+			<th class="cbi-section-table-cell"><%:Tunnelled IPv6 address%></th>
+			<th class="cbi-section-table-cell"><%:Tunnelled IPv4 address%></th>
+			<th class="cbi-section-table-cell"><%:Uptime%></th>
+			<th class="cbi-section-table-cell"><%:CPU usage%></th>
+			<th class="cbi-section-table-cell"><%:Memory usage%></th>
+			<th class="cbi-section-table-cell"><%:Tx queue%></th>
+
+		</tr>
+		<tr class="cbi-section-table-row">
+			<td colspan="8"><em><br /><%:Collecting data...%></em></td>
+		</tr>
+	</table>
+</fieldset>
+
+<fieldset class="cbi-section">
+	<legend><%:Interfaces%></legend>
+	<table class="cbi-section-table" id="ifaces_table">
+		<tr class="cbi-section-table-titles">
+			<th class="cbi-section-table-cell"><%:Interface%></th>
+			<th class="cbi-section-table-cell"><%:State%></th>
+			<th class="cbi-section-table-cell"><%:Type%></th>
+			<th class="cbi-section-table-cell"><%:Max. rate%></th>
+			<th class="cbi-section-table-cell"><%:Link-local IPv6 address%></th>
+			<th class="cbi-section-table-cell"><%:Rx BpP%></th>
+			<th class="cbi-section-table-cell"><%:Tx BpP%></th>
+
+		</tr>
+		<tr class="cbi-section-table-row">
+			<td colspan="7"><em><br /><%:Collecting data...%></em></td>
+		</tr>
+	</table>
+</fieldset>
+
+<fieldset class="cbi-section">
+	<legend><%:Links%></legend>
+	<table class="cbi-section-table" id="links_table">
+		<tr class="cbi-section-table-titles">
+			<th class="cbi-section-table-cell"><%:Short ID%></th>
+			<th class="cbi-section-table-cell"><%:Name%></th>
+			<th class="cbi-section-table-cell"><%:Link key%></th>
+			<th class="cbi-section-table-cell"><%:Remote link-local IPv6 address%></th>
+			<th class="cbi-section-table-cell"><%:Device%></th>
+			<th class="cbi-section-table-cell"><%:Rx rate%></th>
+			<th class="cbi-section-table-cell"><%:Tx rate%></th>
+			<th class="cbi-section-table-cell"><%:Routes%></th>
+
+		</tr>
+		<tr class="cbi-section-table-row">
+			<td colspan="8"><em><br /><%:Collecting data...%></em></td>
+		</tr>
+	</table>
+</fieldset>
+
+
+</div>
+
+<script type="text/javascript">//<![CDATA[
+	new TablePooler(1,"/cgi-bin/bmx7-info", {'$info':''}, "config_table", function(st){
+		var res = Array();
+		var sta = st.info[0].status;
+		var ifaces = st.info[1].interfaces;
+
+		res.push([sta.shortId, sta.name, sta.primaryIp, sta.nodeKey, sta.revision]);
+		res.push(['','','','',''])
+		res.push(['','','','',''])
+
+		return res;
+	});
+
+
+	new TablePooler(1,"/cgi-bin/bmx7-info", {'$info':''}, "status_table", function(st){
+		var res = Array();
+		var sta = st.info[0].status;
+		var mem = st.info[3].memory;
+
+		var txQ = sta.txQ.split('/');
+		console.log(txQ)
+
+		var ptxQ = '<p style="color:rgb('+parseInt(255*txQ[0]/txQ[1])+','+parseInt(128*(txQ[1]-txQ[0])/txQ[1])+',0)")>'+sta.txQ+'</p>';
+		console.log(ptxQ)
+
+		res.push([sta.nodes, sta.nbs, sta.tun6Address, sta.tun4Address, sta.uptime, sta.cpu, mem.bmx7, ptxQ]);
+
+		res.push(['','','','','','','',''])
+		res.push(['','','','','','','',''])
+
+		return res;
+	});
+
+		new TablePooler(1,"/cgi-bin/bmx7-info", {'$info':''}, "ifaces_table", function(st){
+		var res = Array();
+		var sta = st.info[0].status;
+		var ifaces = st.info[1].interfaces;
+
+		ifaces.forEach(function(iface){
+			res.push([iface.dev, iface.state, iface.type, iface.rateMax, iface.localIp, iface.rxBpP, iface.txBpP]);
+		});
+		res.push(['','','','','','',''])
+		if (ifaces.length % 2 == 0)
+			res.push('')
+		res.push(['','','','','','',''])
+		return res;
+	});
+
+		new TablePooler(1,"/cgi-bin/bmx7-info", {'links':''}, "links_table", function(st){
+		var res = Array();
+		links = st.links;
+
+		links.forEach(function(link){
+			res.push([link.shortId, link.name, link.linkKey, link.nbLocalIp, link.dev, link.rxRate, link.txRate, link.routes]);
+		});
+		res.push(['','','','','','','',''])
+		if (links.length % 2 == 0)
+			res.push([])
+		res.push(['','','','','','','',''])
+		return res;
+	});
+//]]></script>
+
+<%+footer%>

From 5416bcc13c1cf88d6aac1e9d5ecc158ac346c883 Mon Sep 17 00:00:00 2001
From: Roger Pueyo Centelles <roger.pueyo@guifi.net>
Date: Thu, 10 Mar 2016 11:28:42 +0100
Subject: [PATCH 228/368] [luci-app-bmx7] Add polling.js resource

---
 .../luci-static/resources/bmx7/js/polling.js  | 80 +++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 luci-app-bmx7/files/www/luci-static/resources/bmx7/js/polling.js

diff --git a/luci-app-bmx7/files/www/luci-static/resources/bmx7/js/polling.js b/luci-app-bmx7/files/www/luci-static/resources/bmx7/js/polling.js
new file mode 100644
index 0000000..4a382eb
--- /dev/null
+++ b/luci-app-bmx7/files/www/luci-static/resources/bmx7/js/polling.js
@@ -0,0 +1,80 @@
+/*
+    Copyright © 2011 Pau Escrich <pau@dabax.net>
+    Contributors Lluis Esquerda <eskerda@gmail.com>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+    The full GNU General Public License is included in this distribution in
+    the file called "COPYING".
+*/
+
+
+/*
+	Table pooler is a function to easy call XHR poller. 
+
+	new TablePooler(5,"/cgi-bin/bmx7-info", {'status':''}, "status_table", function(st){
+		var table = Array()
+		table.push(st.first,st.second)
+		return table
+	}
+
+	The parameters are: 
+		polling_time: time between pollings
+		json_url: the json url to fetch the data
+		json_call: the json call
+		output_table_id: the table where javascript will put the data
+		callback_function: the function that will be executed each polling_time
+	
+	The callback_function must return an array of arrays (matrix).
+	In the code st is the data obtained from the json call
+*/
+
+function TablePooler (time, jsonurl, getparams, table_id, callback) {
+	this.table = document.getElementById(table_id);
+	this.callback = callback;
+	this.jsonurl = jsonurl;
+	this.getparams = getparams;
+	this.time = time;
+
+	/* clear all rows */
+	this.clear = function(){
+		while( this.table.rows.length > 1 ) this.table.deleteRow(1);
+	}
+
+	this.start = function(){
+		XHR.poll(this.time, this.jsonurl, this.getparams, function(x, st){
+			var data = this.callback(st);
+			var content, tr, td;
+			this.clear();
+			for (var i = 0; i < data.length; i++){
+				tr = this.table.insertRow(-1);
+				tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1);
+
+				for (var j = 0; j < data[i].length; j++){
+					td = tr.insertCell(-1);
+					if (data[i][j].length == 2) {
+						td.colSpan = data[i][j][1];
+						content = data[i][j][0];
+					}
+					else content = data[i][j];
+					td.innerHTML = content;
+				}
+			}
+		}.bind(this));
+	}
+
+
+	this.start();
+}

From 46c1f3d289d8806f2295a3318075dcc8d55b9b46 Mon Sep 17 00:00:00 2001
From: Roger Pueyo Centelles <roger.pueyo@guifi.net>
Date: Thu, 10 Mar 2016 11:30:22 +0100
Subject: [PATCH 229/368] [luci-app-bmx7] Add BMX7 logo resource

---
 .../www/luci-static/resources/bmx7/bmx7logo.png  | Bin 0 -> 5121 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 luci-app-bmx7/files/www/luci-static/resources/bmx7/bmx7logo.png

diff --git a/luci-app-bmx7/files/www/luci-static/resources/bmx7/bmx7logo.png b/luci-app-bmx7/files/www/luci-static/resources/bmx7/bmx7logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7d9ceafaeb7e11706f9363f4b97f4cd4d4ada2d
GIT binary patch
literal 5121
zcmV+c6#napP)<h;3K|Lk000e1NJLTq004mi001-y1^@s6t*2X-00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru-~#~>EF+^ne+&Qs6OKtl
zK~#9!?Ol6RROQ<L&7RAi8#CO-!Vp1>5YTcgZ!1rl#{;?4G_^eHNe#LPcC(wH>pOg>
zbx!3eEnQ$KV;Ab=0ux12F#XWaLOT`e5s(7Bq@jRt4ude)J<s<CK@9sHoZ;f7uV<}U
zOZR^F^FI51fA8}?w|65UBEoO<|C(gK4Z)2;pCu$*mwx9K7J~b2_<ti=PR^(J{PSI+
z8@Jzn2iC0l@83q~*Gycy4v_u*?|;R~ljU%^ez_-+0CG9-^2@8CP$&je4wK1*b?epv
z0Q7o2#*ZJ5#Kc6z#>QUvF{-YvMny#hY&IJJV8Vn62n`MW)nFiG+_-iS5D^3ca5}{x
zkV>TkDnv?33NkY@-L4%uas=zwuSaNTDCW<fkCiJ|UekfEsi{GFdOC`ViqO!|;C9bo
zFksiNU6?Ro!mk1Z5f41jKHsB9N7KoZl_C(R)xec2G@u$FB_*YEm3bnA!GQVm=OZ;W
zbwI&TUS5v%>(?VUHy38Jxkq^l3kzX18gGh;KK|~zsM)zwbX{dIAmPIg!Eqco&mN*=
zzyxb(Xz&UE9c?o+Ghs9uk&%(%)ib`X{G_BLj2SZqCX=a00CdQcmX_A<ats6sb~}DN
zaDaI)JU$-W&o+Ta5Og%?Z?f5JNJ>ibc@P^K8n9x;3QU|h5&8M~eU`&)HX|b=14g3}
zCX>l0d5VgPkeZr$!-L?bFTaGNrG>G+B?#~0l5#`@77hjq1o`>-Zj%@j6NAXeNUxtS
zEiJ{v4?m2gq@=5^+MakAjYh0kv7*;JGBYzpHp7iZXZG%8UcdF8d!P;u{$;LRE@A;?
zz(BBW-8#JW)?28mssa(Ayu2LM)zv62F7`>Am`o-N88QT~zy7+{tGK471_=oX7&B%J
zYHDh{?k_Ph5oKj%C@U*NNl6L*{O3O-GBOe=DJcUsfsKugFq_S=TCM0!P`Bm61zbLP
zvPXlk%Ss$ZQYi@d<;QWLz(5rZ1l8Bqd%PDD6XPa_x4&7lW_9xI%K!ZN^PT@LE-og6
z!QeCRn3x!{TCE~ktyU{#WMmA;7(M^|^Q2HHi065d%jLvz97&~8N>5Msn#YOFn`wJ|
zyy#c($3K$bbh@>@<~D)BVCZqh^>&L%NlAg(Y<63n>FMdHuC7LEYAO;E5_+Y+<KyGO
z^StOf&+|x5PVV>d$;->bd+)smyWI|(%?5|V0hh}Ky<U&y%a?m+5IP(<w|~E9gRq<H
zFY^Qfsr1@Mlso+I2@@t@-n@C3Fku38IvoHYDJcm@j~?~-Y=>)i@ZdolJb1A4nog%f
zW@cuOTZX}4z~aS=q0{M5QBi^N@^aMF)WBx5T~k-Es;UZ)KKdxy+S=URIh6|e`S}<$
zXpmQYYL6U&y}6kU0#=S9Iy#)W9fXAF=~`1&Rh35-``vfnkxr-cN`-sduH%=Toh|CG
zu&|IOPo7LAB_-G7-CJ8*DIy|*IF56ZO{3A!+O=za;&o`%D&|)3ziDaA_L8WmFsiBf
z5rW_zQXV`w5a-V~-cZ(VQc@C3CKHTCBO)UsQCeE+X5eW7Oa@R0AQ-?10L5NtpOTW2
z>;7&JJ@gRv?%fNk)#|q8+<*W5*t2Jk*L<#AyokbO%a~D~ackBf^xk{LTR&?%7)bA+
zFBBUai*@VPp`@e)IXO8fEiJ|3#fyI#000F5oB%E{0AMf}ke!{~Y2}X}KOXbu&AaaJ
zwPC{s?Ay1`4FD2}1VKST*tTt(PrS|+7BT_A`}<??`0>nVWY^j-><i7BH4CAkp`C`B
zPNzdwRu;@=^Hl>#27>{`#l>!ksr>wWl$V!Z*LOO4^e9qOQ<-)^VPRpXP2>%^oKBqG
zw~u*m=pX(7PR1@D>A^dY-f$p@jEodn>O9XQD=Q15N00XS9MAK}$;lCACJhDyCQqJx
z-QK66p#d{z&J+PatyUv5GZQ06j`WG&#jn4H?ce_vT_*q$Jru3nR3PYSm9Jd6(&PQ)
z<mBr**-ST15HM@jEHrns;#DdY=FOXjB}<m{TZC}Xop(Yzc(7*>wBzLF*bc6?Rj|U(
zJkJkkWUsgM$}6wn<jIq8I2>Kvaw)>X!mxSsW}o@B)z_o$+i%$s!s*j{e71);!L`u@
zPNx&u+1YM>yq}*R7A{-}iNyO%rcS3rc6K(VOqtTji|2V{WMuf1o46K~pP!FSn>I1+
zfW3S7GJ{iB)dEFD%<BrB4udC7>=^`}G{Ln3!GQw@ker<CHsOLGVD#wGh>3~uIoMQE
zQi6{^{upMn8HtIBH(UWob#*lsFJ8>F13vxqQ$$2W_{`HK2srBj1Vg7ygH$f}T@y$o
zfJ}C6K;Uw@!1KJ@-l)-Npi-&a+I{uaSJ=02AF8UVaPHhWXti358Z`=|MvcPUxpSdb
zs{sH;qtRoO@5?X0#Noq-QCV4u>gsCTa?354G-*=jGk$)4qGy_#n()I9KZq8H(P;E}
zp;#;yBqSuDwY60QfTx~%3NvQR=+zk3efuq}moKxog6_$pzHSFZgyYAL;qc*uxOC|v
z>gz9|uI>`lYAx=%%ZL#pVh|l2gUHC?kY5FTU3s#A(J`sn+1W@-OG9&WGg@0);p$Qh
zxo_V-Xti3bSg``Hyz&ZOdg&!*zaM`1Azpp;Rn*tl!(y?(*`<uCL;c!pHe_aIV%f4~
zZqL5@>Z{neabu@E9b4Ff1q-ls>sFs8Ysr!&sI9Gadk48(j<~outX;dd*9+;ihhS20
zTpawosm2Nm3l@cqWirs%u_HUfil<Lk)3Rj?>DF6yq}MCR-(N*M&yif--c~LLX*6;Q
z3eu2HCnG;UDcy0$P+Gr!Ew!|?^cdnSC@3JkUhmewTrQ`&x;k3Ccrj_UTCYOCYPFgY
z5)#PaaCGvv*=#g_{(RDCG+y!0Xf(8Z`Eqi0$+G?Q(@!G#I{M4a&GkBzn~{;he3!t$
zK&q>&>vg!ft)YRoCnPY##Ao;K_lgIG3<)BR6N6y<_`9gN`9JjRv&p2>$w;l1iQ0Mk
zNhIw&0s_<&9IT;t-`(g@fZe-yiw0RDk<heh(@3pW`;-GvtJO4T&YaFv@0c-TeCDCi
zXy}ng9&wX#&z?O@K3c7o&YU@O)j|IH>#v#5tJP{ceE4vmat;-re8L34uDNr`X|s6;
zg3!=FCJ082x}EO4Gm3ONo;mp(2a-y0RbWV^pnw1+&7C`wnwy(N0_@tgi@DPL{QTVh
z&+|O#^?KrYo^(2$M-8FTXy}VCzM$pHmx~78TOKNvioXB;dp9|sdFC0BMv+RT6dM~$
zcDvo<05>!=FzXmJ8V$Yi#v6SCfXn5g&;Rr%CJ2sYW_ryBx7`-N1c62a(rOiMt6Qs8
zP;jueQ{@jEHkkbVdD3Vk6cnT(y<Wuxg+v0<>y<Qa+$d^mYjYD|=gyrX5Ga*Ow+R_O
zd^oLJw~h`TJV^ER^;B9~N?BQ16c`vtGMP-&Ur0!Z8vxX5H4Ps=oHlIOK!*+;qK1YB
zI(F<BWo2biKtO<qhfF4;1q&9q$!WLSDK0Kf)K;xl)3eV$%N$%m5NP7WiKI{{L|}}M
zkMDEl@!~h%FafYVKA!$__H5rkAd!F+3eF7_dcA_?&wr41?8v24rz$$p?{c~5?Afza
zSh$B$Q(q*#UQSA-l)1w6dL_-C{QwDq&?!J(ULI2ubO7MVC!b_i_7D-(*49!)L<Cb!
zcb%k^loYagP>r><wG<v6&Q#TByA9;&)2Er*L#<ZR-o1N8ykC0hC6V@!NF+3P@L;A^
z^p#5f@)srm{^z;peBy(U5Pgp-U9VSCSXeN9{&~Jv49m+;(%7*h$=_c|5{VdG{{BkZ
zy!jVZwPVK)CJ2;DB_$^(U$wvO+qd_q)}QlYK=ShPMB9%>qoFNZwusv1<m507O}$=E
zwY9ZwwhpVETCJuNCr<Pk0G6gE`fU1iCJ4?H75N5&TW{5Q1c6*Gp{S@ZpHb^{I%)3Q
z8RX~3Gi`*B5PhfD@Y!ddF^fR7S}ip;HhR@pP*9M^;u3FUcRHOE92_iKv8z|FX0~6t
zbg9VRkjZ2;cI;RZ1c7R5YDA#w0KnF*Tl=L5<<z!qOaSbhGlv`=G^Z!>m>_6Bg(Sz8
zEg$%l&g_UWY}~jRayf_Y;RZnfEEYRVruRI?2~;W-UU=aJ1O^6r)z`S6&(wA2k(!$7
zmFykCpYHLC%F0S+`%RlRAtWTkEx+P)I#E_uhE=OpF#|$Mr4n=I%n`*QdP78nvxS9h
zm;e6zA@ecp>@ka|)$(}o!8!Qd@22!h(2$T2{OxaRq0^~E_pV&AASdS^9zmc`C~z;M
z0>%@ChlewH+;h)8Uh@bG3lm-QRF<w(DzSU_Zc$XTt*s3kHf+F!3m4o1LLA2-EG!IJ
zSy}y)f<AEqtrsu$IzlJ{0qfjB`yfiOV#Ufn3A=RZ<8U}^=$;1>1mIu)I*z8MCMF1+
zPABfT;|{O;iHL|0MG74b2cn{)yyh`<=ulDSw6?a^WBU;!M&O-y-hoD=al3A_*<i6)
zL}B5=!a^vO%6<XC84nS{fT$?=_aa&5Q4?6L7M~`<Q!z(K$ZhDJl_mmsUWp%msAPh`
z;c)nL_*5p7LDsEm##bI%tyTo2uH{}VN=!^de0;n}BXkGAC!c)MtHcnCY|YL1$wN(K
zcrUboM-Xsa`?msgI(?soj*X22t2BY*q^PT_gUjU-0fFN<pVG)IQmIsZ=HU%}@WBTN
z2nb;IrB<u)#1l_o)~s3m*5A4P`$1igkayTMN+pK$vT(*D2*SgM^^4GV-+d3{av38@
zL}+NJ>(vpf8;Kka2kdq`^F2DMhx(JwcrXZuOql|C4;raQ5U{OJz+!3Z7oo3QxdK6O
zF}x26<Z{JL4}wP?dBo$PR-4U+haY|zO-)VxV-TJ^i7V&N_nSf3#V~X+L2&NexqcD+
zn{WQ<0R+IHLATu0Ab9)jw{hgi5!mf^k8N67TCiZjg8tD09%=~n!-gTy2P0Sn0@k+a
zasdv99Tz>gA-+&mRVDN2yVL2wEw|jfAUJmH7*?-d&5Q?h*9J$99Kk#9ywj)t>@6+$
z>F{B;7Pv|cVXwUdo>!r)>_nfKH#Rn+vGFpxD;th$j}OGgjzs(S5pFIZT)A=uGiJ;X
zxq=#v1`8K1bSpsVXrGprhU3SN_qxv?4;+B2OHpd4LCEtMGG$8NLBN^=v$+jvX)l7c
zU3g3B>8l}=DMkFHQsBP(rhw=9n^F@jS+YbF<4`CR7&mSlOePc7tXU(9A6P6F%$zw>
zq&fP!6@=b*9~9mC>KDTh0PJ=bYHCg+D{E7)7?+lQi|p*JXlW7q+J1g2ELrl{&-Ta7
z1%mhAe;-9fMWPsjpPwIca&iCwt5&Uo(P(swI}i~X8ykCd{J!zjDVROjXnipVueu$y
zYXb|?(q6_l-~7`jrWY<;z+;asg2f_;wgS0ag7ENg%$_~(rUOA`WhI_|`f1T>R;g6T
z%gaMhP*A7mvwiz^Xti3AHYg}4Kz4R^zi0v7(4hz#F=AjrAP7K9ixtzR-HR7qc;>3A
zjEG<|y@xyRj6zM#S=j9^ku9K7$?*2unVrEER<P(sB&*fRv;)*?HC}x2MNFDB$?f`}
zL4%N+n=7&pT3cI@oScm6>T2%{!q!$?ICN;hv;g3t+L+@2KR+eRW-IJ=7o1KPOr|Z!
z%ge#++4B(>Hxkj&BM=c0iA$F*qO$T7Dl02cSXh9nsw$YxR=1<>9WJ3x$0IfMzc6Xi
zWH;d4477ata$LN4(alDZ$z+I&i$i*PI`f&SQ>P+1IT@LmnQrF{I_!fJCr(`Ti?Qd6
ziy<&Ru))dY2%9>!e?Y)g4;&x}cIfp=G&ft}askcFR<yQSk&%%BtyT?*gkZH=piuDO
zI2l@7Ef53&3<DNYDWKCSv1ri}y!>*SNPFDqw0-+_<mTow4~*>GxwFS3d#}Cr8ov1A
z3zU_WLHK!P2!ep~=g;H$=buMLMn<o;g4-rdf`V~QqF1ERNJJGtG8t&fl!^4%V~fb&
zpC_3Nz51Y(L;_MOrR49=)BEpdF$)?tZ{92_&`>IsJ{3i*U%#GIDwU|9#8)0X&x?4R
zIdg_txujC5m?dQ_I(P0IlZQs5p@M<}y57VA1gR8mKaOip;+RYy<I_)fATn|&0s>T!
z%YmNGskVRI0+7kt_kNvDj^F=&3cmX4TP$6g=+Tb2k!j}4nIbztrBdPX#~(+6mw%%m
zEG!Hkee@C2K3KG9QI9F>YeBN<(;q}dMH%DeX9EBd5~ic9tQt8v|G<tNxj1yF7<RiI
za=8K$2?s$Cz;PUi1lVjA`1=Q7*s$ASG~SJ*q^A%U*Yg>Bj^p5Rx!jI``3ek~Oa>zA
z<UvHD)Ur1`Boc`m4?z%6QBmRM^SfLwgolUY%{SlliT|8AbFg5+0&Ls1&FyqoTU#4e
zu3YK!7fJe)B)<On8$l3o>Qn{l>Mr5(<pwl0U4~Al$L+UABRV?T=k&AHYDIp2zMH`n
z85!wQRS=6uR8*8tUmj~~Ys2o{yWIe2Fc?Iiy^}~Jm^yVTg1dYX)a%f%-Hw8S0#UBv
juDk9+baeD}1Hu0RzYjScl+9Uu00000NkvXXu0mjf+fKzK

literal 0
HcmV?d00001


From 2e6bf4dc6a6988ef07ea083489d3dcf004668d4e Mon Sep 17 00:00:00 2001
From: Roger Pueyo Centelles <roger.pueyo@guifi.net>
Date: Thu, 10 Mar 2016 11:37:46 +0100
Subject: [PATCH 230/368] [luci-app-bmx7] Add bmx7-info script to obtain
 JSON-formatted input for the Status page

---
 luci-app-bmx7/files/www/cgi-bin/bmx7-info | 136 ++++++++++++++++++++++
 1 file changed, 136 insertions(+)
 create mode 100755 luci-app-bmx7/files/www/cgi-bin/bmx7-info

diff --git a/luci-app-bmx7/files/www/cgi-bin/bmx7-info b/luci-app-bmx7/files/www/cgi-bin/bmx7-info
new file mode 100755
index 0000000..8c501c5
--- /dev/null
+++ b/luci-app-bmx7/files/www/cgi-bin/bmx7-info
@@ -0,0 +1,136 @@
+#!/bin/sh
+#    Copyright © 2011 Pau Escrich
+#    Contributors Jo-Philipp Wich <xm@subsignal.org>
+#                 Roger Pueyo Centelles <roger.pueyo@guifi.net>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#    The full GNU General Public License is included in this distribution in
+#    the file called "COPYING".
+#
+#    This script gives information about bmx7
+#    Can be executed from a linux shell: ./bmx7-info -s links
+#    Or from web interfae (with cgi enabled): http://host/cgi-bin/bmx7-info?links
+#    If you ask for a directory you wil get the directory contents in JSON forman
+
+BMX7_DIR="$(uci get bmx7.general.runtimeDir 2>/dev/null)" || BMX7_DIR="/var/run/bmx7/json"
+
+#Checking if shell mode or cgi-bin mode
+if [ "$1" == "-s" ]; then
+	QUERY="$2"
+else
+	QUERY="${QUERY_STRING%%=*}"
+	echo "Content-type: application/json"
+	echo ""
+
+fi
+
+check_path() {
+        [ -d "$1" ] && path=$(cd $1; pwd)
+        [ -f "$1" ] && path=$(cd $1/..; pwd)
+        [ $(echo "$path" | grep -c "^$BMX7_DIR") -ne 1 ] && exit 1
+}
+
+print_mem() {
+	echo -n '{ "memory": { "bmx7": "'
+	cat /proc/$(cat /var/run/bmx7/pid)/status |grep -i VmSize | tr -s " " | cut -d " " -f 2,3 | tr -d "\n"
+	echo '"}}'
+}
+
+print_query() {
+	# If the query is a directory
+	[ -d "$BMX7_DIR/$1" ] &&
+        {
+	# If /all has not been specified
+		[ -z "$QALL" ] &&
+		{
+		total=$(ls $BMX7_DIR/$1 | wc -w)
+		i=1
+        	echo -n "{ \"$1\": [ "
+	        for f in $(ls $BMX7_DIR/$1); do
+			echo -n "{ \"name\": \"$f\" }"
+			[ $i -lt $total ]  && echo -n ','
+			i=$(( $i + 1 ))
+        	done
+	        echo -n " ] }"
+
+	# If /all has been specified, printing all the files together
+		} || {
+		comma=""
+		echo -n "[ "
+		for entry in "$BMX7_DIR/$1/"*; do
+			[ -f "$entry" ] &&
+			{
+				${comma:+echo "$comma"}
+				tr -d '\n' < "$entry"
+				comma=","
+			}
+		done
+		echo -n " ]"
+		}
+        }
+
+	# If the query is a file, just printing the file
+	[ -f "$BMX7_DIR/$1" ] && cat "$BMX7_DIR/$1";
+}
+
+if [ "${QUERY##*/}" == "all" ]; then
+	QUERY="${QUERY%/all}"
+	QALL=1
+fi
+
+if [ "$QUERY" == '$info' ]; then
+	echo '{ "info": [ '
+	print_query status
+	echo -n ","
+	print_query interfaces
+	echo -n ","
+	print_query links
+	echo -n ","
+	print_mem
+	echo "] }"
+fi
+
+if [ "$QUERY" == '$neighbours' ]; then
+	QALL=1
+	echo '{ "neighbours": [ '
+	echo '{ "originators": '
+	print_query originators
+	echo '}, '
+	echo '{ "descriptions": '
+	print_query descriptions
+	echo "} ] }"
+	exit 0
+
+else if [ "$QUERY" == '$tunnels' ]; then
+	bmx7 -c --jshow tunnels /r=0
+	exit 0
+
+	else if [ "$QUERY" == '$originators' ]; then
+		bmx7 -c --jshow originators /r=0
+		exit 0
+
+		else
+		check_path "$BMX7_DIR/$QUERY"
+		print_query $QUERY
+		exit 0
+		fi
+	fi
+fi
+fi
+
+ls -1F "$BMX7_DIR"
+exit 0
+

From a9eb910899d98c0c8862acef0e6ec39e4533c998 Mon Sep 17 00:00:00 2001
From: Roger Pueyo Centelles <roger.pueyo@guifi.net>
Date: Thu, 10 Mar 2016 12:18:27 +0100
Subject: [PATCH 231/368] [luci-app-bmx7] Update configuration and installation
 definitions in Makefile

---
 luci-app-bmx7/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/luci-app-bmx7/Makefile b/luci-app-bmx7/Makefile
index 2946849..a9e96f7 100644
--- a/luci-app-bmx7/Makefile
+++ b/luci-app-bmx7/Makefile
@@ -42,6 +42,7 @@ define Package/luci-app-bmx7/description
 endef
 
 define Package/luci-app-bmx7/conffiles
+	/etc/config/luci-bmx7
 endef
 
 define Build/Prepare
@@ -54,6 +55,8 @@ define Build/Compile
 endef
 
 define Package/luci-app-bmx7/install
+	$(CP) ./files/* $(1)/
+	chmod 755 $(1)/www/cgi-bin/bmx7-info
 endef
 
 $(eval $(call BuildPackage,luci-app-bmx7))

From 246dfbe00d003ba1d9b52972c06fea821dfec0b1 Mon Sep 17 00:00:00 2001
From: Roger Pueyo Centelles <roger.pueyo@guifi.net>
Date: Thu, 10 Mar 2016 13:41:21 +0100
Subject: [PATCH 232/368] [luci-app-bmx7] Add Nodes page menu entry

---
 .../files/usr/lib/lua/luci/controller/bmx7.lua        | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/luci-app-bmx7/files/usr/lib/lua/luci/controller/bmx7.lua b/luci-app-bmx7/files/usr/lib/lua/luci/controller/bmx7.lua
index e24c2a9..ed62628 100644
--- a/luci-app-bmx7/files/usr/lib/lua/luci/controller/bmx7.lua
+++ b/luci-app-bmx7/files/usr/lib/lua/luci/controller/bmx7.lua
@@ -59,8 +59,19 @@ function index()
 	entry(place,call("action_status_j"),"Status",0)
 	table.remove(place)
 
+	-- Nodes list
+	table.insert(place,"Nodes")
+	entry(place,call("action_nodes_j"),"Nodes",1)
+	table.remove(place)
 end
 
+
 function action_status_j()
 	luci.template.render("bmx7/status_j", {})
 end
+
+function action_nodes_j()
+	local http = require "luci.http"
+	local link_non_js = "/cgi-bin/luci" .. http.getenv("PATH_INFO") .. '/nodes_nojs'
+	luci.template.render("bmx7/nodes_j", {link_non_js=link_non_js})
+end

From 499d8cfba4cf3f7cb01f5018d750c4374f2c5369 Mon Sep 17 00:00:00 2001
From: Roger Pueyo Centelles <roger.pueyo@guifi.net>
Date: Thu, 10 Mar 2016 13:41:35 +0100
Subject: [PATCH 233/368] [luci-app-bmx7] Add Nodes view page

---
 .../usr/lib/lua/luci/view/bmx7/nodes_j.htm    | 175 ++++++++++++++++++
 1 file changed, 175 insertions(+)
 create mode 100644 luci-app-bmx7/files/usr/lib/lua/luci/view/bmx7/nodes_j.htm

diff --git a/luci-app-bmx7/files/usr/lib/lua/luci/view/bmx7/nodes_j.htm b/luci-app-bmx7/files/usr/lib/lua/luci/view/bmx7/nodes_j.htm
new file mode 100644
index 0000000..347af42
--- /dev/null
+++ b/luci-app-bmx7/files/usr/lib/lua/luci/view/bmx7/nodes_j.htm
@@ -0,0 +1,175 @@
+<%#
+   Copyright © 2011 Pau Escrich <pau@dabax.net>
+   Contributors Lluis Esquerda <eskerda@gmail.com>
+                Roger Pueyo Centelles <roger.pueyo@guifi.net>
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+   The full GNU General Public License is included in this distribution in
+   the file called "COPYING".
+-%>
+
+<%+header%>
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript" src="<%=resource%>/bmx7/js/polling.js"></script>
+
+
+<style>
+
+	div.hideme{
+		display: none;
+	}
+
+	div.info{
+		background: #FFF;
+		border: solid 0px;
+		height: 90px;
+		display: block;
+		overflow: auto;
+	}
+
+	div.inforow{
+		text-align:left;
+		display:inline-block;
+		margin:10px;
+		vertical-align:top;
+		float: left;
+		white-space:nowrap;
+	}
+
+	div.inforow.newline{
+		clear: both;
+	}
+
+	u {
+    text-decoration: underline;
+	} 
+
+#extra-info ul { list-style: none outside none; margin-left: 0em; }
+
+</style>
+<div class="cbi-map">
+
+<h2>Mesh nodes</h2>
+<div class="cbi-map-descr"></div>
+<div id="extra-info" class="info">
+	<br />
+	<center>
+	Tip: click the <img src="<%=resource%>/bmx7/world.png" /> icon to see individual node information.
+	</center>
+</div>
+<fieldset class="cbi-section">
+	<legend><%:Originators%></legend>
+	<table class="cbi-section-table" id="descriptions_table">
+		<tr class="cbi-section-table-titles">
+			<th class="cbi-section-table-cell"></th>
+			<th class="cbi-section-table-cell"><%:Name%></th>
+			<th class="cbi-section-table-cell"><%:Short ID%></th>
+			<th class="cbi-section-table-cell"><%:S/s/T/t%></th>
+			<th class="cbi-section-table-cell"><%:Primary IPv6 address%></th>
+			<th class="cbi-section-table-cell"><%:Via neighbour%></th>
+			<th class="cbi-section-table-cell"><%:Metric%></th>
+			<th class="cbi-section-table-cell"><%:Last desc.%></th>
+			<th class="cbi-section-table-cell"><%:Last ref.%></th>
+			<th class="cbi-section-table-cell"><%: %></th>
+		</tr>
+		<tr class="cbi-section-table-row">
+			<td colspan="11"><br /><center><em><%:Collecting data...%></em></center></td>
+		</tr>
+	</table>
+</fieldset>
+
+</div>
+
+<script type="text/javascript">//<![CDATA[
+		var displayExtraInfo = function ( id ) {
+			console.log('aaa'+id)
+			document.getElementById('extra-info').innerHTML = document.getElementById(id).innerHTML;
+		}
+
+		new TablePooler(5,"/cgi-bin/bmx7-info", {'$originators':''}, "descriptions_table", function(st){
+			var infoicon = "<%=resource%>/bmx7/world_small.png";
+			var originators = st.originators;
+			var res = Array();
+
+			originators.forEach(function(originator,i){
+				var name =  originator.name;
+				var shortId =  originator.shortId;
+				var nodeId = originator.nodeId;
+				var extensions = originator.name;
+				var SsTt = originator.S+'/'+originator.s+'/'+originator.T+'/'+originator.t;
+				var nodeKey = originator.nodeKey;
+				var descSize = originator.descSize;
+				var primaryIp = originator.primaryIp;
+				var nbName = originator.nbName;
+				var dev = originator.dev;
+				var nbLocalIp = originator.nbLocalIp;
+				var metric = originator.metric;
+				var lastDesc = originator.lastDesc;
+				var lastRef = originator.lastRef;
+				
+			var extrainfo = '<a onclick="displayExtraInfo(\'ip-' + i + '\')"><img src="' + infoicon + '" / ></a>';
+			var extrainfo_link = '<a onclick="displayExtraInfo(\'ip-' + i + '\')">' +  '<img src="' + infoicon + '" />' + '</a>';
+	
+			extrainfo = '<div id="ip-'+ i +'" class="hideme">'
+
+			+ "<div class='inforow'>"
+			+ "<h4><u>" + name  + '</u></h4>\n'
+			+ 'Node ID: ' + nodeId + "</div>"
+
+			+ "<div class='inforow'>"
+			+ "<h5>Primary IPv6 address</h5>\n"
+			+ primaryIp + "</div>\n"
+
+			+ "<div class='inforow'>"
+			+ "<h5>Support & Trust</h5>\n"
+			+ SsTt + "</div>\n"
+
+			+ "<div class='inforow'>"
+			+ "<h5>Node key</h5>\n"
+			+ nodeKey + "</div>\n"
+
+			+ "<div class='inforow newline'>"
+			+ "<h5>Via neighbour</h5>\n"
+			+ nbName + "</div>\n"
+
+			+ "<div class='inforow'>"
+			+ "<h5>Via device</h5>\n"
+			+ dev + "</div>\n"
+
+			+ "<div class='inforow'>"
+			+ "<h5>Via remote link-local IPv6 address</h5>\n"
+			+ nbLocalIp + "</div>\n"
+			
+			+ "<div class='inforow'>"
+			+ "<h5>Route metric</h5>\n"
+			+ metric + "</div>\n"
+
+			+ "<div class='inforow'>"
+			+ "<h5>Desc. size</h5>\n"
+			+ descSize + "</div>\n"
+
+			+ "\n</div>";
+
+			res.push([extrainfo_link, name, shortId, SsTt, primaryIp,
+								nbName, metric, lastDesc, lastRef, extrainfo]);
+
+		  });
+		  return res;
+		});
+//]]></script>
+
+<%+footer%>
+

From a8856d50910d1d3bfcbb7e98720b00255f0bac77 Mon Sep 17 00:00:00 2001
From: Roger Pueyo Centelles <roger.pueyo@guifi.net>
Date: Thu, 10 Mar 2016 13:42:29 +0100
Subject: [PATCH 234/368] [luci-app-bmx7] Add world icons resources

---
 .../www/luci-static/resources/bmx7/world.png     | Bin 0 -> 1885 bytes
 .../luci-static/resources/bmx7/world_small.png   | Bin 0 -> 923 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 luci-app-bmx7/files/www/luci-static/resources/bmx7/world.png
 create mode 100644 luci-app-bmx7/files/www/luci-static/resources/bmx7/world_small.png

diff --git a/luci-app-bmx7/files/www/luci-static/resources/bmx7/world.png b/luci-app-bmx7/files/www/luci-static/resources/bmx7/world.png
new file mode 100644
index 0000000000000000000000000000000000000000..29b53c957ebf3b58cb2948dac35e3fd1dd616345
GIT binary patch
literal 1885
zcmV-j2cr0iP)<h;3K|Lk000e1NJLTq000^Q000^Y1^@s6sY*=F00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru+zby48zVOG$S(i@2I@&f
zK~zY`#g<EKoaGgUpYz{l=AZG*c*ag<Y$tXS;~3`#O#>-WxFpc3m7qncN-I?rX?NYW
zDvNH4+EsT|yXXpagStQs5)>5#X#gQoNE`>SlQ_msY>z#@&&@Oc{r|eD5|AKS_Uw*6
z>3#I-J9^I%?osPX<*rwo(xu#TA)CFgwH<`68=)Cu*!k3S9Qcw+W~#evY1~c6___zB
zlr;_A)uuP)`cXdAMUT;O4UIUZh~tPLhIY##>*-q`%(s3#wmUOZ5V`eLdh&Ik_vhB1
zcM|CrYFq8mQg4QooxtftO2-hT6dFnyS|oZxV`<GHiX!?lGIM+&`;ds#?+H>$$@p^k
z>czS0Q@I_M-Pc`InS?Hlx(fn28cKmCKpc?FB<P5tD)j*6d9o)Htsm&i|G8ku@9zrw
z$HeC7QY*f;;Rfo-V+GlfPpGTYt77N|qM1aoLK6)IL;_kEF}yd&<V{b-NmCjdHB~k}
z`N5%qFKKIEY(8ENo}aHf*Jc`FoU{{S>n63WNCHpcxq{~io-1@bh2w$mns|Z6++2-9
z(v`?<vl&}*VcA!&Pj4(KrHWrU40EgX7q6_;m6f)&bXr&QD;-HClWaLLh9-z8bY0>3
z9Y6>pg<%-@mZDI|lExz$CDht>Ud9)jef@>>-;`3{7m@h3qkn(8`kR^?@5~pI(rB*{
zh$izZEmX>&?szm@m!{KZqqas6wHX;MGPJv!(#|e)JA-TKBr+K!^d+4#m66M{SPPOs
z?zW>)shxj%<J!}gW|tC$!Cidk#4#2YR&cgD40sAZG}vxC#8JS=$ZksIB!P;VnyKJy
z`)G#6Tow8T2UuEZa%+A|%vg|;@nq2`p9Eer0N$Hbd^Wo#O($ma#sc^4>m`x2aFZbu
zpUzP1%@Ndm_Us;Dp|Zw>i;ExzNh61*KsP)1orp{itk*hpS`H=}l}*LuTqL(0U7DDX
zrS%$~W)WH%*KchzK0eN|BL~<s*u&6Jf!Wyv@0`Dc5Mr4&pyPTTqCjabff9<%28~7w
z$8Xb#6c#$uQTxs?Ox?J_a?L|GGvrDI=Bf>v?SRV47KWK(ZKF;q)x&{9hp9KVxOKBa
zyWK+9H8ipC0uRUYDeNq>RokZB?x2Z*9(d>-?+z$ZAuH7tj6|N12M#bfyUfV`1BeQE
z_x;OcQYjwzMv{rkSIFhkJaqgJ!^3$lUaT@XInC!ctLSD-v0A0E-3DLB_anl%30mt8
zsFcrQ8}lqy7Re@4n6VK0F;kP*Fg2l7-)3)Povy6K^o>QXd~%H_5(Wnc**|uGu|vnH
zH7XQ)Q_L^daGVf#+rzXvlm=3FK)*Qij5;^|2`jNrJ{i*A-OZ&7<LJ8J$3BK(&}^>K
z*I(kZ$t83ngRW^*Dx1vRe1{;6C=cW~b@~J;D?@Kz21}G0-l62gSW)}?Z~q6n-$p-m
zY|M`QDvx|~A20p&k4RUZP(Z`P#pC?>YmD9>GtgINYH9}Cwu$i306UeWuRO%`^<^$!
zo&sl^tf?e@bhy&<@ZOuZBS=J+zkB-eKO7wDX}t3C+qB!;1VKO;`uLuUia^9*V&XG0
zxh@_&`XCz{Yec?_3Vk+LD`f063%4pr<daV+hPpM1iQuDCqxq{}%DSia_na-;K~)@&
zz;RT&QA2rcRM;Z$+Jr$wB4Km>U+)ry5r@YP5;Q~V8+D#|>@hx{zDiHdR#_uvS3aqR
zdo1<BnP+c^h!3EDG3(C0es*!Cy8e@M=iU=bG-X9GI+_qEv^atwB4Jrn7jDtt+e`n>
z9qiq^3qOt+=q*yt8q!``Re3!5=?}mC_Q`{#GhdnB<+QwZ=0_)f_2>ipRJge$VSSUJ
zwMpn~q1-yktE0Rcde~y(<8$oY)y=ctdl+wRiGm?~^v0X2q;Jc~BO@<AcWUhC_uR05
zd1d_BbMOD>>_6Z7kjS(#>@=EbU>XKiGJy!}8yck0-OcRGbq*gKC7ZO+y(TA*j;;Uf
z=_5Ptc{5y?+0-0A_+`HD8Ft>cpEqB9i+Zg=+RR{T5VTv|KRQZpA;*;~moQ9&LRXfx
z^(DS_{4hqbt9Wj5!8?6$cjB&&KD;{Dv(f0R&s3W<JWWNNP^t?HYH@K<Ofx~bugvPo
z3YE$tJv{{;dgM`BK3FLYF(TEK)}_B_v#-?qyC+8bU;J9o<<Bd6z2&@A>x9qMJ5i$H
z2KZrwp_^p8vQ(F=AcAR`7^Xqwx>&l2W(XNOK}<MND%gH+w(HlAjFdjO>mS`%Zsuz3
z@JPcA3+*8AT;H?8AjWZhbOg;Z34;I?$7Jm!QRtED%9u&RjN>?*DCSe%(LFuO{6Ffy
XJC$YshjJ?x00000NkvXXu0mjf;7FEt

literal 0
HcmV?d00001

diff --git a/luci-app-bmx7/files/www/luci-static/resources/bmx7/world_small.png b/luci-app-bmx7/files/www/luci-static/resources/bmx7/world_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5f31056c65084460d38d309afba7a848d37caf0
GIT binary patch
literal 923
zcmV;M17!S(P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru+zby494Y{9=1c$p11L#E
zK~y-)ZIjDuTy-49KfgOO_s&f3OeTzDW>SkJX=+>gNTc|mwMr`$#Fi=*>c*`IiVOb*
z7cL4eT!~w8rzqHf+NeZmlaQ%NNSfwh(>x}LnVCDU`<i?2+@GtIfH}J_obQLTI7e`R
zidE|!$8KfyWIFHIfzZ0tQfRiFu2}4c!CbPv-z)YXcbAq`TR%Kvn(pO%PZyp8NKlmy
zEib^b+V;5~ZRpwV<nrE+vLEnIGux~=&gDXnE{#eP%eJr`2g7nmr(&`p5{Y{|&eGII
z<>UVWzP`IXKfdiobEy>7sw<jiNW+v=Odq2a;qiKdLeddyZB>r0+Fu!7XW$9o-h=Y{
zJAQD|a7vMx6+;>UY&Shh)he#nBApQsPYA7BM^8Xg%TU~MZvjLBexBa=aDKPWwRd0T
z!OXe{qYAqXlR`dApt?-XZW6RZqH8fs8E0{ROUlFQwb`v&CJHb<w;GsHm9fcHLf7K>
zsRB+IVQivET-5;;K>$_+m#Apkbsla;z3+dk$OwSl`_czb<)7(auR0{-8j}-C=v_H#
zb(7P>$M8bI#Qg<I|CVulXtjK-Mx$evH*Q4%4hc(2*CwWF6sH!DUYp+DG>a=6{Ql<@
z`Ft;@hh9KLTkMqU*i|WYO^Vls2ZSP}6xT1FNMCw!kh!tHFpU<r889+3P9~kj_XOo?
zg+K1x!KnDm%|7PQ(u^pi5~a^>TyYd3g#6;88*i`AF5tEr(sNDPjwyW~79Xx~X6P(V
zt%WK&H0w1fU6T_z!Oe@uZwn#X3V<p^`MoR8e@kOiD7!mh#4?3qnfT2Xi&GQ4a`p@-
zpF2ul_aO!~I6rt~@%n{hp8!PmiuBz#U;emNb~=CGpT6Y!0a6C2kq|W!(tjk6SKFZ{
zu87x96*`}PdiCi8w{W}o$eLI-lA}M3%39SBNnIzG%~IN0XXxegD5{j_hWbQ*F7fNt
z;iGRpDbk))f?o!5iMLWW-yjlI@m(K32#6;yARQMi9upejTuf1>4@>|swPtrUJxA8-
xrf_W!O;2Jqnq)Hxvgwr4*PStYvJrpJ{~uzmj|OZihQ9y+002ovPDHLkV1ltKp)CLa

literal 0
HcmV?d00001


From 22040963a5241a382a604e3ec7150c06b7972395 Mon Sep 17 00:00:00 2001
From: Henning Rogge <hrogge@gmail.com>
Date: Thu, 5 May 2016 13:59:52 +0100
Subject: [PATCH 235/368] Add optional packages to OONF olsrd2

---
 oonf-olsrd2/Config.in | 29 +++++++++++++++++++++++++++++
 oonf-olsrd2/Makefile  | 16 +++++++++++++++-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 oonf-olsrd2/Config.in

diff --git a/oonf-olsrd2/Config.in b/oonf-olsrd2/Config.in
new file mode 100644
index 0000000..f46831b
--- /dev/null
+++ b/oonf-olsrd2/Config.in
@@ -0,0 +1,29 @@
+	# OONF Olsrd2 configuration
+	menu "Optional Plugins"
+		depends on PACKAGE_oonf-olsrd2
+
+	config OONF_NHDP_AUTOLL4
+		bool "Auto_LL4 plugin enabled"
+		help
+			The auto_ll4 plugin automatically generates linklocal IPv4 addresses on interfaces that do not contain IPv4 addresses.
+		default n
+
+	config OONF_OLSRV2_LAN_IMPORT
+		bool "Lan_import plugin enabled"
+		help
+			The lan_import plugin can read routing tables and automatically export them as locally attached networks in olsrd2.
+		default n
+
+	config OONF_OLSRV2_ROUTE_MODIFIER
+		bool "route_modifier plugin enabled"
+		help
+			The route_modifier plugin allows you to overwrite aspects of routes (like table/protocol) for certain destinations. 
+		default n
+
+	config OONF_GENERIC_DLEP_ROUTER
+		bool "dlep_router plugin enabled"
+		help
+			The dlep_router plugin can receive linklayer metadata over the DLEP protocol. 
+		default n
+
+	endmenu
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 20ee3b2..69cd97b 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -16,12 +16,21 @@ CMAKE_INSTALL:=1
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
+SPACE:=
+SPACE+=
+CMAKE_OPTIONAL_PLUGINS:= $(subst $(SPACE),;,$(strip \
+        $(if $(filter y,$(CONFIG_OONF_NHDP_AUTOLL4)),auto_ll4,) \
+        $(if $(filter y,$(CONFIG_OONF_OLSRV2_LAN_IMPORT)),lan_import,) \
+        $(if $(filter y,$(CONFIG_OONF_OLSRV2_ROUTE_MODIFIER)),route_modifier,) \
+        $(if $(filter y,$(CONFIG_OONF_GENERIC_DLEP_ROUTER)),dlep_router,) \
+    ))
+
 CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \
               -D OONF_LOGGING_LEVEL:String=debug \
               -D OONF_NO_TESTING:Bool=true \
               -D UCI:Bool=true \
               -D OONF_APP_DEFAULT_CFG_HANDLER:String=uci \
-              -D OONF_STATIC_PLUGINS:String="class;clock;duplicate_set;interface;layer2;packet_socket;rfc5444;socket;stream_socket;telnet;timer;viewer;os_clock;os_fd;os_interface;os_routing;os_system;nhdp;olsrv2;ff_dat_metric;neighbor_probing;nl80211_listener;link_config;layer2info;systeminfo;cfg_uciloader;cfg_compact;nhdpinfo;olsrv2info;netjsoninfo" \
+              -D OONF_STATIC_PLUGINS:String="class;clock;duplicate_set;interface;layer2;packet_socket;rfc5444;socket;stream_socket;telnet;timer;viewer;os_clock;os_fd;os_interface;os_routing;os_system;nhdp;olsrv2;ff_dat_metric;neighbor_probing;nl80211_listener;link_config;layer2info;systeminfo;cfg_uciloader;cfg_compact;nhdpinfo;olsrv2info;netjsoninfo;${CMAKE_OPTIONAL_PLUGINS}" \
               -D OONF_LIB_GIT:String=v$(PKG_VERSION)-archive \
               -D OONF_VERSION:String=$(PKG_VERSION) \
               -D INSTALL_LIB_DIR:Path=lib/oonf \
@@ -35,6 +44,7 @@ define Package/oonf-git/template
 	MAINTAINER:=Henning Rogge <hrogge@gmail.com>
 	SUBMENU:=OLSR.org network framework
 	URL:=http://www.olsr.org/
+	MENU:=1
 endef
 
 define Package/oonf-olsrd2
@@ -44,6 +54,10 @@ define Package/oonf-olsrd2
 	VERSION:=$(PKG_VERSION)
 endef
 
+define Package/oonf-olsrd2/config
+	source "$(SOURCE)/Config.in"
+endef
+
 Build/Compile=$(call Build/Compile/Default,olsrd2_static)
 Build/Install=
 

From 6b17ce6f61c7bf171610f7b360b6e42f3341c3dc Mon Sep 17 00:00:00 2001
From: Henning Rogge <hrogge@gmail.com>
Date: Thu, 5 May 2016 14:21:03 +0100
Subject: [PATCH 236/368] Add remotecontrol plugin to selectable Olsrd2 plugins

---
 oonf-olsrd2/Config.in | 6 ++++++
 oonf-olsrd2/Makefile  | 1 +
 2 files changed, 7 insertions(+)

diff --git a/oonf-olsrd2/Config.in b/oonf-olsrd2/Config.in
index f46831b..7cda518 100644
--- a/oonf-olsrd2/Config.in
+++ b/oonf-olsrd2/Config.in
@@ -26,4 +26,10 @@
 			The dlep_router plugin can receive linklayer metadata over the DLEP protocol. 
 		default n
 
+	config OONF_GENERIC_REMOTECONTROL
+		bool "remotecontrol plugin enabled"
+		help
+			The remotecontrol plugin allows you to control configuration and logging over the telnet plugin. Be careful not to open this functionality over the network without securing it.
+		default n
+
 	endmenu
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 69cd97b..5a576d7 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -23,6 +23,7 @@ CMAKE_OPTIONAL_PLUGINS:= $(subst $(SPACE),;,$(strip \
         $(if $(filter y,$(CONFIG_OONF_OLSRV2_LAN_IMPORT)),lan_import,) \
         $(if $(filter y,$(CONFIG_OONF_OLSRV2_ROUTE_MODIFIER)),route_modifier,) \
         $(if $(filter y,$(CONFIG_OONF_GENERIC_DLEP_ROUTER)),dlep_router,) \
+        $(if $(filter y,$(CONFIG_OONF_GENERIC_REMOTECONTROL)),remotecontrol,) \
     ))
 
 CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \

From 006b1918e33c2bbc3adea95f19639b25dbf09a5a Mon Sep 17 00:00:00 2001
From: Marek Lindner <mareklindner@neomailbox.ch>
Date: Thu, 5 May 2016 21:34:03 +0800
Subject: [PATCH 237/368] batman-adv: autoload cfg80211 kernel dependency

Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
 batman-adv/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 20664e1..0c3a65a 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -27,10 +27,10 @@ define KernelPackage/batman-adv
   URL:=https://www.open-mesh.org/
   MAINTAINER:=Marek Lindner <mareklindner@neomailbox.ch>
   SUBMENU:=Network Support
-  DEPENDS:=+KMOD_BATMAN_ADV_BLA:kmod-lib-crc16 +kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c +kmod-cfg80211
+  DEPENDS:=+KMOD_BATMAN_ADV_BLA:kmod-lib-crc16 +kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c +KMOD_BATMAN_ADV_BATMAN_V:kmod-cfg80211
   TITLE:=B.A.T.M.A.N. Adv
   FILES:=$(PKG_BUILD_DIR)/net/batman-adv/batman-adv.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,batman-adv)
+  AUTOLOAD:=$(call AutoLoad,50,cfg80211 batman-adv)
 endef
 
 define KernelPackage/batman-adv/description

From 6d329737f98d488afaeed4dc882bae25375848db Mon Sep 17 00:00:00 2001
From: Marek Lindner <mareklindner@neomailbox.ch>
Date: Fri, 6 May 2016 00:06:46 +0800
Subject: [PATCH 238/368] batman-adv: 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@neomailbox.ch>
---
 batman-adv/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 0c3a65a..8a77692 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -27,7 +27,7 @@ define KernelPackage/batman-adv
   URL:=https://www.open-mesh.org/
   MAINTAINER:=Marek Lindner <mareklindner@neomailbox.ch>
   SUBMENU:=Network Support
-  DEPENDS:=+KMOD_BATMAN_ADV_BLA:kmod-lib-crc16 +kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c +KMOD_BATMAN_ADV_BATMAN_V:kmod-cfg80211
+  DEPENDS:=+KMOD_BATMAN_ADV_BLA:kmod-lib-crc16 +kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c +kmod-cfg80211
   TITLE:=B.A.T.M.A.N. Adv
   FILES:=$(PKG_BUILD_DIR)/net/batman-adv/batman-adv.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,cfg80211 batman-adv)

From 8dec3dc38b514ed8f1212b51f9f6039af3fb0e04 Mon Sep 17 00:00:00 2001
From: Marek Lindner <mareklindner@neomailbox.ch>
Date: Sat, 7 May 2016 20:42:44 +0800
Subject: [PATCH 239/368] batman-adv: 2016.1 bugfixes & stability updates

Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
 ...sure-ELP-OGM-orig-MAC-is-updated-on-.patch |  64 ++++++++++
 ...Avoid-duplicate-neigh_node-additions.patch |  89 ++++++++++++++
 ...-nullptr-derefence-in-batadv_v_neigh.patch |  38 ++++++
 ...v-Fix-refcnt-leak-in-batadv_v_neigh_.patch |  81 +++++++++++++
 ...ouble-neigh_node_put-in-batadv_v_ogm.patch |  40 +++++++
 ...alize-ELP-orig-address-on-secondary-.patch | 110 ++++++++++++++++++
 6 files changed, 422 insertions(+)
 create mode 100644 batman-adv/patches/0001-batman-adv-make-sure-ELP-OGM-orig-MAC-is-updated-on-.patch
 create mode 100644 batman-adv/patches/0002-batman-adv-Avoid-duplicate-neigh_node-additions.patch
 create mode 100644 batman-adv/patches/0003-batman-adv-Avoid-nullptr-derefence-in-batadv_v_neigh.patch
 create mode 100644 batman-adv/patches/0004-batman-adv-Fix-refcnt-leak-in-batadv_v_neigh_.patch
 create mode 100644 batman-adv/patches/0005-batman-adv-Fix-double-neigh_node_put-in-batadv_v_ogm.patch
 create mode 100644 batman-adv/patches/0006-batman-adv-initialize-ELP-orig-address-on-secondary-.patch

diff --git a/batman-adv/patches/0001-batman-adv-make-sure-ELP-OGM-orig-MAC-is-updated-on-.patch b/batman-adv/patches/0001-batman-adv-make-sure-ELP-OGM-orig-MAC-is-updated-on-.patch
new file mode 100644
index 0000000..70adb91
--- /dev/null
+++ b/batman-adv/patches/0001-batman-adv-make-sure-ELP-OGM-orig-MAC-is-updated-on-.patch
@@ -0,0 +1,64 @@
+From a636bf0b69010222ea58337d425ca9ff8ce52639 Mon Sep 17 00:00:00 2001
+From: Antonio Quartulli <a@unstable.cc>
+Date: Mon, 2 May 2016 18:27:38 +0800
+Subject: [PATCH 1/6] batman-adv: make sure ELP/OGM orig MAC is updated on
+ address change
+
+When the MAC address of the primary interface is changed,
+update the originator address in the ELP and OGM skb buffers as
+well in order to reflect the change.
+
+Fixes: a4b88af77e28 ("batman-adv: ELP - adding basic infrastructure")
+Reported-by: Marek Lindner <marek@neomailbox.ch>
+Signed-off-by: Antonio Quartulli <a@unstable.cc>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ net/batman-adv/bat_v.c | 26 ++++++++++++++++++++++----
+ 1 file changed, 22 insertions(+), 4 deletions(-)
+
+diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c
+index 4026f19..4547fce 100644
+--- a/net/batman-adv/bat_v.c
++++ b/net/batman-adv/bat_v.c
+@@ -72,16 +72,34 @@ static void batadv_v_iface_disable(struct batadv_hard_iface *hard_iface)
+ 	batadv_v_elp_iface_disable(hard_iface);
+ }
+ 
+-static void batadv_v_iface_update_mac(struct batadv_hard_iface *hard_iface)
+-{
+-}
+-
+ static void batadv_v_primary_iface_set(struct batadv_hard_iface *hard_iface)
+ {
+ 	batadv_v_elp_primary_iface_set(hard_iface);
+ 	batadv_v_ogm_primary_iface_set(hard_iface);
+ }
+ 
++/**
++ * batadv_v_iface_update_mac - react to hard-interface MAC address change
++ * @hard_iface: the modified interface
++ *
++ * If the modified interface is the primary one, update the originator
++ * address in the ELP and OGM messages to reflect the new MAC address.
++ */
++static void batadv_v_iface_update_mac(struct batadv_hard_iface *hard_iface)
++{
++	struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
++	struct batadv_hard_iface *primary_if;
++
++	primary_if = batadv_primary_if_get_selected(bat_priv);
++	if (primary_if != hard_iface)
++		goto out;
++
++	batadv_v_primary_iface_set(hard_iface);
++out:
++	if (primary_if)
++		batadv_hardif_put(primary_if);
++}
++
+ static void
+ batadv_v_hardif_neigh_init(struct batadv_hardif_neigh_node *hardif_neigh)
+ {
+-- 
+2.8.0.rc3
+
diff --git a/batman-adv/patches/0002-batman-adv-Avoid-duplicate-neigh_node-additions.patch b/batman-adv/patches/0002-batman-adv-Avoid-duplicate-neigh_node-additions.patch
new file mode 100644
index 0000000..ea191b3
--- /dev/null
+++ b/batman-adv/patches/0002-batman-adv-Avoid-duplicate-neigh_node-additions.patch
@@ -0,0 +1,89 @@
+From 8013ae257447c99d7ba037967458f91ceb4051ae Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
+Date: Thu, 7 Jan 2016 08:11:12 +0100
+Subject: [PATCH 2/6] batman-adv: Avoid duplicate neigh_node additions
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Two parallel calls to batadv_neigh_node_new() might race for creating
+and adding the same neig_node. Fix this by including the check for any
+already existing, identical neigh_node within the spin-lock.
+
+This fixes splats like the following:
+
+[  739.535069] ------------[ cut here ]------------
+[  739.535079] WARNING: CPU: 0 PID: 0 at /usr/src/batman-adv/git/batman-adv/net/batman-adv/bat_iv_ogm.c:1004 batadv_iv_ogm_process_per_outif+0xe3f/0xe60 [batman_adv]()
+[  739.535092] too many matching neigh_nodes
+[  739.535094] Modules linked in: dm_mod tun ip6table_filter ip6table_mangle ip6table_nat nf_nat_ipv6 ip6_tables xt_nat iptable_nat nf_nat_ipv4 nf_nat xt_TCPMSS xt_mark iptable_mangle xt_tcpudp xt_conntrack iptable_filter ip_tables x_tables ip_gre ip_tunnel gre bridge stp llc thermal_sys kvm_intel kvm crct10dif_pclmul crc32_pclmul sha256_ssse3 sha256_generic hmac drbg ansi_cprng aesni_intel aes_x86_64 lrw gf128mul glue_helper ablk_helper cryptd evdev pcspkr ip6_gre ip6_tunnel tunnel6 batman_adv(O) libcrc32c nf_conntrack_ipv6 nf_defrag_ipv6 nf_conntrack_ipv4 nf_defrag_ipv4 nf_conntrack autofs4 ext4 crc16 mbcache jbd2 xen_netfront xen_blkfront crc32c_intel
+[  739.535177] CPU: 0 PID: 0 Comm: swapper/0 Tainted: G        W  O    4.2.0-0.bpo.1-amd64 #1 Debian 4.2.6-3~bpo8+2
+[  739.535186]  0000000000000000 ffffffffa013b050 ffffffff81554521 ffff88007d003c18
+[  739.535201]  ffffffff8106fa01 0000000000000000 ffff8800047a087a ffff880079c3a000
+[  739.735602]  ffff88007b82bf40 ffff88007bc2d1c0 ffffffff8106fa7a ffffffffa013aa8e
+[  739.735624] Call Trace:
+[  739.735639]  <IRQ>  [<ffffffff81554521>] ? dump_stack+0x40/0x50
+[  739.735677]  [<ffffffff8106fa01>] ? warn_slowpath_common+0x81/0xb0
+[  739.735692]  [<ffffffff8106fa7a>] ? warn_slowpath_fmt+0x4a/0x50
+[  739.735715]  [<ffffffffa012448f>] ? batadv_iv_ogm_process_per_outif+0xe3f/0xe60 [batman_adv]
+[  739.735740]  [<ffffffffa0124813>] ? batadv_iv_ogm_receive+0x363/0x380 [batman_adv]
+[  739.735762]  [<ffffffffa0124813>] ? batadv_iv_ogm_receive+0x363/0x380 [batman_adv]
+[  739.735783]  [<ffffffff810b0841>] ? __raw_callee_save___pv_queued_spin_unlock+0x11/0x20
+[  739.735804]  [<ffffffffa012cb39>] ? batadv_batman_skb_recv+0xc9/0x110 [batman_adv]
+[  739.735825]  [<ffffffff81464891>] ? __netif_receive_skb_core+0x841/0x9a0
+[  739.735838]  [<ffffffff810b0841>] ? __raw_callee_save___pv_queued_spin_unlock+0x11/0x20
+[  739.735853]  [<ffffffff81465681>] ? process_backlog+0xa1/0x140
+[  739.735864]  [<ffffffff81464f1a>] ? net_rx_action+0x20a/0x320
+[  739.735878]  [<ffffffff81073aa7>] ? __do_softirq+0x107/0x270
+[  739.735891]  [<ffffffff81073d82>] ? irq_exit+0x92/0xa0
+[  739.735905]  [<ffffffff8137e0d1>] ? xen_evtchn_do_upcall+0x31/0x40
+[  739.735924]  [<ffffffff8155b8fe>] ? xen_do_hypervisor_callback+0x1e/0x40
+[  739.735939]  <EOI>  [<ffffffff810013aa>] ? xen_hypercall_sched_op+0xa/0x20
+[  739.735965]  [<ffffffff810013aa>] ? xen_hypercall_sched_op+0xa/0x20
+[  739.735979]  [<ffffffff8100a39c>] ? xen_safe_halt+0xc/0x20
+[  739.735991]  [<ffffffff8101da6c>] ? default_idle+0x1c/0xa0
+[  739.736004]  [<ffffffff810abf6b>] ? cpu_startup_entry+0x2eb/0x350
+[  739.736019]  [<ffffffff81b2af5e>] ? start_kernel+0x480/0x48b
+[  739.736032]  [<ffffffff81b2d116>] ? xen_start_kernel+0x507/0x511
+[  739.736048] ---[ end trace c106bb901244bc8c ]---
+
+Reported-by: Martin Weinelt <martin@darmstadt.freifunk.net>
+Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ net/batman-adv/originator.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
+index c355a82..28241a4 100644
+--- a/net/batman-adv/originator.c
++++ b/net/batman-adv/originator.c
+@@ -630,6 +630,8 @@ batadv_neigh_node_new(struct batadv_orig_node *orig_node,
+ 	struct batadv_neigh_node *neigh_node;
+ 	struct batadv_hardif_neigh_node *hardif_neigh = NULL;
+ 
++	spin_lock_bh(&orig_node->neigh_list_lock);
++
+ 	neigh_node = batadv_neigh_node_get(orig_node, hard_iface, neigh_addr);
+ 	if (neigh_node)
+ 		goto out;
+@@ -666,15 +668,15 @@ batadv_neigh_node_new(struct batadv_orig_node *orig_node,
+ 	kref_init(&neigh_node->refcount);
+ 	kref_get(&neigh_node->refcount);
+ 
+-	spin_lock_bh(&orig_node->neigh_list_lock);
+ 	hlist_add_head_rcu(&neigh_node->list, &orig_node->neigh_list);
+-	spin_unlock_bh(&orig_node->neigh_list_lock);
+ 
+ 	batadv_dbg(BATADV_DBG_BATMAN, orig_node->bat_priv,
+ 		   "Creating new neighbor %pM for orig_node %pM on interface %s\n",
+ 		   neigh_addr, orig_node->orig, hard_iface->net_dev->name);
+ 
+ out:
++	spin_unlock_bh(&orig_node->neigh_list_lock);
++
+ 	if (hardif_neigh)
+ 		batadv_hardif_neigh_put(hardif_neigh);
+ 	return neigh_node;
+-- 
+2.8.0.rc3
+
diff --git a/batman-adv/patches/0003-batman-adv-Avoid-nullptr-derefence-in-batadv_v_neigh.patch b/batman-adv/patches/0003-batman-adv-Avoid-nullptr-derefence-in-batadv_v_neigh.patch
new file mode 100644
index 0000000..aa07ad5
--- /dev/null
+++ b/batman-adv/patches/0003-batman-adv-Avoid-nullptr-derefence-in-batadv_v_neigh.patch
@@ -0,0 +1,38 @@
+From 036aa7b7181ee96ae6971eb31dd97b6ace7c0a80 Mon Sep 17 00:00:00 2001
+From: Sven Eckelmann <sven@narfation.org>
+Date: Fri, 6 May 2016 11:43:38 +0200
+Subject: [PATCH 3/6] 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@narfation.org>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ 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;
+ 
+-- 
+2.8.0.rc3
+
diff --git a/batman-adv/patches/0004-batman-adv-Fix-refcnt-leak-in-batadv_v_neigh_.patch b/batman-adv/patches/0004-batman-adv-Fix-refcnt-leak-in-batadv_v_neigh_.patch
new file mode 100644
index 0000000..15ef21c
--- /dev/null
+++ b/batman-adv/patches/0004-batman-adv-Fix-refcnt-leak-in-batadv_v_neigh_.patch
@@ -0,0 +1,81 @@
+From 650d41de4be2fe9e9d1842c1abdd357dedbaa7ba Mon Sep 17 00:00:00 2001
+From: Sven Eckelmann <sven@narfation.org>
+Date: Fri, 6 May 2016 11:43:39 +0200
+Subject: [PATCH 4/6] batman-adv: Fix refcnt leak in batadv_v_neigh_*
+
+The functions batadv_neigh_ifinfo_get increase the reference counter of the
+batadv_neigh_ifinfo. These have to be reduced again when the reference is
+not used anymore to correctly free the objects.
+
+Fixes: b05bbab5e1fc ("batman-adv: B.A.T.M.A.N. V - implement neighbor comparison API calls")
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ net/batman-adv/bat_v.c | 32 +++++++++++++++++++++++++-------
+ 1 file changed, 25 insertions(+), 7 deletions(-)
+
+diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c
+index 7e1467a..2bcb29b 100644
+--- a/net/batman-adv/bat_v.c
++++ b/net/batman-adv/bat_v.c
+@@ -274,14 +274,23 @@ static int batadv_v_neigh_cmp(struct batadv_neigh_node *neigh1,
+ 			      struct batadv_hard_iface *if_outgoing2)
+ {
+ 	struct batadv_neigh_ifinfo *ifinfo1, *ifinfo2;
++	int ret = 0;
+ 
+ 	ifinfo1 = batadv_neigh_ifinfo_get(neigh1, if_outgoing1);
++	if (WARN_ON(!ifinfo1))
++		goto err_ifinfo1;
++
+ 	ifinfo2 = batadv_neigh_ifinfo_get(neigh2, if_outgoing2);
++	if (WARN_ON(!ifinfo2))
++		goto err_ifinfo2;
+ 
+-	if (WARN_ON(!ifinfo1 || !ifinfo2))
+-		return 0;
++	ret = ifinfo1->bat_v.throughput - ifinfo2->bat_v.throughput;
+ 
+-	return ifinfo1->bat_v.throughput - ifinfo2->bat_v.throughput;
++	batadv_neigh_ifinfo_put(ifinfo2);
++err_ifinfo2:
++	batadv_neigh_ifinfo_put(ifinfo1);
++err_ifinfo1:
++	return ret;
+ }
+ 
+ static bool batadv_v_neigh_is_sob(struct batadv_neigh_node *neigh1,
+@@ -291,17 +300,26 @@ static bool batadv_v_neigh_is_sob(struct batadv_neigh_node *neigh1,
+ {
+ 	struct batadv_neigh_ifinfo *ifinfo1, *ifinfo2;
+ 	u32 threshold;
++	bool ret = false;
+ 
+ 	ifinfo1 = batadv_neigh_ifinfo_get(neigh1, if_outgoing1);
+-	ifinfo2 = batadv_neigh_ifinfo_get(neigh2, if_outgoing2);
++	if (WARN_ON(!ifinfo1))
++		goto err_ifinfo1;
+ 
+-	if (WARN_ON(!ifinfo1 || !ifinfo2))
+-		return false;
++	ifinfo2 = batadv_neigh_ifinfo_get(neigh2, if_outgoing2);
++	if (WARN_ON(!ifinfo2))
++		goto err_ifinfo2;
+ 
+ 	threshold = ifinfo1->bat_v.throughput / 4;
+ 	threshold = ifinfo1->bat_v.throughput - threshold;
+ 
+-	return ifinfo2->bat_v.throughput > threshold;
++	ret = ifinfo2->bat_v.throughput > threshold;
++
++	batadv_neigh_ifinfo_put(ifinfo2);
++err_ifinfo2:
++	batadv_neigh_ifinfo_put(ifinfo1);
++err_ifinfo1:
++	return ret;
+ }
+ 
+ static struct batadv_algo_ops batadv_batman_v __read_mostly = {
+-- 
+2.8.0.rc3
+
diff --git a/batman-adv/patches/0005-batman-adv-Fix-double-neigh_node_put-in-batadv_v_ogm.patch b/batman-adv/patches/0005-batman-adv-Fix-double-neigh_node_put-in-batadv_v_ogm.patch
new file mode 100644
index 0000000..8ea3788
--- /dev/null
+++ b/batman-adv/patches/0005-batman-adv-Fix-double-neigh_node_put-in-batadv_v_ogm.patch
@@ -0,0 +1,40 @@
+From fc3e79d9ef2a1006f94e441d9613749cbbe7176a Mon Sep 17 00:00:00 2001
+From: Sven Eckelmann <sven@narfation.org>
+Date: Fri, 6 May 2016 22:27:09 +0200
+Subject: [PATCH 5/6] batman-adv: Fix double neigh_node_put in
+ batadv_v_ogm_route_update
+
+The router is put down twice when it was non-NULL and either orig_ifinfo is
+NULL afterwards or batman-adv receives a packet with the same sequence
+number. This will end up in a use-after-free when the batadv_neigh_node is
+removed because the reference counter ended up too early at 0.
+
+Fixes: 667996ebeab4 ("batman-adv: OGMv2 - implement originators logic")
+Reported-by: Gui Iribarren <gui@altermundi.net>
+Tested-by: Antonio Quartulli <a@unstable.cc>
+Tested-by: Marek Lindner <mareklindner@neomailbox.ch>
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ net/batman-adv/bat_v_ogm.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c
+index d9bcbe6..91df28a 100644
+--- a/net/batman-adv/bat_v_ogm.c
++++ b/net/batman-adv/bat_v_ogm.c
+@@ -529,8 +529,10 @@ static void batadv_v_ogm_route_update(struct batadv_priv *bat_priv,
+ 		goto out;
+ 	}
+ 
+-	if (router)
++	if (router) {
+ 		batadv_neigh_node_put(router);
++		router = NULL;
++	}
+ 
+ 	/* 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,
+-- 
+2.8.0.rc3
+
diff --git a/batman-adv/patches/0006-batman-adv-initialize-ELP-orig-address-on-secondary-.patch b/batman-adv/patches/0006-batman-adv-initialize-ELP-orig-address-on-secondary-.patch
new file mode 100644
index 0000000..f87ddf0
--- /dev/null
+++ b/batman-adv/patches/0006-batman-adv-initialize-ELP-orig-address-on-secondary-.patch
@@ -0,0 +1,110 @@
+From f58a0b03873fd3aa9568c11af198f997ed2208cc Mon Sep 17 00:00:00 2001
+From: Marek Lindner <mareklindner@neomailbox.ch>
+Date: Sat, 7 May 2016 19:54:17 +0800
+Subject: [PATCH 6/6] batman-adv: initialize ELP orig address on secondary
+ interfaces
+
+This fix prevents nodes to wrongly create a 00:00:00:00:00:00 originator
+which can potentially interfere with the rest of the neighbor statistics.
+
+Fixes: a4b88af77e28 ("batman-adv: ELP - adding basic infrastructure")
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+---
+ net/batman-adv/bat_v.c     | 10 ++++++++++
+ net/batman-adv/bat_v_elp.c | 31 ++++++++++++++++++++++---------
+ net/batman-adv/bat_v_elp.h |  2 ++
+ 3 files changed, 34 insertions(+), 9 deletions(-)
+
+diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c
+index 2bcb29b..0caca2f 100644
+--- a/net/batman-adv/bat_v.c
++++ b/net/batman-adv/bat_v.c
+@@ -39,6 +39,16 @@
+ 
+ static void batadv_v_iface_activate(struct batadv_hard_iface *hard_iface)
+ {
++	struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
++	struct batadv_hard_iface *primary_if;
++
++	primary_if = batadv_primary_if_get_selected(bat_priv);
++
++	if (primary_if) {
++		batadv_v_elp_iface_activate(primary_if, hard_iface);
++		batadv_hardif_put(primary_if);
++	}
++
+ 	/* B.A.T.M.A.N. V does not use any queuing mechanism, therefore it can
+ 	 * set the interface as ACTIVE right away, without any risk of race
+ 	 * condition
+diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
+index 3844e7e..df42eb1 100644
+--- a/net/batman-adv/bat_v_elp.c
++++ b/net/batman-adv/bat_v_elp.c
+@@ -377,6 +377,27 @@ void batadv_v_elp_iface_disable(struct batadv_hard_iface *hard_iface)
+ }
+ 
+ /**
++ * batadv_v_elp_iface_activate - update the ELP buffer belonging to the given
++ *  hard-interface
++ * @primary_iface: the new primary interface
++ * @hard_iface: interface holding the to-be-updated buffer
++ */
++void batadv_v_elp_iface_activate(struct batadv_hard_iface *primary_iface,
++				 struct batadv_hard_iface *hard_iface)
++{
++	struct batadv_elp_packet *elp_packet;
++	struct sk_buff *skb;
++
++	if (!hard_iface->bat_v.elp_skb)
++		return;
++
++	skb = hard_iface->bat_v.elp_skb;
++	elp_packet = (struct batadv_elp_packet *)skb->data;
++	ether_addr_copy(elp_packet->orig,
++			primary_iface->net_dev->dev_addr);
++}
++
++/**
+  * batadv_v_elp_primary_iface_set - change internal data to reflect the new
+  *  primary interface
+  * @primary_iface: the new primary interface
+@@ -384,8 +405,6 @@ void batadv_v_elp_iface_disable(struct batadv_hard_iface *hard_iface)
+ void batadv_v_elp_primary_iface_set(struct batadv_hard_iface *primary_iface)
+ {
+ 	struct batadv_hard_iface *hard_iface;
+-	struct batadv_elp_packet *elp_packet;
+-	struct sk_buff *skb;
+ 
+ 	/* update orig field of every elp iface belonging to this mesh */
+ 	rcu_read_lock();
+@@ -393,13 +412,7 @@ void batadv_v_elp_primary_iface_set(struct batadv_hard_iface *primary_iface)
+ 		if (primary_iface->soft_iface != hard_iface->soft_iface)
+ 			continue;
+ 
+-		if (!hard_iface->bat_v.elp_skb)
+-			continue;
+-
+-		skb = hard_iface->bat_v.elp_skb;
+-		elp_packet = (struct batadv_elp_packet *)skb->data;
+-		ether_addr_copy(elp_packet->orig,
+-				primary_iface->net_dev->dev_addr);
++		batadv_v_elp_iface_activate(primary_iface, hard_iface);
+ 	}
+ 	rcu_read_unlock();
+ }
+diff --git a/net/batman-adv/bat_v_elp.h b/net/batman-adv/bat_v_elp.h
+index e95f1bc..cc130b2 100644
+--- a/net/batman-adv/bat_v_elp.h
++++ b/net/batman-adv/bat_v_elp.h
+@@ -25,6 +25,8 @@ struct work_struct;
+ 
+ int batadv_v_elp_iface_enable(struct batadv_hard_iface *hard_iface);
+ void batadv_v_elp_iface_disable(struct batadv_hard_iface *hard_iface);
++void batadv_v_elp_iface_activate(struct batadv_hard_iface *primary_iface,
++				 struct batadv_hard_iface *hard_iface);
+ void batadv_v_elp_primary_iface_set(struct batadv_hard_iface *primary_iface);
+ int batadv_v_elp_packet_recv(struct sk_buff *skb,
+ 			     struct batadv_hard_iface *if_incoming);
+-- 
+2.8.0.rc3
+

From 822d7cd8a85b762acc89a6be55c5ccde910ddfa2 Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Mon, 9 May 2016 20:29:52 +0200
Subject: [PATCH 240/368] fix check for config existence

---
 nodogsplash/files/nodogsplash.init | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nodogsplash/files/nodogsplash.init b/nodogsplash/files/nodogsplash.init
index 1fa0c79..79e7456 100755
--- a/nodogsplash/files/nodogsplash.init
+++ b/nodogsplash/files/nodogsplash.init
@@ -152,11 +152,11 @@ generate_uci_config() {
 
   config_get val "$cfg" config
   if [ -n "$val" ] ; then
-    if [ -f "$val" ] ; then
+    if [ ! -f "$val" ] ; then
       nolog error "Configuration file '$file' doesn't exist"
       return 0
     fi
-    cat $val > CONFIGFILE
+    cat "$val" >> CONFIGFILE
   fi
 
   config_get val "$cfg" network

From 2f4ac3ada03a746ba31db1b7e57a5629d258dea4 Mon Sep 17 00:00:00 2001
From: Stijn Tintel <stijn@linux-ipv6.be>
Date: Tue, 10 May 2016 16:52:45 +0300
Subject: [PATCH 241/368] bird: fix recvmsg/sendmsg on mips64

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
---
 bird/Makefile                                 |  2 +-
 .../001-netlink-update-struct-msghdr.patch    | 49 +++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 bird/patches/001-netlink-update-struct-msghdr.patch

diff --git a/bird/Makefile b/bird/Makefile
index 04c43ef..aa8aa7f 100644
--- a/bird/Makefile
+++ b/bird/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bird
 PKG_VERSION:=1.5.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird
diff --git a/bird/patches/001-netlink-update-struct-msghdr.patch b/bird/patches/001-netlink-update-struct-msghdr.patch
new file mode 100644
index 0000000..491e8f9
--- /dev/null
+++ b/bird/patches/001-netlink-update-struct-msghdr.patch
@@ -0,0 +1,49 @@
+From 31e9e10144a6994773a04d94903fa3bdde6de91e Mon Sep 17 00:00:00 2001
+From: Stijn Tintel <stijn@linux-ipv6.be>
+Date: Tue, 10 May 2016 16:45:35 +0300
+Subject: [PATCH] netlink: update struct msghdr
+
+The netlink code assumes an order for the members of struct msghdr.
+This breaks recvmsg and sendmsg with musl libc on mips64. Fix this by
+using designated initializers instead.
+
+Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
+---
+ sysdep/linux/netlink.c | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
+index 1ffdff0..b42e7b6 100644
+--- a/sysdep/linux/netlink.c
++++ b/sysdep/linux/netlink.c
+@@ -125,7 +125,12 @@ nl_get_reply(struct nl_sock *nl)
+ 	{
+ 	  struct iovec iov = { nl->rx_buffer, NL_RX_SIZE };
+ 	  struct sockaddr_nl sa;
+-	  struct msghdr m = { (struct sockaddr *) &sa, sizeof(sa), &iov, 1, NULL, 0, 0 };
++	  struct msghdr m = {
++	    .msg_name = &sa,
++	    .msg_namelen = sizeof(sa),
++	    .msg_iov = &iov,
++	    .msg_iovlen = 1,
++	  };
+ 	  int x = recvmsg(nl->fd, &m, 0);
+ 	  if (x < 0)
+ 	    die("nl_get_reply: %m");
+@@ -1231,7 +1236,12 @@ nl_async_hook(sock *sk, int size UNUSED)
+ {
+   struct iovec iov = { nl_async_rx_buffer, NL_RX_SIZE };
+   struct sockaddr_nl sa;
+-  struct msghdr m = { (struct sockaddr *) &sa, sizeof(sa), &iov, 1, NULL, 0, 0 };
++  struct msghdr m = {
++    .msg_name = &sa,
++    .msg_namelen = sizeof(sa),
++    .msg_iov = &iov,
++    .msg_iovlen = 1,
++  };
+   struct nlmsghdr *h;
+   int x;
+   uint len;
+-- 
+2.7.3
+

From 7c71369ec5c6916457db7592c311ff25686b59c5 Mon Sep 17 00:00:00 2001
From: Stijn Tintel <stijn@linux-ipv6.be>
Date: Tue, 10 May 2016 17:12:01 +0300
Subject: [PATCH 242/368] bird: bump to 1.6.0

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
---
 bird/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bird/Makefile b/bird/Makefile
index aa8aa7f..be62460 100644
--- a/bird/Makefile
+++ b/bird/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2009-2015 OpenWrt.org
+# Copyright (C) 2009-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bird
-PKG_VERSION:=1.5.0
-PKG_RELEASE:=2
+PKG_VERSION:=1.6.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird
-PKG_MD5SUM:=330bde6372afa106abfe5a9737e471c1
+PKG_MD5SUM:=4c92ec3548a2a120243879b6ef7046dd
 PKG_BUILD_DEPENDS:=libncurses libreadline
 PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
 

From 341dfdab992e8f3e978c56d2e948dd402c9dfd07 Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Thu, 12 May 2016 18:18:54 +0200
Subject: [PATCH 243/368] nodogsplash: add $ to variable

---
 nodogsplash/files/nodogsplash.init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nodogsplash/files/nodogsplash.init b/nodogsplash/files/nodogsplash.init
index 79e7456..1acee0c 100755
--- a/nodogsplash/files/nodogsplash.init
+++ b/nodogsplash/files/nodogsplash.init
@@ -156,7 +156,7 @@ generate_uci_config() {
       nolog error "Configuration file '$file' doesn't exist"
       return 0
     fi
-    cat "$val" >> CONFIGFILE
+    cat "$val" >> $CONFIGFILE
   fi
 
   config_get val "$cfg" network

From de014ca55f87daf2beb4c0cde7d12419f6af00e3 Mon Sep 17 00:00:00 2001
From: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
Date: Fri, 13 May 2016 10:48:35 +0200
Subject: [PATCH 244/368] Update OONF to 0.11.6

---
 oonf-dlep-proxy/Makefile | 4 ++--
 oonf-dlep-radio/Makefile | 4 ++--
 oonf-olsrd2/Makefile     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index e2cdccb..896ab9f 100644
--- a/oonf-dlep-proxy/Makefile
+++ b/oonf-dlep-proxy/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-proxy
-PKG_VERSION:=0.11.4
-PKG_REV:=a7087466958d3af477fecf4ad8e412ccca33d4c7
+PKG_VERSION:=0.11.6
+PKG_REV:=cabff22b492b52ec25a21822ac4bbcb626c7d7b6
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index b8e9762..fdb32e2 100644
--- a/oonf-dlep-radio/Makefile
+++ b/oonf-dlep-radio/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-radio
-PKG_VERSION:=0.11.4
-PKG_REV:=a7087466958d3af477fecf4ad8e412ccca33d4c7
+PKG_VERSION:=0.11.6
+PKG_REV:=cabff22b492b52ec25a21822ac4bbcb626c7d7b6
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 5a576d7..698c558 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2
-PKG_VERSION:=0.11.4
-PKG_REV:=a7087466958d3af477fecf4ad8e412ccca33d4c7
+PKG_VERSION:=0.11.6
+PKG_REV:=cabff22b492b52ec25a21822ac4bbcb626c7d7b6
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

From c57210d93cad0d0d4f444a80bf22077f2d962960 Mon Sep 17 00:00:00 2001
From: Henning Rogge <hrogge@gmail.com>
Date: Fri, 13 May 2016 15:00:12 +0200
Subject: [PATCH 245/368] Update OONF to v0.11.7

---
 oonf-dlep-proxy/Makefile | 4 ++--
 oonf-dlep-radio/Makefile | 4 ++--
 oonf-olsrd2/Makefile     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index 896ab9f..c632158 100644
--- a/oonf-dlep-proxy/Makefile
+++ b/oonf-dlep-proxy/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-proxy
-PKG_VERSION:=0.11.6
-PKG_REV:=cabff22b492b52ec25a21822ac4bbcb626c7d7b6
+PKG_VERSION:=0.11.7
+PKG_REV:=ef7a89aadbfbe6318b2ad1dc2c32423bd1970918
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index fdb32e2..b95e75d 100644
--- a/oonf-dlep-radio/Makefile
+++ b/oonf-dlep-radio/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-radio
-PKG_VERSION:=0.11.6
-PKG_REV:=cabff22b492b52ec25a21822ac4bbcb626c7d7b6
+PKG_VERSION:=0.11.7
+PKG_REV:=ef7a89aadbfbe6318b2ad1dc2c32423bd1970918
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 698c558..7f2219c 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2
-PKG_VERSION:=0.11.6
-PKG_REV:=cabff22b492b52ec25a21822ac4bbcb626c7d7b6
+PKG_VERSION:=0.11.7
+PKG_REV:=ef7a89aadbfbe6318b2ad1dc2c32423bd1970918
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

From d87fe599698c80ff192b48db4813b7a3b270f1e4 Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Tue, 17 May 2016 00:10:58 +0300
Subject: [PATCH 246/368] hnetd: Bumped to RFC7787/7788 compliant version.

---
 hnetd/Makefile          | 4 ++--
 hnetd/files/hnet.config | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hnetd/Makefile b/hnetd/Makefile
index 89953f4..ebba0e7 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hnetd
-PKG_SOURCE_VERSION:=a67835f479ca9d756128c3554e8d4c21feb03b1f
-PKG_VERSION:=2015-09-29-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=9ab71adbf0a7ad2a0964e48641b19b016b37df16
+PKG_VERSION:=2016-05-16-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
diff --git a/hnetd/files/hnet.config b/hnetd/files/hnet.config
index aba765f..a79dd3c 100644
--- a/hnetd/files/hnet.config
+++ b/hnetd/files/hnet.config
@@ -13,7 +13,7 @@ config pa pa
 #	option ip4prefix 10.0.0.0/8
 #	option ulaprefix fd12:3456:789A::/48
 #	option ulamode off
-#	option persistent_store /etc/hnet-pa.store
+	option persistent_store /etc/hnet-pa.store
 
 config sd sd
 #	option router_name openwrt

From d0b4ede9e612f093f10ded54c93afd80ece4f028 Mon Sep 17 00:00:00 2001
From: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
Date: Wed, 25 May 2016 11:06:31 +0200
Subject: [PATCH 247/368] Alpha of 0.12.0 for Federico Capoano

---
 oonf-olsrd2/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 7f2219c..06ec1ef 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2
-PKG_VERSION:=0.11.7
-PKG_REV:=ef7a89aadbfbe6318b2ad1dc2c32423bd1970918
+PKG_VERSION:=0.12.0-alpha
+PKG_REV:=8f9719fb0c2688e40b2fac1a1a2fa06544a7c292
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

From 0c475a592585dae66b8bf0552a0c5f73f7cc2063 Mon Sep 17 00:00:00 2001
From: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
Date: Wed, 25 May 2016 12:34:07 +0200
Subject: [PATCH 248/368] remove interface subsystem

---
 oonf-olsrd2/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 06ec1ef..942c487 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -31,7 +31,7 @@ CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \
               -D OONF_NO_TESTING:Bool=true \
               -D UCI:Bool=true \
               -D OONF_APP_DEFAULT_CFG_HANDLER:String=uci \
-              -D OONF_STATIC_PLUGINS:String="class;clock;duplicate_set;interface;layer2;packet_socket;rfc5444;socket;stream_socket;telnet;timer;viewer;os_clock;os_fd;os_interface;os_routing;os_system;nhdp;olsrv2;ff_dat_metric;neighbor_probing;nl80211_listener;link_config;layer2info;systeminfo;cfg_uciloader;cfg_compact;nhdpinfo;olsrv2info;netjsoninfo;${CMAKE_OPTIONAL_PLUGINS}" \
+              -D OONF_STATIC_PLUGINS:String="class;clock;duplicate_set;layer2;packet_socket;rfc5444;socket;stream_socket;telnet;timer;viewer;os_clock;os_fd;os_interface;os_routing;os_system;nhdp;olsrv2;ff_dat_metric;neighbor_probing;nl80211_listener;link_config;layer2info;systeminfo;cfg_uciloader;cfg_compact;nhdpinfo;olsrv2info;netjsoninfo;${CMAKE_OPTIONAL_PLUGINS}" \
               -D OONF_LIB_GIT:String=v$(PKG_VERSION)-archive \
               -D OONF_VERSION:String=$(PKG_VERSION) \
               -D INSTALL_LIB_DIR:Path=lib/oonf \

From 582abc17546d869ef6f39192f832acc59fdc9c40 Mon Sep 17 00:00:00 2001
From: Henning Rogge <hrogge@gmail.com>
Date: Wed, 25 May 2016 16:57:35 +0200
Subject: [PATCH 249/368] Update to 0.12.0a2

---
 oonf-olsrd2/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 942c487..3d52c04 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2
-PKG_VERSION:=0.12.0-alpha
-PKG_REV:=8f9719fb0c2688e40b2fac1a1a2fa06544a7c292
+PKG_VERSION:=0.12.0-alpha2
+PKG_REV:=e72b618c5049b090e4ca145d55fb7f87366a1ba1
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

From 82c882a3005d2681251dc19dc1c4e24c407269fd Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Sat, 28 May 2016 13:01:12 +0200
Subject: [PATCH 250/368] nodogsplash: change comments

---
 nodogsplash/files/nodogsplash.config | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nodogsplash/files/nodogsplash.config b/nodogsplash/files/nodogsplash.config
index dbefeb4..12914fe 100644
--- a/nodogsplash/files/nodogsplash.config
+++ b/nodogsplash/files/nodogsplash.config
@@ -1,9 +1,12 @@
+
 config instance
   # Set to 1 to enable nodogsplash
   option enabled 0
 
-  # Use plain configuration file as well
+  # Use plain configuration file
   #option config '/etc/nodogsplash/nodogsplash.conf'
+
+  # The network the users are connected to
   option network 'lan'
   option gatewayname 'OpenWrt Nodogsplash'
   option maxclients '250'

From 5f75450365eab3f36a09e490c1955ceb321f8668 Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Sat, 28 May 2016 13:02:49 +0200
Subject: [PATCH 251/368] nodogplash: change section name

---
 nodogsplash/files/nodogsplash.config | 2 +-
 nodogsplash/files/nodogsplash.init   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nodogsplash/files/nodogsplash.config b/nodogsplash/files/nodogsplash.config
index 12914fe..1825a99 100644
--- a/nodogsplash/files/nodogsplash.config
+++ b/nodogsplash/files/nodogsplash.config
@@ -1,5 +1,5 @@
 
-config instance
+config nodogsplash
   # Set to 1 to enable nodogsplash
   option enabled 0
 
diff --git a/nodogsplash/files/nodogsplash.init b/nodogsplash/files/nodogsplash.init
index 1acee0c..a841721 100755
--- a/nodogsplash/files/nodogsplash.init
+++ b/nodogsplash/files/nodogsplash.init
@@ -257,7 +257,7 @@ start_service() {
   mkdir -p /tmp/etc/
   config_load nodogsplash
 
-  config_foreach create_instance instance
+  config_foreach create_instance nodogsplash
 }
 
 stop_service() {

From 0830aa6442c07851f088626ff48da0e529acf7a3 Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Sat, 28 May 2016 13:03:11 +0200
Subject: [PATCH 252/368] nodogplash: 1.0.0 release

---
 nodogsplash/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nodogsplash/Makefile b/nodogsplash/Makefile
index 11fa5fc..76a5e14 100644
--- a/nodogsplash/Makefile
+++ b/nodogsplash/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nodogsplash
 PKG_FIXUP:=autoreconf
-PKG_VERSION:=0.9_beta9.9.9
-PKG_RELEASE:=6
+PKG_VERSION:=1.0.0
+PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=git://github.com/nodogsplash/nodogsplash.git
-PKG_SOURCE_VERSION:=v0.9_beta9.9.9
+PKG_SOURCE_VERSION:=v1.0.0
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=GPL-2.0+

From fc5780bb5f1a3b26d86991d9b47f808241beb9d3 Mon Sep 17 00:00:00 2001
From: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
Date: Tue, 31 May 2016 08:57:07 +0200
Subject: [PATCH 253/368] Update to v0.12.0

---
 oonf-dlep-proxy/Makefile | 4 ++--
 oonf-dlep-radio/Makefile | 4 ++--
 oonf-olsrd2/Makefile     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index c632158..13eedf9 100644
--- a/oonf-dlep-proxy/Makefile
+++ b/oonf-dlep-proxy/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-proxy
-PKG_VERSION:=0.11.7
-PKG_REV:=ef7a89aadbfbe6318b2ad1dc2c32423bd1970918
+PKG_VERSION:=0.12.0
+PKG_REV:=37d620fbb33c449e39438f2fb1ce25deeb78ff84
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index b95e75d..b363645 100644
--- a/oonf-dlep-radio/Makefile
+++ b/oonf-dlep-radio/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-radio
-PKG_VERSION:=0.11.7
-PKG_REV:=ef7a89aadbfbe6318b2ad1dc2c32423bd1970918
+PKG_VERSION:=0.12.0
+PKG_REV:=37d620fbb33c449e39438f2fb1ce25deeb78ff84
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 3d52c04..14a538c 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2
-PKG_VERSION:=0.12.0-alpha2
-PKG_REV:=e72b618c5049b090e4ca145d55fb7f87366a1ba1
+PKG_VERSION:=0.12.0
+PKG_REV:=37d620fbb33c449e39438f2fb1ce25deeb78ff84
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

From e96845fca61b358fb6ecb18f9222b557c44b55d3 Mon Sep 17 00:00:00 2001
From: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
Date: Tue, 31 May 2016 08:57:07 +0200
Subject: [PATCH 254/368] Update to v0.12.0

---
 oonf-dlep-proxy/Makefile | 6 +++---
 oonf-dlep-radio/Makefile | 6 +++---
 oonf-olsrd2/Makefile     | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index c632158..22dbb1f 100644
--- a/oonf-dlep-proxy/Makefile
+++ b/oonf-dlep-proxy/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-proxy
-PKG_VERSION:=0.11.7
-PKG_REV:=ef7a89aadbfbe6318b2ad1dc2c32423bd1970918
+PKG_VERSION:=0.12.0
+PKG_REV:=37d620fbb33c449e39438f2fb1ce25deeb78ff84
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -21,7 +21,7 @@ CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \
               -D OONF_NO_TESTING:Bool=true \
               -D UCI:Bool=true \
               -D OONF_APP_DEFAULT_CFG_HANDLER:String=uci \
-              -D OONF_STATIC_PLUGINS:String="class;clock;interface;layer2;packet_socket;socket;stream_socket;telnet;timer;viewer;os_clock;os_fd;os_interface;os_system;nl80211_listener;layer2info;systeminfo;cfg_uciloader;cfg_compact;dlep_proxy" \
+              -D OONF_STATIC_PLUGINS:String="class;clock;layer2;packet_socket;socket;stream_socket;telnet;timer;viewer;os_clock;os_fd;os_interface;os_system;nl80211_listener;layer2info;systeminfo;cfg_uciloader;cfg_compact;dlep_proxy" \
               -D OONF_LIB_GIT:String=v$(PKG_VERSION)-archive \
               -D OONF_VERSION:String=$(PKG_VERSION) \
               -D INSTALL_LIB_DIR:Path=lib/oonf \
diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index b95e75d..9f4e903 100644
--- a/oonf-dlep-radio/Makefile
+++ b/oonf-dlep-radio/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-radio
-PKG_VERSION:=0.11.7
-PKG_REV:=ef7a89aadbfbe6318b2ad1dc2c32423bd1970918
+PKG_VERSION:=0.12.0
+PKG_REV:=37d620fbb33c449e39438f2fb1ce25deeb78ff84
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -21,7 +21,7 @@ CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \
               -D OONF_NO_TESTING:Bool=true \
               -D UCI:Bool=true \
               -D OONF_APP_DEFAULT_CFG_HANDLER:String=uci \
-              -D OONF_STATIC_PLUGINS:String="class;clock;interface;layer2;packet_socket;socket;stream_socket;telnet;timer;viewer;os_clock;os_fd;os_interface;os_system;nl80211_listener;layer2info;systeminfo;cfg_uciloader;cfg_compact;dlep_radio" \
+              -D OONF_STATIC_PLUGINS:String="class;clock;layer2;packet_socket;socket;stream_socket;telnet;timer;viewer;os_clock;os_fd;os_interface;os_system;nl80211_listener;layer2info;systeminfo;cfg_uciloader;cfg_compact;dlep_radio" \
               -D OONF_LIB_GIT:String=v$(PKG_VERSION)-archive \
               -D OONF_VERSION:String=$(PKG_VERSION) \
               -D INSTALL_LIB_DIR:Path=lib/oonf \
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 3d52c04..14a538c 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2
-PKG_VERSION:=0.12.0-alpha2
-PKG_REV:=e72b618c5049b090e4ca145d55fb7f87366a1ba1
+PKG_VERSION:=0.12.0
+PKG_REV:=37d620fbb33c449e39438f2fb1ce25deeb78ff84
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

From e17f103c4d6fddc713c63934e6e5b058b8add046 Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Sun, 5 Jun 2016 02:11:34 +0200
Subject: [PATCH 255/368] use @IPV6 instead of +kmod-ipv6

kmod-ipv6 is obsolete.
The symbol IPV6 is a global config symbol, don't select it because it
will override the user decision of IPV6 as all other package in base do
it. A select (+) will also create a recursive dependency error.

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
---
 alfred/Makefile | 2 +-
 nat46/Makefile  | 2 +-
 ndppd/Makefile  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/alfred/Makefile b/alfred/Makefile
index 2e117b3..5701c0a 100644
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -28,7 +28,7 @@ define Package/alfred
   SECTION:=net
   CATEGORY:=Network
   TITLE:=A.L.F.R.E.D. - Almighty Lightweight Fact Remote Exchange Daemon
-  DEPENDS:= +libc +kmod-ipv6 +librt \
+  DEPENDS:= +libc @IPV6 +librt \
 	  +ALFRED_NEEDS_lua:lua \
 	  +ALFRED_NEEDS_libgps:libgps
 endef
diff --git a/nat46/Makefile b/nat46/Makefile
index 65b92c2..9f08b07 100644
--- a/nat46/Makefile
+++ b/nat46/Makefile
@@ -37,7 +37,7 @@ define Package/464xlat
 endef
 
 define KernelPackage/nat46
-  DEPENDS:=+kmod-ipv6
+  DEPENDS:=@IPV6
   TITLE:=Stateless NAT46 translation kernel module
   SECTION:=kernel
   SUBMENU:=Network Support
diff --git a/ndppd/Makefile b/ndppd/Makefile
index ebc764c..b19edeb 100644
--- a/ndppd/Makefile
+++ b/ndppd/Makefile
@@ -32,7 +32,7 @@ define Package/ndppd
   TITLE:=NDP Proxy Daemon
   URL:=http://www.priv.nu/projects/ndppd/
   MAINTAINER:=Gabriel Kerneis <gabriel@kerneis.info>
-  DEPENDS:=+kmod-ipv6 $(CXX_DEPENDS)
+  DEPENDS:=@IPV6 $(CXX_DEPENDS)
 endef
 
 define Package/ndppd/description

From 9b610a90c61cb2a5ec73bc95e5a46cd4b4375aef Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Sun, 5 Jun 2016 02:13:13 +0200
Subject: [PATCH 256/368] replace DEPENDS=+@IPV6 with DEPENDS=@IPV6

The symbol IPV6 is a global config symbol, don't select it because it
will override the user decision of IPV6 as all other package in base do
it. A select (+) will also create a recursive dependency error.

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
---
 ahcpd/Makefile              | 2 +-
 babeld/Makefile             | 2 +-
 hnetd/Makefile              | 2 +-
 minimalist-pcproxy/Makefile | 2 +-
 pimbd/Makefile              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ahcpd/Makefile b/ahcpd/Makefile
index 96b8475..043c609 100644
--- a/ahcpd/Makefile
+++ b/ahcpd/Makefile
@@ -25,7 +25,7 @@ define Package/ahcpd
   TITLE:=Ad-Hoc Configuration Protocol daemon
   URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/ahcp/
   MAINTAINER:=Gabriel Kerneis <gabriel@kerneis.info>
-  DEPENDS:=+@IPV6 +ip +librt
+  DEPENDS:=@IPV6 +ip +librt
 endef
 
 define Package/ahcpd/description
diff --git a/babeld/Makefile b/babeld/Makefile
index 88a7886..69fb1e9 100644
--- a/babeld/Makefile
+++ b/babeld/Makefile
@@ -25,7 +25,7 @@ define Package/babeld
   TITLE:=A loop-free distance-vector routing protocol
   URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/babel/
   MAINTAINER:=Gabriel Kerneis <gabriel@kerneis.info>
-  DEPENDS:=+@IPV6
+  DEPENDS:=@IPV6
 endef
 
 define Package/babeld/description
diff --git a/hnetd/Makefile b/hnetd/Makefile
index ebba0e7..7fc8b9b 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -38,7 +38,7 @@ define Package/hnetd/Default
   TITLE:=HNCP Homenet daemon - $(2)
   URL:=https://github.com/sbyx/hnetd
   DEPENDS:=+odhcpd +odhcp6c +netifd $(3)
-  DEPENDS+=+@IPV6
+  DEPENDS+=@IPV6
   VARIANT:=$1
 endef
 
diff --git a/minimalist-pcproxy/Makefile b/minimalist-pcproxy/Makefile
index d0c2f06..36faa8d 100644
--- a/minimalist-pcproxy/Makefile
+++ b/minimalist-pcproxy/Makefile
@@ -27,7 +27,7 @@ define Package/minimalist-pcproxy
   CATEGORY:=Network
   TITLE:=Lightweight PCP proxy
   URL:=https://github.com/fingon/minimalist-pcproxy
-  DEPENDS:=+libubox +@IPV6
+  DEPENDS:=+libubox @IPV6
 endef
 
 define Package/minimalist-pcproxy/description
diff --git a/pimbd/Makefile b/pimbd/Makefile
index 55aec74..9f97107 100644
--- a/pimbd/Makefile
+++ b/pimbd/Makefile
@@ -24,7 +24,7 @@ define Package/pimbd
   CATEGORY:=Network
   TITLE:=PIM BIDIR daemon
   URL:=https://github.com/Oryon/pimbd.git
-  DEPENDS+=+@IPV6
+  DEPENDS+=@IPV6
   DEPENDS+=netifd
 endef
 

From 73da6b297e51fc0d43d0cca72a162d4f9a7977b6 Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Sun, 5 Jun 2016 03:47:51 +0200
Subject: [PATCH 257/368] batman-adv: remove DEPENDS:=kmod-crypto-core

kmod-crypto-core was removed in openwrt/trunk svn 46820 and all
kconfig's are now built-in.

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
---
 batman-adv/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 8a77692..7de2eab 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -27,7 +27,7 @@ define KernelPackage/batman-adv
   URL:=https://www.open-mesh.org/
   MAINTAINER:=Marek Lindner <mareklindner@neomailbox.ch>
   SUBMENU:=Network Support
-  DEPENDS:=+KMOD_BATMAN_ADV_BLA:kmod-lib-crc16 +kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c +kmod-cfg80211
+  DEPENDS:=+KMOD_BATMAN_ADV_BLA:kmod-lib-crc16 +kmod-crypto-crc32c +kmod-lib-crc32c +kmod-cfg80211
   TITLE:=B.A.T.M.A.N. Adv
   FILES:=$(PKG_BUILD_DIR)/net/batman-adv/batman-adv.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,cfg80211 batman-adv)

From f3f344e949661cbee1df6baa33be365b36d8b7ea Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Sun, 5 Jun 2016 11:43:01 +0200
Subject: [PATCH 258/368] nodogsplash: remove duplicate options, fixes #135

---
 nodogsplash/files/nodogsplash.init | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/nodogsplash/files/nodogsplash.init b/nodogsplash/files/nodogsplash.init
index a841721..f3df6a1 100755
--- a/nodogsplash/files/nodogsplash.init
+++ b/nodogsplash/files/nodogsplash.init
@@ -60,26 +60,6 @@ append_config_option() {
   [ -n "$val" ] && echo "$option_name $val" >> $config_file
 }
 
-setup_user_authentication() {
-  local cfg="$1"
-  local val
-
-  config_get_bool val "$cfg" authenticate_immediately 0
-  [ $val -gt 0 ] && echo "AuthenticateImmediately yes" >> $CONFIGFILE
-
-  config_get val "$cfg" username
-  if [ -n "$val" ] ; then
-    echo "UsernameAuthentication 1" >> $CONFIGFILE
-    echo "Username $val" >> $CONFIGFILE
-  fi
-
-  config_get val "$cfg" password
-  if [ -n "$val" ] ; then
-    echo "PasswordAuthentication 1" >> $CONFIGFILE
-    echo "Password $val" >> $CONFIGFILE
-  fi
-}
-
 setup_mac_lists() {
   local cfg="$1"
   local MAC=""
@@ -225,7 +205,6 @@ generate_uci_config() {
   [ -n "$upload" -o -n "$download" ] && echo "TrafficControl yes" >> $CONFIGFILE
 
   setup_mac_lists "$cfg"
-  setup_user_authentication "$cfg"
   setup_firewall "$cfg"
 }
 

From 64747c9bdf15d2253935f1d8fb82645d8ebab5b3 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 6 Jun 2016 17:03:12 +0200
Subject: [PATCH 259/368] cjdns: use temporary directory within the build
 environment

By default, cjdns' build system uses the system wide `/tmp` directory to store
intermediate build artifacts.

Unfortunately its build system fails to clean after itself, leaving thousands
of `jsmake-<hash>` directories behind, taking up precious inodes and massively
slowing down processes traversing the temporary directory:

    root@buildbot:~# find /tmp/ -maxdepth 1 -type d -name 'jsmake-*' | wc -l
    1581

Attempt to solve that problem by using the upstream-introduced
`CJDNS_BUILD_TMPDIR` environment variable in order to move the intermediate
artifacts from the system-wide `/tmp` to a temporary directory within the
package build dir which is properly deleted upon package rebuild cycles.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---
 cjdns/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cjdns/Makefile b/cjdns/Makefile
index a81b491..8efd282 100644
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cjdns
 PKG_VERSION:=0.17
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE_URL:=https://github.com/hyperboria/cjdns.git
 PKG_SOURCE_PROTO:=git
@@ -77,6 +77,7 @@ PKG_DO_VARS+= UCLIBC=1
 endif
 
 define Build/Compile
+	$(INSTALL_DIR) $(PKG_BUILD_DIR)/tmp
 	CROSS="true" \
 	CC="$(TARGET_CC)" \
 	AR="$(TARGET_AR)" \
@@ -87,6 +88,7 @@ define Build/Compile
 	TARGET_ARCH="$(CONFIG_ARCH)" \
 	SSP_SUPPORT="$(CONFIG_SSP_SUPPORT)" \
 	GYP_ADDITIONAL_ARGS="-f make-linux" \
+	CJDNS_BUILD_TMPDIR="$(PKG_BUILD_DIR)/tmp" \
 	$(PKG_DO_VARS) \
 	$(PKG_BUILD_DIR)/do
 endef

From 1c4438d5066b9e74c11bbfb973cdf0db092b7635 Mon Sep 17 00:00:00 2001
From: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
Date: Tue, 7 Jun 2016 11:19:12 +0200
Subject: [PATCH 260/368] OONF release 0.12.1

---
 oonf-dlep-proxy/Makefile | 4 ++--
 oonf-dlep-radio/Makefile | 4 ++--
 oonf-olsrd2/Makefile     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index 22dbb1f..454bbbe 100644
--- a/oonf-dlep-proxy/Makefile
+++ b/oonf-dlep-proxy/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-proxy
-PKG_VERSION:=0.12.0
-PKG_REV:=37d620fbb33c449e39438f2fb1ce25deeb78ff84
+PKG_VERSION:=0.12.1
+PKG_REV:=e4cb9a3ab52352ecee0da09ab4ccae32461f5f44
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index 9f4e903..fbc0435 100644
--- a/oonf-dlep-radio/Makefile
+++ b/oonf-dlep-radio/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-radio
-PKG_VERSION:=0.12.0
-PKG_REV:=37d620fbb33c449e39438f2fb1ce25deeb78ff84
+PKG_VERSION:=0.12.1
+PKG_REV:=e4cb9a3ab52352ecee0da09ab4ccae32461f5f44
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 14a538c..3873c7f 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2
-PKG_VERSION:=0.12.0
-PKG_REV:=37d620fbb33c449e39438f2fb1ce25deeb78ff84
+PKG_VERSION:=0.12.1
+PKG_REV:=e4cb9a3ab52352ecee0da09ab4ccae32461f5f44
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

From d580d71309f0867022ab7f47badb8c2a1860fc83 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jo@mein.io>
Date: Tue, 7 Jun 2016 11:57:28 +0200
Subject: [PATCH 261/368] Replace my defunct email address

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 4d8f5e2..2f2385a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13,7 +13,7 @@ Bastian Bittorf <bittorf@bluebottle.com>
 Corinna "Elektra" Aichele <onelektra@gmx.net>
 Gabriel Kerneis <gabriel@kerneis.info>
 Gui Iribarren <gui@altermundi.net>
-Jo-Philipp Wich <jow@openwrt.org>
+Jo-Philipp Wich <jo@mein.io>
 Luka Perkov <luka@openwrt.org>
 Marek Lindner <mareklindner@neomailbox.ch>
 Moritz Warning <moritzwarning@web.de>

From fd4a2d7b6d781169ea4581dc211c14921aced9bb Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Thu, 9 Jun 2016 18:28:17 +0200
Subject: [PATCH 262/368] batman-adv: upgrade package to latest release 2016.2

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batman-adv/Makefile                           |   6 +-
 batman-adv/files/compat-hacks.h               |  10 ++
 ...sure-ELP-OGM-orig-MAC-is-updated-on-.patch |  64 ----------
 ...Avoid-duplicate-neigh_node-additions.patch |  89 --------------
 ...-nullptr-derefence-in-batadv_v_neigh.patch |  38 ------
 ...v-Fix-refcnt-leak-in-batadv_v_neigh_.patch |  81 -------------
 ...ouble-neigh_node_put-in-batadv_v_ogm.patch |  40 -------
 ...alize-ELP-orig-address-on-secondary-.patch | 110 ------------------
 8 files changed, 13 insertions(+), 425 deletions(-)
 delete mode 100644 batman-adv/patches/0001-batman-adv-make-sure-ELP-OGM-orig-MAC-is-updated-on-.patch
 delete mode 100644 batman-adv/patches/0002-batman-adv-Avoid-duplicate-neigh_node-additions.patch
 delete mode 100644 batman-adv/patches/0003-batman-adv-Avoid-nullptr-derefence-in-batadv_v_neigh.patch
 delete mode 100644 batman-adv/patches/0004-batman-adv-Fix-refcnt-leak-in-batadv_v_neigh_.patch
 delete mode 100644 batman-adv/patches/0005-batman-adv-Fix-double-neigh_node_put-in-batadv_v_ogm.patch
 delete mode 100644 batman-adv/patches/0006-batman-adv-initialize-ELP-orig-address-on-secondary-.patch

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 7de2eab..7650655 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
 
-PKG_VERSION:=2016.1
-PKG_RELEASE:=1
-PKG_MD5SUM:=8c8e449009b4d29512d26ee308960bb5
+PKG_VERSION:=2016.2
+PKG_RELEASE:=0
+PKG_MD5SUM:=dd1ab664475902fc3dbf34998bbe5a90
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
diff --git a/batman-adv/files/compat-hacks.h b/batman-adv/files/compat-hacks.h
index 5126fc2..a910c2d 100644
--- a/batman-adv/files/compat-hacks.h
+++ b/batman-adv/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) */
diff --git a/batman-adv/patches/0001-batman-adv-make-sure-ELP-OGM-orig-MAC-is-updated-on-.patch b/batman-adv/patches/0001-batman-adv-make-sure-ELP-OGM-orig-MAC-is-updated-on-.patch
deleted file mode 100644
index 70adb91..0000000
--- a/batman-adv/patches/0001-batman-adv-make-sure-ELP-OGM-orig-MAC-is-updated-on-.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From a636bf0b69010222ea58337d425ca9ff8ce52639 Mon Sep 17 00:00:00 2001
-From: Antonio Quartulli <a@unstable.cc>
-Date: Mon, 2 May 2016 18:27:38 +0800
-Subject: [PATCH 1/6] batman-adv: make sure ELP/OGM orig MAC is updated on
- address change
-
-When the MAC address of the primary interface is changed,
-update the originator address in the ELP and OGM skb buffers as
-well in order to reflect the change.
-
-Fixes: a4b88af77e28 ("batman-adv: ELP - adding basic infrastructure")
-Reported-by: Marek Lindner <marek@neomailbox.ch>
-Signed-off-by: Antonio Quartulli <a@unstable.cc>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- net/batman-adv/bat_v.c | 26 ++++++++++++++++++++++----
- 1 file changed, 22 insertions(+), 4 deletions(-)
-
-diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c
-index 4026f19..4547fce 100644
---- a/net/batman-adv/bat_v.c
-+++ b/net/batman-adv/bat_v.c
-@@ -72,16 +72,34 @@ static void batadv_v_iface_disable(struct batadv_hard_iface *hard_iface)
- 	batadv_v_elp_iface_disable(hard_iface);
- }
- 
--static void batadv_v_iface_update_mac(struct batadv_hard_iface *hard_iface)
--{
--}
--
- static void batadv_v_primary_iface_set(struct batadv_hard_iface *hard_iface)
- {
- 	batadv_v_elp_primary_iface_set(hard_iface);
- 	batadv_v_ogm_primary_iface_set(hard_iface);
- }
- 
-+/**
-+ * batadv_v_iface_update_mac - react to hard-interface MAC address change
-+ * @hard_iface: the modified interface
-+ *
-+ * If the modified interface is the primary one, update the originator
-+ * address in the ELP and OGM messages to reflect the new MAC address.
-+ */
-+static void batadv_v_iface_update_mac(struct batadv_hard_iface *hard_iface)
-+{
-+	struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
-+	struct batadv_hard_iface *primary_if;
-+
-+	primary_if = batadv_primary_if_get_selected(bat_priv);
-+	if (primary_if != hard_iface)
-+		goto out;
-+
-+	batadv_v_primary_iface_set(hard_iface);
-+out:
-+	if (primary_if)
-+		batadv_hardif_put(primary_if);
-+}
-+
- static void
- batadv_v_hardif_neigh_init(struct batadv_hardif_neigh_node *hardif_neigh)
- {
--- 
-2.8.0.rc3
-
diff --git a/batman-adv/patches/0002-batman-adv-Avoid-duplicate-neigh_node-additions.patch b/batman-adv/patches/0002-batman-adv-Avoid-duplicate-neigh_node-additions.patch
deleted file mode 100644
index ea191b3..0000000
--- a/batman-adv/patches/0002-batman-adv-Avoid-duplicate-neigh_node-additions.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 8013ae257447c99d7ba037967458f91ceb4051ae Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
-Date: Thu, 7 Jan 2016 08:11:12 +0100
-Subject: [PATCH 2/6] batman-adv: Avoid duplicate neigh_node additions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Two parallel calls to batadv_neigh_node_new() might race for creating
-and adding the same neig_node. Fix this by including the check for any
-already existing, identical neigh_node within the spin-lock.
-
-This fixes splats like the following:
-
-[  739.535069] ------------[ cut here ]------------
-[  739.535079] WARNING: CPU: 0 PID: 0 at /usr/src/batman-adv/git/batman-adv/net/batman-adv/bat_iv_ogm.c:1004 batadv_iv_ogm_process_per_outif+0xe3f/0xe60 [batman_adv]()
-[  739.535092] too many matching neigh_nodes
-[  739.535094] Modules linked in: dm_mod tun ip6table_filter ip6table_mangle ip6table_nat nf_nat_ipv6 ip6_tables xt_nat iptable_nat nf_nat_ipv4 nf_nat xt_TCPMSS xt_mark iptable_mangle xt_tcpudp xt_conntrack iptable_filter ip_tables x_tables ip_gre ip_tunnel gre bridge stp llc thermal_sys kvm_intel kvm crct10dif_pclmul crc32_pclmul sha256_ssse3 sha256_generic hmac drbg ansi_cprng aesni_intel aes_x86_64 lrw gf128mul glue_helper ablk_helper cryptd evdev pcspkr ip6_gre ip6_tunnel tunnel6 batman_adv(O) libcrc32c nf_conntrack_ipv6 nf_defrag_ipv6 nf_conntrack_ipv4 nf_defrag_ipv4 nf_conntrack autofs4 ext4 crc16 mbcache jbd2 xen_netfront xen_blkfront crc32c_intel
-[  739.535177] CPU: 0 PID: 0 Comm: swapper/0 Tainted: G        W  O    4.2.0-0.bpo.1-amd64 #1 Debian 4.2.6-3~bpo8+2
-[  739.535186]  0000000000000000 ffffffffa013b050 ffffffff81554521 ffff88007d003c18
-[  739.535201]  ffffffff8106fa01 0000000000000000 ffff8800047a087a ffff880079c3a000
-[  739.735602]  ffff88007b82bf40 ffff88007bc2d1c0 ffffffff8106fa7a ffffffffa013aa8e
-[  739.735624] Call Trace:
-[  739.735639]  <IRQ>  [<ffffffff81554521>] ? dump_stack+0x40/0x50
-[  739.735677]  [<ffffffff8106fa01>] ? warn_slowpath_common+0x81/0xb0
-[  739.735692]  [<ffffffff8106fa7a>] ? warn_slowpath_fmt+0x4a/0x50
-[  739.735715]  [<ffffffffa012448f>] ? batadv_iv_ogm_process_per_outif+0xe3f/0xe60 [batman_adv]
-[  739.735740]  [<ffffffffa0124813>] ? batadv_iv_ogm_receive+0x363/0x380 [batman_adv]
-[  739.735762]  [<ffffffffa0124813>] ? batadv_iv_ogm_receive+0x363/0x380 [batman_adv]
-[  739.735783]  [<ffffffff810b0841>] ? __raw_callee_save___pv_queued_spin_unlock+0x11/0x20
-[  739.735804]  [<ffffffffa012cb39>] ? batadv_batman_skb_recv+0xc9/0x110 [batman_adv]
-[  739.735825]  [<ffffffff81464891>] ? __netif_receive_skb_core+0x841/0x9a0
-[  739.735838]  [<ffffffff810b0841>] ? __raw_callee_save___pv_queued_spin_unlock+0x11/0x20
-[  739.735853]  [<ffffffff81465681>] ? process_backlog+0xa1/0x140
-[  739.735864]  [<ffffffff81464f1a>] ? net_rx_action+0x20a/0x320
-[  739.735878]  [<ffffffff81073aa7>] ? __do_softirq+0x107/0x270
-[  739.735891]  [<ffffffff81073d82>] ? irq_exit+0x92/0xa0
-[  739.735905]  [<ffffffff8137e0d1>] ? xen_evtchn_do_upcall+0x31/0x40
-[  739.735924]  [<ffffffff8155b8fe>] ? xen_do_hypervisor_callback+0x1e/0x40
-[  739.735939]  <EOI>  [<ffffffff810013aa>] ? xen_hypercall_sched_op+0xa/0x20
-[  739.735965]  [<ffffffff810013aa>] ? xen_hypercall_sched_op+0xa/0x20
-[  739.735979]  [<ffffffff8100a39c>] ? xen_safe_halt+0xc/0x20
-[  739.735991]  [<ffffffff8101da6c>] ? default_idle+0x1c/0xa0
-[  739.736004]  [<ffffffff810abf6b>] ? cpu_startup_entry+0x2eb/0x350
-[  739.736019]  [<ffffffff81b2af5e>] ? start_kernel+0x480/0x48b
-[  739.736032]  [<ffffffff81b2d116>] ? xen_start_kernel+0x507/0x511
-[  739.736048] ---[ end trace c106bb901244bc8c ]---
-
-Reported-by: Martin Weinelt <martin@darmstadt.freifunk.net>
-Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- net/batman-adv/originator.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
-index c355a82..28241a4 100644
---- a/net/batman-adv/originator.c
-+++ b/net/batman-adv/originator.c
-@@ -630,6 +630,8 @@ batadv_neigh_node_new(struct batadv_orig_node *orig_node,
- 	struct batadv_neigh_node *neigh_node;
- 	struct batadv_hardif_neigh_node *hardif_neigh = NULL;
- 
-+	spin_lock_bh(&orig_node->neigh_list_lock);
-+
- 	neigh_node = batadv_neigh_node_get(orig_node, hard_iface, neigh_addr);
- 	if (neigh_node)
- 		goto out;
-@@ -666,15 +668,15 @@ batadv_neigh_node_new(struct batadv_orig_node *orig_node,
- 	kref_init(&neigh_node->refcount);
- 	kref_get(&neigh_node->refcount);
- 
--	spin_lock_bh(&orig_node->neigh_list_lock);
- 	hlist_add_head_rcu(&neigh_node->list, &orig_node->neigh_list);
--	spin_unlock_bh(&orig_node->neigh_list_lock);
- 
- 	batadv_dbg(BATADV_DBG_BATMAN, orig_node->bat_priv,
- 		   "Creating new neighbor %pM for orig_node %pM on interface %s\n",
- 		   neigh_addr, orig_node->orig, hard_iface->net_dev->name);
- 
- out:
-+	spin_unlock_bh(&orig_node->neigh_list_lock);
-+
- 	if (hardif_neigh)
- 		batadv_hardif_neigh_put(hardif_neigh);
- 	return neigh_node;
--- 
-2.8.0.rc3
-
diff --git a/batman-adv/patches/0003-batman-adv-Avoid-nullptr-derefence-in-batadv_v_neigh.patch b/batman-adv/patches/0003-batman-adv-Avoid-nullptr-derefence-in-batadv_v_neigh.patch
deleted file mode 100644
index aa07ad5..0000000
--- a/batman-adv/patches/0003-batman-adv-Avoid-nullptr-derefence-in-batadv_v_neigh.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 036aa7b7181ee96ae6971eb31dd97b6ace7c0a80 Mon Sep 17 00:00:00 2001
-From: Sven Eckelmann <sven@narfation.org>
-Date: Fri, 6 May 2016 11:43:38 +0200
-Subject: [PATCH 3/6] 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@narfation.org>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- 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;
- 
--- 
-2.8.0.rc3
-
diff --git a/batman-adv/patches/0004-batman-adv-Fix-refcnt-leak-in-batadv_v_neigh_.patch b/batman-adv/patches/0004-batman-adv-Fix-refcnt-leak-in-batadv_v_neigh_.patch
deleted file mode 100644
index 15ef21c..0000000
--- a/batman-adv/patches/0004-batman-adv-Fix-refcnt-leak-in-batadv_v_neigh_.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 650d41de4be2fe9e9d1842c1abdd357dedbaa7ba Mon Sep 17 00:00:00 2001
-From: Sven Eckelmann <sven@narfation.org>
-Date: Fri, 6 May 2016 11:43:39 +0200
-Subject: [PATCH 4/6] batman-adv: Fix refcnt leak in batadv_v_neigh_*
-
-The functions batadv_neigh_ifinfo_get increase the reference counter of the
-batadv_neigh_ifinfo. These have to be reduced again when the reference is
-not used anymore to correctly free the objects.
-
-Fixes: b05bbab5e1fc ("batman-adv: B.A.T.M.A.N. V - implement neighbor comparison API calls")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- net/batman-adv/bat_v.c | 32 +++++++++++++++++++++++++-------
- 1 file changed, 25 insertions(+), 7 deletions(-)
-
-diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c
-index 7e1467a..2bcb29b 100644
---- a/net/batman-adv/bat_v.c
-+++ b/net/batman-adv/bat_v.c
-@@ -274,14 +274,23 @@ static int batadv_v_neigh_cmp(struct batadv_neigh_node *neigh1,
- 			      struct batadv_hard_iface *if_outgoing2)
- {
- 	struct batadv_neigh_ifinfo *ifinfo1, *ifinfo2;
-+	int ret = 0;
- 
- 	ifinfo1 = batadv_neigh_ifinfo_get(neigh1, if_outgoing1);
-+	if (WARN_ON(!ifinfo1))
-+		goto err_ifinfo1;
-+
- 	ifinfo2 = batadv_neigh_ifinfo_get(neigh2, if_outgoing2);
-+	if (WARN_ON(!ifinfo2))
-+		goto err_ifinfo2;
- 
--	if (WARN_ON(!ifinfo1 || !ifinfo2))
--		return 0;
-+	ret = ifinfo1->bat_v.throughput - ifinfo2->bat_v.throughput;
- 
--	return ifinfo1->bat_v.throughput - ifinfo2->bat_v.throughput;
-+	batadv_neigh_ifinfo_put(ifinfo2);
-+err_ifinfo2:
-+	batadv_neigh_ifinfo_put(ifinfo1);
-+err_ifinfo1:
-+	return ret;
- }
- 
- static bool batadv_v_neigh_is_sob(struct batadv_neigh_node *neigh1,
-@@ -291,17 +300,26 @@ static bool batadv_v_neigh_is_sob(struct batadv_neigh_node *neigh1,
- {
- 	struct batadv_neigh_ifinfo *ifinfo1, *ifinfo2;
- 	u32 threshold;
-+	bool ret = false;
- 
- 	ifinfo1 = batadv_neigh_ifinfo_get(neigh1, if_outgoing1);
--	ifinfo2 = batadv_neigh_ifinfo_get(neigh2, if_outgoing2);
-+	if (WARN_ON(!ifinfo1))
-+		goto err_ifinfo1;
- 
--	if (WARN_ON(!ifinfo1 || !ifinfo2))
--		return false;
-+	ifinfo2 = batadv_neigh_ifinfo_get(neigh2, if_outgoing2);
-+	if (WARN_ON(!ifinfo2))
-+		goto err_ifinfo2;
- 
- 	threshold = ifinfo1->bat_v.throughput / 4;
- 	threshold = ifinfo1->bat_v.throughput - threshold;
- 
--	return ifinfo2->bat_v.throughput > threshold;
-+	ret = ifinfo2->bat_v.throughput > threshold;
-+
-+	batadv_neigh_ifinfo_put(ifinfo2);
-+err_ifinfo2:
-+	batadv_neigh_ifinfo_put(ifinfo1);
-+err_ifinfo1:
-+	return ret;
- }
- 
- static struct batadv_algo_ops batadv_batman_v __read_mostly = {
--- 
-2.8.0.rc3
-
diff --git a/batman-adv/patches/0005-batman-adv-Fix-double-neigh_node_put-in-batadv_v_ogm.patch b/batman-adv/patches/0005-batman-adv-Fix-double-neigh_node_put-in-batadv_v_ogm.patch
deleted file mode 100644
index 8ea3788..0000000
--- a/batman-adv/patches/0005-batman-adv-Fix-double-neigh_node_put-in-batadv_v_ogm.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From fc3e79d9ef2a1006f94e441d9613749cbbe7176a Mon Sep 17 00:00:00 2001
-From: Sven Eckelmann <sven@narfation.org>
-Date: Fri, 6 May 2016 22:27:09 +0200
-Subject: [PATCH 5/6] batman-adv: Fix double neigh_node_put in
- batadv_v_ogm_route_update
-
-The router is put down twice when it was non-NULL and either orig_ifinfo is
-NULL afterwards or batman-adv receives a packet with the same sequence
-number. This will end up in a use-after-free when the batadv_neigh_node is
-removed because the reference counter ended up too early at 0.
-
-Fixes: 667996ebeab4 ("batman-adv: OGMv2 - implement originators logic")
-Reported-by: Gui Iribarren <gui@altermundi.net>
-Tested-by: Antonio Quartulli <a@unstable.cc>
-Tested-by: Marek Lindner <mareklindner@neomailbox.ch>
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- net/batman-adv/bat_v_ogm.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c
-index d9bcbe6..91df28a 100644
---- a/net/batman-adv/bat_v_ogm.c
-+++ b/net/batman-adv/bat_v_ogm.c
-@@ -529,8 +529,10 @@ static void batadv_v_ogm_route_update(struct batadv_priv *bat_priv,
- 		goto out;
- 	}
- 
--	if (router)
-+	if (router) {
- 		batadv_neigh_node_put(router);
-+		router = NULL;
-+	}
- 
- 	/* 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,
--- 
-2.8.0.rc3
-
diff --git a/batman-adv/patches/0006-batman-adv-initialize-ELP-orig-address-on-secondary-.patch b/batman-adv/patches/0006-batman-adv-initialize-ELP-orig-address-on-secondary-.patch
deleted file mode 100644
index f87ddf0..0000000
--- a/batman-adv/patches/0006-batman-adv-initialize-ELP-orig-address-on-secondary-.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From f58a0b03873fd3aa9568c11af198f997ed2208cc Mon Sep 17 00:00:00 2001
-From: Marek Lindner <mareklindner@neomailbox.ch>
-Date: Sat, 7 May 2016 19:54:17 +0800
-Subject: [PATCH 6/6] batman-adv: initialize ELP orig address on secondary
- interfaces
-
-This fix prevents nodes to wrongly create a 00:00:00:00:00:00 originator
-which can potentially interfere with the rest of the neighbor statistics.
-
-Fixes: a4b88af77e28 ("batman-adv: ELP - adding basic infrastructure")
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
----
- net/batman-adv/bat_v.c     | 10 ++++++++++
- net/batman-adv/bat_v_elp.c | 31 ++++++++++++++++++++++---------
- net/batman-adv/bat_v_elp.h |  2 ++
- 3 files changed, 34 insertions(+), 9 deletions(-)
-
-diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c
-index 2bcb29b..0caca2f 100644
---- a/net/batman-adv/bat_v.c
-+++ b/net/batman-adv/bat_v.c
-@@ -39,6 +39,16 @@
- 
- static void batadv_v_iface_activate(struct batadv_hard_iface *hard_iface)
- {
-+	struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
-+	struct batadv_hard_iface *primary_if;
-+
-+	primary_if = batadv_primary_if_get_selected(bat_priv);
-+
-+	if (primary_if) {
-+		batadv_v_elp_iface_activate(primary_if, hard_iface);
-+		batadv_hardif_put(primary_if);
-+	}
-+
- 	/* B.A.T.M.A.N. V does not use any queuing mechanism, therefore it can
- 	 * set the interface as ACTIVE right away, without any risk of race
- 	 * condition
-diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
-index 3844e7e..df42eb1 100644
---- a/net/batman-adv/bat_v_elp.c
-+++ b/net/batman-adv/bat_v_elp.c
-@@ -377,6 +377,27 @@ void batadv_v_elp_iface_disable(struct batadv_hard_iface *hard_iface)
- }
- 
- /**
-+ * batadv_v_elp_iface_activate - update the ELP buffer belonging to the given
-+ *  hard-interface
-+ * @primary_iface: the new primary interface
-+ * @hard_iface: interface holding the to-be-updated buffer
-+ */
-+void batadv_v_elp_iface_activate(struct batadv_hard_iface *primary_iface,
-+				 struct batadv_hard_iface *hard_iface)
-+{
-+	struct batadv_elp_packet *elp_packet;
-+	struct sk_buff *skb;
-+
-+	if (!hard_iface->bat_v.elp_skb)
-+		return;
-+
-+	skb = hard_iface->bat_v.elp_skb;
-+	elp_packet = (struct batadv_elp_packet *)skb->data;
-+	ether_addr_copy(elp_packet->orig,
-+			primary_iface->net_dev->dev_addr);
-+}
-+
-+/**
-  * batadv_v_elp_primary_iface_set - change internal data to reflect the new
-  *  primary interface
-  * @primary_iface: the new primary interface
-@@ -384,8 +405,6 @@ void batadv_v_elp_iface_disable(struct batadv_hard_iface *hard_iface)
- void batadv_v_elp_primary_iface_set(struct batadv_hard_iface *primary_iface)
- {
- 	struct batadv_hard_iface *hard_iface;
--	struct batadv_elp_packet *elp_packet;
--	struct sk_buff *skb;
- 
- 	/* update orig field of every elp iface belonging to this mesh */
- 	rcu_read_lock();
-@@ -393,13 +412,7 @@ void batadv_v_elp_primary_iface_set(struct batadv_hard_iface *primary_iface)
- 		if (primary_iface->soft_iface != hard_iface->soft_iface)
- 			continue;
- 
--		if (!hard_iface->bat_v.elp_skb)
--			continue;
--
--		skb = hard_iface->bat_v.elp_skb;
--		elp_packet = (struct batadv_elp_packet *)skb->data;
--		ether_addr_copy(elp_packet->orig,
--				primary_iface->net_dev->dev_addr);
-+		batadv_v_elp_iface_activate(primary_iface, hard_iface);
- 	}
- 	rcu_read_unlock();
- }
-diff --git a/net/batman-adv/bat_v_elp.h b/net/batman-adv/bat_v_elp.h
-index e95f1bc..cc130b2 100644
---- a/net/batman-adv/bat_v_elp.h
-+++ b/net/batman-adv/bat_v_elp.h
-@@ -25,6 +25,8 @@ struct work_struct;
- 
- int batadv_v_elp_iface_enable(struct batadv_hard_iface *hard_iface);
- void batadv_v_elp_iface_disable(struct batadv_hard_iface *hard_iface);
-+void batadv_v_elp_iface_activate(struct batadv_hard_iface *primary_iface,
-+				 struct batadv_hard_iface *hard_iface);
- void batadv_v_elp_primary_iface_set(struct batadv_hard_iface *primary_iface);
- int batadv_v_elp_packet_recv(struct sk_buff *skb,
- 			     struct batadv_hard_iface *if_incoming);
--- 
-2.8.0.rc3
-

From ff255dd9d1b75d0be0152b01680859d2a6bfcbcb Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Thu, 9 Jun 2016 18:48:19 +0200
Subject: [PATCH 263/368] batctl: upgrade package to latest release 2016.2

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batctl/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/batctl/Makefile b/batctl/Makefile
index 818e345..174b18e 100644
--- a/batctl/Makefile
+++ b/batctl/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batctl
 
-PKG_VERSION:=2016.1
-PKG_RELEASE:=1
-PKG_MD5SUM:=b98a6e3b45927315cd6d4efba4c1a1ff
+PKG_VERSION:=2016.2
+PKG_RELEASE:=0
+PKG_MD5SUM:=50f42d06611afae58ccfcde502f94c1a
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From 1baec91201d9bcc11dd887a42a5dbc71d97f0ee7 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Thu, 9 Jun 2016 18:48:31 +0200
Subject: [PATCH 264/368] alfred: upgrade package to latest release 2016.2

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 alfred/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/alfred/Makefile b/alfred/Makefile
index 2e117b3..f2ebe2c 100644
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -11,9 +11,9 @@ include $(TOPDIR)/rules.mk
 # The latest alfred git hash in PKG_REV can be obtained from https://git.open-mesh.org/alfred.git
 #
 PKG_NAME:=alfred
-PKG_VERSION:=2016.1
+PKG_VERSION:=2016.2
 PKG_RELEASE:=0
-PKG_MD5SUM:=0caefc13ba631cba93b84d7f5685e8d0
+PKG_MD5SUM:=cc7d5b352942477033a4cafbed84152d
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From 85e771d2f1ca1981983238073ffc602981acbb40 Mon Sep 17 00:00:00 2001
From: Hans Dedecker <dedeckeh@gmail.com>
Date: Sun, 12 Jun 2016 21:49:18 +0200
Subject: [PATCH 265/368] nat46: Depend on IPV6 as IPv6 is kernel builtin
 module now (#195)

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
---
 nat46/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nat46/Makefile b/nat46/Makefile
index 65b92c2..0283dd4 100644
--- a/nat46/Makefile
+++ b/nat46/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=nat46
-PKG_VERSION:=6
+PKG_VERSION:=7
 PKG_RELEASE:=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
@@ -37,7 +37,7 @@ define Package/464xlat
 endef
 
 define KernelPackage/nat46
-  DEPENDS:=+kmod-ipv6
+  DEPENDS:=@IPV6
   TITLE:=Stateless NAT46 translation kernel module
   SECTION:=kernel
   SUBMENU:=Network Support

From 33b0b707dcfb0fca508998d2ab38100352592ad8 Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Tue, 28 Jun 2016 00:45:11 +0300
Subject: [PATCH 266/368] hnetd/ohp -> git head, miniupnpd->2.0 (from 15.05
 branch).

---
 hnetd/Makefile        | 4 ++--
 miniupnpd/Makefile    | 4 ++--
 ohybridproxy/Makefile | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hnetd/Makefile b/hnetd/Makefile
index 7fc8b9b..6390f13 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hnetd
-PKG_SOURCE_VERSION:=9ab71adbf0a7ad2a0964e48641b19b016b37df16
-PKG_VERSION:=2016-05-16-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=606d7e904603ad8792ac1a7ba825618df97b5a4e
+PKG_VERSION:=2016-06-28-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index 1000929..0207036 100644
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
-PKG_VERSION:=1.9.20151212
+PKG_VERSION:=2.0
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=86465b35f711ca9982d48b34c094033a
+PKG_MD5SUM:=1c07a215dd9b362e75a9efc05e2fb3b4
 
 PKG_MAINTAINER:=Markus Stenberg <fingon@iki.fi>
 PKG_LICENSE:=BSD-3-Clause
diff --git a/ohybridproxy/Makefile b/ohybridproxy/Makefile
index fd99c3e..7d88f5d 100644
--- a/ohybridproxy/Makefile
+++ b/ohybridproxy/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ohybridproxy
-PKG_SOURCE_VERSION:=b14767d48225aad9ea56ff3e5d6883550e0cf249
-PKG_VERSION:=2015-09-29-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=8a28ae92c97099e771c9ede5641e3782ae809c27
+PKG_VERSION:=2016-06-28-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git

From fa76522336590a7c9fcb657f734bcdc9f400bd14 Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Tue, 28 Jun 2016 15:18:30 +0300
Subject: [PATCH 267/368] miniupnpd: Fix UUID dependency not to check outside
 the tree, and use uuid always.

---
 miniupnpd/Makefile                         |  7 +++---
 miniupnpd/patches/100-no-ssl.patch         | 12 -----------
 miniupnpd/patches/101-no-ssl-uuid.patch    | 25 ++++++++++++++++++++++
 miniupnpd/patches/104-always-libuuid.patch | 20 +++++++++++++++++
 4 files changed, 49 insertions(+), 15 deletions(-)
 delete mode 100644 miniupnpd/patches/100-no-ssl.patch
 create mode 100644 miniupnpd/patches/101-no-ssl-uuid.patch
 create mode 100644 miniupnpd/patches/104-always-libuuid.patch

diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index 0207036..fbbcfee 100644
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/miniupnpd
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+iptables +libip4tc +IPV6:libip6tc +IPV6:ip6tables
+  DEPENDS:=+iptables +libip4tc +IPV6:libip6tc +IPV6:ip6tables +libuuid
   TITLE:=Lightweight UPnP IGD, NAT-PMP & PCP daemon
   SUBMENU:=Firewall
   URL:=http://miniupnp.free.fr/
@@ -50,9 +50,10 @@ define Build/Prepare
 endef
 
 MAKE_FLAGS += \
-	TEST=0 \
+	TARGET_OPENWRT=1 TEST=0 \
 	LIBS="" \
-	CC="$(TARGET_CC) -DIPTABLES_143 -lip4tc $(if $(CONFIG_IPV6),-lip6tc)" \
+	CC="$(TARGET_CC) -DIPTABLES_143 \
+		-lip4tc $(if $(CONFIG_IPV6),-lip6tc) -luuid" \
 	CONFIG_OPTIONS="$(if $(CONFIG_IPV6),--ipv6) --leasefile" \
 	-f Makefile.linux \
 	miniupnpd
diff --git a/miniupnpd/patches/100-no-ssl.patch b/miniupnpd/patches/100-no-ssl.patch
deleted file mode 100644
index 343e615..0000000
--- a/miniupnpd/patches/100-no-ssl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile.linux
-+++ b/Makefile.linux
-@@ -147,7 +147,8 @@ LDLIBS += $(shell $(PKG_CONFIG) --static
- LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libnetfilter_conntrack)
- endif # ($(TEST),1)
- 
--LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libssl)
-+# n/a - we don't enable https server for IGD v2 anyway
-+#LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libssl)
- 
- TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
- 
diff --git a/miniupnpd/patches/101-no-ssl-uuid.patch b/miniupnpd/patches/101-no-ssl-uuid.patch
new file mode 100644
index 0000000..03a4966
--- /dev/null
+++ b/miniupnpd/patches/101-no-ssl-uuid.patch
@@ -0,0 +1,25 @@
+We do not need to autodetect SSL/UUID; SSL we do not support, UUID we always do.
+
+diff --git a/miniupnpd/Makefile.linux b/miniupnpd/Makefile.linux
+index 2d28126..01daeea 100644
+--- a/Makefile.linux
++++ b/Makefile.linux
+@@ -153,14 +153,18 @@ LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libmnl)
+ LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libnetfilter_conntrack)
+ endif # ($(TEST),1)
+ 
++ifeq ($(TARGET_OPENWRT),)
++# n/a - we don't enable https server for IGD v2 anyway in OpenWrt
+ LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libssl)
+ 
++# n/a - we hardcodedly support libuuid
+ TEST := $(shell $(PKG_CONFIG) --exists uuid && echo 1)
+ ifeq ($(TEST),1)
+ LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l uuid)
+ else
+ $(info please install uuid-dev package / libuuid)
+ endif # ($(TEST),1)
++endif
+ 
+ TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
+ 
diff --git a/miniupnpd/patches/104-always-libuuid.patch b/miniupnpd/patches/104-always-libuuid.patch
new file mode 100644
index 0000000..d6c0770
--- /dev/null
+++ b/miniupnpd/patches/104-always-libuuid.patch
@@ -0,0 +1,20 @@
+As it turns out, the 'magic' libuuid/bsd uuid check just checks
+outside buildtree altogether for the uuid_generate. So we just
+hardcode it.
+
+--- a/genconfig.sh
++++ b/genconfig.sh
+@@ -367,12 +367,7 @@ case $FW in
+ esac
+ 
+ # UUID API
+-if grep uuid_create /usr/include/uuid.h > /dev/null 2>&1 ; then
+-	echo "#define BSD_UUID" >> ${CONFIGFILE}
+-fi
+-if grep uuid_generate /usr/include/uuid/uuid.h > /dev/null 2>&1 ; then
+-	echo "#define LIB_UUID" >> ${CONFIGFILE}
+-fi
++echo "#define LIB_UUID" >> ${CONFIGFILE}
+ 
+ # set V6SOCKETS_ARE_V6ONLY to 0 if it was not set above
+ if [ -z "$V6SOCKETS_ARE_V6ONLY" ] ; then

From c5426a2ad41a66503daeca63159da7ab73264f0b Mon Sep 17 00:00:00 2001
From: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Date: Tue, 28 Jun 2016 15:57:36 +0100
Subject: [PATCH 268/368] miniupnpd: refresh patches

Refresh patches to clear patch fuzz

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
---
 miniupnpd/patches/101-no-ssl-uuid.patch           | 4 +---
 miniupnpd/patches/102-ipv6-ext-port.patch         | 2 +-
 miniupnpd/patches/103-no-ipv6-autodetection.patch | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/miniupnpd/patches/101-no-ssl-uuid.patch b/miniupnpd/patches/101-no-ssl-uuid.patch
index 03a4966..81cea10 100644
--- a/miniupnpd/patches/101-no-ssl-uuid.patch
+++ b/miniupnpd/patches/101-no-ssl-uuid.patch
@@ -1,10 +1,8 @@
 We do not need to autodetect SSL/UUID; SSL we do not support, UUID we always do.
 
-diff --git a/miniupnpd/Makefile.linux b/miniupnpd/Makefile.linux
-index 2d28126..01daeea 100644
 --- a/Makefile.linux
 +++ b/Makefile.linux
-@@ -153,14 +153,18 @@ LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libmnl)
+@@ -153,14 +153,18 @@ LDLIBS += $(shell $(PKG_CONFIG) --static
  LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libnetfilter_conntrack)
  endif # ($(TEST),1)
  
diff --git a/miniupnpd/patches/102-ipv6-ext-port.patch b/miniupnpd/patches/102-ipv6-ext-port.patch
index fdb2af4..806c7fd 100644
--- a/miniupnpd/patches/102-ipv6-ext-port.patch
+++ b/miniupnpd/patches/102-ipv6-ext-port.patch
@@ -1,6 +1,6 @@
 --- a/pcpserver.c
 +++ b/pcpserver.c
-@@ -1004,6 +1004,7 @@ static int CreatePCPMap_NAT(pcp_info_t *
+@@ -982,6 +982,7 @@ static int CreatePCPMap_NAT(pcp_info_t *
  				   timestamp);
  	if (r < 0)
  		return PCP_ERR_NO_RESOURCES;
diff --git a/miniupnpd/patches/103-no-ipv6-autodetection.patch b/miniupnpd/patches/103-no-ipv6-autodetection.patch
index 61c023a..50d5a39 100644
--- a/miniupnpd/patches/103-no-ipv6-autodetection.patch
+++ b/miniupnpd/patches/103-no-ipv6-autodetection.patch
@@ -17,7 +17,7 @@ As the OpenWRT buildsystem already passes the right compile flags, we can skip t
  #        testiptpinhole
 --- a/Makefile.linux
 +++ b/Makefile.linux
-@@ -70,7 +70,6 @@ CPPFLAGS += -DIPTABLES_143
+@@ -73,7 +73,6 @@ CPPFLAGS += -DIPTABLES_143
  endif
  
  CFLAGS  += $(shell $(PKG_CONFIG) --cflags libiptc)

From 7237a6637103cd8f5ed6f513dd9847123074b9a0 Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Fri, 1 Jul 2016 11:08:42 +0200
Subject: [PATCH 269/368] bmx7: update source

---
 bmx7/Makefile              | 10 +++++-----
 bmx7/files/etc/config/bmx7 |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/bmx7/Makefile b/bmx7/Makefile
index b626bce..b015eef 100644
--- a/bmx7/Makefile
+++ b/bmx7/Makefile
@@ -28,12 +28,12 @@ PKG_NAME:=bmx7
 
 PKG_SOURCE_PROTO:=git
 
-PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
-#PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
+#PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
+PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 #PKG_SOURCE_URL:=file:///usr/src/bmx6/bmx6.git
 
-PKG_REV:=b2e3f4439a4b676c2b9c13b82706907fabb67059
-PKG_VERSION:=r2016050108
+PKG_REV:=67329597c7444540f91debc74d037d4642161c4d
+PKG_VERSION:=r2016070104
 PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 
@@ -82,7 +82,7 @@ endef
 define Package/bmx7-iwinfo
   $(call Package/bmx7/Default)
   DEPENDS:=bmx7 +libiwinfo
-  TITLE:=link characteristics plugin based on libiwinfo
+  TITLE:=link characteristics plugin based on libiwinfo (recommended!)
 endef
 
 define Package/bmx7-topology
diff --git a/bmx7/files/etc/config/bmx7 b/bmx7/files/etc/config/bmx7
index 7593ede..b92f525 100644
--- a/bmx7/files/etc/config/bmx7
+++ b/bmx7/files/etc/config/bmx7
@@ -16,6 +16,9 @@ config 'bmx7' 'general'
 #config 'plugin'
 #        option 'plugin' 'bmx7_sms.so'
 
+#config 'plugin'
+#        option 'plugin' 'bmx7_iwinfo.so'
+
 
 config 'dev' 'mesh_1'
         option 'dev' 'br-lan'

From fc23ccd4b48355f98f99ce2f4b02f6f3f6c3ae7b Mon Sep 17 00:00:00 2001
From: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Date: Mon, 4 Jul 2016 20:23:45 +0100
Subject: [PATCH 270/368] miniupnpd: add igd2 postrouting table

add MINIUPNPD-POSTROUTING rule. Solves following error

addmasqueraderule() : chain MINIUPNPD-POSTROUTING not found

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
---
 miniupnpd/Makefile               | 2 +-
 miniupnpd/files/firewall.include | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index fbbcfee..97f0b6c 100644
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
 PKG_VERSION:=2.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/miniupnpd/files/firewall.include b/miniupnpd/files/firewall.include
index 818af9d..0eb96d7 100644
--- a/miniupnpd/files/firewall.include
+++ b/miniupnpd/files/firewall.include
@@ -5,6 +5,7 @@ IP6TABLES=/usr/sbin/ip6tables
 
 iptables -t filter -N MINIUPNPD 2>/dev/null
 iptables -t nat -N MINIUPNPD 2>/dev/null
+iptables -t nat -N MINIUPNPD-POSTROUTING 2>/dev/null
 
 [ -x $IP6TABLES ] && $IP6TABLES -t filter -N MINIUPNPD 2>/dev/null
 
@@ -20,6 +21,7 @@ add_extzone_rules() {
     # IPv4 - due to NAT, need to add both to nat and filter table
     iptables -t filter -I zone_${ext_zone}_forward -j MINIUPNPD
     iptables -t nat -I zone_${ext_zone}_prerouting -j MINIUPNPD
+    iptables -t nat -I zone_${ext_zone}_postrouting -j MINIUPNPD-POSTROUTING
 
     # IPv6 if available - filter only
     [ -x $IP6TABLES ] && {

From af8eeab86fc071b932a113cf21eabb2da8561d22 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
Date: Tue, 5 Jul 2016 12:03:44 +0200
Subject: [PATCH 271/368] batman-adv: Add reference counting + nullptr fixes

 * Avoid nullptr dereference in bla after vlan_insert_tag
 * Avoid nullptr dereference in dat after vlan_insert_tag
 * Avoid tt_req_node list put for unhashed entry
 * Fix orig_node_vlan leak on orig_node_release
 * Fix non-atomic bla_claim::backbone_gw access
 * Fix reference leak in batadv_find_router
 * Free last_bonding_candidate on release of orig_node

Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
---
 ...-nullptr-dereference-in-bla-after-vl.patch |  35 +++
 ...-nullptr-dereference-in-dat-after-vl.patch |  49 +++
 ...-tt_req_node-list-put-for-unhashed-e.patch |  41 +++
 ...rig_node_vlan-leak-on-orig_node_rele.patch |  43 +++
 ...on-atomic-bla_claim-backbone_gw-acce.patch | 291 ++++++++++++++++++
 ...reference-leak-in-batadv_find_router.patch | 120 ++++++++
 ...last_bonding_candidate-on-release-of.patch |  45 +++
 7 files changed, 624 insertions(+)
 create mode 100644 batman-adv/patches/0001-batman-adv-Avoid-nullptr-dereference-in-bla-after-vl.patch
 create mode 100644 batman-adv/patches/0002-batman-adv-Avoid-nullptr-dereference-in-dat-after-vl.patch
 create mode 100644 batman-adv/patches/0003-batman-adv-Avoid-tt_req_node-list-put-for-unhashed-e.patch
 create mode 100644 batman-adv/patches/0004-batman-adv-Fix-orig_node_vlan-leak-on-orig_node_rele.patch
 create mode 100644 batman-adv/patches/0005-batman-adv-Fix-non-atomic-bla_claim-backbone_gw-acce.patch
 create mode 100644 batman-adv/patches/0006-batman-adv-Fix-reference-leak-in-batadv_find_router.patch
 create mode 100644 batman-adv/patches/0007-batman-adv-Free-last_bonding_candidate-on-release-of.patch

diff --git a/batman-adv/patches/0001-batman-adv-Avoid-nullptr-dereference-in-bla-after-vl.patch b/batman-adv/patches/0001-batman-adv-Avoid-nullptr-dereference-in-bla-after-vl.patch
new file mode 100644
index 0000000..49c0637
--- /dev/null
+++ b/batman-adv/patches/0001-batman-adv-Avoid-nullptr-dereference-in-bla-after-vl.patch
@@ -0,0 +1,35 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Sat, 2 Jul 2016 09:52:13 +0200
+Subject: [PATCH] batman-adv: Avoid nullptr dereference in bla after vlan_insert_tag
+
+vlan_insert_tag can return NULL on errors. The bridge loop avoidance code
+therefore has to check the return value of vlan_insert_tag for NULL before
+it can safely operate on this pointer.
+
+Fixes: a9ce0dc43e2c ("batman-adv: add basic bridge loop avoidance code")
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+
+Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/e4cffba4d3353ea15287abbfbdd65208aa62c156
+---
+ net/batman-adv/bridge_loop_avoidance.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
+index 748a9ea..7129780 100644
+--- a/net/batman-adv/bridge_loop_avoidance.c
++++ b/net/batman-adv/bridge_loop_avoidance.c
+@@ -418,9 +418,12 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac,
+ 		break;
+ 	}
+ 
+-	if (vid & BATADV_VLAN_HAS_TAG)
++	if (vid & BATADV_VLAN_HAS_TAG) {
+ 		skb = vlan_insert_tag(skb, htons(ETH_P_8021Q),
+ 				      vid & VLAN_VID_MASK);
++		if (!skb)
++			goto out;
++	}
+ 
+ 	skb_reset_mac_header(skb);
+ 	skb->protocol = eth_type_trans(skb, soft_iface);
diff --git a/batman-adv/patches/0002-batman-adv-Avoid-nullptr-dereference-in-dat-after-vl.patch b/batman-adv/patches/0002-batman-adv-Avoid-nullptr-dereference-in-dat-after-vl.patch
new file mode 100644
index 0000000..e5e72d7
--- /dev/null
+++ b/batman-adv/patches/0002-batman-adv-Avoid-nullptr-dereference-in-dat-after-vl.patch
@@ -0,0 +1,49 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Sat, 2 Jul 2016 09:52:14 +0200
+Subject: [PATCH] batman-adv: Avoid nullptr dereference in dat after vlan_insert_tag
+
+vlan_insert_tag can return NULL on errors. The distributed arp table code
+therefore has to check the return value of vlan_insert_tag for NULL before
+it can safely operate on this pointer.
+
+Fixes: 53c6c262a581 ("batman-adv: tag locally generated ARP reply if needed")
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+
+Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/898382d11fa1f737cd4f7033db1088c601fd11ed
+---
+ net/batman-adv/distributed-arp-table.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
+index 278800a..aee3b39 100644
+--- a/net/batman-adv/distributed-arp-table.c
++++ b/net/batman-adv/distributed-arp-table.c
+@@ -1009,9 +1009,12 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv,
+ 		if (!skb_new)
+ 			goto out;
+ 
+-		if (vid & BATADV_VLAN_HAS_TAG)
++		if (vid & BATADV_VLAN_HAS_TAG) {
+ 			skb_new = vlan_insert_tag(skb_new, htons(ETH_P_8021Q),
+ 						  vid & VLAN_VID_MASK);
++			if (!skb_new)
++				goto out;
++		}
+ 
+ 		skb_reset_mac_header(skb_new);
+ 		skb_new->protocol = eth_type_trans(skb_new,
+@@ -1089,9 +1092,12 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv,
+ 	 */
+ 	skb_reset_mac_header(skb_new);
+ 
+-	if (vid & BATADV_VLAN_HAS_TAG)
++	if (vid & BATADV_VLAN_HAS_TAG) {
+ 		skb_new = vlan_insert_tag(skb_new, htons(ETH_P_8021Q),
+ 					  vid & VLAN_VID_MASK);
++		if (!skb_new)
++			goto out;
++	}
+ 
+ 	/* To preserve backwards compatibility, the node has choose the outgoing
+ 	 * format based on the incoming request packet type. The assumption is
diff --git a/batman-adv/patches/0003-batman-adv-Avoid-tt_req_node-list-put-for-unhashed-e.patch b/batman-adv/patches/0003-batman-adv-Avoid-tt_req_node-list-put-for-unhashed-e.patch
new file mode 100644
index 0000000..60d4e12
--- /dev/null
+++ b/batman-adv/patches/0003-batman-adv-Avoid-tt_req_node-list-put-for-unhashed-e.patch
@@ -0,0 +1,41 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Fri, 24 Jun 2016 21:43:32 +0200
+Subject: [PATCH] batman-adv: Avoid tt_req_node list put for unhashed entry
+
+It can happen that a tt_req_node list entry was already removed from
+tt.req_list when batadv_send_tt_request reaches the end of the function.
+The reference counter was already reduced by 1 for the list entry and thus
+the reference counter is not allowed to be reduced again. Otherwise, the
+entry is freed too early and the next batadv_tt_req_node_put in this
+function will operate on freed memory.
+
+Fixes: cea194d90b11 ("batman-adv: improved client announcement mechanism")
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+
+Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/03ecc9f957b837c755f09251c5f684996521e487
+---
+ net/batman-adv/translation-table.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
+index d033a05..57ec87f 100644
+--- a/net/batman-adv/translation-table.c
++++ b/net/batman-adv/translation-table.c
+@@ -2639,11 +2639,13 @@ static bool batadv_send_tt_request(struct batadv_priv *bat_priv,
+ out:
+ 	if (primary_if)
+ 		batadv_hardif_put(primary_if);
++
+ 	if (ret && tt_req_node) {
+ 		spin_lock_bh(&bat_priv->tt.req_list_lock);
+-		/* hlist_del_init() verifies tt_req_node still is in the list */
+-		hlist_del_init(&tt_req_node->list);
+-		batadv_tt_req_node_put(tt_req_node);
++		if (!hlist_unhashed(&tt_req_node->list)) {
++			hlist_del_init(&tt_req_node->list);
++			batadv_tt_req_node_put(tt_req_node);
++		}
+ 		spin_unlock_bh(&bat_priv->tt.req_list_lock);
+ 	}
+ 
diff --git a/batman-adv/patches/0004-batman-adv-Fix-orig_node_vlan-leak-on-orig_node_rele.patch b/batman-adv/patches/0004-batman-adv-Fix-orig_node_vlan-leak-on-orig_node_rele.patch
new file mode 100644
index 0000000..7af3162
--- /dev/null
+++ b/batman-adv/patches/0004-batman-adv-Fix-orig_node_vlan-leak-on-orig_node_rele.patch
@@ -0,0 +1,43 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Thu, 30 Jun 2016 20:10:46 +0200
+Subject: [PATCH] batman-adv: Fix orig_node_vlan leak on orig_node_release
+
+batadv_orig_node_new uses batadv_orig_node_vlan_new to allocate a new
+batadv_orig_node_vlan and add it to batadv_orig_node::vlan_list. References
+to this list have also to be cleaned when the batadv_orig_node is removed.
+
+Fixes: 21a57f6e7a3b ("batman-adv: make the TT CRC logic VLAN specific")
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+
+Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/719afd254e812c7ff8688ce79bebb7324ec438d6
+---
+ net/batman-adv/originator.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
+index 7f51bc2..fe2fcda 100644
+--- a/net/batman-adv/originator.c
++++ b/net/batman-adv/originator.c
+@@ -765,6 +765,7 @@ static void batadv_orig_node_release(struct kref *ref)
+ 	struct batadv_neigh_node *neigh_node;
+ 	struct batadv_orig_node *orig_node;
+ 	struct batadv_orig_ifinfo *orig_ifinfo;
++	struct batadv_orig_node_vlan *vlan;
+ 
+ 	orig_node = container_of(ref, struct batadv_orig_node, refcount);
+ 
+@@ -784,6 +785,13 @@ static void batadv_orig_node_release(struct kref *ref)
+ 	}
+ 	spin_unlock_bh(&orig_node->neigh_list_lock);
+ 
++	spin_lock_bh(&orig_node->vlan_list_lock);
++	hlist_for_each_entry_safe(vlan, node_tmp, &orig_node->vlan_list, list) {
++		hlist_del_rcu(&vlan->list);
++		batadv_orig_node_vlan_put(vlan);
++	}
++	spin_unlock_bh(&orig_node->vlan_list_lock);
++
+ 	/* Free nc_nodes */
+ 	batadv_nc_purge_orig(orig_node->bat_priv, orig_node, NULL);
+ 
diff --git a/batman-adv/patches/0005-batman-adv-Fix-non-atomic-bla_claim-backbone_gw-acce.patch b/batman-adv/patches/0005-batman-adv-Fix-non-atomic-bla_claim-backbone_gw-acce.patch
new file mode 100644
index 0000000..5e0afdd
--- /dev/null
+++ b/batman-adv/patches/0005-batman-adv-Fix-non-atomic-bla_claim-backbone_gw-acce.patch
@@ -0,0 +1,291 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Fri, 1 Jul 2016 15:49:43 +0200
+Subject: [PATCH] batman-adv: Fix non-atomic bla_claim::backbone_gw access
+
+The pointer batadv_bla_claim::backbone_gw can be changed at any time.
+Therefore, access to it must be protected to ensure that two function
+accessing the same backbone_gw are actually accessing the same. This is
+especially important when the crc_lock is used or when the backbone_gw of a
+claim is exchanged.
+
+Not doing so leads to invalid memory access and/or reference leaks.
+
+Fixes: a9ce0dc43e2c ("batman-adv: add basic bridge loop avoidance code")
+Fixes: b307e72d119f ("batman-adv: lock crc access in bridge loop avoidance")
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+Acked-by: Simon Wunderlich <sw@simonwunderlich.de>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+
+Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/e401297e3a393896e9b07bef8d6e2df203b60d43
+---
+ net/batman-adv/bridge_loop_avoidance.c | 111 ++++++++++++++++++++++++++-------
+ net/batman-adv/types.h                 |   2 +
+ 2 files changed, 90 insertions(+), 23 deletions(-)
+
+diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
+index 7129780..825a5cd 100644
+--- a/net/batman-adv/bridge_loop_avoidance.c
++++ b/net/batman-adv/bridge_loop_avoidance.c
+@@ -177,10 +177,21 @@ static void batadv_backbone_gw_put(struct batadv_bla_backbone_gw *backbone_gw)
+ static void batadv_claim_release(struct kref *ref)
+ {
+ 	struct batadv_bla_claim *claim;
++	struct batadv_bla_backbone_gw *old_backbone_gw;
+ 
+ 	claim = container_of(ref, struct batadv_bla_claim, refcount);
+ 
+-	batadv_backbone_gw_put(claim->backbone_gw);
++	spin_lock_bh(&claim->backbone_lock);
++	old_backbone_gw = claim->backbone_gw;
++	claim->backbone_gw = NULL;
++	spin_unlock_bh(&claim->backbone_lock);
++
++	spin_lock_bh(&old_backbone_gw->crc_lock);
++	old_backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);
++	spin_unlock_bh(&old_backbone_gw->crc_lock);
++
++	batadv_backbone_gw_put(old_backbone_gw);
++
+ 	kfree_rcu(claim, rcu);
+ }
+ 
+@@ -677,8 +688,10 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv,
+ 				 const u8 *mac, const unsigned short vid,
+ 				 struct batadv_bla_backbone_gw *backbone_gw)
+ {
++	struct batadv_bla_backbone_gw *old_backbone_gw;
+ 	struct batadv_bla_claim *claim;
+ 	struct batadv_bla_claim search_claim;
++	bool remove_crc = false;
+ 	int hash_added;
+ 
+ 	ether_addr_copy(search_claim.addr, mac);
+@@ -692,8 +705,10 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv,
+ 			return;
+ 
+ 		ether_addr_copy(claim->addr, mac);
++		spin_lock_init(&claim->backbone_lock);
+ 		claim->vid = vid;
+ 		claim->lasttime = jiffies;
++		kref_get(&backbone_gw->refcount);
+ 		claim->backbone_gw = backbone_gw;
+ 
+ 		kref_init(&claim->refcount);
+@@ -721,15 +736,26 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv,
+ 			   "bla_add_claim(): changing ownership for %pM, vid %d\n",
+ 			   mac, BATADV_PRINT_VID(vid));
+ 
+-		spin_lock_bh(&claim->backbone_gw->crc_lock);
+-		claim->backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);
+-		spin_unlock_bh(&claim->backbone_gw->crc_lock);
+-		batadv_backbone_gw_put(claim->backbone_gw);
++		remove_crc = true;
+ 	}
+-	/* set (new) backbone gw */
++
++	/* replace backbone_gw atomically and adjust reference counters */
++	spin_lock_bh(&claim->backbone_lock);
++	old_backbone_gw = claim->backbone_gw;
+ 	kref_get(&backbone_gw->refcount);
+ 	claim->backbone_gw = backbone_gw;
++	spin_unlock_bh(&claim->backbone_lock);
+ 
++	if (remove_crc) {
++		/* remove claim address from old backbone_gw */
++		spin_lock_bh(&old_backbone_gw->crc_lock);
++		old_backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);
++		spin_unlock_bh(&old_backbone_gw->crc_lock);
++	}
++
++	batadv_backbone_gw_put(old_backbone_gw);
++
++	/* add claim address to new backbone_gw */
+ 	spin_lock_bh(&backbone_gw->crc_lock);
+ 	backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);
+ 	spin_unlock_bh(&backbone_gw->crc_lock);
+@@ -740,6 +766,26 @@ claim_free_ref:
+ }
+ 
+ /**
++ * batadv_bla_claim_get_backbone_gw - Get valid reference for backbone_gw of
++ *  claim
++ * @claim: claim whose backbone_gw should be returned
++ *
++ * Return: valid reference to claim::backbone_gw
++ */
++static struct batadv_bla_backbone_gw *
++batadv_bla_claim_get_backbone_gw(struct batadv_bla_claim *claim)
++{
++	struct batadv_bla_backbone_gw *backbone_gw;
++
++	spin_lock_bh(&claim->backbone_lock);
++	backbone_gw = claim->backbone_gw;
++	kref_get(&backbone_gw->refcount);
++	spin_unlock_bh(&claim->backbone_lock);
++
++	return backbone_gw;
++}
++
++/**
+  * batadv_bla_del_claim - delete a claim from the claim hash
+  * @bat_priv: the bat priv with all the soft interface information
+  * @mac: mac address of the claim to be removed
+@@ -763,10 +809,6 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv,
+ 			   batadv_choose_claim, claim);
+ 	batadv_claim_put(claim); /* reference from the hash is gone */
+ 
+-	spin_lock_bh(&claim->backbone_gw->crc_lock);
+-	claim->backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);
+-	spin_unlock_bh(&claim->backbone_gw->crc_lock);
+-
+ 	/* don't need the reference from hash_find() anymore */
+ 	batadv_claim_put(claim);
+ }
+@@ -1219,6 +1261,7 @@ static void batadv_bla_purge_claims(struct batadv_priv *bat_priv,
+ 				    struct batadv_hard_iface *primary_if,
+ 				    int now)
+ {
++	struct batadv_bla_backbone_gw *backbone_gw;
+ 	struct batadv_bla_claim *claim;
+ 	struct hlist_head *head;
+ 	struct batadv_hashtable *hash;
+@@ -1233,14 +1276,17 @@ static void batadv_bla_purge_claims(struct batadv_priv *bat_priv,
+ 
+ 		rcu_read_lock();
+ 		hlist_for_each_entry_rcu(claim, head, hash_entry) {
++			backbone_gw = batadv_bla_claim_get_backbone_gw(claim);
+ 			if (now)
+ 				goto purge_now;
+-			if (!batadv_compare_eth(claim->backbone_gw->orig,
++
++			if (!batadv_compare_eth(backbone_gw->orig,
+ 						primary_if->net_dev->dev_addr))
+-				continue;
++				goto skip;
++
+ 			if (!batadv_has_timed_out(claim->lasttime,
+ 						  BATADV_BLA_CLAIM_TIMEOUT))
+-				continue;
++				goto skip;
+ 
+ 			batadv_dbg(BATADV_DBG_BLA, bat_priv,
+ 				   "bla_purge_claims(): %pM, vid %d, time out\n",
+@@ -1248,8 +1294,10 @@ static void batadv_bla_purge_claims(struct batadv_priv *bat_priv,
+ 
+ purge_now:
+ 			batadv_handle_unclaim(bat_priv, primary_if,
+-					      claim->backbone_gw->orig,
++					      backbone_gw->orig,
+ 					      claim->addr, claim->vid);
++skip:
++			batadv_backbone_gw_put(backbone_gw);
+ 		}
+ 		rcu_read_unlock();
+ 	}
+@@ -1760,9 +1808,11 @@ batadv_bla_loopdetect_check(struct batadv_priv *bat_priv, struct sk_buff *skb,
+ bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb,
+ 		   unsigned short vid, bool is_bcast)
+ {
++	struct batadv_bla_backbone_gw *backbone_gw;
+ 	struct ethhdr *ethhdr;
+ 	struct batadv_bla_claim search_claim, *claim = NULL;
+ 	struct batadv_hard_iface *primary_if;
++	bool own_claim;
+ 	bool ret;
+ 
+ 	ethhdr = eth_hdr(skb);
+@@ -1797,8 +1847,12 @@ bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb,
+ 	}
+ 
+ 	/* if it is our own claim ... */
+-	if (batadv_compare_eth(claim->backbone_gw->orig,
+-			       primary_if->net_dev->dev_addr)) {
++	backbone_gw = batadv_bla_claim_get_backbone_gw(claim);
++	own_claim = batadv_compare_eth(backbone_gw->orig,
++				       primary_if->net_dev->dev_addr);
++	batadv_backbone_gw_put(backbone_gw);
++
++	if (own_claim) {
+ 		/* ... allow it in any case */
+ 		claim->lasttime = jiffies;
+ 		goto allow;
+@@ -1862,7 +1916,9 @@ bool batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb,
+ {
+ 	struct ethhdr *ethhdr;
+ 	struct batadv_bla_claim search_claim, *claim = NULL;
++	struct batadv_bla_backbone_gw *backbone_gw;
+ 	struct batadv_hard_iface *primary_if;
++	bool client_roamed;
+ 	bool ret = false;
+ 
+ 	primary_if = batadv_primary_if_get_selected(bat_priv);
+@@ -1892,8 +1948,12 @@ bool batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb,
+ 		goto allow;
+ 
+ 	/* check if we are responsible. */
+-	if (batadv_compare_eth(claim->backbone_gw->orig,
+-			       primary_if->net_dev->dev_addr)) {
++	backbone_gw = batadv_bla_claim_get_backbone_gw(claim);
++	client_roamed = batadv_compare_eth(backbone_gw->orig,
++					   primary_if->net_dev->dev_addr);
++	batadv_backbone_gw_put(backbone_gw);
++
++	if (client_roamed) {
+ 		/* if yes, the client has roamed and we have
+ 		 * to unclaim it.
+ 		 */
+@@ -1941,6 +2001,7 @@ int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset)
+ 	struct net_device *net_dev = (struct net_device *)seq->private;
+ 	struct batadv_priv *bat_priv = netdev_priv(net_dev);
+ 	struct batadv_hashtable *hash = bat_priv->bla.claim_hash;
++	struct batadv_bla_backbone_gw *backbone_gw;
+ 	struct batadv_bla_claim *claim;
+ 	struct batadv_hard_iface *primary_if;
+ 	struct hlist_head *head;
+@@ -1965,17 +2026,21 @@ int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset)
+ 
+ 		rcu_read_lock();
+ 		hlist_for_each_entry_rcu(claim, head, hash_entry) {
+-			is_own = batadv_compare_eth(claim->backbone_gw->orig,
++			backbone_gw = batadv_bla_claim_get_backbone_gw(claim);
++
++			is_own = batadv_compare_eth(backbone_gw->orig,
+ 						    primary_addr);
+ 
+-			spin_lock_bh(&claim->backbone_gw->crc_lock);
+-			backbone_crc = claim->backbone_gw->crc;
+-			spin_unlock_bh(&claim->backbone_gw->crc_lock);
++			spin_lock_bh(&backbone_gw->crc_lock);
++			backbone_crc = backbone_gw->crc;
++			spin_unlock_bh(&backbone_gw->crc_lock);
+ 			seq_printf(seq, " * %pM on %5d by %pM [%c] (%#.4x)\n",
+ 				   claim->addr, BATADV_PRINT_VID(claim->vid),
+-				   claim->backbone_gw->orig,
++				   backbone_gw->orig,
+ 				   (is_own ? 'x' : ' '),
+ 				   backbone_crc);
++
++			batadv_backbone_gw_put(backbone_gw);
+ 		}
+ 		rcu_read_unlock();
+ 	}
+diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
+index ba846b0..0051222 100644
+--- a/net/batman-adv/types.h
++++ b/net/batman-adv/types.h
+@@ -1042,6 +1042,7 @@ struct batadv_bla_backbone_gw {
+  * @addr: mac address of claimed non-mesh client
+  * @vid: vlan id this client was detected on
+  * @backbone_gw: pointer to backbone gw claiming this client
++ * @backbone_lock: lock protecting backbone_gw pointer
+  * @lasttime: last time we heard of claim (locals only)
+  * @hash_entry: hlist node for batadv_priv_bla::claim_hash
+  * @refcount: number of contexts the object is used
+@@ -1051,6 +1052,7 @@ struct batadv_bla_claim {
+ 	u8 addr[ETH_ALEN];
+ 	unsigned short vid;
+ 	struct batadv_bla_backbone_gw *backbone_gw;
++	spinlock_t backbone_lock; /* protects backbone_gw */
+ 	unsigned long lasttime;
+ 	struct hlist_node hash_entry;
+ 	struct rcu_head rcu;
diff --git a/batman-adv/patches/0006-batman-adv-Fix-reference-leak-in-batadv_find_router.patch b/batman-adv/patches/0006-batman-adv-Fix-reference-leak-in-batadv_find_router.patch
new file mode 100644
index 0000000..1eeea6e
--- /dev/null
+++ b/batman-adv/patches/0006-batman-adv-Fix-reference-leak-in-batadv_find_router.patch
@@ -0,0 +1,120 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Thu, 30 Jun 2016 20:11:34 +0200
+Subject: [PATCH] batman-adv: Fix reference leak in batadv_find_router
+
+The replacement of last_bonding_candidate in batadv_orig_node has to be an
+atomic operation. Otherwise it is possible that the reference counter of a
+batadv_orig_ifinfo is reduced which was no longer the
+last_bonding_candidate when the new candidate is added. This can either
+lead to an invalid memory access or to reference leaks which make it
+impossible to an interface which was added to batman-adv.
+
+Fixes: 797edd9e87ac ("batman-adv: add bonding again")
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+Acked-by: Simon Wunderlich <sw@simonwunderlich.de>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+
+Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/6ecc711374afd93ee0c2216b38ae52d3ce680c3f
+---
+ net/batman-adv/routing.c | 52 ++++++++++++++++++++++++++++++++++++------------
+ net/batman-adv/types.h   |  4 +++-
+ 2 files changed, 42 insertions(+), 14 deletions(-)
+
+diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
+index 6c2901a..bfac086 100644
+--- a/net/batman-adv/routing.c
++++ b/net/batman-adv/routing.c
+@@ -456,6 +456,29 @@ static int batadv_check_unicast_packet(struct batadv_priv *bat_priv,
+ }
+ 
+ /**
++ * batadv_last_bonding_replace - Replace last_bonding_candidate of orig_node
++ * @orig_node: originator node whose bonding candidates should be replaced
++ * @new_candidate: new bonding candidate or NULL
++ */
++static void
++batadv_last_bonding_replace(struct batadv_orig_node *orig_node,
++			    struct batadv_orig_ifinfo *new_candidate)
++{
++	struct batadv_orig_ifinfo *old_candidate;
++
++	spin_lock_bh(&orig_node->neigh_list_lock);
++	old_candidate = orig_node->last_bonding_candidate;
++
++	if (new_candidate)
++		kref_get(&new_candidate->refcount);
++	orig_node->last_bonding_candidate = new_candidate;
++	spin_unlock_bh(&orig_node->neigh_list_lock);
++
++	if (old_candidate)
++		batadv_orig_ifinfo_put(old_candidate);
++}
++
++/**
+  * batadv_find_router - find a suitable router for this originator
+  * @bat_priv: the bat priv with all the soft interface information
+  * @orig_node: the destination node
+@@ -562,10 +585,6 @@ next:
+ 	}
+ 	rcu_read_unlock();
+ 
+-	/* last_bonding_candidate is reset below, remove the old reference. */
+-	if (orig_node->last_bonding_candidate)
+-		batadv_orig_ifinfo_put(orig_node->last_bonding_candidate);
+-
+ 	/* After finding candidates, handle the three cases:
+ 	 * 1) there is a next candidate, use that
+ 	 * 2) there is no next candidate, use the first of the list
+@@ -574,21 +593,28 @@ next:
+ 	if (next_candidate) {
+ 		batadv_neigh_node_put(router);
+ 
+-		/* remove references to first candidate, we don't need it. */
+-		if (first_candidate) {
+-			batadv_neigh_node_put(first_candidate_router);
+-			batadv_orig_ifinfo_put(first_candidate);
+-		}
++		kref_get(&next_candidate_router->refcount);
+ 		router = next_candidate_router;
+-		orig_node->last_bonding_candidate = next_candidate;
++		batadv_last_bonding_replace(orig_node, next_candidate);
+ 	} else if (first_candidate) {
+ 		batadv_neigh_node_put(router);
+ 
+-		/* refcounting has already been done in the loop above. */
++		kref_get(&first_candidate_router->refcount);
+ 		router = first_candidate_router;
+-		orig_node->last_bonding_candidate = first_candidate;
++		batadv_last_bonding_replace(orig_node, first_candidate);
+ 	} else {
+-		orig_node->last_bonding_candidate = NULL;
++		batadv_last_bonding_replace(orig_node, NULL);
++	}
++
++	/* cleanup of candidates */
++	if (first_candidate) {
++		batadv_neigh_node_put(first_candidate_router);
++		batadv_orig_ifinfo_put(first_candidate);
++	}
++
++	if (next_candidate) {
++		batadv_neigh_node_put(next_candidate_router);
++		batadv_orig_ifinfo_put(next_candidate);
+ 	}
+ 
+ 	return router;
+diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
+index 0051222..74d865a 100644
+--- a/net/batman-adv/types.h
++++ b/net/batman-adv/types.h
+@@ -330,7 +330,9 @@ struct batadv_orig_node {
+ 	DECLARE_BITMAP(bcast_bits, BATADV_TQ_LOCAL_WINDOW_SIZE);
+ 	u32 last_bcast_seqno;
+ 	struct hlist_head neigh_list;
+-	/* neigh_list_lock protects: neigh_list and router */
++	/* neigh_list_lock protects: neigh_list, ifinfo_list,
++	 * last_bonding_candidate and router
++	 */
+ 	spinlock_t neigh_list_lock;
+ 	struct hlist_node hash_entry;
+ 	struct batadv_priv *bat_priv;
diff --git a/batman-adv/patches/0007-batman-adv-Free-last_bonding_candidate-on-release-of.patch b/batman-adv/patches/0007-batman-adv-Free-last_bonding_candidate-on-release-of.patch
new file mode 100644
index 0000000..9e548da
--- /dev/null
+++ b/batman-adv/patches/0007-batman-adv-Free-last_bonding_candidate-on-release-of.patch
@@ -0,0 +1,45 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Thu, 30 Jun 2016 21:41:13 +0200
+Subject: [PATCH] batman-adv: Free last_bonding_candidate on release of orig_node
+
+The orig_ifinfo reference counter for last_bonding_candidate in
+batadv_orig_node has to be reduced when an originator node is released.
+Otherwise the orig_ifinfo is leaked and the reference counter the netdevice
+is not reduced correctly.
+
+Fixes: 797edd9e87ac ("batman-adv: add bonding again")
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
+
+Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/20df5c53865a90095099f0af80536b8abfea303b
+---
+ net/batman-adv/originator.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
+index fe2fcda..ab8c4f9 100644
+--- a/net/batman-adv/originator.c
++++ b/net/batman-adv/originator.c
+@@ -766,6 +766,7 @@ static void batadv_orig_node_release(struct kref *ref)
+ 	struct batadv_orig_node *orig_node;
+ 	struct batadv_orig_ifinfo *orig_ifinfo;
+ 	struct batadv_orig_node_vlan *vlan;
++	struct batadv_orig_ifinfo *last_candidate;
+ 
+ 	orig_node = container_of(ref, struct batadv_orig_node, refcount);
+ 
+@@ -783,8 +784,14 @@ static void batadv_orig_node_release(struct kref *ref)
+ 		hlist_del_rcu(&orig_ifinfo->list);
+ 		batadv_orig_ifinfo_put(orig_ifinfo);
+ 	}
++
++	last_candidate = orig_node->last_bonding_candidate;
++	orig_node->last_bonding_candidate = NULL;
+ 	spin_unlock_bh(&orig_node->neigh_list_lock);
+ 
++	if (last_candidate)
++		batadv_orig_ifinfo_put(last_candidate);
++
+ 	spin_lock_bh(&orig_node->vlan_list_lock);
+ 	hlist_for_each_entry_safe(vlan, node_tmp, &orig_node->vlan_list, list) {
+ 		hlist_del_rcu(&vlan->list);

From 7f6956b5bbccbd2975c154268fe354ae2415aa42 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Fri, 17 Jun 2016 15:54:03 +0200
Subject: [PATCH 272/368] batman-adv: Fix speedy join in gateway client mode

Speedy join only works when the received packet is either broadcast or an
4addr unicast packet. Thus packets converted from broadcast to unicast via
the gateway handling code have to be converted to 4addr packets to allow
the receiving gateway server to add the sender address as temporary entry
to the translation table.

Not doing it will make the batman-adv gateway server drop the DHCP response
in many situations because it doesn't yet have the TT entry for the
destination of the DHCP response.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 ...x-speedy-join-in-gateway-client-mode.patch | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 batman-adv/patches/0008-batman-adv-Fix-speedy-join-in-gateway-client-mode.patch

diff --git a/batman-adv/patches/0008-batman-adv-Fix-speedy-join-in-gateway-client-mode.patch b/batman-adv/patches/0008-batman-adv-Fix-speedy-join-in-gateway-client-mode.patch
new file mode 100644
index 0000000..e63b782
--- /dev/null
+++ b/batman-adv/patches/0008-batman-adv-Fix-speedy-join-in-gateway-client-mode.patch
@@ -0,0 +1,35 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Sun, 12 Jun 2016 10:43:19 +0200
+Subject: [PATCH] batman-adv: Fix speedy join in gateway client mode
+
+Speedy join only works when the received packet is either broadcast or an
+4addr unicast packet. Thus packets converted from broadcast to unicast via
+the gateway handling code have to be converted to 4addr packets to allow
+the receiving gateway server to add the sender address as temporary entry
+to the translation table.
+
+Not doing it will make the batman-adv gateway server drop the DHCP response
+in many situations because it doesn't yet have the TT entry for the
+destination of the DHCP response.
+
+Fixes: 9cbc67d9da47 ("batman-adv: change interface_rx to get orig node")
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+---
+ net/batman-adv/send.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
+index f2f1256..0103976 100644
+--- a/net/batman-adv/send.c
++++ b/net/batman-adv/send.c
+@@ -424,8 +424,8 @@ int batadv_send_skb_via_gw(struct batadv_priv *bat_priv, struct sk_buff *skb,
+ 	struct batadv_orig_node *orig_node;
+ 
+ 	orig_node = batadv_gw_get_selected_orig(bat_priv);
+-	return batadv_send_skb_unicast(bat_priv, skb, BATADV_UNICAST, 0,
+-				       orig_node, vid);
++	return batadv_send_skb_unicast(bat_priv, skb, BATADV_UNICAST_4ADDR,
++				       BATADV_P_DATA, orig_node, vid);
+ }
+ 
+ void batadv_schedule_bat_ogm(struct batadv_hard_iface *hard_iface)

From a4eae82c155079a4372e4b910ec733f77288b717 Mon Sep 17 00:00:00 2001
From: Marek Lindner <mareklindner@neomailbox.ch>
Date: Wed, 6 Jul 2016 21:36:38 +0800
Subject: [PATCH 273/368] batman-adv: update package release to allow pkg
 upgrade

Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
 batman-adv/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 7650655..c45cbb4 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=batman-adv
 
 PKG_VERSION:=2016.2
-PKG_RELEASE:=0
+PKG_RELEASE:=1
 PKG_MD5SUM:=dd1ab664475902fc3dbf34998bbe5a90
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

From 50c28dd9c589702103f32ee8e2fb64213c5fb2da Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
Date: Fri, 8 Jul 2016 11:30:27 +0200
Subject: [PATCH 274/368] batman-adv: Exchange include order for uapi header
 files

The build of netlink.c in batman-adv 2016.3 will fail because the
definition of GENL_NAMESIZE and similar things are missing. This is is
caused by an incorrect order of backports and non-backports header files
mixed up with uapi and non-uapi header files. Parts of the header files
would not get included by include_next because it not anymore in the
remaining search paths.

Reported: Marek Lindner <marek.lindner@open-mesh.com>
Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
---
 batman-adv/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index c45cbb4..1668083 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -62,10 +62,10 @@ PKG_EXTRA_CFLAGS:= \
 
 NOSTDINC_FLAGS = \
 	-I$(PKG_BUILD_DIR)/net/batman-adv \
-	-I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \
 	-I$(STAGING_DIR)/usr/include/mac80211-backport \
-	-I$(STAGING_DIR)/usr/include/mac80211/uapi \
+	-I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \
 	-I$(STAGING_DIR)/usr/include/mac80211 \
+	-I$(STAGING_DIR)/usr/include/mac80211/uapi \
 	-include backport/backport.h \
 	-include $(PKG_BUILD_DIR)/compat-hacks.h
 

From a80c98e8bb74eca1c11acbaed2c8eb43a5e15d4d Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Tue, 12 Jul 2016 15:00:23 +0200
Subject: [PATCH 275/368] bmx7: update source (fixing discarded dhm packet
 signatures)

---
 bmx7/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bmx7/Makefile b/bmx7/Makefile
index b015eef..ae5fdd3 100644
--- a/bmx7/Makefile
+++ b/bmx7/Makefile
@@ -32,8 +32,8 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 #PKG_SOURCE_URL:=file:///usr/src/bmx6/bmx6.git
 
-PKG_REV:=67329597c7444540f91debc74d037d4642161c4d
-PKG_VERSION:=r2016070104
+PKG_REV:=dbea4f6ea857f873489e82d69849b7caf6d0e74f
+PKG_VERSION:=r2016071204
 PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 

From 4a006704c3d33e3f1e45bd0cf965ca629e50f911 Mon Sep 17 00:00:00 2001
From: Alexander Ryzhov <ryzhovau@users.noreply.github.com>
Date: Mon, 18 Jul 2016 14:09:33 +0300
Subject: [PATCH 276/368] ndppd: fix source URL (#209)

Signed-off-by: Alexander Ryzhov <openwrt@ryzhov-al.ru>
---
 ndppd/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ndppd/Makefile b/ndppd/Makefile
index b19edeb..9a3d55e 100644
--- a/ndppd/Makefile
+++ b/ndppd/Makefile
@@ -11,11 +11,11 @@ PKG_NAME:=ndppd
 PKG_VERSION:=0.2.3
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_VERSION).tar.gz
 
 # Latest release
-PKG_SOURCE_URL:=http://www.priv.nu/projects/ndppd/files/
-PKG_MD5SUM:=d6f3243bb7fc04c8085371c9acddc50e
+PKG_SOURCE_URL:=https://github.com/DanielAdolfsson/ndppd/archive
+PKG_MD5SUM:=1391c063db64b47541e58da12e5ae60d
 PKG_LICENSE:=GPL-3.0+
 
 # Development snapshot

From 73e9614e4cd226ba1f60aabeaaba7e25f43f9bf2 Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Tue, 19 Jul 2016 16:01:49 +0200
Subject: [PATCH 277/368] bmx7: update source (disable sysctl settings for
 net/ipv4/conf/{all|default})

---
 bmx7/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bmx7/Makefile b/bmx7/Makefile
index ae5fdd3..02a62bc 100644
--- a/bmx7/Makefile
+++ b/bmx7/Makefile
@@ -32,8 +32,8 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 #PKG_SOURCE_URL:=file:///usr/src/bmx6/bmx6.git
 
-PKG_REV:=dbea4f6ea857f873489e82d69849b7caf6d0e74f
-PKG_VERSION:=r2016071204
+PKG_REV:=87e849ea9e4855fcdfcdf8ce92a049859335b794
+PKG_VERSION:=r2016071904
 PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 

From a715cd2442d5754bb3150716943e4a2995bf4729 Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Wed, 20 Jul 2016 11:17:37 +0200
Subject: [PATCH 278/368] bmx7: update source (fixing several DoS scenarios)

---
 bmx7/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bmx7/Makefile b/bmx7/Makefile
index 02a62bc..e1eb36b 100644
--- a/bmx7/Makefile
+++ b/bmx7/Makefile
@@ -32,8 +32,8 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 #PKG_SOURCE_URL:=file:///usr/src/bmx6/bmx6.git
 
-PKG_REV:=87e849ea9e4855fcdfcdf8ce92a049859335b794
-PKG_VERSION:=r2016071904
+PKG_REV:=379110ae442f80755b5788c527e722f9551b14eb
+PKG_VERSION:=r2016072001
 PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 

From 53b70069c2153513418ca01122c043ff424650a9 Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Thu, 28 Jul 2016 23:57:34 +0200
Subject: [PATCH 279/368] nodogsplash: extend configuration help text

---
 nodogsplash/files/nodogsplash.config | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/nodogsplash/files/nodogsplash.config b/nodogsplash/files/nodogsplash.config
index 1825a99..986a3d9 100644
--- a/nodogsplash/files/nodogsplash.config
+++ b/nodogsplash/files/nodogsplash.config
@@ -1,4 +1,7 @@
 
+# The options available here are an adaptation of the settings used in nodogsplash.conf.
+# See https://github.com/nodogsplash/nodogsplash/blob/master/resources/nodogsplash.conf
+
 config nodogsplash
   # Set to 1 to enable nodogsplash
   option enabled 0
@@ -39,4 +42,12 @@ config nodogsplash
   list users_to_router 'allow tcp port 80'
   list users_to_router 'allow tcp port 443'
 
-  # See https://github.com/nodogsplash for a full list of available options.
+  # MAC addresses that are / are not allowed to access the splash page
+  # Value is either 'allow' or 'block'. The allowedmac or blockedmac list is used.
+  #option macmechanism 'allow'
+  #list allowedmac '00:00:C0:01:D0:0D'
+  #list allowedmac '00:00:C0:01:D0:1D'
+  #list blockedmac '00:00:C0:01:D0:2D'
+
+  #MAC addresses that do not need to authenticate
+  #list trustedmac '00:00:C0:01:D0:1D'

From 2dc7fe57e6e4bd6b5ec168520ae6db54aa34103a Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <git@bitsofnetworks.org>
Date: Sat, 30 Jul 2016 13:29:00 +0200
Subject: [PATCH 280/368] babeld: Update source URL

There is a HTTP redirection in place from the old URL to the new URL, but
better change it now than waiting for the redirection to disappear.

Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org>
---
 babeld/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babeld/Makefile b/babeld/Makefile
index 69fb1e9..b46f4f2 100644
--- a/babeld/Makefile
+++ b/babeld/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=1.7.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/files/
+PKG_SOURCE_URL:=https://www.irif.univ-paris-diderot.fr/~jch/software/files/
 PKG_MD5SUM:=2f71794d4e67f8a5352164ce33611549
 PKG_LICENSE:=MIT
 

From dda5a7d2d4bb1eaf273d4eea05b2fe06b44d18f5 Mon Sep 17 00:00:00 2001
From: Henning Rogge <hrogge@gmail.com>
Date: Mon, 1 Aug 2016 11:58:04 +0200
Subject: [PATCH 281/368] Update to OONF 0.12.2 + coverity fix

---
 oonf-dlep-proxy/Makefile | 4 ++--
 oonf-dlep-radio/Makefile | 4 ++--
 oonf-olsrd2/Makefile     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index 454bbbe..8a952ef 100644
--- a/oonf-dlep-proxy/Makefile
+++ b/oonf-dlep-proxy/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-proxy
-PKG_VERSION:=0.12.1
-PKG_REV:=e4cb9a3ab52352ecee0da09ab4ccae32461f5f44
+PKG_VERSION:=0.12.2
+PKG_REV:=ea3e6e51f94b9b0642f84b44de35b6cab5f30b65
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index fbc0435..0e0f75e 100644
--- a/oonf-dlep-radio/Makefile
+++ b/oonf-dlep-radio/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-radio
-PKG_VERSION:=0.12.1
-PKG_REV:=e4cb9a3ab52352ecee0da09ab4ccae32461f5f44
+PKG_VERSION:=0.12.2
+PKG_REV:=ea3e6e51f94b9b0642f84b44de35b6cab5f30b65
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 3873c7f..ccc1622 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2
-PKG_VERSION:=0.12.1
-PKG_REV:=e4cb9a3ab52352ecee0da09ab4ccae32461f5f44
+PKG_VERSION:=0.12.2
+PKG_REV:=ea3e6e51f94b9b0642f84b44de35b6cab5f30b65
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

From 71f835fdeb2a7c37cdc3a5228e7ebc0e76efc8bd Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 8 Aug 2016 17:05:33 +0200
Subject: [PATCH 282/368] batman-adv: move CONFIG_MODULE_STRIPPED hack to
 compat-hacks.h

The CONFIG_MODULE_STRIPPED hack broke some time ago, as it is undefined too
late (after the headers using it have been included by compat-hacks.h).

Undefine CONFIG_MODULE_STRIPPED at the top of compat-hacks.h instead to
make the module version available to batctl again.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
---
 batman-adv/Makefile             | 4 +---
 batman-adv/files/compat-hacks.h | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index c45cbb4..5d5f6ac 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=batman-adv
 
 PKG_VERSION:=2016.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MD5SUM:=dd1ab664475902fc3dbf34998bbe5a90
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -83,8 +83,6 @@ endef
 define Build/Prepare
 	$(call Build/Prepare/Default)
 	$(CP) ./files/compat-hacks.h $(PKG_BUILD_DIR)/
-	$(SED) '/#define _NET_BATMAN_ADV_MAIN_H_/a\#undef CONFIG_MODULE_STRIPPED' \
-		$(PKG_BUILD_DIR)/net/batman-adv/main.h
 endef
 
 define Build/Clean
diff --git a/batman-adv/files/compat-hacks.h b/batman-adv/files/compat-hacks.h
index a910c2d..cdf397d 100644
--- a/batman-adv/files/compat-hacks.h
+++ b/batman-adv/files/compat-hacks.h
@@ -1,5 +1,7 @@
 /* Please avoid adding hacks here - instead add it to mac80211/backports.git */
 
+#undef CONFIG_MODULE_STRIPPED
+
 #include <linux/version.h>	/* LINUX_VERSION_CODE */
 #include <linux/types.h>
 

From eb800083264c9115822b5154879ae97d4b04e1cd Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Wed, 10 Aug 2016 22:33:04 +0200
Subject: [PATCH 283/368] nodogsplash: bump version to 1.0.1

---
 nodogsplash/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nodogsplash/Makefile b/nodogsplash/Makefile
index 76a5e14..2b8efd2 100644
--- a/nodogsplash/Makefile
+++ b/nodogsplash/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013-2015 OpenWrt.org
+# Copyright (C) 2013-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nodogsplash
 PKG_FIXUP:=autoreconf
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.1
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=git://github.com/nodogsplash/nodogsplash.git
-PKG_SOURCE_VERSION:=v1.0.0
+PKG_SOURCE_VERSION:=485d6dba05cce7a4ed87c28beaaf1199c0f832cf
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=GPL-2.0+

From 7dddc0f353f7387ba3a33391cb4cf8a1950d3aa2 Mon Sep 17 00:00:00 2001
From: Henning Rogge <hrogge@gmail.com>
Date: Wed, 17 Aug 2016 17:21:10 +0200
Subject: [PATCH 284/368] Update to OONF 0.12.3

---
 oonf-dlep-proxy/Makefile | 4 ++--
 oonf-dlep-radio/Makefile | 4 ++--
 oonf-olsrd2/Makefile     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index 8a952ef..4685d55 100644
--- a/oonf-dlep-proxy/Makefile
+++ b/oonf-dlep-proxy/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-proxy
-PKG_VERSION:=0.12.2
-PKG_REV:=ea3e6e51f94b9b0642f84b44de35b6cab5f30b65
+PKG_VERSION:=0.12.3
+PKG_REV:=87baaf3b6ce9ef117956b37a4bfb01f379cd6aaf
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index 0e0f75e..ec93d93 100644
--- a/oonf-dlep-radio/Makefile
+++ b/oonf-dlep-radio/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-radio
-PKG_VERSION:=0.12.2
-PKG_REV:=ea3e6e51f94b9b0642f84b44de35b6cab5f30b65
+PKG_VERSION:=0.12.3
+PKG_REV:=87baaf3b6ce9ef117956b37a4bfb01f379cd6aaf
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index ccc1622..d89886e 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2
-PKG_VERSION:=0.12.2
-PKG_REV:=ea3e6e51f94b9b0642f84b44de35b6cab5f30b65
+PKG_VERSION:=0.12.3
+PKG_REV:=87baaf3b6ce9ef117956b37a4bfb01f379cd6aaf
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

From a62ca047efa9cf2908edf359e460fbc4de0192e8 Mon Sep 17 00:00:00 2001
From: Henning Rogge <hrogge@gmail.com>
Date: Sun, 4 Sep 2016 14:21:45 +0200
Subject: [PATCH 285/368] Update to OONF 0.12.4

---
 oonf-dlep-proxy/Makefile | 4 ++--
 oonf-dlep-radio/Makefile | 4 ++--
 oonf-olsrd2/Makefile     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index 4685d55..7ac366f 100644
--- a/oonf-dlep-proxy/Makefile
+++ b/oonf-dlep-proxy/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-proxy
-PKG_VERSION:=0.12.3
-PKG_REV:=87baaf3b6ce9ef117956b37a4bfb01f379cd6aaf
+PKG_VERSION:=0.12.4
+PKG_REV:=356b7fe90d8f01618185edbc18b7072aa1b41aac
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index ec93d93..500ffae 100644
--- a/oonf-dlep-radio/Makefile
+++ b/oonf-dlep-radio/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-radio
-PKG_VERSION:=0.12.3
-PKG_REV:=87baaf3b6ce9ef117956b37a4bfb01f379cd6aaf
+PKG_VERSION:=0.12.4
+PKG_REV:=356b7fe90d8f01618185edbc18b7072aa1b41aac
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index d89886e..999bceb 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2
-PKG_VERSION:=0.12.3
-PKG_REV:=87baaf3b6ce9ef117956b37a4bfb01f379cd6aaf
+PKG_VERSION:=0.12.4
+PKG_REV:=356b7fe90d8f01618185edbc18b7072aa1b41aac
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

From 3db27f27b2aa9d7d6e3e029a263922a84f141c72 Mon Sep 17 00:00:00 2001
From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Fri, 30 Sep 2016 10:06:12 +0300
Subject: [PATCH 286/368] miniupnpd: fix local variables in hotplug, change
 startup priority

* Remove 'local' variable definitions from hotplug script.
  Busybox 1.25.0 does not allow local variables defined outside functions.
  This fixes #231

* Change startup priority from 95 to 94, so that miniupnpd starts
  before S95done (which is intended to be run last).

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
---
 miniupnpd/Makefile                | 2 +-
 miniupnpd/files/miniupnpd.hotplug | 8 +++-----
 miniupnpd/files/miniupnpd.init    | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index 97f0b6c..9a33bbe 100644
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
 PKG_VERSION:=2.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/miniupnpd/files/miniupnpd.hotplug b/miniupnpd/files/miniupnpd.hotplug
index 65bc500..320437e 100644
--- a/miniupnpd/files/miniupnpd.hotplug
+++ b/miniupnpd/files/miniupnpd.hotplug
@@ -13,11 +13,9 @@
 
 [ ! "$ACTION" = "ifup" ] && service_check /usr/sbin/miniupnpd && exit 0
 
-local iface
-local ifname
-local tmpconf="/var/etc/miniupnpd.conf"
-local extiface=$(uci get upnpd.config.external_iface)
-local extzone=$(uci get upnpd.config.external_zone)
+tmpconf="/var/etc/miniupnpd.conf"
+extiface=$(uci get upnpd.config.external_iface)
+extzone=$(uci get upnpd.config.external_zone)
 
 . /lib/functions/network.sh
 
diff --git a/miniupnpd/files/miniupnpd.init b/miniupnpd/files/miniupnpd.init
index 79def5d..c7dc6a2 100644
--- a/miniupnpd/files/miniupnpd.init
+++ b/miniupnpd/files/miniupnpd.init
@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2006-2014 OpenWrt.org
 
-START=95
+START=94
 STOP=15
 
 SERVICE_USE_PID=1

From 549909f89dd7553e71976d18dc6c13100186964f Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Sun, 8 May 2016 22:27:03 +0800
Subject: [PATCH 287/368] batman-adv: upgrade package to latest release 2016.3

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batman-adv/Makefile                           |  15 +-
 batman-adv/files/compat-hacks.h               |  11 +
 ...-nullptr-dereference-in-bla-after-vl.patch |  35 ---
 ...y-neigh_list-only-with-rcu-list-func.patch |  29 ++
 ...-nullptr-dereference-in-dat-after-vl.patch |  49 ---
 ...-tt_req_node-list-put-for-unhashed-e.patch |  41 ---
 ...rig_node_vlan-leak-on-orig_node_rele.patch |  43 ---
 ...on-atomic-bla_claim-backbone_gw-acce.patch | 291 ------------------
 ...reference-leak-in-batadv_find_router.patch | 120 --------
 ...last_bonding_candidate-on-release-of.patch |  45 ---
 ...x-speedy-join-in-gateway-client-mode.patch |  35 ---
 11 files changed, 51 insertions(+), 663 deletions(-)
 delete mode 100644 batman-adv/patches/0001-batman-adv-Avoid-nullptr-dereference-in-bla-after-vl.patch
 create mode 100644 batman-adv/patches/0001-batman-adv-Modify-neigh_list-only-with-rcu-list-func.patch
 delete mode 100644 batman-adv/patches/0002-batman-adv-Avoid-nullptr-dereference-in-dat-after-vl.patch
 delete mode 100644 batman-adv/patches/0003-batman-adv-Avoid-tt_req_node-list-put-for-unhashed-e.patch
 delete mode 100644 batman-adv/patches/0004-batman-adv-Fix-orig_node_vlan-leak-on-orig_node_rele.patch
 delete mode 100644 batman-adv/patches/0005-batman-adv-Fix-non-atomic-bla_claim-backbone_gw-acce.patch
 delete mode 100644 batman-adv/patches/0006-batman-adv-Fix-reference-leak-in-batadv_find_router.patch
 delete mode 100644 batman-adv/patches/0007-batman-adv-Free-last_bonding_candidate-on-release-of.patch
 delete mode 100644 batman-adv/patches/0008-batman-adv-Fix-speedy-join-in-gateway-client-mode.patch

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 2a1335c..e12c166 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
 
-PKG_VERSION:=2016.2
-PKG_RELEASE:=2
-PKG_MD5SUM:=dd1ab664475902fc3dbf34998bbe5a90
+PKG_VERSION:=2016.3
+PKG_RELEASE:=0
+PKG_MD5SUM:=63f530a62c3d48ed0c7e42f47dfa4d4d
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
@@ -66,11 +66,18 @@ NOSTDINC_FLAGS = \
 	-I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \
 	-I$(STAGING_DIR)/usr/include/mac80211 \
 	-I$(STAGING_DIR)/usr/include/mac80211/uapi \
+	-I$(PKG_BUILD_DIR)/include/ \
 	-include backport/backport.h \
 	-include $(PKG_BUILD_DIR)/compat-hacks.h
 
+COMPAT_SOURCES = \
+	$(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),../../compat-sources/net/core/skbuff.o,) \
+	$(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),../../compat-sources/net/ipv4/igmp.o,) \
+	$(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),../../compat-sources/net/ipv6/mcast_snoop.o,) \
+
 define Build/Compile
-	+$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
+	+env "batman-adv-y=$(COMPAT_SOURCES)" \
+	$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
 		ARCH="$(LINUX_KARCH)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		SUBDIRS="$(PKG_BUILD_DIR)/net/batman-adv" \
diff --git a/batman-adv/files/compat-hacks.h b/batman-adv/files/compat-hacks.h
index cdf397d..a7fc179 100644
--- a/batman-adv/files/compat-hacks.h
+++ b/batman-adv/files/compat-hacks.h
@@ -33,6 +33,17 @@
 
 #endif /* < KERNEL_VERSION(4, 5, 0) */
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0)
+
+struct sk_buff *skb_checksum_trimmed(struct sk_buff *skb,
+				     unsigned int transport_len,
+				     __sum16(*skb_chkf)(struct sk_buff *skb));
+
+int ip_mc_check_igmp(struct sk_buff *skb, struct sk_buff **skb_trimmed);
+
+int ipv6_mc_check_mld(struct sk_buff *skb, struct sk_buff **skb_trimmed);
+
+#endif /* < KERNEL_VERSION(4, 2, 0) */
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
 
diff --git a/batman-adv/patches/0001-batman-adv-Avoid-nullptr-dereference-in-bla-after-vl.patch b/batman-adv/patches/0001-batman-adv-Avoid-nullptr-dereference-in-bla-after-vl.patch
deleted file mode 100644
index 49c0637..0000000
--- a/batman-adv/patches/0001-batman-adv-Avoid-nullptr-dereference-in-bla-after-vl.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Sat, 2 Jul 2016 09:52:13 +0200
-Subject: [PATCH] batman-adv: Avoid nullptr dereference in bla after vlan_insert_tag
-
-vlan_insert_tag can return NULL on errors. The bridge loop avoidance code
-therefore has to check the return value of vlan_insert_tag for NULL before
-it can safely operate on this pointer.
-
-Fixes: a9ce0dc43e2c ("batman-adv: add basic bridge loop avoidance code")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
-
-Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/e4cffba4d3353ea15287abbfbdd65208aa62c156
----
- net/batman-adv/bridge_loop_avoidance.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
-index 748a9ea..7129780 100644
---- a/net/batman-adv/bridge_loop_avoidance.c
-+++ b/net/batman-adv/bridge_loop_avoidance.c
-@@ -418,9 +418,12 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac,
- 		break;
- 	}
- 
--	if (vid & BATADV_VLAN_HAS_TAG)
-+	if (vid & BATADV_VLAN_HAS_TAG) {
- 		skb = vlan_insert_tag(skb, htons(ETH_P_8021Q),
- 				      vid & VLAN_VID_MASK);
-+		if (!skb)
-+			goto out;
-+	}
- 
- 	skb_reset_mac_header(skb);
- 	skb->protocol = eth_type_trans(skb, soft_iface);
diff --git a/batman-adv/patches/0001-batman-adv-Modify-neigh_list-only-with-rcu-list-func.patch b/batman-adv/patches/0001-batman-adv-Modify-neigh_list-only-with-rcu-list-func.patch
new file mode 100644
index 0000000..a30d80b
--- /dev/null
+++ b/batman-adv/patches/0001-batman-adv-Modify-neigh_list-only-with-rcu-list-func.patch
@@ -0,0 +1,29 @@
+From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
+Date: Thu, 29 Sep 2016 17:22:58 +0200
+Subject: [PATCH] batman-adv: Modify neigh_list only with rcu-list functions
+
+The batadv_hard_iface::neigh_list is accessed via rcu based primitives.
+Thus all operations done on it have to fulfill the requirements by RCU. So
+using non-RCU mechanisms like hlist_add_head is not allowed because it
+misses the barriers required to protect concurrent readers when accessing
+the data behind the pointer.
+
+Fixes: fed2826b490c ("batman-adv: add list of unique single hop neighbors per hard-interface")
+Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
+---
+ net/batman-adv/originator.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
+index 3940b5d..3e9667e 100644
+--- a/net/batman-adv/originator.c
++++ b/net/batman-adv/originator.c
+@@ -537,7 +537,7 @@ batadv_hardif_neigh_create(struct batadv_hard_iface *hard_iface,
+ 	if (bat_priv->algo_ops->neigh.hardif_init)
+ 		bat_priv->algo_ops->neigh.hardif_init(hardif_neigh);
+ 
+-	hlist_add_head(&hardif_neigh->list, &hard_iface->neigh_list);
++	hlist_add_head_rcu(&hardif_neigh->list, &hard_iface->neigh_list);
+ 
+ out:
+ 	spin_unlock_bh(&hard_iface->neigh_list_lock);
diff --git a/batman-adv/patches/0002-batman-adv-Avoid-nullptr-dereference-in-dat-after-vl.patch b/batman-adv/patches/0002-batman-adv-Avoid-nullptr-dereference-in-dat-after-vl.patch
deleted file mode 100644
index e5e72d7..0000000
--- a/batman-adv/patches/0002-batman-adv-Avoid-nullptr-dereference-in-dat-after-vl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Sat, 2 Jul 2016 09:52:14 +0200
-Subject: [PATCH] batman-adv: Avoid nullptr dereference in dat after vlan_insert_tag
-
-vlan_insert_tag can return NULL on errors. The distributed arp table code
-therefore has to check the return value of vlan_insert_tag for NULL before
-it can safely operate on this pointer.
-
-Fixes: 53c6c262a581 ("batman-adv: tag locally generated ARP reply if needed")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
-
-Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/898382d11fa1f737cd4f7033db1088c601fd11ed
----
- net/batman-adv/distributed-arp-table.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
-index 278800a..aee3b39 100644
---- a/net/batman-adv/distributed-arp-table.c
-+++ b/net/batman-adv/distributed-arp-table.c
-@@ -1009,9 +1009,12 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv,
- 		if (!skb_new)
- 			goto out;
- 
--		if (vid & BATADV_VLAN_HAS_TAG)
-+		if (vid & BATADV_VLAN_HAS_TAG) {
- 			skb_new = vlan_insert_tag(skb_new, htons(ETH_P_8021Q),
- 						  vid & VLAN_VID_MASK);
-+			if (!skb_new)
-+				goto out;
-+		}
- 
- 		skb_reset_mac_header(skb_new);
- 		skb_new->protocol = eth_type_trans(skb_new,
-@@ -1089,9 +1092,12 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv,
- 	 */
- 	skb_reset_mac_header(skb_new);
- 
--	if (vid & BATADV_VLAN_HAS_TAG)
-+	if (vid & BATADV_VLAN_HAS_TAG) {
- 		skb_new = vlan_insert_tag(skb_new, htons(ETH_P_8021Q),
- 					  vid & VLAN_VID_MASK);
-+		if (!skb_new)
-+			goto out;
-+	}
- 
- 	/* To preserve backwards compatibility, the node has choose the outgoing
- 	 * format based on the incoming request packet type. The assumption is
diff --git a/batman-adv/patches/0003-batman-adv-Avoid-tt_req_node-list-put-for-unhashed-e.patch b/batman-adv/patches/0003-batman-adv-Avoid-tt_req_node-list-put-for-unhashed-e.patch
deleted file mode 100644
index 60d4e12..0000000
--- a/batman-adv/patches/0003-batman-adv-Avoid-tt_req_node-list-put-for-unhashed-e.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Fri, 24 Jun 2016 21:43:32 +0200
-Subject: [PATCH] batman-adv: Avoid tt_req_node list put for unhashed entry
-
-It can happen that a tt_req_node list entry was already removed from
-tt.req_list when batadv_send_tt_request reaches the end of the function.
-The reference counter was already reduced by 1 for the list entry and thus
-the reference counter is not allowed to be reduced again. Otherwise, the
-entry is freed too early and the next batadv_tt_req_node_put in this
-function will operate on freed memory.
-
-Fixes: cea194d90b11 ("batman-adv: improved client announcement mechanism")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
-
-Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/03ecc9f957b837c755f09251c5f684996521e487
----
- net/batman-adv/translation-table.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
-index d033a05..57ec87f 100644
---- a/net/batman-adv/translation-table.c
-+++ b/net/batman-adv/translation-table.c
-@@ -2639,11 +2639,13 @@ static bool batadv_send_tt_request(struct batadv_priv *bat_priv,
- out:
- 	if (primary_if)
- 		batadv_hardif_put(primary_if);
-+
- 	if (ret && tt_req_node) {
- 		spin_lock_bh(&bat_priv->tt.req_list_lock);
--		/* hlist_del_init() verifies tt_req_node still is in the list */
--		hlist_del_init(&tt_req_node->list);
--		batadv_tt_req_node_put(tt_req_node);
-+		if (!hlist_unhashed(&tt_req_node->list)) {
-+			hlist_del_init(&tt_req_node->list);
-+			batadv_tt_req_node_put(tt_req_node);
-+		}
- 		spin_unlock_bh(&bat_priv->tt.req_list_lock);
- 	}
- 
diff --git a/batman-adv/patches/0004-batman-adv-Fix-orig_node_vlan-leak-on-orig_node_rele.patch b/batman-adv/patches/0004-batman-adv-Fix-orig_node_vlan-leak-on-orig_node_rele.patch
deleted file mode 100644
index 7af3162..0000000
--- a/batman-adv/patches/0004-batman-adv-Fix-orig_node_vlan-leak-on-orig_node_rele.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Thu, 30 Jun 2016 20:10:46 +0200
-Subject: [PATCH] batman-adv: Fix orig_node_vlan leak on orig_node_release
-
-batadv_orig_node_new uses batadv_orig_node_vlan_new to allocate a new
-batadv_orig_node_vlan and add it to batadv_orig_node::vlan_list. References
-to this list have also to be cleaned when the batadv_orig_node is removed.
-
-Fixes: 21a57f6e7a3b ("batman-adv: make the TT CRC logic VLAN specific")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
-
-Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/719afd254e812c7ff8688ce79bebb7324ec438d6
----
- net/batman-adv/originator.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
-index 7f51bc2..fe2fcda 100644
---- a/net/batman-adv/originator.c
-+++ b/net/batman-adv/originator.c
-@@ -765,6 +765,7 @@ static void batadv_orig_node_release(struct kref *ref)
- 	struct batadv_neigh_node *neigh_node;
- 	struct batadv_orig_node *orig_node;
- 	struct batadv_orig_ifinfo *orig_ifinfo;
-+	struct batadv_orig_node_vlan *vlan;
- 
- 	orig_node = container_of(ref, struct batadv_orig_node, refcount);
- 
-@@ -784,6 +785,13 @@ static void batadv_orig_node_release(struct kref *ref)
- 	}
- 	spin_unlock_bh(&orig_node->neigh_list_lock);
- 
-+	spin_lock_bh(&orig_node->vlan_list_lock);
-+	hlist_for_each_entry_safe(vlan, node_tmp, &orig_node->vlan_list, list) {
-+		hlist_del_rcu(&vlan->list);
-+		batadv_orig_node_vlan_put(vlan);
-+	}
-+	spin_unlock_bh(&orig_node->vlan_list_lock);
-+
- 	/* Free nc_nodes */
- 	batadv_nc_purge_orig(orig_node->bat_priv, orig_node, NULL);
- 
diff --git a/batman-adv/patches/0005-batman-adv-Fix-non-atomic-bla_claim-backbone_gw-acce.patch b/batman-adv/patches/0005-batman-adv-Fix-non-atomic-bla_claim-backbone_gw-acce.patch
deleted file mode 100644
index 5e0afdd..0000000
--- a/batman-adv/patches/0005-batman-adv-Fix-non-atomic-bla_claim-backbone_gw-acce.patch
+++ /dev/null
@@ -1,291 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Fri, 1 Jul 2016 15:49:43 +0200
-Subject: [PATCH] batman-adv: Fix non-atomic bla_claim::backbone_gw access
-
-The pointer batadv_bla_claim::backbone_gw can be changed at any time.
-Therefore, access to it must be protected to ensure that two function
-accessing the same backbone_gw are actually accessing the same. This is
-especially important when the crc_lock is used or when the backbone_gw of a
-claim is exchanged.
-
-Not doing so leads to invalid memory access and/or reference leaks.
-
-Fixes: a9ce0dc43e2c ("batman-adv: add basic bridge loop avoidance code")
-Fixes: b307e72d119f ("batman-adv: lock crc access in bridge loop avoidance")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Acked-by: Simon Wunderlich <sw@simonwunderlich.de>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
-
-Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/e401297e3a393896e9b07bef8d6e2df203b60d43
----
- net/batman-adv/bridge_loop_avoidance.c | 111 ++++++++++++++++++++++++++-------
- net/batman-adv/types.h                 |   2 +
- 2 files changed, 90 insertions(+), 23 deletions(-)
-
-diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
-index 7129780..825a5cd 100644
---- a/net/batman-adv/bridge_loop_avoidance.c
-+++ b/net/batman-adv/bridge_loop_avoidance.c
-@@ -177,10 +177,21 @@ static void batadv_backbone_gw_put(struct batadv_bla_backbone_gw *backbone_gw)
- static void batadv_claim_release(struct kref *ref)
- {
- 	struct batadv_bla_claim *claim;
-+	struct batadv_bla_backbone_gw *old_backbone_gw;
- 
- 	claim = container_of(ref, struct batadv_bla_claim, refcount);
- 
--	batadv_backbone_gw_put(claim->backbone_gw);
-+	spin_lock_bh(&claim->backbone_lock);
-+	old_backbone_gw = claim->backbone_gw;
-+	claim->backbone_gw = NULL;
-+	spin_unlock_bh(&claim->backbone_lock);
-+
-+	spin_lock_bh(&old_backbone_gw->crc_lock);
-+	old_backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);
-+	spin_unlock_bh(&old_backbone_gw->crc_lock);
-+
-+	batadv_backbone_gw_put(old_backbone_gw);
-+
- 	kfree_rcu(claim, rcu);
- }
- 
-@@ -677,8 +688,10 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv,
- 				 const u8 *mac, const unsigned short vid,
- 				 struct batadv_bla_backbone_gw *backbone_gw)
- {
-+	struct batadv_bla_backbone_gw *old_backbone_gw;
- 	struct batadv_bla_claim *claim;
- 	struct batadv_bla_claim search_claim;
-+	bool remove_crc = false;
- 	int hash_added;
- 
- 	ether_addr_copy(search_claim.addr, mac);
-@@ -692,8 +705,10 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv,
- 			return;
- 
- 		ether_addr_copy(claim->addr, mac);
-+		spin_lock_init(&claim->backbone_lock);
- 		claim->vid = vid;
- 		claim->lasttime = jiffies;
-+		kref_get(&backbone_gw->refcount);
- 		claim->backbone_gw = backbone_gw;
- 
- 		kref_init(&claim->refcount);
-@@ -721,15 +736,26 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv,
- 			   "bla_add_claim(): changing ownership for %pM, vid %d\n",
- 			   mac, BATADV_PRINT_VID(vid));
- 
--		spin_lock_bh(&claim->backbone_gw->crc_lock);
--		claim->backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);
--		spin_unlock_bh(&claim->backbone_gw->crc_lock);
--		batadv_backbone_gw_put(claim->backbone_gw);
-+		remove_crc = true;
- 	}
--	/* set (new) backbone gw */
-+
-+	/* replace backbone_gw atomically and adjust reference counters */
-+	spin_lock_bh(&claim->backbone_lock);
-+	old_backbone_gw = claim->backbone_gw;
- 	kref_get(&backbone_gw->refcount);
- 	claim->backbone_gw = backbone_gw;
-+	spin_unlock_bh(&claim->backbone_lock);
- 
-+	if (remove_crc) {
-+		/* remove claim address from old backbone_gw */
-+		spin_lock_bh(&old_backbone_gw->crc_lock);
-+		old_backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);
-+		spin_unlock_bh(&old_backbone_gw->crc_lock);
-+	}
-+
-+	batadv_backbone_gw_put(old_backbone_gw);
-+
-+	/* add claim address to new backbone_gw */
- 	spin_lock_bh(&backbone_gw->crc_lock);
- 	backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);
- 	spin_unlock_bh(&backbone_gw->crc_lock);
-@@ -740,6 +766,26 @@ claim_free_ref:
- }
- 
- /**
-+ * batadv_bla_claim_get_backbone_gw - Get valid reference for backbone_gw of
-+ *  claim
-+ * @claim: claim whose backbone_gw should be returned
-+ *
-+ * Return: valid reference to claim::backbone_gw
-+ */
-+static struct batadv_bla_backbone_gw *
-+batadv_bla_claim_get_backbone_gw(struct batadv_bla_claim *claim)
-+{
-+	struct batadv_bla_backbone_gw *backbone_gw;
-+
-+	spin_lock_bh(&claim->backbone_lock);
-+	backbone_gw = claim->backbone_gw;
-+	kref_get(&backbone_gw->refcount);
-+	spin_unlock_bh(&claim->backbone_lock);
-+
-+	return backbone_gw;
-+}
-+
-+/**
-  * batadv_bla_del_claim - delete a claim from the claim hash
-  * @bat_priv: the bat priv with all the soft interface information
-  * @mac: mac address of the claim to be removed
-@@ -763,10 +809,6 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv,
- 			   batadv_choose_claim, claim);
- 	batadv_claim_put(claim); /* reference from the hash is gone */
- 
--	spin_lock_bh(&claim->backbone_gw->crc_lock);
--	claim->backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);
--	spin_unlock_bh(&claim->backbone_gw->crc_lock);
--
- 	/* don't need the reference from hash_find() anymore */
- 	batadv_claim_put(claim);
- }
-@@ -1219,6 +1261,7 @@ static void batadv_bla_purge_claims(struct batadv_priv *bat_priv,
- 				    struct batadv_hard_iface *primary_if,
- 				    int now)
- {
-+	struct batadv_bla_backbone_gw *backbone_gw;
- 	struct batadv_bla_claim *claim;
- 	struct hlist_head *head;
- 	struct batadv_hashtable *hash;
-@@ -1233,14 +1276,17 @@ static void batadv_bla_purge_claims(struct batadv_priv *bat_priv,
- 
- 		rcu_read_lock();
- 		hlist_for_each_entry_rcu(claim, head, hash_entry) {
-+			backbone_gw = batadv_bla_claim_get_backbone_gw(claim);
- 			if (now)
- 				goto purge_now;
--			if (!batadv_compare_eth(claim->backbone_gw->orig,
-+
-+			if (!batadv_compare_eth(backbone_gw->orig,
- 						primary_if->net_dev->dev_addr))
--				continue;
-+				goto skip;
-+
- 			if (!batadv_has_timed_out(claim->lasttime,
- 						  BATADV_BLA_CLAIM_TIMEOUT))
--				continue;
-+				goto skip;
- 
- 			batadv_dbg(BATADV_DBG_BLA, bat_priv,
- 				   "bla_purge_claims(): %pM, vid %d, time out\n",
-@@ -1248,8 +1294,10 @@ static void batadv_bla_purge_claims(struct batadv_priv *bat_priv,
- 
- purge_now:
- 			batadv_handle_unclaim(bat_priv, primary_if,
--					      claim->backbone_gw->orig,
-+					      backbone_gw->orig,
- 					      claim->addr, claim->vid);
-+skip:
-+			batadv_backbone_gw_put(backbone_gw);
- 		}
- 		rcu_read_unlock();
- 	}
-@@ -1760,9 +1808,11 @@ batadv_bla_loopdetect_check(struct batadv_priv *bat_priv, struct sk_buff *skb,
- bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb,
- 		   unsigned short vid, bool is_bcast)
- {
-+	struct batadv_bla_backbone_gw *backbone_gw;
- 	struct ethhdr *ethhdr;
- 	struct batadv_bla_claim search_claim, *claim = NULL;
- 	struct batadv_hard_iface *primary_if;
-+	bool own_claim;
- 	bool ret;
- 
- 	ethhdr = eth_hdr(skb);
-@@ -1797,8 +1847,12 @@ bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb,
- 	}
- 
- 	/* if it is our own claim ... */
--	if (batadv_compare_eth(claim->backbone_gw->orig,
--			       primary_if->net_dev->dev_addr)) {
-+	backbone_gw = batadv_bla_claim_get_backbone_gw(claim);
-+	own_claim = batadv_compare_eth(backbone_gw->orig,
-+				       primary_if->net_dev->dev_addr);
-+	batadv_backbone_gw_put(backbone_gw);
-+
-+	if (own_claim) {
- 		/* ... allow it in any case */
- 		claim->lasttime = jiffies;
- 		goto allow;
-@@ -1862,7 +1916,9 @@ bool batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb,
- {
- 	struct ethhdr *ethhdr;
- 	struct batadv_bla_claim search_claim, *claim = NULL;
-+	struct batadv_bla_backbone_gw *backbone_gw;
- 	struct batadv_hard_iface *primary_if;
-+	bool client_roamed;
- 	bool ret = false;
- 
- 	primary_if = batadv_primary_if_get_selected(bat_priv);
-@@ -1892,8 +1948,12 @@ bool batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb,
- 		goto allow;
- 
- 	/* check if we are responsible. */
--	if (batadv_compare_eth(claim->backbone_gw->orig,
--			       primary_if->net_dev->dev_addr)) {
-+	backbone_gw = batadv_bla_claim_get_backbone_gw(claim);
-+	client_roamed = batadv_compare_eth(backbone_gw->orig,
-+					   primary_if->net_dev->dev_addr);
-+	batadv_backbone_gw_put(backbone_gw);
-+
-+	if (client_roamed) {
- 		/* if yes, the client has roamed and we have
- 		 * to unclaim it.
- 		 */
-@@ -1941,6 +2001,7 @@ int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset)
- 	struct net_device *net_dev = (struct net_device *)seq->private;
- 	struct batadv_priv *bat_priv = netdev_priv(net_dev);
- 	struct batadv_hashtable *hash = bat_priv->bla.claim_hash;
-+	struct batadv_bla_backbone_gw *backbone_gw;
- 	struct batadv_bla_claim *claim;
- 	struct batadv_hard_iface *primary_if;
- 	struct hlist_head *head;
-@@ -1965,17 +2026,21 @@ int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset)
- 
- 		rcu_read_lock();
- 		hlist_for_each_entry_rcu(claim, head, hash_entry) {
--			is_own = batadv_compare_eth(claim->backbone_gw->orig,
-+			backbone_gw = batadv_bla_claim_get_backbone_gw(claim);
-+
-+			is_own = batadv_compare_eth(backbone_gw->orig,
- 						    primary_addr);
- 
--			spin_lock_bh(&claim->backbone_gw->crc_lock);
--			backbone_crc = claim->backbone_gw->crc;
--			spin_unlock_bh(&claim->backbone_gw->crc_lock);
-+			spin_lock_bh(&backbone_gw->crc_lock);
-+			backbone_crc = backbone_gw->crc;
-+			spin_unlock_bh(&backbone_gw->crc_lock);
- 			seq_printf(seq, " * %pM on %5d by %pM [%c] (%#.4x)\n",
- 				   claim->addr, BATADV_PRINT_VID(claim->vid),
--				   claim->backbone_gw->orig,
-+				   backbone_gw->orig,
- 				   (is_own ? 'x' : ' '),
- 				   backbone_crc);
-+
-+			batadv_backbone_gw_put(backbone_gw);
- 		}
- 		rcu_read_unlock();
- 	}
-diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
-index ba846b0..0051222 100644
---- a/net/batman-adv/types.h
-+++ b/net/batman-adv/types.h
-@@ -1042,6 +1042,7 @@ struct batadv_bla_backbone_gw {
-  * @addr: mac address of claimed non-mesh client
-  * @vid: vlan id this client was detected on
-  * @backbone_gw: pointer to backbone gw claiming this client
-+ * @backbone_lock: lock protecting backbone_gw pointer
-  * @lasttime: last time we heard of claim (locals only)
-  * @hash_entry: hlist node for batadv_priv_bla::claim_hash
-  * @refcount: number of contexts the object is used
-@@ -1051,6 +1052,7 @@ struct batadv_bla_claim {
- 	u8 addr[ETH_ALEN];
- 	unsigned short vid;
- 	struct batadv_bla_backbone_gw *backbone_gw;
-+	spinlock_t backbone_lock; /* protects backbone_gw */
- 	unsigned long lasttime;
- 	struct hlist_node hash_entry;
- 	struct rcu_head rcu;
diff --git a/batman-adv/patches/0006-batman-adv-Fix-reference-leak-in-batadv_find_router.patch b/batman-adv/patches/0006-batman-adv-Fix-reference-leak-in-batadv_find_router.patch
deleted file mode 100644
index 1eeea6e..0000000
--- a/batman-adv/patches/0006-batman-adv-Fix-reference-leak-in-batadv_find_router.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Thu, 30 Jun 2016 20:11:34 +0200
-Subject: [PATCH] batman-adv: Fix reference leak in batadv_find_router
-
-The replacement of last_bonding_candidate in batadv_orig_node has to be an
-atomic operation. Otherwise it is possible that the reference counter of a
-batadv_orig_ifinfo is reduced which was no longer the
-last_bonding_candidate when the new candidate is added. This can either
-lead to an invalid memory access or to reference leaks which make it
-impossible to an interface which was added to batman-adv.
-
-Fixes: 797edd9e87ac ("batman-adv: add bonding again")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Acked-by: Simon Wunderlich <sw@simonwunderlich.de>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
-
-Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/6ecc711374afd93ee0c2216b38ae52d3ce680c3f
----
- net/batman-adv/routing.c | 52 ++++++++++++++++++++++++++++++++++++------------
- net/batman-adv/types.h   |  4 +++-
- 2 files changed, 42 insertions(+), 14 deletions(-)
-
-diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
-index 6c2901a..bfac086 100644
---- a/net/batman-adv/routing.c
-+++ b/net/batman-adv/routing.c
-@@ -456,6 +456,29 @@ static int batadv_check_unicast_packet(struct batadv_priv *bat_priv,
- }
- 
- /**
-+ * batadv_last_bonding_replace - Replace last_bonding_candidate of orig_node
-+ * @orig_node: originator node whose bonding candidates should be replaced
-+ * @new_candidate: new bonding candidate or NULL
-+ */
-+static void
-+batadv_last_bonding_replace(struct batadv_orig_node *orig_node,
-+			    struct batadv_orig_ifinfo *new_candidate)
-+{
-+	struct batadv_orig_ifinfo *old_candidate;
-+
-+	spin_lock_bh(&orig_node->neigh_list_lock);
-+	old_candidate = orig_node->last_bonding_candidate;
-+
-+	if (new_candidate)
-+		kref_get(&new_candidate->refcount);
-+	orig_node->last_bonding_candidate = new_candidate;
-+	spin_unlock_bh(&orig_node->neigh_list_lock);
-+
-+	if (old_candidate)
-+		batadv_orig_ifinfo_put(old_candidate);
-+}
-+
-+/**
-  * batadv_find_router - find a suitable router for this originator
-  * @bat_priv: the bat priv with all the soft interface information
-  * @orig_node: the destination node
-@@ -562,10 +585,6 @@ next:
- 	}
- 	rcu_read_unlock();
- 
--	/* last_bonding_candidate is reset below, remove the old reference. */
--	if (orig_node->last_bonding_candidate)
--		batadv_orig_ifinfo_put(orig_node->last_bonding_candidate);
--
- 	/* After finding candidates, handle the three cases:
- 	 * 1) there is a next candidate, use that
- 	 * 2) there is no next candidate, use the first of the list
-@@ -574,21 +593,28 @@ next:
- 	if (next_candidate) {
- 		batadv_neigh_node_put(router);
- 
--		/* remove references to first candidate, we don't need it. */
--		if (first_candidate) {
--			batadv_neigh_node_put(first_candidate_router);
--			batadv_orig_ifinfo_put(first_candidate);
--		}
-+		kref_get(&next_candidate_router->refcount);
- 		router = next_candidate_router;
--		orig_node->last_bonding_candidate = next_candidate;
-+		batadv_last_bonding_replace(orig_node, next_candidate);
- 	} else if (first_candidate) {
- 		batadv_neigh_node_put(router);
- 
--		/* refcounting has already been done in the loop above. */
-+		kref_get(&first_candidate_router->refcount);
- 		router = first_candidate_router;
--		orig_node->last_bonding_candidate = first_candidate;
-+		batadv_last_bonding_replace(orig_node, first_candidate);
- 	} else {
--		orig_node->last_bonding_candidate = NULL;
-+		batadv_last_bonding_replace(orig_node, NULL);
-+	}
-+
-+	/* cleanup of candidates */
-+	if (first_candidate) {
-+		batadv_neigh_node_put(first_candidate_router);
-+		batadv_orig_ifinfo_put(first_candidate);
-+	}
-+
-+	if (next_candidate) {
-+		batadv_neigh_node_put(next_candidate_router);
-+		batadv_orig_ifinfo_put(next_candidate);
- 	}
- 
- 	return router;
-diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
-index 0051222..74d865a 100644
---- a/net/batman-adv/types.h
-+++ b/net/batman-adv/types.h
-@@ -330,7 +330,9 @@ struct batadv_orig_node {
- 	DECLARE_BITMAP(bcast_bits, BATADV_TQ_LOCAL_WINDOW_SIZE);
- 	u32 last_bcast_seqno;
- 	struct hlist_head neigh_list;
--	/* neigh_list_lock protects: neigh_list and router */
-+	/* neigh_list_lock protects: neigh_list, ifinfo_list,
-+	 * last_bonding_candidate and router
-+	 */
- 	spinlock_t neigh_list_lock;
- 	struct hlist_node hash_entry;
- 	struct batadv_priv *bat_priv;
diff --git a/batman-adv/patches/0007-batman-adv-Free-last_bonding_candidate-on-release-of.patch b/batman-adv/patches/0007-batman-adv-Free-last_bonding_candidate-on-release-of.patch
deleted file mode 100644
index 9e548da..0000000
--- a/batman-adv/patches/0007-batman-adv-Free-last_bonding_candidate-on-release-of.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Thu, 30 Jun 2016 21:41:13 +0200
-Subject: [PATCH] batman-adv: Free last_bonding_candidate on release of orig_node
-
-The orig_ifinfo reference counter for last_bonding_candidate in
-batadv_orig_node has to be reduced when an originator node is released.
-Otherwise the orig_ifinfo is leaked and the reference counter the netdevice
-is not reduced correctly.
-
-Fixes: 797edd9e87ac ("batman-adv: add bonding again")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
-
-Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/20df5c53865a90095099f0af80536b8abfea303b
----
- net/batman-adv/originator.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
-index fe2fcda..ab8c4f9 100644
---- a/net/batman-adv/originator.c
-+++ b/net/batman-adv/originator.c
-@@ -766,6 +766,7 @@ static void batadv_orig_node_release(struct kref *ref)
- 	struct batadv_orig_node *orig_node;
- 	struct batadv_orig_ifinfo *orig_ifinfo;
- 	struct batadv_orig_node_vlan *vlan;
-+	struct batadv_orig_ifinfo *last_candidate;
- 
- 	orig_node = container_of(ref, struct batadv_orig_node, refcount);
- 
-@@ -783,8 +784,14 @@ static void batadv_orig_node_release(struct kref *ref)
- 		hlist_del_rcu(&orig_ifinfo->list);
- 		batadv_orig_ifinfo_put(orig_ifinfo);
- 	}
-+
-+	last_candidate = orig_node->last_bonding_candidate;
-+	orig_node->last_bonding_candidate = NULL;
- 	spin_unlock_bh(&orig_node->neigh_list_lock);
- 
-+	if (last_candidate)
-+		batadv_orig_ifinfo_put(last_candidate);
-+
- 	spin_lock_bh(&orig_node->vlan_list_lock);
- 	hlist_for_each_entry_safe(vlan, node_tmp, &orig_node->vlan_list, list) {
- 		hlist_del_rcu(&vlan->list);
diff --git a/batman-adv/patches/0008-batman-adv-Fix-speedy-join-in-gateway-client-mode.patch b/batman-adv/patches/0008-batman-adv-Fix-speedy-join-in-gateway-client-mode.patch
deleted file mode 100644
index e63b782..0000000
--- a/batman-adv/patches/0008-batman-adv-Fix-speedy-join-in-gateway-client-mode.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Sun, 12 Jun 2016 10:43:19 +0200
-Subject: [PATCH] batman-adv: Fix speedy join in gateway client mode
-
-Speedy join only works when the received packet is either broadcast or an
-4addr unicast packet. Thus packets converted from broadcast to unicast via
-the gateway handling code have to be converted to 4addr packets to allow
-the receiving gateway server to add the sender address as temporary entry
-to the translation table.
-
-Not doing it will make the batman-adv gateway server drop the DHCP response
-in many situations because it doesn't yet have the TT entry for the
-destination of the DHCP response.
-
-Fixes: 9cbc67d9da47 ("batman-adv: change interface_rx to get orig node")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
----
- net/batman-adv/send.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
-index f2f1256..0103976 100644
---- a/net/batman-adv/send.c
-+++ b/net/batman-adv/send.c
-@@ -424,8 +424,8 @@ int batadv_send_skb_via_gw(struct batadv_priv *bat_priv, struct sk_buff *skb,
- 	struct batadv_orig_node *orig_node;
- 
- 	orig_node = batadv_gw_get_selected_orig(bat_priv);
--	return batadv_send_skb_unicast(bat_priv, skb, BATADV_UNICAST, 0,
--				       orig_node, vid);
-+	return batadv_send_skb_unicast(bat_priv, skb, BATADV_UNICAST_4ADDR,
-+				       BATADV_P_DATA, orig_node, vid);
- }
- 
- void batadv_schedule_bat_ogm(struct batadv_hard_iface *hard_iface)

From c2d16c25362cc31683cefa44020affb77c7c30ac Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Thu, 1 Sep 2016 19:20:54 +0200
Subject: [PATCH 288/368] batctl: upgrade package to latest release 2016.3

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batctl/Makefile                               |  7 +-
 ...around-uclibc-collision-for-__unused.patch | 77 +++++++++++++++++++
 2 files changed, 81 insertions(+), 3 deletions(-)
 create mode 100644 batctl/patches/0001-batctl-Work-around-uclibc-collision-for-__unused.patch

diff --git a/batctl/Makefile b/batctl/Makefile
index 174b18e..36cea26 100644
--- a/batctl/Makefile
+++ b/batctl/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batctl
 
-PKG_VERSION:=2016.2
+PKG_VERSION:=2016.3
 PKG_RELEASE:=0
-PKG_MD5SUM:=50f42d06611afae58ccfcde502f94c1a
+PKG_MD5SUM:=533cbbe981bd0e9fc9ec73ed59379960
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
@@ -55,7 +55,8 @@ MAKE_BATCTL_ENV += \
         CPPFLAGS="$(TARGET_CPPFLAGS)" \
         CFLAGS="$(TARGET_CFLAGS)" \
         LDFLAGS="$(TARGET_LDFLAGS)" \
-        LIBNL_NAME="libnl-tiny"
+        LIBNL_NAME="libnl-tiny" \
+        LIBNL_GENL_NAME="libnl-tiny"
 
 MAKE_BATCTL_ARGS += \
         REVISION="$(PKG_BATCTL_SHORTREV)" \
diff --git a/batctl/patches/0001-batctl-Work-around-uclibc-collision-for-__unused.patch b/batctl/patches/0001-batctl-Work-around-uclibc-collision-for-__unused.patch
new file mode 100644
index 0000000..558bc9d
--- /dev/null
+++ b/batctl/patches/0001-batctl-Work-around-uclibc-collision-for-__unused.patch
@@ -0,0 +1,77 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Sun, 4 Sep 2016 20:20:40 +0200
+Subject: [PATCH] batctl: Work around uclibc collision for __unused
+
+uclibc on 64 bit systems uses struct members called __unused. These
+conflict with the definition of __unused in batctl. Such a conflict results
+in a build error because the struct member will be replaced with the
+__attribute__((unused)).
+
+This can be avoided by renaming it to the Linux kernel name
+"__maybe_unused".
+
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+---
+ genl.c     | 4 ++--
+ main.h     | 2 +-
+ tp_meter.c | 5 +++--
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/genl.c b/genl.c
+index b6f66fd..36fc27e 100644
+--- a/genl.c
++++ b/genl.c
+@@ -34,7 +34,7 @@
+ 
+ #include "batman_adv.h"
+ 
+-static int mcast_error_handler(struct sockaddr_nl *nla __unused,
++static int mcast_error_handler(struct sockaddr_nl *nla __maybe_unused,
+ 			       struct nlmsgerr *err, void *arg)
+ {
+ 	int *ret = arg;
+@@ -42,7 +42,7 @@ static int mcast_error_handler(struct sockaddr_nl *nla __unused,
+ 	return NL_STOP;
+ }
+ 
+-static int mcast_ack_handler(struct nl_msg *msg __unused, void *arg)
++static int mcast_ack_handler(struct nl_msg *msg __maybe_unused, void *arg)
+ {
+ 	int *ret = arg;
+ 	*ret = 0;
+diff --git a/main.h b/main.h
+index 01f70e8..12c33b7 100644
+--- a/main.h
++++ b/main.h
+@@ -47,7 +47,7 @@
+ #endif
+ 
+ #define __packed __attribute((packed))   /* linux kernel compat */
+-#define __unused __attribute__((unused))
++#define __maybe_unused __attribute__((unused))
+ #define BIT(nr)                 (1UL << (nr)) /* linux kernel compat */
+ 
+ typedef uint8_t u8; /* linux kernel compat */
+diff --git a/tp_meter.c b/tp_meter.c
+index 43c19da..a402e45 100644
+--- a/tp_meter.c
++++ b/tp_meter.c
+@@ -66,7 +66,7 @@ struct tp_cookie {
+ 	uint32_t cookie;
+ };
+ 
+-static int tpmeter_nl_print_error(struct sockaddr_nl *nla __unused,
++static int tpmeter_nl_print_error(struct sockaddr_nl *nla __maybe_unused,
+ 				  struct nlmsgerr *nlerr,
+ 				  void *arg)
+ {
+@@ -236,7 +236,8 @@ out:
+ 	return err;
+ }
+ 
+-static int no_seq_check(struct nl_msg *msg __unused, void *arg __unused)
++static int no_seq_check(struct nl_msg *msg __maybe_unused,
++			void *arg __maybe_unused)
+ {
+ 	return NL_OK;
+ }

From 674adedb8fc88e3a6d890b821d20d0077af51c07 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Thu, 1 Sep 2016 19:42:20 +0200
Subject: [PATCH 289/368] alfred: upgrade package to latest release 2016.3

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 alfred/Makefile                               | 11 ++--
 ...ed-vis-Fix-netlink-function-fallback.patch | 40 +++++++++++++++
 ...irect-neighbors-detection-with-origi.patch | 50 +++++++++++++++++++
 3 files changed, 97 insertions(+), 4 deletions(-)
 create mode 100644 alfred/patches/0001-alfred-vis-Fix-netlink-function-fallback.patch
 create mode 100644 alfred/patches/0002-alfred-vis-Fix-direct-neighbors-detection-with-origi.patch

diff --git a/alfred/Makefile b/alfred/Makefile
index 8d651a5..319795a 100644
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -11,9 +11,9 @@ include $(TOPDIR)/rules.mk
 # The latest alfred git hash in PKG_REV can be obtained from https://git.open-mesh.org/alfred.git
 #
 PKG_NAME:=alfred
-PKG_VERSION:=2016.2
+PKG_VERSION:=2016.3
 PKG_RELEASE:=0
-PKG_MD5SUM:=cc7d5b352942477033a4cafbed84152d
+PKG_MD5SUM:=8a33199b8926a960889d1cf08535ef63
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
@@ -28,7 +28,7 @@ define Package/alfred
   SECTION:=net
   CATEGORY:=Network
   TITLE:=A.L.F.R.E.D. - Almighty Lightweight Fact Remote Exchange Daemon
-  DEPENDS:= +libc @IPV6 +librt \
+  DEPENDS:= +libc @IPV6 +libnl-tiny +librt \
 	  +ALFRED_NEEDS_lua:lua \
 	  +ALFRED_NEEDS_libgps:libgps
 endef
@@ -60,10 +60,13 @@ endef
 MAKE_ALFRED_FLAGS=\
 	CONFIG_ALFRED_VIS=$(if $(CONFIG_PACKAGE_ALFRED_VIS),y,n) \
 	CONFIG_ALFRED_GPSD=$(if $(CONFIG_PACKAGE_ALFRED_GPSD),y,n) \
-	CONFIG_ALFRED_CAPABILITIES=n
+	CONFIG_ALFRED_CAPABILITIES=n \
+        LIBNL_NAME="libnl-tiny" \
+        LIBNL_GENL_NAME="libnl-tiny"
 
 TARGET_CFLAGS  += -ffunction-sections -fdata-sections -flto
 TARGET_LDFLAGS += -Wl,--gc-sections -fuse-linker-plugin
+TARGET_CPPFLAGS += -D_GNU_SOURCE
 
 define Build/Compile
 	CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
diff --git a/alfred/patches/0001-alfred-vis-Fix-netlink-function-fallback.patch b/alfred/patches/0001-alfred-vis-Fix-netlink-function-fallback.patch
new file mode 100644
index 0000000..7115273
--- /dev/null
+++ b/alfred/patches/0001-alfred-vis-Fix-netlink-function-fallback.patch
@@ -0,0 +1,40 @@
+From 9729239306edd6c0d122b0222626988f44d9b1cf Mon Sep 17 00:00:00 2001
+From: Sven Eckelmann <sven@narfation.org>
+Date: Thu, 22 Sep 2016 23:41:20 +0200
+Subject: [PATCH] alfred: vis: Fix netlink function fallback
+
+The netlink functions return -EOPNOTSUPP when the kernel doesn't support
+the netlink command. The caller can then fall back to debugfs. So check for
+-EOPNOTSUPP and not EOPNOTSUPP.
+
+Fixes: bca55a86fecd ("alfred: vis: Add support for netlink")
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+---
+ vis/vis.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/vis/vis.c b/vis/vis.c
+index b865508..677f8aa 100644
+--- a/vis/vis.c
++++ b/vis/vis.c
+@@ -361,7 +361,7 @@ static int parse_transtable_local(struct globals *globals)
+ 	int ret;
+ 
+ 	ret = parse_transtable_local_netlink(globals);
+-	if (ret != EOPNOTSUPP)
++	if (ret != -EOPNOTSUPP)
+ 		return ret;
+ 
+ 	return parse_transtable_local_debugfs(globals);
+@@ -602,7 +602,7 @@ static int parse_orig_list(struct globals *globals)
+ 	int ret;
+ 
+ 	ret = parse_orig_list_netlink(globals);
+-	if (ret != EOPNOTSUPP)
++	if (ret != -EOPNOTSUPP)
+ 		return ret;
+ 
+ 	return parse_orig_list_debugfs(globals);
+-- 
+2.9.3
+
diff --git a/alfred/patches/0002-alfred-vis-Fix-direct-neighbors-detection-with-origi.patch b/alfred/patches/0002-alfred-vis-Fix-direct-neighbors-detection-with-origi.patch
new file mode 100644
index 0000000..01a8510
--- /dev/null
+++ b/alfred/patches/0002-alfred-vis-Fix-direct-neighbors-detection-with-origi.patch
@@ -0,0 +1,50 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Fri, 23 Sep 2016 15:45:12 +0200
+Subject: [PATCH] alfred: vis: Fix direct neighbors detection with originator netlink query
+
+Only entries in the originator table with the destination address equal to
+the originator address should be handled by alfred as actual neighbors.
+
+Fixes: bca55a86fecd ("alfred: vis: Add support for netlink")
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+---
+ vis/vis.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/vis/vis.c b/vis/vis.c
+index 94e583e..f4d13c7 100644
+--- a/vis/vis.c
++++ b/vis/vis.c
+@@ -453,6 +453,7 @@ err:
+ 
+ static const int parse_orig_list_mandatory[] = {
+ 	BATADV_ATTR_ORIG_ADDRESS,
++	BATADV_ATTR_NEIGH_ADDRESS,
+ 	BATADV_ATTR_TQ,
+ 	BATADV_ATTR_HARD_IFINDEX,
+ };
+@@ -466,6 +467,7 @@ static int parse_orig_list_netlink_cb(struct nl_msg *msg, void *arg)
+ 	struct genlmsghdr *ghdr;
+ 	struct vis_list_entry *v_entry;
+ 	uint8_t *orig;
++	uint8_t *neigh;
+ 	uint8_t tq;
+ 	uint32_t hardif;
+ 
+@@ -493,12 +495,16 @@ static int parse_orig_list_netlink_cb(struct nl_msg *msg, void *arg)
+ 		return NL_OK;
+ 
+ 	orig = nla_data(attrs[BATADV_ATTR_ORIG_ADDRESS]);
++	neigh = nla_data(attrs[BATADV_ATTR_NEIGH_ADDRESS]);
+ 	tq = nla_get_u8(attrs[BATADV_ATTR_TQ]);
+ 	hardif = nla_get_u32(attrs[BATADV_ATTR_HARD_IFINDEX]);
+ 
+ 	if (tq < 1)
+ 		return NL_OK;
+ 
++	if (memcmp(orig, neigh, ETH_ALEN) != 0)
++		return NL_OK;
++
+ 	v_entry = malloc(sizeof(*v_entry));
+ 	if (!v_entry)
+ 		return NL_OK;

From d5075dea36f1e1f1f736d17aba79c2e0e5e183d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
Date: Wed, 28 Sep 2016 18:15:43 +0200
Subject: [PATCH 290/368] bird: update to v1.6.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 bird/Makefile                                 |  4 +-
 .../001-netlink-update-struct-msghdr.patch    | 49 -------------------
 2 files changed, 2 insertions(+), 51 deletions(-)
 delete mode 100644 bird/patches/001-netlink-update-struct-msghdr.patch

diff --git a/bird/Makefile b/bird/Makefile
index be62460..e9c3ce0 100644
--- a/bird/Makefile
+++ b/bird/Makefile
@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bird
-PKG_VERSION:=1.6.0
+PKG_VERSION:=1.6.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird
-PKG_MD5SUM:=4c92ec3548a2a120243879b6ef7046dd
+PKG_MD5SUM:=36bc84db93ae7a2fe10194075331e1b9
 PKG_BUILD_DEPENDS:=libncurses libreadline
 PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
 
diff --git a/bird/patches/001-netlink-update-struct-msghdr.patch b/bird/patches/001-netlink-update-struct-msghdr.patch
deleted file mode 100644
index 491e8f9..0000000
--- a/bird/patches/001-netlink-update-struct-msghdr.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 31e9e10144a6994773a04d94903fa3bdde6de91e Mon Sep 17 00:00:00 2001
-From: Stijn Tintel <stijn@linux-ipv6.be>
-Date: Tue, 10 May 2016 16:45:35 +0300
-Subject: [PATCH] netlink: update struct msghdr
-
-The netlink code assumes an order for the members of struct msghdr.
-This breaks recvmsg and sendmsg with musl libc on mips64. Fix this by
-using designated initializers instead.
-
-Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
----
- sysdep/linux/netlink.c | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
-index 1ffdff0..b42e7b6 100644
---- a/sysdep/linux/netlink.c
-+++ b/sysdep/linux/netlink.c
-@@ -125,7 +125,12 @@ nl_get_reply(struct nl_sock *nl)
- 	{
- 	  struct iovec iov = { nl->rx_buffer, NL_RX_SIZE };
- 	  struct sockaddr_nl sa;
--	  struct msghdr m = { (struct sockaddr *) &sa, sizeof(sa), &iov, 1, NULL, 0, 0 };
-+	  struct msghdr m = {
-+	    .msg_name = &sa,
-+	    .msg_namelen = sizeof(sa),
-+	    .msg_iov = &iov,
-+	    .msg_iovlen = 1,
-+	  };
- 	  int x = recvmsg(nl->fd, &m, 0);
- 	  if (x < 0)
- 	    die("nl_get_reply: %m");
-@@ -1231,7 +1236,12 @@ nl_async_hook(sock *sk, int size UNUSED)
- {
-   struct iovec iov = { nl_async_rx_buffer, NL_RX_SIZE };
-   struct sockaddr_nl sa;
--  struct msghdr m = { (struct sockaddr *) &sa, sizeof(sa), &iov, 1, NULL, 0, 0 };
-+  struct msghdr m = {
-+    .msg_name = &sa,
-+    .msg_namelen = sizeof(sa),
-+    .msg_iov = &iov,
-+    .msg_iovlen = 1,
-+  };
-   struct nlmsghdr *h;
-   int x;
-   uint len;
--- 
-2.7.3
-

From cb5478e0799dbea47203af960a43cb5b1a2b5993 Mon Sep 17 00:00:00 2001
From: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
Date: Fri, 21 Oct 2016 12:50:17 +0200
Subject: [PATCH 291/368] Update to OONF version 0.13.0

---
 oonf-dlep-proxy/Makefile | 4 ++--
 oonf-dlep-radio/Makefile | 4 ++--
 oonf-olsrd2/Makefile     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index 7ac366f..2f36eaa 100644
--- a/oonf-dlep-proxy/Makefile
+++ b/oonf-dlep-proxy/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-proxy
-PKG_VERSION:=0.12.4
-PKG_REV:=356b7fe90d8f01618185edbc18b7072aa1b41aac
+PKG_VERSION:=0.13.0
+PKG_REV:=9f941b25e1ac806db9d41e9892a5cf361bfe98f5
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index 500ffae..ac1f19c 100644
--- a/oonf-dlep-radio/Makefile
+++ b/oonf-dlep-radio/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-radio
-PKG_VERSION:=0.12.4
-PKG_REV:=356b7fe90d8f01618185edbc18b7072aa1b41aac
+PKG_VERSION:=0.13.0
+PKG_REV:=9f941b25e1ac806db9d41e9892a5cf361bfe98f5
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 999bceb..9b8e988 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2
-PKG_VERSION:=0.12.4
-PKG_REV:=356b7fe90d8f01618185edbc18b7072aa1b41aac
+PKG_VERSION:=0.13.0
+PKG_REV:=9f941b25e1ac806db9d41e9892a5cf361bfe98f5
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

From 215d6b834fd1191c2b7c078020bc0cc204495caa Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Fri, 30 Sep 2016 10:10:51 +0200
Subject: [PATCH 292/368] batman-adv: upgrade package to latest release 2016.4

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batman-adv/Config.in                          |  5 ++
 batman-adv/Makefile                           |  5 +-
 batman-adv/files/compat-hacks.h               | 90 +++++++++++++++++++
 ...y-neigh_list-only-with-rcu-list-func.patch | 29 ------
 4 files changed, 98 insertions(+), 31 deletions(-)
 delete mode 100644 batman-adv/patches/0001-batman-adv-Modify-neigh_list-only-with-rcu-list-func.patch

diff --git a/batman-adv/Config.in b/batman-adv/Config.in
index 48092e7..8c75f31 100644
--- a/batman-adv/Config.in
+++ b/batman-adv/Config.in
@@ -14,6 +14,11 @@ config KMOD_BATMAN_ADV_DAT
 	depends on PACKAGE_kmod-batman-adv
 	default y
 
+config KMOD_BATMAN_ADV_DEBUGFS
+	bool "enable debugfs support"
+	depends on PACKAGE_kmod-batman-adv
+	default y
+
 config KMOD_BATMAN_ADV_MCAST
 	bool "enable multicast transmission optimization"
 	depends on PACKAGE_kmod-batman-adv
diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index e12c166..23b2f74 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
 
-PKG_VERSION:=2016.3
+PKG_VERSION:=2016.4
 PKG_RELEASE:=0
-PKG_MD5SUM:=63f530a62c3d48ed0c7e42f47dfa4d4d
+PKG_MD5SUM:=1ed28d02ad86050d1518023e354737b6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
@@ -50,6 +50,7 @@ endef
 PKG_EXTRA_KCONFIG:= \
 	CONFIG_BATMAN_ADV=m \
 	CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG),y,n) \
+	CONFIG_BATMAN_ADV_DEBUGFS=$(if $(CONFIG_KMOD_BATMAN_ADV_DEBUGFS),y,n) \
 	CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_KMOD_BATMAN_ADV_BLA),y,n) \
 	CONFIG_BATMAN_ADV_DAT=$(if $(CONFIG_KMOD_BATMAN_ADV_DAT),y,n) \
 	CONFIG_BATMAN_ADV_MCAST=$(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),y,n) \
diff --git a/batman-adv/files/compat-hacks.h b/batman-adv/files/compat-hacks.h
index a7fc179..32903b5 100644
--- a/batman-adv/files/compat-hacks.h
+++ b/batman-adv/files/compat-hacks.h
@@ -97,3 +97,93 @@ static inline void batadv_netif_trans_update(struct net_device *dev)
 }
 
 #endif /* < KERNEL_VERSION(4, 7, 0) */
+
+
+#include_next <linux/netlink.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
+
+#include_next <net/netlink.h>
+
+static inline bool batadv_nla_need_padding_for_64bit(struct sk_buff *skb);
+
+static inline int batadv_nla_align_64bit(struct sk_buff *skb, int padattr)
+{
+	if (batadv_nla_need_padding_for_64bit(skb) &&
+	    !nla_reserve(skb, padattr, 0))
+		return -EMSGSIZE;
+
+	return 0;
+}
+
+static inline struct nlattr *batadv__nla_reserve_64bit(struct sk_buff *skb,
+						       int attrtype,
+						       int attrlen, int padattr)
+{
+	if (batadv_nla_need_padding_for_64bit(skb))
+		batadv_nla_align_64bit(skb, padattr);
+
+	return __nla_reserve(skb, attrtype, attrlen);
+}
+
+static inline void batadv__nla_put_64bit(struct sk_buff *skb, int attrtype,
+					 int attrlen, const void *data,
+					 int padattr)
+{
+	struct nlattr *nla;
+
+	nla = batadv__nla_reserve_64bit(skb, attrtype, attrlen, padattr);
+	memcpy(nla_data(nla), data, attrlen);
+}
+
+static inline bool batadv_nla_need_padding_for_64bit(struct sk_buff *skb)
+{
+#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
+	/* The nlattr header is 4 bytes in size, that's why we test
+	 * if the skb->data _is_ aligned.  A NOP attribute, plus
+	 * nlattr header for next attribute, will make nla_data()
+	 * 8-byte aligned.
+	 */
+	if (IS_ALIGNED((unsigned long)skb_tail_pointer(skb), 8))
+		return true;
+#endif
+	return false;
+}
+
+static inline int batadv_nla_total_size_64bit(int payload)
+{
+	return NLA_ALIGN(nla_attr_size(payload))
+#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
+		+ NLA_ALIGN(nla_attr_size(0))
+#endif
+		;
+}
+
+static inline int batadv_nla_put_64bit(struct sk_buff *skb, int attrtype,
+				       int attrlen, const void *data,
+				       int padattr)
+{
+	size_t len;
+
+	if (batadv_nla_need_padding_for_64bit(skb))
+		len = batadv_nla_total_size_64bit(attrlen);
+	else
+		len = nla_total_size(attrlen);
+	if (unlikely(skb_tailroom(skb) < len))
+		return -EMSGSIZE;
+
+	batadv__nla_put_64bit(skb, attrtype, attrlen, data, padattr);
+	return 0;
+}
+
+#define nla_put_u64_64bit(_skb, _attrtype, _value, _padattr) \
+	batadv_nla_put_u64_64bit(_skb, _attrtype, _value, _padattr)
+static inline int batadv_nla_put_u64_64bit(struct sk_buff *skb, int attrtype,
+					   u64 value, int padattr)
+{
+	return batadv_nla_put_64bit(skb, attrtype, sizeof(u64), &value,
+				    padattr);
+}
+
+#endif /* < KERNEL_VERSION(4, 7, 0) */
+
diff --git a/batman-adv/patches/0001-batman-adv-Modify-neigh_list-only-with-rcu-list-func.patch b/batman-adv/patches/0001-batman-adv-Modify-neigh_list-only-with-rcu-list-func.patch
deleted file mode 100644
index a30d80b..0000000
--- a/batman-adv/patches/0001-batman-adv-Modify-neigh_list-only-with-rcu-list-func.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
-Date: Thu, 29 Sep 2016 17:22:58 +0200
-Subject: [PATCH] batman-adv: Modify neigh_list only with rcu-list functions
-
-The batadv_hard_iface::neigh_list is accessed via rcu based primitives.
-Thus all operations done on it have to fulfill the requirements by RCU. So
-using non-RCU mechanisms like hlist_add_head is not allowed because it
-misses the barriers required to protect concurrent readers when accessing
-the data behind the pointer.
-
-Fixes: fed2826b490c ("batman-adv: add list of unique single hop neighbors per hard-interface")
-Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
----
- net/batman-adv/originator.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
-index 3940b5d..3e9667e 100644
---- a/net/batman-adv/originator.c
-+++ b/net/batman-adv/originator.c
-@@ -537,7 +537,7 @@ batadv_hardif_neigh_create(struct batadv_hard_iface *hard_iface,
- 	if (bat_priv->algo_ops->neigh.hardif_init)
- 		bat_priv->algo_ops->neigh.hardif_init(hardif_neigh);
- 
--	hlist_add_head(&hardif_neigh->list, &hard_iface->neigh_list);
-+	hlist_add_head_rcu(&hardif_neigh->list, &hard_iface->neigh_list);
- 
- out:
- 	spin_unlock_bh(&hard_iface->neigh_list_lock);

From b429e28714296aaa14c03a0db6e53dd84cad3b25 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Fri, 28 Oct 2016 09:46:15 +0200
Subject: [PATCH 293/368] batctl: upgrade package to latest release 2016.4

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batctl/Makefile                               |  4 +-
 ...around-uclibc-collision-for-__unused.patch | 77 -------------------
 2 files changed, 2 insertions(+), 79 deletions(-)
 delete mode 100644 batctl/patches/0001-batctl-Work-around-uclibc-collision-for-__unused.patch

diff --git a/batctl/Makefile b/batctl/Makefile
index 36cea26..7ae81b5 100644
--- a/batctl/Makefile
+++ b/batctl/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batctl
 
-PKG_VERSION:=2016.3
+PKG_VERSION:=2016.4
 PKG_RELEASE:=0
-PKG_MD5SUM:=533cbbe981bd0e9fc9ec73ed59379960
+PKG_MD5SUM:=0112f35b2a48d32f23a17a6f45348e63
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
diff --git a/batctl/patches/0001-batctl-Work-around-uclibc-collision-for-__unused.patch b/batctl/patches/0001-batctl-Work-around-uclibc-collision-for-__unused.patch
deleted file mode 100644
index 558bc9d..0000000
--- a/batctl/patches/0001-batctl-Work-around-uclibc-collision-for-__unused.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Sun, 4 Sep 2016 20:20:40 +0200
-Subject: [PATCH] batctl: Work around uclibc collision for __unused
-
-uclibc on 64 bit systems uses struct members called __unused. These
-conflict with the definition of __unused in batctl. Such a conflict results
-in a build error because the struct member will be replaced with the
-__attribute__((unused)).
-
-This can be avoided by renaming it to the Linux kernel name
-"__maybe_unused".
-
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
----
- genl.c     | 4 ++--
- main.h     | 2 +-
- tp_meter.c | 5 +++--
- 3 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/genl.c b/genl.c
-index b6f66fd..36fc27e 100644
---- a/genl.c
-+++ b/genl.c
-@@ -34,7 +34,7 @@
- 
- #include "batman_adv.h"
- 
--static int mcast_error_handler(struct sockaddr_nl *nla __unused,
-+static int mcast_error_handler(struct sockaddr_nl *nla __maybe_unused,
- 			       struct nlmsgerr *err, void *arg)
- {
- 	int *ret = arg;
-@@ -42,7 +42,7 @@ static int mcast_error_handler(struct sockaddr_nl *nla __unused,
- 	return NL_STOP;
- }
- 
--static int mcast_ack_handler(struct nl_msg *msg __unused, void *arg)
-+static int mcast_ack_handler(struct nl_msg *msg __maybe_unused, void *arg)
- {
- 	int *ret = arg;
- 	*ret = 0;
-diff --git a/main.h b/main.h
-index 01f70e8..12c33b7 100644
---- a/main.h
-+++ b/main.h
-@@ -47,7 +47,7 @@
- #endif
- 
- #define __packed __attribute((packed))   /* linux kernel compat */
--#define __unused __attribute__((unused))
-+#define __maybe_unused __attribute__((unused))
- #define BIT(nr)                 (1UL << (nr)) /* linux kernel compat */
- 
- typedef uint8_t u8; /* linux kernel compat */
-diff --git a/tp_meter.c b/tp_meter.c
-index 43c19da..a402e45 100644
---- a/tp_meter.c
-+++ b/tp_meter.c
-@@ -66,7 +66,7 @@ struct tp_cookie {
- 	uint32_t cookie;
- };
- 
--static int tpmeter_nl_print_error(struct sockaddr_nl *nla __unused,
-+static int tpmeter_nl_print_error(struct sockaddr_nl *nla __maybe_unused,
- 				  struct nlmsgerr *nlerr,
- 				  void *arg)
- {
-@@ -236,7 +236,8 @@ out:
- 	return err;
- }
- 
--static int no_seq_check(struct nl_msg *msg __unused, void *arg __unused)
-+static int no_seq_check(struct nl_msg *msg __maybe_unused,
-+			void *arg __maybe_unused)
- {
- 	return NL_OK;
- }

From 8e27d38c71b04d1c846e0e0bd12cc3737e8a34f3 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Fri, 28 Oct 2016 09:50:00 +0200
Subject: [PATCH 294/368] alfred: upgrade package to latest release 2016.4

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 alfred/Makefile                               |  5 +-
 ...ed-vis-Fix-netlink-function-fallback.patch | 40 ---------------
 ...irect-neighbors-detection-with-origi.patch | 50 -------------------
 3 files changed, 2 insertions(+), 93 deletions(-)
 delete mode 100644 alfred/patches/0001-alfred-vis-Fix-netlink-function-fallback.patch
 delete mode 100644 alfred/patches/0002-alfred-vis-Fix-direct-neighbors-detection-with-origi.patch

diff --git a/alfred/Makefile b/alfred/Makefile
index 319795a..09f62d4 100644
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -11,9 +11,9 @@ include $(TOPDIR)/rules.mk
 # The latest alfred git hash in PKG_REV can be obtained from https://git.open-mesh.org/alfred.git
 #
 PKG_NAME:=alfred
-PKG_VERSION:=2016.3
+PKG_VERSION:=2016.4
 PKG_RELEASE:=0
-PKG_MD5SUM:=8a33199b8926a960889d1cf08535ef63
+PKG_MD5SUM:=172501ca734ac584fa13f10dcfa708da
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
@@ -66,7 +66,6 @@ MAKE_ALFRED_FLAGS=\
 
 TARGET_CFLAGS  += -ffunction-sections -fdata-sections -flto
 TARGET_LDFLAGS += -Wl,--gc-sections -fuse-linker-plugin
-TARGET_CPPFLAGS += -D_GNU_SOURCE
 
 define Build/Compile
 	CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
diff --git a/alfred/patches/0001-alfred-vis-Fix-netlink-function-fallback.patch b/alfred/patches/0001-alfred-vis-Fix-netlink-function-fallback.patch
deleted file mode 100644
index 7115273..0000000
--- a/alfred/patches/0001-alfred-vis-Fix-netlink-function-fallback.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 9729239306edd6c0d122b0222626988f44d9b1cf Mon Sep 17 00:00:00 2001
-From: Sven Eckelmann <sven@narfation.org>
-Date: Thu, 22 Sep 2016 23:41:20 +0200
-Subject: [PATCH] alfred: vis: Fix netlink function fallback
-
-The netlink functions return -EOPNOTSUPP when the kernel doesn't support
-the netlink command. The caller can then fall back to debugfs. So check for
--EOPNOTSUPP and not EOPNOTSUPP.
-
-Fixes: bca55a86fecd ("alfred: vis: Add support for netlink")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
----
- vis/vis.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/vis/vis.c b/vis/vis.c
-index b865508..677f8aa 100644
---- a/vis/vis.c
-+++ b/vis/vis.c
-@@ -361,7 +361,7 @@ static int parse_transtable_local(struct globals *globals)
- 	int ret;
- 
- 	ret = parse_transtable_local_netlink(globals);
--	if (ret != EOPNOTSUPP)
-+	if (ret != -EOPNOTSUPP)
- 		return ret;
- 
- 	return parse_transtable_local_debugfs(globals);
-@@ -602,7 +602,7 @@ static int parse_orig_list(struct globals *globals)
- 	int ret;
- 
- 	ret = parse_orig_list_netlink(globals);
--	if (ret != EOPNOTSUPP)
-+	if (ret != -EOPNOTSUPP)
- 		return ret;
- 
- 	return parse_orig_list_debugfs(globals);
--- 
-2.9.3
-
diff --git a/alfred/patches/0002-alfred-vis-Fix-direct-neighbors-detection-with-origi.patch b/alfred/patches/0002-alfred-vis-Fix-direct-neighbors-detection-with-origi.patch
deleted file mode 100644
index 01a8510..0000000
--- a/alfred/patches/0002-alfred-vis-Fix-direct-neighbors-detection-with-origi.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Fri, 23 Sep 2016 15:45:12 +0200
-Subject: [PATCH] alfred: vis: Fix direct neighbors detection with originator netlink query
-
-Only entries in the originator table with the destination address equal to
-the originator address should be handled by alfred as actual neighbors.
-
-Fixes: bca55a86fecd ("alfred: vis: Add support for netlink")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
----
- vis/vis.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/vis/vis.c b/vis/vis.c
-index 94e583e..f4d13c7 100644
---- a/vis/vis.c
-+++ b/vis/vis.c
-@@ -453,6 +453,7 @@ err:
- 
- static const int parse_orig_list_mandatory[] = {
- 	BATADV_ATTR_ORIG_ADDRESS,
-+	BATADV_ATTR_NEIGH_ADDRESS,
- 	BATADV_ATTR_TQ,
- 	BATADV_ATTR_HARD_IFINDEX,
- };
-@@ -466,6 +467,7 @@ static int parse_orig_list_netlink_cb(struct nl_msg *msg, void *arg)
- 	struct genlmsghdr *ghdr;
- 	struct vis_list_entry *v_entry;
- 	uint8_t *orig;
-+	uint8_t *neigh;
- 	uint8_t tq;
- 	uint32_t hardif;
- 
-@@ -493,12 +495,16 @@ static int parse_orig_list_netlink_cb(struct nl_msg *msg, void *arg)
- 		return NL_OK;
- 
- 	orig = nla_data(attrs[BATADV_ATTR_ORIG_ADDRESS]);
-+	neigh = nla_data(attrs[BATADV_ATTR_NEIGH_ADDRESS]);
- 	tq = nla_get_u8(attrs[BATADV_ATTR_TQ]);
- 	hardif = nla_get_u32(attrs[BATADV_ATTR_HARD_IFINDEX]);
- 
- 	if (tq < 1)
- 		return NL_OK;
- 
-+	if (memcmp(orig, neigh, ETH_ALEN) != 0)
-+		return NL_OK;
-+
- 	v_entry = malloc(sizeof(*v_entry));
- 	if (!v_entry)
- 		return NL_OK;

From 31cdf1f3eef23eba299ce13b9e1854b3c3233fe2 Mon Sep 17 00:00:00 2001
From: Vasilis Tsiligiannis <acinonyx@openwrt.gr>
Date: Sat, 29 Oct 2016 17:06:18 +0300
Subject: [PATCH 295/368] quagga: Bump to v1.1.0

- Fix dependencies to 'libzebra'
- Drop support for 'babeld' daemon
- Drop support for extra MANET protocols
- Refresh patches
---
 quagga/Makefile                               |  40 +--
 ...vtysh-fix-build-against-readline-6.3.patch |  15 --
 quagga/patches/120-quagga_manet.patch         | 243 ------------------
 quagga/patches/140-holdtimer-set.patch        |  10 +-
 quagga/patches/150-no-cross-fs-link.patch     |   4 +-
 quagga/patches/170-use-supported-pagers.patch |   6 +-
 6 files changed, 19 insertions(+), 299 deletions(-)
 delete mode 100644 quagga/patches/110-vtysh-fix-build-against-readline-6.3.patch
 delete mode 100644 quagga/patches/120-quagga_manet.patch

diff --git a/quagga/Makefile b/quagga/Makefile
index 67eedd6..f8963e0 100644
--- a/quagga/Makefile
+++ b/quagga/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2013 OpenWrt.org
+# Copyright (C) 2006-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=quagga
-PKG_VERSION:=0.99.22.4
-PKG_RELEASE:=2
-PKG_MD5SUM:=03ef24a448be47beba80efa2152f8a28
+PKG_VERSION:=1.1.0
+PKG_RELEASE:=1
+PKG_MD5SUM:=daa303871e07ea5856aae6fd79e89722
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://download.savannah.gnu.org/releases/quagga/
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_IPV6 \
@@ -25,7 +25,6 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_PACKAGE_quagga-ospf6d \
 	CONFIG_PACKAGE_quagga-ripd \
 	CONFIG_PACKAGE_quagga-ripngd \
-	CONFIG_PACKAGE_quagga-babeld \
 	CONFIG_PACKAGE_quagga-vtysh
 PKG_BUILD_PARALLEL:=1
 PKG_FIXUP:=autoreconf
@@ -41,7 +40,7 @@ define Package/quagga/Default
   DEPENDS:=quagga
   TITLE:=The Quagga Software Routing Suite
   URL:=http://www.quagga.net
-  MAINTAINER:=Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
+  MAINTAINER:=Vasilis Tsiligiannis <acinonyx@openwrt.gr>
 endef
 
 define Package/quagga
@@ -77,6 +76,7 @@ endef
 
 define Package/quagga-libospf
   $(call Package/quagga/Default)
+  DEPENDS+=+quagga-libzebra
   TITLE:=OSPF library
 endef
 
@@ -94,13 +94,13 @@ endef
 
 define Package/quagga-ospfd
   $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libospf +quagga-libzebra
+  DEPENDS+=+quagga-libospf
   TITLE:=OSPFv2 routing engine
 endef
 
 define Package/quagga-ospf6d
   $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libospf +quagga-libzebra @IPV6
+  DEPENDS+=+quagga-libospf @IPV6
   TITLE:=OSPFv3 routing engine
 endef
 
@@ -116,12 +116,6 @@ define Package/quagga-ripngd
   TITLE:=RIPNG routing engine
 endef
 
-define Package/quagga-babeld
-  $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libzebra @IPV6
-  TITLE:=Babel routing engine
-endef
-
 define Package/quagga-vtysh
   $(call Package/quagga/Default)
   DEPENDS+=+quagga-libzebra +libreadline +libncurses
@@ -156,10 +150,6 @@ define Package/quagga-ripngd/conffiles
 /etc/quagga/ripngd.conf
 endef
 
-define Package/quagga-babeld/conffiles
-/etc/quagga/babeld.conf
-endef
-
 ifneq ($(SDK),)
 CONFIG_PACKAGE_quagga-libzebra:=m
 CONFIG_PACKAGE_quagga-libospf:=m
@@ -170,7 +160,6 @@ CONFIG_PACKAGE_quagga-isisd:=m
 CONFIG_PACKAGE_quagga-ospf6d:=m
 CONFIG_PACKAGE_quagga-ripd:=m
 CONFIG_PACKAGE_quagga-ripngd:=m
-CONFIG_PACKAGE_quagga-babeld:=m
 CONFIG_PACKAGE_quagga-vtysh:=m
 endif
 
@@ -181,7 +170,6 @@ CONFIGURE_ARGS+= \
 	--disable-static \
 	--enable-user=network \
 	--enable-group=network \
-	--enable-pie=no \
 	--enable-multipath=8 \
 	--disable-ospfclient \
 	--disable-capabilities \
@@ -193,7 +181,6 @@ CONFIGURE_ARGS+= \
 	$(call autoconf_bool,CONFIG_PACKAGE_quagga-ospf6d,ospf6d) \
 	$(call autoconf_bool,CONFIG_PACKAGE_quagga-ripd,ripd) \
 	$(call autoconf_bool,CONFIG_PACKAGE_quagga-ripngd,ripngd) \
-	$(call autoconf_bool,CONFIG_PACKAGE_quagga-babeld,babeld) \
 	$(call autoconf_bool,CONFIG_PACKAGE_quagga-vtysh,vtysh) \
 
 MAKE_FLAGS += \
@@ -267,14 +254,6 @@ define Package/quagga-ripngd/install
 	$(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/ripngd.conf
 endef
 
-define Package/quagga-babeld/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/babeld $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/quagga
-	chmod 0750 $(1)/etc/quagga
-	$(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/babeld.conf
-endef
-
 define Package/quagga-vtysh/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vtysh $(1)/usr/bin/
@@ -301,5 +280,4 @@ $(eval $(call BuildPackage,quagga-ospfd))
 $(eval $(call BuildPackage,quagga-ospf6d))
 $(eval $(call BuildPackage,quagga-ripd))
 $(eval $(call BuildPackage,quagga-ripngd))
-$(eval $(call BuildPackage,quagga-babeld))
 $(eval $(call BuildPackage,quagga-vtysh))
diff --git a/quagga/patches/110-vtysh-fix-build-against-readline-6.3.patch b/quagga/patches/110-vtysh-fix-build-against-readline-6.3.patch
deleted file mode 100644
index e8c499e..0000000
--- a/quagga/patches/110-vtysh-fix-build-against-readline-6.3.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/vtysh/vtysh.c
-+++ b/vtysh/vtysh.c
-@@ -2211,9 +2211,9 @@
- vtysh_readline_init (void)
- {
-   /* readline related settings. */
--  rl_bind_key ('?', (Function *) vtysh_rl_describe);
-+  rl_bind_key ('?', (rl_command_func_t *) vtysh_rl_describe);
-   rl_completion_entry_function = vtysh_completion_entry_function;
--  rl_attempted_completion_function = (CPPFunction *)new_completion;
-+  rl_attempted_completion_function = (rl_completion_func_t *) new_completion;
-   /* do not append space after completion. It will be appended
-    * in new_completion() function explicitly. */
-   rl_completion_append_character = '\0';
-
diff --git a/quagga/patches/120-quagga_manet.patch b/quagga/patches/120-quagga_manet.patch
deleted file mode 100644
index 2411bd0..0000000
--- a/quagga/patches/120-quagga_manet.patch
+++ /dev/null
@@ -1,243 +0,0 @@
---- a/lib/log.c
-+++ b/lib/log.c
-@@ -925,13 +925,19 @@ proto_redistnum(int afi, const char *s)
- 	return ZEBRA_ROUTE_STATIC;
-       else if (strncmp (s, "r", 1) == 0)
- 	return ZEBRA_ROUTE_RIP;
--      else if (strncmp (s, "o", 1) == 0)
-+      else if (strncmp (s, "os", 2) == 0)
- 	return ZEBRA_ROUTE_OSPF;
-       else if (strncmp (s, "i", 1) == 0)
- 	return ZEBRA_ROUTE_ISIS;
-       else if (strncmp (s, "bg", 2) == 0)
- 	return ZEBRA_ROUTE_BGP;
--      else if (strncmp (s, "ba", 2) == 0)
-+      else if (strncmp (s, "h", 1) == 0)
-+	return ZEBRA_ROUTE_HSLS;
-+      else if (strncmp (s, "ol", 2) == 0)
-+	return ZEBRA_ROUTE_OLSR;
-+      else if (strncmp (s, "bat", 3) == 0)
-+	return ZEBRA_ROUTE_BATMAN;
-+      else if (strncmp (s, "bab", 3) == 0)
- 	return ZEBRA_ROUTE_BABEL;
-     }
-   if (afi == AFI_IP6)
-@@ -944,13 +950,19 @@ proto_redistnum(int afi, const char *s)
- 	return ZEBRA_ROUTE_STATIC;
-       else if (strncmp (s, "r", 1) == 0)
- 	return ZEBRA_ROUTE_RIPNG;
--      else if (strncmp (s, "o", 1) == 0)
-+      else if (strncmp (s, "os", 2) == 0)
- 	return ZEBRA_ROUTE_OSPF6;
-       else if (strncmp (s, "i", 1) == 0)
- 	return ZEBRA_ROUTE_ISIS;
-       else if (strncmp (s, "bg", 2) == 0)
- 	return ZEBRA_ROUTE_BGP;
--      else if (strncmp (s, "ba", 2) == 0)
-+      else if (strncmp (s, "h", 1) == 0)
-+	return ZEBRA_ROUTE_HSLS;
-+      else if (strncmp (s, "ol", 2) == 0)
-+	return ZEBRA_ROUTE_OLSR;
-+      else if (strncmp (s, "bat", 3) == 0)
-+	return ZEBRA_ROUTE_BATMAN;
-+      else if (strncmp (s, "bab", 3) == 0)
- 	return ZEBRA_ROUTE_BABEL;
-     }
-   return -1;
---- a/lib/route_types.txt
-+++ b/lib/route_types.txt
-@@ -51,13 +51,9 @@ ZEBRA_ROUTE_OSPF,       ospf,      ospfd
- ZEBRA_ROUTE_OSPF6,      ospf6,     ospf6d, 'O', 0, 1, "OSPFv6"
- ZEBRA_ROUTE_ISIS,       isis,      isisd,  'I', 1, 1, "IS-IS"
- ZEBRA_ROUTE_BGP,        bgp,       bgpd,   'B', 1, 1, "BGP"
--# HSLS and OLSR both are AFI independent (so: 1, 1), however
--# we want to disable for them for general Quagga distribution.
--# This at least makes it trivial for users of these protocols
--# to 'switch on' redist support (direct numeric entry remaining
--# possible).
--ZEBRA_ROUTE_HSLS,       hsls,      hslsd,  'H', 0, 0, "HSLS"
--ZEBRA_ROUTE_OLSR,       olsr,      olsrd,  'o', 0, 0, "OLSR"
-+ZEBRA_ROUTE_HSLS,       hsls,      hslsd,  'H', 1, 1, "HSLS"
-+ZEBRA_ROUTE_OLSR,       olsr,      olsrd,  'o', 1, 1, "OLSR"
-+ZEBRA_ROUTE_BATMAN,     batman,    batmand,'b', 1, 1, "BATMAN"
- ZEBRA_ROUTE_BABEL,      babel,     babeld, 'A', 1, 1, "Babel"
- 
- ## help strings
-@@ -72,5 +68,6 @@ ZEBRA_ROUTE_OSPF6,  "Open Shortest Path
- ZEBRA_ROUTE_ISIS,   "Intermediate System to Intermediate System (IS-IS)"
- ZEBRA_ROUTE_BGP,    "Border Gateway Protocol (BGP)"
- ZEBRA_ROUTE_HSLS,   "Hazy-Sighted Link State Protocol (HSLS)"
--ZEBRA_ROUTE_OLSR,   "Optimised Link State Routing (OLSR)"
-+ZEBRA_ROUTE_OLSR,   "Optimized Link State Routing (OLSR)"
-+ZEBRA_ROUTE_BATMAN, "Better Approach to Mobile Ad-Hoc Networking (BATMAN)"
- ZEBRA_ROUTE_BABEL,  "Babel routing protocol (Babel)"
---- a/ripd/rip_zebra.c
-+++ b/ripd/rip_zebra.c
-@@ -206,9 +206,12 @@ static struct {
-   {ZEBRA_ROUTE_KERNEL,  1, "kernel"},
-   {ZEBRA_ROUTE_CONNECT, 1, "connected"},
-   {ZEBRA_ROUTE_STATIC,  1, "static"},
--  {ZEBRA_ROUTE_OSPF,    1, "ospf"},
-+  {ZEBRA_ROUTE_OSPF,    2, "ospf"},
-   {ZEBRA_ROUTE_BGP,     2, "bgp"},
--  {ZEBRA_ROUTE_BABEL,   2, "babel"},
-+  {ZEBRA_ROUTE_HSLS,    1, "hsls"},
-+  {ZEBRA_ROUTE_OLSR,    2, "olsr"},
-+  {ZEBRA_ROUTE_BATMAN,  3, "batman"},
-+  {ZEBRA_ROUTE_BABEL,   3, "babel"},
-   {0, 0, NULL}
- };
- 
---- a/ripngd/ripng_zebra.c
-+++ b/ripngd/ripng_zebra.c
-@@ -216,9 +216,12 @@ static struct {
-   {ZEBRA_ROUTE_KERNEL,  1, "kernel"},
-   {ZEBRA_ROUTE_CONNECT, 1, "connected"},
-   {ZEBRA_ROUTE_STATIC,  1, "static"},
--  {ZEBRA_ROUTE_OSPF6,   1, "ospf6"},
-+  {ZEBRA_ROUTE_OSPF6,   2, "ospf6"},
-   {ZEBRA_ROUTE_BGP,     2, "bgp"},
--  {ZEBRA_ROUTE_BABEL,   2, "babel"},
-+  {ZEBRA_ROUTE_HSLS,    1, "hsls"},
-+  {ZEBRA_ROUTE_OLSR,    2, "olsr"},
-+  {ZEBRA_ROUTE_BATMAN,  3, "batman"},
-+  {ZEBRA_ROUTE_BABEL,   3, "babel"},
-   {0, 0, NULL}
- };
- 
---- a/zebra/rt_netlink.c
-+++ b/zebra/rt_netlink.c
-@@ -1609,6 +1609,9 @@ netlink_route_multipath (int cmd, struct
-                         addattr_l (&req.n, sizeof req, RTA_PREFSRC,
- 				 &nexthop->src.ipv4, bytelen);
- 
-+		      if (rib->type == ZEBRA_ROUTE_OLSR)
-+			req.r.rtm_scope = RT_SCOPE_LINK;
-+
- 		      if (IS_ZEBRA_DEBUG_KERNEL)
- 			zlog_debug("netlink_route_multipath() (single hop): "
- 				   "nexthop via if %u", nexthop->ifindex);
---- a/zebra/zebra_rib.c
-+++ b/zebra/zebra_rib.c
-@@ -68,6 +68,9 @@ static const struct
-   [ZEBRA_ROUTE_OSPF6]   = {ZEBRA_ROUTE_OSPF6,   110},
-   [ZEBRA_ROUTE_ISIS]    = {ZEBRA_ROUTE_ISIS,    115},
-   [ZEBRA_ROUTE_BGP]     = {ZEBRA_ROUTE_BGP,      20  /* IBGP is 200. */},
-+  [ZEBRA_ROUTE_HSLS]    = {ZEBRA_ROUTE_HSLS,      0},
-+  [ZEBRA_ROUTE_OLSR]    = {ZEBRA_ROUTE_OLSR,      0},
-+  [ZEBRA_ROUTE_BATMAN]  = {ZEBRA_ROUTE_BATMAN,    0},
-   [ZEBRA_ROUTE_BABEL]   = {ZEBRA_ROUTE_BABEL,    95},
-   /* no entry/default: 150 */
- };
-@@ -456,6 +459,18 @@ nexthop_active_ipv4 (struct rib *rib, st
- 		  }
- 	      return 0;
- 	    }
-+	  else if (match->type == ZEBRA_ROUTE_OLSR)
-+	    {
-+	      for (newhop = match->nexthop; newhop; newhop = newhop->next)
-+		if (CHECK_FLAG (newhop->flags, NEXTHOP_FLAG_FIB)
-+		    && newhop->type == NEXTHOP_TYPE_IFINDEX)
-+		  {
-+		    if (nexthop->type == NEXTHOP_TYPE_IPV4)
-+		      nexthop->ifindex = newhop->ifindex;
-+		    return 1;
-+		  }
-+	      return 0;
-+	    }
- 	  else
- 	    {
- 	      return 0;
-@@ -560,6 +575,18 @@ nexthop_active_ipv6 (struct rib *rib, st
- 		  }
- 	      return 0;
- 	    }
-+	  else if (match->type == ZEBRA_ROUTE_OLSR)
-+	    {
-+	      for (newhop = match->nexthop; newhop; newhop = newhop->next)
-+		if (CHECK_FLAG (newhop->flags, NEXTHOP_FLAG_FIB)
-+		    && newhop->type == NEXTHOP_TYPE_IFINDEX)
-+		  {
-+		    if (nexthop->type == NEXTHOP_TYPE_IPV6)
-+		      nexthop->ifindex = newhop->ifindex;
-+		    return 1;
-+		  }
-+	      return 0;
-+	    }
- 	  else
- 	    {
- 	      return 0;
-@@ -1376,6 +1403,8 @@ static const u_char meta_queue_map[ZEBRA
-   [ZEBRA_ROUTE_ISIS]    = 2,
-   [ZEBRA_ROUTE_BGP]     = 3,
-   [ZEBRA_ROUTE_HSLS]    = 4,
-+  [ZEBRA_ROUTE_OLSR]    = 4,
-+  [ZEBRA_ROUTE_BATMAN]  = 4,
-   [ZEBRA_ROUTE_BABEL]   = 2,
- };
- 
---- a/zebra/zebra_snmp.c
-+++ b/zebra/zebra_snmp.c
-@@ -245,6 +245,12 @@ proto_trans(int type)
-       return 1; /* shouldn't happen */
-     case ZEBRA_ROUTE_BGP:
-       return 14; /* bgp */
-+    case ZEBRA_ROUTE_HSLS:
-+      return 1; /* other */
-+    case ZEBRA_ROUTE_OLSR:
-+      return 1; /* other */
-+    case ZEBRA_ROUTE_BATMAN:
-+      return 1; /* other */
-     default:
-       return 1; /* other */
-     }
---- a/zebra/zebra_vty.c
-+++ b/zebra/zebra_vty.c
-@@ -558,7 +558,10 @@ vty_show_ip_route_detail (struct vty *vt
- 	  || rib->type == ZEBRA_ROUTE_OSPF
- 	  || rib->type == ZEBRA_ROUTE_BABEL
- 	  || rib->type == ZEBRA_ROUTE_ISIS
--	  || rib->type == ZEBRA_ROUTE_BGP)
-+	  || rib->type == ZEBRA_ROUTE_BGP
-+	  || rib->type == ZEBRA_ROUTE_HSLS
-+	  || rib->type == ZEBRA_ROUTE_OLSR
-+	  || rib->type == ZEBRA_ROUTE_BATMAN)
- 	{
- 	  time_t uptime;
- 	  struct tm *tm;
-@@ -784,7 +787,10 @@ vty_show_ip_route (struct vty *vty, stru
- 	  || rib->type == ZEBRA_ROUTE_OSPF
- 	  || rib->type == ZEBRA_ROUTE_BABEL
- 	  || rib->type == ZEBRA_ROUTE_ISIS
--	  || rib->type == ZEBRA_ROUTE_BGP)
-+	  || rib->type == ZEBRA_ROUTE_BGP
-+	  || rib->type == ZEBRA_ROUTE_HSLS
-+	  || rib->type == ZEBRA_ROUTE_OLSR
-+	  || rib->type == ZEBRA_ROUTE_BATMAN)
- 	{
- 	  time_t uptime;
- 	  struct tm *tm;
-@@ -1577,7 +1583,10 @@ vty_show_ipv6_route_detail (struct vty *
- 	  || rib->type == ZEBRA_ROUTE_OSPF6
- 	  || rib->type == ZEBRA_ROUTE_BABEL
- 	  || rib->type == ZEBRA_ROUTE_ISIS
--	  || rib->type == ZEBRA_ROUTE_BGP)
-+	  || rib->type == ZEBRA_ROUTE_BGP
-+	  || rib->type == ZEBRA_ROUTE_HSLS
-+	  || rib->type == ZEBRA_ROUTE_OLSR
-+	  || rib->type == ZEBRA_ROUTE_BATMAN)
- 	{
- 	  time_t uptime;
- 	  struct tm *tm;
-@@ -1757,7 +1766,10 @@ vty_show_ipv6_route (struct vty *vty, st
- 	  || rib->type == ZEBRA_ROUTE_OSPF6
- 	  || rib->type == ZEBRA_ROUTE_BABEL
- 	  || rib->type == ZEBRA_ROUTE_ISIS
--	  || rib->type == ZEBRA_ROUTE_BGP)
-+	  || rib->type == ZEBRA_ROUTE_BGP
-+	  || rib->type == ZEBRA_ROUTE_HSLS
-+	  || rib->type == ZEBRA_ROUTE_OLSR
-+	  || rib->type == ZEBRA_ROUTE_BATMAN)
- 	{
- 	  time_t uptime;
- 	  struct tm *tm;
diff --git a/quagga/patches/140-holdtimer-set.patch b/quagga/patches/140-holdtimer-set.patch
index b699775..6d1c1ea 100644
--- a/quagga/patches/140-holdtimer-set.patch
+++ b/quagga/patches/140-holdtimer-set.patch
@@ -1,6 +1,6 @@
 --- a/bgpd/bgp_network.c
 +++ b/bgpd/bgp_network.c
-@@ -193,8 +193,7 @@ bgp_accept (struct thread *thread)
+@@ -257,8 +257,7 @@ bgp_accept (struct thread *thread)
      peer->fd = bgp_sock;
      peer->status = Active;
      peer->local_id = peer1->local_id;
@@ -12,11 +12,11 @@
      sockunion2str (&su, buf, SU_ADDRSTRLEN);
 --- a/bgpd/bgpd.h
 +++ b/bgpd/bgpd.h
-@@ -732,6 +732,7 @@ struct bgp_nlri
+@@ -752,6 +752,7 @@ struct bgp_nlri
+ 
  /* BGP timers default value.  */
- #define BGP_INIT_START_TIMER                     5
- #define BGP_ERROR_START_TIMER                   30
+ #define BGP_INIT_START_TIMER                     1
 +#define BGP_LARGE_HOLDTIME                     240
  #define BGP_DEFAULT_HOLDTIME                   180
  #define BGP_DEFAULT_KEEPALIVE                   60 
- #define BGP_DEFAULT_ASORIGINATE                 15
+ #define BGP_DEFAULT_EBGP_ROUTEADV               30
diff --git a/quagga/patches/150-no-cross-fs-link.patch b/quagga/patches/150-no-cross-fs-link.patch
index 32c1208..8445103 100644
--- a/quagga/patches/150-no-cross-fs-link.patch
+++ b/quagga/patches/150-no-cross-fs-link.patch
@@ -1,6 +1,6 @@
 --- a/lib/command.c
 +++ b/lib/command.c
-@@ -2527,6 +2527,13 @@ DEFUN (config_write_file,
+@@ -3198,6 +3198,13 @@ DEFUN (config_write_file,
  		 VTY_NEWLINE);
          goto finished;
        }
@@ -14,7 +14,7 @@
    if (link (config_file, config_file_sav) != 0)
      {
        vty_out (vty, "Can't backup old configuration file %s.%s", config_file_sav,
-@@ -2540,7 +2547,23 @@ DEFUN (config_write_file,
+@@ -3211,7 +3218,23 @@ DEFUN (config_write_file,
  	        VTY_NEWLINE);
        goto finished;
      }
diff --git a/quagga/patches/170-use-supported-pagers.patch b/quagga/patches/170-use-supported-pagers.patch
index 15595a7..ad4c4db 100644
--- a/quagga/patches/170-use-supported-pagers.patch
+++ b/quagga/patches/170-use-supported-pagers.patch
@@ -1,6 +1,6 @@
 --- a/vtysh/vtysh.c
 +++ b/vtysh/vtysh.c
-@@ -268,7 +268,7 @@ vtysh_pager_init (void)
+@@ -251,7 +251,7 @@ vtysh_pager_init (void)
    if (pager_defined)
      vtysh_pager_name = strdup (pager_defined);
    else
@@ -9,7 +9,7 @@
  }
  
  /* Command execution over the vty interface. */
-@@ -1884,7 +1884,7 @@ DEFUN (vtysh_terminal_length,
+@@ -2047,7 +2047,7 @@ DEFUN (vtysh_terminal_length,
  {
    int lines;
    char *endptr = NULL;
@@ -18,7 +18,7 @@
  
    lines = strtol (argv[0], &endptr, 10);
    if (lines < 0 || lines > 512 || *endptr != '\0')
-@@ -1901,7 +1901,7 @@ DEFUN (vtysh_terminal_length,
+@@ -2064,7 +2064,7 @@ DEFUN (vtysh_terminal_length,
  
    if (lines != 0)
      {

From 893890ae2b0e04b68362e1b3976bc1c263d2115a Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Tue, 1 Nov 2016 02:13:49 +0100
Subject: [PATCH 296/368] nodogsplash: wait for interface to appear

---
 nodogsplash/Makefile               |  2 +-
 nodogsplash/files/nodogsplash.init | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/nodogsplash/Makefile b/nodogsplash/Makefile
index 2b8efd2..971fbac 100644
--- a/nodogsplash/Makefile
+++ b/nodogsplash/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=nodogsplash
 PKG_FIXUP:=autoreconf
 PKG_VERSION:=1.0.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/nodogsplash/files/nodogsplash.init b/nodogsplash/files/nodogsplash.init
index f3df6a1..85bcfcc 100755
--- a/nodogsplash/files/nodogsplash.init
+++ b/nodogsplash/files/nodogsplash.init
@@ -119,6 +119,22 @@ setup_firewall() {
   done
 }
 
+wait_for_interface()
+{
+  local ifname="$1"
+  local timeout=10
+  for i in $(seq $timeout); do
+    if [ $(ip -4 addr show dev $ifname 2> /dev/null | grep -c inet) -ne 0 ]; then
+      break
+    fi
+    sleep 1
+    if [ $i == $timeout ] ; then
+      nolog error "$ifname not detected, NoDogSplash not starting."
+      exit 1
+    fi
+  done
+}
+
 generate_uci_config() {
   local cfg="$1"
   local val
@@ -161,6 +177,8 @@ generate_uci_config() {
       return 1
   fi
 
+  wait_for_interface "$ifname"
+
   echo "GatewayInterface $ifname" >> $CONFIGFILE
 
   append_config_option "$CONFIGFILE" "$cfg" gatewayname

From 8387f7c9d4f0a3b931374badbf305c6d6341acb5 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Wed, 30 Nov 2016 09:47:47 +0100
Subject: [PATCH 297/368] batman-adv: add patches from 2016.4-maint 2016-12-02

 * batman-adv: Install module in $INSTALL_MOD_DIR/updates/net/batman-adv
 * batman-adv: Revert "fix splat on disabling an interface"
 * batman-adv: Detect missing primaryif during tp_send as error
 * batman-adv: Check for alloc errors when preparing TT local data

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batman-adv/Makefile                           |  2 +-
 ...ll-module-in-INSTALL_MOD_DIR-updates.patch | 71 +++++++++++++++++++
 ...t-fix-splat-on-disabling-an-interfac.patch | 32 +++++++++
 ...t-missing-primaryif-during-tp_send-a.patch | 28 ++++++++
 ...-for-alloc-errors-when-preparing-TT-.patch | 39 ++++++++++
 5 files changed, 171 insertions(+), 1 deletion(-)
 create mode 100644 batman-adv/patches/0001-batman-adv-Install-module-in-INSTALL_MOD_DIR-updates.patch
 create mode 100644 batman-adv/patches/0002-batman-adv-Revert-fix-splat-on-disabling-an-interfac.patch
 create mode 100644 batman-adv/patches/0003-batman-adv-Detect-missing-primaryif-during-tp_send-a.patch
 create mode 100644 batman-adv/patches/0004-batman-adv-Check-for-alloc-errors-when-preparing-TT-.patch

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 23b2f74..55f41fb 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=batman-adv
 
 PKG_VERSION:=2016.4
-PKG_RELEASE:=0
+PKG_RELEASE:=1
 PKG_MD5SUM:=1ed28d02ad86050d1518023e354737b6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/batman-adv/patches/0001-batman-adv-Install-module-in-INSTALL_MOD_DIR-updates.patch b/batman-adv/patches/0001-batman-adv-Install-module-in-INSTALL_MOD_DIR-updates.patch
new file mode 100644
index 0000000..e5072e2
--- /dev/null
+++ b/batman-adv/patches/0001-batman-adv-Install-module-in-INSTALL_MOD_DIR-updates.patch
@@ -0,0 +1,71 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Mon, 31 Oct 2016 08:27:19 +0100
+Subject: [PATCH] batman-adv: Install module in $INSTALL_MOD_DIR/updates/net/batman-adv
+
+depmod may skip the batman-adv.ko module in the $INSTALL_MOD_DIR/update/
+folder when it contains the word "build" as directory name.
+
+Avoid this extra directory "build" in the installation path by making the
+obj-y dir relative to build/ in the source directory.
+
+Reported-by: Jean-Jacques Sarton <jj.sarton@t-online.de>
+Fixes: 66ac14a09445 ("batman-adv: Introduce compat-patches support")
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+Tested-by: Martin Weinelt <martin@darmstadt.freifunk.net>
+---
+ Makefile | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7ef2569..b852a17 100644
+--- a/Makefile
++++ b/Makefile
+@@ -46,6 +46,7 @@ MKDIR := mkdir -p
+ PATCH_FLAGS = --batch --fuzz=0 --forward --strip=1 --unified --version-control=never -g0 --remove-empty-files --no-backup-if-mismatch --reject-file=-
+ PATCH := patch $(PATCH_FLAGS) -i
+ CP := cp -fpR
++LN := ln -sf
+ 
+ SOURCE = $(wildcard net/batman-adv/*.[ch]) net/batman-adv/Makefile
+ SOURCE_BUILD = $(wildcard $(BUILD_DIR)/net/batman-adv/*.[ch]) $(BUILD_DIR)/net/batman-adv/Makefile
+@@ -55,25 +56,25 @@ REVISION= $(shell	if [ -d "$(PWD)/.git" ]; then \
+ 				echo $$(git --git-dir="$(PWD)/.git" describe --always --dirty --match "v*" |sed 's/^v//' 2> /dev/null || echo "[unknown]"); \
+ 			fi)
+ NOSTDINC_FLAGS += \
+-	-I$(PWD)/compat-include/ \
+-	-I$(PWD)/include/ \
+-	-include $(PWD)/compat.h \
++	-I$(PWD)/../compat-include/ \
++	-I$(PWD)/../include/ \
++	-include $(PWD)/../compat.h \
+ 	$(CFLAGS)
+ 
+ ifneq ($(REVISION),)
+ NOSTDINC_FLAGS += -DBATADV_SOURCE_VERSION=\"$(REVISION)\"
+ endif
+ 
+-include $(PWD)/compat-sources/Makefile
++-include $(PWD)/../compat-sources/Makefile
+ 
+-obj-y += build/net/batman-adv/
++obj-y += net/batman-adv/
+ 
+ export batman-adv-y
+ 
+ 
+ BUILD_FLAGS := \
+-	M=$(PWD) \
+-	PWD=$(PWD) \
++	M=$(BUILD_DIR) \
++	PWD=$(BUILD_DIR) \
+ 	REVISION=$(REVISION) \
+ 	CONFIG_BATMAN_ADV=m \
+ 	CONFIG_BATMAN_ADV_DEBUG=$(CONFIG_BATMAN_ADV_DEBUG) \
+@@ -101,6 +102,7 @@ config:
+ 
+ $(SOURCE_STAMP): $(SOURCE) compat-patches/* compat-patches/replacements.sh
+ 	$(MKDIR) $(BUILD_DIR)/net/batman-adv/
++	@$(LN) ../Makefile $(BUILD_DIR)/Makefile
+ 	@$(RM) $(SOURCE_BUILD)
+ 	@$(CP) $(SOURCE) $(BUILD_DIR)/net/batman-adv/
+ 	@set -e; \
diff --git a/batman-adv/patches/0002-batman-adv-Revert-fix-splat-on-disabling-an-interfac.patch b/batman-adv/patches/0002-batman-adv-Revert-fix-splat-on-disabling-an-interfac.patch
new file mode 100644
index 0000000..46d2779
--- /dev/null
+++ b/batman-adv/patches/0002-batman-adv-Revert-fix-splat-on-disabling-an-interfac.patch
@@ -0,0 +1,32 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Wed, 2 Nov 2016 18:14:43 +0100
+Subject: [PATCH] batman-adv: Revert "fix splat on disabling an interface"
+
+The commit bac7733d06fa ("batman-adv: fix splat on disabling an interface")
+fixed a warning but at the same time broke the rtnl function add_slave for
+devices which were temporarily removed.
+
+batadv_softif_slave_add requires soft_iface of and hard_iface to be NULL
+before it is allowed to be enslaved. But this resetting of soft_iface to
+NULL in batadv_hardif_disable_interface was removed with the aforementioned
+commit.
+
+Reported-by: Julian Labus <julian@freifunk-rtk.de>
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+Acked-by: Linus Lüssing <linus.luessing@c0d3.blue>
+---
+ net/batman-adv/hard-interface.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
+index e034afb..08ce361 100644
+--- a/net/batman-adv/hard-interface.c
++++ b/net/batman-adv/hard-interface.c
+@@ -652,6 +652,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,
+ 			batadv_softif_destroy_sysfs(hard_iface->soft_iface);
+ 	}
+ 
++	hard_iface->soft_iface = NULL;
+ 	batadv_hardif_put(hard_iface);
+ 
+ out:
diff --git a/batman-adv/patches/0003-batman-adv-Detect-missing-primaryif-during-tp_send-a.patch b/batman-adv/patches/0003-batman-adv-Detect-missing-primaryif-during-tp_send-a.patch
new file mode 100644
index 0000000..37c676d
--- /dev/null
+++ b/batman-adv/patches/0003-batman-adv-Detect-missing-primaryif-during-tp_send-a.patch
@@ -0,0 +1,28 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Sat, 29 Oct 2016 09:18:43 +0200
+Subject: [PATCH] batman-adv: Detect missing primaryif during tp_send as error
+
+The throughput meter detects different situations as problems for the
+current test. It stops the test after these and reports it to userspace.
+This also has to be done when the primary interface disappeared during the
+test.
+
+Fixes: 98d7a766b645 ("batman-adv: throughput meter implementation")
+Reported-by: Joe Perches <joe@perches.com>
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+---
+ net/batman-adv/tp_meter.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c
+index 2333777..8af1611 100644
+--- a/net/batman-adv/tp_meter.c
++++ b/net/batman-adv/tp_meter.c
+@@ -837,6 +837,7 @@ static int batadv_tp_send(void *arg)
+ 	primary_if = batadv_primary_if_get_selected(bat_priv);
+ 	if (unlikely(!primary_if)) {
+ 		err = BATADV_TP_REASON_DST_UNREACHABLE;
++		tp_vars->reason = err;
+ 		goto out;
+ 	}
+ 
diff --git a/batman-adv/patches/0004-batman-adv-Check-for-alloc-errors-when-preparing-TT-.patch b/batman-adv/patches/0004-batman-adv-Check-for-alloc-errors-when-preparing-TT-.patch
new file mode 100644
index 0000000..bf6478c
--- /dev/null
+++ b/batman-adv/patches/0004-batman-adv-Check-for-alloc-errors-when-preparing-TT-.patch
@@ -0,0 +1,39 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Wed, 30 Nov 2016 21:47:09 +0100
+Subject: [PATCH] batman-adv: Check for alloc errors when preparing TT local data
+
+batadv_tt_prepare_tvlv_local_data can fail to allocate the memory for the
+new TVLV block. The caller is informed about this problem with the returned
+length of 0. Not checking this value results in an invalid memory access
+when either tt_data or tt_change is accessed.
+
+Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
+Fixes: 21a57f6e7a3b ("batman-adv: make the TT CRC logic VLAN specific")
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
+---
+ net/batman-adv/translation-table.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
+index 7f66309..0dc85eb 100644
+--- a/net/batman-adv/translation-table.c
++++ b/net/batman-adv/translation-table.c
+@@ -3282,7 +3282,7 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv,
+ 							     &tvlv_tt_data,
+ 							     &tt_change,
+ 							     &tt_len);
+-		if (!tt_len)
++		if (!tt_len || !tvlv_len)
+ 			goto unlock;
+ 
+ 		/* Copy the last orig_node's OGM buffer */
+@@ -3300,7 +3300,7 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv,
+ 							     &tvlv_tt_data,
+ 							     &tt_change,
+ 							     &tt_len);
+-		if (!tt_len)
++		if (!tt_len || !tvlv_len)
+ 			goto out;
+ 
+ 		/* fill the rest of the tvlv with the real TT entries */

From 3e7f211fee6e0db21c93f33bd7478d8ad3ba66af Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Wed, 30 Nov 2016 11:54:46 +0100
Subject: [PATCH 298/368] batman-adv: Add get_link_net compat code for Linux <
 4.0.0

LEDE is still using Linux 3.18 on some systems. Allow to build batman-adv
for it by not checking the netns of a possible netdev link during the
batadv-on-batadv check.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 ...mpat-fallback-for-batadv_getlink_net.patch | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 batman-adv/patches/0005-Add-compat-fallback-for-batadv_getlink_net.patch

diff --git a/batman-adv/patches/0005-Add-compat-fallback-for-batadv_getlink_net.patch b/batman-adv/patches/0005-Add-compat-fallback-for-batadv_getlink_net.patch
new file mode 100644
index 0000000..23592e8
--- /dev/null
+++ b/batman-adv/patches/0005-Add-compat-fallback-for-batadv_getlink_net.patch
@@ -0,0 +1,29 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Fri, 23 Sep 2016 14:55:38 +0200
+Subject: [PATCH] Add compat fallback for batadv_getlink_net
+---
+ net/batman-adv/hard-interface.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
+index 08ce361..e6ea2f9 100644
+--- a/net/batman-adv/hard-interface.c
++++ b/net/batman-adv/hard-interface.c
+@@ -95,6 +95,9 @@ out:
+ static const struct net *batadv_getlink_net(const struct net_device *netdev,
+ 					    const struct net *fallback_net)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)
++	return fallback_net;
++#else
+ 	if (!netdev->rtnl_link_ops)
+ 		return fallback_net;
+ 
+@@ -102,6 +105,7 @@ static const struct net *batadv_getlink_net(const struct net_device *netdev,
+ 		return fallback_net;
+ 
+ 	return netdev->rtnl_link_ops->get_link_net(netdev);
++#endif
+ }
+ 
+ /**

From 803575c023057ee08eefd0799f25a675f5a01b7c Mon Sep 17 00:00:00 2001
From: FreifunkUFO <ufo@rund.freifunk.net>
Date: Wed, 7 Dec 2016 14:29:04 +0100
Subject: [PATCH 299/368] olsrd: add netjson plugin

netjson plugin added
---
 olsrd/Makefile | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/olsrd/Makefile b/olsrd/Makefile
index e6f85f7..15832a2 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
-PKG_VERSION:=0.9.0.3
+PKG_VERSION:=0.9.5
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/OLSR/olsrd.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=v0.9.0.3
+PKG_SOURCE_VERSION:=v0.9.5
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_MD5SUM:=
 
@@ -87,6 +87,12 @@ define Package/olsrd-mod-jsoninfo
   TITLE:=Small informative plugin with JSON output
 endef
 
+define Package/olsrd-mod-netjson
+  $(call Package/olsrd/template)
+  DEPENDS:=olsrd
+  TITLE:=netjson plugin with JSON output
+endef
+
 define Package/olsrd-mod-mdns
   $(call Package/olsrd/template)
   DEPENDS:=olsrd
@@ -166,7 +172,7 @@ MAKE_FLAGS+= \
 	DESTDIR="$(PKG_INSTALL_DIR)" \
 	STRIP="true" \
 	INSTALL_LIB="true" \
-	SUBDIRS="arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo mdns nameservice p2pd pgraph pud quagga secure sgwdynspeed txtinfo watchdog"
+	SUBDIRS="arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo netjson mdns nameservice p2pd pgraph pud quagga secure sgwdynspeed txtinfo watchdog"
 
 define Build/Compile
 	$(call Build/Compile/Default,all)
@@ -223,6 +229,11 @@ define Package/olsrd-mod-jsoninfo/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/jsoninfo/olsrd_jsoninfo.so.* $(1)/usr/lib/
 endef
 
+define Package/olsrd-mod-netjson/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/netjson/olsrd_netjson.so.* $(1)/usr/lib/
+endef
+
 define Package/olsrd-mod-mdns/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/mdns/olsrd_mdns.so.* $(1)/usr/lib/
@@ -289,6 +300,7 @@ $(eval $(call BuildPackage,olsrd-mod-dyn-gw))
 $(eval $(call BuildPackage,olsrd-mod-dyn-gw-plain))
 $(eval $(call BuildPackage,olsrd-mod-httpinfo))
 $(eval $(call BuildPackage,olsrd-mod-jsoninfo))
+$(eval $(call BuildPackage,olsrd-mod-netjson))
 $(eval $(call BuildPackage,olsrd-mod-mdns))
 $(eval $(call BuildPackage,olsrd-mod-nameservice))
 $(eval $(call BuildPackage,olsrd-mod-p2pd))

From a80e8687720e430fd8f816e26eff4e07e6e244cf Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Sun, 11 Dec 2016 15:04:33 +0100
Subject: [PATCH 300/368] batman-adv: upgrade package to latest release 2016.5

 * support latest kernels (3.2 - 4.10)
 * change installation path back to $INSTALL_MOD_DIR/updates/net/batman-adv
 * add simple (re)broadcast avoidance
 * reduce multicast TT and TVLV update delays under B.A.T.M.A.N. V
 * support B.A.T.M.A.N. V throughput detection when using VLANs on top of WiFi
 * improve documentation of sysfs and debugfs files
 * coding style cleanups and refactoring
 * bugs squashed:
   - detect missing primaryif during tp_send as error
   - fix re-adding of previously removed interfaces via rtnetlink
   - fix rare race conditions on interface removal
   - handle allocation error when generating TT responses

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batman-adv/Makefile                           |  6 +-
 batman-adv/files/compat-hacks.h               | 17 +++++
 ...pat-fallback-for-batadv_getlink_net.patch} |  8 +--
 ...ll-module-in-INSTALL_MOD_DIR-updates.patch | 71 -------------------
 ...t-fix-splat-on-disabling-an-interfac.patch | 32 ---------
 ...t-missing-primaryif-during-tp_send-a.patch | 28 --------
 ...-for-alloc-errors-when-preparing-TT-.patch | 39 ----------
 7 files changed, 24 insertions(+), 177 deletions(-)
 rename batman-adv/patches/{0005-Add-compat-fallback-for-batadv_getlink_net.patch => 0001-Add-compat-fallback-for-batadv_getlink_net.patch} (71%)
 delete mode 100644 batman-adv/patches/0001-batman-adv-Install-module-in-INSTALL_MOD_DIR-updates.patch
 delete mode 100644 batman-adv/patches/0002-batman-adv-Revert-fix-splat-on-disabling-an-interfac.patch
 delete mode 100644 batman-adv/patches/0003-batman-adv-Detect-missing-primaryif-during-tp_send-a.patch
 delete mode 100644 batman-adv/patches/0004-batman-adv-Check-for-alloc-errors-when-preparing-TT-.patch

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 55f41fb..df64571 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
 
-PKG_VERSION:=2016.4
-PKG_RELEASE:=1
-PKG_MD5SUM:=1ed28d02ad86050d1518023e354737b6
+PKG_VERSION:=2016.5
+PKG_RELEASE:=0
+PKG_MD5SUM:=6717a933a08dd2a01b00df30cb9f16a8
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
diff --git a/batman-adv/files/compat-hacks.h b/batman-adv/files/compat-hacks.h
index 32903b5..af91f41 100644
--- a/batman-adv/files/compat-hacks.h
+++ b/batman-adv/files/compat-hacks.h
@@ -49,6 +49,11 @@ int ipv6_mc_check_mld(struct sk_buff *skb, struct sk_buff **skb_trimmed);
 
 #define IFF_NO_QUEUE	0; dev->tx_queue_len = 0
 
+static inline bool hlist_fake(struct hlist_node *h)
+{
+	return h->pprev == &h->next;
+}
+
 #endif /* < KERNEL_VERSION(4, 3, 0) */
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
@@ -187,3 +192,15 @@ static inline int batadv_nla_put_u64_64bit(struct sk_buff *skb, int attrtype,
 
 #endif /* < KERNEL_VERSION(4, 7, 0) */
 
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+
+#include_next <linux/cache.h>
+
+/* hack for netlink.c which marked the family ops as ro */
+#ifdef __ro_after_init
+#undef __ro_after_init
+#endif
+#define __ro_after_init
+
+#endif /* < KERNEL_VERSION(4, 10, 0) */
diff --git a/batman-adv/patches/0005-Add-compat-fallback-for-batadv_getlink_net.patch b/batman-adv/patches/0001-Add-compat-fallback-for-batadv_getlink_net.patch
similarity index 71%
rename from batman-adv/patches/0005-Add-compat-fallback-for-batadv_getlink_net.patch
rename to batman-adv/patches/0001-Add-compat-fallback-for-batadv_getlink_net.patch
index 23592e8..c641828 100644
--- a/batman-adv/patches/0005-Add-compat-fallback-for-batadv_getlink_net.patch
+++ b/batman-adv/patches/0001-Add-compat-fallback-for-batadv_getlink_net.patch
@@ -6,12 +6,12 @@ Subject: [PATCH] Add compat fallback for batadv_getlink_net
  1 file changed, 4 insertions(+)
 
 diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
-index 08ce361..e6ea2f9 100644
+index 61a431a9..6969f580 100644
 --- a/net/batman-adv/hard-interface.c
 +++ b/net/batman-adv/hard-interface.c
 @@ -95,6 +95,9 @@ out:
- static const struct net *batadv_getlink_net(const struct net_device *netdev,
- 					    const struct net *fallback_net)
+ static struct net *batadv_getlink_net(const struct net_device *netdev,
+ 				      struct net *fallback_net)
  {
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)
 +	return fallback_net;
@@ -19,7 +19,7 @@ index 08ce361..e6ea2f9 100644
  	if (!netdev->rtnl_link_ops)
  		return fallback_net;
  
-@@ -102,6 +105,7 @@ static const struct net *batadv_getlink_net(const struct net_device *netdev,
+@@ -102,6 +105,7 @@ static struct net *batadv_getlink_net(const struct net_device *netdev,
  		return fallback_net;
  
  	return netdev->rtnl_link_ops->get_link_net(netdev);
diff --git a/batman-adv/patches/0001-batman-adv-Install-module-in-INSTALL_MOD_DIR-updates.patch b/batman-adv/patches/0001-batman-adv-Install-module-in-INSTALL_MOD_DIR-updates.patch
deleted file mode 100644
index e5072e2..0000000
--- a/batman-adv/patches/0001-batman-adv-Install-module-in-INSTALL_MOD_DIR-updates.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Mon, 31 Oct 2016 08:27:19 +0100
-Subject: [PATCH] batman-adv: Install module in $INSTALL_MOD_DIR/updates/net/batman-adv
-
-depmod may skip the batman-adv.ko module in the $INSTALL_MOD_DIR/update/
-folder when it contains the word "build" as directory name.
-
-Avoid this extra directory "build" in the installation path by making the
-obj-y dir relative to build/ in the source directory.
-
-Reported-by: Jean-Jacques Sarton <jj.sarton@t-online.de>
-Fixes: 66ac14a09445 ("batman-adv: Introduce compat-patches support")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Tested-by: Martin Weinelt <martin@darmstadt.freifunk.net>
----
- Makefile | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 7ef2569..b852a17 100644
---- a/Makefile
-+++ b/Makefile
-@@ -46,6 +46,7 @@ MKDIR := mkdir -p
- PATCH_FLAGS = --batch --fuzz=0 --forward --strip=1 --unified --version-control=never -g0 --remove-empty-files --no-backup-if-mismatch --reject-file=-
- PATCH := patch $(PATCH_FLAGS) -i
- CP := cp -fpR
-+LN := ln -sf
- 
- SOURCE = $(wildcard net/batman-adv/*.[ch]) net/batman-adv/Makefile
- SOURCE_BUILD = $(wildcard $(BUILD_DIR)/net/batman-adv/*.[ch]) $(BUILD_DIR)/net/batman-adv/Makefile
-@@ -55,25 +56,25 @@ REVISION= $(shell	if [ -d "$(PWD)/.git" ]; then \
- 				echo $$(git --git-dir="$(PWD)/.git" describe --always --dirty --match "v*" |sed 's/^v//' 2> /dev/null || echo "[unknown]"); \
- 			fi)
- NOSTDINC_FLAGS += \
--	-I$(PWD)/compat-include/ \
--	-I$(PWD)/include/ \
--	-include $(PWD)/compat.h \
-+	-I$(PWD)/../compat-include/ \
-+	-I$(PWD)/../include/ \
-+	-include $(PWD)/../compat.h \
- 	$(CFLAGS)
- 
- ifneq ($(REVISION),)
- NOSTDINC_FLAGS += -DBATADV_SOURCE_VERSION=\"$(REVISION)\"
- endif
- 
--include $(PWD)/compat-sources/Makefile
-+-include $(PWD)/../compat-sources/Makefile
- 
--obj-y += build/net/batman-adv/
-+obj-y += net/batman-adv/
- 
- export batman-adv-y
- 
- 
- BUILD_FLAGS := \
--	M=$(PWD) \
--	PWD=$(PWD) \
-+	M=$(BUILD_DIR) \
-+	PWD=$(BUILD_DIR) \
- 	REVISION=$(REVISION) \
- 	CONFIG_BATMAN_ADV=m \
- 	CONFIG_BATMAN_ADV_DEBUG=$(CONFIG_BATMAN_ADV_DEBUG) \
-@@ -101,6 +102,7 @@ config:
- 
- $(SOURCE_STAMP): $(SOURCE) compat-patches/* compat-patches/replacements.sh
- 	$(MKDIR) $(BUILD_DIR)/net/batman-adv/
-+	@$(LN) ../Makefile $(BUILD_DIR)/Makefile
- 	@$(RM) $(SOURCE_BUILD)
- 	@$(CP) $(SOURCE) $(BUILD_DIR)/net/batman-adv/
- 	@set -e; \
diff --git a/batman-adv/patches/0002-batman-adv-Revert-fix-splat-on-disabling-an-interfac.patch b/batman-adv/patches/0002-batman-adv-Revert-fix-splat-on-disabling-an-interfac.patch
deleted file mode 100644
index 46d2779..0000000
--- a/batman-adv/patches/0002-batman-adv-Revert-fix-splat-on-disabling-an-interfac.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Wed, 2 Nov 2016 18:14:43 +0100
-Subject: [PATCH] batman-adv: Revert "fix splat on disabling an interface"
-
-The commit bac7733d06fa ("batman-adv: fix splat on disabling an interface")
-fixed a warning but at the same time broke the rtnl function add_slave for
-devices which were temporarily removed.
-
-batadv_softif_slave_add requires soft_iface of and hard_iface to be NULL
-before it is allowed to be enslaved. But this resetting of soft_iface to
-NULL in batadv_hardif_disable_interface was removed with the aforementioned
-commit.
-
-Reported-by: Julian Labus <julian@freifunk-rtk.de>
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Acked-by: Linus Lüssing <linus.luessing@c0d3.blue>
----
- net/batman-adv/hard-interface.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
-index e034afb..08ce361 100644
---- a/net/batman-adv/hard-interface.c
-+++ b/net/batman-adv/hard-interface.c
-@@ -652,6 +652,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,
- 			batadv_softif_destroy_sysfs(hard_iface->soft_iface);
- 	}
- 
-+	hard_iface->soft_iface = NULL;
- 	batadv_hardif_put(hard_iface);
- 
- out:
diff --git a/batman-adv/patches/0003-batman-adv-Detect-missing-primaryif-during-tp_send-a.patch b/batman-adv/patches/0003-batman-adv-Detect-missing-primaryif-during-tp_send-a.patch
deleted file mode 100644
index 37c676d..0000000
--- a/batman-adv/patches/0003-batman-adv-Detect-missing-primaryif-during-tp_send-a.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Sat, 29 Oct 2016 09:18:43 +0200
-Subject: [PATCH] batman-adv: Detect missing primaryif during tp_send as error
-
-The throughput meter detects different situations as problems for the
-current test. It stops the test after these and reports it to userspace.
-This also has to be done when the primary interface disappeared during the
-test.
-
-Fixes: 98d7a766b645 ("batman-adv: throughput meter implementation")
-Reported-by: Joe Perches <joe@perches.com>
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
----
- net/batman-adv/tp_meter.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c
-index 2333777..8af1611 100644
---- a/net/batman-adv/tp_meter.c
-+++ b/net/batman-adv/tp_meter.c
-@@ -837,6 +837,7 @@ static int batadv_tp_send(void *arg)
- 	primary_if = batadv_primary_if_get_selected(bat_priv);
- 	if (unlikely(!primary_if)) {
- 		err = BATADV_TP_REASON_DST_UNREACHABLE;
-+		tp_vars->reason = err;
- 		goto out;
- 	}
- 
diff --git a/batman-adv/patches/0004-batman-adv-Check-for-alloc-errors-when-preparing-TT-.patch b/batman-adv/patches/0004-batman-adv-Check-for-alloc-errors-when-preparing-TT-.patch
deleted file mode 100644
index bf6478c..0000000
--- a/batman-adv/patches/0004-batman-adv-Check-for-alloc-errors-when-preparing-TT-.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Wed, 30 Nov 2016 21:47:09 +0100
-Subject: [PATCH] batman-adv: Check for alloc errors when preparing TT local data
-
-batadv_tt_prepare_tvlv_local_data can fail to allocate the memory for the
-new TVLV block. The caller is informed about this problem with the returned
-length of 0. Not checking this value results in an invalid memory access
-when either tt_data or tt_change is accessed.
-
-Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
-Fixes: 21a57f6e7a3b ("batman-adv: make the TT CRC logic VLAN specific")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
----
- net/batman-adv/translation-table.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
-index 7f66309..0dc85eb 100644
---- a/net/batman-adv/translation-table.c
-+++ b/net/batman-adv/translation-table.c
-@@ -3282,7 +3282,7 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv,
- 							     &tvlv_tt_data,
- 							     &tt_change,
- 							     &tt_len);
--		if (!tt_len)
-+		if (!tt_len || !tvlv_len)
- 			goto unlock;
- 
- 		/* Copy the last orig_node's OGM buffer */
-@@ -3300,7 +3300,7 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv,
- 							     &tvlv_tt_data,
- 							     &tt_change,
- 							     &tt_len);
--		if (!tt_len)
-+		if (!tt_len || !tvlv_len)
- 			goto out;
- 
- 		/* fill the rest of the tvlv with the real TT entries */

From c425a4d8a6cc5fa29ab13d585e7115ded69387ed Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Sun, 11 Dec 2016 15:07:19 +0100
Subject: [PATCH 301/368] batctl: upgrade package to latest release 2016.5

 * reimplement traceroute/ping commands in userspace without debugfs
 * switch interface manipulation from (legacy) sysfs to rtnetlink
 * coding style cleanups

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batctl/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/batctl/Makefile b/batctl/Makefile
index 7ae81b5..bf305a2 100644
--- a/batctl/Makefile
+++ b/batctl/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batctl
 
-PKG_VERSION:=2016.4
+PKG_VERSION:=2016.5
 PKG_RELEASE:=0
-PKG_MD5SUM:=0112f35b2a48d32f23a17a6f45348e63
+PKG_MD5SUM:=7b33fb47c7fa5b317e9a152a286999fc
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
@@ -25,7 +25,7 @@ define Package/batctl
   URL:=https://www.open-mesh.org/
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+kmod-batman-adv +libnl-tiny +libc
+  DEPENDS:=+kmod-batman-adv +libnl-tiny +libc +librt
   TITLE:=B.A.T.M.A.N. Advanced user space configuration tool batctl
   MAINTAINER:=Marek Lindner <mareklindner@neomailbox.ch>
 endef

From e18c440d8b062603477e49a67ea9de31f749abce Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Sun, 11 Dec 2016 15:10:30 +0100
Subject: [PATCH 302/368] alfred: upgrade package to latest release 2016.5

 * support interface validity checks on systems without debugfs
 * remove debugfs check during batadv-vis startup
 * allow out-of-order txend packets during transmissions

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 alfred/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/alfred/Makefile b/alfred/Makefile
index 09f62d4..b5d37ce 100644
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -11,9 +11,9 @@ include $(TOPDIR)/rules.mk
 # The latest alfred git hash in PKG_REV can be obtained from https://git.open-mesh.org/alfred.git
 #
 PKG_NAME:=alfred
-PKG_VERSION:=2016.4
+PKG_VERSION:=2016.5
 PKG_RELEASE:=0
-PKG_MD5SUM:=172501ca734ac584fa13f10dcfa708da
+PKG_MD5SUM:=e03d422ed3b5a162b90e8af13389523f
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From 3b14a1c5b6aaf0422374a14998279d9047b0abf7 Mon Sep 17 00:00:00 2001
From: Bastian Bittorf <bittorf@bluebottle.com>
Date: Fri, 16 Dec 2016 17:14:09 +0100
Subject: [PATCH 303/368] olsrd: plugins: pud: fix missing dependency for
 libgps

Signed-off-by: Bastian Bittorf <bittorf@bluebottle.com>
---
 olsrd/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/olsrd/Makefile b/olsrd/Makefile
index 15832a2..cbc65f2 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -120,7 +120,7 @@ endef
 
 define Package/olsrd-mod-pud
   $(call Package/olsrd/template)
-  DEPENDS:=olsrd
+  DEPENDS:=olsrd +ncurses +libgps
   TITLE:=Position Update Distribution plugin
 endef
 

From dcecd7007d0557a52ad619e3ef9815417ae85349 Mon Sep 17 00:00:00 2001
From: Bastian Bittorf <bittorf@bluebottle.com>
Date: Sun, 18 Dec 2016 21:39:05 +0100
Subject: [PATCH 304/368] olsrd: disable parallel build and swap a dependency
 order, should fix buildbot

---
 olsrd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/olsrd/Makefile b/olsrd/Makefile
index cbc65f2..2e8d0a2 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -18,7 +18,7 @@ PKG_SOURCE_VERSION:=v0.9.5
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_MD5SUM:=
 
-PKG_BUILD_PARALLEL:=1
+PKG_BUILD_PARALLEL:=0
 PKG_LICENSE:=BSD-3-Clause
 
 include $(INCLUDE_DIR)/package.mk
@@ -120,7 +120,7 @@ endef
 
 define Package/olsrd-mod-pud
   $(call Package/olsrd/template)
-  DEPENDS:=olsrd +ncurses +libgps
+  DEPENDS:=olsrd +libgps +ncurses
   TITLE:=Position Update Distribution plugin
 endef
 

From f8010674554e27f4858d36cebc3ec4b87d31a51d Mon Sep 17 00:00:00 2001
From: Sven Roederer <devel-sven@geroedel.de>
Date: Thu, 22 Dec 2016 12:32:55 +0100
Subject: [PATCH 305/368] olsrd: disale compiler-warning "missing-include-dirs"

remove this warning as it fails to build for the nmealib with missing
"staging_dir/target-mipsel_24kc_musl-1.1.15/include" from buildenv
---
 olsrd/patches/missing-include-dirs-warning.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 olsrd/patches/missing-include-dirs-warning.patch

diff --git a/olsrd/patches/missing-include-dirs-warning.patch b/olsrd/patches/missing-include-dirs-warning.patch
new file mode 100644
index 0000000..2bf0895
--- /dev/null
+++ b/olsrd/patches/missing-include-dirs-warning.patch
@@ -0,0 +1,12 @@
+diff -ur olsrd-0.9.5_orig/lib/pud/nmealib/Makefile.inc olsrd-0.9.5/lib/pud/nmealib/Makefile.inc
+--- olsrd-0.9.5_orig/lib/pud/nmealib/Makefile.inc	2016-12-22 12:23:42.175283967 +0100
++++ olsrd-0.9.5/lib/pud/nmealib/Makefile.inc	2016-12-22 12:24:24.591015066 +0100
+@@ -63,7 +63,7 @@
+                 -Wmissing-format-attribute -Wno-multichar -Wno-deprecated-declarations -Wendif-labels -Wwrite-strings \
+                 -Wbad-function-cast -Wpointer-arith -Wcast-qual -Wshadow -Wformat -Wsequence-point -Wcast-align \
+                 -Wnested-externs -Winline -Wdisabled-optimization -funit-at-a-time -fPIC -ggdb -Wformat=2 -Winit-self \
+-                -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wconversion -Wdouble-promotion \
++                -Wswitch-default -Wswitch-enum -Wconversion -Wdouble-promotion \
+                 -Werror=format-security -Wformat-security -Wformat-y2k -Wredundant-decls -Wundef -Wunreachable-code \
+                 -Wunused-parameter
+ 

From 5b35f4b80501e1218f7a0f873386517961aa5380 Mon Sep 17 00:00:00 2001
From: Christof Schulze <christof.schulze@gmx.net>
Date: Wed, 21 Dec 2016 21:39:31 +0100
Subject: [PATCH 306/368] babeld: update to version 1.8 which is compatible to
 1.7.1

Signed-off-by: Christof Schulze <christof.schulze@gmx.net>
---
 babeld/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/babeld/Makefile b/babeld/Makefile
index b46f4f2..3264e9c 100644
--- a/babeld/Makefile
+++ b/babeld/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=babeld
-PKG_VERSION:=1.7.1
+PKG_VERSION:=1.8.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.irif.univ-paris-diderot.fr/~jch/software/files/
-PKG_MD5SUM:=2f71794d4e67f8a5352164ce33611549
+PKG_MD5SUM:=eb1c66c382e9181c418ebd84e52b5af2
 PKG_LICENSE:=MIT
 
 include $(INCLUDE_DIR)/package.mk

From a4e1f758267870d07abdcf3750012d1adee603c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
Date: Tue, 27 Dec 2016 18:04:47 +0100
Subject: [PATCH 307/368] bird: update to v1.6.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 bird/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bird/Makefile b/bird/Makefile
index e9c3ce0..f691add 100644
--- a/bird/Makefile
+++ b/bird/Makefile
@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bird
-PKG_VERSION:=1.6.2
+PKG_VERSION:=1.6.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird
-PKG_MD5SUM:=36bc84db93ae7a2fe10194075331e1b9
+PKG_MD5SUM:=39c51cf57c3ba8b5978b2a657ffa2f647ec7f3ae643e91cf42ee5cb070cf7e7c
 PKG_BUILD_DEPENDS:=libncurses libreadline
 PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
 

From 30f5f90fc65af84044aef54b3b115b49ac99df5a Mon Sep 17 00:00:00 2001
From: Daniel Engberg <daniel.engberg.lists@pyret.net>
Date: Mon, 9 Jan 2017 11:44:27 +0100
Subject: [PATCH 308/368] miniupnpd: Update to 2.0.20161216

Enable IGDv2 as v1 Device DCPs were deprecated as of March 30, 2015
Source: http://upnp.org/specs/gw/igd2

Enable port in use check

Patches are originally from the FreeBSD Ports repo and refreshed for this repo.
Source: https://svnweb.freebsd.org/ports/head/net/miniupnpd/files/

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
---
 miniupnpd/Makefile                                 |  6 +++---
 miniupnpd/patches/105-enable_check_portinuse.patch | 11 +++++++++++
 miniupnpd/patches/106-enable_igdv2.patch           | 11 +++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 miniupnpd/patches/105-enable_check_portinuse.patch
 create mode 100644 miniupnpd/patches/106-enable_igdv2.patch

diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index 9a33bbe..fdfac91 100644
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
-PKG_VERSION:=2.0
-PKG_RELEASE:=3
+PKG_VERSION:=2.0.20161216
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=1c07a215dd9b362e75a9efc05e2fb3b4
+PKG_MD5SUM:=9e73d50ac830b5e08b6eb1df4e4c917833a5ab54351809f615d15d0f30cdeef3
 
 PKG_MAINTAINER:=Markus Stenberg <fingon@iki.fi>
 PKG_LICENSE:=BSD-3-Clause
diff --git a/miniupnpd/patches/105-enable_check_portinuse.patch b/miniupnpd/patches/105-enable_check_portinuse.patch
new file mode 100644
index 0000000..8bf6c33
--- /dev/null
+++ b/miniupnpd/patches/105-enable_check_portinuse.patch
@@ -0,0 +1,11 @@
+--- a/genconfig.sh
++++ b/genconfig.sh
+@@ -467,7 +467,7 @@ echo "/* Uncomment the following line to
+ if [ -n "$PORTINUSE" ]; then
+ 	echo "#define CHECK_PORTINUSE" >> ${CONFIGFILE}
+ else
+-	echo "/*#define CHECK_PORTINUSE*/" >> ${CONFIGFILE}
++	echo "#define CHECK_PORTINUSE" >> ${CONFIGFILE}
+ fi
+ echo "" >> ${CONFIGFILE}
+ 
diff --git a/miniupnpd/patches/106-enable_igdv2.patch b/miniupnpd/patches/106-enable_igdv2.patch
new file mode 100644
index 0000000..26811a0
--- /dev/null
+++ b/miniupnpd/patches/106-enable_igdv2.patch
@@ -0,0 +1,11 @@
+--- a/genconfig.sh
++++ b/genconfig.sh
+@@ -516,7 +516,7 @@ echo " * control points, so enable with
+ if [ -n "$IGD2" ]; then
+ 	echo "#define IGD_V2" >> ${CONFIGFILE}
+ else
+-	echo "/*#define IGD_V2*/" >> ${CONFIGFILE}
++	echo "#define IGD_V2" >> ${CONFIGFILE}
+ fi
+ echo "" >> ${CONFIGFILE}
+ 

From 159dc575a6cfe965e6eeaa9e9027fc627bf6069b Mon Sep 17 00:00:00 2001
From: Imuli <i@imu.li>
Date: Tue, 16 Sep 2014 11:07:41 -0400
Subject: [PATCH 309/368] babeld: procd support

note: dependant on openwrt commit 85fabd68, adding support for null arguments.
---
 babeld/files/babeld.init | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/babeld/files/babeld.init b/babeld/files/babeld.init
index 21ae4be..416bbe4 100755
--- a/babeld/files/babeld.init
+++ b/babeld/files/babeld.init
@@ -2,9 +2,9 @@
 
 . $IPKG_INSTROOT/lib/functions/network.sh
 
+USE_PROCD=1
 START=70
 
-pidfile='/var/run/babeld.pid'
 CONFIGFILE='/var/etc/babeld.conf'
 OTHERCONFIGFILE="/etc/babeld.conf"
 OTHERCONFIGDIR="/tmp/babeld.d/"
@@ -212,7 +212,7 @@ babel_config_cb() {
 	esac
 }
 
-start() {
+start_service() {
 	mkdir -p /var/lib
 	mkdir -p /var/etc
 	mkdir -p $OTHERCONFIGDIR
@@ -235,26 +235,18 @@ start() {
 	config_foreach parse_old_global_options general
 	# Parse filters separately, since we know which options we expect
 	config_foreach babel_filter filter
+	procd_open_instance
 	# Using multiple config files is supported since babeld 1.5.1
-	/usr/sbin/babeld -D -I "$pidfile" -c "$OTHERCONFIGFILE" -c "$CONFIGFILE"
-	# Wait for the pidfile to appear
-	for i in 1 2
-	do
-		[ -f "$pidfile" ] || sleep 1
-	done
-	[ -f "$pidfile" ] || (echo "Failed to start babeld"; exit 42)
+	procd_set_param command /usr/sbin/babeld -L /var/log/babeld.log -I "" -c "$OTHERCONFIGFILE" -c "$CONFIGFILE"
+	procd_set_param file "$OTHERCONFIGFILE" "$CONFIGFILE"
+	procd_set_param respawn
+	procd_close_instance
 }
 
-stop() {
-	[ -f "$pidfile" ] && kill $(cat $pidfile)
-  # avoid race-condition on restart: wait for
-  # babeld to die for real.
-  [ -f "$pidfile" ] && sleep 1
-  [ -f "$pidfile" ] && sleep 1
-  [ -f "$pidfile" ] && sleep 1
-  [ -f "$pidfile" ] && exit 42
+service_triggers() {
+	procd_add_reload_trigger babeld
 }
 
 status() {
-	[ -f "$pidfile" ] && kill -USR1 $(cat $pidfile)
+	kill -USR1 $(pgrep -P 1 babeld)
 }

From fd424268ba0945ab6647d1fbb1674b1c85c59f82 Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <git@bitsofnetworks.org>
Date: Mon, 9 Jan 2017 15:42:58 +0100
Subject: [PATCH 310/368] babeld: Log to the system log instead of logging to a
 file

This avoids running out of flash or RAM space if babeld logs too much.
The system log is stored on RAM by default and has a controlled size.

It is still possible to tell babeld to log to a file, by using the
following in /etc/config/babeld:

    config general
        option log_file "/var/log/babeld.log"

Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org>
---
 babeld/files/babeld.init | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/babeld/files/babeld.init b/babeld/files/babeld.init
index 416bbe4..def90b2 100755
--- a/babeld/files/babeld.init
+++ b/babeld/files/babeld.init
@@ -237,7 +237,9 @@ start_service() {
 	config_foreach babel_filter filter
 	procd_open_instance
 	# Using multiple config files is supported since babeld 1.5.1
-	procd_set_param command /usr/sbin/babeld -L /var/log/babeld.log -I "" -c "$OTHERCONFIGFILE" -c "$CONFIGFILE"
+	procd_set_param command /usr/sbin/babeld -I "" -c "$OTHERCONFIGFILE" -c "$CONFIGFILE"
+	procd_set_param stdout 1
+	procd_set_param stderr 1
 	procd_set_param file "$OTHERCONFIGFILE" "$CONFIGFILE"
 	procd_set_param respawn
 	procd_close_instance

From 669fe615c644920b88d42943fb1920695ab30e63 Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <git@bitsofnetworks.org>
Date: Mon, 9 Jan 2017 16:05:03 +0100
Subject: [PATCH 311/368] babeld: Properly quote variables

This was mostly introduced by 82d9002689 ("babeld: add support for dynamic
config files").

Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org>
---
 babeld/files/babeld.init | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/babeld/files/babeld.init b/babeld/files/babeld.init
index def90b2..dea207a 100755
--- a/babeld/files/babeld.init
+++ b/babeld/files/babeld.init
@@ -18,7 +18,7 @@ ignored_options="carrier_sense assume_wireless no_split_horizon random_router_id
 # Append a line to the configuration file
 cfg_append() {
         local value="$1"
-        echo "$value" >> $CONFIGFILE
+        echo "$value" >> "$CONFIGFILE"
 }
 
 cfg_append_option() {
@@ -215,13 +215,13 @@ babel_config_cb() {
 start_service() {
 	mkdir -p /var/lib
 	mkdir -p /var/etc
-	mkdir -p $OTHERCONFIGDIR
+	mkdir -p "$OTHERCONFIGDIR"
 
 	# Start by emptying the generated config file
 	>"$CONFIGFILE"
 	# Import dynamic config files
-	for f in $OTHERCONFIGDIR/*.conf; do
-		[ -f "$f" ] && cat $f >> $CONFIGFILE
+	for f in "$OTHERCONFIGDIR"/*.conf; do
+		[ -f "$f" ] && cat "$f" >> "$CONFIGFILE"
 	done
 	# First load the whole config file, without callbacks, so that we are
 	# aware of all "ignore" options in the second pass.

From ebfb650f017fc04855b5d8697c1d017dd27f3167 Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <git@bitsofnetworks.org>
Date: Mon, 9 Jan 2017 17:07:40 +0100
Subject: [PATCH 312/368] babeld: add dynamic config files to the procd watch
 list

This way, "/etc/init.d/babeld reload" will detect when one of these
dynamic config files has changed, and restart babeld only if that is the
case.

Dynamic config files where introduced by 82d9002689 ("babeld: add support
for dynamic config files").

Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org>
---
 babeld/files/babeld.init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babeld/files/babeld.init b/babeld/files/babeld.init
index dea207a..276e67f 100755
--- a/babeld/files/babeld.init
+++ b/babeld/files/babeld.init
@@ -240,7 +240,7 @@ start_service() {
 	procd_set_param command /usr/sbin/babeld -I "" -c "$OTHERCONFIGFILE" -c "$CONFIGFILE"
 	procd_set_param stdout 1
 	procd_set_param stderr 1
-	procd_set_param file "$OTHERCONFIGFILE" "$CONFIGFILE"
+	procd_set_param file "$OTHERCONFIGFILE" "$OTHERCONFIGDIR"/*.conf "$CONFIGFILE"
 	procd_set_param respawn
 	procd_close_instance
 }

From 4c963b1b85267aa3a004a97a5781ad6f28cb95fa Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <git@bitsofnetworks.org>
Date: Mon, 9 Jan 2017 17:11:58 +0100
Subject: [PATCH 313/368] babeld: Bump PKG_RELEASE because of procd support

Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org>
---
 babeld/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babeld/Makefile b/babeld/Makefile
index 3264e9c..2d781ef 100644
--- a/babeld/Makefile
+++ b/babeld/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=babeld
 PKG_VERSION:=1.8.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.irif.univ-paris-diderot.fr/~jch/software/files/

From 4868ec008ee516e0c7b83782bf2743aa65398418 Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <git@bitsofnetworks.org>
Date: Mon, 9 Jan 2017 17:12:19 +0100
Subject: [PATCH 314/368] =?UTF-8?q?babeld:=20Update=20project=20URL=20agai?=
 =?UTF-8?q?n=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org>
---
 babeld/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/babeld/Makefile b/babeld/Makefile
index 2d781ef..45d8ba7 100644
--- a/babeld/Makefile
+++ b/babeld/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=1.8.0
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://www.irif.univ-paris-diderot.fr/~jch/software/files/
+PKG_SOURCE_URL:=https://www.irif.fr/~jch/software/files/
 PKG_MD5SUM:=eb1c66c382e9181c418ebd84e52b5af2
 PKG_LICENSE:=MIT
 
@@ -23,7 +23,7 @@ define Package/babeld
   CATEGORY:=Network
   SUBMENU:=Routing and Redirection
   TITLE:=A loop-free distance-vector routing protocol
-  URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/babel/
+  URL:=https://www.irif.fr/~jch/software/babel/
   MAINTAINER:=Gabriel Kerneis <gabriel@kerneis.info>
   DEPENDS:=@IPV6
 endef

From 308df74448d5bc14d6a8356b42d3b466d9ec9508 Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Wed, 11 Jan 2017 01:17:33 +0100
Subject: [PATCH 315/368] bmx7: bump src code including mbedtls.2.4.0 support
 and compatibility CV21

---
 bmx7/Makefile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/bmx7/Makefile b/bmx7/Makefile
index e1eb36b..215ec72 100644
--- a/bmx7/Makefile
+++ b/bmx7/Makefile
@@ -1,4 +1,3 @@
-#    Copyright (C) 2011 Fundacio Privada per a la Xarxa Oberta, Lliure i Neutral guifi.net
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -32,8 +31,8 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 #PKG_SOURCE_URL:=file:///usr/src/bmx6/bmx6.git
 
-PKG_REV:=379110ae442f80755b5788c527e722f9551b14eb
-PKG_VERSION:=r2016072001
+PKG_REV:=589ee21b49d370056a24d8931d663626608f3c12
+PKG_VERSION:=r2017011101
 PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 
@@ -46,8 +45,10 @@ include $(INCLUDE_DIR)/package.mk
 
 TARGET_CFLAGS += $(FPIC)
 
+#MAKE_ARGS += EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DCRYPTLIB=POLARSSL_1_3_4 -DCORE_LIMIT=20000 -DTRAFFIC_DUMP -DNO_TRACE_FUNCTION_CALLS -DBMX7_LIB_IWINFO"
+MAKE_ARGS += EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DCRYPTLIB=MBEDTLS_2_4_0 -DCORE_LIMIT=20000 -DTRAFFIC_DUMP -DNO_TRACE_FUNCTION_CALLS -DBMX7_LIB_IWINFO"
+
 MAKE_ARGS += \
-        EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DCRYPTLIB=POLARSSL_1_3_4 -DCORE_LIMIT=20000 -DTRAFFIC_DUMP -DNO_TRACE_FUNCTION_CALLS -DBMX7_LIB_IWINFO" \
         EXTRA_LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib -liwinfo" \
         GIT_REV="$(PKG_REV)" \
         CC="$(TARGET_CC)" \
@@ -61,7 +62,8 @@ define Package/bmx7/Default
   TITLE:=BMX7 layer 3 routing daemon
   URL:=http://bmx6.net/
   MAINTAINER:=Axel Neumann <neumann@cgws.de>
-  DEPENDS:=+zlib +libpolarssl +libiwinfo
+#  DEPENDS:=+zlib +libpolarssl +libiwinfo
+  DEPENDS:=+zlib +libmbedtls +libiwinfo
 endef
 
 define Package/bmx7/description

From ba5bffa6f43f112a1fb61a80259234e6ad2072bb Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <git@bitsofnetworks.org>
Date: Thu, 12 Jan 2017 23:09:30 +0100
Subject: [PATCH 316/368] babeld: Add myself as maintainer

Also update my email address in the main MAINTAINERS file.

Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org>
---
 MAINTAINERS     | 2 +-
 babeld/Makefile | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 2f2385a..1892327 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8,7 +8,7 @@
 # use alphabetical order when updating the list.
 
 Axel "axn" Neumann <neumann@cgws.de>
-Baptiste Jonglez <bjonglez@illyse.org>
+Baptiste Jonglez <openwrt-pkg@bitsofnetworks.org>
 Bastian Bittorf <bittorf@bluebottle.com>
 Corinna "Elektra" Aichele <onelektra@gmx.net>
 Gabriel Kerneis <gabriel@kerneis.info>
diff --git a/babeld/Makefile b/babeld/Makefile
index 45d8ba7..2632392 100644
--- a/babeld/Makefile
+++ b/babeld/Makefile
@@ -24,7 +24,8 @@ define Package/babeld
   SUBMENU:=Routing and Redirection
   TITLE:=A loop-free distance-vector routing protocol
   URL:=https://www.irif.fr/~jch/software/babel/
-  MAINTAINER:=Gabriel Kerneis <gabriel@kerneis.info>
+  MAINTAINER:=Gabriel Kerneis <gabriel@kerneis.info>, \
+              Baptiste Jonglez <openwrt-pkg@bitsofnetworks.org>
   DEPENDS:=@IPV6
 endef
 

From 3d41efe1b5c7ee1c5d01fe94479192bd2bffa933 Mon Sep 17 00:00:00 2001
From: Sven Roederer <devel-sven@geroedel.de>
Date: Sat, 14 Jan 2017 06:03:50 +0100
Subject: [PATCH 317/368] olsrd: remove deprecated 6and4 compatibility

It's announced since several years, that such setups (one
olsrd running IPv4 and IPv6) will no be supported anymore.

See 4b06c42f97a0d45eaf41a42c065c2dba4d643408
(olsrd: splitting IPv6/4 configuration and start scripts)

Signed-off-by: Sven Roederer <freifunk@it-solutions.geroedel.de>
---
 olsrd/files/olsrd.init | 75 +++++-------------------------------------
 1 file changed, 9 insertions(+), 66 deletions(-)

diff --git a/olsrd/files/olsrd.init b/olsrd/files/olsrd.init
index 43c7e67..6a8f50a 100644
--- a/olsrd/files/olsrd.init
+++ b/olsrd/files/olsrd.init
@@ -15,8 +15,6 @@ OLSRD_INTERFACE_DEFAULTS_SCHEMA='AutoDetectChanges:bool'
 T='	'
 N='
 '
-#6and4: backward compatibility - it MUST be different from /etc/init.d/olsrd6 PID variable
-PID6=/var/run/olsrd6and4.pid
 
 log() {
 	logger -t olsrd -p daemon.info -s "${initscript}: $@"
@@ -396,19 +394,6 @@ olsrd_write_olsrd() {
 
 	[ "$OLSRD_COUNT" -gt 0 ] && return 0
 
-	config_get ipversion "$cfg" IpVersion
-	if [ "$UCI_CONF_NAME" = "olsrd6" ]; then
-	        OLSRD_OLSRD_SCHEMA="$OLSRD_OLSRD_SCHEMA IpVersion=6"
-	        if [ "$ipversion" = "6and4" ]; then
-		        error "IpVersion 6and4 not supported in olsrd6"
-			return 1
-		fi
-	else
-	        if [ "$ipversion" = "6and4" ]; then
-		        OLSRD_IPVERSION_6AND4=1
-			config_set "$cfg" IpVersion '6'
-		fi
-	fi
 	config_get smartgateway "$cfg" SmartGateway
 	config_get smartgatewayuplink "$cfg" SmartGatewayUplink
 
@@ -632,7 +617,6 @@ olsrd_update_schema() {
 }
 
 olsrd_write_config() {
-	OLSRD_IPVERSION_6AND4=0
 	OLSRD_COUNT=0
 	config_foreach olsrd_write_olsrd olsrd
 	IPCCONNECT_COUNT=0
@@ -800,53 +784,16 @@ start() {
 
 	[ -z "$OLSRD_CONFIG_FILE" ] && return 1
 
-	#6and4: backward compatibility
-	local bindv6only='0'
-	if [ "$OLSRD_IPVERSION_6AND4" -ne 0 ]; then
-	        warn "IpVersion 6and4 is deprecated and will be removed in future!"
-		warn "You must use /etc/config/olsrd and /etc/init.d/olsrd for IPv4"
-		warn " /etc/config/olsrd6 and /etc/init.d/olsrd6 for IPv6"
-
-		bindv6only="$(sysctl -n net.ipv6.bindv6only)"
-		sysctl -w net.ipv6.bindv6only=1 > /dev/null
-		sed -e '/[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}/d' < "$OLSRD_CONFIG_FILE" > /var/etc/olsrd.conf.ipv6
-		sed -e 's/^IpVersion[ ][ ]*6$/IpVersion 4/' -e 's/^\t\t[A-Fa-f0-9.:]*[:][A-Fa-f0-9.:]*[ ][0-9]*$//' < "$OLSRD_CONFIG_FILE" > /var/etc/olsrd.conf.ipv4
-		rm $OLSRD_CONFIG_FILE
-
-		# some filenames should get the suffix .ipv6
-		for file in $latlon_file $hosts_file $services_file $resolv_file $macs_file $wd_file;do
-			f=$(echo $file|sed 's/\//\\\//g')
-			sed -i "s/$f/$f.ipv6/g" /var/etc/olsrd.conf.ipv6
-		done
-
-		SERVICE_PID_FILE="$PID6"
-		if service_check /usr/sbin/olsrd; then
-			error "there is already an IPv6 instance of olsrd running (pid: '$(cat $PID6)'), not starting."
-		else
-			service_start /usr/sbin/olsrd -f /var/etc/olsrd.conf.ipv6 -nofork
-		fi
-
-		SERVICE_PID_FILE="$PID"
-		if service_check /usr/sbin/olsrd; then
-			error "there is already an IPv4 instance of olsrd running (pid: '$(cat $PID)'), not starting."
-		else
-			service_start /usr/sbin/olsrd -f /var/etc/olsrd.conf.ipv4 -nofork
-		fi
-
-		sleep 3
-		sysctl -w net.ipv6.bindv6only="$bindv6only" > /dev/null
+	SERVICE_PID_FILE="$PID"
+	if service_check /usr/sbin/olsrd; then
+		error "there is already an instance of $UCI_CONF_NAME running (pid: '$(cat $PID)'), not starting."
+		return 1
 	else
-		SERVICE_PID_FILE="$PID"
-		if service_check /usr/sbin/olsrd; then
-			error "there is already an instance of $UCI_CONF_NAME running (pid: '$(cat $PID)'), not starting."
-			return 1
-		else
-			service_start /usr/sbin/olsrd -f "$OLSRD_CONFIG_FILE" -nofork
-			sleep 1
-			service_check /usr/sbin/olsrd || {
-				log "startup-error: check via: '/usr/sbin/olsrd -f \"$OLSRD_CONFIG_FILE\" -nofork'"
-			}
-		fi
+		service_start /usr/sbin/olsrd -f "$OLSRD_CONFIG_FILE" -nofork
+		sleep 1
+		service_check /usr/sbin/olsrd || {
+			log "startup-error: check via: '/usr/sbin/olsrd -f \"$OLSRD_CONFIG_FILE\" -nofork'"
+		}
 	fi
 
 	olsrd_setup_smartgw_rules
@@ -855,8 +802,4 @@ start() {
 stop() {
 	SERVICE_PID_FILE="$PID"
 	service_stop /usr/sbin/olsrd
-
-	#6and4: backward compatibility
-	SERVICE_PID_FILE="$PID6"
-	service_stop /usr/sbin/olsrd
 }

From 5994c4507de7c634a7f92f9521e22a78c86b218f Mon Sep 17 00:00:00 2001
From: root <devel-sven@geroedel.de>
Date: Sun, 15 Jan 2017 11:51:43 +0000
Subject: [PATCH 318/368] olsrd: init: updated (c)-year to 2017

---
 olsrd/files/olsrd.init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/olsrd/files/olsrd.init b/olsrd/files/olsrd.init
index 6a8f50a..258c7a5 100644
--- a/olsrd/files/olsrd.init
+++ b/olsrd/files/olsrd.init
@@ -1,5 +1,5 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2008-2013 OpenWrt.org
+# Copyright (C) 2008-2017 OpenWrt.org
 
 START=65
 

From 1aacfea7b3ad97fb8c549a66fa7e7526a6419bd2 Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <git@bitsofnetworks.org>
Date: Sun, 15 Jan 2017 23:33:32 +0100
Subject: [PATCH 319/368] babeld: Cleanup old compatibility code in initscript

It makes the init script more readable.  It has been more than two years
since babeld 1.5.1, let's hope nobody is still using the old
(undocumented) option names.

Incidentally, this commit fixes support for the "conf_dir" option,
introduced by ac643416dc ("babeld: allow changing alternative
configuration file and directory").  The default value of $OTHERCONFIGDIR
was always used, because the variable was used *before* it was (possibly)
redefined when parsing the UCI config.

Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org>
---
 babeld/Makefile          |  2 +-
 babeld/files/babeld.init | 96 ++++++++++------------------------------
 2 files changed, 25 insertions(+), 73 deletions(-)

diff --git a/babeld/Makefile b/babeld/Makefile
index 2632392..cd7f6e3 100644
--- a/babeld/Makefile
+++ b/babeld/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=babeld
 PKG_VERSION:=1.8.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.irif.fr/~jch/software/files/
diff --git a/babeld/files/babeld.init b/babeld/files/babeld.init
index 276e67f..378a8ab 100755
--- a/babeld/files/babeld.init
+++ b/babeld/files/babeld.init
@@ -11,10 +11,6 @@ OTHERCONFIGDIR="/tmp/babeld.d/"
 EXTRA_COMMANDS="status"
 EXTRA_HELP="        status Dump Babel's table to the log file."
 
-# Options to ignore for the global section (old options that are translated
-# for backward compatibility with old configuration files)
-ignored_options="carrier_sense assume_wireless no_split_horizon random_router_id multicast_address port hello_interval wired_hello_interval smoothing_half_time duplication_priority local_server conf_file conf_dir"
-
 # Append a line to the configuration file
 cfg_append() {
         local value="$1"
@@ -61,63 +57,6 @@ append_parm() {
 	append buffer "$switch $_loctmp"
 }
 
-
-# Provides backward compatibility for old option names in the global section.
-translate_option() {
-	local section="$1"
-	local old_option="$2"
-	local new_option="$3"
-	local _value
-	config_get _value "$section" "$old_option"
-	[ -z "$_value" ] && return
-	cfg_append "${new_option//_/-} $_value"
-}
-
-translate_bool() {
-	local section="$1"
-	local old_option="$2"
-	local new_option="$3"
-	local _bool
-	local _value
-	config_get_bool _bool "$section" "$old_option" 0
-	[ "$_bool" -eq 0 ] && return
-	cfg_append "${new_option//_/-} true"
-}
-
-# Adds a new interface section for setting default interface options.
-add_default_option() {
-	local option="$1"
-	local value="$2"
-	cfg_append "default ${option//_/-} $value"
-}
-
-# Global 'hello_interval' and 'wired_hello_interval' options are ignored,
-# because they have no direct equivalent: you should use
-# interface-specific settings.
-parse_old_global_options() {
-	local section="$1"
-	translate_bool   "$section" 'carrier_sense'	'link_detect'
-	translate_bool   "$section" 'random_router_id'	'random_id'
-	translate_option "$section" 'multicast_address'	'protocol_group'
-	translate_option "$section" 'port'		'protocol_port'
-	translate_option "$section" 'local_server'	'local_port'
-	translate_option "$section" 'smoothing_half_time'	'smoothing_half_life'
-	translate_option "$section" 'duplication_priority'	'allow_duplicates'
-	# These two global options are turned into default interface options.
-	local _bool
-	config_get_bool _bool "$section" 'assume_wireless' 0
-	[ "$_bool" -eq 1 ] && add_default_option "wired" "false"
-	config_get_bool _bool "$section" 'no_split_horizon' 0
-	[ "$_bool" -eq 1 ] && add_default_option "split_horizon" "false"
-        # Configure alternative configuration file and directory
-	local conf_file
-	config_get conf_file "$section" "conf_file"
-	[ -n "$conf_file" ] && OTHERCONFIGFILE="$conf_file"
-	local conf_dir
-	config_get conf_dir "$section" "conf_dir"
-	[ -n "$conf_dir" ] && OTHERCONFIGDIR="$conf_dir"
-}
-
 babel_filter() {
 	local cfg="$1"
 	local _loctmp
@@ -164,8 +103,9 @@ babel_config_cb() {
 		option_cb() {
 			local option="$1"
 			local value="$2"
-			# Ignore old options
-			list_contains ignored_options "$option" && return
+			# Ignore options that are not supposed to be given to babeld
+			[ "$option" = "conf_file" ] && return
+			[ "$option" = "conf_dir" ] && return
 			# Skip lists. They will be taken care of by list_cb
 			test "${option#*_ITEM}" != "$option" && return
 			test "${option#*_LENGTH}" != "$option" && return
@@ -175,9 +115,6 @@ babel_config_cb() {
 	"interface")
 		local _ifname
 		config_get _ifname "$section" 'ifname'
-		# Backward compatibility: try to use the section name
-		# if no "option ifname" was used.
-		[ -z "$_ifname" -a "${section:0:3}" != "cfg" ] && _ifname="$section"
 		# Try to resolve the logical interface name
 		unset interface
 		network_get_device interface "$_ifname" || interface="$_ifname"
@@ -212,27 +149,42 @@ babel_config_cb() {
 	esac
 }
 
+# Support for conf_file and conf_dir
+babel_configpaths() {
+	local cfg="$1"
+	local conf_file
+	config_get conf_file "$cfg" "conf_file"
+	[ -n "$conf_file" ] && OTHERCONFIGFILE="$conf_file"
+	local conf_dir
+	config_get conf_dir "$cfg" "conf_dir"
+	[ -n "$conf_dir" ] && OTHERCONFIGDIR="$conf_dir"
+}
+
 start_service() {
 	mkdir -p /var/lib
 	mkdir -p /var/etc
-	mkdir -p "$OTHERCONFIGDIR"
+
+	# First load the whole config file, without callbacks, so that we are
+	# aware of all "ignore" options in the second pass.  This also allows
+	# to load the configuration paths (conf_file and conf_dir).
+	config_load babeld
+
+	# Configure alternative configuration file and directory
+	config_foreach babel_configpaths "general"
 
 	# Start by emptying the generated config file
 	>"$CONFIGFILE"
 	# Import dynamic config files
+	mkdir -p "$OTHERCONFIGDIR"
 	for f in "$OTHERCONFIGDIR"/*.conf; do
 		[ -f "$f" ] && cat "$f" >> "$CONFIGFILE"
 	done
-	# First load the whole config file, without callbacks, so that we are
-	# aware of all "ignore" options in the second pass.
-	config_load babeld
+
 	# Parse general and interface sections thanks to the "config_cb()"
 	# callback.  This allows to loop over all options without having to
 	# know their name in advance.
 	config_cb() { babel_config_cb "$@"; }
 	config_load babeld
-	# Backward compatibility
-	config_foreach parse_old_global_options general
 	# Parse filters separately, since we know which options we expect
 	config_foreach babel_filter filter
 	procd_open_instance

From 9627e2956bf2ebcc931e8538723ba64c3032206f Mon Sep 17 00:00:00 2001
From: Sven Roederer <devel-sven@geroedel.de>
Date: Sun, 15 Jan 2017 18:04:43 +0100
Subject: [PATCH 320/368] olsrd: Makefile - remove empty line

doesn't look like it intended

Signed-off-by: Sven Roederer <freifunk@it-solutions.geroedel.de>
---
 olsrd/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/olsrd/Makefile b/olsrd/Makefile
index 2e8d0a2..cce17b9 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -111,7 +111,6 @@ define Package/olsrd-mod-p2pd
   TITLE:=Peer to Peer Discovery plugin
 endef
 
-
 define Package/olsrd-mod-pgraph
   $(call Package/olsrd/template)
   DEPENDS:=olsrd

From 5aa009c7e617d607611316c71268cf44dff372f1 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 18 Jan 2017 01:57:17 +0100
Subject: [PATCH 321/368] ndppd: fix compilation with modern gcc

Import upstream commit "f19fa4b Fix a cast so it can be compiled with gcc-6"
in order to fix building ndppd with recent gcc versions.

Fixes the following error spotted by the build bots:

    src/iface.cc: In static member function 'static ndppd::ptr<ndppd::iface> ndppd::iface::open_pfd(const string&)':
    src/iface.cc:153:5: error: narrowing conversion of '-1' from 'int' to '__u32 {aka unsigned int}' inside { } [-Wnarrowing]

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---
 ndppd/patches/0002-upstream-cast-fix.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 ndppd/patches/0002-upstream-cast-fix.patch

diff --git a/ndppd/patches/0002-upstream-cast-fix.patch b/ndppd/patches/0002-upstream-cast-fix.patch
new file mode 100644
index 0000000..555a198
--- /dev/null
+++ b/ndppd/patches/0002-upstream-cast-fix.patch
@@ -0,0 +1,22 @@
+From f19fa4be6ac87032c01f2db57ccb484f83c62604 Mon Sep 17 00:00:00 2001
+From: Daniel Adolfsson <daniel@priv.nu>
+Date: Fri, 8 Apr 2016 13:32:22 +0200
+Subject: [PATCH] Fix a cast so it can be compiled with gcc-6
+
+---
+ src/iface.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/iface.cc b/src/iface.cc
+index 3ce893f..5f165eb 100644
+--- a/src/iface.cc
++++ b/src/iface.cc
+@@ -147,7 +147,7 @@ ptr<iface> iface::open_pfd(const std::string& name)
+         // Bail if it's* not* ND_NEIGHBOR_SOLICIT.
+         BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, ND_NEIGHBOR_SOLICIT, 0, 1),
+         // Keep packet.
+-        BPF_STMT(BPF_RET | BPF_K, -1),
++        BPF_STMT(BPF_RET | BPF_K, (u_int32_t)-1),
+         // Drop packet.
+         BPF_STMT(BPF_RET | BPF_K, 0)
+     };

From 510aaaaffc14e1ef5f31822df213e11cd85a5e2e Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 18 Jan 2017 02:45:18 +0100
Subject: [PATCH 322/368] batmand: switch to tarball download, fix build with
 musl libc

Since the upstream SVN repository is not available anymore, update the
Makefile to fetch tarballs cached by the LEDE or OpenWrt projects instead.

Also add a missing -D_GNU_SOURCE to the target flags to fix compilation
with musl libc.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---
 batmand/Makefile | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/batmand/Makefile b/batmand/Makefile
index a807650..2372ce3 100644
--- a/batmand/Makefile
+++ b/batmand/Makefile
@@ -11,15 +11,13 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=batmand
 PKG_REV:=1439
 PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=2
-PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\"
+PKG_RELEASE:=3
+PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" -D_GNU_SOURCE
 
-PKG_SOURCE_PROTO:=svn
+PKG_HASH:=3c72ce2aae889944acfc898434c6e9573b20815862db1938f3132cc50b669667
 PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_SUBDIR:=$(if $(PKG_BRANCH),$(PKG_BRANCH),$(PKG_NAME))-$(PKG_VERSION)
-PKG_SOURCE_URL:=http://downloads.open-mesh.org/svn/batman/trunk/
-PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://sources.lede-project.org https://downloads.openwrt.org/sources
 PKG_LICENSE:=GPL-2.0
 
 PKG_KMOD_BUILD_DIR:=$(PKG_BUILD_DIR)/batman/linux/modules

From d35111fe5ce7cb94f56281b22c4701597f748eb5 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Wed, 18 Jan 2017 13:01:20 +0100
Subject: [PATCH 323/368] batmand: Replace maintainer with Elektra

The mail address for Marek Lindner was not up to date. Marek was also not
maintaining this package and was forwarding requests to Elektra:

  "Elektra is the maintainer for batmand. I'd rather not interfere."

https://github.com/openwrt-routing/packages/pull/134#issuecomment-236346560

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batmand/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/batmand/Makefile b/batmand/Makefile
index 2372ce3..4c8bf30 100644
--- a/batmand/Makefile
+++ b/batmand/Makefile
@@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define Package/batmand/Default
   URL:=http://www.open-mesh.org/
-  MAINTAINER:=Marek Lindner <lindner_marek@yahoo.de>
+  MAINTAINER:=Corinna "Elektra" Aichele <onelektra@gmx.net>
 endef
 
 define Package/batmand

From 5e6eede6f32e14a8536902defbb8a846c640f7cf Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Mon, 23 Jan 2017 18:59:17 +0100
Subject: [PATCH 324/368] batman-adv: Change maintainer to Simon Wunderlich

Marek Lindner forwarded all recent requests regarding the package changes
to Simon. He also asked that further changes should be handled directly
without waiting for him.

Simon Wunderlich already has write access to the repository and is
therefore well prepared to take over the role of the maintainer.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batman-adv/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index df64571..a363b3d 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 define KernelPackage/batman-adv
   URL:=https://www.open-mesh.org/
-  MAINTAINER:=Marek Lindner <mareklindner@neomailbox.ch>
+  MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
   SUBMENU:=Network Support
   DEPENDS:=+KMOD_BATMAN_ADV_BLA:kmod-lib-crc16 +kmod-crypto-crc32c +kmod-lib-crc32c +kmod-cfg80211
   TITLE:=B.A.T.M.A.N. Adv

From 64cb90b04e02267642e4ee696b9a777421393a91 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Mon, 23 Jan 2017 18:59:17 +0100
Subject: [PATCH 325/368] batctl: Change maintainer to Simon Wunderlich

Marek Lindner forwarded all recent requests regarding the package changes
to Simon. He also asked that further changes should be handled directly
without waiting for him.

Simon Wunderlich already has write access to the repository and is
therefore well prepared to take over the role of the maintainer.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batctl/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/batctl/Makefile b/batctl/Makefile
index bf305a2..7901503 100644
--- a/batctl/Makefile
+++ b/batctl/Makefile
@@ -27,7 +27,7 @@ define Package/batctl
   CATEGORY:=Network
   DEPENDS:=+kmod-batman-adv +libnl-tiny +libc +librt
   TITLE:=B.A.T.M.A.N. Advanced user space configuration tool batctl
-  MAINTAINER:=Marek Lindner <mareklindner@neomailbox.ch>
+  MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
 endef
 
 define Package/batctl/description

From 81213497f1932de68c09e33e3544774bc77d2651 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Wed, 18 Jan 2017 12:59:53 +0100
Subject: [PATCH 326/368] batmand: Switch upstream URL to HTTPS

The open-mesh.org server is not serving plain HTTP pages since a while.
Updating the default URL to https is therefore prefered.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batmand/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/batmand/Makefile b/batmand/Makefile
index 4c8bf30..12bbd2e 100644
--- a/batmand/Makefile
+++ b/batmand/Makefile
@@ -25,7 +25,7 @@ PKG_KMOD_BUILD_DIR:=$(PKG_BUILD_DIR)/batman/linux/modules
 include $(INCLUDE_DIR)/package.mk
 
 define Package/batmand/Default
-  URL:=http://www.open-mesh.org/
+  URL:=https://www.open-mesh.org/
   MAINTAINER:=Corinna "Elektra" Aichele <onelektra@gmx.net>
 endef
 

From 44f9373e0551b299d0c3f6d3c94244442fe29742 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Wed, 18 Jan 2017 13:05:51 +0100
Subject: [PATCH 327/368] vis: Extract vis package from batmand

The batmand and vis sources are actually stored in two different
repositories. It therefore makes more sense to have these two packages also
split in two different OpenWrt packages. This also allows to get the vis
sources directly from the git repository.

The SVN version of vis r1439 was actually r1346. The git export of revision
r1346 is referenced by this commit.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batmand/Makefile                      | 44 +---------------
 vis/Makefile                          | 73 +++++++++++++++++++++++++++
 {batmand => vis}/files/etc/config/vis |  0
 {batmand => vis}/files/etc/init.d/vis |  0
 4 files changed, 74 insertions(+), 43 deletions(-)
 create mode 100644 vis/Makefile
 rename {batmand => vis}/files/etc/config/vis (100%)
 rename {batmand => vis}/files/etc/init.d/vis (100%)

diff --git a/batmand/Makefile b/batmand/Makefile
index 12bbd2e..3822dde 100644
--- a/batmand/Makefile
+++ b/batmand/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=batmand
 PKG_REV:=1439
 PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" -D_GNU_SOURCE
 
 PKG_HASH:=3c72ce2aae889944acfc898434c6e9573b20815862db1938f3132cc50b669667
@@ -42,19 +42,6 @@ define Package/batmand/description
 B.A.T.M.A.N. layer 3 routing daemon
 endef
 
-define Package/vis
-$(call Package/batmand/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Routing and Redirection
-  DEPENDS:=+libpthread
-  TITLE:=visualization server for B.A.T.M.A.N. layer 3
-endef
-        
-define Package/vis/description
-visualization server for B.A.T.M.A.N. layer 3
-endef
-
 define KernelPackage/batgat
 $(call Package/batmand/Default)
   SUBMENU:=Network Support
@@ -80,18 +67,6 @@ MAKE_BATMAND_ARGS += \
 	INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
 	STRIP="/bin/true" \
 	batmand install
-	
-MAKE_VIS_ARGS += \
-	EXTRA_CFLAGS='$(TARGET_CFLAGS) $(PKG_EXTRA_CFLAGS)' \
-	CCFLAGS="$(TARGET_CFLAGS)" \
-	OFLAGS="$(TARGET_CFLAGS)" \
-	REVISION="$(PKG_REV)" \
-	CC="$(TARGET_CC)" \
-	NODEBUG=1 \
-	UNAME="Linux" \
-	INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
-	STRIP="/bin/true" \
-	vis install
 
 MAKE_BATGAT_ARGS += \
 	CROSS_COMPILE="$(TARGET_CROSS)" \
@@ -108,10 +83,6 @@ endef
 ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_batmand),)
 	BUILD_BATMAND := $(MAKE) -C $(PKG_BUILD_DIR)/batman $(MAKE_BATMAND_ARGS)
 endif
-
-ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_vis),)
-	BUILD_VIS := $(MAKE) -C $(PKG_BUILD_DIR)/vis $(MAKE_VIS_ARGS)
-endif
 	
 ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batgat),)
 	BUILD_BATGAT := $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATGAT_ARGS)
@@ -119,7 +90,6 @@ endif
 	        
 define Build/Compile
 	$(BUILD_BATMAND)
-	$(BUILD_VIS)
 	cp $(PKG_KMOD_BUILD_DIR)/Makefile.kbuild $(PKG_KMOD_BUILD_DIR)/Makefile
 	$(BUILD_BATGAT)
 endef
@@ -135,17 +105,5 @@ define Package/batmand/conffiles
 /etc/config/batmand
 endef
 
-define Package/vis/install
-	$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/vis $(1)/usr/sbin/
-	$(INSTALL_BIN) ./files/etc/init.d/vis $(1)/etc/init.d
-	$(INSTALL_DATA) ./files/etc/config/vis $(1)/etc/config
-endef
-
-define Package/vis/conffiles
-/etc/config/vis
-endef
-
 $(eval $(call BuildPackage,batmand))
-$(eval $(call BuildPackage,vis))
 $(eval $(call KernelPackage,batgat))
diff --git a/vis/Makefile b/vis/Makefile
new file mode 100644
index 0000000..889b410
--- /dev/null
+++ b/vis/Makefile
@@ -0,0 +1,73 @@
+#
+# Copyright (C) 2008-2011 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:=vis
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://git.open-mesh.org/vis.git
+PKG_REV:=e141311c6a4fc824efbad536c137ed279905d825
+PKG_VERSION:=1440
+PKG_RELEASE:=0
+PKG_LICENSE:=GPL-2.0
+
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
+
+PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" -D_GNU_SOURCE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/vis
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Routing and Redirection
+  DEPENDS:=+libpthread
+  TITLE:=visualization server for B.A.T.M.A.N. layer 3
+  URL:=https://www.open-mesh.org/
+  MAINTAINER:=Corinna "Elektra" Aichele <onelektra@gmx.net>
+endef
+
+define Package/vis/description
+visualization server for B.A.T.M.A.N. layer 3
+endef
+
+MAKE_VIS_ARGS += \
+	EXTRA_CFLAGS='$(TARGET_CFLAGS) $(PKG_EXTRA_CFLAGS)' \
+	CCFLAGS="$(TARGET_CFLAGS)" \
+	OFLAGS="$(TARGET_CFLAGS)" \
+	REVISION="$(PKG_REV)" \
+	CC="$(TARGET_CC)" \
+	NODEBUG=1 \
+	UNAME="Linux" \
+	INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
+	STRIP="/bin/true" \
+	vis install
+
+
+define Build/Configure
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_VIS_ARGS)
+endef
+
+define Package/vis/install
+	$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/vis $(1)/usr/sbin/
+	$(INSTALL_BIN) ./files/etc/init.d/vis $(1)/etc/init.d
+	$(INSTALL_DATA) ./files/etc/config/vis $(1)/etc/config
+endef
+
+define Package/vis/conffiles
+/etc/config/vis
+endef
+
+$(eval $(call BuildPackage,vis))
diff --git a/batmand/files/etc/config/vis b/vis/files/etc/config/vis
similarity index 100%
rename from batmand/files/etc/config/vis
rename to vis/files/etc/config/vis
diff --git a/batmand/files/etc/init.d/vis b/vis/files/etc/init.d/vis
similarity index 100%
rename from batmand/files/etc/init.d/vis
rename to vis/files/etc/init.d/vis

From 55890241f5f3bd6134470675a1815036d4e07a56 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Wed, 18 Jan 2017 13:34:16 +0100
Subject: [PATCH 328/368] batmand: Use git repository to retrieve sources

The current package is build around the subversion repository which does
not exist anymore. The package can therefore be moved to the git repository
to have an official source for the revision used in OpenWrt.

The SVN version of batman r1439 was actually r1435. The git export of revision
r1435 is referenced by this commit. The version number was only increased
to 1440 to create a new source tarball. SVN revision r1440 is not a commit
for batman and therefore no code changes in batman was done in r1440.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batmand/Makefile                 | 24 ++++++++++++++----------
 batmand/patches/100-2.6.36.patch |  4 ++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/batmand/Makefile b/batmand/Makefile
index 3822dde..c4284ca 100644
--- a/batmand/Makefile
+++ b/batmand/Makefile
@@ -9,18 +9,22 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=batmand
-PKG_REV:=1439
-PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=4
-PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" -D_GNU_SOURCE
 
-PKG_HASH:=3c72ce2aae889944acfc898434c6e9573b20815862db1938f3132cc50b669667
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://sources.lede-project.org https://downloads.openwrt.org/sources
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://git.open-mesh.org/batmand.git
+PKG_REV:=b67a7087b51d7a5e90d27ac39116d1f57257c86e
+PKG_VERSION:=1440
+PKG_RELEASE:=0
 PKG_LICENSE:=GPL-2.0
 
-PKG_KMOD_BUILD_DIR:=$(PKG_BUILD_DIR)/batman/linux/modules
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
+
+PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" -D_GNU_SOURCE
+
+PKG_KMOD_BUILD_DIR:=$(PKG_BUILD_DIR)/linux/modules
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -81,7 +85,7 @@ define Build/Configure
 endef
 
 ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_batmand),)
-	BUILD_BATMAND := $(MAKE) -C $(PKG_BUILD_DIR)/batman $(MAKE_BATMAND_ARGS)
+	BUILD_BATMAND := $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_BATMAND_ARGS)
 endif
 	
 ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batgat),)
diff --git a/batmand/patches/100-2.6.36.patch b/batmand/patches/100-2.6.36.patch
index 566c23b..13318e0 100644
--- a/batmand/patches/100-2.6.36.patch
+++ b/batmand/patches/100-2.6.36.patch
@@ -2,8 +2,8 @@
  batman/linux/modules/gateway.c |   19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
 
---- batmand-r1439.orig/batman/linux/modules/gateway.c
-+++ batmand-r1439/batman/linux/modules/gateway.c
+--- batmand-r1439.orig/linux/modules/gateway.c
++++ batmand-r1439/linux/modules/gateway.c
 @@ -29,6 +29,7 @@ static struct class *batman_class;
  static int batgat_open(struct inode *inode, struct file *filp);
  static int batgat_release(struct inode *inode, struct file *file);

From 62152884ebe7893372ac0dc3967899d980c8ad53 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Wed, 25 Jan 2017 09:51:44 +0100
Subject: [PATCH 329/368] batmand: Provide PKG_MIRROR_HASH for LEDE mirror
 download

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batmand/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/batmand/Makefile b/batmand/Makefile
index c4284ca..b4ed301 100644
--- a/batmand/Makefile
+++ b/batmand/Makefile
@@ -20,6 +20,7 @@ PKG_LICENSE:=GPL-2.0
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
+PKG_MIRROR_HASH:=ceb8e0e399f79b1b663594fcf9642e1efc40e696a7604daf709c77da9b6ec52f
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
 
 PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" -D_GNU_SOURCE

From 7d66bea3d78dd514798770bf839f9686215b77ac Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Wed, 25 Jan 2017 09:51:44 +0100
Subject: [PATCH 330/368] vis: Provide PKG_MIRROR_HASH for LEDE mirror download

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 vis/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vis/Makefile b/vis/Makefile
index 889b410..316224a 100644
--- a/vis/Makefile
+++ b/vis/Makefile
@@ -19,6 +19,7 @@ PKG_LICENSE:=GPL-2.0
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
+PKG_MIRROR_HASH:=fd4b337a56993eec9a03ad8e7918bccc7691aa8b2e5ab6dd7863350f07503285
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
 
 PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" -D_GNU_SOURCE

From 8d9d16c93195f6ef3bf3ff721ec573ea515b908d Mon Sep 17 00:00:00 2001
From: Gabriel <gabriel@autistici.org>
Date: Wed, 25 Jan 2017 21:48:06 +0100
Subject: [PATCH 331/368] addedd poprouting makefile

---
 poprouting/Makefile | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 poprouting/Makefile

diff --git a/poprouting/Makefile b/poprouting/Makefile
new file mode 100644
index 0000000..5df8cfe
--- /dev/null
+++ b/poprouting/Makefile
@@ -0,0 +1,35 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=prince
+PKG_VERSION:=v0.2
+PKG_RELEASE:=2
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/prince-$(PKG_VERSION)
+PKG_USE_MIPS16:=0
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE:=prince-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/gabri94/poprouting.git
+PKG_SOURCE_VERSION:=v0.2
+PKG_SOURCE_SUBDIR:=prince-v0.2
+include $(INCLUDE_DIR)/package.mk
+define Package/prince
+	SECTION :=net
+	CATEGORY :=Network
+	SUBMENU :=Routing and Redirection
+	Mantainer :=Gabriele Gemmi <gabriel@autistici.org>
+	TITLE :=PopRouting daemon
+	MENU :=0
+	DEPENDS := +libjson-c +libpthread
+endef
+
+define Package/poprouting/description
+Prince is an open source implementation of the PopRouting Algorithm.
+It has been developed as a Google Summer of Code Project in collaboration with Freifunk and the University of Trento.
+
+It fetches topology data from a Link State routing deamon(OONF, OLSR, OSPF, etc),
+uses the betweenness centrality to optimize the timer's value and pushes back the optimized timer.
+Currently it only supports OLSRd2 (aka OONF).
+endef
+
+
+$(eval $(call BuildPackage,poprouting))

From 2fa9b0cec95e08f5a7fd8c5a25dd6708e67cbe83 Mon Sep 17 00:00:00 2001
From: Gabriel <gabriel@autistici.org>
Date: Wed, 25 Jan 2017 21:50:27 +0100
Subject: [PATCH 332/368] fixup! addedd poprouting makefile

---
 poprouting/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/poprouting/Makefile b/poprouting/Makefile
index 5df8cfe..bf9c3a9 100644
--- a/poprouting/Makefile
+++ b/poprouting/Makefile
@@ -12,17 +12,18 @@ PKG_SOURCE_URL:=https://github.com/gabri94/poprouting.git
 PKG_SOURCE_VERSION:=v0.2
 PKG_SOURCE_SUBDIR:=prince-v0.2
 include $(INCLUDE_DIR)/package.mk
+
 define Package/prince
 	SECTION :=net
 	CATEGORY :=Network
 	SUBMENU :=Routing and Redirection
 	Mantainer :=Gabriele Gemmi <gabriel@autistici.org>
 	TITLE :=PopRouting daemon
-	MENU :=0
+	MENU :=1
 	DEPENDS := +libjson-c +libpthread
 endef
 
-define Package/poprouting/description
+define Package/prince/description
 Prince is an open source implementation of the PopRouting Algorithm.
 It has been developed as a Google Summer of Code Project in collaboration with Freifunk and the University of Trento.
 

From ef885818ece0ed3fa031309d6b4f202d0ffdfb12 Mon Sep 17 00:00:00 2001
From: Gabriel <gabriel@autistici.org>
Date: Wed, 25 Jan 2017 21:58:08 +0100
Subject: [PATCH 333/368] fixup! fixup! addedd poprouting makefile

---
 poprouting/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/poprouting/Makefile b/poprouting/Makefile
index bf9c3a9..a2911ac 100644
--- a/poprouting/Makefile
+++ b/poprouting/Makefile
@@ -19,6 +19,7 @@ define Package/prince
 	SUBMENU :=Routing and Redirection
 	Mantainer :=Gabriele Gemmi <gabriel@autistici.org>
 	TITLE :=PopRouting daemon
+	URL :=https://github.com/gabri94/poprouting
 	MENU :=1
 	DEPENDS := +libjson-c +libpthread
 endef
@@ -33,4 +34,4 @@ Currently it only supports OLSRd2 (aka OONF).
 endef
 
 
-$(eval $(call BuildPackage,poprouting))
+$(eval $(call BuildPackage,prince))

From 7120a94aaf6fc52cda87eb3d7760bab527de40c8 Mon Sep 17 00:00:00 2001
From: Gabriel <gabriel@autistici.org>
Date: Wed, 25 Jan 2017 23:33:28 +0100
Subject: [PATCH 334/368] added install

---
 poprouting/Makefile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/poprouting/Makefile b/poprouting/Makefile
index a2911ac..dd1f454 100644
--- a/poprouting/Makefile
+++ b/poprouting/Makefile
@@ -20,7 +20,7 @@ define Package/prince
 	Mantainer :=Gabriele Gemmi <gabriel@autistici.org>
 	TITLE :=PopRouting daemon
 	URL :=https://github.com/gabri94/poprouting
-	MENU :=1
+	MENU :=0
 	DEPENDS := +libjson-c +libpthread
 endef
 
@@ -33,5 +33,13 @@ uses the betweenness centrality to optimize the timer's value and pushes back th
 Currently it only supports OLSRd2 (aka OONF).
 endef
 
+define Package/prince/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/graph-parser_c/build/lib/libgraphcparser.so $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/prince/build/prince_c $(1)/usr/sbin/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/prince/build/libprince_oonf.so $(1)/usr/lib/
+endef
+
 
 $(eval $(call BuildPackage,prince))

From 8941865af0cda443b96e785b97f739313840df86 Mon Sep 17 00:00:00 2001
From: Gabriel <gabriel@autistici.org>
Date: Thu, 26 Jan 2017 01:21:17 +0100
Subject: [PATCH 335/368] Changed description

---
 poprouting/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/poprouting/Makefile b/poprouting/Makefile
index dd1f454..6a88905 100644
--- a/poprouting/Makefile
+++ b/poprouting/Makefile
@@ -28,8 +28,9 @@ define Package/prince/description
 Prince is an open source implementation of the PopRouting Algorithm.
 It has been developed as a Google Summer of Code Project in collaboration with Freifunk and the University of Trento.
 
-It fetches topology data from a Link State routing deamon(OONF, OLSR, OSPF, etc),
-uses the betweenness centrality to optimize the timer's value and pushes back the optimized timer.
+It work by fetching topology data from a Link State routing demon(OONF, OLSR, OSPF, etc),
+calculating the betweenness centrality using the topology, then using these data
+the timer's value are optimized. Finally the timers are pushed back to the routing demon.
 Currently it only supports OLSRd2 (aka OONF).
 endef
 

From 8018159e9c48b0082076544061cb28acc5ce58fa Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 27 Jan 2017 13:23:39 +0100
Subject: [PATCH 336/368] batman-adv: use kernel-specific PKG_BUILD_DIR

The batman-adv Makefile set a PKG_BUILD_DIR outside of KERNEL_BUILD_DIR;
this could lead to batman-adv not being rebuilt when switching targets and
thus kernel configurations. This resulted in ABI mismatches and
occasionally broke the build with messages like the following:

    Package kmod-batman-adv is missing dependencies for the following libraries:
    crc16.ko

Instead of setting a better PKG_BUILD_DIR ourselves, we can just remove
the explicit PKG_BUILD_DIR definition and include kernel.mk before
package.mk to get the default definition used by other kernel module
packages.

Reported-by: David Lutz <kpanic@hirnduenger.de>
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
---
 batman-adv/Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index df64571..4c8e740 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -11,17 +11,15 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=batman-adv
 
 PKG_VERSION:=2016.5
-PKG_RELEASE:=0
+PKG_RELEASE:=1
 PKG_MD5SUM:=6717a933a08dd2a01b00df30cb9f16a8
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/batman-adv
   URL:=https://www.open-mesh.org/

From 1f2e4d7d03fc3d9e79c28581419911395bcde404 Mon Sep 17 00:00:00 2001
From: Marek Lindner <mareklindner@neomailbox.ch>
Date: Sun, 29 Jan 2017 19:46:17 +0800
Subject: [PATCH 337/368] batman-adv: compile batman v by default

Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
 batman-adv/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/batman-adv/Config.in b/batman-adv/Config.in
index 8c75f31..1b2399f 100644
--- a/batman-adv/Config.in
+++ b/batman-adv/Config.in
@@ -32,4 +32,4 @@ config KMOD_BATMAN_ADV_NC
 config KMOD_BATMAN_ADV_BATMAN_V
 	bool "enable batman v routing algorithm"
 	depends on PACKAGE_kmod-batman-adv
-	default n
+	default y

From 96fd90d9fa72732d67b66ba0f40a2c4413104063 Mon Sep 17 00:00:00 2001
From: Hans Dedecker <dedeckeh@gmail.com>
Date: Mon, 30 Jan 2017 10:50:46 +0100
Subject: [PATCH 338/368] nat46: support portless protocols in 1:1 share ratio

5fed76d nat46-core: support portless protocols in 1:1 share ratio
df4c7da nat46-core: minor code improvements
4e45bd5 treewide: fix white space errors

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
---
 nat46/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nat46/Makefile b/nat46/Makefile
index 0283dd4..47b5a5b 100644
--- a/nat46/Makefile
+++ b/nat46/Makefile
@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=nat46
-PKG_VERSION:=7
+PKG_VERSION:=8
 PKG_RELEASE:=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=https://github.com/ayourtch/nat46.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8ff2ae59ec9840a7b8b45f976c51cae80abe0226
+PKG_SOURCE_VERSION:=1cd9fc7025906e1825767b05615d2cf02e1528da
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
 PKG_LICENSE:=GPL-2.0
 

From c1c1e134d6a45715eb105e27b74d7fda81176808 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
Date: Wed, 25 Jan 2017 10:03:30 +0100
Subject: [PATCH 339/368] alfred: Add sha256 PKG_HASH for LEDE

Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
---
 alfred/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/alfred/Makefile b/alfred/Makefile
index b5d37ce..379c0fe 100644
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -14,6 +14,7 @@ PKG_NAME:=alfred
 PKG_VERSION:=2016.5
 PKG_RELEASE:=0
 PKG_MD5SUM:=e03d422ed3b5a162b90e8af13389523f
+PKG_HASH:=37b3babf7f37643cf296be11fb82d5730cf441a5a56f72fba96edae9f149c9d2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From 7fce5dbf3696d82fea5fb66eff2e6c7d29a43916 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
Date: Wed, 25 Jan 2017 10:03:30 +0100
Subject: [PATCH 340/368] batctl: Add sha256 PKG_HASH for LEDE

Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
---
 batctl/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/batctl/Makefile b/batctl/Makefile
index bf305a2..60c3dd9 100644
--- a/batctl/Makefile
+++ b/batctl/Makefile
@@ -12,6 +12,7 @@ PKG_NAME:=batctl
 PKG_VERSION:=2016.5
 PKG_RELEASE:=0
 PKG_MD5SUM:=7b33fb47c7fa5b317e9a152a286999fc
+PKG_HASH:=07edeb1d87a548285be8c499542790a158fc8d94ef7ebb295f27ebf710024ae9
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From 438114cc26e1ea24d20adab2b0afb9157de4e03f Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
Date: Wed, 25 Jan 2017 10:03:30 +0100
Subject: [PATCH 341/368] batman-adv: Add sha256 PKG_HASH for LEDE

Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
---
 batman-adv/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 4c8e740..59d1e6e 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -13,6 +13,7 @@ PKG_NAME:=batman-adv
 PKG_VERSION:=2016.5
 PKG_RELEASE:=1
 PKG_MD5SUM:=6717a933a08dd2a01b00df30cb9f16a8
+PKG_HASH:=d0a0fc90c4f410b57d043215e253bb0b855efa5edbe165d87c17bfdcfafd0db7
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From 0e8b0976f5a475126ba3f66aefcb75963fcddccb Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
Date: Mon, 30 Jan 2017 14:37:37 +0100
Subject: [PATCH 342/368] batman-adv: add patches from 2016.4-maint 2017-01-04

 * batman-adv: Decrease hardif refcnt on fragmentation send error

Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
---
 batman-adv/Makefile                           |  2 +-
 ...ase-hardif-refcnt-on-fragmentation-s.patch | 63 +++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 batman-adv/patches/0002-batman-adv-Decrease-hardif-refcnt-on-fragmentation-s.patch

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 59d1e6e..b33f368 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=batman-adv
 
 PKG_VERSION:=2016.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MD5SUM:=6717a933a08dd2a01b00df30cb9f16a8
 PKG_HASH:=d0a0fc90c4f410b57d043215e253bb0b855efa5edbe165d87c17bfdcfafd0db7
 
diff --git a/batman-adv/patches/0002-batman-adv-Decrease-hardif-refcnt-on-fragmentation-s.patch b/batman-adv/patches/0002-batman-adv-Decrease-hardif-refcnt-on-fragmentation-s.patch
new file mode 100644
index 0000000..92da394
--- /dev/null
+++ b/batman-adv/patches/0002-batman-adv-Decrease-hardif-refcnt-on-fragmentation-s.patch
@@ -0,0 +1,63 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Tue, 27 Dec 2016 08:51:17 +0100
+Subject: [PATCH] batman-adv: Decrease hardif refcnt on fragmentation send error
+
+An error before the hardif is found has to free the skb. But every error
+after that has to free the skb + put the hard interface.
+
+Fixes: 8b4132b1447a ("batman-adv: Consume skb in batadv_frag_send_packet")
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
+---
+ net/batman-adv/fragmentation.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
+index 9c561e6..0854ebd 100644
+--- a/net/batman-adv/fragmentation.c
++++ b/net/batman-adv/fragmentation.c
+@@ -474,7 +474,7 @@ int batadv_frag_send_packet(struct sk_buff *skb,
+ 	primary_if = batadv_primary_if_get_selected(bat_priv);
+ 	if (!primary_if) {
+ 		ret = -EINVAL;
+-		goto put_primary_if;
++		goto free_skb;
+ 	}
+ 
+ 	/* Create one header to be copied to all fragments */
+@@ -502,7 +502,7 @@ int batadv_frag_send_packet(struct sk_buff *skb,
+ 		skb_fragment = batadv_frag_create(skb, &frag_header, mtu);
+ 		if (!skb_fragment) {
+ 			ret = -ENOMEM;
+-			goto free_skb;
++			goto put_primary_if;
+ 		}
+ 
+ 		batadv_inc_counter(bat_priv, BATADV_CNT_FRAG_TX);
+@@ -511,7 +511,7 @@ int batadv_frag_send_packet(struct sk_buff *skb,
+ 		ret = batadv_send_unicast_skb(skb_fragment, neigh_node);
+ 		if (ret != NET_XMIT_SUCCESS) {
+ 			ret = NET_XMIT_DROP;
+-			goto free_skb;
++			goto put_primary_if;
+ 		}
+ 
+ 		frag_header.no++;
+@@ -519,7 +519,7 @@ int batadv_frag_send_packet(struct sk_buff *skb,
+ 		/* The initial check in this function should cover this case */
+ 		if (frag_header.no == BATADV_FRAG_MAX_FRAGMENTS - 1) {
+ 			ret = -EINVAL;
+-			goto free_skb;
++			goto put_primary_if;
+ 		}
+ 	}
+ 
+@@ -527,7 +527,7 @@ int batadv_frag_send_packet(struct sk_buff *skb,
+ 	if (batadv_skb_head_push(skb, header_size) < 0 ||
+ 	    pskb_expand_head(skb, header_size + ETH_HLEN, 0, GFP_ATOMIC) < 0) {
+ 		ret = -ENOMEM;
+-		goto free_skb;
++		goto put_primary_if;
+ 	}
+ 
+ 	memcpy(skb->data, &frag_header, header_size);

From 6c1a1a066670d2ac61a6d1d30906c2ed4d3f280c Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
Date: Mon, 30 Jan 2017 14:46:03 +0100
Subject: [PATCH 343/368] batman-adv: Fix "aggregated_ogms" setting

The new setting for aggregated_ogms was read from the correct config key.
But the setting was applied to the wrong file. Also the value to set was
not read from the correct variable.

Reported-by: Edward Beech <initialed85@gmail.com>
Fixes: 2d654c0af194 ("batman-adv: upgrade package to latest release 2012.0.0")
Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
---
 batman-adv/Makefile                       | 2 +-
 batman-adv/files/lib/batman-adv/config.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index b33f368..23dd732 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=batman-adv
 
 PKG_VERSION:=2016.5
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_MD5SUM:=6717a933a08dd2a01b00df30cb9f16a8
 PKG_HASH:=d0a0fc90c4f410b57d043215e253bb0b855efa5edbe165d87c17bfdcfafd0db7
 
diff --git a/batman-adv/files/lib/batman-adv/config.sh b/batman-adv/files/lib/batman-adv/config.sh
index 1429a43..e46628c 100644
--- a/batman-adv/files/lib/batman-adv/config.sh
+++ b/batman-adv/files/lib/batman-adv/config.sh
@@ -34,7 +34,7 @@ bat_config()
 
 	[ ! -f "/sys/class/net/$mesh/mesh/orig_interval" ] && echo "batman-adv mesh $mesh does not exist - check your interface configuration" && return 1
 
-	[ -n "$aggregate_ogms" ] && echo $aggregate_ogms > /sys/class/net/$mesh/mesh/aggregate_ogms
+	[ -n "$aggregated_ogms" ] && echo $aggregated_ogms > /sys/class/net/$mesh/mesh/aggregated_ogms
 	[ -n "$ap_isolation" ] && echo $ap_isolation > /sys/class/net/$mesh/mesh/ap_isolation
 	[ -n "$bonding" ] && echo $bonding > /sys/class/net/$mesh/mesh/bonding
 	[ -n "$bridge_loop_avoidance" ] && echo $bridge_loop_avoidance > /sys/class/net/$mesh/mesh/bridge_loop_avoidance 2>&-

From 8a66ed185709df5b9120e602fda760969bebd632 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
Date: Mon, 30 Jan 2017 14:52:25 +0100
Subject: [PATCH 344/368] batman-adv: Remove non-existing setting "vis_mode"

There is no vis_mode in the batman-adv kernel module since batman-adv
2014.0.0. So don't expose such a setting in uci.

Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
---
 batman-adv/files/etc/config/batman-adv    | 1 -
 batman-adv/files/lib/batman-adv/config.sh | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/batman-adv/files/etc/config/batman-adv b/batman-adv/files/etc/config/batman-adv
index f38855e..97be622 100644
--- a/batman-adv/files/etc/config/batman-adv
+++ b/batman-adv/files/etc/config/batman-adv
@@ -9,7 +9,6 @@ config 'mesh' 'bat0'
 	option 'gw_sel_class'
 	option 'log_level'
 	option 'orig_interval'
-	option 'vis_mode'
 	option 'bridge_loop_avoidance'
 	option 'distributed_arp_table'
 	option 'multicast_mode'
diff --git a/batman-adv/files/lib/batman-adv/config.sh b/batman-adv/files/lib/batman-adv/config.sh
index e46628c..3a746a3 100644
--- a/batman-adv/files/lib/batman-adv/config.sh
+++ b/batman-adv/files/lib/batman-adv/config.sh
@@ -13,7 +13,7 @@ bat_config()
 	local mesh="$1"
 	local aggregated_ogms ap_isolation bonding bridge_loop_avoidance distributed_arp_table fragmentation
 	local gw_bandwidth gw_mode gw_sel_class isolation_mark hop_penalty multicast_mode network_coding log_level
-	local orig_interval vis_mode
+	local orig_interval
 
 	config_get aggregated_ogms "$mesh" aggregated_ogms
 	config_get ap_isolation "$mesh" ap_isolation
@@ -30,7 +30,6 @@ bat_config()
 	config_get network_coding "$mesh" network_coding
 	config_get log_level "$mesh" log_level
 	config_get orig_interval "$mesh" orig_interval
-	config_get vis_mode "$mesh" vis_mode
 
 	[ ! -f "/sys/class/net/$mesh/mesh/orig_interval" ] && echo "batman-adv mesh $mesh does not exist - check your interface configuration" && return 1
 
@@ -49,5 +48,4 @@ bat_config()
 	[ -n "$network_coding" ] && echo $network_coding > /sys/class/net/$mesh/mesh/network_coding 2>&-
 	[ -n "$log_level" ] && echo $log_level > /sys/class/net/$mesh/mesh/log_level 2>&-
 	[ -n "$orig_interval" ] && echo $orig_interval > /sys/class/net/$mesh/mesh/orig_interval
-	[ -n "$vis_mode" ] && echo $vis_mode > /sys/class/net/$mesh/mesh/vis_mode
 }

From 54e47597d78937ed14440eddb5cb49555c5f9304 Mon Sep 17 00:00:00 2001
From: Ferry Huberts <ferry.huberts@pelagic.nl>
Date: Wed, 1 Feb 2017 18:47:49 +0100
Subject: [PATCH 345/368] olsrd: update to v0.9.6

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
---
 olsrd/Makefile                                   |  4 ++--
 olsrd/files/olsrd.config                         |  4 ++--
 olsrd/files/olsrd6.config                        |  2 +-
 olsrd/patches/.gitignore                         |  0
 olsrd/patches/missing-include-dirs-warning.patch | 12 ------------
 5 files changed, 5 insertions(+), 17 deletions(-)
 create mode 100644 olsrd/patches/.gitignore
 delete mode 100644 olsrd/patches/missing-include-dirs-warning.patch

diff --git a/olsrd/Makefile b/olsrd/Makefile
index cce17b9..aa5de7a 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
-PKG_VERSION:=0.9.5
+PKG_VERSION:=0.9.6
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/OLSR/olsrd.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=v0.9.5
+PKG_SOURCE_VERSION:=v0.9.6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_MD5SUM:=
 
diff --git a/olsrd/files/olsrd.config b/olsrd/files/olsrd.config
index f4ddfd0..15ea80a 100644
--- a/olsrd/files/olsrd.config
+++ b/olsrd/files/olsrd.config
@@ -14,10 +14,10 @@ config LoadPlugin
 	list Net '0.0.0.0 0.0.0.0'
 
 config LoadPlugin
-	option library 'olsrd_nameservice.so.0.3'
+	option library 'olsrd_nameservice.so.0.4'
 
 config LoadPlugin
-	option library 'olsrd_txtinfo.so.0.1'
+	option library 'olsrd_txtinfo.so.1.1'
 	option accept '0.0.0.0'
 
 config Interface
diff --git a/olsrd/files/olsrd6.config b/olsrd/files/olsrd6.config
index 37349e4..7a03f28 100644
--- a/olsrd/files/olsrd6.config
+++ b/olsrd/files/olsrd6.config
@@ -3,7 +3,7 @@ config olsrd
 	#option config_file '/etc/olsrd6.conf'
 
 config LoadPlugin
-	option library 'olsrd_txtinfo.so.0.1'
+	option library 'olsrd_txtinfo.so.1.1'
 	option accept '::'
 	option port '2007'
 
diff --git a/olsrd/patches/.gitignore b/olsrd/patches/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/olsrd/patches/missing-include-dirs-warning.patch b/olsrd/patches/missing-include-dirs-warning.patch
deleted file mode 100644
index 2bf0895..0000000
--- a/olsrd/patches/missing-include-dirs-warning.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur olsrd-0.9.5_orig/lib/pud/nmealib/Makefile.inc olsrd-0.9.5/lib/pud/nmealib/Makefile.inc
---- olsrd-0.9.5_orig/lib/pud/nmealib/Makefile.inc	2016-12-22 12:23:42.175283967 +0100
-+++ olsrd-0.9.5/lib/pud/nmealib/Makefile.inc	2016-12-22 12:24:24.591015066 +0100
-@@ -63,7 +63,7 @@
-                 -Wmissing-format-attribute -Wno-multichar -Wno-deprecated-declarations -Wendif-labels -Wwrite-strings \
-                 -Wbad-function-cast -Wpointer-arith -Wcast-qual -Wshadow -Wformat -Wsequence-point -Wcast-align \
-                 -Wnested-externs -Winline -Wdisabled-optimization -funit-at-a-time -fPIC -ggdb -Wformat=2 -Winit-self \
--                -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wconversion -Wdouble-promotion \
-+                -Wswitch-default -Wswitch-enum -Wconversion -Wdouble-promotion \
-                 -Werror=format-security -Wformat-security -Wformat-y2k -Wredundant-decls -Wundef -Wunreachable-code \
-                 -Wunused-parameter
- 

From ede4989259d385f3dcd63cbf6fb462e7bd6378a3 Mon Sep 17 00:00:00 2001
From: Ferry Huberts <ferry.huberts@pelagic.nl>
Date: Fri, 10 Feb 2017 11:14:52 +0100
Subject: [PATCH 346/368] olsrd: update to v0.9.6.1

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
---
 olsrd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/olsrd/Makefile b/olsrd/Makefile
index aa5de7a..9091efb 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
-PKG_VERSION:=0.9.6
+PKG_VERSION:=0.9.6.1
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/OLSR/olsrd.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=v0.9.6
+PKG_SOURCE_VERSION:=v0.9.6.1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_MD5SUM:=
 

From a7ce5a5d60bd2005da8fc5993dcb733290f32eb2 Mon Sep 17 00:00:00 2001
From: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Date: Thu, 9 Feb 2017 09:18:11 +0000
Subject: [PATCH 347/368] miniupnpd: add IGDv2 support as build option

Make IGDv2 support a build time option (default enabled)
Some devices (xbox one, windows home server) are not happy talking to an
IGDv2 enabled upnp server.

Remove 'portinuse' & 'igdv2' enabling patches backported from freebsd as
these can be configured via build time options in package makefile.

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
---
 miniupnpd/Makefile                                 | 12 +++++++++++-
 miniupnpd/patches/105-enable_check_portinuse.patch | 11 -----------
 miniupnpd/patches/106-enable_igdv2.patch           | 11 -----------
 3 files changed, 11 insertions(+), 23 deletions(-)
 delete mode 100644 miniupnpd/patches/105-enable_check_portinuse.patch
 delete mode 100644 miniupnpd/patches/106-enable_igdv2.patch

diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index fdfac91..5537e2c 100644
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -29,6 +29,13 @@ define Package/miniupnpd
   URL:=http://miniupnp.free.fr/
 endef
 
+define Package/miniupnpd/config
+config MINIUPNPD_IGDv2
+	bool
+	default y
+	prompt "Enable IGDv2"
+endef
+
 define Package/miniupnpd/conffiles
 /etc/config/upnpd
 endef
@@ -54,10 +61,13 @@ MAKE_FLAGS += \
 	LIBS="" \
 	CC="$(TARGET_CC) -DIPTABLES_143 \
 		-lip4tc $(if $(CONFIG_IPV6),-lip6tc) -luuid" \
-	CONFIG_OPTIONS="$(if $(CONFIG_IPV6),--ipv6) --leasefile" \
+	CONFIG_OPTIONS="--portinuse --leasefile \
+		$(if $(CONFIG_IPV6),--ipv6) \
+		$(if $(CONFIG_MINIUPNPD_IGDv2),--igd2)" \
 	-f Makefile.linux \
 	miniupnpd
 
+
 define Package/miniupnpd/install
 	$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/init.d $(1)/etc/config $(1)/etc/uci-defaults $(1)/etc/hotplug.d/iface $(1)/usr/share/miniupnpd
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/miniupnpd $(1)/usr/sbin/miniupnpd
diff --git a/miniupnpd/patches/105-enable_check_portinuse.patch b/miniupnpd/patches/105-enable_check_portinuse.patch
deleted file mode 100644
index 8bf6c33..0000000
--- a/miniupnpd/patches/105-enable_check_portinuse.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/genconfig.sh
-+++ b/genconfig.sh
-@@ -467,7 +467,7 @@ echo "/* Uncomment the following line to
- if [ -n "$PORTINUSE" ]; then
- 	echo "#define CHECK_PORTINUSE" >> ${CONFIGFILE}
- else
--	echo "/*#define CHECK_PORTINUSE*/" >> ${CONFIGFILE}
-+	echo "#define CHECK_PORTINUSE" >> ${CONFIGFILE}
- fi
- echo "" >> ${CONFIGFILE}
- 
diff --git a/miniupnpd/patches/106-enable_igdv2.patch b/miniupnpd/patches/106-enable_igdv2.patch
deleted file mode 100644
index 26811a0..0000000
--- a/miniupnpd/patches/106-enable_igdv2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/genconfig.sh
-+++ b/genconfig.sh
-@@ -516,7 +516,7 @@ echo " * control points, so enable with
- if [ -n "$IGD2" ]; then
- 	echo "#define IGD_V2" >> ${CONFIGFILE}
- else
--	echo "/*#define IGD_V2*/" >> ${CONFIGFILE}
-+	echo "#define IGD_V2" >> ${CONFIGFILE}
- fi
- echo "" >> ${CONFIGFILE}
- 

From 33dc373da9b24547d2bc30e9038ffdb97cb41744 Mon Sep 17 00:00:00 2001
From: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Date: Sat, 11 Feb 2017 19:13:29 +0000
Subject: [PATCH 348/368] miniupnpd: implement an 'enabled' flag

Add a 'master' miniupnpd service enable flag rather than just relying on
rcS.d script existence.  This allows the service to be disabled across
sysupgrade, similar to minidlna.

The service assumes enabled if no 'enabled' config flag is configured
for backwards compatibility.

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
---
 miniupnpd/files/miniupnpd.init | 6 +++++-
 miniupnpd/files/upnpd.config   | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/miniupnpd/files/miniupnpd.init b/miniupnpd/files/miniupnpd.init
index c7dc6a2..c934a28 100644
--- a/miniupnpd/files/miniupnpd.init
+++ b/miniupnpd/files/miniupnpd.init
@@ -68,7 +68,11 @@ start() {
 	local extip port usesysuptime conffile serial_number model_number
 	local uuid notify_interval presentation_url enable_upnp
 	local upnp_lease_file clean_ruleset_threshold clean_ruleset_interval
-        local ipv6_listening_ip
+        local ipv6_listening_ip enabled
+
+	config_get_bool enabled config enabled 1
+
+	[ "$enabled" -gt 0 ] || return 1
 
 	config_get extiface config external_iface
 	config_get extzone config external_zone
diff --git a/miniupnpd/files/upnpd.config b/miniupnpd/files/upnpd.config
index 56cde57..9a65bfa 100644
--- a/miniupnpd/files/upnpd.config
+++ b/miniupnpd/files/upnpd.config
@@ -1,4 +1,5 @@
 config upnpd config
+	option enabled		0
 	option enable_natpmp	1
 	option enable_upnp	1
 	option secure_mode	1

From f4bc87dc65729ef663f6dc9b7e157a909c5eb92b Mon Sep 17 00:00:00 2001
From: Bastian Bittorf <bb@npl.de>
Date: Sun, 12 Feb 2017 14:36:20 +0100
Subject: [PATCH 349/368] olsr: allow lazy-plugin-naming: e.g. olsrd_txtinfo
 (not olsrd_txtinfo.so.1.2)

overload init-skript's olsrd_write_loadplugin() with new function
find_most_recent_plugin_libary() - so now we can mix 'exact' and lazy
names. This change is backward compatible and now we have a better
migration strategy. This topic was hot again, after the latest updates
of a lot of plugins, resulting in non-working configs...
---
 olsrd/files/olsrd.init | 48 +++++++++++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/olsrd/files/olsrd.init b/olsrd/files/olsrd.init
index 258c7a5..9018b2e 100644
--- a/olsrd/files/olsrd.init
+++ b/olsrd/files/olsrd.init
@@ -475,32 +475,48 @@ olsrd_write_hna6() {
 	return 0
 }
 
-olsrd_write_loadplugin() {
-	local funcname="olsrd_write_loadplugin"
+find_most_recent_plugin_libary()
+{
+	local library="$1"
+	local file unixtime
+
+	for file in "/lib/$library"* "/usr/lib/$library"* "/usr/local/lib/$library"*; do {
+		[ -f "$file" ] && {
+			unixtime="$( date +%s -r "$file" )"
+			echo "$unixtime $file"
+		}
+	} done | sort -n | tail -n1 | cut -d' ' -f2
+}
+
+olsrd_write_loadplugin()
+{
+	local funcname='olsrd_write_loadplugin'
 	local cfg="$1"
+	local ignore name suffix lat lon latlon_infile
+
 	validate_varname "$cfg" || return 0
-	local ignore
-	local name
-	local suffix
-	local lat
-	local lon
-	local latlon_infile
 
 	config_get_bool ignore "$cfg" ignore 0
 	[ "$ignore" -ne 0 ] && return 0
 
+	# e.g. olsrd_txtinfo.so.1.1 or 'olsrd_txtinfo'
 	config_get library "$cfg" library
-	if ! validate_olsrd_option "$library"; then
-		warning_invalid_value olsrd "$cfg" "library"
-		return 0
-	fi
-	if ! [ -x "/lib/$library" -o -x "/usr/lib/$library" -o -x "/usr/local/lib/$library" ]; then
+
+	library="$( find_most_recent_plugin_libary "$library" )"
+	if [ -z "$library" ]; then
 		log "$funcname() Warning: Plugin library '$library' not found, skipped"
 		return 0
+	else
+		library="$( basename "$library" )"
 	fi
 
+	validate_olsrd_option "$library" || {
+		warning_invalid_value olsrd "$cfg" 'library'
+		return 0
+	}
+
 	case "$library" in
-		olsrd_nameservice.*)
+		'olsrd_nameservice.'*)
 			config_get name "$cfg" name
 			[ -z "$name" ] && config_set "$cfg" name $SYSTEM_HOSTNAME
 
@@ -527,7 +543,7 @@ olsrd_write_loadplugin() {
 
 			[ -z "$latlon_file" ] && config_set "$cfg" latlon_file '/var/run/latlon.js'
 		;;
-		olsrd_watchdog.*)
+		'olsrd_watchdog.'*)
 			config_get wd_file "$cfg" file
 		;;
 	esac
@@ -535,8 +551,6 @@ olsrd_write_loadplugin() {
 	echo -n "${N}LoadPlugin \"$library\"${N}{"
 	config_write_options "$OLSRD_LOADPLUGIN_SCHEMA" "$cfg" olsrd_write_plparam "${T}"
 	echo "${N}}"
-
-	return 0
 }
 
 olsrd_write_interface() {

From 0e71dbfba6a58a70dd6ef92e9c3138c4259f084d Mon Sep 17 00:00:00 2001
From: Bastian Bittorf <bb@npl.de>
Date: Sun, 12 Feb 2017 20:19:16 +0100
Subject: [PATCH 350/368] olsr: init-script: minor style changes

1) echo -n -> printf
2) do not 'return 0' in functions where rc is 0 anyway
3) calc with $(( $var + $x )) -> $(( var + x ))
---
 olsrd/files/olsrd.init | 63 +++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 37 deletions(-)

diff --git a/olsrd/files/olsrd.init b/olsrd/files/olsrd.init
index 9018b2e..f5b8660 100644
--- a/olsrd/files/olsrd.init
+++ b/olsrd/files/olsrd.init
@@ -17,15 +17,15 @@ N='
 '
 
 log() {
-	logger -t olsrd -p daemon.info -s "${initscript}: $@"
+	logger -t olsrd -p daemon.info -s "${initscript}: $*"
 }
 
 error() {
-        logger -t olsrd -p daemon.err -s "${initscript}: ERROR: $@"
+        logger -t olsrd -p daemon.err -s "${initscript}: ERROR: $*"
 }
 
 warn() {
-        logger -t olsrd -p daemon.warn -s "${initscript}: WARNING: $@"
+        logger -t olsrd -p daemon.warn -s "${initscript}: WARNING: $*"
 }
 
 validate_varname() {
@@ -124,22 +124,21 @@ olsrd_write_option() {
 		fi
 	fi
 
-	echo -n "${N}$param$option $value"
-
-	return 0
+	printf '%s' "${N}$param$option $value"
 }
 
 olsrd_write_plparam() {
 	local funcname="olsrd_write_plparam"
 	local param="$1"
 	local cfg="$2"
-	validate_varname "$cfg" || return 1
 	local option="$3"
-	validate_varname "$option" || return 1
 	local value="$4"
 	local option_type="$5"
 	local _option oldIFS
 
+	validate_varname "$cfg" || return 1
+	validate_varname "$option" || return 1
+
 	if [ "$option_type" = bool ]; then
 		case "$value" in
 			1|on|true|enabled|yes) value=yes;;
@@ -180,9 +179,7 @@ olsrd_write_plparam() {
 		[ -z "$ifname" ] || value=$ifname
 	fi
 
-	echo -n "${N}${param}PlParam \"$option\" \"$value\""
-
-	return 0
+	printf '%s' "${N}${param}PlParam \"$option\" \"$value\""
 }
 
 config_update_schema() {
@@ -274,7 +271,7 @@ config_write_options() {
 	already_in_schema "speed" && {
 		get_value_for_entry "speed"
 
-		if [ 2>/dev/null $value -gt 0 -a $value -le 20 ]; then
+		if test 2>/dev/null "$value" -gt 0 -a "$value" -le 20 ; then
 			speed="$value"
 		else
 			log "$funcname() Warning: invalid speed-value: '$value' - allowed integers: 1...20, fallback to 6"
@@ -290,30 +287,30 @@ config_write_options() {
 		if [ -n "$speed" ]; then		# like sven-ola freifunk firmware fff-1.7.4
 			case "$schema_entry" in
 				HelloInterval)
-					value="$(( $speed / 2 + 1 )).0"
+					value="$(( speed / 2 + 1 )).0"
 				;;
 				HelloValidityTime)
-					value="$(( $speed * 25 )).0"
+					value="$(( speed * 25 )).0"
 				;;
-				TcInterval)	# todo: not fisheye? -> $(( $speed * 2 ))
-					value=$(( $speed / 2 ))
+				TcInterval)	# todo: not fisheye? -> $(( speed * 2 ))
+					value=$(( speed / 2 ))
 					[ $value -eq 0 ] && value=1
 					value="$value.0"
 				;;
 				TcValidityTime)
-					value="$(( $speed * 100 )).0"
+					value="$(( speed * 100 )).0"
 				;;
 				MidInterval)
-					value="$(( $speed * 5 )).0"
+					value="$(( speed * 5 )).0"
 				;;
 				MidValidityTime)
-					value="$(( $speed * 100 )).0"
+					value="$(( speed * 100 )).0"
 				;;
 				HnaInterval)
-					value="$(( $speed * 2 )).0"
+					value="$(( speed * 2 )).0"
 				;;
 				HnaValidityTime)
-					value="$(( $speed * 25 )).0"
+					value="$(( speed * 25 )).0"
 				;;
 				*)
 					get_value_for_entry "$schema_entry" || continue
@@ -413,12 +410,10 @@ olsrd_write_ipcconnect() {
 
 	[ "$IPCCONNECT_COUNT" -gt 0 ] && return 0
 
-	echo -n "${N}IpcConnect${N}{"
+	printf '%s' "${N}IpcConnect${N}{"
 	config_write_options "$OLSRD_IPCCONNECT_SCHEMA" "$cfg" olsrd_write_option "${T}"
 	echo "${N}}"
 	IPCCONNECT_COUNT=$((IPCCONNECT_COUNT + 1))
-
-	return 0
 }
 
 olsrd_write_hna4() {
@@ -441,11 +436,9 @@ olsrd_write_hna4() {
 		return 0
 	fi
 
-	[ "$HNA4_COUNT" -le 0 ] && echo -n "${N}Hna4${N}{"
-	echo -n "${N}${T}${T}$netaddr $netmask"
+	[ "$HNA4_COUNT" -le 0 ] && printf '%s' "${N}Hna4${N}{"
+	printf '%s' "${N}${T}${T}$netaddr $netmask"
 	HNA4_COUNT=$((HNA4_COUNT + 1))
-
-	return 0
 }
 
 olsrd_write_hna6() {
@@ -468,11 +461,9 @@ olsrd_write_hna6() {
 		return 0
 	fi
 
-	[ "$HNA6_COUNT" -le 0 ] && echo -n "${N}Hna6${N}{"
-	echo -n "${N}${T}${T}$netaddr $prefix"
+	[ "$HNA6_COUNT" -le 0 ] && printf '%s' "${N}Hna6${N}{"
+	printf '%s' "${N}${T}${T}$netaddr $prefix"
 	HNA6_COUNT=$((HNA6_COUNT + 1))
-
-	return 0
 }
 
 find_most_recent_plugin_libary()
@@ -548,7 +539,7 @@ olsrd_write_loadplugin()
 		;;
 	esac
 
-	echo -n "${N}LoadPlugin \"$library\"${N}{"
+	printf '%s' "${N}LoadPlugin \"$library\"${N}{"
 	config_write_options "$OLSRD_LOADPLUGIN_SCHEMA" "$cfg" olsrd_write_plparam "${T}"
 	echo "${N}}"
 }
@@ -589,19 +580,17 @@ olsrd_write_interface() {
 
 	[ -z "$ifnames" ] && return 0
 
-	echo -n "${N}Interface$ifnames${N}{"
+	printf '%s' "${N}Interface$ifnames${N}{"
 	config_write_options "$OLSRD_INTERFACE_SCHEMA" "$cfg" olsrd_write_option "${T}"
 	echo "${N}}"
 	INTERFACES_COUNT=$((INTERFACES_COUNT + 1))
-
-	return 0
 }
 
 olsrd_write_interface_defaults() {
 	local cfg="$1"
 	validate_varname "$cfg" || return 0
 
-	echo -n "${N}InterfaceDefaults$ifnames${N}{"
+	printf '%s' "${N}InterfaceDefaults$ifnames${N}{"
 	config_write_options "$OLSRD_INTERFACE_DEFAULTS_SCHEMA" "$cfg" olsrd_write_option "${T}"
 	echo "${N}}"
 

From 22c05861e6168e74cd91d202a5ea4119f38d1ce1 Mon Sep 17 00:00:00 2001
From: Bastian Bittorf <bb@npl.de>
Date: Sun, 12 Feb 2017 20:22:23 +0100
Subject: [PATCH 351/368] olsr: smartfw: fix a syntax error whwile checking for
 'nowan'

introduced in 059b26c2 in 2011-nov-14 ("Manuel Munz freifunk@somakoma.de modified init
file of olsrd with improvements for 6and4 operation and also for setup of smartgw")
---
 olsrd/files/olsrd.init | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/olsrd/files/olsrd.init b/olsrd/files/olsrd.init
index f5b8660..48ca281 100644
--- a/olsrd/files/olsrd.init
+++ b/olsrd/files/olsrd.init
@@ -717,7 +717,7 @@ olsrd_setup_smartgw_rules() {
 				$IP4T -I forwarding_rule -o tnl_+ -j ACCEPT
 				$IP4T -t nat -I postrouting_rule -o tnl_+ -j MASQUERADE
 				# Allow forwarding from tunl0 to (all) wan-interfaces
-				if [ "$nowan"="0" ]; then
+				if [ "$nowan" = '0' ]; then
 					for IFACE in $wanifnames; do
 						$IP4T -A forwarding_rule -i tunl0 -o $IFACE -j ACCEPT
 					done
@@ -728,7 +728,7 @@ olsrd_setup_smartgw_rules() {
 				done
 			elif [ "$smartgatewayuplink" = "ipv6" ]; then
 				$IP6T -I forwarding_rule -o tnl_+ -j ACCEPT
-				if [ "$nowan"="0" ]; then
+				if [ "$nowan" = '0' ]; then
 					for IFACE in $wanifnames; do
 						$IP6T -A forwarding_rule -i tunl0 -o $IFACE -j ACCEPT
 					done
@@ -740,7 +740,7 @@ olsrd_setup_smartgw_rules() {
 				$IP4T -t nat -I postrouting_rule -o tnl_+ -j MASQUERADE
 				for IPT in $IP4T $IP6T; do
 					$IPT -I forwarding_rule -o tnl_+ -j ACCEPT
-					if [ "$nowan"="0" ]; then
+					if [ "$nowan" = '0' ]; then
 						for IFACE in $wanifnames; do
 							$IPT -A forwarding_rule -i tunl0 -o $IFACE -j ACCEPT
 						done

From 67939e59a2b7d59fc16e1df6d7916006708e67b3 Mon Sep 17 00:00:00 2001
From: Bastian Bittorf <bb@npl.de>
Date: Sun, 12 Feb 2017 20:37:28 +0100
Subject: [PATCH 352/368] olsr: fix minor complain from 'shellcheck'

---
 olsrd/files/olsrd.init | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/olsrd/files/olsrd.init b/olsrd/files/olsrd.init
index 48ca281..b21d8ea 100644
--- a/olsrd/files/olsrd.init
+++ b/olsrd/files/olsrd.init
@@ -176,6 +176,7 @@ olsrd_write_plparam() {
 		else
 			warning_invalid_value olsrd "$cfg" "NonOlsrIf"
 		fi
+
 		[ -z "$ifname" ] || value=$ifname
 	fi
 
@@ -184,15 +185,16 @@ olsrd_write_plparam() {
 
 config_update_schema() {
 	local schema_varname="$1"
-	validate_varname "$schema_varname" || return 1
 	local command="$2"
-	validate_varname "$command" || return 1
 	local option="$3"
-	validate_varname "$option" || return 1
 	local value="$4"
 	local schema
 	local cur_option
 
+	validate_varname "$schema_varname" || return 1
+	validate_varname "$command" || return 1
+	validate_varname "$option" || return 1
+
 	case "$varname" in
 		*_LENGTH) return 0;;
 		*_ITEM*) return 0;;
@@ -393,6 +395,8 @@ olsrd_write_olsrd() {
 
 	config_get smartgateway "$cfg" SmartGateway
 	config_get smartgatewayuplink "$cfg" SmartGatewayUplink
+	export smartgateway
+	export smartgatewayuplink
 
 	config_write_options "$OLSRD_OLSRD_SCHEMA" "$cfg" olsrd_write_option
 	echo
@@ -599,13 +603,13 @@ olsrd_write_interface_defaults() {
 
 olsrd_update_schema() {
 	local command="$1"
-	validate_varname "$command" || return 0
 	local varname="$2"
-	validate_varname "$varname" || return 0
 	local value="$3"
 	local cfg="$CONFIG_SECTION"
 	local cfgt
-	local cur_varname
+
+	validate_varname "$command" || return 0
+	validate_varname "$varname" || return 0
 
 	config_get cfgt "$cfg" TYPE
 	case "$cfgt" in
@@ -643,7 +647,7 @@ get_wan_ifnames()
 {
 	local wanifnames word catch_next
 
-	which ip >/dev/null || return 1
+	command -v ip >/dev/null || return 1
 
 	set -- $( ip route list exact 0.0.0.0/0 table all )
 	for word in $*; do
@@ -672,8 +676,10 @@ get_wan_ifnames()
 
 olsrd_setup_smartgw_rules() {
 	local funcname="olsrd_setup_smartgw_rules"
-	# Check if ipip is installed
-	[ -e /etc/modules.d/[0-9]*-ipip ] || {
+	local file=
+
+	for file in /etc/modules.d/[0-9]*-ipip; do :; done
+	[ -e "$file" ] || {
 		log "$funcname() Warning: kmod-ipip is missing. SmartGateway will not work until you install it."
 		return 1
 	}
@@ -686,8 +692,8 @@ olsrd_setup_smartgw_rules() {
 		nowan=0
 	fi
 
-	IP4T=$(which iptables)
-	IP6T=$(which ip6tables)
+	IP4T="$( command -v iptables )"
+	IP6T="$( command -v ip6tables )"
 
 	# Delete smartgw firewall rules first
 	if [ "$UCI_CONF_NAME" = "olsrd6" ]; then
@@ -709,8 +715,10 @@ olsrd_setup_smartgw_rules() {
 		while $IP4T -t nat -D postrouting_rule -o tnl_+ -j MASQUERADE 2> /dev/null; do :;done
 	fi
 
+	# var 'smartgateway' + 'smartgatewayuplink' build in olsrd_write_olsrd()
 	if [ "$smartgateway" = "yes" ]; then
 		log "$funcname() Notice: Inserting firewall rules for SmartGateway"
+
 		if [ ! "$smartgatewayuplink" = "none" ]; then
 			if [ "$smartgatewayuplink" = "ipv4" ]; then
 				# Allow everything to be forwarded to tnl_+ and use NAT for it

From 824f1a68e3eba8e0c8f90026e7ae652465cc1de2 Mon Sep 17 00:00:00 2001
From: Bastian Bittorf <bb@npl.de>
Date: Sun, 12 Feb 2017 20:41:04 +0100
Subject: [PATCH 353/368] olsr: hotplug: fix a wrong grep (never successful) in
 olsrd_interface_already_in_config()

---
 olsrd/files/olsrd.hotplug.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/olsrd/files/olsrd.hotplug.sh b/olsrd/files/olsrd.hotplug.sh
index 99e834e..ee41a2e 100755
--- a/olsrd/files/olsrd.hotplug.sh
+++ b/olsrd/files/olsrd.hotplug.sh
@@ -15,14 +15,14 @@ olsrd_list_configured_interfaces()
 			;;
 		esac
 
-		i=$(( $i + 1 ))
+		i=$(( i + 1 ))
 	} done
 }
 
 olsrd_interface_already_in_config()
 {
 	# e.g.: 'Interface "eth0.1" "eth0.2" "wlan0"'
-	if grep -s ^'Interface ' '/var/etc/$OLSRD.conf' | grep -q "\"$DEVICE\""; then
+	if grep -s ^'Interface ' "/var/etc/$OLSRD.conf" | grep -q "\"$DEVICE\""; then
 		logger -t olsrd_hotplug -p daemon.debug "[OK] already_active: '$INTERFACE' => '$DEVICE'"
 		return 0
 	else

From c91ced72795bc0e75c7b617dac16c14d4567352b Mon Sep 17 00:00:00 2001
From: Bastian Bittorf <bb@npl.de>
Date: Mon, 13 Feb 2017 16:25:37 +0100
Subject: [PATCH 354/368] olsrd: init-script: fix new plugin-lazymode

make sure that we do not select
'olsrd_dyn_gw_plain.so.0.4' if user wants
'olsrd_dyn_gw.so.0.5'
---
 olsrd/files/olsrd.init | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/olsrd/files/olsrd.init b/olsrd/files/olsrd.init
index b21d8ea..bbb4e07 100644
--- a/olsrd/files/olsrd.init
+++ b/olsrd/files/olsrd.init
@@ -472,13 +472,18 @@ olsrd_write_hna6() {
 
 find_most_recent_plugin_libary()
 {
-	local library="$1"
+	local library="$1"	# e.g. 'olsrd_dyn_gw' or 'olsrd_txtinfo.so.1.1'
 	local file unixtime
 
 	for file in "/lib/$library"* "/usr/lib/$library"* "/usr/local/lib/$library"*; do {
 		[ -f "$file" ] && {
-			unixtime="$( date +%s -r "$file" )"
-			echo "$unixtime $file"
+			# make sure that we do not select
+			# 'olsrd_dyn_gw_plain.so.0.4' if user wants
+			# 'olsrd_dyn_gw.so.0.5' -> compare part before 1st dot
+			[ "${library%%.*}" = "${file%%.*}" ] && {
+				unixtime="$( date +%s -r "$file" )"
+				echo "$unixtime $file"
+			}
 		}
 	} done | sort -n | tail -n1 | cut -d' ' -f2
 }

From f15b8246fabbf042cf520b40876247e654396a54 Mon Sep 17 00:00:00 2001
From: Bastian Bittorf <bb@npl.de>
Date: Tue, 14 Feb 2017 08:58:22 +0100
Subject: [PATCH 355/368] olsrd: find_most_recent_plugin_libary() fix input
 with 'exact' filenames

---
 olsrd/files/olsrd.init | 1 +
 1 file changed, 1 insertion(+)

diff --git a/olsrd/files/olsrd.init b/olsrd/files/olsrd.init
index bbb4e07..7f7aecc 100644
--- a/olsrd/files/olsrd.init
+++ b/olsrd/files/olsrd.init
@@ -477,6 +477,7 @@ find_most_recent_plugin_libary()
 
 	for file in "/lib/$library"* "/usr/lib/$library"* "/usr/local/lib/$library"*; do {
 		[ -f "$file" ] && {
+			file="$( basename "$file" )"
 			# make sure that we do not select
 			# 'olsrd_dyn_gw_plain.so.0.4' if user wants
 			# 'olsrd_dyn_gw.so.0.5' -> compare part before 1st dot

From 4ef6404bcb1e39908bb8e365a83dd01913c3a9d7 Mon Sep 17 00:00:00 2001
From: Pau Escrich <p4u@dabax.net>
Date: Tue, 21 Feb 2017 17:18:29 +0100
Subject: [PATCH 356/368] bmx6: update to d9b985

Signed-off-by: Pau Escrich <p4u@dabax.net>
---
 bmx6/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bmx6/Makefile b/bmx6/Makefile
index 425c298..411d9cb 100644
--- a/bmx6/Makefile
+++ b/bmx6/Makefile
@@ -31,8 +31,8 @@ PKG_SOURCE_PROTO:=git
 #PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
 PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 
-PKG_REV:=2a87b770d3f9c254e3927dc159e2f425f2e0e83a
-PKG_VERSION:=r2015080701
+PKG_REV:=d9b985d8838ad6fe6d5c79f858a588b96abcf306
+PKG_VERSION:=r2017021601
 PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 

From 2a5a5e18375a5eaf90bceb3c356d0291e7eb9edc Mon Sep 17 00:00:00 2001
From: Bastian Bittorf <bb@npl.de>
Date: Fri, 24 Feb 2017 15:12:19 +0100
Subject: [PATCH 357/368] olsrd: find_most_recent_plugin_libary() fix sorting

---
 olsrd/files/olsrd.init | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/olsrd/files/olsrd.init b/olsrd/files/olsrd.init
index 7f7aecc..8e562c1 100644
--- a/olsrd/files/olsrd.init
+++ b/olsrd/files/olsrd.init
@@ -473,16 +473,17 @@ olsrd_write_hna6() {
 find_most_recent_plugin_libary()
 {
 	local library="$1"	# e.g. 'olsrd_dyn_gw' or 'olsrd_txtinfo.so.1.1'
-	local file unixtime
+	local file file_fullpath unixtime
 
 	for file in "/lib/$library"* "/usr/lib/$library"* "/usr/local/lib/$library"*; do {
 		[ -f "$file" ] && {
+			file_fullpath="$file"
 			file="$( basename "$file" )"
 			# make sure that we do not select
 			# 'olsrd_dyn_gw_plain.so.0.4' if user wants
 			# 'olsrd_dyn_gw.so.0.5' -> compare part before 1st dot
 			[ "${library%%.*}" = "${file%%.*}" ] && {
-				unixtime="$( date +%s -r "$file" )"
+				unixtime="$( date +%s -r "$file_fullpath" )"
 				echo "$unixtime $file"
 			}
 		}

From 0a4df2c301edf0e014c36210c1283cf089fbd651 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Sun, 26 Feb 2017 15:11:20 +0100
Subject: [PATCH 358/368] batman-adv: add patches from 2016.5-maint 2017-02-21

 * batman-adv: Fix double free during fragment merge error
 * batman-adv: Fix transmission of final, 16th fragment

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batman-adv/Makefile                           |  2 +-
 ...ouble-free-during-fragment-merge-err.patch | 61 +++++++++++++++++++
 ...-transmission-of-final-16th-fragment.patch | 54 ++++++++++++++++
 3 files changed, 116 insertions(+), 1 deletion(-)
 create mode 100644 batman-adv/patches/0003-batman-adv-Fix-double-free-during-fragment-merge-err.patch
 create mode 100644 batman-adv/patches/0004-batman-adv-Fix-transmission-of-final-16th-fragment.patch

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index a2eb702..d3e916e 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=batman-adv
 
 PKG_VERSION:=2016.5
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_MD5SUM:=6717a933a08dd2a01b00df30cb9f16a8
 PKG_HASH:=d0a0fc90c4f410b57d043215e253bb0b855efa5edbe165d87c17bfdcfafd0db7
 
diff --git a/batman-adv/patches/0003-batman-adv-Fix-double-free-during-fragment-merge-err.patch b/batman-adv/patches/0003-batman-adv-Fix-double-free-during-fragment-merge-err.patch
new file mode 100644
index 0000000..f4baf46
--- /dev/null
+++ b/batman-adv/patches/0003-batman-adv-Fix-double-free-during-fragment-merge-err.patch
@@ -0,0 +1,61 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Sun, 12 Feb 2017 11:26:33 +0100
+Subject: [PATCH] batman-adv: Fix double free during fragment merge error
+
+The function batadv_frag_skb_buffer was supposed not to consume the skbuff
+on errors. This was followed in the helper function
+batadv_frag_insert_packet when the skb would potentially be inserted in the
+fragment queue. But it could happen that the next helper function
+batadv_frag_merge_packets would try to merge the fragments and fail. This
+results in a kfree_skb of all the enqueued fragments (including the just
+inserted one). batadv_recv_frag_packet would detect the error in
+batadv_frag_skb_buffer and try to free the skb again.
+
+The behavior of batadv_frag_skb_buffer (and its helper
+batadv_frag_insert_packet) must therefore be changed to always consume the
+skbuff to have a common behavior and avoid the double kfree_skb.
+
+Fixes: 9b3eab61754d ("batman-adv: Receive fragmented packets and merge")
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+
+Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/e3bab02816097f860545d9ce9ae0808c69d7c92f
+---
+ net/batman-adv/fragmentation.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
+index 0854ebd8..31e97e9a 100644
+--- a/net/batman-adv/fragmentation.c
++++ b/net/batman-adv/fragmentation.c
+@@ -239,8 +239,10 @@ err_unlock:
+ 	spin_unlock_bh(&chain->lock);
+ 
+ err:
+-	if (!ret)
++	if (!ret) {
+ 		kfree(frag_entry_new);
++		kfree_skb(skb);
++	}
+ 
+ 	return ret;
+ }
+@@ -313,7 +315,7 @@ free:
+  *
+  * There are three possible outcomes: 1) Packet is merged: Return true and
+  * set *skb to merged packet; 2) Packet is buffered: Return true and set *skb
+- * to NULL; 3) Error: Return false and leave skb as is.
++ * to NULL; 3) Error: Return false and free skb.
+  *
+  * Return: true when packet is merged or buffered, false when skb is not not
+  * used.
+@@ -338,9 +340,9 @@ bool batadv_frag_skb_buffer(struct sk_buff **skb,
+ 		goto out_err;
+ 
+ out:
+-	*skb = skb_out;
+ 	ret = true;
+ out_err:
++	*skb = skb_out;
+ 	return ret;
+ }
+ 
diff --git a/batman-adv/patches/0004-batman-adv-Fix-transmission-of-final-16th-fragment.patch b/batman-adv/patches/0004-batman-adv-Fix-transmission-of-final-16th-fragment.patch
new file mode 100644
index 0000000..6dec0f6
--- /dev/null
+++ b/batman-adv/patches/0004-batman-adv-Fix-transmission-of-final-16th-fragment.patch
@@ -0,0 +1,54 @@
+From: Linus Lüssing <linus.luessing@c0d3.blue>
+Date: Mon, 13 Feb 2017 20:44:31 +0100
+Subject: [PATCH] batman-adv: Fix transmission of final, 16th fragment
+
+Trying to split and transmit a unicast packet in 16 parts will fail for
+the final fragment: After having sent the 15th one with a frag_packet.no
+index of 14, we will increase the the index to 15 - and return with an
+error code immediately, even though one more fragment is due for
+transmission and allowed.
+
+Fixing this issue by moving the check before incrementing the index.
+
+While at it, adding an unlikely(), because the check is actually more of
+an assertion.
+
+Fixes: db56e4ecf5c2 ("batman-adv: Fragment and send skbs larger than mtu")
+Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+
+Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/464eff3b1768ff190466a453a57ac140ea5cb756
+---
+ net/batman-adv/fragmentation.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
+index 31e97e9a..11149e5b 100644
+--- a/net/batman-adv/fragmentation.c
++++ b/net/batman-adv/fragmentation.c
+@@ -501,6 +501,12 @@ int batadv_frag_send_packet(struct sk_buff *skb,
+ 
+ 	/* Eat and send fragments from the tail of skb */
+ 	while (skb->len > max_fragment_size) {
++		/* The initial check in this function should cover this case */
++		if (unlikely(frag_header.no == BATADV_FRAG_MAX_FRAGMENTS - 1)) {
++			ret = -EINVAL;
++			goto put_primary_if;
++		}
++
+ 		skb_fragment = batadv_frag_create(skb, &frag_header, mtu);
+ 		if (!skb_fragment) {
+ 			ret = -ENOMEM;
+@@ -517,12 +523,6 @@ int batadv_frag_send_packet(struct sk_buff *skb,
+ 		}
+ 
+ 		frag_header.no++;
+-
+-		/* The initial check in this function should cover this case */
+-		if (frag_header.no == BATADV_FRAG_MAX_FRAGMENTS - 1) {
+-			ret = -EINVAL;
+-			goto put_primary_if;
+-		}
+ 	}
+ 
+ 	/* Make room for the fragment header. */

From f5b1fe1a603fcb49543ae85323d01b52b4b4fd18 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Tue, 28 Feb 2017 19:25:27 +0100
Subject: [PATCH 359/368] batman-adv: upgrade package to latest release 2017.0

 * support latest kernels (3.2 - 4.11)
 * remove bridge loop avoidance addresses from translation table
 * allow to build B.A.T.M.A.N. V without cfg80211 integration on Linux <
 * 3.16
 * coding style cleanups and refactoring
 * bugs squashed:
   - fix interface reference counter on fragmentation errors
   - avoid double free on fragment merge error
   - fix support for up to 16 fragments
   - fix build of multicast compatibility code on some architectures

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batman-adv/Makefile                           |  8 +--
 batman-adv/files/compat-hacks.h               |  9 +++
 ...mpat-fallback-for-batadv_getlink_net.patch | 29 ---------
 ...ase-hardif-refcnt-on-fragmentation-s.patch | 63 -------------------
 ...ouble-free-during-fragment-merge-err.patch | 61 ------------------
 ...-transmission-of-final-16th-fragment.patch | 54 ----------------
 6 files changed, 13 insertions(+), 211 deletions(-)
 delete mode 100644 batman-adv/patches/0001-Add-compat-fallback-for-batadv_getlink_net.patch
 delete mode 100644 batman-adv/patches/0002-batman-adv-Decrease-hardif-refcnt-on-fragmentation-s.patch
 delete mode 100644 batman-adv/patches/0003-batman-adv-Fix-double-free-during-fragment-merge-err.patch
 delete mode 100644 batman-adv/patches/0004-batman-adv-Fix-transmission-of-final-16th-fragment.patch

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index d3e916e..0ba7310 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -10,10 +10,10 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
 
-PKG_VERSION:=2016.5
-PKG_RELEASE:=4
-PKG_MD5SUM:=6717a933a08dd2a01b00df30cb9f16a8
-PKG_HASH:=d0a0fc90c4f410b57d043215e253bb0b855efa5edbe165d87c17bfdcfafd0db7
+PKG_VERSION:=2017.0
+PKG_RELEASE:=0
+PKG_MD5SUM:=1b3121f0baa8771ff6d8ad172c95904f
+PKG_HASH:=65df01222bc51ec788fb1b6dc63feaf69d393f2d0a96e347d55de83b1602c509
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
diff --git a/batman-adv/files/compat-hacks.h b/batman-adv/files/compat-hacks.h
index af91f41..6c98a98 100644
--- a/batman-adv/files/compat-hacks.h
+++ b/batman-adv/files/compat-hacks.h
@@ -33,6 +33,15 @@
 
 #endif /* < KERNEL_VERSION(4, 5, 0) */
 
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)
+
+/* wild hack for batadv_getlink_net only */
+#define get_link_net get_xstats_size || 1 ? fallback_net : (struct net*)netdev->rtnl_link_ops->get_xstats_size
+
+#endif /* < KERNEL_VERSION(4, 0, 0) */
+
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0)
 
 struct sk_buff *skb_checksum_trimmed(struct sk_buff *skb,
diff --git a/batman-adv/patches/0001-Add-compat-fallback-for-batadv_getlink_net.patch b/batman-adv/patches/0001-Add-compat-fallback-for-batadv_getlink_net.patch
deleted file mode 100644
index c641828..0000000
--- a/batman-adv/patches/0001-Add-compat-fallback-for-batadv_getlink_net.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Fri, 23 Sep 2016 14:55:38 +0200
-Subject: [PATCH] Add compat fallback for batadv_getlink_net
----
- net/batman-adv/hard-interface.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
-index 61a431a9..6969f580 100644
---- a/net/batman-adv/hard-interface.c
-+++ b/net/batman-adv/hard-interface.c
-@@ -95,6 +95,9 @@ out:
- static struct net *batadv_getlink_net(const struct net_device *netdev,
- 				      struct net *fallback_net)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)
-+	return fallback_net;
-+#else
- 	if (!netdev->rtnl_link_ops)
- 		return fallback_net;
- 
-@@ -102,6 +105,7 @@ static struct net *batadv_getlink_net(const struct net_device *netdev,
- 		return fallback_net;
- 
- 	return netdev->rtnl_link_ops->get_link_net(netdev);
-+#endif
- }
- 
- /**
diff --git a/batman-adv/patches/0002-batman-adv-Decrease-hardif-refcnt-on-fragmentation-s.patch b/batman-adv/patches/0002-batman-adv-Decrease-hardif-refcnt-on-fragmentation-s.patch
deleted file mode 100644
index 92da394..0000000
--- a/batman-adv/patches/0002-batman-adv-Decrease-hardif-refcnt-on-fragmentation-s.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Tue, 27 Dec 2016 08:51:17 +0100
-Subject: [PATCH] batman-adv: Decrease hardif refcnt on fragmentation send error
-
-An error before the hardif is found has to free the skb. But every error
-after that has to free the skb + put the hard interface.
-
-Fixes: 8b4132b1447a ("batman-adv: Consume skb in batadv_frag_send_packet")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
----
- net/batman-adv/fragmentation.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
-index 9c561e6..0854ebd 100644
---- a/net/batman-adv/fragmentation.c
-+++ b/net/batman-adv/fragmentation.c
-@@ -474,7 +474,7 @@ int batadv_frag_send_packet(struct sk_buff *skb,
- 	primary_if = batadv_primary_if_get_selected(bat_priv);
- 	if (!primary_if) {
- 		ret = -EINVAL;
--		goto put_primary_if;
-+		goto free_skb;
- 	}
- 
- 	/* Create one header to be copied to all fragments */
-@@ -502,7 +502,7 @@ int batadv_frag_send_packet(struct sk_buff *skb,
- 		skb_fragment = batadv_frag_create(skb, &frag_header, mtu);
- 		if (!skb_fragment) {
- 			ret = -ENOMEM;
--			goto free_skb;
-+			goto put_primary_if;
- 		}
- 
- 		batadv_inc_counter(bat_priv, BATADV_CNT_FRAG_TX);
-@@ -511,7 +511,7 @@ int batadv_frag_send_packet(struct sk_buff *skb,
- 		ret = batadv_send_unicast_skb(skb_fragment, neigh_node);
- 		if (ret != NET_XMIT_SUCCESS) {
- 			ret = NET_XMIT_DROP;
--			goto free_skb;
-+			goto put_primary_if;
- 		}
- 
- 		frag_header.no++;
-@@ -519,7 +519,7 @@ int batadv_frag_send_packet(struct sk_buff *skb,
- 		/* The initial check in this function should cover this case */
- 		if (frag_header.no == BATADV_FRAG_MAX_FRAGMENTS - 1) {
- 			ret = -EINVAL;
--			goto free_skb;
-+			goto put_primary_if;
- 		}
- 	}
- 
-@@ -527,7 +527,7 @@ int batadv_frag_send_packet(struct sk_buff *skb,
- 	if (batadv_skb_head_push(skb, header_size) < 0 ||
- 	    pskb_expand_head(skb, header_size + ETH_HLEN, 0, GFP_ATOMIC) < 0) {
- 		ret = -ENOMEM;
--		goto free_skb;
-+		goto put_primary_if;
- 	}
- 
- 	memcpy(skb->data, &frag_header, header_size);
diff --git a/batman-adv/patches/0003-batman-adv-Fix-double-free-during-fragment-merge-err.patch b/batman-adv/patches/0003-batman-adv-Fix-double-free-during-fragment-merge-err.patch
deleted file mode 100644
index f4baf46..0000000
--- a/batman-adv/patches/0003-batman-adv-Fix-double-free-during-fragment-merge-err.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Sun, 12 Feb 2017 11:26:33 +0100
-Subject: [PATCH] batman-adv: Fix double free during fragment merge error
-
-The function batadv_frag_skb_buffer was supposed not to consume the skbuff
-on errors. This was followed in the helper function
-batadv_frag_insert_packet when the skb would potentially be inserted in the
-fragment queue. But it could happen that the next helper function
-batadv_frag_merge_packets would try to merge the fragments and fail. This
-results in a kfree_skb of all the enqueued fragments (including the just
-inserted one). batadv_recv_frag_packet would detect the error in
-batadv_frag_skb_buffer and try to free the skb again.
-
-The behavior of batadv_frag_skb_buffer (and its helper
-batadv_frag_insert_packet) must therefore be changed to always consume the
-skbuff to have a common behavior and avoid the double kfree_skb.
-
-Fixes: 9b3eab61754d ("batman-adv: Receive fragmented packets and merge")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-
-Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/e3bab02816097f860545d9ce9ae0808c69d7c92f
----
- net/batman-adv/fragmentation.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
-index 0854ebd8..31e97e9a 100644
---- a/net/batman-adv/fragmentation.c
-+++ b/net/batman-adv/fragmentation.c
-@@ -239,8 +239,10 @@ err_unlock:
- 	spin_unlock_bh(&chain->lock);
- 
- err:
--	if (!ret)
-+	if (!ret) {
- 		kfree(frag_entry_new);
-+		kfree_skb(skb);
-+	}
- 
- 	return ret;
- }
-@@ -313,7 +315,7 @@ free:
-  *
-  * There are three possible outcomes: 1) Packet is merged: Return true and
-  * set *skb to merged packet; 2) Packet is buffered: Return true and set *skb
-- * to NULL; 3) Error: Return false and leave skb as is.
-+ * to NULL; 3) Error: Return false and free skb.
-  *
-  * Return: true when packet is merged or buffered, false when skb is not not
-  * used.
-@@ -338,9 +340,9 @@ bool batadv_frag_skb_buffer(struct sk_buff **skb,
- 		goto out_err;
- 
- out:
--	*skb = skb_out;
- 	ret = true;
- out_err:
-+	*skb = skb_out;
- 	return ret;
- }
- 
diff --git a/batman-adv/patches/0004-batman-adv-Fix-transmission-of-final-16th-fragment.patch b/batman-adv/patches/0004-batman-adv-Fix-transmission-of-final-16th-fragment.patch
deleted file mode 100644
index 6dec0f6..0000000
--- a/batman-adv/patches/0004-batman-adv-Fix-transmission-of-final-16th-fragment.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Linus Lüssing <linus.luessing@c0d3.blue>
-Date: Mon, 13 Feb 2017 20:44:31 +0100
-Subject: [PATCH] batman-adv: Fix transmission of final, 16th fragment
-
-Trying to split and transmit a unicast packet in 16 parts will fail for
-the final fragment: After having sent the 15th one with a frag_packet.no
-index of 14, we will increase the the index to 15 - and return with an
-error code immediately, even though one more fragment is due for
-transmission and allowed.
-
-Fixing this issue by moving the check before incrementing the index.
-
-While at it, adding an unlikely(), because the check is actually more of
-an assertion.
-
-Fixes: db56e4ecf5c2 ("batman-adv: Fragment and send skbs larger than mtu")
-Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-
-Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/464eff3b1768ff190466a453a57ac140ea5cb756
----
- net/batman-adv/fragmentation.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
-index 31e97e9a..11149e5b 100644
---- a/net/batman-adv/fragmentation.c
-+++ b/net/batman-adv/fragmentation.c
-@@ -501,6 +501,12 @@ int batadv_frag_send_packet(struct sk_buff *skb,
- 
- 	/* Eat and send fragments from the tail of skb */
- 	while (skb->len > max_fragment_size) {
-+		/* The initial check in this function should cover this case */
-+		if (unlikely(frag_header.no == BATADV_FRAG_MAX_FRAGMENTS - 1)) {
-+			ret = -EINVAL;
-+			goto put_primary_if;
-+		}
-+
- 		skb_fragment = batadv_frag_create(skb, &frag_header, mtu);
- 		if (!skb_fragment) {
- 			ret = -ENOMEM;
-@@ -517,12 +523,6 @@ int batadv_frag_send_packet(struct sk_buff *skb,
- 		}
- 
- 		frag_header.no++;
--
--		/* The initial check in this function should cover this case */
--		if (frag_header.no == BATADV_FRAG_MAX_FRAGMENTS - 1) {
--			ret = -EINVAL;
--			goto put_primary_if;
--		}
- 	}
- 
- 	/* Make room for the fragment header. */

From 62f4fa6ee43b5905d72905630299aef79c908b58 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Tue, 28 Feb 2017 19:26:10 +0100
Subject: [PATCH 360/368] batctl: upgrade package to latest release 2017.0

 * remove root check for read-only sysfs and rtnl functionality
 * coding style cleanups
 * bugs squashed:
   - fix check for root privileges when started under modified effective
     uid

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batctl/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/batctl/Makefile b/batctl/Makefile
index 24bd16b..819d42b 100644
--- a/batctl/Makefile
+++ b/batctl/Makefile
@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batctl
 
-PKG_VERSION:=2016.5
+PKG_VERSION:=2017.0
 PKG_RELEASE:=0
-PKG_MD5SUM:=7b33fb47c7fa5b317e9a152a286999fc
-PKG_HASH:=07edeb1d87a548285be8c499542790a158fc8d94ef7ebb295f27ebf710024ae9
+PKG_MD5SUM:=17c0ac0746f1994ddacc88ebf48e5aec
+PKG_HASH:=c0bb1127d6070b46abeb8d6a63d1150d71fa85f87f9a846873b649a21934c686
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From bc114d5acbfcca9bc7bc3f0845e27672897fd6a0 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Tue, 28 Feb 2017 19:26:50 +0100
Subject: [PATCH 361/368] alfred: upgrade package to latest release 2017.0

 * support IPv4 multicast distribution
 * coding style cleanups

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 alfred/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/alfred/Makefile b/alfred/Makefile
index 379c0fe..8b2d9e3 100644
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk
 # The latest alfred git hash in PKG_REV can be obtained from https://git.open-mesh.org/alfred.git
 #
 PKG_NAME:=alfred
-PKG_VERSION:=2016.5
+PKG_VERSION:=2017.0
 PKG_RELEASE:=0
-PKG_MD5SUM:=e03d422ed3b5a162b90e8af13389523f
-PKG_HASH:=37b3babf7f37643cf296be11fb82d5730cf441a5a56f72fba96edae9f149c9d2
+PKG_MD5SUM:=2e9ae897b1d477f14d06389eb7c1f97b
+PKG_HASH:=f8d6d83d2ce30b2238354ce12073285387c0f4ca1a28060390ff50b411b50fa8
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

From 1eccf0ec67ad661ed754de7d1488b4cdb5534960 Mon Sep 17 00:00:00 2001
From: gabri94 <gabriel@autistici.org>
Date: Wed, 1 Mar 2017 09:23:48 +0100
Subject: [PATCH 362/368] New makefile for prince v0.3

---
 poprouting/Makefile | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/poprouting/Makefile b/poprouting/Makefile
index 6a88905..cb43487 100644
--- a/poprouting/Makefile
+++ b/poprouting/Makefile
@@ -1,16 +1,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=prince
-PKG_VERSION:=v0.2
-PKG_RELEASE:=2
+PKG_VERSION:=v0.3
+PKG_RELEASE:=3
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/prince-$(PKG_VERSION)
 PKG_USE_MIPS16:=0
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE:=prince-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/gabri94/poprouting.git
-PKG_SOURCE_VERSION:=v0.2
-PKG_SOURCE_SUBDIR:=prince-v0.2
+PKG_SOURCE_VERSION:=346e59afefe5c46ddd6377a814da40254f64d26d
+PKG_SOURCE_SUBDIR:=prince-v0.3
 include $(INCLUDE_DIR)/package.mk
 
 define Package/prince
@@ -36,10 +36,9 @@ endef
 
 define Package/prince/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/graph-parser_c/build/lib/libgraphcparser.so $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/prince/build/prince_c $(1)/usr/sbin/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/prince/build/libprince_oonf.so $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/output/prince $(1)/usr/sbin/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/output/libprince_oonf_c.so $(1)/usr/lib/
 endef
 
 

From 7da2bbccc02ab0ee05619adf04ee339a03acfa97 Mon Sep 17 00:00:00 2001
From: gabri94 <gabriel@autistici.org>
Date: Thu, 2 Mar 2017 12:55:11 +0100
Subject: [PATCH 363/368] compile v0.3

---
 poprouting/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/poprouting/Makefile b/poprouting/Makefile
index cb43487..28b2010 100644
--- a/poprouting/Makefile
+++ b/poprouting/Makefile
@@ -9,7 +9,7 @@ PKG_USE_MIPS16:=0
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE:=prince-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/gabri94/poprouting.git
-PKG_SOURCE_VERSION:=346e59afefe5c46ddd6377a814da40254f64d26d
+PKG_SOURCE_VERSION:=v0.3
 PKG_SOURCE_SUBDIR:=prince-v0.3
 include $(INCLUDE_DIR)/package.mk
 

From aa6c4711cdcb7bdeb19dce76ebd1d868400833a3 Mon Sep 17 00:00:00 2001
From: gabri94 <gabriel@autistici.org>
Date: Thu, 2 Mar 2017 18:06:11 +0100
Subject: [PATCH 364/368] Symbolic Version number

---
 poprouting/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/poprouting/Makefile b/poprouting/Makefile
index 28b2010..67f3701 100644
--- a/poprouting/Makefile
+++ b/poprouting/Makefile
@@ -4,13 +4,13 @@ PKG_NAME:=prince
 PKG_VERSION:=v0.3
 PKG_RELEASE:=3
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/prince-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_USE_MIPS16:=0
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE:=prince-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/gabri94/poprouting.git
 PKG_SOURCE_VERSION:=v0.3
-PKG_SOURCE_SUBDIR:=prince-v0.3
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 include $(INCLUDE_DIR)/package.mk
 
 define Package/prince

From 50560d22db24ebf0dabab15f17312728697cdff6 Mon Sep 17 00:00:00 2001
From: Gabriel <gabriel@autistici.org>
Date: Sat, 4 Mar 2017 17:17:22 +0100
Subject: [PATCH 365/368] Makefile for v0.3.1

---
 poprouting/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/poprouting/Makefile b/poprouting/Makefile
index 67f3701..c68db92 100644
--- a/poprouting/Makefile
+++ b/poprouting/Makefile
@@ -1,15 +1,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=prince
-PKG_VERSION:=v0.3
-PKG_RELEASE:=3
+PKG_VERSION:=v0.3.1
+PKG_RELEASE:=4
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_USE_MIPS16:=0
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE:=prince-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/gabri94/poprouting.git
-PKG_SOURCE_VERSION:=v0.3
+PKG_SOURCE_VERSION:=v0.3.1
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 include $(INCLUDE_DIR)/package.mk
 

From 1c0419755d9d7c0f723fa3aa7fe166db07172db2 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Sat, 4 Mar 2017 17:08:47 +0100
Subject: [PATCH 366/368] batman-adv: Add bugfixes for 2017.0.1

 * batman-adv: average: change to declare precision, not factor
 * batman-adv: Keep fragments equally sized
 * batman-adv: Initialize gw sel_class via batadv_algo

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batman-adv/files/compat-hacks.h               |  75 ++++++++++
 ...ge-change-to-declare-precision-not-f.patch | 132 ++++++++++++++++
 ...man-adv-Keep-fragments-equally-sized.patch | 103 +++++++++++++
 ...tialize-gw-sel_class-via-batadv_algo.patch | 141 ++++++++++++++++++
 4 files changed, 451 insertions(+)
 create mode 100644 batman-adv/patches/0001-batman-adv-average-change-to-declare-precision-not-f.patch
 create mode 100644 batman-adv/patches/0002-batman-adv-Keep-fragments-equally-sized.patch
 create mode 100644 batman-adv/patches/0003-batman-adv-Initialize-gw-sel_class-via-batadv_algo.patch

diff --git a/batman-adv/files/compat-hacks.h b/batman-adv/files/compat-hacks.h
index 6c98a98..8c8a889 100644
--- a/batman-adv/files/compat-hacks.h
+++ b/batman-adv/files/compat-hacks.h
@@ -213,3 +213,78 @@ static inline int batadv_nla_put_u64_64bit(struct sk_buff *skb, int attrtype,
 #define __ro_after_init
 
 #endif /* < KERNEL_VERSION(4, 10, 0) */
+
+/* <DECLARE_EWMA> */
+
+#include <linux/version.h>
+#include_next <linux/average.h>
+
+#include <linux/bug.h>
+
+#ifdef DECLARE_EWMA
+#undef DECLARE_EWMA
+#endif /* DECLARE_EWMA */
+
+/*
+ * Exponentially weighted moving average (EWMA)
+ *
+ * This implements a fixed-precision EWMA algorithm, with both the
+ * precision and fall-off coefficient determined at compile-time
+ * and built into the generated helper funtions.
+ *
+ * The first argument to the macro is the name that will be used
+ * for the struct and helper functions.
+ *
+ * The second argument, the precision, expresses how many bits are
+ * used for the fractional part of the fixed-precision values.
+ *
+ * The third argument, the weight reciprocal, determines how the
+ * new values will be weighed vs. the old state, new values will
+ * get weight 1/weight_rcp and old values 1-1/weight_rcp. Note
+ * that this parameter must be a power of two for efficiency.
+ */
+
+#define DECLARE_EWMA(name, _precision, _weight_rcp)			\
+	struct ewma_##name {						\
+		unsigned long internal;					\
+	};								\
+	static inline void ewma_##name##_init(struct ewma_##name *e)	\
+	{								\
+		BUILD_BUG_ON(!__builtin_constant_p(_precision));	\
+		BUILD_BUG_ON(!__builtin_constant_p(_weight_rcp));	\
+		/*							\
+		 * Even if you want to feed it just 0/1 you should have	\
+		 * some bits for the non-fractional part...		\
+		 */							\
+		BUILD_BUG_ON((_precision) > 30);			\
+		BUILD_BUG_ON_NOT_POWER_OF_2(_weight_rcp);		\
+		e->internal = 0;					\
+	}								\
+	static inline unsigned long					\
+	ewma_##name##_read(struct ewma_##name *e)			\
+	{								\
+		BUILD_BUG_ON(!__builtin_constant_p(_precision));	\
+		BUILD_BUG_ON(!__builtin_constant_p(_weight_rcp));	\
+		BUILD_BUG_ON((_precision) > 30);			\
+		BUILD_BUG_ON_NOT_POWER_OF_2(_weight_rcp);		\
+		return e->internal >> (_precision);			\
+	}								\
+	static inline void ewma_##name##_add(struct ewma_##name *e,	\
+					     unsigned long val)		\
+	{								\
+		unsigned long internal = ACCESS_ONCE(e->internal);	\
+		unsigned long weight_rcp = ilog2(_weight_rcp);		\
+		unsigned long precision = _precision;			\
+									\
+		BUILD_BUG_ON(!__builtin_constant_p(_precision));	\
+		BUILD_BUG_ON(!__builtin_constant_p(_weight_rcp));	\
+		BUILD_BUG_ON((_precision) > 30);			\
+		BUILD_BUG_ON_NOT_POWER_OF_2(_weight_rcp);		\
+									\
+		ACCESS_ONCE(e->internal) = internal ?			\
+			(((internal << weight_rcp) - internal) +	\
+				(val << precision)) >> weight_rcp :	\
+			(val << precision);				\
+	}
+
+/* </DECLARE_EWMA> */
diff --git a/batman-adv/patches/0001-batman-adv-average-change-to-declare-precision-not-f.patch b/batman-adv/patches/0001-batman-adv-average-change-to-declare-precision-not-f.patch
new file mode 100644
index 0000000..c2f9467
--- /dev/null
+++ b/batman-adv/patches/0001-batman-adv-average-change-to-declare-precision-not-f.patch
@@ -0,0 +1,132 @@
+From: Johannes Berg <johannes.berg@intel.com>
+Date: Wed, 15 Feb 2017 09:49:26 +0100
+Subject: [PATCH] batman-adv: average: change to declare precision, not factor
+
+Declaring the factor is counter-intuitive, and people are prone
+to using small(-ish) values even when that makes no sense.
+
+Change the DECLARE_EWMA() macro to take the fractional precision,
+in bits, rather than a factor, and update all users.
+
+While at it, add some more documentation.
+
+Acked-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+[sven@narfation.org: Added compatibility code]
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+---
+ compat-include/linux/average.h | 67 +++++++++++++++++++++++++++---------------
+ net/batman-adv/types.h         |  2 +-
+ 2 files changed, 45 insertions(+), 24 deletions(-)
+
+diff --git a/compat-include/linux/average.h b/compat-include/linux/average.h
+index ec022cb6..a1e3c254 100644
+--- a/compat-include/linux/average.h
++++ b/compat-include/linux/average.h
+@@ -26,49 +26,70 @@
+ 
+ #include <linux/bug.h>
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
++#undef DECLARE_EWMA
++#endif /* < KERNEL_VERSION(4, 3, 0) */
+ 
+-/* Exponentially weighted moving average (EWMA) */
++/*
++ * Exponentially weighted moving average (EWMA)
++ *
++ * This implements a fixed-precision EWMA algorithm, with both the
++ * precision and fall-off coefficient determined at compile-time
++ * and built into the generated helper funtions.
++ *
++ * The first argument to the macro is the name that will be used
++ * for the struct and helper functions.
++ *
++ * The second argument, the precision, expresses how many bits are
++ * used for the fractional part of the fixed-precision values.
++ *
++ * The third argument, the weight reciprocal, determines how the
++ * new values will be weighed vs. the old state, new values will
++ * get weight 1/weight_rcp and old values 1-1/weight_rcp. Note
++ * that this parameter must be a power of two for efficiency.
++ */
+ 
+-#define DECLARE_EWMA(name, _factor, _weight)				\
++#define DECLARE_EWMA(name, _precision, _weight_rcp)			\
+ 	struct ewma_##name {						\
+ 		unsigned long internal;					\
+ 	};								\
+ 	static inline void ewma_##name##_init(struct ewma_##name *e)	\
+ 	{								\
+-		BUILD_BUG_ON(!__builtin_constant_p(_factor));		\
+-		BUILD_BUG_ON(!__builtin_constant_p(_weight));		\
+-		BUILD_BUG_ON_NOT_POWER_OF_2(_factor);			\
+-		BUILD_BUG_ON_NOT_POWER_OF_2(_weight);			\
++		BUILD_BUG_ON(!__builtin_constant_p(_precision));	\
++		BUILD_BUG_ON(!__builtin_constant_p(_weight_rcp));	\
++		/*							\
++		 * Even if you want to feed it just 0/1 you should have	\
++		 * some bits for the non-fractional part...		\
++		 */							\
++		BUILD_BUG_ON((_precision) > 30);			\
++		BUILD_BUG_ON_NOT_POWER_OF_2(_weight_rcp);		\
+ 		e->internal = 0;					\
+ 	}								\
+ 	static inline unsigned long					\
+ 	ewma_##name##_read(struct ewma_##name *e)			\
+ 	{								\
+-		BUILD_BUG_ON(!__builtin_constant_p(_factor));		\
+-		BUILD_BUG_ON(!__builtin_constant_p(_weight));		\
+-		BUILD_BUG_ON_NOT_POWER_OF_2(_factor);			\
+-		BUILD_BUG_ON_NOT_POWER_OF_2(_weight);			\
+-		return e->internal >> ilog2(_factor);			\
++		BUILD_BUG_ON(!__builtin_constant_p(_precision));	\
++		BUILD_BUG_ON(!__builtin_constant_p(_weight_rcp));	\
++		BUILD_BUG_ON((_precision) > 30);			\
++		BUILD_BUG_ON_NOT_POWER_OF_2(_weight_rcp);		\
++		return e->internal >> (_precision);			\
+ 	}								\
+ 	static inline void ewma_##name##_add(struct ewma_##name *e,	\
+ 					     unsigned long val)		\
+ 	{								\
+ 		unsigned long internal = ACCESS_ONCE(e->internal);	\
+-		unsigned long weight = ilog2(_weight);			\
+-		unsigned long factor = ilog2(_factor);			\
++		unsigned long weight_rcp = ilog2(_weight_rcp);		\
++		unsigned long precision = _precision;			\
+ 									\
+-		BUILD_BUG_ON(!__builtin_constant_p(_factor));		\
+-		BUILD_BUG_ON(!__builtin_constant_p(_weight));		\
+-		BUILD_BUG_ON_NOT_POWER_OF_2(_factor);			\
+-		BUILD_BUG_ON_NOT_POWER_OF_2(_weight);			\
++		BUILD_BUG_ON(!__builtin_constant_p(_precision));	\
++		BUILD_BUG_ON(!__builtin_constant_p(_weight_rcp));	\
++		BUILD_BUG_ON((_precision) > 30);			\
++		BUILD_BUG_ON_NOT_POWER_OF_2(_weight_rcp);		\
+ 									\
+ 		ACCESS_ONCE(e->internal) = internal ?			\
+-			(((internal << weight) - internal) +		\
+-				(val << factor)) >> weight :		\
+-			(val << factor);				\
++			(((internal << weight_rcp) - internal) +	\
++				(val << precision)) >> weight_rcp :	\
++			(val << precision);				\
+ 	}
+ 
+-#endif /* < KERNEL_VERSION(4, 3, 0) */
+-
+ #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_AVERAGE_H */
+diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
+index 8f64a5c0..66b25e41 100644
+--- a/net/batman-adv/types.h
++++ b/net/batman-adv/types.h
+@@ -402,7 +402,7 @@ struct batadv_gw_node {
+ 	struct rcu_head rcu;
+ };
+ 
+-DECLARE_EWMA(throughput, 1024, 8)
++DECLARE_EWMA(throughput, 10, 8)
+ 
+ /**
+  * struct batadv_hardif_neigh_node_bat_v - B.A.T.M.A.N. V private neighbor
diff --git a/batman-adv/patches/0002-batman-adv-Keep-fragments-equally-sized.patch b/batman-adv/patches/0002-batman-adv-Keep-fragments-equally-sized.patch
new file mode 100644
index 0000000..3286cf3
--- /dev/null
+++ b/batman-adv/patches/0002-batman-adv-Keep-fragments-equally-sized.patch
@@ -0,0 +1,103 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Wed, 22 Feb 2017 17:25:42 +0100
+Subject: [PATCH] batman-adv: Keep fragments equally sized
+
+The batman-adv fragmentation packets have the design problem that they
+cannot be refragmented and cannot handle padding by the underlying link.
+The latter often leads to problems when networks are incorrectly configured
+and don't use a common MTU.
+
+The sender could for example fragment a 1271 byte frame (plus external
+ethernet header (14) and batadv unicast header (10)) to fit in a 1280 bytes
+large MTU of the underlying link (max. 1294 byte frames). This would create
+a 1294 bytes large frame (fragment 2) and a 55 bytes large frame
+(fragment 1). The extra 54 bytes are the fragment header (20) added to each
+fragment and the external ethernet header (14) for the second fragment.
+
+Let us assume that the next hop is then not able to transport 1294 bytes to
+its next hop. The 1294 byte large frame will be dropped but the 55 bytes
+large fragment will still be forwarded to its destination.
+
+Or let us assume that the underlying hardware requires that each frame has
+a minimum size (e.g. 60 bytes). Then it will pad the 55 bytes frame to 60
+bytes. The receiver of the 60 bytes frame will no longer be able to
+correctly assemble the two frames together because it is not aware that 5
+bytes of the 60 bytes frame are padding and don't belong to the reassembled
+frame.
+
+This can partly be avoided by splitting frames more equally. In this
+example, the 675 and 674 bytes large fragment frames could both potentially
+reach its destination without being too large or too small.
+
+Reported-by: Martin Weinelt <martin@darmstadt.freifunk.net>
+Fixes: db56e4ecf5c2 ("batman-adv: Fragment and send skbs larger than mtu")
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+Acked-by: Linus Lüssing <linus.luessing@c0d3.blue>
+---
+ net/batman-adv/fragmentation.c | 20 +++++++++++++-------
+ 1 file changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
+index 11a23fd6..8f964bea 100644
+--- a/net/batman-adv/fragmentation.c
++++ b/net/batman-adv/fragmentation.c
+@@ -404,7 +404,7 @@ bool batadv_frag_skb_fwd(struct sk_buff *skb,
+  * batadv_frag_create - create a fragment from skb
+  * @skb: skb to create fragment from
+  * @frag_head: header to use in new fragment
+- * @mtu: size of new fragment
++ * @fragment_size: size of new fragment
+  *
+  * Split the passed skb into two fragments: A new one with size matching the
+  * passed mtu and the old one with the rest. The new skb contains data from the
+@@ -414,11 +414,11 @@ bool batadv_frag_skb_fwd(struct sk_buff *skb,
+  */
+ static struct sk_buff *batadv_frag_create(struct sk_buff *skb,
+ 					  struct batadv_frag_packet *frag_head,
+-					  unsigned int mtu)
++					  unsigned int fragment_size)
+ {
+ 	struct sk_buff *skb_fragment;
+ 	unsigned int header_size = sizeof(*frag_head);
+-	unsigned int fragment_size = mtu - header_size;
++	unsigned int mtu = fragment_size + header_size;
+ 
+ 	skb_fragment = netdev_alloc_skb(NULL, mtu + ETH_HLEN);
+ 	if (!skb_fragment)
+@@ -456,7 +456,7 @@ int batadv_frag_send_packet(struct sk_buff *skb,
+ 	struct sk_buff *skb_fragment;
+ 	unsigned int mtu = neigh_node->if_incoming->net_dev->mtu;
+ 	unsigned int header_size = sizeof(frag_header);
+-	unsigned int max_fragment_size, max_packet_size;
++	unsigned int max_fragment_size, num_fragments;
+ 	int ret;
+ 
+ 	/* To avoid merge and refragmentation at next-hops we never send
+@@ -464,10 +464,15 @@ int batadv_frag_send_packet(struct sk_buff *skb,
+ 	 */
+ 	mtu = min_t(unsigned int, mtu, BATADV_FRAG_MAX_FRAG_SIZE);
+ 	max_fragment_size = mtu - header_size;
+-	max_packet_size = max_fragment_size * BATADV_FRAG_MAX_FRAGMENTS;
++
++	if (skb->len == 0 || max_fragment_size == 0)
++		return -EINVAL;
++
++	num_fragments = (skb->len - 1) / max_fragment_size + 1;
++	max_fragment_size = (skb->len - 1) / num_fragments + 1;
+ 
+ 	/* Don't even try to fragment, if we need more than 16 fragments */
+-	if (skb->len > max_packet_size) {
++	if (num_fragments > BATADV_FRAG_MAX_FRAGMENTS) {
+ 		ret = -EAGAIN;
+ 		goto free_skb;
+ 	}
+@@ -507,7 +512,8 @@ int batadv_frag_send_packet(struct sk_buff *skb,
+ 			goto put_primary_if;
+ 		}
+ 
+-		skb_fragment = batadv_frag_create(skb, &frag_header, mtu);
++		skb_fragment = batadv_frag_create(skb, &frag_header,
++						  max_fragment_size);
+ 		if (!skb_fragment) {
+ 			ret = -ENOMEM;
+ 			goto put_primary_if;
diff --git a/batman-adv/patches/0003-batman-adv-Initialize-gw-sel_class-via-batadv_algo.patch b/batman-adv/patches/0003-batman-adv-Initialize-gw-sel_class-via-batadv_algo.patch
new file mode 100644
index 0000000..f65ac45
--- /dev/null
+++ b/batman-adv/patches/0003-batman-adv-Initialize-gw-sel_class-via-batadv_algo.patch
@@ -0,0 +1,141 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Sat, 4 Mar 2017 15:48:50 +0100
+Subject: [PATCH] batman-adv: Initialize gw sel_class via batadv_algo
+
+The gateway selection class variable is shared between different algorithm
+versions. But the interpretation of the content is algorithm specific. The
+initialization is therefore also algorithm specific.
+
+But this was implemented incorrectly and the initialization for BATMAN_V
+always overwrote the value previously written for BATMAN_IV. This could
+only be avoided when BATMAN_V was disabled during compile time.
+
+Using a special batadv_algo hook for this initialization avoids this
+problem.
+
+Fixes: 80b2d47be2c7 ("batman-adv: B.A.T.M.A.N. V - implement GW selection logic")
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+---
+ net/batman-adv/bat_iv_ogm.c     | 11 +++++++++++
+ net/batman-adv/bat_v.c          | 14 +++++++++++---
+ net/batman-adv/gateway_common.c |  5 +++++
+ net/batman-adv/soft-interface.c |  1 -
+ net/batman-adv/types.h          |  2 ++
+ 5 files changed, 29 insertions(+), 4 deletions(-)
+
+diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
+index 7c3d994e..71343d0f 100644
+--- a/net/batman-adv/bat_iv_ogm.c
++++ b/net/batman-adv/bat_iv_ogm.c
+@@ -2477,6 +2477,16 @@ static void batadv_iv_iface_activate(struct batadv_hard_iface *hard_iface)
+ 	batadv_iv_ogm_schedule(hard_iface);
+ }
+ 
++/**
++ * batadv_iv_init_sel_class - initialize GW selection class
++ * @bat_priv: the bat priv with all the soft interface information
++ */
++static void batadv_iv_init_sel_class(struct batadv_priv *bat_priv)
++{
++	/* set default TQ difference threshold to 20 */
++	atomic_set(&bat_priv->gw.sel_class, 20);
++}
++
+ static struct batadv_gw_node *
+ batadv_iv_gw_get_best_gw_node(struct batadv_priv *bat_priv)
+ {
+@@ -2823,6 +2833,7 @@ static struct batadv_algo_ops batadv_batman_iv __read_mostly = {
+ 		.del_if = batadv_iv_ogm_orig_del_if,
+ 	},
+ 	.gw = {
++		.init_sel_class = batadv_iv_init_sel_class,
+ 		.get_best_gw_node = batadv_iv_gw_get_best_gw_node,
+ 		.is_eligible = batadv_iv_gw_is_eligible,
+ #ifdef CONFIG_BATMAN_ADV_DEBUGFS
+diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c
+index 0acd081d..a36c8e72 100644
+--- a/net/batman-adv/bat_v.c
++++ b/net/batman-adv/bat_v.c
+@@ -668,6 +668,16 @@ static bool batadv_v_neigh_is_sob(struct batadv_neigh_node *neigh1,
+ 	return ret;
+ }
+ 
++/**
++ * batadv_v_init_sel_class - initialize GW selection class
++ * @bat_priv: the bat priv with all the soft interface information
++ */
++static void batadv_v_init_sel_class(struct batadv_priv *bat_priv)
++{
++	/* set default throughput difference threshold to 5Mbps */
++	atomic_set(&bat_priv->gw.sel_class, 50);
++}
++
+ static ssize_t batadv_v_store_sel_class(struct batadv_priv *bat_priv,
+ 					char *buff, size_t count)
+ {
+@@ -1052,6 +1062,7 @@ static struct batadv_algo_ops batadv_batman_v __read_mostly = {
+ 		.dump = batadv_v_orig_dump,
+ 	},
+ 	.gw = {
++		.init_sel_class = batadv_v_init_sel_class,
+ 		.store_sel_class = batadv_v_store_sel_class,
+ 		.show_sel_class = batadv_v_show_sel_class,
+ 		.get_best_gw_node = batadv_v_gw_get_best_gw_node,
+@@ -1092,9 +1103,6 @@ int batadv_v_mesh_init(struct batadv_priv *bat_priv)
+ 	if (ret < 0)
+ 		return ret;
+ 
+-	/* set default throughput difference threshold to 5Mbps */
+-	atomic_set(&bat_priv->gw.sel_class, 50);
+-
+ 	return 0;
+ }
+ 
+diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c
+index 5db2e43e..33940c5c 100644
+--- a/net/batman-adv/gateway_common.c
++++ b/net/batman-adv/gateway_common.c
+@@ -253,6 +253,11 @@ static void batadv_gw_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
+  */
+ void batadv_gw_init(struct batadv_priv *bat_priv)
+ {
++	if (bat_priv->algo_ops->gw.init_sel_class)
++		bat_priv->algo_ops->gw.init_sel_class(bat_priv);
++	else
++		atomic_set(&bat_priv->gw.sel_class, 1);
++
+ 	batadv_tvlv_handler_register(bat_priv, batadv_gw_tvlv_ogm_handler_v1,
+ 				     NULL, BATADV_TVLV_GW, 1,
+ 				     BATADV_TVLV_HANDLER_OGM_CIFNOTFND);
+diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
+index 5d099b2e..d042c99a 100644
+--- a/net/batman-adv/soft-interface.c
++++ b/net/batman-adv/soft-interface.c
+@@ -819,7 +819,6 @@ static int batadv_softif_init_late(struct net_device *dev)
+ 	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.bandwidth_down, 100);
+ 	atomic_set(&bat_priv->gw.bandwidth_up, 20);
+ 	atomic_set(&bat_priv->orig_interval, 1000);
+diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
+index 66b25e41..246f21b4 100644
+--- a/net/batman-adv/types.h
++++ b/net/batman-adv/types.h
+@@ -1489,6 +1489,7 @@ struct batadv_algo_orig_ops {
+ 
+ /**
+  * struct batadv_algo_gw_ops - mesh algorithm callbacks (GW specific)
++ * @init_sel_class: initialize GW selection class (optional)
+  * @store_sel_class: parse and stores a new GW selection class (optional)
+  * @show_sel_class: prints the current GW selection class (optional)
+  * @get_best_gw_node: select the best GW from the list of available nodes
+@@ -1499,6 +1500,7 @@ struct batadv_algo_orig_ops {
+  * @dump: dump gateways to a netlink socket (optional)
+  */
+ struct batadv_algo_gw_ops {
++	void (*init_sel_class)(struct batadv_priv *bat_priv);
+ 	ssize_t (*store_sel_class)(struct batadv_priv *bat_priv, char *buff,
+ 				   size_t count);
+ 	ssize_t (*show_sel_class)(struct batadv_priv *bat_priv, char *buff);

From a377a065f4129afd511fcd4775e08af270a80675 Mon Sep 17 00:00:00 2001
From: Gabriel <gabriel@autistici.org>
Date: Sat, 4 Mar 2017 21:51:30 +0100
Subject: [PATCH 367/368] fixed +PKG_RELEASE

---
 poprouting/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/poprouting/Makefile b/poprouting/Makefile
index c68db92..0f51a8b 100644
--- a/poprouting/Makefile
+++ b/poprouting/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=prince
 PKG_VERSION:=v0.3.1
-PKG_RELEASE:=4
+PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_USE_MIPS16:=0

From c1b0d8e36f581e227ea5b021224659b2cfa9c689 Mon Sep 17 00:00:00 2001
From: Saverio Proto <saverio.proto@switch.ch>
Date: Sat, 4 Mar 2017 22:31:52 +0100
Subject: [PATCH 368/368] MAINTAINERS: updated email addresses

---
 MAINTAINERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 1892327..7eadf8e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9,7 +9,7 @@
 
 Axel "axn" Neumann <neumann@cgws.de>
 Baptiste Jonglez <openwrt-pkg@bitsofnetworks.org>
-Bastian Bittorf <bittorf@bluebottle.com>
+Bastian Bittorf <bb@npl.de>
 Corinna "Elektra" Aichele <onelektra@gmx.net>
 Gabriel Kerneis <gabriel@kerneis.info>
 Gui Iribarren <gui@altermundi.net>
@@ -21,5 +21,5 @@ Nicolás Echániz <nicoechaniz@altermundi.net>
 Pau Escrich <pau@dabax.net>
 Saverio Proto <zioproto@gmail.com>
 Simon Wunderlich <sw@simonwunderlich.de>
-Steven Barth <cyrus@openwrt.org>
+Steven Barth <steven@midlink.org>
 Vasilis "acinonyx" Tsiligiannis <acinonyx@openwrt.gr>