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] 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} &