diff --git a/luci-app-dsvpn/Makefile b/luci-app-dsvpn/Makefile new file mode 100644 index 000000000..2e7237c71 --- /dev/null +++ b/luci-app-dsvpn/Makefile @@ -0,0 +1,15 @@ +# +# Copyright (C) 2018-2019 Ycarus (Yannick Chabanois) for OpenMPTCProuter +# +# + +include $(TOPDIR)/rules.mk + +LUCI_TITLE:=LuCI Support for DSVPN +LUCI_DEPENDS:=+dsvpn + +PKG_LICENSE:=GPLv3 + +include ../luci/luci.mk + +# call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-dsvpn/luasrc/controller/dsvpn.lua b/luci-app-dsvpn/luasrc/controller/dsvpn.lua new file mode 100644 index 000000000..8476e4767 --- /dev/null +++ b/luci-app-dsvpn/luasrc/controller/dsvpn.lua @@ -0,0 +1,7 @@ +module("luci.controller.dsvpn", package.seeall) + +function index() + --entry({"admin", "openmptcprouter", "mlvpn"}, cbi("mlvpn"), _("MLVPN")) + --entry({"admin", "services", "dsvpn"}, cbi("dsvpn"), _("DSVPN")) + entry({"admin", "vpn", "dsvpn"}, cbi("dsvpn"), _("DSVPN")) +end diff --git a/luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua b/luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua new file mode 100644 index 000000000..f3716d3c8 --- /dev/null +++ b/luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua @@ -0,0 +1,44 @@ +local net = require "luci.model.network".init() +local sys = require "luci.sys" +local ifaces = sys.net:devices() +local m, s, o + +m = Map("dsvpn", translate("DSVPN")) + +s = m:section(TypedSection, "dsvpn", translate("Settings")) +s.anonymous = true +s.addremove = false + +o = s:option(Flag, "enable", translate("Enable")) +o.rmempty = false + +o = s:option(Value, "host", translate("Remote host")) +o.placeholder = "128.128.128.128" +o.default = "128.128.128.128" +o.datatype = "host" +o.rmempty = false + +o = s:option(Value, "port", translate("Remote/Bind port")) +o.placeholder = "65011" +o.default = "65011" +o.datatype = "port" + +o = s:option(Value, "key", translate("Key")) +o.password = true +o.rmempty = false + + +o = s:option(Value, "localip", translate("Local IP"),translate("Tunnel local IP")) +o.default = "10.255.251.2" +o.datatype = "host" + +o = s:option(Value, "remoteip", translate("Remote IP"),translate("Tunnel remote IP")) +o.default = "10.255.251.1" +o.datatype = "host" + +o = s:option(Value, "dev", translate("Interface name")) +o.placeholder = "tun0" +o.default = "tun0" +o.rmempty = false + +return m diff --git a/luci-app-dsvpn/po/fr/mlvpn.po b/luci-app-dsvpn/po/fr/mlvpn.po new file mode 100644 index 000000000..36e5e89ab --- /dev/null +++ b/luci-app-dsvpn/po/fr/mlvpn.po @@ -0,0 +1,61 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.0.6\n" +"Last-Translator: Ycarus \n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Language: fr\n" + +msgid "Add" +msgstr "Ajouter" + +msgid "Enable" +msgstr "Activé" + +msgid "First remote port" +msgstr "Premier port distant" + +msgid "Interface name" +msgstr "Nom de l'interface" + +msgid "Interface will increase port used beginning with this" +msgstr "" + +msgid "Interfaces" +msgstr "Interfaces" + +msgid "Invalid" +msgstr "Invalide" + +msgid "Loss tolerance" +msgstr "" + +msgid "MLVPN" +msgstr "" + +msgid "Mode" +msgstr "" + +msgid "Password" +msgstr "Mot de passe" + +msgid "Remote host" +msgstr "Nom de l'hôte distant ou adresse IP" + +msgid "Remote/Bind port" +msgstr "Port de connexion distant" + +msgid "Reorder buffer size" +msgstr "" + +msgid "Settings" +msgstr "Paramètres" + +msgid "Timeout (s)" +msgstr "Délais d'attente (s)" diff --git a/luci-app-dsvpn/po/templates/mlvpn.pot b/luci-app-dsvpn/po/templates/mlvpn.pot new file mode 100644 index 000000000..0eecd2f65 --- /dev/null +++ b/luci-app-dsvpn/po/templates/mlvpn.pot @@ -0,0 +1,50 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8" + +msgid "Add" +msgstr "" + +msgid "Enable" +msgstr "" + +msgid "First remote port" +msgstr "" + +msgid "Interface name" +msgstr "" + +msgid "Interface will increase port used beginning with this" +msgstr "" + +msgid "Interfaces" +msgstr "" + +msgid "Invalid" +msgstr "" + +msgid "Loss tolerance" +msgstr "" + +msgid "MLVPN" +msgstr "" + +msgid "Mode" +msgstr "" + +msgid "Password" +msgstr "" + +msgid "Remote host" +msgstr "" + +msgid "Remote/Bind port" +msgstr "" + +msgid "Reorder buffer size" +msgstr "" + +msgid "Settings" +msgstr "" + +msgid "Timeout (s)" +msgstr "" diff --git a/luci-app-glorytun/luasrc/controller/glorytun.lua b/luci-app-glorytun/luasrc/controller/glorytun.lua index 8624e1adc..c9917bb74 100644 --- a/luci-app-glorytun/luasrc/controller/glorytun.lua +++ b/luci-app-glorytun/luasrc/controller/glorytun.lua @@ -1,4 +1,4 @@ --- Copyright 2018 Ycarus (Yannick Chabanois) +-- Copyright 2018 - 2019 Ycarus (Yannick Chabanois) -- Licensed to the public under the Apache License 2.0. module("luci.controller.glorytun", package.seeall) @@ -7,6 +7,8 @@ function index() if not nixio.fs.access("/etc/config/glorytun") then return end - entry({"admin", "services", "glorytun"}, cbi("glorytun"), _("Glorytun") ) - entry({"admin", "services", "glorytun", "settings"}, cbi("glorytun-settings"), nil ).leaf = true + --entry({"admin", "services", "glorytun"}, cbi("glorytun"), _("Glorytun") ) + --entry({"admin", "services", "glorytun", "settings"}, cbi("glorytun-settings"), nil ).leaf = true + entry({"admin", "vpn", "glorytun"}, cbi("glorytun"), _("Glorytun") ) + entry({"admin", "vpn", "glorytun", "settings"}, cbi("glorytun-settings"), nil ).leaf = true end diff --git a/luci-app-mlvpn/luasrc/controller/mlvpn.lua b/luci-app-mlvpn/luasrc/controller/mlvpn.lua index aefd8c027..b62f60476 100644 --- a/luci-app-mlvpn/luasrc/controller/mlvpn.lua +++ b/luci-app-mlvpn/luasrc/controller/mlvpn.lua @@ -2,5 +2,6 @@ module("luci.controller.mlvpn", package.seeall) function index() --entry({"admin", "openmptcprouter", "mlvpn"}, cbi("mlvpn"), _("MLVPN")) - entry({"admin", "services", "mlvpn"}, cbi("mlvpn"), _("MLVPN")) + --entry({"admin", "services", "mlvpn"}, cbi("mlvpn"), _("MLVPN")) + entry({"admin", "dsvpn", "mlvpn"}, cbi("mlvpn"), _("MLVPN")) end diff --git a/openmptcprouter-full/Makefile b/openmptcprouter-full/Makefile index 821b9ee40..ca644b470 100644 --- a/openmptcprouter-full/Makefile +++ b/openmptcprouter-full/Makefile @@ -17,7 +17,7 @@ MY_DEPENDS := \ mptcp \ unbound-daemon unbound-control \ netifd \ - dsvpn \ + luci-app-dsvpn \ mc \ f2fs-tools \ openmptcprouter \