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

94
sbin/rx3_net_adm
View File

@@ -39,26 +39,26 @@
# Global Variables
#-----------------------------------------------------------------------------------------------------------------------------------
declare -g VERSION="1.2.0"
declare -g NAME="rx3_net_adm"
declare -g HELP="usage: [-h | --help] | [-V | --version] | [-v | --verbose] {start|stop|restart|status|dump|table_set|refresh_address} [args...]"
declare -g VERSION="1.2.4"
declare -g NAME="rx3_net_adm"
declare -g HELP="usage: [-h | --help] | [-V | --version] | [-v | --verbose] {start|stop|restart|status|dump|table_set|refresh_address} [args...]"
declare -g MODE="DEFAULT"
declare -g VERBOSE="FALSE"
declare -g DRY_RUN="FALSE"
declare -g RETVAL=0
declare -g prog="rx3-net"
declare -g EXIT_CODE=0
declare -g MODE="DEFAULT"
declare -g VERBOSE="FALSE"
declare -g DRY_RUN="FALSE"
declare -g prog="rx3-net"
declare -g DEBUG="${DEBUG-}"
#declare -g DEBUG=""
#declare -g DEBUG="echo"
#declare -g DEBUG=":"
declare -g DEBUG="${DEBUG-}"
#declare -g DEBUG=""
#declare -g DEBUG="echo"
#declare -g DEBUG=":"
declare -g ECHO="${ECHO-}"
#declare -g ECHO="echo"
#declare -g ECHO=":"
declare -g ECHO="${ECHO-}"
#declare -g ECHO="echo"
#declare -g ECHO=":"
#declare -g LOG=""
#declare -g LOG=""
@@ -83,7 +83,7 @@ rna_version_print()
rna_help_print()
{
rna_version_print
version_print ""
help_print
}
@@ -106,9 +106,11 @@ rna_args_parse()
while true
do
case "$1" in
# Options
-h|--help) MODE="EXIT"; rna_help_print; shift;;
-V|--version) MODE="EXIT"; rna_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
@@ -117,14 +119,13 @@ rna_args_parse()
esac
done
if [[ "${MODE}" != "EXIT" ]]
if [[ "${MODE}" == "DEFAULT" ]]
then
if [[ "${#}" -lt "1" ]]
then
MODE="EXIT"
echo_error "Not enough args!"
rna_help_print
MODE="HELP"
EXIT_CODE=1
else
case "$1" in
start|stop|restart|status|dump|table_set|refresh_address)
@@ -132,10 +133,9 @@ rna_args_parse()
;;
*)
MODE="EXIT"
echo_error "Invalid command: [$1]"
rna_help_print
MODE="HELP"
EXIT_CODE=1
;;
esac
fi
@@ -157,12 +157,12 @@ rna_start()
if [ -r /var/lock/subsys/rx3-net ]
then
echo "already started"
RETVAL=0
EXIT_CODE=0
else
network_start
RETVAL=$?
[ "${RETVAL}" = 0 ] && touch /var/lock/subsys/rx3-net
EXIT_CODE=$?
[ "${EXIT_CODE}" = 0 ] && touch /var/lock/subsys/rx3-net
fi
echo
@@ -184,13 +184,13 @@ rna_stop()
then
network_stop
RETVAL=$?
EXIT_CODE=$?
else
echo "already stopped"
RETVAL=0
EXIT_CODE=0
fi
[ "${RETVAL}" = 0 ] && rm -f /var/lock/subsys/rx3-net
[ "${EXIT_CODE}" = 0 ] && rm -f /var/lock/subsys/rx3-net
echo
}
@@ -269,12 +269,27 @@ rna_address_refresh()
# Main
#-----------------------------------------------------------------------------------------------------------------------------------
vsl_add
rna_args_parse "$@"
if [[ "${MODE}" == "EXIT" ]]
then
exit 0
fi
case "${MODE}" in
"EXIT")
exit ${EXIT_CODE}
;;
"HELP")
rna_help_print
exit ${EXIT_CODE}
;;
"VERSION")
rna_version_print
exit ${EXIT_CODE}
;;
esac
network_init
@@ -311,10 +326,11 @@ case "${MODE}" in
*)
echo "Usage: $0 {start|stop|restart|status|dump|table_set|refresh_address}"
RETVAL=1
EXIT_CODE=1
;;
esac
network_deinit
exit ${RETVAL}
exit ${EXIT_CODE}