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

sshtunnel: allow empty remoteaddress

Browse source 
Just empty or * may have some semantic difference on a server

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
This commit is contained in:
Sergey Ponomarev 2023-06-21 19:58:48 +03:00 committed by Nuno Goncalves
parent 1d9f10a135
commit 9dd8a62238
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
net/sshtunnel/files/sshtunnel.init
View file

@ -57,7 +57,7 @@ validate_server_section() {
validate_tunnelR_section() { validate_tunnelR_section() {
uci_load_validate sshtunnel tunnelR "$1" "$2" \ uci_load_validate sshtunnel tunnelR "$1" "$2" \
'remoteaddress:or(host, "*"):*' \ 'remoteaddress:or(host, "*")' \
'remoteport:port' \ 'remoteport:port' \
'localaddress:host' \ 'localaddress:host' \
'localport:port' 'localport:port'
@ -67,13 +67,13 @@ validate_tunnelL_section() {
uci_load_validate sshtunnel tunnelL "$1" "$2" \ uci_load_validate sshtunnel tunnelL "$1" "$2" \
'remoteaddress:host' \ 'remoteaddress:host' \
'remoteport:port' \ 'remoteport:port' \
'localaddress:or(host, "*"):*' \ 'localaddress:or(host, "*")' \
'localport:port' 'localport:port'
} }
validate_tunnelD_section() { validate_tunnelD_section() {
uci_load_validate sshtunnel tunnelD "$1" "$2" \ uci_load_validate sshtunnel tunnelD "$1" "$2" \
'localaddress:or(host, "*"):*' \ 'localaddress:or(host, "*")' \
'localport:port' 'localport:port'
} }
@ -93,7 +93,7 @@ load_tunnelR() {
# validate and load this remote tunnel config # validate and load this remote tunnel config
[ "$2" = 0 ] || { _err "tunnelR $1: validation failed"; return 1; } [ "$2" = 0 ] || { _err "tunnelR $1: validation failed"; return 1; }
[ -n "$remoteport" -a -n "$localport" -a -n "$remoteaddress" ] || { _err "tunnelR $1: missing required options"; return 1; } [ -n "$remoteport" -a -n "$localport" ] || { _err "tunnelR $1: missing required options"; return 1; }
# count nr of valid sections to make sure there are at least one # count nr of valid sections to make sure there are at least one
count=$((count+=1)) count=$((count+=1))
@ -111,7 +111,7 @@ load_tunnelL() {
# validate and load this remote tunnel config # validate and load this remote tunnel config
[ "$2" = 0 ] || { _err "tunnelL $1: validation failed"; return 1; } [ "$2" = 0 ] || { _err "tunnelL $1: validation failed"; return 1; }
[ -n "$remoteport" -a -n "$localport" -a -n "$remoteaddress" ] || { _err "tunnelL $1: missing required options"; return 1; } [ -n "$remoteport" -a -n "$localport" ] || { _err "tunnelL $1: missing required options"; return 1; }
# count nr of valid sections to make sure there are at least one # count nr of valid sections to make sure there are at least one
count=$((count+=1)) count=$((count+=1))