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

Merge pull request #114 from Ysurac/develop

Browse source 
sync
This commit is contained in:
suyuan 2021-04-14 00:39:22 +08:00 committed by GitHub
commit 3000d34656
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
View file

@ -364,6 +364,7 @@ function wizard_add()
ucic:set("sqm",intf,"download",math.ceil(downloadspeed*95/100))
ucic:set("qos",intf,"download",math.ceil(downloadspeed*95/100))
else
ucic:delete("network",intf,"downloadspeed")
ucic:set("sqm",intf,"download","0")
ucic:set("qos",intf,"download","0")
end
@ -372,13 +373,10 @@ function wizard_add()
ucic:set("sqm",intf,"upload",math.ceil(uploadspeed*95/100))
ucic:set("qos",intf,"upload",math.ceil(uploadspeed*95/100))
else
ucic:delete("network",intf,"uploadspeed")
ucic:set("sqm",intf,"upload","0")
ucic:set("qos",intf,"upload","0")
end
if downloadspeed ~= "0" and downloadspeed ~= "" and uploadspeed ~= "0" and uploadspeed ~= "" then
ucic:set("sqm",intf,"enabled","0")
ucic:set("qos",intf,"enabled","0")
end
if sqmenabled == "1" then
ucic:set("sqm",intf,"iqdisc_opts","autorate-ingress nat dual-dsthost")

7
luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter
View file

@ -121,6 +121,13 @@ if [ "$(uci -q get openmptcprouter.settings.disableintfrename)" = "" ]; then
EOF
fi
if [ "$(uci -q get openmptcprouter.settings.tracebox)" = "" ]; then
uci -q batch <<-EOF >/dev/null
set openmptcprouter.settings.tracebox='0'
commit openmptcprouter
EOF
fi
sed -i 's/net.ipv4.tcp_retries2=3$/net.ipv4.tcp_retries2=15/' /etc/sysctl.d/zzz_openmptcprouter.conf
exit 0

10
mptcp/files/etc/init.d/mptcp
View file

@ -238,7 +238,7 @@ interface_multipath_settings() {
EOF
else
#echo "Add routes for $ipaddr table $id"
ip rule add from $ipaddr table $id pref 0
[ -n "$ipaddr" ] && ip rule add from $ipaddr table $id pref 0
ip route replace $network/$netmask dev $iface scope link metric $id 2>&1 >/dev/null
ip route replace $network/$netmask dev $iface scope link table $id 2>&1 >/dev/null
ip route replace default via $gateway dev $iface table $id 2>&1 >/dev/null
@ -384,9 +384,9 @@ add_route() {
config_get interface "$1" interface
iface=$(ifstatus "$interface" | jsonfilter -q -e '@["l3_device"]')
[ -n "$(echo $iface | grep '@')" ] && iface=$(ifstatus "$interface" | jsonfilter -q -e '@["device"]')
routeset="$routeset dev $iface"
[ -n "$iface" ] && routeset="$routeset dev $iface"
logger -t "MPTCP" "Add route $routeset"
ip route replace $routeset 2>&1 >/dev/null
[ -n "$routeset" ] && ip route replace $routeset 2>&1 >/dev/null
}
add_route6() {
@ -405,9 +405,9 @@ add_route6() {
config_get interface "$1" interface
iface=$(ifstatus "$interface" | jsonfilter -q -e '@["l3_device"]')
[ -n "$(echo $iface | grep '@')" ] && iface=$(ifstatus "$interface" | jsonfilter -q -e '@["device"]')
routeset="$routeset dev $iface"
[ -n "$iface" ] && routeset="$routeset dev $iface"
logger -t "MPTCP" "Add IPv6 route $routeset"
ip -6 route replace $routeset 2>&1 >/dev/null
[ -n "$routeset" ] && ip -6 route replace $routeset 2>&1 >/dev/null
}
remove() {

2
omr-tracker/files/bin/omr-tracker
View file

@ -238,7 +238,7 @@ while true; do
OMR_TRACKER_DEVICE_GATEWAY6=
serverip_ping=false
if [ -d "/sys/class/net/$OMR_TRACKER_DEVICE" ]; then
if [ -n "$OMR_TRACKER_DEVICE" ] && [ -d "/sys/class/net/$OMR_TRACKER_DEVICE" ]; then
if [ -n "$(ip link show $OMR_TRACKER_DEVICE | grep UP)" ]; then
# retrieve iface ip and gateway
if [ "$OMR_TRACKER_INTERFACE_PROTO" != "dhcpv6" ]; then

4
openmptcprouter/files/etc/init.d/openmptcprouter-vps
View file

@ -822,8 +822,8 @@ _set_vpn_ip() {
vpnip_local=$(ip -4 -br addr ls dev ${vpnifname} | awk -F'[ /]+' '{print $3}')
vpnip_remote_current="$(echo "$vps_config" | jsonfilter -q -e '@.vpn.localip')"
vpnip_remote=$(ip -4 r list dev ${vpnifname} | grep via | grep -v default | grep -v / | grep -v metric | awk '{print $1}' | tr -d "\n")
[ -z "$vpnip_remote" ] && vpnip_remote=$(ip -4 r list dev ${vpnifname} | grep kernel | awk '{print $1}' | tr -d "\n")
[ -z "$vpnip_remote" ] && vpnip_remote=$(ip -4 r list dev ${vpnifname} | grep "proto static src" | awk '{print $3}' | tr -d "\n")
[ -z "$vpnip_remote" ] && [ -n "$vpnifname" ] && vpnip_remote=$(ip -4 r list dev ${vpnifname} | grep kernel | awk '{print $1}' | tr -d "\n")
[ -z "$vpnip_remote" ] && [ -n "$vpnifname" ] && vpnip_remote=$(ip -4 r list dev ${vpnifname} | grep "proto static src" | awk '{print $3}' | tr -d "\n")
[ -z "$vpnip_remote" ] && vpnip_remote=$(ifstatus omrvpn | jsonfilter -e '@.route[0].nexthop')
ula="$(uci -q get network.globals.ula_prefix)"
ula_current="$(echo "$vps_config" | jsonfilter -q -e '@.ip6in4.ula')"