From: Dengfeng Liu <redacted>
Date: Fri, 14 Oct 2022 08:36:16 +0000 (+0000)
Subject: xfrpc: allow server_addr ip and domain
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=a7e3f28c3761de6e7eed5423fbd116eeeec38491;p=openwrt-packages.git

xfrpc: allow server_addr ip and domain

Signed-off-by: Dengfeng Liu <redacted>
---

diff --git a/net/xfrpc/files/xfrpc.init b/net/xfrpc/files/xfrpc.init
index aa999bc68..3b0ddedaf 100755
--- a/net/xfrpc/files/xfrpc.init
+++ b/net/xfrpc/files/xfrpc.init
@@ -34,14 +34,16 @@ handle_xfrpc() {
 			;;
 		http|https)
 			config_get custom_domains "$name" custom_domains
-			echo "custom_domains = $custom_domains" >> "$config"
+			[ -z "$custom_domains" ] || echo "custom_domains = $custom_domains" >> "$config"
+			config_get subdomain "$name" subdomain
+			[ -z "$subdomain" ] || echo "subdomain = $subdomain" >> "$config"
 			;;
 		esac
 	}
 
 	if [ "$name" = "common" ]; then
 		uci_validate_section xfrpc xfrp "$name" \
-				'server_addr:ipaddr' \
+				'server_addr:host' \
 				'server_port:uinteger' \
 				'token:string:'