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

- Bug fixes next to Darkstar live testing...

Browse Source 
- Fix .ovpn download file type.
This commit is contained in:
Arnaud G. GIBERT
2026-08-24 16:51:44 +02:00
parent c2de255a0e
commit 0af93ac67e
6 changed files with 43 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ReleaseNotes.txt
View File

@@ -1,3 +1,12 @@
------------------------------------------------------------------------------------------------------------------------------------
Network Tools V 1.2.3 - A. GIBERT - 2026/08/25
------------------------------------------------------------------------------------------------------------------------------------
- Bug fixes next to Darkstar live testing...
- Fix .ovpn download file type.
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
Network Tools V 1.2.2 - A. GIBERT - 2026/08/18 Network Tools V 1.2.2 - A. GIBERT - 2026/08/18
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------

5
SPECS/network_tools.spec
View File

@@ -24,7 +24,7 @@
%define name network_tools %define name network_tools
%define version 1.2.2 %define version 1.2.3
%define release %mkrel 1rx3 %define release %mkrel 1rx3
%global debug_package %{nil} %global debug_package %{nil}
@@ -213,6 +213,9 @@ cp www/cgi-bin/*.cgi %{buildroot}%{_webcgi}
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
%changelog %changelog
* Tue Aug 25 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.2.3-1rx3.mga9
- Update to 1.2.3
* Tue Aug 18 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.2.2-1rx3.mga9 * Tue Aug 18 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.2.2-1rx3.mga9
- Update to 1.2.2 - Update to 1.2.2

2
lib/rx3/dns.bash
View File

@@ -315,7 +315,7 @@ dns_host_update()
echo "update delete ${host}.${zone}. TXT" echo "update delete ${host}.${zone}. TXT"
echo "update add ${host}.${zone}. ${ttl} TXT ${date}" echo "update add ${host}.${zone}. ${ttl} TXT ${date}"
echo "" echo ""
) | sudo nsupdate || rc="$?" ) | sudo nsupdate && rc="$?"
if [[ "${rc}" == "0" ]] if [[ "${rc}" == "0" ]]
then then

18
lib/rx3/network.bash
View File

@@ -71,7 +71,7 @@ declare -g NETWORK_LOG_FILE
declare -g NETWORK_LOG_LOCK declare -g NETWORK_LOG_LOCK
#declare -g NETWORK_LOG_LOCK="${NETWORK_LOG_FILE}" #declare -g NETWORK_LOG_LOCK="${NETWORK_LOG_FILE}"
declare -g NETWORK_LOG_TRACE="DISABLE" declare -g NETWORK_LOG_TRACE="DISABLED"
declare -g NETWORK_NC_TIMEOUT declare -g NETWORK_NC_TIMEOUT
@@ -134,14 +134,24 @@ network_common_openvpn_stats_get()
fi fi
if [[ "${device}" != "" ]] if [[ "${device}" != "" ]]
then then
ovpn_stat_client_name=""
if [[ "${NETWORK_OPENVPN_STATUS}" =~ ("${device}.status: TITLE") ]] if [[ "${NETWORK_OPENVPN_STATUS}" =~ ("${device}.status: TITLE") ]]
then then
# OpenVPN Server Mode # OpenVPN Server Mode
OIFS="${IFS}" OIFS="${IFS}"
IFS="," IFS=","
set XXX/$( echo "${NETWORK_OPENVPN_STATUS}" | grep "${device}\.status: CLIENT_LIST,${client},") &>/dev/null || true line="$( echo "${NETWORK_OPENVPN_STATUS}" | grep "${device}\.status: CLIENT_LIST,${client},")" || true
if [[ "${line}" == "" ]]
then
line="/var/lib/openvpn/${device}.status: CLIENT_LIST,,,,,,,,,,,,"
fi
set XXX/${line} &>/dev/null || true
IFS="${OIFS}" IFS="${OIFS}"
tmp="${1/XXX*\//}" tmp="${1/XXX*\//}"
@@ -1078,7 +1088,7 @@ network_table_set()
fi fi
tab_assign NETWORK_SRC_TAB "${src_id},Table" "${ts_table}" tab_assign NETWORK_SRC_TAB "${src_id},Table" "${nts_table}"
${DEBUG} sed "/^NETWORK_SRC_CONFIG=\"/,/^\"/ { s/^\(${nts_ip//./\\.}[[:space:]]\+\([^\t ]\+[[:space:]]\+\)\{2\}\)[^[:space:]]\+/\1${nts_table}/ }" -i ${NETWORK_CONFIG_FILE} ${DEBUG} sed "/^NETWORK_SRC_CONFIG=\"/,/^\"/ { s/^\(${nts_ip//./\\.}[[:space:]]\+\([^\t ]\+[[:space:]]\+\)\{2\}\)[^[:space:]]\+/\1${nts_table}/ }" -i ${NETWORK_CONFIG_FILE}

30
lib/rx3/vpn.bash
View File

@@ -264,11 +264,11 @@ vpn_job_tab_deinit()
do do
vpn_job_tab_get "${job_id}" vpn_job_tab_get "${job_id}"
if [[ "${job_PId}" -gt 0 ]] if [[ "${job_pid}" -gt 0 ]]
then then
log_info "VPN" "Killing : Id: [${job_id}] Name: [${job_name}] PId: [${job_pid}]..." log_info "VPN" "Killing : Id: [${job_id}] Name: [${job_name}] PId: [${job_pid}]..."
kill -15 ${job_pid} kill -15 ${job_pid} || true
fi fi
done done
@@ -339,12 +339,8 @@ vpn_supervisor()
for job_id in ${VPN_JOB_ID_LIST} for job_id in ${VPN_JOB_ID_LIST}
do do
vpn_job_tab_get "${job_id}" vpn_job_tab_get "${job_id}"
${DEBUG} kill -0 "${job_pid}" 2>/dev/null if [[ ${job_pid} == "0" ]] || ! kill -0 "${job_pid}" 2>/dev/null
rc=$?
if [[ ${job_pid} == 0 ]] || [[ $rc != 0 ]]
then then
log_info "VPN" "Restarting Cmd: [${job_cmd}]..." log_info "VPN" "Restarting Cmd: [${job_cmd}]..."
@@ -395,10 +391,7 @@ vpn_jobs_kill()
do do
vpn_job_tab_get "${job_id}" vpn_job_tab_get "${job_id}"
${DEBUG} kill -0 "${job_pid}" 2>/dev/null if [[ ${job_pid} != 0 ]] && kill -0 "${job_pid}" 2>/dev/null
rc=$?
if [[ ${job_pid} != 0 ]] && [[ $rc == 0 ]]
then then
log_info "VPN" "Killing Job Id: [${job_id}] Job_PId: [${job_pid}] Cmd: [${job_cmd}]..." log_info "VPN" "Killing Job Id: [${job_id}] Job_PId: [${job_pid}] Cmd: [${job_cmd}]..."
@@ -477,10 +470,7 @@ vpn_start()
daemon_pid=0 daemon_pid=0
fi fi
${DEBUG} kill -0 "${daemon_pid}" 2>/dev/null if [[ "${daemon_pid}" == "0" ]] || ! kill -0 "${daemon_pid}" 2>/dev/null
rc=$?
if [[ "${daemon_pid}" == "0" ]] || [[ $rc != 0 ]]
then then
vpn_config_make_all vpn_config_make_all
@@ -519,10 +509,7 @@ vpn_stop()
daemon_pid=0 daemon_pid=0
fi fi
${DEBUG} kill -0 "${daemon_pid}" 2>/dev/null if [[ "${daemon_pid}" == "0" ]] || ! kill -0 "${daemon_pid}" 2>/dev/null
rc=$?
if [[ "${daemon_pid}" == "0" ]] || [[ $rc != 0 ]]
then then
log_info "VPN" "Daemon already stoped!" log_info "VPN" "Daemon already stoped!"
else else
@@ -572,10 +559,7 @@ vpn_status()
do do
vpn_job_tab_get "${job_id}" vpn_job_tab_get "${job_id}"
${DEBUG} kill -0 "${job_pid}" 2>/dev/null if [[ "${job_pid}" == "0" ]] || ! kill -0 "${job_pid}" 2>/dev/null
rc=$?
if [[ "${job_pid}" == "0" ]] || [[ $rc != 0 ]]
then then
job_status="Down" job_status="Down"
else else

10
www/cgi-bin/vpn-admin_board.cgi Executable file → Normal file
View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/usr/bin/bash
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
# #
# Rx3 VPN Admin Board CGI # Rx3 VPN Admin Board CGI
@@ -125,6 +125,12 @@ vab_header_print()
echo "Content-type: text/plain" echo "Content-type: text/plain"
echo "" echo ""
;; ;;
"ovpn")
echo "Content-disposition: attachment; filename=${FILE_NAME}"
echo "Content-type: application/x-openvpn-profile"
echo ""
;;
esac esac
} }
@@ -903,7 +909,7 @@ vab_command_handler()
route_type="defroute" route_type="defroute"
fi fi
FORMAT="txt" FORMAT="ovpn"
if [[ "${TYPE}" == "ext" ]] if [[ "${TYPE}" == "ext" ]]
then then