Merge pull request #14592 from dobo90/socat_improvement

socat: allow more complex command line options
This commit is contained in:
Rosen Penev 2021-01-27 13:32:46 -08:00 committed by GitHub
commit ebba975286
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 3 deletions

View File

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=socat
PKG_VERSION:=1.7.3.4
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download

View File

@ -12,11 +12,18 @@ validate_section_socat()
{
uci_load_validate socat socat "$1" "$2" \
'enable:bool:1' \
'SocatOptions:string'
'SocatOptions:or(string, list(string))'
}
append_param_command()
{
procd_append_param command "$1"
}
socat_instance()
{
local is_list
[ "$2" = 0 ] || {
echo "validation failed"
return 1
@ -26,7 +33,14 @@ socat_instance()
procd_open_instance
procd_set_param command "$PROG"
procd_append_param command $SocatOptions
config_get is_list "$1" SocatOptions_LENGTH
if [ -z "$is_list" ]; then
procd_append_param command $SocatOptions
else
config_list_foreach "$1" SocatOptions append_param_command
fi
procd_set_param stdout 1
procd_set_param stderr 1
procd_close_instance
}