Merge pull request #130 from Ysurac/develop

sync
2025-02-15 03:51:51 +00:00 · 2021-04-28 09:07:55 +08:00 · 2021-04-28 09:07:55 +08:00 · 63b67d68b5
commit 63b67d68b5
parent 5bc8d47300 44dc902961
4 changed files with 86 additions and 67 deletions
--- a/luci-app-mptcp/luasrc/view/mptcp/mptcp_check.htm
+++ b/luci-app-mptcp/luasrc/view/mptcp/mptcp_check.htm
@ -69,5 +69,7 @@
    
 <div class="cbi-section">
    <span id="tracebox"></span>
+    <br />
+    <i><%:If you get "TCPOptionMPTCPCapable [...] Sender's Key" at the end, then MPTCP is supported. If there is a "-TCPOptionMPTCPCapable", then it's blocked.%></i>
 </div>
 <%+footer%>
--- a/luci-app-mptcp/po/templates/mptcp.pot
+++ b/luci-app-mptcp/po/templates/mptcp.pot
@ -1,27 +1,23 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"

-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:779
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:775
 msgid "(%d minute window, %d second interval)"
 msgstr ""

-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:245
-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:246
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:241
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:242
 msgid "(%d minutes window, %d seconds interval)"
 msgstr ""

-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:319
-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:322
-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:377
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:315
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:318
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:373
 #: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:932
 #: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:942
 msgid "Average:"
 msgstr ""

-#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:34
-msgid "BLEST"
-msgstr ""
-
 #: luci-app-mptcp/luasrc/controller/mptcp.lua:11
 msgid "Bandwidth"
 msgstr ""
@ -34,27 +30,32 @@ msgstr ""
 msgid "Congestion Control"
 msgstr ""

-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:315
-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:318
-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:373
+#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:69
+msgid "Consecutive segments that should be sent for round robin"
+msgstr ""
+
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:311
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:314
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:369
 msgid "Current:"
 msgstr ""

 #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:40
-msgid "Default is bbr"
+msgid "Default is cubic"
+msgstr ""
+
+#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:21
+msgid "Default is fullmesh"
 msgstr ""

 #: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:908
 msgid "Download:"
 msgstr ""

-#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:35
-msgid "ECF"
-msgstr ""
-
 #: luci-app-mptcp/luasrc/view/mptcp/mptcp_check.htm:31
 #: luci-app-mptcp/luasrc/view/mptcp/mptcp_connections.htm:31
 #: luci-app-mptcp/luasrc/view/mptcp/mptcp_fullmesh.htm:31
+#: luci-app-mptcp/luasrc/view/mptcp/mptcp_monitor.htm:24
 msgid "Error"
 msgstr ""

@ -62,7 +63,11 @@ msgstr ""
 msgid "Established connections"
 msgstr ""

-#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:45
+#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:63
+msgid "Fill the congestion window on all subflows for round robin"
+msgstr ""
+
+#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:46
 msgid "Fullmesh subflows for each pair of IP addresses"
 msgstr ""

@ -70,6 +75,13 @@ msgstr ""
 msgid "Grant UCI access for luci-app-mptcp"
 msgstr ""

+#: luci-app-mptcp/luasrc/view/mptcp/mptcp_check.htm:73
+msgid ""
+"If you get \"TCPOptionMPTCPCapable [...] Sender's Key\" at the end, then "
+"MPTCP is supported. If there is a \"-TCPOptionMPTCPCapable\", then it's "
+"blocked."
+msgstr ""
+
 #: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:929
 msgid "Inbound:"
 msgstr ""
@ -78,18 +90,19 @@ msgstr ""
 msgid "Interface"
 msgstr ""

-#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:56
+#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:75
 msgid "Interfaces Settings"
 msgstr ""

 #: luci-app-mptcp/luasrc/view/mptcp/mptcp_check.htm:21
 #: luci-app-mptcp/luasrc/view/mptcp/mptcp_connections.htm:21
 #: luci-app-mptcp/luasrc/view/mptcp/mptcp_fullmesh.htm:21
+#: luci-app-mptcp/luasrc/view/mptcp/mptcp_monitor.htm:14
 msgid "Loading"
 msgstr ""

-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:90
-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:690
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:93
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:686
 msgid "MB/s"
 msgstr ""

@ -108,8 +121,12 @@ msgstr ""
 msgid "MPTCP Support Check"
 msgstr ""

-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:99
-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:699
+#: luci-app-mptcp/luasrc/controller/mptcp.lua:20
+msgid "MPTCP monitoring"
+msgstr ""
+
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:102
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:695
 msgid "Mbit/s"
 msgstr ""

@ -118,7 +135,7 @@ msgid "Multipath Debug"
 msgstr ""

 #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:12
-#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:57
+#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:76
 msgid "Multipath TCP"
 msgstr ""

@ -149,7 +166,7 @@ msgid ""
 "ConfigureMPTCP</a> for help."
 msgstr ""

-#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:57
+#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:76
 msgid "One interface must be set as master"
 msgstr ""

@ -157,19 +174,19 @@ msgstr ""
 msgid "Outbound:"
 msgstr ""

-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:323
-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:326
-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:381
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:319
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:322
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:377
 #: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:935
 #: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:945
 msgid "Peak:"
 msgstr ""

-#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:48
+#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:52
 msgid "Re-create fullmesh subflows after a timeout"
 msgstr ""

-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:895
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:891
 msgid "Realtime Traffic"
 msgstr ""

@ -189,17 +206,14 @@ msgstr ""
 #: luci-app-mptcp/luasrc/view/mptcp/mptcp_check.htm:21
 #: luci-app-mptcp/luasrc/view/mptcp/mptcp_connections.htm:21
 #: luci-app-mptcp/luasrc/view/mptcp/mptcp_fullmesh.htm:21
+#: luci-app-mptcp/luasrc/view/mptcp/mptcp_monitor.htm:14
 msgid "Waiting for command to complete..."
 msgstr ""

-#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:61
+#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:80
 msgid "backup"
 msgstr ""

-#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:25
-msgid "binder"
-msgstr ""
-
 #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:22
 #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:30
 msgid "default"
@ -208,37 +222,35 @@ msgstr ""
 #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:14
 #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:17
 #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:20
-#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:50
+#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:54
+#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:65
 msgid "disable"
 msgstr ""

-#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:59
+#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:78
 msgid "disabled"
 msgstr ""

 #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:13
 #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:16
 #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:19
-#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:49
+#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:53
+#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:64
 msgid "enable"
 msgstr ""

-#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:58
+#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:77
 msgid "enabled"
 msgstr ""

-#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:23
-msgid "fullmesh"
-msgstr ""
-
-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:85
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:88
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:314
 #: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:318
 #: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:322
-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:326
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:372
 #: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:376
 #: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:380
-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:384
-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:685
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:681
 #: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:930
 #: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:933
 #: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:936
@ -248,14 +260,14 @@ msgstr ""
 msgid "kB/s"
 msgstr ""

-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:94
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:97
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:314
 #: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:318
 #: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:322
-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:326
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:372
 #: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:376
 #: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:380
-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:384
-#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:694
+#: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:690
 #: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:930
 #: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:933
 #: luci-app-mptcp/luasrc/view/mptcp/multipath.htm:936
@ -265,22 +277,10 @@ msgstr ""
 msgid "kbit/s"
 msgstr ""

-#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:60
+#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:79
 msgid "master"
 msgstr ""

-#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:24
-msgid "ndiffports"
-msgstr ""
-
-#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:52
+#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:57
 msgid "ndiffports subflows number"
 msgstr ""
-
-#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:32
-msgid "redundant"
-msgstr ""
-
-#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:31
-msgid "round-robin"
-msgstr ""
--- a/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter
+++ b/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter
@ -1,4 +1,7 @@
 #!/bin/sh
+
+. /lib/functions.sh
+
 uci -q batch <<-EOF
    delete ucitrack.@openmptcprouter[-1]
    add ucitrack openmptcprouter
@ -128,6 +131,21 @@ if [ "$(uci -q get openmptcprouter.settings.tracebox)" = "" ]; then
 	EOF
 fi

+_set_omr_ip() {
+	server=$1
+	serverip="$(uci -q get openmptcprouter.${server}.ip)"
+	if [ -n "$serverip" ]; then
+		uci -q batch <<-EOF >/dev/null
+			delete openmptcprouter.${server}.ip
+			add_list openmptcprouter.${server}.ip="${serverip}"
+			commit openmptcprouter
+		EOF
+	fi
+}
+
+config_load openmptcprouter
+config_foreach _set_omr_ip server
+
 sed -i 's/net.ipv4.tcp_retries2=3$/net.ipv4.tcp_retries2=15/' /etc/sysctl.d/zzz_openmptcprouter.conf

 exit 0
--- a/luci-theme-openwrt-2020/root/etc/uci-defaults/30_luci-theme-openwrt-2020
+++ b/luci-theme-openwrt-2020/root/etc/uci-defaults/30_luci-theme-openwrt-2020
@ -4,7 +4,6 @@ if [ "$PKG_UPGRADE" != 1 ]; then
 	uci get luci.themes.OpenWrt2020 >/dev/null 2>&1 || \
 	uci batch <<-EOF
 		set luci.themes.OpenWrt2020=/luci-static/openwrt2020
-		set luci.main.mediaurlbase=/luci-static/openwrt2020
 		commit luci
 	EOF
 fi