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 6a3a76a18b
17 changed files with 431 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
sbin/cert_dump
View File

@@ -37,14 +37,14 @@
# Global Variables
#-----------------------------------------------------------------------------------------------------------------------------------
declare -g VERSION="1.2.0"
declare -g VERSION="1.2.4"
declare -g NAME="cert_dump"
declare -g HELP="usage: [-h | --help] | [-V | --version] | [-v | --verbose] {ca|tc|key|csr|crt} [host]"
declare -g EXIT_CODE=0
declare -g MODE="DEFAULT"
declare -g VERBOSE="FALSE"
declare -g DRY_RUN="FALSE"
declare -g RETVAL=0
declare -g DEBUG=""
#declare -g DEBUG="echo"
@@ -81,7 +81,6 @@ cdu_version_print()
cdu_help_print()
{
cdu_version_print
help_print
}
@@ -104,25 +103,26 @@ cdu_args_parse()
while true
do
case "$1" in
# Options
-h|--help) MODE="EXIT"; cdu_help_print; shift;;
-V|--version) MODE="EXIT"; cdu_version_print; shift;;
-v|--verbose) VERBOSE="TRUE"; shift;;
# Mode switches
-h|--help) MODE="HELP"; shift;;
-V|--version) MODE="VERSION"; shift;;
# Global options
-v|--verbose) VERBOSE="TRUE"; shift;;
# End of options
--) shift; break;;
*) echo "args_parse internal error [$1]!"; exit 1;;
--) shift; break;;
*) echo "args_parse internal error [$1]!"; exit 1;;
esac
done
if [[ "${MODE}" != "EXIT" ]]
if [[ "${MODE}" == "DEFAULT" ]]
then
if [[ "${#}" -lt "1" ]]
then
MODE="EXIT"
echo_error "Not enough args!"
cdu_help_print
MODE="HELP"
EXIT_CODE=1
else
case "$1" in
"ca"|"tc")
@@ -132,10 +132,9 @@ cdu_args_parse()
"key"|"csr"|"crt")
if [[ "${#}" -lt "2" ]]
then
MODE="EXIT"
echo_error "Missing host argument for type: [$1]"
cdu_help_print
MODE="HELP"
EXIT_CODE=1
else
MODE="$(echo "$1" | tr '[:lower:]' '[:upper:]')"
HOST="$2"
@@ -143,10 +142,9 @@ cdu_args_parse()
;;
*)
MODE="EXIT"
echo_error "Invalid type: [$1]"
cdu_help_print
MODE="HELP"
EXIT_CODE=1
;;
esac
fi
@@ -232,15 +230,26 @@ cdu_cert_dump_crt()
# Main
#-----------------------------------------------------------------------------------------------------------------------------------
vsl_add
cdu_args_parse "$@"
case "${MODE}" in
"EXIT")
exit ${EXIT_CODE}
;;
"HELP")
cdu_help_print
exit ${EXIT_CODE}
;;
if [[ "${MODE}" == "EXIT" ]]
then
exit 0
fi
"VERSION")
cdu_version_print
exit ${EXIT_CODE}
;;
esac
case "${MODE}" in
@@ -266,10 +275,10 @@ case "${MODE}" in
*)
cdu_help_print
RETVAL=1
EXIT_CODE=1
;;
esac
exit ${RETVAL}
exit ${EXIT_CODE}

83
sbin/ip_host_update
View File

@@ -39,27 +39,27 @@
# Global Variables
#-----------------------------------------------------------------------------------------------------------------------------------
declare -g VERSION="1.0.0"
declare -g NAME="ip_host_update"
declare -g HELP="usage: [-h | --help] | [-V | --version] | [-v | --verbose] <host> <zone> <ip> <ttl>"
declare -g VERSION="1.2.4"
declare -g NAME="ip_host_update"
declare -g HELP="usage: [-h | --help] | [-V | --version] | [-v | --verbose] <host> <zone> <ip> <ttl>"
declare -g MODE="DEFAULT"
declare -g VERBOSE="FALSE"
declare -g DRY_RUN="FALSE"
declare -g RETVAL=0
declare -g EXIT_CODE=0
declare -g MODE="DEFAULT"
declare -g VERBOSE="FALSE"
declare -g DRY_RUN="FALSE"
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"
declare -g HOST=""
declare -g ZONE=""
declare -g IP=""
declare -g TTL=""
declare -g HOST=""
declare -g ZONE=""
declare -g IP=""
declare -g TTL=""
@@ -84,7 +84,6 @@ ihu_version_print()
ihu_help_print()
{
ihu_version_print
help_print
}
@@ -107,25 +106,26 @@ ihu_args_parse()
while true
do
case "$1" in
# Options
-h|--help) MODE="EXIT"; ihu_help_print; shift;;
-V|--version) MODE="EXIT"; ihu_version_print; shift;;
-v|--verbose) VERBOSE="TRUE"; shift;;
# Mode switches
-h|--help) MODE="HELP"; shift;;
-V|--version) MODE="VERSION"; shift;;
# Global options
-v|--verbose) VERBOSE="TRUE"; shift;;
# End of options
--) shift; break;;
*) echo "args_parse internal error [$1]!"; exit 1;;
--) shift; break;;
*) echo "args_parse internal error [$1]!"; exit 1;;
esac
done
if [[ "${MODE}" != "EXIT" ]]
if [[ "${MODE}" == "DEFAULT" ]]
then
if [[ "${#}" -lt "4" ]]
then
MODE="EXIT"
echo_error "Not enough args!"
ihu_help_print
MODE="HELP"
EXIT_CODE=1
else
MODE="UPDATE"
HOST="$1"
@@ -162,12 +162,27 @@ ihu_host_update()
# Main
#-----------------------------------------------------------------------------------------------------------------------------------
vsl_add
ihu_args_parse "$@"
if [[ "${MODE}" == "EXIT" ]]
then
exit 0
fi
case "${MODE}" in
"EXIT")
exit ${EXIT_CODE}
;;
"HELP")
ihu_help_print
exit ${EXIT_CODE}
;;
"VERSION")
ihu_version_print
exit ${EXIT_CODE}
;;
esac
case "${MODE}" in
UPDATE)
@@ -176,8 +191,8 @@ case "${MODE}" in
*)
echo "Usage: $0 <host> <zone> <ip> <ttl>"
RETVAL=1
EXIT_CODE=1
;;
esac
exit ${RETVAL}
exit ${EXIT_CODE}

2
sbin/openvpn-client-down
View File

@@ -39,7 +39,7 @@
# Global Variables
#-----------------------------------------------------------------------------------------------------------------------------------
declare -g VERSION="1.2.0"
declare -g VERSION="1.2.4"
declare -g NAME="openvpn-client-down"
declare -g DEBUG=""

2
sbin/openvpn-client-up
View File

@@ -39,7 +39,7 @@
# Global Variables
#-----------------------------------------------------------------------------------------------------------------------------------
declare -g VERSION="1.0.0"
declare -g VERSION="1.2.4"
declare -g NAME="openvpn-client-up"
declare -g DEBUG=""

2
sbin/openvpn-down
View File

@@ -39,7 +39,7 @@
# Global Variables
#-----------------------------------------------------------------------------------------------------------------------------------
declare -g VERSION="1.0.0"
declare -g VERSION="1.2.4"
declare -g NAME="openvpn-down"
declare -g DEBUG=""

72
sbin/openvpn-status
View File

@@ -39,25 +39,25 @@
# Global Variables
#-----------------------------------------------------------------------------------------------------------------------------------
declare -g VERSION="1.0.0"
declare -g NAME="openvpn-status"
declare -g HELP="usage: [-h | --help] | [-V | --version] | [-v | --verbose] [dev]"
declare -g VERSION="1.2.4"
declare -g NAME="openvpn-status"
declare -g HELP="usage: [-h | --help] | [-V | --version] | [-v | --verbose] [dev]"
declare -g MODE="DEFAULT"
declare -g VERBOSE="FALSE"
declare -g DRY_RUN="FALSE"
declare -g RETVAL=0
declare -g EXIT_CODE=0
declare -g MODE="DEFAULT"
declare -g VERBOSE="FALSE"
declare -g DRY_RUN="FALSE"
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"
declare -g STATUS_DIR="/var/lib/openvpn"
declare -g DEV=""
declare -g STATUS_DIR="/var/lib/openvpn"
declare -g DEV=""
@@ -105,18 +105,20 @@ ovs_args_parse()
while true
do
case "$1" in
# Options
-h|--help) MODE="EXIT"; ovs_help_print; shift;;
-V|--version) MODE="EXIT"; ovs_version_print; shift;;
-v|--verbose) VERBOSE="TRUE"; shift;;
# Mode switches
-h|--help) MODE="HELP"; shift;;
-V|--version) MODE="VERSION"; shift;;
# Global options
-v|--verbose) VERBOSE="TRUE"; shift;;
# End of options
--) shift; break;;
*) echo "args_parse internal error [$1]!"; exit 1;;
--) shift; break;;
*) echo "args_parse internal error [$1]!"; exit 1;;
esac
done
if [[ "${MODE}" != "EXIT" ]]
if [[ "${MODE}" == "DEFAULT" ]]
then
if [[ "${#}" -ge "1" ]]
then
@@ -164,15 +166,26 @@ ovs_status_all()
# Main
#-----------------------------------------------------------------------------------------------------------------------------------
vsl_add
ovs_args_parse "$@"
case "${MODE}" in
"EXIT")
exit ${EXIT_CODE}
;;
"HELP")
ovs_help_print
exit ${EXIT_CODE}
;;
if [[ "${MODE}" == "EXIT" ]]
then
exit 0
fi
"VERSION")
ovs_version_print
exit ${EXIT_CODE}
;;
esac
case "${MODE}" in
@@ -186,8 +199,9 @@ case "${MODE}" in
*)
echo "Usage: $0 [dev]"
RETVAL=1
EXIT_CODE=1
;;
esac
exit ${RETVAL}
exit ${EXIT_CODE}

2
sbin/openvpn-up
View File

@@ -37,7 +37,7 @@
# Global Variables
#-----------------------------------------------------------------------------------------------------------------------------------
declare -g VERSION="1.0.0"
declare -g VERSION="1.2.4"
declare -g NAME="openvpn-up"
declare -g DEBUG=""

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}

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}