diff --git a/luci-app-mptcp/luasrc/view/mptcp/mptcp_check.htm b/luci-app-mptcp/luasrc/view/mptcp/mptcp_check.htm index 3df062637..b60e89ba5 100644 --- a/luci-app-mptcp/luasrc/view/mptcp/mptcp_check.htm +++ b/luci-app-mptcp/luasrc/view/mptcp/mptcp_check.htm @@ -69,5 +69,7 @@
+
+ <:If you get "TCPOptionMPTCPCapable [...] Sender's Key" at the end, then MPTCP is supported. If there is a "-TCPOptionMPTCPCapable", then it's blocked.%>
<%+footer%> diff --git a/luci-app-mptcp/po/templates/mptcp.pot b/luci-app-mptcp/po/templates/mptcp.pot index f784674a3..f75646c67 100644 --- 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 "" @@ -78,18 +83,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 +114,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 +128,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 +159,7 @@ msgid "" "ConfigureMPTCP 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 +167,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 +199,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 +215,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 +253,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 +270,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 ""