From 2ee6d3729b1f6a6a21bdffead096c5f1f5ad62e9 Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 31 Jul 2011 12:05:54 +0000
Subject: [package] dropbear: 	- split port argument at the rightmost colon,
 allows binding to specific IPv6 addresses 	- don't use uci ipaddr var but
 resolve ifname and get addresses from it (#9853)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27843 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/dropbear/files/dropbear.init | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

(limited to 'package/dropbear/files/dropbear.init')

diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init
index aa7e07dd6..d06d2d534 100755
--- a/package/dropbear/files/dropbear.init
+++ b/package/dropbear/files/dropbear.init
@@ -12,6 +12,27 @@ EXTRA_HELP="	killclients Kill ${NAME} processes except servers and yourself"
 
 dropbear_start()
 {
+	append_ports()
+	{
+		local ifname="$1"
+		local port="$2"
+
+		grep -qs "^ *$ifname:" /proc/net/dev || {
+			append args "-p $port"
+			return
+		}
+
+		for addr in $(
+			ifconfig "$ifname" | sed -ne '
+				/addr: *fe[89ab][0-9a-f]:/d
+				s/.* addr: *\([0-9a-f:\.]*\).*/\1/p
+			'
+		); do
+			append args "-p $addr:$port"
+		done
+	}
+
+
 	local section="$1"
 
 	# check if section is enabled (default)
@@ -33,13 +54,12 @@ dropbear_start()
 	config_get_bool val "${section}" PasswordAuth 1
 	[ "${val}" -eq 0 ] && append args "-s"
 	# B) listen interface and port
+	local port
 	local interface
-	local address
 	config_get interface "${section}" Interface
-	config_get address "${interface}" ipaddr
-	config_get val "${section}" Port
-	val="${address:+${address}:}${val}"
-	[ -n "${val}" ] && append args "-p ${val}"
+	config_get interface "${interface}" ifname "$interface"
+	config_get port "${section}" Port 22
+	append_ports "$interface" "$port"
 	# C) banner file
 	config_get val "${section}" BannerFile
 	[ -f "${val}" ] && append args "-b ${val}"
-- 
cgit v1.2.3