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

Add MPTCP upstream support to MPTCP support detection

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2021-09-02 19:51:18 +02:00
parent 16dd1b400f
commit 3389d09c23
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
luci-app-openmptcprouter/root/bin/omr-mptcp-intf
View file

@ -12,9 +12,17 @@ get_mptcp_from_server() {
get_mptcp() { get_mptcp() {
serverip=$1 serverip=$1
if [ "$(echo $serverip | grep :)" ]; then if [ "$(echo $serverip | grep :)" ]; then
support="$(curl -s -k -6 -m ${timeout} --interface $intf https://[$serverip]:$serverport/mptcpsupport)" if [ -f /proc/sys/net/mptcp/enabled ]; then
support="$(mptcpize run curl -s -k -6 -m ${timeout} --interface $intf https://[$serverip]:$serverport/mptcpsupport)"
else
support="$(curl -s -k -6 -m ${timeout} --interface $intf https://[$serverip]:$serverport/mptcpsupport)"
fi
else else
support="$(curl -s -k -4 -m ${timeout} --interface $intf https://$serverip:$serverport/mptcpsupport)" if [ -f /proc/sys/net/mptcp/enabled ]; then
support="$(mptcpize run curl -s -k -4 -m ${timeout} --interface $intf https://$serverip:$serverport/mptcpsupport)"
else
support="$(curl -s -k -4 -m ${timeout} --interface $intf https://$serverip:$serverport/mptcpsupport)"
fi
fi fi
[ -n "$support" ] && { [ -n "$support" ] && {
support=$(echo $support | jsonfilter -e '@.mptcp') support=$(echo $support | jsonfilter -e '@.mptcp')
@ -56,8 +64,10 @@ get_mptcp_from_website6() {
support="" support=""
config_load openmptcprouter config_load openmptcprouter
config_foreach get_mptcp_from_server server config_foreach get_mptcp_from_server server
[ -z "$support" ] && [ -n "$(ip -4 a show dev $intf)" ] && get_mptcp_from_website if [ ! -f /proc/sys/net/mptcp/enabled ] && [ -z "$support" ]; then
[ -z "$support" ] && [ -n "$(ip -6 a show dev $intf)" ] && get_mptcp_from_website6 [ -n "$(ip -4 a show dev $intf)" ] && get_mptcp_from_website
[ -n "$(ip -6 a show dev $intf)" ] && get_mptcp_from_website6
fi
if [ "$support" = "working" ]; then if [ "$support" = "working" ]; then
echo "MPTCP enabled" echo "MPTCP enabled"
elif [ "$support" = "not working" ]; then elif [ "$support" = "not working" ]; then