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

sshtunnel: init script improvements

Browse source 
* Fix for OpenSSH pickiness about argument order to be able to use
  tap devices.
* Allow tun/tap devices to be used from index 0 as demonstrated in
  example config.
* Change arithmetic expressions.

Signed-off-by: Kimmo Vuorinen <kimmo.vuorinen@gmail.com>
This commit is contained in:
Kimmo Vuorinen 2020-02-12 20:00:19 +02:00 committed by Nuno Goncalves
parent fe71eacbc6
commit e7088fe82c
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/sshtunnel/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=sshtunnel PKG_NAME:=sshtunnel
PKG_VERSION:=4 PKG_VERSION:=4
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE:=GPL-2.0-or-later
PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com> PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>

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

@ -20,7 +20,7 @@ _err() {
append_params() { append_params() {
local p v args local p v args
for p in $*; do for p in "$@"; do
eval "v=\$$p" eval "v=\$$p"
[ -n "$v" ] && args="$args -o $p=$v" [ -n "$v" ] && args="$args -o $p=$v"
done done
@ -80,8 +80,8 @@ validate_tunnelD_section() {
validate_tunnelW_section() { validate_tunnelW_section() {
uci_load_validate sshtunnel tunnelW "$1" "$2" \ uci_load_validate sshtunnel tunnelW "$1" "$2" \
'vpntype:or("ethernet", "point-to-point"):point-to-point' \ 'vpntype:or("ethernet", "point-to-point"):point-to-point' \
'localdev:or("any", min(1))' \ 'localdev:or("any", min(0))' \
'remotedev:or("any", min(1))' 'remotedev:or("any", min(0))'
} }
load_tunnelR() { load_tunnelR() {
@ -96,7 +96,7 @@ load_tunnelR() {
[ -n "$remoteport" -a -n "$localport" -a -n "$remoteaddress" ] || { _err "tunnelR $1: missing required options"; return 1; } [ -n "$remoteport" -a -n "$localport" -a -n "$remoteaddress" ] || { _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
let count++ count=$((count+=1))
_log "tunnelR at $server: -R $remoteaddress:$remoteport:$localaddress:$localport" _log "tunnelR at $server: -R $remoteaddress:$remoteport:$localaddress:$localport"
append_string "ARGS_tunnels" "-R $remoteaddress:$remoteport:$localaddress:$localport" append_string "ARGS_tunnels" "-R $remoteaddress:$remoteport:$localaddress:$localport"
@ -114,7 +114,7 @@ load_tunnelL() {
[ -n "$remoteport" -a -n "$localport" -a -n "$remoteaddress" ] || { _err "tunnelL $1: missing required options"; return 1; } [ -n "$remoteport" -a -n "$localport" -a -n "$remoteaddress" ] || { _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
let count++ count=$((count+=1))
_log "tunnelL at $server: -L $localaddress:$localport:$remoteaddress:$remoteport" _log "tunnelL at $server: -L $localaddress:$localport:$remoteaddress:$remoteport"
append_string "ARGS_tunnels" "-L $localaddress:$localport:$remoteaddress:$remoteport" append_string "ARGS_tunnels" "-L $localaddress:$localport:$remoteaddress:$remoteport"
@ -132,7 +132,7 @@ load_tunnelD() {
[ -n "$localport" ] || { _err "tunnelD $1: missing localport"; return 1; } [ -n "$localport" ] || { _err "tunnelD $1: missing localport"; 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
let count++ count=$((count+=1))
_log "proxy via $server: -D $localaddress:$localport" _log "proxy via $server: -D $localaddress:$localport"
append_string "ARGS_tunnels" "-D $localaddress:$localport" append_string "ARGS_tunnels" "-D $localaddress:$localport"
@ -152,10 +152,10 @@ load_tunnelW() {
[ "$user" = "root" ] || { _err "tunnelW $1: root is required for tun"; return 1; } [ "$user" = "root" ] || { _err "tunnelW $1: root is required for tun"; 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
let count++ count=$((count+=1))
_log "tunnelW to $server: -w $localdev:$remotedev -o Tunnel=$vpntype" _log "tunnelW to $server: -o Tunnel=$vpntype -w $localdev:$remotedev"
append_string "ARGS_tunnels" "-w $localdev:$remotedev -o Tunnel=$vpntype" append_string "ARGS_tunnels" "-o Tunnel=$vpntype -w $localdev:$remotedev"
} }
load_server() { load_server() {