diff options
author | Ted Trask <ttrask01@yahoo.com> | 2008-07-02 15:08:15 +0000 |
---|---|---|
committer | Ted Trask <ttrask01@yahoo.com> | 2008-07-02 15:08:15 +0000 |
commit | f2137fec9261e79f89ea2877e40bed72c3c70808 (patch) | |
tree | 59c64a5335976c5eba04c2746b734b947077922e /opennhrp-model.lua | |
parent | d00a84674c3d2e4d6b2b6ad870dbed7515a62678 (diff) | |
download | acf-opennhrp-f2137fec9261e79f89ea2877e40bed72c3c70808.tar.bz2 acf-opennhrp-f2137fec9261e79f89ea2877e40bed72c3c70808.tar.xz |
Started modifying opennhrp to simplify, use new cfes, ...
git-svn-id: svn://svn.alpinelinux.org/acf/opennhrp/trunk@1265 ab2d0c66-481e-0410-8bed-d214d4d58bed
Diffstat (limited to 'opennhrp-model.lua')
-rw-r--r-- | opennhrp-model.lua | 174 |
1 files changed, 34 insertions, 140 deletions
diff --git a/opennhrp-model.lua b/opennhrp-model.lua index 278234e..090b541 100644 --- a/opennhrp-model.lua +++ b/opennhrp-model.lua @@ -1,18 +1,15 @@ module(..., package.seeall) -- Load libraries -require("fs") -require("procps") -require("format") -require("daemoncontrol") +require("modelfunctions") require("validator") -require("processinfo") -- Set variables local configfile = "/etc/opennhrp/opennhrp.conf" local processname = "opennhrp" local packagename = "opennhrp" -local baseurl = "/etc/opennhrp/" + +--[[ local descr = { Type = { ['incomplete']="The protocol address is being resolved", @@ -72,154 +69,51 @@ local function opennhrpctl_show() return peers_list,opennhrpstatus,cmd_output_error end - - -function process_status_text(procname) - local t = procps.pidof(procname) - if (t) and (#t > 0) then - return "Enabled" - else - return "Disabled" - end -end +--]] -- ################################################################################ -- PUBLIC FUNCTIONS -function startstop_service ( self, action ) - local cmd = action.value - local cmdresult,cmdmessage,cmderror,cmdaction = daemoncontrol.daemoncontrol(processname, cmd) - action.descr=cmdmessage - action.errtxt=cmderror - return cmdresult,action +function startstop_service(action) + return modelfunctions.startstop_service(processname, action) end function getstatus() - local status = {} - - local value, errtxt = processinfo.package_version(packagename) - status.version = cfe({ name = "version", - label="Program version", - value=value, - errtxt=errtxt, - }) - - status.status = cfe({ name="status", - label="Program status", - value=process_status_text(processname), - }) - - local autostart_sequense, autostart_errtxt = processinfo.process_botsequence(processname) - status.autostart = cfe({ name="autostart", - label="Autostart sequence", - value=autostart_sequense, - errtxt=autostart_errtxt, - }) - - local opennhrpctl_show, opennhrpctl_status = opennhrpctl_show() - status.stats = cfe({ name="stats", - label="Programstatus reports", - value=opennhrpctl_status, - }) - - status.show = cfe({ name="show", - label="Peers", - option=opennhrpctl_show, - }) - - return status + return modelfunctions.getstatus(processname, packagename, "Opennhrp Status") +end + +function getshowreport() + local show = cfe({ type="longtext", label="OpenNHRP show report" }) + local cmd = "/usr/sbin/opennhrpctl show 2>/dev/null" + local f = io.popen( cmd ) + show.value = f:read("*a") or "" + return show end function getconfig() - local config = {} - return config + return cfe({ type="table", value={}, label="Edit Config" }) end -function get_filedetails(self,num) - local path - if (num == "2") then - path = configfile2 - else - path = configfile - end - local file = {} - local filedetails = {} - local config = {} - local filenameerrtxt - if (path) and (fs.is_file(path)) then - filedetails = fs.stat(path) - config = getconfig(path) - else - config = {} - config.filename = {} - config["filename"]["errtxt"]="Config file '".. path .. "' is missing!" - end +function setconfig(config) + return config +end - file["filename" .. (num or "")] = cfe({ - name="filename" .. (num or ""), - label="File name", - value=path, - errtxt=filenameerrtxt - }) - file["filesize" .. (num or "")] = cfe({ - name="filesize" .. (num or ""), - label="File size", - value=filedetails.size or 0, - }) - file["mtime" .. (num or "")] = cfe({ - name="mtime" .. (num or ""), - label="File date", - value=filedetails.mtime or "---", - }) - file["filecontent" .. (num or "")] = cfe({ - type="longtext", - name="filecontent" .. (num or ""), - label="File content", - value=fs.read_file(path), - }) - - -- Sum all errors into one cfe - local sumerrors = "" - for k,v in pairs(config) do - if (config[k]) and (config[k]["errtxt"]) and (config[k]["errtxt"] ~= "") then - sumerrors = sumerrors .. config[k]["errtxt"] .. "\n" - end - end - if (sumerrors ~= "") then - file["sumerrors" .. (num or "")] = cfe ({ - name="sumerrors" .. (num or ""), - label = "Configuration errors", - errtxt = string.match(sumerrors, "(.-)\n$"), - }) - end +function getconfigfile() + local filedetails = modelfunctions.getfiledetails(configfile) + + -- Validate - return file + return filedetails end -function update_filecontent (self, modifications) - local path = configfile - local file_result,err = fs.write_file(path, format.dostounix(modifications)) - return file_result -end -function get_logfile () - local file = {} - local cmdtxt = "grep " .. processname .. " /var/log/messages" - local cmd, error = io.popen(cmdtxt ,r) - local cmdoutput = cmd:read("*a") - cmd:close() - - file["filename"] = cfe({ - name="filename", - label="File name", - value=cmdtxt, - }) - - file["filecontent"] = cfe({ - type="longtext", - name="filecontent", - label="File content", - value=cmdoutput, - }) - - return file +function setconfigfile(filedetails) + -- Validate + --local result, filedetails = validateconfigfile(filedetails) + local result = true + + if result then + fs.write_file(configfile, format.dostounix(filedetails.value.filecontent.value)) + end + + return filedetails end |