From: Richard Yu <yurichard3839@gmail.com>
Date: Wed, 21 Dec 2022 09:50:18 +0000 (+0800)
Subject: natmap: add forward_port option
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=cd51b58efdfa689f282e808c14a6f8b054eedb57;p=feed%2Fpackages.git

natmap: add forward_port option

The bind port (-b) can be used with forward port (-p),
so expose this option in config file.

Signed-off-by: Richard Yu <yurichard3839@gmail.com>
---

diff --git a/net/natmap/Makefile b/net/natmap/Makefile
index 7c09f17165..3c2991df83 100644
--- a/net/natmap/Makefile
+++ b/net/natmap/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=natmap
 PKG_VERSION:=20221203
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/heiher/natmap/releases/download/$(PKG_VERSION)
diff --git a/net/natmap/files/natmap.config b/net/natmap/files/natmap.config
index 71931f6c56..01328c1bbc 100644
--- a/net/natmap/files/natmap.config
+++ b/net/natmap/files/natmap.config
@@ -8,5 +8,6 @@ config natmap
 	option http_server 'example.com'
 	option port '8080'
 	option forward_target ''
+	option forward_port ''
 	option notify_script ''
 
diff --git a/net/natmap/files/natmap.init b/net/natmap/files/natmap.init
index a9ff905391..3688880b3e 100644
--- a/net/natmap/files/natmap.init
+++ b/net/natmap/files/natmap.init
@@ -26,6 +26,7 @@ validate_section_natmap() {
 		'http_server:host' \
 		'port:port' \
 		'forward_target:host' \
+		'forward_port:port' \
 		'notify_script:file'
 }
 
@@ -39,15 +40,16 @@ natmap_instance() {
 
 	procd_open_instance "$1"
 	procd_set_param command "$PROG" \
-		${interval:+-k $interval} \
+		${interval:+-k "$interval"} \
 		${stun_server:+-s "$stun_server"} \
-		${http_server:+-h "$http_server"}
+		${http_server:+-h "$http_server"} \
+		${port:+-b "$port"} \
 
 	[ "${family}" = ipv4 ] && procd_append_param command -4
 	[ "${family}" = ipv6 ] && procd_append_param command -6
 	[ "${udp_mode}" = 1 ] && procd_append_param command -u
 
-	[ -n "$interface" ] && {
+	[ -n "${interface}" ] && {
 		local ifname
 
 		network_get_device ifname "$interface" || ifname="$interface"
@@ -55,11 +57,7 @@ natmap_instance() {
 		procd_append_param netdev "$ifname"
 	}
 
-	if [ -n "$forward_target" ]; then
-		procd_append_param command -t "$forward_target" -p $port
-	else
-		procd_append_param command -b $port
-	fi
+	[ -n "${forward_target}" ] && procd_append_param command -t "$forward_target" -p "$forward_port"
 
 	[ -n "${notify_script}" ] && procd_set_param env "NOTIFY_SCRIPT=${notify_script}"
 	procd_append_param command -e /usr/lib/natmap/update.sh