[openwrt/openwrt] unetd: fix handling of connect/tunnel list

LEDE Commits lede-commits at lists.infradead.org
Thu Sep 1 11:42:25 PDT 2022


nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/23a7188ab47907a631951c18d93cf3fee0055a79

commit 23a7188ab47907a631951c18d93cf3fee0055a79
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Wed Aug 31 13:29:32 2022 +0200

    unetd: fix handling of connect/tunnel list
    
    change the type to array, so that uci lists can be used
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 package/network/services/unetd/files/unetd.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/package/network/services/unetd/files/unetd.sh b/package/network/services/unetd/files/unetd.sh
index 8e56fbd869..581eeb95fa 100644
--- a/package/network/services/unetd/files/unetd.sh
+++ b/package/network/services/unetd/files/unetd.sh
@@ -16,8 +16,8 @@ proto_unet_init_config() {
 	proto_config_add_string file
 	proto_config_add_int keepalive
 	proto_config_add_string domain
-	proto_config_add_string "tunnels:list(string)"
-	proto_config_add_string "connect:list(string)"
+	proto_config_add_array "tunnels:list(string)"
+	proto_config_add_array "connect:list(string)"
 	no_device=1
 	available=1
 	no_proto_task=1
@@ -27,7 +27,9 @@ proto_unet_setup() {
 	local config="$1"
 
 	local device type key file keepalive domain tunnels
-	json_get_vars device type auth_key key file keepalive domain tunnels connect
+	json_get_vars device type auth_key key file keepalive domain
+	json_get_values tunnels tunnels
+	json_get_values connect connect
 	device="${device:-$config}"
 
 	[ -n "$auth_key" ] && type="${type:-dynamic}"




More information about the lede-commits mailing list