X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-app-openvpn%2Fluasrc%2Fmodel%2Fcbi%2Fopenvpn.lua;h=ccad531513c328e2f5491049566a50f7de31fa72;hp=8b2ce5a85a76ce63499a87b9fef5ad5bed2103ea;hb=c0d9c4f3ce7bda19081d0da01a599bec067338a3;hpb=7a3493b1f7d75a3945279115324cf2ff4da26b7b

diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua
index 8b2ce5a85..ccad53151 100644
--- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua
+++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua
@@ -25,6 +25,15 @@ uci:foreach( "openvpn_recipes", "openvpn_recipe",
 	end
 )
 
+function s.getPID(section) -- Universal function which returns valid pid # or nil
+	local pid = sys.exec("%s | grep -w [o]penvpn(%s)" % { psstring, section })
+	if pid and #pid > 0 then
+		return tonumber(pid:match("^%d+"))
+	else
+		return nil
+	end
+end
+
 function s.parse(self, section)
 	local recipe = luci.http.formvalue(
 		luci.cbi.CREATE_PREFIX .. self.config .. "." ..
@@ -68,8 +77,8 @@ s:option( Flag, "enabled", translate("Enabled") )
 
 local active = s:option( DummyValue, "_active", translate("Started") )
 function active.cfgvalue(self, 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
+	local pid = s.getPID(section)
+	if pid ~= nil then
 		return (sys.process.signal(pid, 0))
 			and translatef("yes (%i)", pid)
 			or  translate("no")
@@ -83,8 +92,8 @@ updown.redirect = luci.dispatcher.build_url(
 	"admin", "services", "openvpn"
 )
 function updown.cbid(self, 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)
+	local pid = s.getPID(section)
+	self._state = pid ~= nil and sys.process.signal(pid, 0)
 	self.option = self._state and "stop" or "start"
 	return AbstractValue.cbid(self, section)
 end
@@ -94,8 +103,10 @@ function updown.cfgvalue(self, section)
 end
 function updown.write(self, section, value)
 	if self.option == "stop" then
-		local pid = sys.exec("%s | grep %s | grep openvpn | grep -v grep | awk '{print $1}'" % { psstring,section} )
-		sys.process.signal(pid,15)
+		local pid = s.getPID(section)
+		if pid ~= nil then
+			sys.process.signal(pid,15)
+		end
 	else
 		luci.sys.call("/etc/init.d/openvpn start %s" % section)
 	end