Rx3/network_tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 11 Wiki Activity

- Add VSL support,

Browse Source 
- Display VSL tab in VPN Admin Board,
- Support now rx3-base 1.2.0.
This commit is contained in:
Arnaud G. GIBERT
2026-09-11 20:21:19 +02:00
parent 3dc7f6bdd5
commit e8ff2a1761
17 changed files with 431 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
sbin/rx3_vpn_adm
View File

@@ -39,23 +39,23 @@
# Global Variables
#-----------------------------------------------------------------------------------------------------------------------------------
declare -g VERSION="1.2.0"
declare -g NAME="rx3_vpn_adm"
declare -g HELP="usage: [-h | --help] | [-V | --version] | [-v | --verbose] {start | stop | restart | status | dump} [args...]"
declare -g VERSION="1.2.4"
declare -g NAME="Rx3_VPN_Adm"
declare -g HELP="usage: [-h | --help] | [-V | --version] | [-v | --verbose] {start | stop | restart | status | dump} [args...]"
declare -g MODE="DEFAULT"
declare -g VERBOSE="FALSE"
declare -g DRY_RUN="FALSE"
declare -g RETVAL=0
declare -g prog="rx3-vpn"
declare -g EXIT_CODE=0
declare -g MODE="DEFAULT"
declare -g VERBOSE="FALSE"
declare -g DRY_RUN="FALSE"
declare -g prog="rx3-vpn"
declare -g DEBUG=""
#declare -g DEBUG="echo"
#declare -g DEBUG=":"
declare -g DEBUG=""
#declare -g DEBUG="echo"
#declare -g DEBUG=":"
declare -g LOG=""
#declare -g LOG=":"
#declare -g LOG="echo"
declare -g LOG=""
#declare -g LOG=":"
#declare -g LOG="echo"
@@ -80,7 +80,6 @@ rva_version_print()
rva_help_print()
{
rva_version_print
help_print
}
@@ -103,9 +102,11 @@ rva_args_parse()
while true
do
case "$1" in
# Options
-h|--help) MODE="EXIT"; rva_help_print; shift;;
-V|--version) MODE="EXIT"; rva_version_print; shift;;
# Mode switches
-h|--help) MODE="HELP"; shift;;
-V|--version) MODE="VERSION"; shift;;
# Global options
-v|--verbose) VERBOSE="TRUE"; shift;;
# End of options
@@ -114,14 +115,14 @@ rva_args_parse()
esac
done
if [[ "${MODE}" != "EXIT" ]]
if [[ "${MODE}" == "DEFAULT" ]]
then
if [[ "${#}" -lt "1" ]]
then
MODE="EXIT"
echo_error "Not enough args!"
rva_help_print
MODE="HELP"
EXIT_CODE=1
else
case "$1" in
start|stop|restart|status|dump)
@@ -129,10 +130,10 @@ rva_args_parse()
;;
*)
MODE="EXIT"
echo_error "Invalid command: [$1]"
rva_help_print
MODE="HELP"
EXIT_CODE=1
;;
esac
fi
@@ -154,12 +155,12 @@ rva_start()
if [ -r /var/lock/subsys/rx3-vpn ]
then
echo "already started"
RETVAL=0
EXIT_CODE=0
else
vpn_start
RETVAL=$?
[ "${RETVAL}" = 0 ] && touch /var/lock/subsys/rx3-vpn
EXIT_CODE=$?
[ "${EXIT_CODE}" = 0 ] && touch /var/lock/subsys/rx3-vpn
fi
echo
@@ -181,13 +182,13 @@ rva_stop()
then
vpn_stop
RETVAL=$?
EXIT_CODE=$?
else
echo "already stopped"
RETVAL=0
EXIT_CODE=0
fi
[ "${RETVAL}" = 0 ] && rm -f /var/lock/subsys/rx3-vpn
[ "${EXIT_CODE}" = 0 ] && rm -f /var/lock/subsys/rx3-vpn
echo
}
@@ -226,14 +227,27 @@ rva_dump()
# Main
#-----------------------------------------------------------------------------------------------------------------------------------
vsl_add
rva_args_parse "$@"
case "${MODE}" in
"EXIT")
exit ${EXIT_CODE}
;;
"HELP")
rva_help_print
exit ${EXIT_CODE}
;;
"VERSION")
rva_version_print
exit ${EXIT_CODE}
;;
esac
if [[ "${MODE}" == "EXIT" ]]
then
exit 0
fi
vpn_init
@@ -262,10 +276,11 @@ case "${MODE}" in
*)
echo "Usage: $0 {start|stop|restart|status|dump}"
RETVAL=1
EXIT_CODE=1
;;
esac
vpn_deinit
exit ${RETVAL}
exit ${EXIT_CODE}