From 63debca7357e98301f6580f4afcde1e6734ddd51 Mon Sep 17 00:00:00 2001
From: Jernej Kos <k@jst.sm>
Date: Tue, 5 Jun 2012 11:05:37 +0200
Subject: [PATCH 01/42] Preliminary version of tunneldigger OpenWrt package.

---
 net/tunneldigger/Makefile                | 38 ++++++++++++++++++++++++
 net/tunneldigger/files/config.default    |  6 ++++
 net/tunneldigger/files/iface_setup.sh    |  4 +++
 net/tunneldigger/files/tunneldigger.init | 28 +++++++++++++++++
 4 files changed, 76 insertions(+)
 create mode 100644 net/tunneldigger/Makefile
 create mode 100644 net/tunneldigger/files/config.default
 create mode 100644 net/tunneldigger/files/iface_setup.sh
 create mode 100644 net/tunneldigger/files/tunneldigger.init

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
new file mode 100644
index 0000000..5b0967f
--- /dev/null
+++ b/net/tunneldigger/Makefile
@@ -0,0 +1,38 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=tunneldigger
+PKG_VERSION:=0.1
+PKG_RELEASE:=1
+PKG_REV:=HEAD
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=git://github.com/wlanslovenija/tunneldigger.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=$(PKG_REV)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/tunneldigger
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=libnl-tiny
+  TITLE:=L2TPv3 tunnel broker client
+endef
+
+define Build/Prepare
+	$(call Build/Prepare/Default)
+	mv $(PKG_BUILD_DIR)/client/* $(PKG_BUILD_DIR)
+	sed -i s/-lnl /-lnl-tiny /g $(PKG_BUILD_DIR)/Makefile
+endef
+
+define Package/tunneldigger/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/l2tp_client $(1)/usr/bin/tunneldigger
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/tunneldigger.init $(1)/etc/init.d/tunneldigger
+	$(INSTALL_DIR) $(1)/lib/tunneldigger
+	$(INSTALL_BIN) ./files/iface_setup.sh $(1)/lib/tunneldigger/iface_setup.sh
+endef
+
+$(eval $(call BuildPackage,tunneldigger))
diff --git a/net/tunneldigger/files/config.default b/net/tunneldigger/files/config.default
new file mode 100644
index 0000000..b1a3175
--- /dev/null
+++ b/net/tunneldigger/files/config.default
@@ -0,0 +1,6 @@
+config broker
+	option address 'x.y.z.w'
+	option port 53
+	option uuid 'abcd'
+	option interface 'l2tp0'
+
diff --git a/net/tunneldigger/files/iface_setup.sh b/net/tunneldigger/files/iface_setup.sh
new file mode 100644
index 0000000..ef040c5
--- /dev/null
+++ b/net/tunneldigger/files/iface_setup.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+# Call the hotplug network interface setup script so our new L2TPv3 tunnel
+# interface gets configured with required addresses
+ACTION="add" INTERFACE="$1" /sbin/hotplug-call net
diff --git a/net/tunneldigger/files/tunneldigger.init b/net/tunneldigger/files/tunneldigger.init
new file mode 100644
index 0000000..deb3530
--- /dev/null
+++ b/net/tunneldigger/files/tunneldigger.init
@@ -0,0 +1,28 @@
+#!/bin/sh /etc/rc.common
+START=40
+STOP=90
+
+config_cb() {
+	local cfg="$CONFIG_SECTION"
+	config_get configname "$cfg" TYPE
+
+	case "$configname" in
+		broker)
+			config_get address "$cfg" address
+			config_get port "$cfg" port
+			config_get uuid "$cfg" uuid
+			config_get interface "$cfg" interface
+			/usr/bin/tunneldigger -u ${uuid} -l 0.0.0.0 -b ${address} -p ${port} -i ${interface} &
+		;;
+	esac
+}
+
+start() 
+{
+	config_load tunneldigger
+}
+
+stop() {
+	killall tunneldigger
+}
+

From 0db29697cf414039792292aa9781bd9da2a4ddbc Mon Sep 17 00:00:00 2001
From: Jernej Kos <k@jst.sm>
Date: Tue, 5 Jun 2012 11:06:16 +0200
Subject: [PATCH 02/42] Minor Makefile fixes.

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

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index 5b0967f..9a2a5f2 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -16,14 +16,14 @@ include $(INCLUDE_DIR)/package.mk
 define Package/tunneldigger
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=libnl-tiny
+  DEPENDS:=+libnl-tiny
   TITLE:=L2TPv3 tunnel broker client
 endef
 
 define Build/Prepare
 	$(call Build/Prepare/Default)
 	mv $(PKG_BUILD_DIR)/client/* $(PKG_BUILD_DIR)
-	sed -i s/-lnl /-lnl-tiny /g $(PKG_BUILD_DIR)/Makefile
+	sed -i s/-lnl/-lnl-tiny/g $(PKG_BUILD_DIR)/Makefile
 endef
 
 define Package/tunneldigger/install

From d5c247ad29e7c0e991d7da39dce71c43e3dabc4f Mon Sep 17 00:00:00 2001
From: Jernej Kos <k@jst.sm>
Date: Tue, 5 Jun 2012 11:10:29 +0200
Subject: [PATCH 03/42] Added L2TP kernel module dependencies.

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

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index 9a2a5f2..f0d3b4a 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/tunneldigger
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libnl-tiny
+  DEPENDS:=+libnl-tiny +kmod-l2tp +kmod-l2tp-ip +kmod-l2tp-eth
   TITLE:=L2TPv3 tunnel broker client
 endef
 

From 710c155f85eba3499909cc9338780ce47618648d Mon Sep 17 00:00:00 2001
From: Jernej Kos <k@jst.sm>
Date: Tue, 5 Jun 2012 13:51:20 +0200
Subject: [PATCH 04/42] Added libnl-tiny include path to TARGET_CFLAGS.

---
 net/tunneldigger/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index f0d3b4a..0f36ddc 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -20,6 +20,10 @@ define Package/tunneldigger
   TITLE:=L2TPv3 tunnel broker client
 endef
 
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include/libnl-tiny \
+	-I$(STAGING_DIR)/usr/include
+
 define Build/Prepare
 	$(call Build/Prepare/Default)
 	mv $(PKG_BUILD_DIR)/client/* $(PKG_BUILD_DIR)

From 4e84dbf44d8682a9248de179a9f1361fc0c95f54 Mon Sep 17 00:00:00 2001
From: Jernej Kos <k@jst.sm>
Date: Tue, 5 Jun 2012 18:05:21 +0200
Subject: [PATCH 05/42] Add -DLIBNL_TINY to TARGET_CFLAGS to enable
 compatibility mode.

---
 net/tunneldigger/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index 0f36ddc..f260217 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -22,7 +22,8 @@ endef
 
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include/libnl-tiny \
-	-I$(STAGING_DIR)/usr/include
+	-I$(STAGING_DIR)/usr/include \
+	-DLIBNL_TINY
 
 define Build/Prepare
 	$(call Build/Prepare/Default)

From 18d36556db9e5ff6639af7be10a54c718d3d2f29 Mon Sep 17 00:00:00 2001
From: Jernej Kos <k@jst.sm>
Date: Wed, 6 Jun 2012 12:12:25 +0200
Subject: [PATCH 06/42] Interface up scripts are not needed as new OpenWrt
 versions have netifd which monitors for interface up events via netlink.

---
 net/tunneldigger/Makefile             | 2 --
 net/tunneldigger/files/iface_setup.sh | 4 ----
 2 files changed, 6 deletions(-)
 delete mode 100644 net/tunneldigger/files/iface_setup.sh

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index f260217..ca0d00f 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -36,8 +36,6 @@ define Package/tunneldigger/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/l2tp_client $(1)/usr/bin/tunneldigger
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/tunneldigger.init $(1)/etc/init.d/tunneldigger
-	$(INSTALL_DIR) $(1)/lib/tunneldigger
-	$(INSTALL_BIN) ./files/iface_setup.sh $(1)/lib/tunneldigger/iface_setup.sh
 endef
 
 $(eval $(call BuildPackage,tunneldigger))
diff --git a/net/tunneldigger/files/iface_setup.sh b/net/tunneldigger/files/iface_setup.sh
deleted file mode 100644
index ef040c5..0000000
--- a/net/tunneldigger/files/iface_setup.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-# Call the hotplug network interface setup script so our new L2TPv3 tunnel
-# interface gets configured with required addresses
-ACTION="add" INTERFACE="$1" /sbin/hotplug-call net

From c7d3aec3e921fd410f7426d51892ce4637f657b2 Mon Sep 17 00:00:00 2001
From: Jernej Kos <k@jst.sm>
Date: Thu, 7 Jun 2012 10:22:48 +0200
Subject: [PATCH 07/42] Changed init script priority.

---
 net/tunneldigger/files/tunneldigger.init | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/tunneldigger/files/tunneldigger.init b/net/tunneldigger/files/tunneldigger.init
index deb3530..ca6eb62 100644
--- a/net/tunneldigger/files/tunneldigger.init
+++ b/net/tunneldigger/files/tunneldigger.init
@@ -1,6 +1,5 @@
 #!/bin/sh /etc/rc.common
-START=40
-STOP=90
+START=90
 
 config_cb() {
 	local cfg="$CONFIG_SECTION"

From 4c8ac4b392786984c4cb99a03f83e4ca1a3a7fd1 Mon Sep 17 00:00:00 2001
From: Jernej Kos <k@jst.sm>
Date: Fri, 8 Jun 2012 22:59:59 +0200
Subject: [PATCH 08/42] Added support for tunnels to multiple servers.

---
 net/tunneldigger/files/tunneldigger.init | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net/tunneldigger/files/tunneldigger.init b/net/tunneldigger/files/tunneldigger.init
index ca6eb62..f495db2 100644
--- a/net/tunneldigger/files/tunneldigger.init
+++ b/net/tunneldigger/files/tunneldigger.init
@@ -1,6 +1,8 @@
 #!/bin/sh /etc/rc.common
 START=90
 
+tunnel_id=1
+
 config_cb() {
 	local cfg="$CONFIG_SECTION"
 	config_get configname "$cfg" TYPE
@@ -11,7 +13,8 @@ config_cb() {
 			config_get port "$cfg" port
 			config_get uuid "$cfg" uuid
 			config_get interface "$cfg" interface
-			/usr/bin/tunneldigger -u ${uuid} -l 0.0.0.0 -b ${address} -p ${port} -i ${interface} &
+			/usr/bin/tunneldigger -u ${uuid} -l 0.0.0.0 -b ${address} -p ${port} -i ${interface} -t ${tunnel_id} &
+			let tunnel_id++
 		;;
 	esac
 }

From b6606c131c4131fa04eb303161d2ef0ffc87ee2e Mon Sep 17 00:00:00 2001
From: Jernej Kos <k@jst.sm>
Date: Fri, 8 Jun 2012 23:00:50 +0200
Subject: [PATCH 09/42] Added missing librt dependency.

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

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index ca0d00f..452a138 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tunneldigger
 PKG_VERSION:=0.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_REV:=HEAD
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/tunneldigger
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libnl-tiny +kmod-l2tp +kmod-l2tp-ip +kmod-l2tp-eth
+  DEPENDS:=+libnl-tiny +kmod-l2tp +kmod-l2tp-ip +kmod-l2tp-eth +librt
   TITLE:=L2TPv3 tunnel broker client
 endef
 

From 959b0be24a7956a881e94a8303c4ea7e86de9f85 Mon Sep 17 00:00:00 2001
From: Jernej Kos <k@jst.sm>
Date: Wed, 11 Jul 2012 20:33:11 +0200
Subject: [PATCH 10/42] Updated package to latest tunneldigger version.

---
 net/tunneldigger/Makefile                |  4 ++--
 net/tunneldigger/files/config.default    |  4 +++-
 net/tunneldigger/files/tunneldigger.init | 10 ++++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index 452a138..e709f3a 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tunneldigger
-PKG_VERSION:=0.1
-PKG_RELEASE:=2
+PKG_VERSION:=0.2
+PKG_RELEASE:=1
 PKG_REV:=HEAD
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/net/tunneldigger/files/config.default b/net/tunneldigger/files/config.default
index b1a3175..3dd7747 100644
--- a/net/tunneldigger/files/config.default
+++ b/net/tunneldigger/files/config.default
@@ -1,6 +1,8 @@
 config broker
 	option address 'x.y.z.w'
-	option port 53
+	list port 8942
+	list port 53
+	list port 123
 	option uuid 'abcd'
 	option interface 'l2tp0'
 
diff --git a/net/tunneldigger/files/tunneldigger.init b/net/tunneldigger/files/tunneldigger.init
index f495db2..a2bc4a4 100644
--- a/net/tunneldigger/files/tunneldigger.init
+++ b/net/tunneldigger/files/tunneldigger.init
@@ -10,10 +10,16 @@ config_cb() {
 	case "$configname" in
 		broker)
 			config_get address "$cfg" address
-			config_get port "$cfg" port
+			config_get ports "$cfg" port
 			config_get uuid "$cfg" uuid
 			config_get interface "$cfg" interface
-			/usr/bin/tunneldigger -u ${uuid} -l 0.0.0.0 -b ${address} -p ${port} -i ${interface} -t ${tunnel_id} &
+			
+			local broker_opts=""
+			for port in $ports; do
+			  broker_opts="${broker_opts} -b ${address}:${port}"
+			done
+			
+			/usr/bin/tunneldigger -u ${uuid} -i ${interface} -t ${tunnel_id} ${broker_opts} &
 			let tunnel_id++
 		;;
 	esac

From 8e423b5efd81b1115b01e20c77ff60f132f711a9 Mon Sep 17 00:00:00 2001
From: Jernej Kos <k@jst.sm>
Date: Sun, 19 Aug 2012 18:36:06 +0200
Subject: [PATCH 11/42] Modified the way tunneldigger hosts are configured in
 UCI.

---
 net/tunneldigger/Makefile                | 2 +-
 net/tunneldigger/files/config.default    | 7 +++----
 net/tunneldigger/files/tunneldigger.init | 7 +++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index e709f3a..f660bb8 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tunneldigger
 PKG_VERSION:=0.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_REV:=HEAD
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/net/tunneldigger/files/config.default b/net/tunneldigger/files/config.default
index 3dd7747..d1830a7 100644
--- a/net/tunneldigger/files/config.default
+++ b/net/tunneldigger/files/config.default
@@ -1,8 +1,7 @@
 config broker
-	option address 'x.y.z.w'
-	list port 8942
-	list port 53
-	list port 123
+	list address 'x.y.z.w:8942'
+	list address 'x.y.z.w:53'
+	list address 'x.y.z.w:123'
 	option uuid 'abcd'
 	option interface 'l2tp0'
 
diff --git a/net/tunneldigger/files/tunneldigger.init b/net/tunneldigger/files/tunneldigger.init
index a2bc4a4..4724f56 100644
--- a/net/tunneldigger/files/tunneldigger.init
+++ b/net/tunneldigger/files/tunneldigger.init
@@ -9,14 +9,13 @@ config_cb() {
 
 	case "$configname" in
 		broker)
-			config_get address "$cfg" address
-			config_get ports "$cfg" port
+			config_get addresses "$cfg" address
 			config_get uuid "$cfg" uuid
 			config_get interface "$cfg" interface
 			
 			local broker_opts=""
-			for port in $ports; do
-			  broker_opts="${broker_opts} -b ${address}:${port}"
+			for address in $addresses; do
+			  broker_opts="${broker_opts} -b ${address}"
 			done
 			
 			/usr/bin/tunneldigger -u ${uuid} -i ${interface} -t ${tunnel_id} ${broker_opts} &

From 3161df6e34a0ed413dc4e0022c89226590896137 Mon Sep 17 00:00:00 2001
From: Jernej Kos <k@jst.sm>
Date: Thu, 6 Jun 2013 18:56:29 +0200
Subject: [PATCH 12/42] Added new bandwidth limit option to tunneldigger.

---
 net/tunneldigger/Makefile                | 4 ++--
 net/tunneldigger/files/config.default    | 2 +-
 net/tunneldigger/files/tunneldigger.init | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index f660bb8..acd46e4 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tunneldigger
-PKG_VERSION:=0.2
-PKG_RELEASE:=2
+PKG_VERSION:=0.3
+PKG_RELEASE:=1
 PKG_REV:=HEAD
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/net/tunneldigger/files/config.default b/net/tunneldigger/files/config.default
index d1830a7..44b1fe9 100644
--- a/net/tunneldigger/files/config.default
+++ b/net/tunneldigger/files/config.default
@@ -4,4 +4,4 @@ config broker
 	list address 'x.y.z.w:123'
 	option uuid 'abcd'
 	option interface 'l2tp0'
-
+	option limit_bw_down '1024'
diff --git a/net/tunneldigger/files/tunneldigger.init b/net/tunneldigger/files/tunneldigger.init
index 4724f56..6853311 100644
--- a/net/tunneldigger/files/tunneldigger.init
+++ b/net/tunneldigger/files/tunneldigger.init
@@ -12,11 +12,16 @@ config_cb() {
 			config_get addresses "$cfg" address
 			config_get uuid "$cfg" uuid
 			config_get interface "$cfg" interface
+			config_get limit_bw_down "$cfg" limit_bw_down
 			
 			local broker_opts=""
 			for address in $addresses; do
 			  broker_opts="${broker_opts} -b ${address}"
 			done
+
+			if [ ! -z "${limit_bw_down}" ]; then
+				broker_opts="${broker_opts} -L ${limit_bw_down}"
+			fi
 			
 			/usr/bin/tunneldigger -u ${uuid} -i ${interface} -t ${tunnel_id} ${broker_opts} &
 			let tunnel_id++

From 1e24f1c48102ba0910a146af6fed81224673ee4f Mon Sep 17 00:00:00 2001
From: Marc Juul <juul@labitat.dk>
Date: Fri, 10 Jan 2014 02:11:39 -0800
Subject: [PATCH 13/42] changed tunneldigger init script to use
 start-stop-daemon and added restart option

---
 net/tunneldigger/files/tunneldigger.init | 30 +++++++++++++++++++-----
 1 file changed, 24 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 net/tunneldigger/files/tunneldigger.init

diff --git a/net/tunneldigger/files/tunneldigger.init b/net/tunneldigger/files/tunneldigger.init
old mode 100644
new mode 100755
index 6853311..7926bdf
--- a/net/tunneldigger/files/tunneldigger.init
+++ b/net/tunneldigger/files/tunneldigger.init
@@ -1,18 +1,20 @@
 #!/bin/sh /etc/rc.common
+
 START=90
 
+PIDFILE=/var/run/tunneldigger.pid
 tunnel_id=1
 
 config_cb() {
 	local cfg="$CONFIG_SECTION"
 	config_get configname "$cfg" TYPE
-
 	case "$configname" in
 		broker)
 			config_get addresses "$cfg" address
 			config_get uuid "$cfg" uuid
 			config_get interface "$cfg" interface
 			config_get limit_bw_down "$cfg" limit_bw_down
+			config_get hook_script "$cfg" hook_script
 			
 			local broker_opts=""
 			for address in $addresses; do
@@ -22,19 +24,35 @@ config_cb() {
 			if [ ! -z "${limit_bw_down}" ]; then
 				broker_opts="${broker_opts} -L ${limit_bw_down}"
 			fi
-			
-			/usr/bin/tunneldigger -u ${uuid} -i ${interface} -t ${tunnel_id} ${broker_opts} &
+			echo "Starting tunneldigger"		
+			/sbin/start-stop-daemon -S -q -b -m -p $PIDFILE -x /usr/bin/tunneldigger -- -u ${uuid} -i ${interface}
+ -t ${tunnel_id} -s ${hook_script} ${broker_opts}
 			let tunnel_id++
 		;;
 	esac
 }
 
-start() 
-{
+start() {
 	config_load tunneldigger
 }
 
 stop() {
-	killall tunneldigger
+	echo "Stopping tunneldigger"
+	if [ -f $PIDFILE ]; then
+		PID=`cat ${PIDFILE}`
+		start-stop-daemon -K -q -p $PIDFILE 
+		while test -d "/proc/${PID}"; do
+			echo "waiting for tunneldigger to stop"
+			sleep 1
+		done
+		echo "tunneldigger stopped"
+	else
+		echo "Looks like tunneldigger wasn't running"
+	fi
+}
+
+restart() {
+	stop
+	start
 }
 

From fd62822c3a1d6f4716746c1440b683e7071c1fcd Mon Sep 17 00:00:00 2001
From: Marc Juul <juul@labitat.dk>
Date: Fri, 10 Jan 2014 02:13:13 -0800
Subject: [PATCH 14/42] removed extra newline

---
 net/tunneldigger/files/tunneldigger.init | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/tunneldigger/files/tunneldigger.init b/net/tunneldigger/files/tunneldigger.init
index 7926bdf..efa4366 100755
--- a/net/tunneldigger/files/tunneldigger.init
+++ b/net/tunneldigger/files/tunneldigger.init
@@ -25,8 +25,7 @@ config_cb() {
 				broker_opts="${broker_opts} -L ${limit_bw_down}"
 			fi
 			echo "Starting tunneldigger"		
-			/sbin/start-stop-daemon -S -q -b -m -p $PIDFILE -x /usr/bin/tunneldigger -- -u ${uuid} -i ${interface}
- -t ${tunnel_id} -s ${hook_script} ${broker_opts}
+			/sbin/start-stop-daemon -S -q -b -m -p $PIDFILE -x /usr/bin/tunneldigger -- -u ${uuid} -i ${interface} -t ${tunnel_id} -s ${hook_script} ${broker_opts}
 			let tunnel_id++
 		;;
 	esac

From e398b54e798a7a8c875065f15585dfb244b7f91f Mon Sep 17 00:00:00 2001
From: Marc Juul <juul@labitat.dk>
Date: Fri, 10 Jan 2014 02:56:40 -0800
Subject: [PATCH 15/42] tunneldigger script now tells which interface it's
 starting for

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

diff --git a/net/tunneldigger/files/tunneldigger.init b/net/tunneldigger/files/tunneldigger.init
index efa4366..dd49370 100755
--- a/net/tunneldigger/files/tunneldigger.init
+++ b/net/tunneldigger/files/tunneldigger.init
@@ -24,7 +24,7 @@ config_cb() {
 			if [ ! -z "${limit_bw_down}" ]; then
 				broker_opts="${broker_opts} -L ${limit_bw_down}"
 			fi
-			echo "Starting tunneldigger"		
+			echo "Starting tunneldigger on ${interface}"
 			/sbin/start-stop-daemon -S -q -b -m -p $PIDFILE -x /usr/bin/tunneldigger -- -u ${uuid} -i ${interface} -t ${tunnel_id} -s ${hook_script} ${broker_opts}
 			let tunnel_id++
 		;;

From 3e20dd91576aa35e0612b5c9ebe4a110a4f0c5c3 Mon Sep 17 00:00:00 2001
From: Marc Juul <juul@labitat.dk>
Date: Fri, 10 Jan 2014 06:03:43 -0800
Subject: [PATCH 16/42] tentative support for stopping multiple tunneldiggers

---
 net/tunneldigger/files/tunneldigger.init | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/net/tunneldigger/files/tunneldigger.init b/net/tunneldigger/files/tunneldigger.init
index dd49370..d62b458 100755
--- a/net/tunneldigger/files/tunneldigger.init
+++ b/net/tunneldigger/files/tunneldigger.init
@@ -2,7 +2,7 @@
 
 START=90
 
-PIDFILE=/var/run/tunneldigger.pid
+PIDPATH=/var/run
 tunnel_id=1
 
 config_cb() {
@@ -25,7 +25,7 @@ config_cb() {
 				broker_opts="${broker_opts} -L ${limit_bw_down}"
 			fi
 			echo "Starting tunneldigger on ${interface}"
-			/sbin/start-stop-daemon -S -q -b -m -p $PIDFILE -x /usr/bin/tunneldigger -- -u ${uuid} -i ${interface} -t ${tunnel_id} -s ${hook_script} ${broker_opts}
+			/sbin/start-stop-daemon -S -q -b -m -p ${PIDPATH}/tunneldigger.${interface}.pid -x /usr/bin/tunneldigger -- -u ${uuid} -i ${interface} -t ${tunnel_id} -s ${hook_script} ${broker_opts}
 			let tunnel_id++
 		;;
 	esac
@@ -36,18 +36,17 @@ start() {
 }
 
 stop() {
-	echo "Stopping tunneldigger"
-	if [ -f $PIDFILE ]; then
+  for PIDFILE in `find ${PIDPATH}/ -name "tunneldigger\.*\.pid"`; do
 		PID=`cat ${PIDFILE}`
+    IFACE=`echo ${PIDFILE} | awk -F\/tunneldigger '{print $2}' | cut -d'.' -f2`
+    echo "Stopping tunneldigger for interface ${IFACE}"
 		start-stop-daemon -K -q -p $PIDFILE 
 		while test -d "/proc/${PID}"; do
-			echo "waiting for tunneldigger to stop"
+			echo "  waiting for tunneldigger to stop"
 			sleep 1
 		done
-		echo "tunneldigger stopped"
-	else
-		echo "Looks like tunneldigger wasn't running"
-	fi
+		echo "  tunneldigger stopped"
+  done
 }
 
 restart() {

From c474b882bc85ae57278adb57adecd51e94f9e22d Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Mon, 20 Jan 2014 03:52:40 +0100
Subject: [PATCH 17/42] tunneldigger: fix startup when no hookscript given

---
 net/tunneldigger/files/tunneldigger.init | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/net/tunneldigger/files/tunneldigger.init b/net/tunneldigger/files/tunneldigger.init
index d62b458..d2a3db3 100755
--- a/net/tunneldigger/files/tunneldigger.init
+++ b/net/tunneldigger/files/tunneldigger.init
@@ -24,8 +24,14 @@ config_cb() {
 			if [ ! -z "${limit_bw_down}" ]; then
 				broker_opts="${broker_opts} -L ${limit_bw_down}"
 			fi
+
+			if [ ! -z "${hook_script}" ] ; then
+				broker_opts="${broker_opts} -s ${hook_script}"
+			fi
+
 			echo "Starting tunneldigger on ${interface}"
-			/sbin/start-stop-daemon -S -q -b -m -p ${PIDPATH}/tunneldigger.${interface}.pid -x /usr/bin/tunneldigger -- -u ${uuid} -i ${interface} -t ${tunnel_id} -s ${hook_script} ${broker_opts}
+			/sbin/start-stop-daemon -S -q -b -m -p ${PIDPATH}/tunneldigger.${interface}.pid -x /usr/bin/tunneldigger -- -u ${uuid} -i ${interface} -t ${tunnel_id} ${broker_opts}
+
 			let tunnel_id++
 		;;
 	esac

From 338baaef71a22b49cf077f447cbc9d773b308e15 Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Mon, 27 Jan 2014 05:29:29 +0100
Subject: [PATCH 18/42] tunneldigger: new config option enabled

---
 net/tunneldigger/files/config.default    | 1 +
 net/tunneldigger/files/tunneldigger.init | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/net/tunneldigger/files/config.default b/net/tunneldigger/files/config.default
index 44b1fe9..571621a 100644
--- a/net/tunneldigger/files/config.default
+++ b/net/tunneldigger/files/config.default
@@ -5,3 +5,4 @@ config broker
 	option uuid 'abcd'
 	option interface 'l2tp0'
 	option limit_bw_down '1024'
+	option enabled '0'
diff --git a/net/tunneldigger/files/tunneldigger.init b/net/tunneldigger/files/tunneldigger.init
index d2a3db3..3ae1cb0 100755
--- a/net/tunneldigger/files/tunneldigger.init
+++ b/net/tunneldigger/files/tunneldigger.init
@@ -10,12 +10,15 @@ config_cb() {
 	config_get configname "$cfg" TYPE
 	case "$configname" in
 		broker)
+			config_get_bool enabled "$cfg" enabled 1
 			config_get addresses "$cfg" address
 			config_get uuid "$cfg" uuid
 			config_get interface "$cfg" interface
 			config_get limit_bw_down "$cfg" limit_bw_down
 			config_get hook_script "$cfg" hook_script
 			
+			[ $enabled -eq 0 ] && return
+
 			local broker_opts=""
 			for address in $addresses; do
 			  broker_opts="${broker_opts} -b ${address}"

From fd23c8cd317b2b984801b2fb0ad1842278f1f01a Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Thu, 16 Jan 2014 10:03:22 +0100
Subject: [PATCH 19/42] tunneldigger: install default config
 /etc/config/tunneldigger

---
 net/tunneldigger/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index acd46e4..5cb2c67 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tunneldigger
 PKG_VERSION:=0.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_REV:=HEAD
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -36,6 +36,8 @@ define Package/tunneldigger/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/l2tp_client $(1)/usr/bin/tunneldigger
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/tunneldigger.init $(1)/etc/init.d/tunneldigger
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DATA) ./files/config.default $(1)/etc/config/tunneldigger
 endef
 
 $(eval $(call BuildPackage,tunneldigger))

From 215df2b5369fb4a3fc8bbb2a531f5b359a372d49 Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Mon, 27 Jan 2014 05:32:29 +0100
Subject: [PATCH 20/42] tunneldigger: build cmdline using function "append"

---
 net/tunneldigger/files/tunneldigger.init | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/net/tunneldigger/files/tunneldigger.init b/net/tunneldigger/files/tunneldigger.init
index 3ae1cb0..229eea6 100755
--- a/net/tunneldigger/files/tunneldigger.init
+++ b/net/tunneldigger/files/tunneldigger.init
@@ -21,15 +21,12 @@ config_cb() {
 
 			local broker_opts=""
 			for address in $addresses; do
-			  broker_opts="${broker_opts} -b ${address}"
+			  append broker_opts "-b ${address}"
 			done
 
-			if [ ! -z "${limit_bw_down}" ]; then
-				broker_opts="${broker_opts} -L ${limit_bw_down}"
-			fi
+			[ ! -z "${limit_bw_down}" ] && append broker_opts "-L ${limit_bw_down}"
+			[ ! -z "${hook_script}" ] && append broker_opts "-s ${hook_script}"
 
-			if [ ! -z "${hook_script}" ] ; then
-				broker_opts="${broker_opts} -s ${hook_script}"
 			fi
 
 			echo "Starting tunneldigger on ${interface}"

From 2ad52fe0a95731bdf5bbaea1a4de5f2953deea93 Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Mon, 27 Jan 2014 05:33:33 +0100
Subject: [PATCH 21/42] tunneldigger: check if all mandantory cmdargs are given

---
 net/tunneldigger/files/tunneldigger.init | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/net/tunneldigger/files/tunneldigger.init b/net/tunneldigger/files/tunneldigger.init
index 229eea6..c4b5060 100755
--- a/net/tunneldigger/files/tunneldigger.init
+++ b/net/tunneldigger/files/tunneldigger.init
@@ -5,6 +5,10 @@ START=90
 PIDPATH=/var/run
 tunnel_id=1
 
+missing() {
+	echo "Not starting tunneldigger - missing $1" >&2
+}
+
 config_cb() {
 	local cfg="$CONFIG_SECTION"
 	config_get configname "$cfg" TYPE
@@ -27,6 +31,12 @@ config_cb() {
 			[ ! -z "${limit_bw_down}" ] && append broker_opts "-L ${limit_bw_down}"
 			[ ! -z "${hook_script}" ] && append broker_opts "-s ${hook_script}"
 
+			if [ -z "$uuid" ]; then
+				missing uuid
+				return
+			elif [ -z "$interface" ]; then
+				missing interface
+				return
 			fi
 
 			echo "Starting tunneldigger on ${interface}"

From 7c5c0592bfb7e907772125523c50c2589ed56384 Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Mon, 27 Jan 2014 07:28:49 +0100
Subject: [PATCH 22/42] tunneldigger: fix coding style of stop()

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

diff --git a/net/tunneldigger/files/tunneldigger.init b/net/tunneldigger/files/tunneldigger.init
index c4b5060..de4e0cb 100755
--- a/net/tunneldigger/files/tunneldigger.init
+++ b/net/tunneldigger/files/tunneldigger.init
@@ -52,17 +52,17 @@ start() {
 }
 
 stop() {
-  for PIDFILE in `find ${PIDPATH}/ -name "tunneldigger\.*\.pid"`; do
-		PID=`cat ${PIDFILE}`
-    IFACE=`echo ${PIDFILE} | awk -F\/tunneldigger '{print $2}' | cut -d'.' -f2`
-    echo "Stopping tunneldigger for interface ${IFACE}"
+	for PIDFILE in `find ${PIDPATH}/ -name "tunneldigger\.*\.pid"`; do
+		PID="$(cat ${PIDFILE})"
+		IFACE="$(echo ${PIDFILE} | awk -F\/tunneldigger '{print $2}' | cut -d'.' -f2)"
+		echo "Stopping tunneldigger for interface ${IFACE}"
 		start-stop-daemon -K -q -p $PIDFILE 
 		while test -d "/proc/${PID}"; do
 			echo "  waiting for tunneldigger to stop"
 			sleep 1
 		done
 		echo "  tunneldigger stopped"
-  done
+	done
 }
 
 restart() {

From 95cac4328c53d2e039d847e97cee78d52c775d20 Mon Sep 17 00:00:00 2001
From: Jernej Kos <jernej@kos.mx>
Date: Mon, 3 Feb 2014 14:25:08 +0100
Subject: [PATCH 23/42] Tunneldigger client now requires libpthread.

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

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index 5cb2c67..3d45904 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tunneldigger
 PKG_VERSION:=0.3
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_REV:=HEAD
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/tunneldigger
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libnl-tiny +kmod-l2tp +kmod-l2tp-ip +kmod-l2tp-eth +librt
+  DEPENDS:=+libnl-tiny +kmod-l2tp +kmod-l2tp-ip +kmod-l2tp-eth +librt +libpthread
   TITLE:=L2TPv3 tunnel broker client
 endef
 

From f0e0d50cec4e4fa61662222de271c2bdc8cbe7a1 Mon Sep 17 00:00:00 2001
From: Jernej Kos <jernej@kos.mx>
Date: Wed, 16 Apr 2014 14:27:33 +0200
Subject: [PATCH 24/42] Use fixed revision for tunneldigger package.

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

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index 3d45904..a16d983 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -2,8 +2,8 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tunneldigger
 PKG_VERSION:=0.3
-PKG_RELEASE:=3
-PKG_REV:=HEAD
+PKG_RELEASE:=4
+PKG_REV:=7b23f649db053c1cf624000be8b6b54eb7d683b8
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=git://github.com/wlanslovenija/tunneldigger.git

From 5b206bbfd0b929852da2b5830845e994e08589aa Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Fri, 29 Aug 2014 20:09:41 +0200
Subject: [PATCH 25/42] tunneldigger: use conffiles for
 /etc/config/tunneldigger

This will prevent opkg from overwriting /etc/config/tunneldigger.
---
 net/tunneldigger/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index a16d983..b52b12f 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tunneldigger
 PKG_VERSION:=0.3
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 PKG_REV:=7b23f649db053c1cf624000be8b6b54eb7d683b8
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -40,4 +40,8 @@ define Package/tunneldigger/install
 	$(INSTALL_DATA) ./files/config.default $(1)/etc/config/tunneldigger
 endef
 
+define Package/tunneldigger/conffiles
+/etc/config/tunneldigger
+endef
+
 $(eval $(call BuildPackage,tunneldigger))

From 4c81adeff6bf0f26833cda605af6d78433258bba Mon Sep 17 00:00:00 2001
From: Jernej Kos <jernej@kos.mx>
Date: Thu, 30 Apr 2015 11:25:14 +0200
Subject: [PATCH 27/42] tunneldigger: Bumped package version.

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

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index b52b12f..0bdaf60 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -1,9 +1,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tunneldigger
-PKG_VERSION:=0.3
-PKG_RELEASE:=5
-PKG_REV:=7b23f649db053c1cf624000be8b6b54eb7d683b8
+PKG_VERSION:=0.4
+PKG_RELEASE:=1
+PKG_REV:=d028411ec486e086e130e0d651f763bc5e757622
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=git://github.com/wlanslovenija/tunneldigger.git

From 7754a4be35fb1480fb0ed95db9d04728ff649e21 Mon Sep 17 00:00:00 2001
From: Jernej Kos <jernej@kos.mx>
Date: Fri, 1 May 2015 18:12:01 +0200
Subject: [PATCH 28/42] tunneldigger: Bumped package version.

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

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index 0bdaf60..40f1655 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -2,8 +2,8 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tunneldigger
 PKG_VERSION:=0.4
-PKG_RELEASE:=1
-PKG_REV:=d028411ec486e086e130e0d651f763bc5e757622
+PKG_RELEASE:=2
+PKG_REV:=a3b5154f9933ad2a0d07e00a74c9164b625aac2a
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=git://github.com/wlanslovenija/tunneldigger.git

From 5c723f66c3af783812bd8cfbf70c56b6661d9469 Mon Sep 17 00:00:00 2001
From: Jernej Kos <jernej@kos.mx>
Date: Sun, 24 May 2015 12:14:10 +0200
Subject: [PATCH 29/42] tunneldigger: Bumped package version.

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

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index 40f1655..5fa0459 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -1,9 +1,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tunneldigger
-PKG_VERSION:=0.4
+PKG_VERSION:=0.4.1
 PKG_RELEASE:=2
-PKG_REV:=a3b5154f9933ad2a0d07e00a74c9164b625aac2a
+PKG_REV:=8d12a8d868548560f5c3e9ef63bb30b6c6d8b5c3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=git://github.com/wlanslovenija/tunneldigger.git

From 7c2d154b682a1ba8c812085bf370e67783b498da Mon Sep 17 00:00:00 2001
From: Jernej Kos <jernej@kos.mx>
Date: Fri, 12 Jun 2015 19:29:30 +0200
Subject: [PATCH 30/42] tunneldigger: Bumped package version.

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

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index 5fa0459..3d24ebd 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -1,9 +1,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tunneldigger
-PKG_VERSION:=0.4.1
-PKG_RELEASE:=2
-PKG_REV:=8d12a8d868548560f5c3e9ef63bb30b6c6d8b5c3
+PKG_VERSION:=0.4.2
+PKG_RELEASE:=1
+PKG_REV:=0a292c7aaacb1cff86c7bfffcb2bc663fc772f18
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=git://github.com/wlanslovenija/tunneldigger.git

From ee3d691136ca461b992e265796986f2fb3660336 Mon Sep 17 00:00:00 2001
From: Jernej Kos <jernej@kos.mx>
Date: Sat, 13 Jun 2015 13:41:01 +0200
Subject: [PATCH 31/42] tunneldigger: Bumped revision.

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

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index 3d24ebd..950a968 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=tunneldigger
 PKG_VERSION:=0.4.2
 PKG_RELEASE:=1
-PKG_REV:=0a292c7aaacb1cff86c7bfffcb2bc663fc772f18
+PKG_REV:=604c4351dfa4fc58df0e93a9c0df8b937f8c4c92
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=git://github.com/wlanslovenija/tunneldigger.git

From ba1458bc87abe02eadfde2cb486366b795997a0e Mon Sep 17 00:00:00 2001
From: Jernej Kos <jernej@kos.mx>
Date: Wed, 30 Sep 2015 10:48:19 +0200
Subject: [PATCH 32/42] tunneldigger: Support bind to interface option.

---
 net/tunneldigger/Makefile                | 4 ++--
 net/tunneldigger/files/tunneldigger.init | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index 950a968..4322b9c 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -1,9 +1,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tunneldigger
-PKG_VERSION:=0.4.2
+PKG_VERSION:=0.4.3
 PKG_RELEASE:=1
-PKG_REV:=604c4351dfa4fc58df0e93a9c0df8b937f8c4c92
+PKG_REV:=42288abb57261e07491a8233fec2e0741dcb8d52
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=git://github.com/wlanslovenija/tunneldigger.git
diff --git a/net/tunneldigger/files/tunneldigger.init b/net/tunneldigger/files/tunneldigger.init
index de4e0cb..f388a1b 100755
--- a/net/tunneldigger/files/tunneldigger.init
+++ b/net/tunneldigger/files/tunneldigger.init
@@ -20,6 +20,7 @@ config_cb() {
 			config_get interface "$cfg" interface
 			config_get limit_bw_down "$cfg" limit_bw_down
 			config_get hook_script "$cfg" hook_script
+			config_get bind_interface "$cfg" bind_interface
 			
 			[ $enabled -eq 0 ] && return
 
@@ -30,6 +31,7 @@ config_cb() {
 
 			[ ! -z "${limit_bw_down}" ] && append broker_opts "-L ${limit_bw_down}"
 			[ ! -z "${hook_script}" ] && append broker_opts "-s ${hook_script}"
+			[ ! -z "${bind_interface}" ] && append broker_opts "-I ${bind_interface}"
 
 			if [ -z "$uuid" ]; then
 				missing uuid

From 5725320cdcdf78a17c32660442aaea915fa92c06 Mon Sep 17 00:00:00 2001
From: Jernej Kos <jernej@kos.mx>
Date: Wed, 30 Sep 2015 13:14:38 +0200
Subject: [PATCH 33/42] tunneldigger: Allow logical interface names.

---
 net/tunneldigger/Makefile                | 2 +-
 net/tunneldigger/files/tunneldigger.init | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index 4322b9c..05a8fd7 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tunneldigger
 PKG_VERSION:=0.4.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_REV:=42288abb57261e07491a8233fec2e0741dcb8d52
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/net/tunneldigger/files/tunneldigger.init b/net/tunneldigger/files/tunneldigger.init
index f388a1b..7747d46 100755
--- a/net/tunneldigger/files/tunneldigger.init
+++ b/net/tunneldigger/files/tunneldigger.init
@@ -1,5 +1,7 @@
 #!/bin/sh /etc/rc.common
 
+. $IPKG_INSTROOT/lib/functions/network.sh
+
 START=90
 
 PIDPATH=/var/run
@@ -31,7 +33,12 @@ config_cb() {
 
 			[ ! -z "${limit_bw_down}" ] && append broker_opts "-L ${limit_bw_down}"
 			[ ! -z "${hook_script}" ] && append broker_opts "-s ${hook_script}"
-			[ ! -z "${bind_interface}" ] && append broker_opts "-I ${bind_interface}"
+			[ ! -z "${bind_interface}" ] && {
+				# Resolve logical interface name.
+				unset _bind_interface
+				network_get_device _bind_interface "${bind_interface}" || _bind_interface="${bind_interface}"
+				append broker_opts "-I ${_bind_interface}"
+			}
 
 			if [ -z "$uuid" ]; then
 				missing uuid

From 09d47c289b37b1437fa4fafd2c8b1b9d8d37877b Mon Sep 17 00:00:00 2001
From: CyrusFox <cyrus@lambdacore.de>
Date: Mon, 5 Oct 2015 22:11:17 +0200
Subject: [PATCH 34/42] Added group setting for start-stop-daemon in order to
 use iptables owner marks

---
 net/tunneldigger/files/config.default    | 1 +
 net/tunneldigger/files/tunneldigger.init | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/tunneldigger/files/config.default b/net/tunneldigger/files/config.default
index 571621a..307c1b9 100644
--- a/net/tunneldigger/files/config.default
+++ b/net/tunneldigger/files/config.default
@@ -3,6 +3,7 @@ config broker
 	list address 'x.y.z.w:53'
 	list address 'x.y.z.w:123'
 	option uuid 'abcd'
+	option group 'root'
 	option interface 'l2tp0'
 	option limit_bw_down '1024'
 	option enabled '0'
diff --git a/net/tunneldigger/files/tunneldigger.init b/net/tunneldigger/files/tunneldigger.init
index 7747d46..2cfcb74 100755
--- a/net/tunneldigger/files/tunneldigger.init
+++ b/net/tunneldigger/files/tunneldigger.init
@@ -20,6 +20,7 @@ config_cb() {
 			config_get addresses "$cfg" address
 			config_get uuid "$cfg" uuid
 			config_get interface "$cfg" interface
+			config_get group "$cfg" group
 			config_get limit_bw_down "$cfg" limit_bw_down
 			config_get hook_script "$cfg" hook_script
 			config_get bind_interface "$cfg" bind_interface
@@ -49,7 +50,7 @@ config_cb() {
 			fi
 
 			echo "Starting tunneldigger on ${interface}"
-			/sbin/start-stop-daemon -S -q -b -m -p ${PIDPATH}/tunneldigger.${interface}.pid -x /usr/bin/tunneldigger -- -u ${uuid} -i ${interface} -t ${tunnel_id} ${broker_opts}
+			/sbin/start-stop-daemon -S -q -b -m -c root:${group} -p ${PIDPATH}/tunneldigger.${interface}.pid -x /usr/bin/tunneldigger -- -u ${uuid} -i ${interface} -t ${tunnel_id} ${broker_opts}
 
 			let tunnel_id++
 		;;

From b13bd9e577fc7d4d849b58c80d1968e655f7eb87 Mon Sep 17 00:00:00 2001
From: Cyrus <lcb01@lcb01.de>
Date: Thu, 22 Oct 2015 10:14:35 +0200
Subject: [PATCH 36/42] Updated tunneldigger package to newest upstream version

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

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index 05a8fd7..5ac21ff 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -2,8 +2,8 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tunneldigger
 PKG_VERSION:=0.4.3
-PKG_RELEASE:=2
-PKG_REV:=42288abb57261e07491a8233fec2e0741dcb8d52
+PKG_RELEASE:=3
+PKG_REV:=4e4f13cdc630c46909d47441093a5bdaffa0d67f
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=git://github.com/wlanslovenija/tunneldigger.git

From 3611bcf933b8baa318f7368bb337e3ca5ad220d3 Mon Sep 17 00:00:00 2001
From: Cyrus <lcb01@lcb01.de>
Date: Wed, 2 Dec 2015 16:56:30 +0100
Subject: [PATCH 37/42] Updated makefile to build newest client

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

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index 5ac21ff..04d94b9 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -1,9 +1,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tunneldigger
-PKG_VERSION:=0.4.3
-PKG_RELEASE:=3
-PKG_REV:=4e4f13cdc630c46909d47441093a5bdaffa0d67f
+PKG_VERSION:=0.4.4
+PKG_RELEASE:=2
+PKG_REV:=909656ed7908c51b7f42844ba26e3a41ac7ab8bb
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=git://github.com/wlanslovenija/tunneldigger.git

From 8e453e426d777257696b1a566b63f3eedde99dec Mon Sep 17 00:00:00 2001
From: CyrusFox <cyrus@lambdacore.de>
Date: Mon, 14 Dec 2015 00:23:03 +0100
Subject: [PATCH 38/42] Added support for tunneldigger usage based broker
 selection

---
 net/tunneldigger/Makefile                |  8 ++++----
 net/tunneldigger/files/config.default    |  1 +
 net/tunneldigger/files/tunneldigger.init | 15 +++++++++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index 04d94b9..92bcb3a 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tunneldigger
-PKG_VERSION:=0.4.4
-PKG_RELEASE:=2
-PKG_REV:=909656ed7908c51b7f42844ba26e3a41ac7ab8bb
+PKG_VERSION:=0.4.5
+PKG_RELEASE:=1
+PKG_REV:=f820d65e57098094231083c2e83ed4983d2be049
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=git://github.com/wlanslovenija/tunneldigger.git
+PKG_SOURCE_URL:=git://github.com/ffrl/tunneldigger.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
diff --git a/net/tunneldigger/files/config.default b/net/tunneldigger/files/config.default
index 307c1b9..f269704 100644
--- a/net/tunneldigger/files/config.default
+++ b/net/tunneldigger/files/config.default
@@ -6,4 +6,5 @@ config broker
 	option group 'root'
 	option interface 'l2tp0'
 	option limit_bw_down '1024'
+	option broker_selection 'usage'
 	option enabled '0'
diff --git a/net/tunneldigger/files/tunneldigger.init b/net/tunneldigger/files/tunneldigger.init
index 2cfcb74..09d08cf 100755
--- a/net/tunneldigger/files/tunneldigger.init
+++ b/net/tunneldigger/files/tunneldigger.init
@@ -24,6 +24,7 @@ config_cb() {
 			config_get limit_bw_down "$cfg" limit_bw_down
 			config_get hook_script "$cfg" hook_script
 			config_get bind_interface "$cfg" bind_interface
+			config_get broker_selection "$cfg" broker_selection
 			
 			[ $enabled -eq 0 ] && return
 
@@ -40,6 +41,20 @@ config_cb() {
 				network_get_device _bind_interface "${bind_interface}" || _bind_interface="${bind_interface}"
 				append broker_opts "-I ${_bind_interface}"
 			}
+			[ ! -z "${broker_selection}" ] && {
+				# Set broker selection.
+				case "${broker_selection}" in
+					usage)
+						append broker_opts "-a"
+					;;
+					first)
+						append broker_opts "-g"
+					;;
+					random)
+						append broker_opts "-r"
+					;;
+				esac
+			}
 
 			if [ -z "$uuid" ]; then
 				missing uuid

From caaf0a41b0dbf61003379c89474fd56e4dbe7939 Mon Sep 17 00:00:00 2001
From: CyrusFox <cyrus@lambdacore.de>
Date: Sat, 30 Apr 2016 16:50:34 +0200
Subject: [PATCH 39/42] Updated to newest tunneldigger client version

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

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index 92bcb3a..1517acc 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -2,8 +2,8 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tunneldigger
 PKG_VERSION:=0.4.5
-PKG_RELEASE:=1
-PKG_REV:=f820d65e57098094231083c2e83ed4983d2be049
+PKG_RELEASE:=2
+PKG_REV:=32c97bbf1729df339eb846b6583d49162ca7c799
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=git://github.com/ffrl/tunneldigger.git

From de2ceca806a63bd29f3a637cfc5dae82c37a7555 Mon Sep 17 00:00:00 2001
From: CyrusFox <cyrus@lambdacore.de>
Date: Mon, 2 May 2016 00:23:55 +0200
Subject: [PATCH 40/42] Updated to newest tunneldigger client version

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

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index 1517acc..177bd40 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -2,8 +2,8 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tunneldigger
 PKG_VERSION:=0.4.5
-PKG_RELEASE:=2
-PKG_REV:=32c97bbf1729df339eb846b6583d49162ca7c799
+PKG_RELEASE:=3
+PKG_REV:=8788ea702d6afbf430596c6fd9a6da55bb5bcb25
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=git://github.com/ffrl/tunneldigger.git

From 7da29667496f2a0d7ce940b73a761cd71f1f3df3 Mon Sep 17 00:00:00 2001
From: Cyrus Fox <cyrus@lambdacore.de>
Date: Fri, 1 Jul 2016 14:06:00 +0200
Subject: [PATCH 41/42] Switched tunneldigger source URL to wlanslovenija git
 repo

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

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index 177bd40..3f81513 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -6,7 +6,7 @@ PKG_RELEASE:=3
 PKG_REV:=8788ea702d6afbf430596c6fd9a6da55bb5bcb25
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=git://github.com/ffrl/tunneldigger.git
+PKG_SOURCE_URL:=git://github.com/wlanslovenija/tunneldigger.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)

From cf8e99283e4a40f2f40fc66e4424105389ab0b04 Mon Sep 17 00:00:00 2001
From: Cyrus Fox <cyrus@lambdacore.de>
Date: Mon, 4 Jul 2016 11:47:34 +0200
Subject: [PATCH 42/42] Incremented version number for tunneldigger

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

diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index 3f81513..a57873d 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -1,9 +1,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tunneldigger
-PKG_VERSION:=0.4.5
-PKG_RELEASE:=3
-PKG_REV:=8788ea702d6afbf430596c6fd9a6da55bb5bcb25
+PKG_VERSION:=0.4.7
+PKG_RELEASE:=1
+PKG_REV:=7cc92020cbafe5be2b24eb6bc943a65f151c2a18
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=git://github.com/wlanslovenija/tunneldigger.git