mirror of
https://github.com/Ysurac/openmptcprouter-feeds.git
synced 2025-02-15 03:51:51 +00:00
sync (#415)
This commit is contained in:
suyuan
GitHub
commit
e24bac9404
7 changed files with 81 additions and 66 deletions
|
|
@ -406,10 +406,14 @@ interface_multipath_settings() {
|
|||
fi
|
||||
|
||||
if [ "$(uci -q get openmptcprouter.settings.force_multipath)" != "0" ]; then
|
||||
logger -t "MPTCP" "Set $iface to $mode"
|
||||
if [ "$mode" = "master" ]; then
|
||||
if ([ "$mode" = "master" ] || [ "$mode" = "on" ]) && [ -z "$(multipath $iface | grep default)" ]; then
|
||||
logger -t "MPTCP" "Set $iface to $mode"
|
||||
multipath "$iface" "on"
|
||||
else
|
||||
elif [ "$mode" = "off" ] && [ -z "$(multipath $iface | grep deactivated)" ]
|
||||
logger -t "MPTCP" "Set $iface to $mode"
|
||||
multipath "$iface" "$mode"
|
||||
elif [ "$mode" = "backup" ] && [ -z "$(multipath $iface | grep backup)" ]
|
||||
logger -t "MPTCP" "Set $iface to $mode"
|
||||
multipath "$iface" "$mode"
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -732,7 +732,8 @@ initcwrwnd=""
|
|||
# An interface in error will never be used in MPTCP
|
||||
if [ "$OMR_TRACKER_STATUS" = "ERROR" ] || [ "$interface_up" != "true" ]; then
|
||||
#if [ "$interface_up" = "true" ] && [ -n "$OMR_TRACKER_INTERFACE" ] && ([ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "modemmanager" ] || [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "wireguard" ]); then
|
||||
if [ "$interface_available" = "true" ] && ([ "$interface_pending" = "true" ] || [ "$interface_up" = "true" ]) && [ -n "$OMR_TRACKER_INTERFACE" ] && ([ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "modemmanager" ] || [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "wireguard" ]); then
|
||||
#if [ "$interface_available" = "true" ] && ([ "$interface_pending" = "true" ] || [ "$interface_up" = "true" ]) && [ -n "$OMR_TRACKER_INTERFACE" ] && ([ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "modemmanager" ] || [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "wireguard" ]); then
|
||||
if [ "$interface_available" = "true" ] && [ -n "$OMR_TRACKER_INTERFACE" ] && ([ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "modemmanager" ] || [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "wireguard" ]); then
|
||||
_log "No answer from $OMR_TRACKER_INTERFACE ($OMR_TRACKER_DEVICE), restart interface"
|
||||
_log "Set $OMR_TRACKER_INTERFACE down"
|
||||
ifdown $OMR_TRACKER_INTERFACE
|
||||
|
|
|
|||
|
|
@ -397,7 +397,7 @@ _bypass_proto_without_ndpi() {
|
|||
set firewall.bypass_$proto_rule.src='lan'
|
||||
set firewall.bypass_$proto_rule.dest='*'
|
||||
set firewall.bypass_$proto_rule.target='MARK'
|
||||
set firewall.bypass_$proto_rule.set_xmark="4539${intfid}"
|
||||
set firewall.bypass_$proto_rule.set_xmark="0x4539${intfid}"
|
||||
commit firewall
|
||||
EOF
|
||||
uci -q batch <<-EOF >/dev/null
|
||||
|
|
@ -409,7 +409,7 @@ _bypass_proto_without_ndpi() {
|
|||
set firewall.bypass6_$proto_rule.src='lan'
|
||||
set firewall.bypass6_$proto_rule.dest='*'
|
||||
set firewall.bypass6_$proto_rule.target='MARK'
|
||||
set firewall.bypass6_$proto_rule.set_xmark="6539${intfid}"
|
||||
set firewall.bypass6_$proto_rule.set_xmark="0x6539${intfid}"
|
||||
commit firewall
|
||||
EOF
|
||||
#if [ "$intfid" != "" ]; then
|
||||
|
|
@ -501,12 +501,12 @@ _bypass_proto_without_ndpi() {
|
|||
|
||||
_intf_rule_ss_rules() {
|
||||
cat >> /etc/firewall.omr-bypass <<-EOF
|
||||
nft insert rule inet fw4 ss_rules_dst_tcp ip daddr @omr_dst_bypass_${intf}_4 accept
|
||||
nft insert rule inet fw4 ss_rules_local_out ip daddr @omr_dst_bypass_${intf}_4 accept
|
||||
nft insert rule inet fw4 ss_rules_pre_tcp ip daddr @omr_dst_bypass_${intf}_4 meta mark set 0x00004539 accept
|
||||
nft insert rule inet fw4 ss_rules_local_out ip daddr @omr_dst_bypass_${intf}_4 meta mark set 0x00004539 accept
|
||||
EOF
|
||||
if [ "$disableipv6" = "0" ]; then
|
||||
cat >> /etc/firewall.omr-bypass <<-EOF
|
||||
nft insert rule inet fw4 ss_rules_dst_tcp ip6 daddr @omr_dst_bypass_${intf}_6 accept
|
||||
nft insert rule inet fw4 ss_rules_pre_tcp ip6 daddr @omr_dst_bypass_${intf}_6 accept
|
||||
nft insert rule inet fw4 ss_rules_local_out ip6 daddr @omr_dst_bypass_${intf}_6 accept
|
||||
EOF
|
||||
fi
|
||||
|
|
@ -514,12 +514,12 @@ _intf_rule_ss_rules() {
|
|||
|
||||
_intf_rule_v2ray_rules() {
|
||||
cat >> /etc/firewall.omr-bypass <<-EOF
|
||||
nft insert rule inet fw4 v2r_rules_dst_tcp ip daddr @omr_dst_bypass_${intf}_4 accept
|
||||
nft insert rule inet fw4 v2r_rules_pre_tcp ip daddr @omr_dst_bypass_${intf}_4 accept
|
||||
nft insert rule inet fw4 v2r_rules_local_out ip daddr @omr_dst_bypass_${intf}_4 accept
|
||||
EOF
|
||||
if [ "$disableipv6" = "0" ]; then
|
||||
cat >> /etc/firewall.omr-bypass <<-EOF
|
||||
nft insert rule inet fw4 v2r_rules_dst_tcp ip6 daddr @omr_dst_bypass_${intf}_6 accept
|
||||
nft insert rule inet fw4 v2r_rules_pre_tcp ip6 daddr @omr_dst_bypass_${intf}_6 accept
|
||||
nft insert rule inet fw4 v2r_rules_local_out ip6 daddr @omr_dst_bypass_${intf}_6 accept
|
||||
EOF
|
||||
fi
|
||||
|
|
@ -527,12 +527,12 @@ _intf_rule_v2ray_rules() {
|
|||
|
||||
_intf_rule_xray_rules() {
|
||||
cat >> /etc/firewall.omr-bypass <<-EOF
|
||||
nft insert rule inet fw4 xr_rules_dst_tcp ip daddr @omr_dst_bypass_${intf}_4 accept
|
||||
nft insert rule inet fw4 xr_rules_pre_tcp ip daddr @omr_dst_bypass_${intf}_4 accept
|
||||
nft insert rule inet fw4 xr_rules_local_out ip daddr @omr_dst_bypass_${intf}_4 accept
|
||||
EOF
|
||||
if [ "$disableipv6" = "0" ]; then
|
||||
cat >> /etc/firewall.omr-bypass <<-EOF
|
||||
nft insert rule inet fw4 xr_rules_dst_tcp ip6 daddr @omr_dst_bypass_${intf}_6 accept
|
||||
nft insert rule inet fw4 xr_rules_pre_tcp ip6 daddr @omr_dst_bypass_${intf}_6 accept
|
||||
nft insert rule inet fw4 xr_rules_local_out ip6 daddr @omr_dst_bypass_${intf}_6 accept
|
||||
EOF
|
||||
fi
|
||||
|
|
@ -585,11 +585,17 @@ _intf_rule() {
|
|||
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}=rule
|
||||
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}.name="omr_dst_bypass_${intf}_rule"
|
||||
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}.ipset="omr_dst_bypass_${intf}_4"
|
||||
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}.target='MARK'
|
||||
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}.src='lan'
|
||||
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}.dest='*'
|
||||
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}.target='MARK'
|
||||
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}.enabled='0'
|
||||
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}.set_xmark="${ipv46}539${count}"
|
||||
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}.set_mark="0x${ipv46}539${count}"
|
||||
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}_accept=rule
|
||||
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}_accept.name="omr_dst_bypass_${intf}_rule_accept"
|
||||
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}_accept.target='ACCEPT'
|
||||
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}_accept.dest='*'
|
||||
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}_accept.enabled='0'
|
||||
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}_accept.mark="0x${ipv46}539${count}"
|
||||
set firewall.omr_dst_bypass_${intf}_srcip_${ipv46}=rule
|
||||
set firewall.omr_dst_bypass_${intf}_srcip_${ipv46}.name="omr_dst_bypass_${intf}_srcip"
|
||||
set firewall.omr_dst_bypass_${intf}_srcip_${ipv46}.ipset="omr_dst_bypass_${intf}_4"
|
||||
|
|
@ -597,14 +603,14 @@ _intf_rule() {
|
|||
set firewall.omr_dst_bypass_${intf}_srcip_${ipv46}.dest='*'
|
||||
set firewall.omr_dst_bypass_${intf}_srcip_${ipv46}.target='MARK'
|
||||
set firewall.omr_dst_bypass_${intf}_srcip_${ipv46}.enabled='0'
|
||||
set firewall.omr_dst_bypass_${intf}_srcip_${ipv46}.set_xmark="${ipv46}539${count}"
|
||||
set firewall.omr_dst_bypass_${intf}_srcip_${ipv46}.set_xmark="0x${ipv46}539${count}"
|
||||
set firewall.omr_dst_bypass_${intf}_mac_${ipv46}=rule
|
||||
set firewall.omr_dst_bypass_${intf}_mac_${ipv46}.name='omr_dst_bypass_${intf}_mac'
|
||||
set firewall.omr_dst_bypass_${intf}_mac_${ipv46}.src='lan'
|
||||
set firewall.omr_dst_bypass_${intf}_mac_${ipv46}.dest='*'
|
||||
set firewall.omr_dst_bypass_${intf}_mac_${ipv46}.target='MARK'
|
||||
set firewall.omr_dst_bypass_${intf}_mac_${ipv46}.enabled='0'
|
||||
set firewall.omr_dst_bypass_${intf}_mac_${ipv46}.set_xmark="${ipv46}539${count}"
|
||||
set firewall.omr_dst_bypass_${intf}_mac_${ipv46}.set_xmark="0x${ipv46}539${count}"
|
||||
set firewall.omr_dst_bypass_${intf}_srcport_tcp_${ipv46}=rule
|
||||
set firewall.omr_dst_bypass_${intf}_srcport_tcp_${ipv46}.name="omr_dst_bypass_${intf}_srcport"
|
||||
set firewall.omr_dst_bypass_${intf}_srcport_tcp_${ipv46}.proto='tcp'
|
||||
|
|
@ -612,7 +618,7 @@ _intf_rule() {
|
|||
set firewall.omr_dst_bypass_${intf}_srcport_tcp_${ipv46}.dest='*'
|
||||
set firewall.omr_dst_bypass_${intf}_srcport_tcp_${ipv46}.target='MARK'
|
||||
set firewall.omr_dst_bypass_${intf}_srcport_tcp_${ipv46}.enabled='0'
|
||||
set firewall.omr_dst_bypass_${intf}_srcport_tcp_${ipv46}.set_xmark="${ipv46}539${count}"
|
||||
set firewall.omr_dst_bypass_${intf}_srcport_tcp_${ipv46}.set_xmark="0x${ipv46}539${count}"
|
||||
set firewall.omr_dst_bypass_${intf}_srcport_udp_${ipv46}=rule
|
||||
set firewall.omr_dst_bypass_${intf}_srcport_udp_${ipv46}.name="omr_dst_bypass_${intf}_srcport"
|
||||
set firewall.omr_dst_bypass_${intf}_srcport_udp_${ipv46}.proto='udp'
|
||||
|
|
@ -620,21 +626,21 @@ _intf_rule() {
|
|||
set firewall.omr_dst_bypass_${intf}_srcport_udp_${ipv46}.dest='*'
|
||||
set firewall.omr_dst_bypass_${intf}_srcport_udp_${ipv46}.target='MARK'
|
||||
set firewall.omr_dst_bypass_${intf}_srcport_udp_${ipv46}.enabled='0'
|
||||
set firewall.omr_dst_bypass_${intf}_srcport_udp_${ipv46}.set_xmark="${ipv46}539${count}"
|
||||
set firewall.omr_dst_bypass_${intf}_srcport_udp_${ipv46}.set_xmark="0x${ipv46}539${count}"
|
||||
set firewall.omr_dst_bypass_${intf}_dstport_tcp_${ipv46}=rule
|
||||
set firewall.omr_dst_bypass_${intf}_dstport_tcp_${ipv46}.name="omr_dst_bypass_${intf}_dstport"
|
||||
set firewall.omr_dst_bypass_${intf}_dstport_tcp_${ipv46}.src='lan'
|
||||
set firewall.omr_dst_bypass_${intf}_dstport_tcp_${ipv46}.dest='*'
|
||||
set firewall.omr_dst_bypass_${intf}_dstport_tcp_${ipv46}.target='MARK'
|
||||
set firewall.omr_dst_bypass_${intf}_dstport_tcp_${ipv46}.enabled='0'
|
||||
set firewall.omr_dst_bypass_${intf}_dstport_tcp_${ipv46}.set_xmark="${ipv46}539${count}"
|
||||
set firewall.omr_dst_bypass_${intf}_dstport_tcp_${ipv46}.set_xmark="0x${ipv46}539${count}"
|
||||
set firewall.omr_dst_bypass_${intf}_dstport_udp_${ipv46}=rule
|
||||
set firewall.omr_dst_bypass_${intf}_dstport_udp_${ipv46}.name="omr_dst_bypass_${intf}_dstport"
|
||||
set firewall.omr_dst_bypass_${intf}_dstport_udp_${ipv46}.src='lan'
|
||||
set firewall.omr_dst_bypass_${intf}_dstport_udp_${ipv46}.dest='*'
|
||||
set firewall.omr_dst_bypass_${intf}_dstport_udp_${ipv46}.target='MARK'
|
||||
set firewall.omr_dst_bypass_${intf}_dstport_udp_${ipv46}.enabled='0'
|
||||
set firewall.omr_dst_bypass_${intf}_dstport_udp_${ipv46}.set_xmark="${ipv46}539${count}"
|
||||
set firewall.omr_dst_bypass_${intf}_dstport_udp_${ipv46}.set_xmark="0x${ipv46}539${count}"
|
||||
commit firewall
|
||||
EOF
|
||||
done
|
||||
|
|
@ -725,43 +731,45 @@ _bypass_omr_server() {
|
|||
_ss_rules_config() {
|
||||
cat >> /etc/firewall.omr-bypass <<-EOF
|
||||
[ -z "\$(nft list ruleset | grep ss_rules)" ] && exit 0
|
||||
nft insert rule inet fw4 ss_rules_dst_tcp ip daddr @omr_dst_bypass_all_4 accept
|
||||
nft insert rule inet fw4 ss_rules_local_out ip daddr @omr_dst_bypass_all_4 accept
|
||||
#nft insert rule inet fw4 ss_rules_dst_tcp ip daddr @omr_dst_bypass_all_4 meta mark set 0x00004539 accept
|
||||
#nft insert rule inet fw4 ss_rules_local_out ip daddr @omr_dst_bypass_all_4 meta mark set 0x00004539 accept
|
||||
#nft add chain inet fw4 bypass_prerouting '{ type nat hook prerouting priority filter - 5; policy accept; }'
|
||||
#nft add chain inet fw4 bypass_local '{ type nat hook output priority filter - 5; policy accept; }'
|
||||
EOF
|
||||
if [ "$disableipv6" = "0" ]; then
|
||||
cat >> /etc/firewall.omr-bypass <<-EOF
|
||||
nft insert rule inet fw4 ss_rules_dst_tcp ip6 daddr @omr_dst_bypass_all_6 accept
|
||||
nft insert rule inet fw4 ss_rules_local_out ip6 daddr @omr_dst_bypass_all_6 accept
|
||||
EOF
|
||||
fi
|
||||
#if [ "$disableipv6" = "0" ]; then
|
||||
# cat >> /etc/firewall.omr-bypass <<-EOF
|
||||
# nft insert rule inet fw4 ss_rules_dst_tcp ip6 daddr @omr_dst_bypass_all_6 accept
|
||||
# nft insert rule inet fw4 ss_rules_local_out ip6 daddr @omr_dst_bypass_all_6 accept
|
||||
# EOF
|
||||
#fi
|
||||
}
|
||||
|
||||
_v2ray_rules_config() {
|
||||
cat >> /etc/firewall.omr-bypass <<-EOF
|
||||
[ -z "\$(nft list ruleset | grep v2r_rules)" ] && exit 0
|
||||
nft insert rule inet fw4 v2r_rules_dst_tcp ip daddr @omr_dst_bypass_all_4 accept
|
||||
nft insert rule inet fw4 v2r_rules_local_out ip daddr @omr_dst_bypass_all_4 accept
|
||||
#nft insert rule inet fw4 v2r_rules_dst_tcp ip daddr @omr_dst_bypass_all_4 accept
|
||||
#nft insert rule inet fw4 v2r_rules_local_out ip daddr @omr_dst_bypass_all_4 accept
|
||||
EOF
|
||||
if [ "$disableipv6" = "0" ]; then
|
||||
cat >> /etc/firewall.omr-bypass <<-EOF
|
||||
nft insert rule inet fw4 v2r_rules_dst_tcp ip6 daddr @omr_dst_bypass_all_6 accept
|
||||
nft insert rule inet fw4 v2r_rules_local_out ip6 daddr @omr_dst_bypass_all_6 accept
|
||||
EOF
|
||||
fi
|
||||
#if [ "$disableipv6" = "0" ]; then
|
||||
# cat >> /etc/firewall.omr-bypass <<-EOF
|
||||
# nft insert rule inet fw4 v2r_rules_dst_tcp ip6 daddr @omr_dst_bypass_all_6 accept
|
||||
# nft insert rule inet fw4 v2r_rules_local_out ip6 daddr @omr_dst_bypass_all_6 accept
|
||||
# EOF
|
||||
#fi
|
||||
}
|
||||
|
||||
_xray_rules_config() {
|
||||
cat >> /etc/firewall.omr-bypass <<-EOF
|
||||
[ -z "\$(nft list ruleset | grep xr_rules)" ] && exit 0
|
||||
nft insert rule inet fw4 xr_rules_dst_tcp ip daddr @omr_dst_bypass_all_4 accept
|
||||
nft insert rule inet fw4 xr_rules_local_out ip daddr @omr_dst_bypass_all_4 accept
|
||||
#nft insert rule inet fw4 xr_rules_dst_tcp ip daddr @omr_dst_bypass_all_4 accept
|
||||
#nft insert rule inet fw4 xr_rules_local_out ip daddr @omr_dst_bypass_all_4 accept
|
||||
EOF
|
||||
if [ "$disableipv6" = "0" ]; then
|
||||
cat >> /etc/firewall.omr-bypass <<-EOF
|
||||
nft insert rule inet fw4 xr_rules_dst_tcp ip6 daddr @omr_dst_bypass_all_6 accept
|
||||
nft insert rule inet fw4 xr_rules_local_out ip6 daddr @omr_dst_bypass_all_6 accept
|
||||
EOF
|
||||
fi
|
||||
#if [ "$disableipv6" = "0" ]; then
|
||||
# cat >> /etc/firewall.omr-bypass <<-EOF
|
||||
# nft insert rule inet fw4 xr_rules_dst_tcp ip6 daddr @omr_dst_bypass_all_6 accept
|
||||
# nft insert rule inet fw4 xr_rules_local_out ip6 daddr @omr_dst_bypass_all_6 accept
|
||||
# EOF
|
||||
#fi
|
||||
}
|
||||
|
||||
_delete_dhcp_ipset() {
|
||||
|
|
|
|||
|
|
@ -46,18 +46,20 @@ _add_dscp_domains_rules() {
|
|||
set firewall.omr_dscp_${class}_6.match='dest_ip'
|
||||
EOF
|
||||
uci -q batch <<-EOF
|
||||
set firewall.omr_dscp_${class}=rule
|
||||
set firewall.omr_dscp_${class}.ipset="omr_dscp_${class}_4"
|
||||
set firewall.omr_dscp_${class}.set_dscp="$(echo ${class} | tr '[a-z'] '[A-Z]')"
|
||||
set firewall.omr_dscp_${class}.target='DSCP'
|
||||
set firewall.omr_dscp_${class}.src='lan'
|
||||
set firewall.omr_dscp_${class}.dest='*'
|
||||
set firewall.omr6_dscp_${class}=rule
|
||||
set firewall.omr6_dscp_${class}.ipset="omr_dscp_${class}_6"
|
||||
set firewall.omr6_dscp_${class}.target='DSCP'
|
||||
set firewall.omr6_dscp_${class}.set_dscp="$(echo ${class} | tr '[a-z'] '[A-Z]')"
|
||||
set firewall.omr6_dscp_${class}.src='lan'
|
||||
set firewall.omr6_dscp_${class}.dest='*'
|
||||
set firewall.omr_dscp_rule_${class}_4=rule
|
||||
set firewall.omr_dscp_rule_${class}_4.name="omr_dscp_${class}_4"
|
||||
set firewall.omr_dscp_rule_${class}_4.ipset="omr_dscp_${class}_4"
|
||||
set firewall.omr_dscp_rule_${class}_4.set_dscp="$(echo ${class} | tr '[a-z'] '[A-Z]')"
|
||||
set firewall.omr_dscp_rule_${class}_4.target='DSCP'
|
||||
set firewall.omr_dscp_rule_${class}_4.src='lan'
|
||||
set firewall.omr_dscp_rule_${class}_4.dest='*'
|
||||
set firewall.omr_dscp_rule_${class}_6=rule
|
||||
set firewall.omr_dscp_rule_${class}_6.name="omr6_dscp_${class}_6"
|
||||
set firewall.omr_dscp_rule_${class}_6.ipset="omr_dscp_${class}_6"
|
||||
set firewall.omr_dscp_rule_${class}_6.target='DSCP'
|
||||
set firewall.omr_dscp_rule_${class}_6.set_dscp="$(echo ${class} | tr '[a-z'] '[A-Z]')"
|
||||
set firewall.omr_dscp_rule_${class}_6.src='lan'
|
||||
set firewall.omr_dscp_rule_${class}_6.dest='*'
|
||||
commit firewall
|
||||
EOF
|
||||
done
|
||||
|
|
|
|||
|
|
@ -311,10 +311,10 @@ while true; do
|
|||
OMR_TRACKER_DEVICE_ROUTE=$(ip -4 r list dev "$OMR_TRACKER_DEVICE" | grep via | grep -v default | grep -v metric | grep -v / | awk '{print $1; exit}' | tr -d "\n")
|
||||
fi
|
||||
if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
|
||||
OMR_TRACKER_DEVICE_GATEWAY=$(ip -4 r list dev "$OMR_TRACKER_DEVICE" | grep kernel | grep -v '.0/' | awk '/proto kernel/ {print $1}' | tr -d "\n")
|
||||
OMR_TRACKER_DEVICE_GATEWAY=$(ip -4 r list dev "$OMR_TRACKER_DEVICE" | grep kernel | grep -v '.0/' | awk '/proto kernel/ {print $1;exit}' | tr -d "\n")
|
||||
fi
|
||||
if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
|
||||
OMR_TRACKER_DEVICE_GATEWAY=$(ip -4 r list dev "$OMR_TRACKER_DEVICE" | grep -m 1 default | awk '/via/ {print $3}' | tr -d "\n")
|
||||
OMR_TRACKER_DEVICE_GATEWAY=$(ip -4 r list dev "$OMR_TRACKER_DEVICE" | grep -m 1 default | awk '/via/ {print $3;exit}' | tr -d "\n")
|
||||
fi
|
||||
if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
|
||||
OMR_TRACKER_DEVICE_GATEWAY=$(ip -4 r list dev "$OMR_TRACKER_DEVICE" | awk '/via/ {print $3;exit}' | tr -d "\n")
|
||||
|
|
@ -349,9 +349,9 @@ while true; do
|
|||
if ([ "$OMR_TRACKER_FAMILY" = "ipv4" ] || [ "$OMR_TRACKER_FAMILY" = "ipv4ipv6" ]) && [ -n "$OMR_TRACKER_DEVICE_IP" ] && [ -n "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
|
||||
# setup loop variable
|
||||
if [ "$OMR_TRACKER_PREV_STATUS" = "ERROR" ]; then
|
||||
tries="$OMR_TRACKER_TRIES"
|
||||
else
|
||||
tries="$OMR_TRACKER_TRIES_UP"
|
||||
else
|
||||
tries="$OMR_TRACKER_TRIES"
|
||||
fi
|
||||
# loop until tries attempts have been reached
|
||||
while [ "$tries" -gt 0 ]; do
|
||||
|
|
@ -612,7 +612,7 @@ while true; do
|
|||
_restart
|
||||
|
||||
if [ "$OMR_TRACKER_STATUS" = "ERROR" ]; then
|
||||
sleep "${OMR_TRACKER_FAILURE_INTERVAL:-5}"
|
||||
[ -n "$OMR_TRACKER_FAILURE_INTERVAL" ] && sleep "$OMR_TRACKER_FAILURE_INTERVAL"
|
||||
else
|
||||
sleep "${OMR_TRACKER_INTERVAL:-2}"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -40,8 +40,8 @@ _check_server() {
|
|||
_check_server_intf() {
|
||||
local host=$1
|
||||
local port=$2
|
||||
local k=0
|
||||
for intf in $(multipath | awk '/default/ {print $1}'); do
|
||||
local k=0
|
||||
while [ "$server_ping" = false ] && [ "$k" -le "$retry" ]; do
|
||||
ret=$(curl \
|
||||
--max-time "$OMR_TRACKER_TIMEOUT" \
|
||||
|
|
@ -52,7 +52,6 @@ _check_server_intf() {
|
|||
)
|
||||
[ -n "$ret" ] && {
|
||||
server_ping=true
|
||||
return
|
||||
}
|
||||
k=$((k+1))
|
||||
sleep "${intervaltries}"
|
||||
|
|
|
|||
|
|
@ -92,7 +92,8 @@ _launch_tracker() {
|
|||
config_get ipv6 "$1" ipv6
|
||||
config_get proto "$1" proto
|
||||
|
||||
[ -z "$ifname" ] || [ -z "$multipath" ] || [ "$multipath" = "off" ] && [ "$1" != "glorytun" ] && [ "$1" != "omrvpn" ] && [ "$( uci -q get openmptcprouter.$1.multipathvpn)" != "1" ] && return
|
||||
#[ -z "$ifname" ] || [ -z "$multipath" ] || [ "$multipath" = "off" ] && [ "$1" != "glorytun" ] && [ "$1" != "omrvpn" ] && [ "$( uci -q get openmptcprouter.$1.multipathvpn)" != "1" ] && return
|
||||
[ -z "$multipath" ] || [ "$multipath" = "off" ] && [ "$1" != "glorytun" ] && [ "$1" != "omrvpn" ] && [ "$( uci -q get openmptcprouter.$1.multipathvpn)" != "1" ] && return
|
||||
[ "$1" = "omrvpn" ] && [ "$(uci -q get openmptcprouter.settings.vpn)" = "none" ] && return
|
||||
[ "${ifenabled}" = "0" ] && return
|
||||
[ "${enabled}" = "0" ] && return
|
||||
|
|
@ -109,7 +110,7 @@ _launch_tracker() {
|
|||
[ -z "${tries}" ] && tries=5
|
||||
[ -z "${reliability}" ] && reliability=1
|
||||
[ -z "${tries_up}" ] && tries_up=${tries}
|
||||
[ -z "${failure_interval}" ] && failure_interval=5
|
||||
#[ -z "${failure_interval}" ] && failure_interval=5
|
||||
|
||||
procd_open_instance
|
||||
# shellcheck disable=SC2086
|
||||
|
|
|
|||
Loading…
Reference in a new issue