mirror of
https://github.com/anten-ka/go_warp_pro.git
synced 2026-05-19 21:46:02 +00:00
Fix: revert save_clients to heredoc (pipe was unreliable), remove warp interface guard from apply_rules
Made-with: Cursor
This commit is contained in:
12
warp.sh
12
warp.sh
@@ -847,10 +847,11 @@ awg_load_clients() {
|
|||||||
awg_save_clients() {
|
awg_save_clients() {
|
||||||
local content=""
|
local content=""
|
||||||
for ip in "${AWG_SELECTED_IPS[@]}"; do
|
for ip in "${AWG_SELECTED_IPS[@]}"; do
|
||||||
content+="${ip}"$'\n'
|
content="${content}${ip}"$'\n'
|
||||||
done
|
done
|
||||||
docker exec "$CONTAINER" sh -c "mkdir -p '${AWG_WARP_DIR}'"
|
docker exec "$CONTAINER" sh -c "mkdir -p '$AWG_WARP_DIR' && cat > '$AWG_WARP_CLIENTS' <<'CLEOF'
|
||||||
echo -n "$content" | docker exec -i "$CONTAINER" sh -c "cat > '${AWG_WARP_CLIENTS}'"
|
${content}CLEOF
|
||||||
|
"
|
||||||
}
|
}
|
||||||
|
|
||||||
awg_parse_clients_table() {
|
awg_parse_clients_table() {
|
||||||
@@ -1039,10 +1040,7 @@ awg_cleanup_rules() {
|
|||||||
awg_apply_rules() {
|
awg_apply_rules() {
|
||||||
awg_cleanup_rules
|
awg_cleanup_rules
|
||||||
[ ${#AWG_SELECTED_IPS[@]} -eq 0 ] && return 0
|
[ ${#AWG_SELECTED_IPS[@]} -eq 0 ] && return 0
|
||||||
if ! docker exec "$CONTAINER" sh -c "ip link show warp >/dev/null 2>&1"; then
|
docker exec "$CONTAINER" sh -c "ip route add default dev warp table 100 2>/dev/null || ip route replace default dev warp table 100 2>/dev/null || true"
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
docker exec "$CONTAINER" sh -c "ip route add default dev warp table 100 2>/dev/null || ip route replace default dev warp table 100"
|
|
||||||
local prio=100
|
local prio=100
|
||||||
for ip in "${AWG_SELECTED_IPS[@]}"; do
|
for ip in "${AWG_SELECTED_IPS[@]}"; do
|
||||||
docker exec "$CONTAINER" sh -c "
|
docker exec "$CONTAINER" sh -c "
|
||||||
|
|||||||
Reference in New Issue
Block a user