mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Fix no output redirection in some openmptcprouter scripts

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2024-07-04 10:48:01 +02:00
parent 60f552fd68
commit c1f7c7d935
4 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

20
openmptcprouter/files/bin/blocklanfw
View file

@ -17,7 +17,7 @@ ss_rules_fw_drop() {
while IFS=$"\n" read -r c; do
fwrule=$(echo "$c" | sed 's/reject/REDIRECT --to-ports 65535/')
if [ -n "$fwrule" ] && [ -z "$($IPTABLESSAVE 2>/dev/null | grep zone_lan_prerouting | grep '${fwrule}')" ]; then
eval "$IPTABLES-w -t nat -A zone_lan_prerouting ${fwrule} 2>&1 >/dev/null"
eval "$IPTABLES-w -t nat -A zone_lan_prerouting ${fwrule} >/dev/null 2>&1"
fw=$((fw+1))
fi
done
@ -25,7 +25,7 @@ ss_rules_fw_drop() {
while IFS=$"\n" read -r c; do
fwrule=$(echo "$c" | sed 's/DROP/REDIRECT --to-ports 65535/')
if [ -n "$fwrule" ] && [ -z "$($IPTABLESSAVE 2>/dev/null | grep zone_lan_prerouting | grep '${fwrule}')" ]; then
eval "$IPTABLES-w -t nat -A zone_lan_prerouting ${fwrule} 2>&1 >/dev/null"
eval "$IPTABLES-w -t nat -A zone_lan_prerouting ${fwrule} >/dev/null 2>&1"
fw=$((fw+1))
fi
done
@ -36,7 +36,7 @@ ss_rules6_fw_drop() {
while IFS=$"\n" read -r c; do
fwrule=$(echo "$c" | sed 's/reject/REDIRECT --to-ports 65535/')
if [ -n "$fwrule" ] && [ -z "$($IPTABLESSAVE 2>/dev/null | grep zone_lan_prerouting | grep '${fwrule}')" ]; then
eval "$IP6TABLES-w -t nat -A zone_lan_prerouting ${fwrule} 2>&1 >/dev/null"
eval "$IP6TABLES-w -t nat -A zone_lan_prerouting ${fwrule} >/dev/null 2>&1"
fw=$((fw+1))
fi
done
@ -44,7 +44,7 @@ ss_rules6_fw_drop() {
while IFS=$"\n" read -r c; do
fwrule=$(echo "$c" | sed 's/DROP/REDIRECT --to-ports 65535/')
if [ -n "$fwrule" ] && [ -z "$($IPTABLESSAVE 2>/dev/null | grep zone_lan_prerouting | grep '${fwrule}')" ]; then
eval "$IP6TABLES-w -t nat -A zone_lan_prerouting ${fwrule} 2>&1 >/dev/null"
eval "$IP6TABLES-w -t nat -A zone_lan_prerouting ${fwrule} >/dev/null 2>&1"
fw=$((fw+1))
fi
done
@ -55,7 +55,7 @@ v2r_rules_fw_drop() {
while IFS=$"\n" read -r c; do
fwrule=$(echo "$c" | sed 's/reject/REDIRECT --to-ports 65535/')
if [ -n "$fwrule" ] && [ -z "$($IPTABLESSAVE 2>/dev/null | grep zone_lan_prerouting | grep '${fwrule}')" ]; then
eval "$IPTABLES-w -t nat -I zone_lan_prerouting 1 ${fwrule} 2>&1 >/dev/null"
eval "$IPTABLES-w -t nat -I zone_lan_prerouting 1 ${fwrule} >/dev/null 2>&1"
fw=$((fw+1))
fi
done
@ -63,7 +63,7 @@ v2r_rules_fw_drop() {
while IFS=$"\n" read -r c; do
fwrule=$(echo "$c" | sed 's/DROP/REDIRECT --to-ports 65535/')
if [ -n "$fwrule" ] && [ -z "$($IPTABLESSAVE 2>/dev/null | grep zone_lan_prerouting | grep '${fwrule}')" ]; then
eval "$IPTABLES-w -t nat -I zone_lan_prerouting 1 ${fwrule} 2>&1 >/dev/null"
eval "$IPTABLES-w -t nat -I zone_lan_prerouting 1 ${fwrule} >/dev/null 2>&1"
fw=$((fw+1))
fi
done
@ -74,14 +74,14 @@ v2ray_rules6_fw_drop() {
while IFS=$"\n" read -r c; do
fwrule=$(echo "$c" | sed 's/reject/REDIRECT --to-ports 65535/')
if [ -n "$fwrule" ] && [ -z "$($IPTABLESSAVE 2>/dev/null | grep zone_lan_prerouting | grep '${fwrule}')" ]; then
eval "$IP6TABLES-w -t nat -I zone_lan_prerouting 1 ${fwrule} 2>&1 >/dev/null"
eval "$IP6TABLES-w -t nat -I zone_lan_prerouting 1 ${fwrule} >/dev/null 2>&1"
fi
done
timeout 1 fw3 -6 print 2>/dev/null | awk '/iptables/&&/zone_lan_forward/&&/tcp/&&/-t filter/&&/-j DROP/ {for(i=6; i<=NF; i++) { printf "%s ",$i } print "\n" }' |
while IFS=$"\n" read -r c; do
fwrule=$(echo "$c" | sed 's/DROP/REDIRECT --to-ports 65535/')
if [ -n "$fwrule" ] && [ -z "$($IPTABLESSAVE 2>/dev/null | grep zone_lan_prerouting | grep '${fwrule}')" ]; then
eval "$IP6TABLES-w -t nat -I zone_lan_prerouting 1 ${fwrule} 2>&1 >/dev/null"
eval "$IP6TABLES-w -t nat -I zone_lan_prerouting 1 ${fwrule} >/dev/null 2>&1"
fi
done
}
@ -97,6 +97,6 @@ elif [ -n "$(uci -q get openmptcprouter.settings.proxy | grep v2ray)" ] || [ -n
v2ray_rules6_fw_drop
fi
rule=$(timeout 1 fw3 -4 print | grep 'A PREROUTING' | grep zone_lan_prerouting | sed 's/-A PREROUTING/-D PREROUTING/')
eval "$rule 2>&1 >/dev/null"
eval "$rule >/dev/null 2>&1"
newrule=$(echo "$rule" | sed 's/-D PREROUTING/-I PREROUTING 1/')
eval "$newrule 2>&1 >/dev/null"
eval "$newrule >/dev/null 2>&1"

4
openmptcprouter/files/bin/omr-test-speed
View file

@ -59,7 +59,7 @@ else
fi
if [ -n "$(nft list set inet fw4 omr_dst_bypass_all_4 2>/dev/null)" ]; then
for ip in $hostip; do
nft add element inet fw4 omr_dst_bypass_all_4 { $ip } 2>&1 >/dev/null
nft add element inet fw4 omr_dst_bypass_all_4 { $ip } >/dev/null 2>&1
done
fi
if [ "$FASTTEST" = true ]; then
@ -75,7 +75,7 @@ else
fi
if [ -n "$(nft list set inet fw4 omr_dst_bypass_all_4 2>/dev/null)" ]; then
for ip in $hostip; do
nft delete element inet fw4 omr_dst_bypass_all_4 { $ip } 2>&1 >/dev/null
nft delete element inet fw4 omr_dst_bypass_all_4 { $ip } >/dev/null 2>&1
done
fi
/etc/init.d/sqm start $INTERFACE

12
openmptcprouter/files/bin/omr-test-speed-server
View file

@ -39,13 +39,13 @@ if [ -n "$HOST" ] && [ -n "$PORT" ] && [ -n "$USERNAME" ] && [ -n "$PASSWORD" ];
export SQM_VERBOSITY_MIN=10
export SQM_VERBOSITY_MAX=0
export SQM_SYSLOG=1
/etc/init.d/sqm stop $INTERFACE 2>&1 >/dev/null
#tc qdisc delete dev $INTERFACE root 2>&1 >/dev/null
#tc qdisc delete dev ifb4$INTERFACE root 2>&1 >/dev/null
/etc/init.d/sqm stop $INTERFACE >/dev/null 2>&1
#tc qdisc delete dev $INTERFACE root >/dev/null 2>&1
#tc qdisc delete dev ifb4$INTERFACE root >/dev/null 2>&1
}
#if [ "$(multipath ${INTERFACE} | grep default)" ]; then
# MP=true
# /etc/init.d/omr-tracker stop 2>&1 >/dev/null
# /etc/init.d/omr-tracker stop >/dev/null 2>&1
# multipath ${INTERFACE} off
#fi
if [ -n "$UPLOAD" ]; then
@ -94,10 +94,10 @@ if [ -n "$HOST" ] && [ -n "$PORT" ] && [ -n "$USERNAME" ] && [ -n "$PASSWORD" ];
fi
#if [ $MP ]; then
# multipath ${INTERFACE} on
# /etc/init.d/omr-tracker start & 2>&1 >/dev/null
# /etc/init.d/omr-tracker start & >/dev/null 2>&1
#fi
[ -z "$FASTTEST" ] && echo "Restart SQM on $INTERFACE"
/etc/init.d/sqm start $INTERFACE 2>&1 >/dev/null
/etc/init.d/sqm start $INTERFACE >/dev/null 2>&1
else
if [ "$resolve" != "${HOST}" ] || [ "$valid_ip6" != "ok" ]; then
curl -k -o /dev/null -H "Authorization: Bearer ${KEY}" https://${HOST}:${PORT}/speedtest || echo

4
openmptcprouter/files/bin/omr-test-speedv6
View file

@ -56,7 +56,7 @@ else
fi
if [ -n "$(nft list set inet fw4 omr_dst_bypass_all_6 2>/dev/null)" ]; then
for ip in $hostip; do
nft add element inet fw4 omr_dst_bypass_all_6 { $ip } 2>&1 >/dev/null
nft add element inet fw4 omr_dst_bypass_all_6 { $ip } >/dev/null 2>&1
done
fi
if [ "$FASTTEST" = true ]; then
@ -72,7 +72,7 @@ else
fi
if [ -n "$(nft list set inet fw4 omr_dst_bypass_all_6 2>/dev/null)" ]; then
for ip in $hostip; do
nft delete element inet fw4 omr_dst_bypass_all_6 { $ip } 2>&1 >/dev/null
nft delete element inet fw4 omr_dst_bypass_all_6 { $ip } >/dev/null 2>&1
done
fi
/etc/init.d/sqm start $INTERFACE