Updated openvpn app to work with current openvpn package

Signed-off-by: Vladimir Ulrich <redacted>

diff --git a/applications/luci-openvpn/luasrc/model/cbi/openvpn-advanced.lua b/applications/luci-openvpn/luasrc/model/cbi/openvpn-advanced.lua
index eee08eb8132cd112a1deb85a3e465c4e74e29bcd..f47af6d2f1a9a9251da365a44ffe4e823820816d 100644 (file)
--- a/applications/luci-openvpn/luasrc/model/cbi/openvpn-advanced.lua
+++ b/applications/luci-openvpn/luasrc/model/cbi/openvpn-advanced.lua
@@ -88,7 +88,7 @@ local knownParams = {
 
                { ListValue,    "mtu_disc",                                             { "yes", "maybe", "no" },                                                                               translate("Enable Path MTU discovery") },
                { Flag,                 "mtu_test",                                             0,                                                                                                                              translate("Empirically measure MTU") },
-               { Flag,                 "comp_lzo",                                             0,                                                                                                                              translate("Use fast LZO compression") },
+               { ListValue,                    "comp_lzo",                             { "yes", "no", "adaptive" },                                                                                                                            translate("Use fast LZO compression") },
                { Flag,                 "comp_noadapt",                                 0,                                                                                                                              translate("Don't use adaptive lzo compression"),        { comp_lzo=1 } },
                { Value,                "link_mtu",                                             1500,                                                                                                                   translate("Set TCP/UDP MTU") },
                { Value,                "tun_mtu",                                              1500,                                                                                                                   translate("Set tun/tap device MTU") },

diff --git a/applications/luci-openvpn/luasrc/model/cbi/openvpn-basic.lua b/applications/luci-openvpn/luasrc/model/cbi/openvpn-basic.lua
index dc1114b6ef2789d29aaa5ce6203e53b70de54d0a..92f7cb569283258b5584cb12744bccd955ac2987 100644 (file)
--- a/applications/luci-openvpn/luasrc/model/cbi/openvpn-basic.lua
+++ b/applications/luci-openvpn/luasrc/model/cbi/openvpn-basic.lua
@@ -32,7 +32,7 @@ local basicParams = {
        { Value,"server_bridge","192.168.1.1 255.255.255.0 192.168.1.128 192.168.1.254", translate("Configure server bridge") },
        { Flag,"nobind",0, translate("Do not bind to local address and port") },
 
-       { Flag,"comp_lzo",0, translate("Use fast LZO compression") },
+       { ListValue,"comp_lzo",{"yes","no","adaptive"}, translate("Use fast LZO compression") },
        { Value,"keepalive","10 60", translate("Helper directive to simplify the expression of --ping and --ping-restart in server mode configurations") },
 
        { ListValue,"proto",{ "udp", "tcp" }, translate("Use protocol") },

diff --git a/applications/luci-openvpn/luasrc/model/cbi/openvpn.lua b/applications/luci-openvpn/luasrc/model/cbi/openvpn.lua
index 0fa60fd0292dd2f6656c6fd168221b2bdbeb869f..2f865e0020bb75b6f9afd0f53ee37cfc4e34fe36 100644 (file)
--- a/applications/luci-openvpn/luasrc/model/cbi/openvpn.lua
+++ b/applications/luci-openvpn/luasrc/model/cbi/openvpn.lua
@@ -15,6 +15,8 @@ $Id$
 local fs  = require "nixio.fs"
 local sys = require "luci.sys"
 local uci = require "luci.model.uci".cursor()
+local testfullps = luci.sys.exec("ps --help 2>&1 | grep BusyBox") --check which ps do we have
+local psstring = (string.len(testfullps)>0) and  "ps w" or  "ps axfw" --set command we use to get pid
 
 local m = Map("openvpn", translate("OpenVPN"))
 local s = m:section( TypedSection, "openvpn", translate("OpenVPN instances"), translate("Below is a list of configured OpenVPN instances and their current state") )
@@ -52,8 +54,11 @@ function s.create(self, name)
                luci.cbi.CREATE_PREFIX .. self.config .. "." ..
                self.sectiontype .. ".select"
        )
-
-       if name and not name:match("[^a-zA-Z0-9_]") then
+       name = luci.http.formvalue(
+               luci.cbi.CREATE_PREFIX .. self.config .. "." ..
+               self.sectiontype .. ".text"
+       )
+       if string.len(name)>3 and not name:match("[^a-zA-Z0-9_]") then
                uci:section(
                        "openvpn", "openvpn", name,
                        uci:get_all( "openvpn_recipes", recipe )
@@ -74,7 +79,7 @@ s:option( Flag, "enabled", translate("Enabled") )
 
 local active = s:option( DummyValue, "_active", translate("Started") )
 function active.cfgvalue(self, section)
-       local pid = fs.readfile("/var/run/openvpn-%s.pid" % section)
+       local pid = sys.exec("%s | grep %s | grep openvpn | grep -v grep | awk '{print $1}'" % { psstring,section} )
        if pid and #pid > 0 and tonumber(pid) ~= nil then
                return (sys.process.signal(pid, 0))
                        and translatef("yes (%i)", pid)
@@ -85,8 +90,11 @@ end
 
 local updown = s:option( Button, "_updown", translate("Start/Stop") )
 updown._state = false
+updown.redirect = luci.dispatcher.build_url(
+       "admin", "services", "openvpn"
+)
 function updown.cbid(self, section)
-       local pid = fs.readfile("/var/run/openvpn-%s.pid" % section)
+       local pid = sys.exec("%s | grep %s | grep openvpn | grep -v grep | awk '{print $1}'" % { psstring,section} )
        self._state = pid and #pid > 0 and sys.process.signal(pid, 0)
        self.option = self._state and "stop" or "start"
        return AbstractValue.cbid(self, section)
@@ -97,12 +105,15 @@ function updown.cfgvalue(self, section)
 end
 function updown.write(self, section, value)
        if self.option == "stop" then
-               luci.sys.call("/etc/init.d/openvpn down %s" % section)
+               local pid = sys.exec("%s | grep %s | grep openvpn | grep -v grep | awk '{print $1}'" % { psstring,section} )
+               sys.process.signal(pid,15)
        else
-               luci.sys.call("/etc/init.d/openvpn up %s" % section)
+               luci.sys.call("/etc/init.d/openvpn start %s" % section)
        end
+       luci.http.redirect( self.redirect )
 end
 
+
 local port = s:option( DummyValue, "port", translate("Port") )
 function port.cfgvalue(self, section)
        local val = AbstractValue.cfgvalue(self, section)

diff --git a/applications/luci-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm b/applications/luci-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm
index cedac51e42a9637207dd571443927bc00cfbdad8..0166de778e4c3d984dfd994a0c8f40a4a7b01b88 100644 (file)
--- a/applications/luci-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm
+++ b/applications/luci-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm
@@ -1,6 +1,6 @@
 <div class="cbi-section-create">
        <% if self.invalid_cts then -%><div class="cbi-section-error"><% end %>
-       <input type="text" class="cbi-section-create-name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" />
+       <input type="text" class="cbi-section-create-name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.text" />
        <select class="cbi-section-create-name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.select">
        <%- for k, v in luci.util.kspairs(self.add_select_options) do %>
                <option value="<%=k%>"><%=luci.util.pcdata(v)%></option>

diff --git a/applications/luci-openvpn/root/etc/config/openvpn_recipes b/applications/luci-openvpn/root/etc/config/openvpn_recipes
index 50e328af5b9f8d7840a8d17279cfa51f2a08e4bb..1b394dffbc19984565f33366b0cbe9b5c2d3663d 100644 (file)
--- a/applications/luci-openvpn/root/etc/config/openvpn_recipes
+++ b/applications/luci-openvpn/root/etc/config/openvpn_recipes
@@ -8,10 +8,9 @@ config openvpn_recipe server_tun_ptp
        option ifconfig                 "10.0.0.1 10.0.0.2"
        option secret                   "shared-secret.key"
        option keepalive                "10 60"
-       option comp_lzo                 "1"
+       option comp_lzo                 "yes"
        option verb                     "3"
         option mssfix                  "1420"
-       option management               "127.0.0.1 31194"
 
 #
 # Routed point-to-point client
@@ -24,9 +23,8 @@ config openvpn_recipe client_tun_ptp
        option ifconfig                 "10.0.0.2 10.0.0.1"
        option secret                   "shared-secret.key"
        option nobind                   "1"
-       option comp_lzo                 "1"
+       option comp_lzo                 "yes"
        option verb                     "3"
-       option management               "127.0.0.1 31194"
 
 #
 # Routed multi-client server
@@ -41,10 +39,9 @@ config openvpn_recipe server_tun
        option key                      "server.key"
        option dh                       "dh1024.pem"
        option keepalive                "10 60"
-       option comp_lzo                 "1"
+       option comp_lzo                 "yes"
        option verb                     "3"
         option mssfix                  "1420"
-       option management               "127.0.0.1 31194"
 
 #
 # Routed client
@@ -57,14 +54,13 @@ config openvpn_recipe client_tun
        list   remote                   "vpnserver.example.org"
        option pkcs12                   "my_client.p12"
        option remote_cert_tls          "server"
-       option comp_lzo                 "1"
+       option comp_lzo                 "yes"
        option nobind                   "1"
        option persist_key              "1"
        option persist_tun              "1"
        option verb                     "3"
        option reneg_sec                "0"
        option float                    "1"
-       option management               "127.0.0.1 31194"
 
 #
 # Multi-client ethernet bridge server
@@ -79,10 +75,9 @@ config openvpn_recipe server_tap_bridge
        option key                      "server.key"
        option dh                       "dh1024.pem"
        option keepalive                "10 60"
-       option comp_lzo                 "1"
+       option comp_lzo                 "yes"
        option verb                     "3"
         option mssfix                  "1420"
-       option management               "127.0.0.1 31194"
 
 #
 # Ethernet bridge client
@@ -98,10 +93,10 @@ config openvpn_recipe client_tap_bridge
        option key                      "my_client.key"
        option dh                       "dh1024.pem"
        option remote_cert_tls          "server"
-       option comp_lzo                 "1"
+       option comp_lzo                 "yes"
        option nobind                   "1"
        option persist_key              "1"
        option verb                     "3"
        option reneg_sec                "0"
        option float                    "1"
-       option management               "127.0.0.1 31194"
+

diff --git a/contrib/package/luci-addons/Makefile b/contrib/package/luci-addons/Makefile
index 0838ed07ead442f0e253fab9dc5d69c28b0c6d6c..ac31b639e801582cd54beeab5cd7be157a4daa13 100644 (file)
--- a/contrib/package/luci-addons/Makefile
+++ b/contrib/package/luci-addons/Makefile
@@ -181,7 +181,7 @@ $(eval $(call application,ushare,uShare - UPnP A/V & DLNA Media Server,ushare))
 $(eval $(call application,hd-idle,Hard Disk Idle Spin-Down module,hd-idle))
 $(eval $(call application,tinyproxy,Tinyproxy - HTTP(S)-Proxy configuration,tinyproxy))
 $(eval $(call application,polipo,LuCI Support for the Polipo Proxy,polipo))
-$(eval $(call application,openvpn,LuCI Support for OpenVPN,openvpn @BROKEN))
+$(eval $(call application,openvpn,LuCI Support for OpenVPN,openvpn))
 $(eval $(call application,p2pblock,LuCI Support for the Freifunk P2P-Block addon,luci-app-firewall freifunk-p2pblock))
 $(eval $(call application,multiwan,LuCI Support for the OpenWrt MultiWAN agent,luci-app-firewall multiwan))
 $(eval $(call application,wol,LuCI Support for Wake-on-LAN,etherwake))