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 tracking and set mptcp debug to 0 by default

Browse source
This commit is contained in:
Ycarus 2018-12-28 13:17:39 +01:00
parent 790ce134b4
commit 0a3c8548fb
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mptcp/files/etc/uci-defaults/mptcp-defaults
View file

@ -6,6 +6,7 @@ if [ "$(uci -q show network.globals | grep mptcp_path_manager)" = "" ]; then
set network.globals.mptcp_scheduler='default' set network.globals.mptcp_scheduler='default'
set network.globals.congestion='bbr' set network.globals.congestion='bbr'
set network.globals.mptcp_checksum=0 set network.globals.mptcp_checksum=0
set network.globals.mptcp_debug=0
set network.globals.mptcp_syn_retries=5 set network.globals.mptcp_syn_retries=5
commit network commit network
EOF EOF

13
mptcp/files/usr/share/omr/post-tracking.d/post-tracking
View file

@ -9,7 +9,7 @@ set_route() {
interface_if=$(uci -q get network.$INTERFACE.ifname) interface_if=$(uci -q get network.$INTERFACE.ifname)
[ -z "$interface_if" ] && interface_if=$(ifstatus "$INTERFACE" 2>/dev/null | jsonfilter -q -e '@["l3_device"]') [ -z "$interface_if" ] && interface_if=$(ifstatus "$INTERFACE" 2>/dev/null | jsonfilter -q -e '@["l3_device"]')
[ -z "$interface_if" ] && interface_if=$(ifstatus "${INTERFACE}_4" 2>/dev/null | jsonfilter -q -e '@["l3_device"]') [ -z "$interface_if" ] && interface_if=$(ifstatus "${INTERFACE}_4" 2>/dev/null | jsonfilter -q -e '@["l3_device"]')
multipath_current_config=$(multipath $interface_if | grep deactivated) multipath_current_config=$(multipath $interface_if | grep 'deactivated')
if [ "$multipath_config" != "off" ] && [ "$SETROUTE" != true ] && [ "$INTERFACE" != "$PREVINTERFACE" ] && [ "$multipath_current_config" = "" ]; then if [ "$multipath_config" != "off" ] && [ "$SETROUTE" != true ] && [ "$INTERFACE" != "$PREVINTERFACE" ] && [ "$multipath_current_config" = "" ]; then
interface_gw="$(uci -q get network.$INTERFACE.gateway)" interface_gw="$(uci -q get network.$INTERFACE.gateway)"
if [ -z "$interface_gw" ]; then if [ -z "$interface_gw" ]; then
@ -75,7 +75,7 @@ set_server_route() {
interface_if=$(uci -q get network.$OMR_TRACKER_INTERFACE.ifname) interface_if=$(uci -q get network.$OMR_TRACKER_INTERFACE.ifname)
[ -z "$interface_if" ] && interface_if=$(ifstatus "$OMR_TRACKER_INTERFACE" 2>/dev/null | jsonfilter -q -e '@["l3_device"]') [ -z "$interface_if" ] && interface_if=$(ifstatus "$OMR_TRACKER_INTERFACE" 2>/dev/null | jsonfilter -q -e '@["l3_device"]')
[ -z "$interface_if" ] && interface_if=$(ifstatus "${OMR_TRACKER_INTERFACE}_4" 2>/dev/null | jsonfilter -q -e '@["l3_device"]') [ -z "$interface_if" ] && interface_if=$(ifstatus "${OMR_TRACKER_INTERFACE}_4" 2>/dev/null | jsonfilter -q -e '@["l3_device"]')
multipath_current_config=$(multipath $interface_if | grep deactivated) multipath_current_config=$(multipath $interface_if | grep "deactivated")
if [ "$serverip" != "" ] && [ "$OMR_TRACKER_DEVICE_GATEWAY" != "" ] && [ "$(ip route show dev $OMR_TRACKER_DEVICE metric $metric | grep $serverip | grep $OMR_TRACKER_DEVICE_GATEWAY)" = "" ] && [ "$multipath_config_route" != "off" ] && [ "$multipath_current_config" = "" ]; then if [ "$serverip" != "" ] && [ "$OMR_TRACKER_DEVICE_GATEWAY" != "" ] && [ "$(ip route show dev $OMR_TRACKER_DEVICE metric $metric | grep $serverip | grep $OMR_TRACKER_DEVICE_GATEWAY)" = "" ] && [ "$multipath_config_route" != "off" ] && [ "$multipath_current_config" = "" ]; then
_log "Set server $server ($serverip) route via $OMR_TRACKER_DEVICE_GATEWAY metric $metric" _log "Set server $server ($serverip) route via $OMR_TRACKER_DEVICE_GATEWAY metric $metric"
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
@ -109,12 +109,16 @@ del_server_route() {
local server=$1 local server=$1
local serverip local serverip
config_get serverip $server ip config_get serverip $server ip
_log "Delete $server ($serverip) route via $OMR_TRACKER_DEVICE_GATEWAY" _log "Delete $server ($serverip) route via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE"
ip route del $serverip dev $OMR_TRACKER_DEVICE >/dev/null 2>&1
ip route del default via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE >/dev/null 2>&1
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
delete network.server_${server}_${OMR_TRACKER_INTERFACE}_route delete network.server_${server}_${OMR_TRACKER_INTERFACE}_route
delete network.${OMR_TRACKER_INTERFACE}_route_default_metric
commit network commit network
EOF EOF
ip route del $serverip dev $OMR_TRACKER_DEVICE >/dev/null 2>&1 ip route del $serverip dev $OMR_TRACKER_DEVICE >/dev/null 2>&1
ip route del default via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE >/dev/null 2>&1
} }
dns_flush() { dns_flush() {
@ -138,7 +142,7 @@ if [ -d "/sys/class/net/$OMR_TRACKER_DEVICE" ]; then
esac esac
fi fi
default_gw=$(ip route show default | grep -v metric | awk '/default/ {print $3}') default_gw=$(ip route show default | grep -v "metric" | awk '/default/ {print $3}')
#current_interface_gw=$(uci -q get "network.$OMR_TRACKER_INTERFACE.gateway") #current_interface_gw=$(uci -q get "network.$OMR_TRACKER_INTERFACE.gateway")
# An interface in error will never be used in MPTCP # An interface in error will never be used in MPTCP
@ -162,7 +166,6 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ]; then
if [ -n "$OMR_TRACKER_DEVICE_IP" ]; then if [ -n "$OMR_TRACKER_DEVICE_IP" ]; then
glorytun-udp path $OMR_TRACKER_DEVICE_IP dev tun0 down > /dev/null 2>&1 glorytun-udp path $OMR_TRACKER_DEVICE_IP dev tun0 down > /dev/null 2>&1
fi fi
ip route del default via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE >/dev/null 2>&1
config_load openmptcprouter config_load openmptcprouter
config_foreach del_server_route server config_foreach del_server_route server
} }