View.read got some functionallity, like displaying programversion

git-svn-id: svn://svn.alpinelinux.org/acf/openvpn/trunk@345 ab2d0c66-481e-0410-8bed-d214d4d58bed

1 files changed, 40 insertions, 12 deletions

diff --git a/openvpn-model.lua b/openvpn-model.lua
index 2ef36d5..5d17dbb 100644
--- a/openvpn-model.lua
+++ b/openvpn-model.lua
@@ -21,21 +21,42 @@ local function read_file_as_array ( path )
 	return f
 end
 
+local function is_cmdline(path, name)
+	local f = io.open(path.."/cmdline")
+	if f == nil then
+		return false
+	end
+	local line = f:read()
+	f:close()
+	if line == nil then 
+		return false
+	end
+	local arg0 = string.gsub(line, string.char(0)..".*", "")
+	return posix.basename(arg0) == name
+end
+
+
+
+
 
 local is_running = function( process, parameters )
-	local retval = false
-	local pidofs = io.popen("pidof " .. process)
-	if pidofs ~= nil then
-	require ("pidof")
-	for k,v in pairs(pidof.pidof(process)) do
---	for pidof in split(pidofs) do
-		local file = io.open( "/proc/" .. v .. "/cmdline" )
-		local file_result = file:read("*a") or "unknown"
-		file:close()
-		retval = file_result
-	end
+	strsplit = require("split")
+	local retval = nil
+	local pidofsx,error = io.popen("pidof " .. process ,r)
+	local pidofs = strsplit(" ", pidofsx:read("*a"))
+	pidofsx:close()
+	if ( pidofs ~= nil ) then
+		for k,v in pairs(pidofs) do
+			local path = string.gsub("/proc/".. v .. "/cmdline", "%s", "")
+			local f = io.open(path)
+			local file_resultx = f:read("*a")
+			local file_result = string.match(file_resultx, parameters)
+			f:close()
+			if ( file_result ) then
+				retval = "Running"
+			end
+		end
 	end
-	
 	return retval
 end
 
@@ -121,6 +142,13 @@ end
 
 -- ################################################################################
 -- PUBLIC FUNCTIONS
+function openvpn_version()
+	local f,error = io.popen("/usr/sbin/openvpn --version")
+	openvpnversion = f:read("*l")
+	f:close()
+	return openvpnversion
+end
+
 function list_conffiles()
 	conlistfiles = {}
 	local files = list_rootfolder()