mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

owsd: make client connection timers configurable

Browse source
This commit is contained in:
Jakob Olsson 2020-06-01 08:54:40 +02:00
parent 4c124ccd4e
commit 0c5f03d50c
2 changed files with 48 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
owsd/Makefile
View file

@ -10,7 +10,7 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO=git
PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/owsd.git
PKG_SOURCE_VERSION:=6d2c10b28d2064f9341b5185a32a735cbb8d644d
PKG_SOURCE_VERSION:=ceeb7d440c2af2cccc4b2c3f424b3251d8ff4a0c
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
PKG_INSTALL:=1

50
owsd/files/owsd.init
View file

@ -9,7 +9,7 @@ USE_PROCD=1
PROG=/usr/bin/owsd
UPROXYD="/sbin/uproxyd"
CONFIGFILE="/etc/config/owsd"
JSONFILE="/tmp/owsd/owsd.json"
DHCP_DOMAINS=""
USERS=""
@ -113,6 +113,9 @@ validate_owsd_ubusproxy() {
'peer:list(string)' \
'object:list(string)' \
'prefix:string' \
'max_reconnect_time:string' \
'client_backoff_timeout:string' \
'reconnect_timeout:string' \
'peer_key:file' \
'peer_cert:file' \
'peer_ca:file' \
@ -278,6 +281,37 @@ parse_owsd_iface() {
fi
}
parser_timeout()
{
local flag data
local ret=0
#data format is digital with time unit
#10s-10 seconds 10m-10 minutes 10h-10 hours 10d-10 days
if [ -n "$1" ]; then
flag=$(echo "$1"| tr -d [0-9] | tr '[A-Z]' '[a-z]')
data=$(echo "$1"| tr -cd [0-9])
case $flag in
m)
ret=$((data*1000*60))
;;
h)
ret=$((data*1000*60*60))
;;
d)
ret=$((data*1000*60*60*24))
;;
*)
# assume seconds if no format given
ret=$((data*1000))
;;
esac
echo "$ret"
else
echo "0"
fi
}
start_service() {
# update rpcd config according to owsd acl
handle_owsd_acl
@ -296,6 +330,7 @@ start_service() {
echo "Global validation failed"
return 1
}
json_init
json_add_object "global"
[ -n "${sock}" ] && json_add_string "socket" "$sock"
@ -327,6 +362,8 @@ start_service() {
config_list_foreach "ubusproxy" "object" append_object
json_close_array
[ -n "${reconnect_timeout}" ] && json_add_int "reconnect_timeout" $(parser_timeout $reconnect_timeout)
[ "${prefix}" == "mac" ] && json_add_string "prefix" "mac"
json_close_object
fi
@ -337,8 +374,8 @@ start_service() {
json_close_object
[ ! -d "/tmp/owsd" ] && mkdir /tmp/owsd
json_dump > /tmp/owsd/owsd_cfg.json
procd_append_param command -f "/tmp/owsd/owsd_cfg.json"
json_dump > "$JSONFILE"
procd_append_param command -f "$JSONFILE"
# procd_set_param stderr 1
procd_set_param respawn
@ -349,6 +386,13 @@ start_service() {
# Start uproxyd
procd_open_instance
procd_set_param command $UPROXYD
config_get ctimeout ubusproxy client_backoff_timeout
config_get reconn ubusproxy max_reconnect_time
[ -n "${reconn}" ] && procd_append_param command -r "${reconn}"
[ -n "${ctimeout}" ] && ctimeout=$(parser_timeout $ctimeout)
[ -n "${ctimeout}" ] && procd_append_param command -t "${ctimeout}"
procd_set_param respawn
procd_close_instance
fi