From 0c54e920d89aea75e7235b64130652a041aaaadb Mon Sep 17 00:00:00 2001 From: Ycarus Date: Tue, 27 Nov 2018 15:21:47 +0100 Subject: [PATCH] Change wizard interface, add VPS admin support,... --- .../openmptcprouter/css/wanstatus.css | 19 ++ .../htdocs/luci-static/resources/server.png | Bin 0 -> 1115 bytes .../luasrc/controller/openmptcprouter.lua | 85 ++++---- .../view/openmptcprouter/mptcp_check.htm | 73 ------- .../luasrc/view/openmptcprouter/settings.htm | 30 ++- .../luasrc/view/openmptcprouter/wanstatus.htm | 196 ++++++++++-------- .../luasrc/view/openmptcprouter/wizard.htm | 98 +++++++-- .../po/fr/openmptcprouter.po | 68 +++++- .../po/templates/openmptcprouter.pot | 53 ++++- .../root/etc/init.d/openmptcprouter | 14 +- .../root/etc/uci-defaults/openmptcprouter | 4 +- 11 files changed, 402 insertions(+), 238 deletions(-) create mode 100644 luci-app-openmptcprouter/htdocs/luci-static/resources/server.png delete mode 100644 luci-app-openmptcprouter/luasrc/view/openmptcprouter/mptcp_check.htm diff --git a/luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css b/luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css index fbddd23be..461c9090f 100644 --- a/luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css +++ b/luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css @@ -197,6 +197,9 @@ right connector from last child*/ height: 30px; z-index: -10; } +.remote-from-lease a { + height: 90px; +} .tree li#networkRootNode { padding: 25px 0 0 0; } @@ -242,6 +245,7 @@ Thanks :)*/ width: 400px; max-width: 400px; box-sizing: border-box; + height: 170px; } .network-node .equipment-icon { position: relative; @@ -301,4 +305,19 @@ Thanks :)*/ } #networkRootNode table td { border-top: 0px; +} +.vertdash { + width:5px; + border-right:2px dotted black; + height:70px; + padding-right: 195px; +} +#omr { + height: 190px; +} +#omr-vps { + height: 160px; +} +.space { + height: 55px; } \ No newline at end of file diff --git a/luci-app-openmptcprouter/htdocs/luci-static/resources/server.png b/luci-app-openmptcprouter/htdocs/luci-static/resources/server.png new file mode 100644 index 0000000000000000000000000000000000000000..78f61d67281331786d80f0af1580dba0a51b5736 GIT binary patch literal 1115 zcmV-h1f=_kP)LIgn!K{1UQqcJ8Xduwrb;WD>(H@h?Uk=*mZ3%R|SN%Fh-cxUIyCZM%Sz)j#f zFa~S|0ydULjMp(xv8=lS`~uzp_kh<~zxmx-BZ*=yJ_09f;FW5H1uZ=)z@!N+YWTVU z%m90lS}6d|)>yqtD==k}FBXf5xIv2^dD$#A#Zsx1seBYg^*N@ib$Ym3?+<}dmsS=R7YW1Ax_lhR)sHht zx>~1ODijLl4{;;}${8DJx>l)FhHW^n+ggTMTNpB6RuaU1Kx}Ft3aPmB~thgJ5PS=$a%bxY~Q&#vdCo;w3PMQ6`h0nV8PwgF25 zX$`OfTuLi=uJ)!Zbe&_e9r0_(+}SQ-;6|q%%S)v^9dCp*-JwY{d5()!TZl4wdR$m! z^32=?W%BHPvMrNmevmSGdVuK1YD5Qok9?ggTZ z?;apF0F%kn5u!|B0dPmjY{a)2n4r>7K0CeOwx&T;ddXLtuLAKIo&wk1In#6g0% zZc@u&d>=}snLGjBqT_)~9F3Te$1I&A@;3slEgX|<>T+(u4W+tv9uaMUbxs5WUTy=kEo zr|gtj=CJ_g>X8>36YXU|%mwmM{o)k?%nfm_z9JtNmrQEBiM<2Z83KF6#a@L%!Ti&U zu@KlUG`V{sK%|2z4-!N{6huL!M^4#6cgeay?3Gh?;9au0Aj&E00iv9;ejv&z>uFBx zl~Z=$U9zw-oU*}Y?TL~g3gSRQRL+uRmysmqIc-WUUvC^WrQz@w1u|X>slh)&D3igJ(8?O;4>W0`CRV8sI!|IIZ9T;0JPj zb&6#=*z1k~p9HF9d;w0`blp+l0q{@I*5WU4AJ~=k4#@;?6*v#<19k&jhGY)>Q_G(} hP<_tsvswm|s{d)gJT8*w5MTfR002ovPDHLkV1lRS@<#vw literal 0 HcmV?d00001 diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua index f26e77e83..f7c10481d 100644 --- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua +++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua @@ -17,8 +17,6 @@ function index() entry({"admin", "system", "openmptcprouter", "interfaces_status"}, call("interfaces_status")).leaf = true entry({"admin", "system", "openmptcprouter", "settings"}, template("openmptcprouter/settings"), _("Advanced Settings"), 3).leaf = true entry({"admin", "system", "openmptcprouter", "settings_add"}, post("settings_add")).leaf = true - entry({"admin", "system", "openmptcprouter", "mptcp_check"}, template("openmptcprouter/mptcp_check"), _("MPTCP Support Check"), 3).leaf = true - entry({"admin", "system", "openmptcprouter", "mptcp_check_trace"}, post("mptcp_check_trace")).leaf = true end function interface_from_device(dev) @@ -127,16 +125,20 @@ function wizard_add() ucic:save("qos") ucic:commit("qos") luci.sys.call("uci -q del_list vnstat.@vnstat[-1].interface=" .. intf) + gostatus = false end - gostatus = false end -- Set interfaces settings local interfaces = luci.http.formvaluetable("intf") for intf, _ in pairs(interfaces) do + local proto = luci.http.formvalue("cbid.network.%s.proto" % intf) or "static" local ipaddr = luci.http.formvalue("cbid.network.%s.ipaddr" % intf) or "" local netmask = luci.http.formvalue("cbid.network.%s.netmask" % intf) or "" local gateway = luci.http.formvalue("cbid.network.%s.gateway" % intf) or "" + if proto ~= "other" then + ucic:set("network",intf,"proto",proto) + end ucic:set("network",intf,"ipaddr",ipaddr) ucic:set("network",intf,"netmask",netmask) ucic:set("network",intf,"gateway",gateway) @@ -193,9 +195,6 @@ function wizard_add() ucic:save("network") ucic:commit("network") end - ucic:set("openmptcprouter","settings","vpn",default_vpn) - ucic:save("openmptcprouter") - ucic:commit("openmptcprouter") -- Get all servers ips local server_ip = luci.http.formvalue("server_ip") or "" @@ -246,6 +245,8 @@ function wizard_add() ucic:set("shadowsocks-libev","sss0","server",server_ip) ucic:save("shadowsocks-libev") ucic:commit("shadowsocks-libev") + ucic:set("openmptcprouter","vps","ip",server_ip) + ucic:save("openmptcprouter") end ucic:set("glorytun","vpn","host",server_ip) ucic:save("glorytun") @@ -265,16 +266,17 @@ function wizard_add() -- Set ShadowSocks settings local shadowsocks_key = luci.http.formvalue("shadowsocks_key") + local shadowsocks_disable = luci.http.formvalue("disableshadowsocks") or "0" if shadowsocks_key ~= "" then ucic:set("shadowsocks-libev","sss0","key",shadowsocks_key) ucic:set("shadowsocks-libev","sss0","method","chacha20") ucic:set("shadowsocks-libev","sss0","server_port","65101") - ucic:set("shadowsocks-libev","sss0","disabled",0) + ucic:set("shadowsocks-libev","sss0","disabled",shadowsocks_disable) ucic:save("shadowsocks-libev") ucic:commit("shadowsocks-libev") else ucic:set("shadowsocks-libev","sss0","key","") - ucic:set("shadowsocks-libev","sss0","disabled",1) + ucic:set("shadowsocks-libev","sss0","disabled",shadowsocks_disable) ucic:save("shadowsocks-libev") ucic:commit("shadowsocks-libev") luci.sys.call("/etc/init.d/shadowsocks rules_down >/dev/null 2>/dev/null") @@ -331,7 +333,7 @@ function wizard_add() ucic:save("mlvpn") ucic:commit("mlvpn") else - ucic:set("mlvpn","general","enable",0) + --ucic:set("mlvpn","general","enable",0) ucic:set("mlvpn","general","password","") ucic:save("mlvpn") ucic:commit("mlvpn") @@ -368,8 +370,23 @@ function wizard_add() ucic:commit("openvpn") end + -- OpenMPTCProuter VPS + local openmptcprouter_vps_key = luci.http.formvalue("openmptcprouter_vps_key") or "" + ucic:set("openmptcprouter","vps","username","openmptcprouter") + ucic:set("openmptcprouter","vps","password",openmptcprouter_vps_key) + ucic:set("openmptcprouter","vps","get_config","1") + local shadowsocks_disable = luci.http.formvalue("disableshadowsocks") or "0" + ucic:set("openmptcprouter","settings","shadowsocks_disable",shadowsocks_disable) + ucic:set("openmptcprouter","settings","vpn",default_vpn) + ucic:save("openmptcprouter") + ucic:commit("openmptcprouter") + -- Restart all luci.sys.call("(env -i /bin/ubus call network reload) >/dev/null 2>/dev/null") + if openmptcprouter_vps_key ~= "" then + luci.sys.call("/etc/init.d/openmptcprouter-vps restart >/dev/null 2>/dev/null") + os.execute("sleep 2") + end luci.sys.call("/etc/init.d/shadowsocks restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/glorytun restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/glorytun-udp restart >/dev/null 2>/dev/null") @@ -384,6 +401,10 @@ function wizard_add() end function settings_add() + -- Redirects all ports from VPS to OpenMPTCProuter + local redirect_ports = luci.http.formvalue("redirect_ports") or "0" + ucic:set("openmptcprouter","vps","redirect_ports",redirect_ports) + -- Set tcp_keepalive_time local tcp_keepalive_time = luci.http.formvalue("tcp_keepalive_time") luci.sys.exec("sysctl -w net.ipv4.tcp_keepalive_time=%s" % tcp_keepalive_time) @@ -514,6 +535,7 @@ function interfaces_status() mArray.openmptcprouter = {} --mArray.openmptcprouter["version"] = ut.trim(sys.exec("cat /etc/os-release | grep VERSION= | sed -e 's:VERSION=::'")) mArray.openmptcprouter["version"] = uci:get("openmptcprouter", "settings", "version") or ut.trim(sys.exec("cat /etc/os-release | grep VERSION= | sed -e 's:VERSION=::' -e 's/^.//' -e 's/.$//'")) + mArray.openmptcprouter["vps_omr_version"] = uci:get("openmptcprouter", "vps", "omr_version") or "" mArray.openmptcprouter["latest_version_omr"] = uci:get("openmptcprouter", "latest_versions", "omr") or "" mArray.openmptcprouter["latest_version_vps"] = uci:get("openmptcprouter", "latest_versions", "vps") or "" @@ -540,7 +562,7 @@ function interfaces_status() local tracker_ip = "" if mArray.openmptcprouter["dns"] == true then -- shadowsocksaddr - mArray.openmptcprouter["ss_addr"] = uci:get("openmptcprouter","vps","ipv4") or "" + mArray.openmptcprouter["ss_addr"] = uci:get("openmptcprouter","vps","public_detected_ipv4") or "" if mArray.openmptcprouter["ss_addr"] == "" then tracker_ip = uci:get("shadowsocks-libev","tracker","local_address") or "" if tracker_ip ~= "" then @@ -552,7 +574,7 @@ function interfaces_status() -- wanaddr mArray.openmptcprouter["wan_addr"] = sys.exec("wget -4 -qO- -T 1 http://ip.openmptcprouter.com") if mArray.openmptcprouter["ipv6"] == "enabled" then - mArray.openmptcprouter["wan_addr6"] = uci:get("openmptcprouter","vps","ipv6") or "" + mArray.openmptcprouter["wan_addr6"] = uci:get("openmptcprouter","vps","public_detected_ipv6") or "" if mArray.openmptcprouter["wan_addr6"] == "" then mArray.openmptcprouter["wan_addr6"] = sys.exec("wget -6 -qO- -T 1 http://ipv6.openmptcprouter.com") end @@ -569,6 +591,11 @@ function interfaces_status() end end + -- Get VPS info + mArray.openmptcprouter["vps_kernel"] = uci:get("openmptcprouter","vps","kernel") or "" + mArray.openmptcprouter["vps_machine"] = uci:get("openmptcprouter","vps","machine") or "" + mArray.openmptcprouter["vps_omr_version"] = uci:get("openmptcprouter","vps","omr_version") or "" + -- Check openmptcprouter service are running mArray.openmptcprouter["tun_service"] = false mArray.openmptcprouter["tun_state"] = "" @@ -659,6 +686,8 @@ function interfaces_status() mArray.openmptcprouter["loadavg"] = sys.exec("cat /proc/loadavg 2>/dev/null"):match("[%d%.]+ [%d%.]+ [%d%.]+") mArray.openmptcprouter["uptime"] = sys.exec("cat /proc/uptime 2>/dev/null"):match("[%d%.]+") + + mArray.openmptcprouter["vps_status"] = "DOWN" -- overview status mArray.wans = {} mArray.tunnels = {} @@ -753,6 +782,7 @@ function interfaces_status() connectivity = "WARNING" end else + mArray.openmptcprouter["vps_status"] = "UP" server_ping = "UP" latency = ut.trim(sys.exec("echo '" .. server_ping_test .. "' | cut -d '/' -s -f5 | cut -d '.' -f1")) end @@ -927,29 +957,6 @@ function _ipv6_discover(interface) return ra6_result end -function mptcp_check_trace(iface) - luci.http.prepare_content("text/plain") - local tracebox - local uci = require "luci.model.uci".cursor() - local interface = get_device(iface) - local server = uci:get("shadowsocks-libev", "sss0", "server") or "" - if server == "" then return end - if interface == "" then - tracebox = io.popen("tracebox -s /usr/share/tracebox/omr-mptcp-trace.lua " .. server) - else - tracebox = io.popen("tracebox -s /usr/share/tracebox/omr-mptcp-trace.lua -i " .. interface .. " " .. server) - end - if tracebox then - while true do - local ln = tracebox:read("*l") - if not ln then break end - luci.http.write(ln) - luci.http.write("\n") - end - end - return -end - function set_ipv6_state(disable_ipv6) -- Disable/Enable IPv6 support luci.sys.exec("sysctl -w net.ipv6.conf.all.disable_ipv6=%s" % disable_ipv6) @@ -980,16 +987,16 @@ function set_ipv6_state(disable_ipv6) else -- ucic:set("dhcp","lan","dhcpv6","server") -- ucic:set("dhcp","lan","ra","server") - -- ucic:set("dhcp","lan","ra_default","0") + -- ucic:set("dhcp","lan","ra_default","1") ucic:set("shadowsocks-libev","hi","local_address","::") end ucic:save("dhcp") ucic:commit("dhcp") - if disable_ipv6 == "1" then - luci.sys.exec("/etc/init.d/odhcpd stop >/dev/null 2>&1") - luci.sys.exec("/etc/init.d/odhcpd disable >/dev/null 2>&1") + --if disable_ipv6 == "1" then + -- luci.sys.exec("/etc/init.d/odhcpd stop >/dev/null 2>&1") + -- luci.sys.exec("/etc/init.d/odhcpd disable >/dev/null 2>&1") --else -- luci.sys.exec("/etc/init.d/odhcpd start >/dev/null 2>&1") -- luci.sys.exec("/etc/init.d/odhcpd enable >/dev/null 2>&1") - end + --end end \ No newline at end of file diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/mptcp_check.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/mptcp_check.htm deleted file mode 100644 index 97b560bbb..000000000 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/mptcp_check.htm +++ /dev/null @@ -1,73 +0,0 @@ -<%+header%> - -<% - local uci = require("luci.model.uci").cursor() - local sys = require "luci.sys" - local ifaces = sys.net:devices() - local net = require "luci.model.network".init() -%> - - - - -<% if stderr and #stderr > 0 then %>
<%=pcdata(stderr)%>
<% end %> -
-
-

<%:MPTCP Support Check%>

-
<%:Check if MPTCP between interface and server is working.%>
-
- <%:Settings%> -
-
- -
- -
-
- -
-
-
- -
- -
-<%+footer%> diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm index 17b341300..98da2d13f 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm @@ -5,6 +5,26 @@

<%:Advanced Settings%>

+ <%:VPS settings%> +
+
+ +
+ checked<% end %>> +
+
+
+ +
+ checked<% end %>> +
+
+ <%:OBFS will be enabled on both side%> +
+
+
+
+
<%:Networks settings%>
@@ -35,16 +55,6 @@
-
- -
- checked<% end %>> -
-
- <%:OBFS must be enabled on VPS%> -
-
-
<% if nixio.fs.access("/sys/devices/system/cpu/cpufreq/policy0/scaling_min_freq") then %>
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm index 198a5b5f4..31103f918 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm @@ -22,7 +22,13 @@ -- Copyright 2018 Ycarus (Yannick Chabanois) ycarus@zugaina.org -- -- Small changes to make this work with OpenMPTCProuter --- New features: DNS detection, IPv6 route received,... +-- New features: +-- * DNS detection +-- * IPv6 route received +-- * latest version available +-- * MPTCP server status +-- * Server status, errors,icon,... +-- * Many tests -%> <%+header%> @@ -37,35 +43,45 @@ { mArray.openmptcprouter.wan_addr=replaceLastNChars(mArray.openmptcprouter.wan_addr,"x",6); mArray.openmptcprouter.wan_addr6=replaceLastNChars(mArray.openmptcprouter.wan_addr6,"x",10); + mArray.openmptcprouter.service_addr=replaceLastNChars(mArray.openmptcprouter.service_addr,"x",6); } var status = document.getElementById('openmptcprouter_status'); - var stepbar = false; var temp = '
'; temp += ''; // Close tree temp += ''; temp += '
'; @@ -361,18 +395,18 @@ function getNetworkNodeTemplate(equipmentIcon, statusIcon, title, statusMessageClass, statusMessage, content) { - return String.format( '
' + - '
%s
' + - '
' + - '
' + - '
%s
' + - '
%s
' + - '
%s
' + - '
' + - '
' + - '
' + - '
', - equipmentIcon, statusIcon, title, statusMessageClass, statusMessage, content); + return String.format('
' + + '
%s
' + + '
' + + '
' + + '
%s
' + + '
%s
' + + '
%s
' + + '
' + + '
' + + '
' + + '
', + equipmentIcon, statusIcon, title, statusMessageClass, statusMessage, content); } function stringToColour(str) { diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm index dfa977e38..281bc7086 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm @@ -33,13 +33,22 @@ end %> - + + <% if stderr and #stderr > 0 then %>
<%=pcdata(stderr)%>
<% end %>

<%:Wizard%>

- <%:Server settings%> + <%:Server settings%>
<%:Put the values given by OpenMPTCProuter VPS script.%>
@@ -66,16 +75,58 @@ end

+
+ +
+ checked<% end %> /> +
+
+ <%:You should disable IPv6 here if server doesn't provide IPv6.%> +
+
+
+
+
+ +
+ " data-type="base64"> +
+
+ <%:Key to configure and retrieve others keys from OpenMPTCProuter VPS. Empty to disable.%> +
+
+
+
+ +
+ +
+
+
+
<%:Interfaces settings%>
<%:You must disable DHCP on your modems and set IP in different networks.%>
@@ -155,26 +197,40 @@ end

<%=ifname%>

-
+
+ +
+ +
+
+ <%:You can use DHCP if you have multiple real ethernet ports. Select other if you want to use another protocol available in Network Interfaces page.%> +
+
+
+
- " data-type="ip4addr"> + " data-type="ip4addr">
<%:Set an IP in the same network as the modem%>
-
+
- " data-type="ip4addr"> + " data-type="ip4addr">
-
+
- " data-type="ip4addr"> + " data-type="ip4addr">
<%:Set here IP of the modem%> @@ -192,7 +248,7 @@ end upload = uci:get("qos",ifname,"upload") end %> -
+
@@ -202,7 +258,7 @@ end
-
+
diff --git a/luci-app-openmptcprouter/po/fr/openmptcprouter.po b/luci-app-openmptcprouter/po/fr/openmptcprouter.po index ee9fc352a..430d9d6ba 100644 --- a/luci-app-openmptcprouter/po/fr/openmptcprouter.po +++ b/luci-app-openmptcprouter/po/fr/openmptcprouter.po @@ -18,6 +18,15 @@ msgstr "Ajouter une interface" msgid "Advanced Settings" msgstr "Configuration avancé" +msgid "Advanced settings" +msgstr "Configuration avancé" + +msgid "By default ShadowSocks is used for TCP traffic." +msgstr "ShadowSocks est utilisé pour le trafic TCP." + +msgid "By default VPN is used for any traffic that is not TCP." +msgstr "Par défaut le VPN est utilisé pour le trafic n'étant pas du TCP." + msgid "Check if MPTCP between interface and server is working." msgstr "Vérifie le fonctionnement de MPTCP entre l'interface et le serveur." @@ -25,6 +34,9 @@ msgid "Connection with lowest RTT is used as master interface" msgstr "" "La connexion avec le plus faible RTT est utilisé en temps qu'interface maître" +msgid "DHCP" +msgstr "" + msgid "Default VPN" msgstr "VPN par défaut" @@ -34,6 +46,9 @@ msgstr "Supprimer" msgid "Disable IPv6" msgstr "Désactiver IPv6" +msgid "Disable ShadowSocks" +msgstr "Désactiver ShadowSocks" + msgid "Download speed (Kb/s)" msgstr "Vitesse de téléchargement (Kb/s)" @@ -76,6 +91,13 @@ msgstr "Nom de l'interface" msgid "Interfaces settings" msgstr "Paramètres des interfaces" +msgid "" +"Key to configure and retrieve others keys from OpenMPTCProuter VPS. Empty to " +"disable." +msgstr "" +"Clef pour configurer et récupérer les autres clefs depuis OpenMPTCProuter " +"VPS. Vide pour désactiver." + msgid "Loading" msgstr "Chargement" @@ -100,18 +122,30 @@ msgstr "Aperçu réseau" msgid "Networks settings" msgstr "Paramètres réseaux" -msgid "OBFS must be enabled on VPS" -msgstr "OBFS doit être activé sur le VPS" +msgid "OBFS will be enabled on both side" +msgstr "OBFS sera activé des deux côtés" msgid "OpenMPTCProuter" msgstr "" +msgid "OpenMPTCProuter VPS key" +msgstr "Clef d'OpenMPTCProuter VPS" + msgid "OpenVPN key" msgstr "Clef OpenVPN" +msgid "Other" +msgstr "Autre" + +msgid "Protocol" +msgstr "Protocole" + msgid "Put the values given by OpenMPTCProuter VPS script." msgstr "Mettez les valeurs données par le script OpenMPTCProuter VPS." +msgid "Redirects all ports from VPS to OpenMPTCProuter" +msgstr "Rédiriger tous les ports du VPS vers OpenMPTCProuter" + msgid "Save & Apply" msgstr "Sauvegarder et Appliquer" @@ -160,12 +194,18 @@ msgstr "Paramètres" msgid "Settings Wizard" msgstr "Assistant de configuration" -msgid "ShadowSocks is used for TCP. Empty to disable." -msgstr "ShadowSocks est utilisé pour le TCP. Videz pour désactiver." +msgid "ShadowSocks is used for TCP." +msgstr "ShadowSocks est utilisé pour le TCP." msgid "ShadowSocks key" msgstr "Clef de ShadowSocks" +msgid "ShadowSocks settings" +msgstr "Paramètres de ShadowSocks" + +msgid "Static address" +msgstr "Adresse statique" + msgid "Status" msgstr "État" @@ -178,12 +218,26 @@ msgstr "Teste" msgid "Upload speed (Kb/s)" msgstr "Vitesse d'envoi (Kb/s)" +msgid "VPN settings" +msgstr "Paramètres du VPN" + +msgid "VPS settings" +msgstr "Paramètres du VPS" + msgid "Waiting for command to complete..." msgstr "En attente de la réponse de la commande..." msgid "Wizard" msgstr "Assistant" +msgid "" +"You can use DHCP if you have multiple real ethernet ports. Select other if " +"you want to use another protocol available in Network Interfaces page." +msgstr "" +"Vous pouvez utiliser DHCP si vous avez plusieurs ports réseau physique. " +"Choisissez autre si vous utilisez un autre protocole dans la page Réseau " +"Interfaces." + msgid "You must disable DHCP on your modems and set IP in different networks." msgstr "" "Vous devez désactiver DHCP sur vos modems et configurer leurs IP dans des " @@ -199,6 +253,12 @@ msgstr "" msgid "You should disable IPv6 here if server doesn't provide IPv6." msgstr "Vous devriez désactiver IPv6 ici si le serveur ne supporte pas IPv6." +#~ msgid "OBFS must be enabled on VPS" +#~ msgstr "OBFS doit être activé sur le VPS" + +#~ msgid "ShadowSocks is used for TCP. Empty to disable." +#~ msgstr "ShadowSocks est utilisé pour le TCP. Videz pour désactiver." + #~ msgid "" #~ "Set value between 80-95% of max download speed link. Empty to disable." #~ msgstr "" diff --git a/luci-app-openmptcprouter/po/templates/openmptcprouter.pot b/luci-app-openmptcprouter/po/templates/openmptcprouter.pot index 39eff773a..6a785d669 100644 --- a/luci-app-openmptcprouter/po/templates/openmptcprouter.pot +++ b/luci-app-openmptcprouter/po/templates/openmptcprouter.pot @@ -7,12 +7,24 @@ msgstr "" msgid "Advanced Settings" msgstr "" +msgid "Advanced settings" +msgstr "" + +msgid "By default ShadowSocks is used for TCP traffic." +msgstr "" + +msgid "By default VPN is used for any traffic that is not TCP." +msgstr "" + msgid "Check if MPTCP between interface and server is working." msgstr "" msgid "Connection with lowest RTT is used as master interface" msgstr "" +msgid "DHCP" +msgstr "" + msgid "Default VPN" msgstr "" @@ -22,6 +34,9 @@ msgstr "" msgid "Disable IPv6" msgstr "" +msgid "Disable ShadowSocks" +msgstr "" + msgid "Download speed (Kb/s)" msgstr "" @@ -64,6 +79,11 @@ msgstr "" msgid "Interfaces settings" msgstr "" +msgid "" +"Key to configure and retrieve others keys from OpenMPTCProuter VPS. Empty to " +"disable." +msgstr "" + msgid "Loading" msgstr "" @@ -88,18 +108,30 @@ msgstr "" msgid "Networks settings" msgstr "" -msgid "OBFS must be enabled on VPS" +msgid "OBFS will be enabled on both side" msgstr "" msgid "OpenMPTCProuter" msgstr "" +msgid "OpenMPTCProuter VPS key" +msgstr "" + msgid "OpenVPN key" msgstr "" +msgid "Other" +msgstr "" + +msgid "Protocol" +msgstr "" + msgid "Put the values given by OpenMPTCProuter VPS script." msgstr "" +msgid "Redirects all ports from VPS to OpenMPTCProuter" +msgstr "" + msgid "Save & Apply" msgstr "" @@ -141,12 +173,18 @@ msgstr "" msgid "Settings Wizard" msgstr "" -msgid "ShadowSocks is used for TCP. Empty to disable." +msgid "ShadowSocks is used for TCP." msgstr "" msgid "ShadowSocks key" msgstr "" +msgid "ShadowSocks settings" +msgstr "" + +msgid "Static address" +msgstr "" + msgid "Status" msgstr "" @@ -159,12 +197,23 @@ msgstr "" msgid "Upload speed (Kb/s)" msgstr "" +msgid "VPN settings" +msgstr "" + +msgid "VPS settings" +msgstr "" + msgid "Waiting for command to complete..." msgstr "" msgid "Wizard" msgstr "" +msgid "" +"You can use DHCP if you have multiple real ethernet ports. Select other if " +"you want to use another protocol available in Network Interfaces page." +msgstr "" + msgid "You must disable DHCP on your modems and set IP in different networks." msgstr "" diff --git a/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter b/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter index 5db7f8561..e5ec7edf6 100755 --- a/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter +++ b/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter @@ -1,4 +1,6 @@ #!/bin/sh /etc/rc.common +# Copyright (C) 2018 Ycarus (Yannick Chabanois) +# Released under GPL 3. See LICENSE for the full terms. START=5 @@ -38,17 +40,17 @@ set_ipv6_state() { uci -q set shadowsocks-libev.hi.local_address="::" fi uci -q commit dhcp - if [ "$disable_ipv6" == "1" ]; then - /etc/init.d/odhcpd stop >/dev/null 2>&1 - /etc/init.d/odhcpd disable >/dev/null 2>&1 - fi + #if [ "$disable_ipv6" == "1" ]; then + # /etc/init.d/odhcpd stop >/dev/null 2>&1 + # /etc/init.d/odhcpd disable >/dev/null 2>&1 + #fi } start_service() { local scaling_min_freq scaling_max_freq - config_load openmptcprouter - config_foreach omr_intf_del interface + #config_load openmptcprouter + #config_foreach omr_intf_del interface config_load network config_foreach omr_intf_set interface diff --git a/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter b/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter index da97255f6..dcd2daca8 100755 --- a/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter +++ b/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter @@ -27,9 +27,9 @@ if [ "$(uci -q ucitrack.@network[-1].affects | grep openmptcprouter)" = "" ]; th commit ucitrack EOF fi -if [ "$(uci -q get openmptcprouter.vps)" = "" ]; then +if [ "$(uci -q get openmptcprouter.vps)" != "server" ]; then uci -q batch <<-EOF - set openmptcprouter.vps=vps + set openmptcprouter.vps=server commit openmptcprouter EOF fi