Cleaning up code.

git-svn-id: svn://svn.alpinelinux.org/acf/ipsec-tools/trunk@957 ab2d0c66-481e-0410-8bed-d214d4d58bed

1 files changed, 13 insertions, 31 deletions

diff --git a/ipsectools-model.lua b/ipsectools-model.lua
index d46f476..49f259b 100644
--- a/ipsectools-model.lua
+++ b/ipsectools-model.lua
@@ -1,16 +1,19 @@
 module(..., package.seeall)
 
+-- Load libraries
 require("fs")
 require("procps")
 require("getopts")
 require("format")
 require("daemoncontrol")
 require("validator")
+require("processinfo")
 
+-- Set variables
 local configfile = "/etc/racoon/racoon.conf"
 local configfile2 = "/etc/ipsec.conf"
 local processname = "racoon"
-local pkgname = "ipsec-tools"
+local packagename = "ipsec-tools"
 local baseurl = "/etc/racoon/"
 
 local descr = {
@@ -28,34 +31,9 @@ local descr = {
 	},
 
 }
-local function get_version()
-	local cmd_output_result, cmd_output_error
-	local cmd = "/sbin/apk_version -vs " .. pkgname .." 2>/dev/null"
-	local f = io.popen( cmd )
-	local cmdresult = f:read("*l")
-	if (cmdresult) and (#cmdresult > 0) then
-		cmd_output_result = string.match(cmdresult,"^%S*") or "Unknown"
-	else
-		cmd_output_error = "Program not installed"
-	end	
-	f:close()
-	return cmd_output_result,cmd_output_error
-end
 
-local function autostarts()
-	local cmd_output_result
-	local cmd = "/sbin/rc_status | egrep '^S' | egrep '" .. processname .."' 2>/dev/null"
-	local f = io.popen( cmd )
-	local cmdresult = f:read("*a")
-	if (cmdresult) and (#cmdresult > 0) then
-		cmd_output_result = "Process will autostart at next boot (at sequence '" .. string.match(cmdresult,"^%a+(%d%d)") .. "')"
-	else
-		cmd_output_error = "Not programmed to autostart"
-	end	
-	f:close()
-	return cmd_output_result
-
-end
+-- ################################################################################
+-- LOCAL FUNCTIONS
 
 local function ip_xfrm(mode)
 	local cmd_output_result
@@ -156,21 +134,25 @@ function startstop_service ( self, action )
 	local cmdresult,cmdmessage,cmderror,cmdaction = daemoncontrol.daemoncontrol(processname, cmd)
 	action.descr=cmdmessage
 	action.errtxt=cmderror
-	-- Reporting back (true|false, the original acition)
 	return cmdresult,action
 end
 
 function getstatus()
 	local status = {}
+
+	local value, errtxt = processinfo.package_version(packagename)
 	status.version = cfe({ name = "version",
 		label="Program version",
-		value=get_version(),
+		value=value,
+		errtxt=errtxt,
 		 })
+
 	status.status = cfe({ name="status",
 		label="Program status",
 		value=process_status_text(processname),
 		})
-	local autostart_sequense, autostart_errtxt = autostarts()
+
+	local autostart_sequense, autostart_errtxt = processinfo.process_botsequence(processname)
 	status.autostart = cfe({ name="autostart",
 		label="Autostart sequence",
 		value=autostart_sequense,