mirror of
https://github.com/kiddin9/op-packages.git
synced 2026-11-16 13:33:02 +08:00
🐶 Sync 2026-11-13 02:35:39
This commit is contained in:
1 parent
ba3675b9f3
commit
900ce0fdde
88 files changed
+2145
-1509
No files matched your search
@@ -9,6 +9,9 @@ STATE_FILE="/var/run/flowproxy.running"
|
||||
DEGRADED_FILE="/var/run/flowproxy.degraded"
|
||||
GEN_FILE="/var/run/flowproxy.gen"
|
||||
MARK_FILE="/var/run/flowproxy.mark"
|
||||
TARGET_FILE="/var/run/flowproxy.target"
|
||||
WD_CFG_FILE="/var/run/flowproxy.wd_cfg"
|
||||
WD_PID_FILE="/var/run/flowproxy.wd_pid"
|
||||
LOCK_FILE="/var/lock/flowproxy.lock"
|
||||
|
||||
get_level_weight() {
|
||||
@@ -49,31 +52,56 @@ log_msg() {
|
||||
}
|
||||
|
||||
acquire_lock() {
|
||||
local max_wait="${1:-30}"
|
||||
[ "${FLOWPROXY_LOCKED:-0}" = "1" ] && return 0
|
||||
mkdir -p "$(dirname "$LOCK_FILE")"
|
||||
if command -v flock >/dev/null 2>&1; then
|
||||
exec 9>"$LOCK_FILE"
|
||||
flock -x 9
|
||||
local wait_cnt=0
|
||||
while ! flock -x -n 9 2>/dev/null; do
|
||||
if [ "$wait_cnt" -ge "$max_wait" ]; then
|
||||
exec 9>&- 2>/dev/null
|
||||
return 1
|
||||
fi
|
||||
wait_cnt=$((wait_cnt + 1))
|
||||
sleep 1
|
||||
done
|
||||
FLOWPROXY_LOCK_METHOD="flock"
|
||||
FLOWPROXY_LOCKED=1
|
||||
return 0
|
||||
else
|
||||
local wait_cnt=0
|
||||
while ! mkdir "${LOCK_FILE}.d" 2>/dev/null; do
|
||||
local lock_pid=$(cat "${LOCK_FILE}.d/pid" 2>/dev/null)
|
||||
if [ -n "$lock_pid" ] && [ "$lock_pid" != "$$" ] && ! kill -0 "$lock_pid" 2>/dev/null; then
|
||||
log_msg warn "Removing stale lock held by dead PID $lock_pid"
|
||||
rm -rf "${LOCK_FILE}.d"
|
||||
continue
|
||||
fi
|
||||
if [ "$wait_cnt" -ge "$max_wait" ]; then
|
||||
log_msg error "Timed out waiting for lock ${LOCK_FILE}.d"
|
||||
return 1
|
||||
fi
|
||||
wait_cnt=$((wait_cnt + 1))
|
||||
[ "$wait_cnt" -ge 50 ] && break
|
||||
sleep 1
|
||||
done
|
||||
echo "$$" > "${LOCK_FILE}.d/pid"
|
||||
FLOWPROXY_LOCK_METHOD="mkdir"
|
||||
FLOWPROXY_LOCKED=1
|
||||
return 0
|
||||
fi
|
||||
FLOWPROXY_LOCKED=1
|
||||
return 0
|
||||
}
|
||||
|
||||
release_lock() {
|
||||
[ "${FLOWPROXY_LOCKED:-0}" != "1" ] && return 0
|
||||
if command -v flock >/dev/null 2>&1; then
|
||||
if [ "${FLOWPROXY_LOCK_METHOD:-}" = "flock" ]; then
|
||||
flock -u 9 2>/dev/null
|
||||
exec 9>&-
|
||||
else
|
||||
exec 9>&- 2>/dev/null
|
||||
elif [ "${FLOWPROXY_LOCK_METHOD:-}" = "mkdir" ]; then
|
||||
rm -f "${LOCK_FILE}.d/pid" 2>/dev/null
|
||||
rmdir "${LOCK_FILE}.d" 2>/dev/null
|
||||
fi
|
||||
FLOWPROXY_LOCK_METHOD=""
|
||||
FLOWPROXY_LOCKED=0
|
||||
return 0
|
||||
}
|
||||
@@ -90,10 +118,16 @@ check_env() {
|
||||
check_config() {
|
||||
local proxy_server_ip_addr=$(uci -q get "$UCI_CONFIG.global.proxy_server_ip_addr")
|
||||
[ -z "$proxy_server_ip_addr" ] && { log_msg error "proxy_server_ip_addr not configured"; return 1; }
|
||||
local tcp_enabled=$(uci -q get "$UCI_CONFIG.global.tcp_enabled"); tcp_enabled="${tcp_enabled:-1}"
|
||||
local udp_enabled=$(uci -q get "$UCI_CONFIG.global.udp_enabled"); udp_enabled="${udp_enabled:-1}"
|
||||
if [ "$tcp_enabled" != "1" ] && [ "$udp_enabled" != "1" ]; then
|
||||
log_msg error "Both TCP and UDP diversion are disabled"
|
||||
return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
apply_nft_rules() {
|
||||
generate_nft_cache() {
|
||||
log_msg info "Generating nftables configuration..."
|
||||
local conf_level=$(uci -q get "$UCI_CONFIG.global.log_level" || echo "info")
|
||||
|
||||
@@ -112,17 +146,10 @@ apply_nft_rules() {
|
||||
fi
|
||||
rm -f "$err_file"
|
||||
|
||||
if [ $ret -eq 0 ]; then
|
||||
log_msg info "Applying nftables rules from $NFT_CONF"
|
||||
# 确保内核支持 inet 表
|
||||
nft delete table inet flowproxy 2>/dev/null
|
||||
if nft -f "$NFT_CONF"; then
|
||||
return 0
|
||||
else
|
||||
log_msg error "nftables rules application failed (syntax error)"
|
||||
return 1
|
||||
fi
|
||||
if [ $ret -eq 0 ] && [ -s "$NFT_CONF" ]; then
|
||||
return 0
|
||||
else
|
||||
rm -f "$NFT_CONF"
|
||||
log_msg error "Failed to generate nftables config"
|
||||
return 1
|
||||
fi
|
||||
@@ -132,6 +159,19 @@ apply_nft_rules() {
|
||||
fi
|
||||
}
|
||||
|
||||
apply_nft_rules() {
|
||||
generate_nft_cache || return 1
|
||||
log_msg info "Applying nftables rules from $NFT_CONF"
|
||||
# 确保内核支持 inet 表
|
||||
nft delete table inet flowproxy 2>/dev/null
|
||||
if nft -f "$NFT_CONF"; then
|
||||
return 0
|
||||
else
|
||||
log_msg error "nftables rules application failed (syntax error)"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
restore_nft_rules() {
|
||||
if [ -s "$NFT_CONF" ]; then
|
||||
log_msg info "Restoring nftables rules from cached $NFT_CONF"
|
||||
@@ -144,37 +184,198 @@ restore_nft_rules() {
|
||||
apply_nft_rules
|
||||
}
|
||||
|
||||
resolve_master_iface() {
|
||||
local iface="$1"
|
||||
if [ -L "/sys/class/net/$iface/master" ]; then
|
||||
local master_path=$(readlink "/sys/class/net/$iface/master" 2>/dev/null)
|
||||
local master_name=$(basename "$master_path" 2>/dev/null)
|
||||
[ -n "$master_name" ] && { echo "$master_name"; return; }
|
||||
fi
|
||||
echo "$iface"
|
||||
}
|
||||
|
||||
detect_iface_by_ip() {
|
||||
local target_ip="$1"
|
||||
[ -z "$target_ip" ] && return 1
|
||||
|
||||
# 1. 优先通过本地接口 IPv4 子网掩码最长前缀匹配(不受策略路由 ip rule 干扰)
|
||||
local matched_dev
|
||||
matched_dev=$(ip -o -4 addr show 2>/dev/null | awk -v tip="$target_ip" '
|
||||
function ip2int(ip, a, n) {
|
||||
n = split(ip, a, ".")
|
||||
if (n != 4) return -1
|
||||
return ((a[1] * 256 + a[2]) * 256 + a[3]) * 256 + a[4]
|
||||
}
|
||||
BEGIN {
|
||||
t = ip2int(tip)
|
||||
best_plen = -1
|
||||
best_dev = ""
|
||||
}
|
||||
t >= 0 {
|
||||
dev = $2
|
||||
sub(/@.*/, "", dev)
|
||||
if (dev == "lo") next
|
||||
for (i = 3; i <= NF; i++) {
|
||||
if ($i == "inet" && (i + 1) <= NF) {
|
||||
split($(i + 1), cidr, "/")
|
||||
addr = ip2int(cidr[1])
|
||||
plen = (cidr[2] != "") ? int(cidr[2]) : 32
|
||||
if (addr < 0 || plen < 0 || plen > 32) continue
|
||||
if (plen == 0) {
|
||||
if (plen > best_plen) {
|
||||
best_plen = plen
|
||||
best_dev = dev
|
||||
}
|
||||
} else {
|
||||
factor = 2 ^ (32 - plen)
|
||||
if (int(t / factor) == int(addr / factor)) {
|
||||
if (plen > best_plen) {
|
||||
best_plen = plen
|
||||
best_dev = dev
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
END {
|
||||
if (best_dev != "") print best_dev
|
||||
}
|
||||
')
|
||||
if [ -n "$matched_dev" ]; then
|
||||
echo "$matched_dev"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# 2. 兜底:通过内核路由查询直连出接口
|
||||
local route_line route_dev
|
||||
route_line=$(ip -4 route get "$target_ip" 2>/dev/null | head -n 1)
|
||||
case "$route_line" in
|
||||
*" via "*) ;;
|
||||
*)
|
||||
route_dev=$(echo "$route_line" | awk '{for(i=1;i<=NF;i++) if($i=="dev") {print $(i+1); exit}}')
|
||||
if [ -n "$route_dev" ] && [ "$route_dev" != "lo" ]; then
|
||||
echo "$route_dev"
|
||||
return 0
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
resolve_proxy_iface() {
|
||||
local conf_iface="$1"
|
||||
local proxy_ip="$2"
|
||||
[ -z "$conf_iface" ] && conf_iface=$(uci -q get "$UCI_CONFIG.global.interface")
|
||||
[ -z "$proxy_ip" ] && proxy_ip=$(uci -q get "$UCI_CONFIG.global.proxy_server_ip_addr")
|
||||
conf_iface="${conf_iface:-auto}"
|
||||
|
||||
local resolved=""
|
||||
if [ "$conf_iface" = "auto" ]; then
|
||||
resolved=$(detect_iface_by_ip "$proxy_ip")
|
||||
if [ -z "$resolved" ]; then
|
||||
log_msg warn "Unable to auto-detect interface for ${proxy_ip:-empty}, falling back to br-lan"
|
||||
resolved="br-lan"
|
||||
fi
|
||||
else
|
||||
resolved="$conf_iface"
|
||||
fi
|
||||
|
||||
resolve_master_iface "$resolved"
|
||||
}
|
||||
|
||||
_run_probe_cmd() {
|
||||
if [ -n "${MY_GEN:-}" ]; then
|
||||
[ "${STOP_REQUESTED:-0}" -eq 1 ] && return 1
|
||||
"$@" >/dev/null 2>&1 &
|
||||
SLEEP_PID=$!
|
||||
wait "$SLEEP_PID" 2>/dev/null
|
||||
local ret=$?
|
||||
SLEEP_PID=""
|
||||
[ "${STOP_REQUESTED:-0}" -eq 1 ] && return 1
|
||||
return $ret
|
||||
else
|
||||
"$@" >/dev/null 2>&1
|
||||
return $?
|
||||
fi
|
||||
}
|
||||
|
||||
iface_supports_arp() {
|
||||
local iface="$1"
|
||||
[ -d "/sys/class/net/$iface" ] || return 1
|
||||
local flags=$(cat "/sys/class/net/$iface/flags" 2>/dev/null)
|
||||
[ -z "$flags" ] && return 0
|
||||
# IFF_NOARP(0x80) | IFF_POINTOPOINT(0x10) | IFF_LOOPBACK(0x8) = 0x98
|
||||
if [ $((flags & 0x98)) -ne 0 ]; then
|
||||
return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
check_proxy_alive() {
|
||||
local ip="$1"
|
||||
local iface="$2"
|
||||
|
||||
# 1. 支持 ARP 的二层接口优先使用 arping:同网段旁路由正常及禁 Ping 场景均在毫秒级返回
|
||||
# 若二层 ARP 明确超时无应答,不再执行冗余 ping(避免额外阻塞及污染邻居表)
|
||||
if iface_supports_arp "$iface"; then
|
||||
if command -v arping >/dev/null 2>&1; then
|
||||
if _run_probe_cmd arping -f -q -c 2 -w 2 -I "$iface" "$ip"; then
|
||||
return 0
|
||||
fi
|
||||
return 1
|
||||
fi
|
||||
|
||||
# 无 arping 二进制时的内核邻居表探测兜底
|
||||
if _run_probe_cmd ping -c 1 -W 1 -I "$iface" "$ip"; then
|
||||
return 0
|
||||
fi
|
||||
ip neigh flush to "$ip" dev "$iface" >/dev/null 2>&1
|
||||
_run_probe_cmd ping -c 1 -W 1 -I "$iface" "$ip"
|
||||
if ip neigh show to "$ip" dev "$iface" 2>/dev/null | grep -qE "REACHABLE|DELAY|PROBE"; then
|
||||
return 0
|
||||
fi
|
||||
return 1
|
||||
fi
|
||||
|
||||
# 2. 非 ARP / 三层点对点虚拟接口使用 ICMP Ping 探测
|
||||
if _run_probe_cmd ping -c 1 -W 1 -I "$iface" "$ip"; then
|
||||
return 0
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
|
||||
add_route() {
|
||||
local proxy_server_ip_addr=$(uci -q get "$UCI_CONFIG.global.proxy_server_ip_addr")
|
||||
local interface=$(uci -q get "$UCI_CONFIG.global.interface"); interface="${interface:-br-lan}"
|
||||
local interface=$(resolve_proxy_iface "" "$proxy_server_ip_addr")
|
||||
local traffic_mark=$(uci -q get "$UCI_CONFIG.global.traffic_mark"); traffic_mark="${traffic_mark:-0x666}"
|
||||
local routing_table=$(uci -q get "$UCI_CONFIG.global.routing_table"); routing_table="${routing_table:-888}"
|
||||
local rule_priority=$(uci -q get "$UCI_CONFIG.global.rule_priority"); rule_priority="${rule_priority:-1000}"
|
||||
local rule_priority=$(uci -q get "$UCI_CONFIG.global.rule_priority"); rule_priority="${rule_priority:-10000}"
|
||||
|
||||
# 1. 先尝试用旧记录清理一次,防止由于配置变更导致的残留
|
||||
delete_route "quiet"
|
||||
|
||||
log_msg info "Setting up routing table $routing_table and rule for mark $traffic_mark with priority $rule_priority..."
|
||||
|
||||
# 2. 记录当前使用的标记值、路由表 ID 和优先级
|
||||
echo "$traffic_mark:$routing_table:$rule_priority" > "$MARK_FILE"
|
||||
|
||||
# 3. 再次确保新标记和表的规则是干净的
|
||||
# 2. 确保新标记和表的规则是干净的
|
||||
while ip rule del fwmark "$traffic_mark" lookup "$routing_table" 2>/dev/null; do :; done
|
||||
ip route flush table "$routing_table" 2>/dev/null
|
||||
|
||||
# 4. 添加路由和策略
|
||||
# 3. 添加路由和策略,成功后再记录状态文件
|
||||
local err
|
||||
if ! err=$(ip route add default via "$proxy_server_ip_addr" dev "$interface" table "$routing_table" 2>&1); then
|
||||
rm -f "$MARK_FILE"
|
||||
log_msg error "Failed to add default route: $err"
|
||||
return 1
|
||||
fi
|
||||
echo "$traffic_mark:$routing_table:$rule_priority" > "$MARK_FILE"
|
||||
err=$(ip rule add fwmark "$traffic_mark" lookup "$routing_table" priority "$rule_priority" 2>&1)
|
||||
if [ $? -eq 0 ]; then
|
||||
log_msg info "Route added: via $proxy_server_ip_addr dev $interface table $routing_table for mark $traffic_mark with priority $rule_priority"
|
||||
return 0
|
||||
else
|
||||
log_msg error "Failed to add ip rule: $err"
|
||||
delete_route
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
@@ -194,7 +395,7 @@ delete_route() {
|
||||
|
||||
local curr_mark=$(uci -q get "$UCI_CONFIG.global.traffic_mark"); curr_mark="${curr_mark:-0x666}"
|
||||
local curr_table=$(uci -q get "$UCI_CONFIG.global.routing_table"); curr_table="${curr_table:-888}"
|
||||
local curr_prio=$(uci -q get "$UCI_CONFIG.global.rule_priority"); curr_prio="${curr_prio:-1000}"
|
||||
local curr_prio=$(uci -q get "$UCI_CONFIG.global.rule_priority"); curr_prio="${curr_prio:-10000}"
|
||||
|
||||
[ "$quiet" != "quiet" ] && log_msg info "Cleaning up FlowProxy routes (Atomic Mode)..."
|
||||
|
||||
@@ -218,7 +419,7 @@ delete_route() {
|
||||
|
||||
# 执行清理:先清旧值,再清当前值 (防止残留)
|
||||
safe_del_rule "$old_mark" "$old_table" "$old_prio"
|
||||
[ "$old_mark" != "$curr_mark" ] || [ "$old_table" != "$curr_table" ] && \
|
||||
[ "$old_mark" != "$curr_mark" ] || [ "$old_table" != "$curr_table" ] || [ "$old_prio" != "$curr_prio" ] && \
|
||||
safe_del_rule "$curr_mark" "$curr_table" "$curr_prio"
|
||||
}
|
||||
|
||||
@@ -227,6 +428,81 @@ delete_nft() {
|
||||
log_msg info "Removed nftables table 'flowproxy'"
|
||||
}
|
||||
|
||||
_norm_server_list() {
|
||||
local raw="$1"
|
||||
local out="" s
|
||||
for s in $(echo "$raw" | tr ',' ' '); do
|
||||
[ -n "$s" ] && out="${out:+$out }$s"
|
||||
done
|
||||
echo "$out"
|
||||
}
|
||||
|
||||
_restart_dnsmasq_unlocked() {
|
||||
if [ "${FLOWPROXY_LOCK_METHOD:-}" = "flock" ]; then
|
||||
/etc/init.d/dnsmasq restart 9>&-
|
||||
else
|
||||
/etc/init.d/dnsmasq restart
|
||||
fi
|
||||
}
|
||||
|
||||
_backup_dns_if_needed() {
|
||||
if ! uci -q get "$UCI_CONFIG.dns_backup" >/dev/null; then
|
||||
local old_noresolv=$(uci -q get dhcp.@dnsmasq[0].noresolv)
|
||||
local old_dns_redirect=$(uci -q get dhcp.@dnsmasq[0].dns_redirect)
|
||||
local old_servers=$(uci -q get dhcp.@dnsmasq[0].server | tr '\n ' ',,' | sed 's/,,*/,/g; s/^,//; s/,$//')
|
||||
|
||||
log_msg debug "Backing up DNS: noresolv=${old_noresolv:-empty}, redirect=${old_dns_redirect:-empty}, servers=${old_servers:-empty}"
|
||||
|
||||
uci set "$UCI_CONFIG.dns_backup=dns_backup"
|
||||
[ -n "$old_noresolv" ] && uci set "$UCI_CONFIG.dns_backup.noresolv=$old_noresolv"
|
||||
[ -n "$old_dns_redirect" ] && uci set "$UCI_CONFIG.dns_backup.dns_redirect=$old_dns_redirect"
|
||||
[ -n "$old_servers" ] && uci set "$UCI_CONFIG.dns_backup.servers=$old_servers"
|
||||
uci commit "$UCI_CONFIG" || return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
_apply_dnsmasq_config() {
|
||||
local target_noresolv="$1"
|
||||
local target_redirect="$2"
|
||||
local target_servers_norm="$3"
|
||||
local delete_redirect_if_empty="$4"
|
||||
|
||||
local cur_noresolv=$(uci -q get dhcp.@dnsmasq[0].noresolv)
|
||||
local cur_redirect=$(uci -q get dhcp.@dnsmasq[0].dns_redirect)
|
||||
local cur_servers=$(_norm_server_list "$(uci -q get dhcp.@dnsmasq[0].server)")
|
||||
|
||||
local redirect_match=0
|
||||
if [ "$delete_redirect_if_empty" = "1" ] && [ -z "$target_redirect" ]; then
|
||||
[ -z "$cur_redirect" ] && redirect_match=1
|
||||
else
|
||||
[ "$cur_redirect" = "$target_redirect" ] && redirect_match=1
|
||||
fi
|
||||
|
||||
if [ "$cur_noresolv" = "$target_noresolv" ] && [ "$redirect_match" = "1" ] && [ "$cur_servers" = "$target_servers_norm" ]; then
|
||||
log_msg debug "DNS configuration already matches target, skipping commit and dnsmasq restart"
|
||||
return 0
|
||||
fi
|
||||
|
||||
uci set dhcp.@dnsmasq[0].noresolv="$target_noresolv"
|
||||
if [ -n "$target_redirect" ]; then
|
||||
uci set dhcp.@dnsmasq[0].dns_redirect="$target_redirect"
|
||||
elif [ "$delete_redirect_if_empty" = "1" ]; then
|
||||
uci -q delete dhcp.@dnsmasq[0].dns_redirect
|
||||
fi
|
||||
|
||||
uci -q delete dhcp.@dnsmasq[0].server
|
||||
if [ -n "$target_servers_norm" ]; then
|
||||
local s
|
||||
for s in $target_servers_norm; do
|
||||
[ -n "$s" ] && uci add_list dhcp.@dnsmasq[0].server="$s"
|
||||
done
|
||||
fi
|
||||
|
||||
uci commit dhcp || return 1
|
||||
_restart_dnsmasq_unlocked
|
||||
}
|
||||
|
||||
setup_dns() {
|
||||
local enabled=$(uci -q get "$UCI_CONFIG.global.enabled")
|
||||
local dns_proxy_enabled=$(uci -q get "$UCI_CONFIG.global.dns_proxy_enabled")
|
||||
@@ -236,93 +512,64 @@ setup_dns() {
|
||||
# Only apply DNS proxy if BOTH main service and DNS proxy are enabled
|
||||
if [ "${enabled:-0}" != "1" ] || [ "${dns_proxy_enabled:-0}" != "1" ]; then
|
||||
cleanup_dns
|
||||
return 0
|
||||
return $?
|
||||
fi
|
||||
|
||||
[ -z "$proxy_server_ip_addr" ] && { log_msg error "proxy_server_ip_addr not configured, cannot setup DNS"; return 1; }
|
||||
|
||||
log_msg info "Setting up DNS redirection to $proxy_server_ip_addr#$proxy_server_dns_port..."
|
||||
|
||||
# Persistent backup in UCI
|
||||
if ! uci -q get "$UCI_CONFIG.dns_backup" >/dev/null; then
|
||||
local old_noresolv=$(uci -q get dhcp.@dnsmasq[0].noresolv)
|
||||
local old_dns_redirect=$(uci -q get dhcp.@dnsmasq[0].dns_redirect)
|
||||
local old_servers=$(uci -q get dhcp.@dnsmasq[0].server | tr '\n' ',' | sed 's/,$//')
|
||||
_backup_dns_if_needed || return 1
|
||||
|
||||
log_msg debug "Backing up DNS: noresolv=${old_noresolv:-empty}, redirect=${old_dns_redirect:-empty}, servers=${old_servers:-empty}"
|
||||
|
||||
uci set "$UCI_CONFIG.dns_backup=dns_backup"
|
||||
[ -n "$old_noresolv" ] && uci set "$UCI_CONFIG.dns_backup.noresolv=$old_noresolv"
|
||||
[ -n "$old_dns_redirect" ] && uci set "$UCI_CONFIG.dns_backup.dns_redirect=$old_dns_redirect"
|
||||
[ -n "$old_servers" ] && uci set "$UCI_CONFIG.dns_backup.servers=$old_servers"
|
||||
uci commit "$UCI_CONFIG"
|
||||
fi
|
||||
|
||||
log_msg debug "Applying new DNS: noresolv=1, redirect=0, server=$proxy_server_ip_addr#$proxy_server_dns_port"
|
||||
uci set dhcp.@dnsmasq[0].noresolv='1'
|
||||
uci set dhcp.@dnsmasq[0].dns_redirect='0'
|
||||
|
||||
# Delete current servers and add our proxy
|
||||
uci -q delete dhcp.@dnsmasq[0].server
|
||||
uci add_list dhcp.@dnsmasq[0].server="$proxy_server_ip_addr#$proxy_server_dns_port"
|
||||
|
||||
uci commit dhcp
|
||||
/etc/init.d/dnsmasq restart
|
||||
log_msg debug "Applying DNS target: noresolv=1, redirect=0, server=$proxy_server_ip_addr#$proxy_server_dns_port"
|
||||
_apply_dnsmasq_config "1" "0" "${proxy_server_ip_addr}#${proxy_server_dns_port}" "0"
|
||||
}
|
||||
|
||||
cleanup_dns() {
|
||||
restore_dnsmasq_from_backup() {
|
||||
if uci -q get "$UCI_CONFIG.dns_backup" >/dev/null; then
|
||||
log_msg info "Restoring original DNS configuration..."
|
||||
log_msg info "Restoring original DNS configuration to dnsmasq..."
|
||||
|
||||
local noresolv=$(uci -q get "$UCI_CONFIG.dns_backup.noresolv")
|
||||
local dns_redirect=$(uci -q get "$UCI_CONFIG.dns_backup.dns_redirect")
|
||||
local servers=$(uci -q get "$UCI_CONFIG.dns_backup.servers")
|
||||
local servers_norm=$(_norm_server_list "$servers")
|
||||
|
||||
log_msg debug "Restoring DNS values: noresolv=${noresolv:-0}, redirect=${dns_redirect:-1}, servers=${servers:-empty}"
|
||||
noresolv="${noresolv:-0}"
|
||||
log_msg debug "Restoring DNS values: noresolv=$noresolv, redirect=${dns_redirect:-empty}, servers=${servers_norm:-empty}"
|
||||
|
||||
# Restore noresolv (default to 0 if not backed up)
|
||||
[ -n "$noresolv" ] && uci set dhcp.@dnsmasq[0].noresolv="$noresolv" || uci set dhcp.@dnsmasq[0].noresolv="0"
|
||||
_apply_dnsmasq_config "$noresolv" "$dns_redirect" "$servers_norm" "1" || return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
# Restore dns_redirect (only restore if it originally existed, avoid polluting config)
|
||||
if [ -n "$dns_redirect" ]; then
|
||||
uci set dhcp.@dnsmasq[0].dns_redirect="$dns_redirect"
|
||||
else
|
||||
uci -q delete dhcp.@dnsmasq[0].dns_redirect
|
||||
fi
|
||||
|
||||
# Restore servers correctly splitting comma-separated list
|
||||
uci -q delete dhcp.@dnsmasq[0].server
|
||||
if [ -n "$servers" ]; then
|
||||
for s in $(echo "$servers" | tr ',' ' '); do
|
||||
[ -n "$s" ] && uci add_list dhcp.@dnsmasq[0].server="$s"
|
||||
done
|
||||
fi
|
||||
|
||||
uci commit dhcp
|
||||
cleanup_dns() {
|
||||
if uci -q get "$UCI_CONFIG.dns_backup" >/dev/null; then
|
||||
restore_dnsmasq_from_backup || return 1
|
||||
uci delete "$UCI_CONFIG.dns_backup"
|
||||
uci commit "$UCI_CONFIG"
|
||||
/etc/init.d/dnsmasq restart
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
do_degrade() {
|
||||
local proxy_ip=$(uci -q get "$UCI_CONFIG.global.proxy_server_ip_addr")
|
||||
log_msg warn "Proxy server ${proxy_ip:-unknown} unreachable, degrading FlowProxy to direct mode..."
|
||||
log_msg warn "Proxy server ${proxy_ip:-unknown} unreachable, hot-degrading FlowProxy to direct mode..."
|
||||
# 先写入降级标记,避免 RPCD 状态自愈误删 STATE_FILE
|
||||
touch "$DEGRADED_FILE"
|
||||
delete_route
|
||||
delete_nft
|
||||
cleanup_dns
|
||||
log_msg warn "FlowProxy degraded to direct mode (monitoring remains active)"
|
||||
# 热降级:仅从 flowproxy.dns_backup 读取并还原 dnsmasq,保留 UCI 备份不改写 flowproxy
|
||||
restore_dnsmasq_from_backup
|
||||
log_msg warn "FlowProxy hot-degraded to direct mode (monitoring remains active)"
|
||||
}
|
||||
|
||||
do_recover() {
|
||||
local proxy_ip=$(uci -q get "$UCI_CONFIG.global.proxy_server_ip_addr")
|
||||
log_msg info "Proxy server ${proxy_ip:-unknown} is online, recovering FlowProxy..."
|
||||
log_msg info "Proxy server ${proxy_ip:-unknown} is online, hot-recovering FlowProxy..."
|
||||
restore_nft_rules || return 1
|
||||
add_route || { delete_nft; return 1; }
|
||||
setup_dns
|
||||
setup_dns || { restore_dnsmasq_from_backup; delete_route; delete_nft; return 1; }
|
||||
rm -f "$DEGRADED_FILE"
|
||||
log_msg info "FlowProxy recovered to active proxy mode"
|
||||
log_msg info "FlowProxy hot-recovered to active proxy mode"
|
||||
return 0
|
||||
}
|
||||
@@ -7,7 +7,11 @@
|
||||
|
||||
CONFIG="flowproxy"
|
||||
NFT_TABLE="flowproxy"
|
||||
OUTPUT_FILE="/tmp/flowproxy/nft.conf"
|
||||
if [ "$FLOWPROXY_PREVIEW" = "1" ]; then
|
||||
OUTPUT_FILE="/tmp/flowproxy/nft.preview.conf"
|
||||
else
|
||||
OUTPUT_FILE="/tmp/flowproxy/nft.conf"
|
||||
fi
|
||||
|
||||
mkdir -p "$(dirname "$OUTPUT_FILE")"
|
||||
|
||||
|
||||
@@ -27,16 +27,6 @@ interruptible_sleep() {
|
||||
return 0
|
||||
}
|
||||
|
||||
resolve_probe_iface() {
|
||||
local iface="$1"
|
||||
if [ -L "/sys/class/net/$iface/master" ]; then
|
||||
local master_path=$(readlink "/sys/class/net/$iface/master" 2>/dev/null)
|
||||
local master_name=$(basename "$master_path" 2>/dev/null)
|
||||
[ -n "$master_name" ] && { echo "$master_name"; return; }
|
||||
fi
|
||||
echo "$iface"
|
||||
}
|
||||
|
||||
get_uint_or_default() {
|
||||
local val="$1"
|
||||
local def="$2"
|
||||
@@ -56,41 +46,12 @@ is_context_valid() {
|
||||
return 0
|
||||
}
|
||||
|
||||
check_proxy_alive() {
|
||||
local ip="$1"
|
||||
local iface="$2"
|
||||
|
||||
# 1. ICMP Ping (首次成功即毫秒级返回;失败则补测一次防单包抖动)
|
||||
if ping -c 1 -W 1 -I "$iface" "$ip" >/dev/null 2>&1; then
|
||||
return 0
|
||||
fi
|
||||
if [ "$STOP_REQUESTED" -eq 1 ]; then
|
||||
return 0
|
||||
fi
|
||||
if ping -c 1 -W 1 -I "$iface" "$ip" >/dev/null 2>&1; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
# 2. ARP 互补探测 (防止旁路由禁 Ping 误报)
|
||||
if command -v arping >/dev/null 2>&1; then
|
||||
if arping -f -q -c 2 -w 1 -I "$iface" "$ip" >/dev/null 2>&1; then
|
||||
return 0
|
||||
fi
|
||||
else
|
||||
ip neigh flush to "$ip" dev "$iface" >/dev/null 2>&1
|
||||
ping -c 1 -W 1 -I "$iface" "$ip" >/dev/null 2>&1
|
||||
if ip neigh show to "$ip" dev "$iface" 2>/dev/null | grep -qE "REACHABLE|DELAY|PROBE"; then
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
|
||||
return 1
|
||||
is_nft_active() {
|
||||
nft list tables inet 2>/dev/null | grep -q "^table inet ${UCI_CONFIG}$"
|
||||
}
|
||||
|
||||
proxy_ip=$(uci -q get "$UCI_CONFIG.global.proxy_server_ip_addr")
|
||||
conf_iface=$(uci -q get "$UCI_CONFIG.global.interface")
|
||||
conf_iface="${conf_iface:-br-lan}"
|
||||
probe_iface=$(resolve_probe_iface "$conf_iface")
|
||||
probe_iface=$(resolve_proxy_iface "" "$proxy_ip")
|
||||
|
||||
interval=$(get_uint_or_default "$(uci -q get "$UCI_CONFIG.global.monitor_interval")" 5 2)
|
||||
fail_threshold=$(get_uint_or_default "$(uci -q get "$UCI_CONFIG.global.monitor_fail_threshold")" 3 1)
|
||||
@@ -98,9 +59,10 @@ recover_threshold=$(get_uint_or_default "$(uci -q get "$UCI_CONFIG.global.monito
|
||||
|
||||
[ -z "$proxy_ip" ] && exit 0
|
||||
|
||||
echo "$$" > "$WD_PID_FILE"
|
||||
log_msg info "Watchdog started (target=$proxy_ip, iface=$probe_iface, interval=${interval}s, fail=$fail_threshold, recover=$recover_threshold)"
|
||||
|
||||
# 启动后先等待一个探测周期,确保主服务完全进入稳定运行态
|
||||
# 启动阶段已由 init 完成首次状态建立,进入常规周期轮询
|
||||
interruptible_sleep "$interval" || exit 0
|
||||
|
||||
[ -f "$DEGRADED_FILE" ] && state="degraded" || state="online"
|
||||
@@ -108,33 +70,48 @@ fail_count=0
|
||||
ok_count=0
|
||||
|
||||
while is_context_valid; do
|
||||
[ -f "$DEGRADED_FILE" ] && state="degraded" || state="online"
|
||||
probe_start=$(date +%s)
|
||||
if check_proxy_alive "$proxy_ip" "$probe_iface"; then
|
||||
fail_count=0
|
||||
if [ "$state" = "degraded" ]; then
|
||||
ok_count=$((ok_count + 1))
|
||||
log_msg debug "Watchdog: probe succeeded ($ok_count/$recover_threshold)"
|
||||
if [ "$ok_count" -ge "$recover_threshold" ]; then
|
||||
acquire_lock
|
||||
if ! is_context_valid; then
|
||||
release_lock
|
||||
break
|
||||
fi
|
||||
if [ -f "$DEGRADED_FILE" ]; then
|
||||
if do_recover; then
|
||||
if acquire_lock 0; then
|
||||
if ! is_context_valid; then
|
||||
release_lock
|
||||
break
|
||||
fi
|
||||
if [ -f "$DEGRADED_FILE" ]; then
|
||||
if do_recover; then
|
||||
state="online"
|
||||
ok_count=0
|
||||
fail_count=0
|
||||
else
|
||||
log_msg error "Watchdog: recovery failed, staying in degraded mode"
|
||||
fi
|
||||
else
|
||||
state="online"
|
||||
ok_count=0
|
||||
fail_count=0
|
||||
else
|
||||
log_msg error "Watchdog: recovery failed, staying in degraded mode"
|
||||
fi
|
||||
release_lock
|
||||
else
|
||||
state="online"
|
||||
ok_count=0
|
||||
log_msg warn "Watchdog: failed to acquire lock for recovery, retrying next cycle"
|
||||
fi
|
||||
release_lock
|
||||
fi
|
||||
else
|
||||
ok_count=0
|
||||
# 在线状态下若内核 nft 表被外部清空,自动自愈恢复
|
||||
if ! is_nft_active; then
|
||||
if acquire_lock 0; then
|
||||
if is_context_valid && [ ! -f "$DEGRADED_FILE" ] && ! is_nft_active; then
|
||||
log_msg warn "Watchdog: nftables table missing while online, restoring rules..."
|
||||
restore_nft_rules && add_route
|
||||
fi
|
||||
release_lock
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
else
|
||||
[ "$STOP_REQUESTED" -eq 1 ] && break
|
||||
@@ -143,29 +120,38 @@ while is_context_valid; do
|
||||
fail_count=$((fail_count + 1))
|
||||
log_msg warn "Watchdog: probe failed ($fail_count/$fail_threshold) for $proxy_ip via $probe_iface"
|
||||
if [ "$fail_count" -ge "$fail_threshold" ]; then
|
||||
acquire_lock
|
||||
if ! is_context_valid; then
|
||||
if acquire_lock 0; then
|
||||
if ! is_context_valid; then
|
||||
release_lock
|
||||
break
|
||||
fi
|
||||
if [ ! -f "$DEGRADED_FILE" ]; then
|
||||
do_degrade
|
||||
state="degraded"
|
||||
fail_count=0
|
||||
ok_count=0
|
||||
else
|
||||
state="degraded"
|
||||
fail_count=0
|
||||
fi
|
||||
release_lock
|
||||
break
|
||||
fi
|
||||
if [ ! -f "$DEGRADED_FILE" ]; then
|
||||
do_degrade
|
||||
state="degraded"
|
||||
fail_count=0
|
||||
ok_count=0
|
||||
else
|
||||
state="degraded"
|
||||
fail_count=0
|
||||
log_msg warn "Watchdog: failed to acquire lock for degrade, retrying next cycle"
|
||||
fi
|
||||
release_lock
|
||||
fi
|
||||
else
|
||||
fail_count=0
|
||||
fi
|
||||
fi
|
||||
|
||||
interruptible_sleep "$interval" || break
|
||||
probe_end=$(date +%s)
|
||||
elapsed=$((probe_end - probe_start))
|
||||
[ "$elapsed" -lt 0 ] && elapsed=0
|
||||
sleep_secs=$((interval - elapsed))
|
||||
[ "$sleep_secs" -lt 1 ] && sleep_secs=1
|
||||
interruptible_sleep "$sleep_secs" || break
|
||||
done
|
||||
|
||||
[ "$(cat "$WD_PID_FILE" 2>/dev/null)" = "$$" ] && rm -f "$WD_PID_FILE"
|
||||
log_msg info "Watchdog stopped"
|
||||
exit 0
|
||||
Reference in new issue
Block a user