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

- Add log type support,

Browse Source 
- Add NETWORK_LOG_TRACE config variable.
This commit is contained in:
Arnaud G. GIBERT
2025-07-26 00:01:24 +02:00
parent b76a23a9c7
commit 6996353536
6 changed files with 154 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
usr/local/lib/network.bash
View File

@@ -46,6 +46,8 @@ declare -g NETWORK_LOG_FILE
declare -g NETWORK_LOG_LOCK
#declare -g NETWORK_LOG_LOCK="${NETWORK_LOG_FILE}"
declare -g NETWORK_LOG_TRACE
declare -g NETWORK_NC_TIMEOUT
@@ -140,7 +142,7 @@ num_to_ip()
network_common_load()
{
log_print "Network" "Loading common..."
log_trace "Network" "Loading common..."
NETWORK_OPENVPN_STATUS="$( sudo /usr/local/sbin/openvpn-status)"
NETWORK_TABLE_LIST=""
@@ -175,7 +177,7 @@ network_ip_route_tab_load()
nirtl_id=0
log_print "Network" "Loading IP Route tab..."
log_trace "Network" "Loading IP Route tab..."
while IFS= read -r line
do
@@ -263,7 +265,7 @@ network_dst_tab_load()
ndtl_id=0
log_print "Network" "Loading Dst tab..."
log_trace "Network" "Loading Dst tab..."
while IFS= read -r line
do
@@ -449,7 +451,7 @@ network_src_tab_load()
nstl_port_default=3000
log_print "Network" "Loading Src tab..."
log_trace "Network" "Loading Src tab..."
ip_base=$( ip_to_num ${NETWORK_SRC_LOCAL_ADDRESS})
@@ -659,7 +661,7 @@ network_src_tab_ip_lookup()
network_tab_load()
{
log_print "Network" "Loading config..."
log_trace "Network" "Loading config..."
dns_tab_load
@@ -707,14 +709,14 @@ network_table_init()
if [[ ${dst_type} == "0" ]]
then
log_print "Network" "Copy main default route into table 3 (VPN Local routing table)"
log_trace "Network" "Copy main default route into table 3 (VPN Local routing table)"
if [[ "$(ip route list match 0.0.0.0 table main)" != "" ]]
then
${DEBUG} ip route add $(ip route list match 0.0.0.0 table main) table 3
fi
else
log_print "Network" "Define default route to device: [${dst_device}] into table: [${dst_table}]"
log_trace "Network" "Define default route to device: [${dst_device}] into table: [${dst_table}]"
if [[ "$(ip link show ${dst_device})" != "" ]]
then
@@ -722,7 +724,7 @@ network_table_init()
fi
fi
log_print "Network" "Add Rx3 routes in VPN tables"
log_trace "Network" "Add Rx3 routes in VPN tables"
for ip_route_id in ${NETWORK_IP_ROUTE_ID_LIST}
do
@@ -743,7 +745,7 @@ network_table_init()
network_table_deinit()
{
log_print "Network" "Remove Rx3 routes in VPN tables"
log_trace "Network" "Remove Rx3 routes in VPN tables"
for table in ${NETWORK_TABLE_LIST}
do
@@ -760,7 +762,7 @@ network_table_deinit()
network_dst_tab_get ${dst_id}
log_print "Network" "Remove default route in table: [${dst_table}]"
log_trace "Network" "Remove default route in table: [${dst_table}]"
${DEBUG} ip route del default table ${dst_table} 2>/dev/null
done
@@ -828,15 +830,15 @@ network_dst_address_refresh()
then
if [[ "${dst_ip_old}" != "${dst_ip_new}" ]]
then
log_print "Network" "Update ${dst_host_name}: Old: [${dst_ip_old}] New: [${dst_ip_new}]"
log_info "Network" "Update ${dst_host_name}: Old: [${dst_ip_old}] New: [${dst_ip_new}]"
${DEBUG} /usr/local/sbin/ip_host_update "${dst_host_name/.*}" "${dst_host_name#*.}" "${dst_ip_new}" 60
tab_assign NETWORK_DST_TAB "${dst_id},IP" "${dst_ip_new}"
else
log_print "Network" "Skiping ${dst_host_name}: IP: [${dst_ip_old}]"
log_trace "Network" "Skiping ${dst_host_name}: IP: [${dst_ip_old}]"
fi
else
log_print "Network" "Skiping ${dst_host_name}: Invalid IP: [${dst_ip_new}] Old IP: [${dst_ip_old}]"
log_info "Network" "Skiping ${dst_host_name}: Invalid IP: [${dst_ip_new}] Old IP: [${dst_ip_old}]"
fi
}
@@ -876,18 +878,18 @@ function bridge_up
bu_table=$6
log_print "Network" "Create bridge [${bu_bridge_device}]..."
log_trace "Network" "Create bridge [${bu_bridge_device}]..."
${DEBUG} ip link add name ${bu_bridge_device} type bridge
log_print "Network" "Configure host side [${bu_bridge_device}:${bu_bridge_address}/${bu_bridge_mask}]..."
log_trace "Network" "Configure host side [${bu_bridge_device}:${bu_bridge_address}/${bu_bridge_mask}]..."
${DEBUG} ip link set ${bu_bridge_device} up
${DEBUG} ip addr add ${bu_bridge_address}/${bu_bridge_mask} dev ${bu_bridge_device}
log_print "Network" "Configure IP rule and routing [${bu_bridge_device}]..."
log_trace "Network" "Configure IP rule and routing [${bu_bridge_device}]..."
${DEBUG} ip rule add from ${bu_peer_address} table ${bu_table}
@@ -916,7 +918,7 @@ function bridge_down
bd_table=$6
log_print "Network" "Remove IP routing and rule [${bd_bridge_device}]..."
log_trace "Network" "Remove IP routing and rule [${bd_bridge_device}]..."
for bd_tab in ${NETWORK_TABLE_LIST}
do
@@ -926,7 +928,7 @@ function bridge_down
${DEBUG} ip rule del from ${bd_peer_address} table ${bd_table} 2>/dev/null
log_print "Network" "Remove bridge [${bd_bridge_device}]..."
log_trace "Network" "Remove bridge [${bd_bridge_device}]..."
${DEBUG} ip link show ${bd_bridge_device} &>/dev/null && ${DEBUG} ip link del ${bd_bridge_device}
}
@@ -941,7 +943,7 @@ function bridge_down
network_bridge_init()
{
log_print "Network" "Add all Bridges"
log_trace "Network" "Add all Bridges"
for src_id in ${NETWORK_SRC_ID_LIST}
do
@@ -970,7 +972,7 @@ network_bridge_init()
network_bridge_deinit()
{
log_print "Network" "Remove all Bridge"
log_trace "Network" "Remove all Bridge"
for src_id in ${NETWORK_SRC_ID_LIST}
do
@@ -1036,12 +1038,12 @@ network_forward_remove()
network_forward_start()
{
log_print "Network" "Create VPN forward chain"
log_trace "Network" "Create VPN forward chain"
${DEBUG} iptables -t nat -N PREROUTING-VPN
log_print "Network" "Add jump rule for VPN"
log_trace "Network" "Add jump rule for VPN"
for dst_id in ${NETWORK_DST_ID_LIST}
do
@@ -1054,7 +1056,7 @@ network_forward_start()
done
log_print "Network" "Add VPN client addresse rules"
log_trace "Network" "Add VPN client addresse rules"
for src_id in ${NETWORK_SRC_ID_LIST}
do
@@ -1079,7 +1081,7 @@ network_forward_start()
network_forward_stop()
{
log_print "Network" "Remove VPN client addresse rules"
log_trace "Network" "Remove VPN client addresse rules"
for src_id in ${NETWORK_SRC_ID_LIST}
do
@@ -1094,7 +1096,7 @@ network_forward_stop()
done
log_print "Network" "Remove Jump rule for VPN"
log_trace "Network" "Remove Jump rule for VPN"
for dst_id in ${NETWORK_DST_ID_LIST}
do
@@ -1107,7 +1109,7 @@ network_forward_stop()
done
log_print "Network" "Delete VPN forward chain"
log_trace "Network" "Delete VPN forward chain"
${DEBUG} iptables -t nat -X PREROUTING-VPN 2>/dev/null
}
@@ -1148,7 +1150,7 @@ network_init()
export ECHO=":"
fi
log_set "${NETWORK_LOG_FILE}" "${NETWORK_LOG_LOCK}" "${ECHO}"
log_set "${NETWORK_LOG_FILE}" "${NETWORK_LOG_LOCK}" "${ECHO}" "${NETWORK_LOG_TRACE}"
dns_init