Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

natmap: add forward_port option

Browse source 
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>
This commit is contained in:
Richard Yu 2022-12-21 17:50:18 +08:00
parent 735cba83ce
commit cd51b58efd
No known key found for this signature in database
GPG key ID: 44FFAF069A806DED
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/natmap/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=natmap PKG_NAME:=natmap
PKG_VERSION:=20221203 PKG_VERSION:=20221203
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/heiher/natmap/releases/download/$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/heiher/natmap/releases/download/$(PKG_VERSION)

1
net/natmap/files/natmap.config
View file

@ -8,5 +8,6 @@ config natmap
option http_server 'example.com' option http_server 'example.com'
option port '8080' option port '8080'
option forward_target '' option forward_target ''
option forward_port ''
option notify_script '' option notify_script ''

14
net/natmap/files/natmap.init
View file

@ -26,6 +26,7 @@ validate_section_natmap() {
'http_server:host' \ 'http_server:host' \
'port:port' \ 'port:port' \
'forward_target:host' \ 'forward_target:host' \
'forward_port:port' \
'notify_script:file' 'notify_script:file'
} }
@ -39,15 +40,16 @@ natmap_instance() {
procd_open_instance "$1" procd_open_instance "$1"
procd_set_param command "$PROG" \ procd_set_param command "$PROG" \
${interval:+-k $interval} \ ${interval:+-k "$interval"} \
${stun_server:+-s "$stun_server"} \ ${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}" = ipv4 ] && procd_append_param command -4
[ "${family}" = ipv6 ] && procd_append_param command -6 [ "${family}" = ipv6 ] && procd_append_param command -6
[ "${udp_mode}" = 1 ] && procd_append_param command -u [ "${udp_mode}" = 1 ] && procd_append_param command -u
[ -n "$interface" ] && { [ -n "${interface}" ] && {
local ifname local ifname
network_get_device ifname "$interface" || ifname="$interface" network_get_device ifname "$interface" || ifname="$interface"
@ -55,11 +57,7 @@ natmap_instance() {
procd_append_param netdev "$ifname" procd_append_param netdev "$ifname"
} }
if [ -n "$forward_target" ]; then [ -n "${forward_target}" ] && procd_append_param command -t "$forward_target" -p "$forward_port"
procd_append_param command -t "$forward_target" -p $port
else
procd_append_param command -b $port
fi
[ -n "${notify_script}" ] && procd_set_param env "NOTIFY_SCRIPT=${notify_script}" [ -n "${notify_script}" ] && procd_set_param env "NOTIFY_SCRIPT=${notify_script}"
procd_append_param command -e /usr/lib/natmap/update.sh procd_append_param command -e /usr/lib/natmap/update.sh