diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2016-08-10 15:42:58 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2016-08-10 15:42:58 +0000 |
| commit | 9edd4f964597835e18aac743ae249fcfdc513842 (patch) | |
| tree | fc36f5b5164d684980ebeaf5b8143c59da37b788 | |
| parent | dbdc3e5e4d82f4afb56bd90047182ecbb1fdd170 (diff) | |
| download | acf-ipsec-tools-9edd4f964597835e18aac743ae249fcfdc513842.tar.bz2 acf-ipsec-tools-9edd4f964597835e18aac743ae249fcfdc513842.tar.xz | |
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | ipsectools-details-html.lsp | 4 | ||||
| -rw-r--r-- | ipsectools-expert-html.lsp | 2 | ||||
| -rw-r--r-- | ipsectools-model.lua | 4 |
4 files changed, 6 insertions, 6 deletions
@@ -8,7 +8,7 @@ APP_DIST=\ EXTRA_DIST=README Makefile config.mk -DISTFILES=$(APP_DIST) $(EXTRA_DIST) +DISTFILES=$(APP_DIST) $(EXTRA_DIST) TAR=tar diff --git a/ipsectools-details-html.lsp b/ipsectools-details-html.lsp index 0c3d2ff..84d900a 100644 --- a/ipsectools-details-html.lsp +++ b/ipsectools-details-html.lsp @@ -1,4 +1,4 @@ -<% local data, viewlibrary, page_info, session = ... +<% local data, viewlibrary, page_info, session = ... htmlviewfunctions = require("htmlviewfunctions") html = require("acf.html") %> @@ -17,7 +17,7 @@ else io.write("<table>\n") local tags = {"Created","Source","Destination", "St", "Phase2details"} for j,tag in pairs(tags) do - io.write("<tr><td style='font-weight:bold;width:120px;border:none;'>" .. + io.write("<tr><td style='font-weight:bold;width:120px;border:none;'>" .. html.html_escape(entry[tag].label) .. "</td><td style='border:none;'>"..string.gsub(html.html_escape(entry[tag].value), "\n", "<br/>")) if (entry[tag].descr) and (#entry[tag].descr > 0) then io.write(" (".. html.html_escape(entry[tag].descr) .. ")") end io.write("</td></tr>") diff --git a/ipsectools-expert-html.lsp b/ipsectools-expert-html.lsp index 08b08c1..0fc126c 100644 --- a/ipsectools-expert-html.lsp +++ b/ipsectools-expert-html.lsp @@ -3,7 +3,7 @@ <% htmlviewfunctions.displaycommandresults({"editracoon", "editipsec"}, session, true) %> -<% +<% viewlibrary.dispatch_component("status") viewlibrary.dispatch_component("editracoon") viewlibrary.dispatch_component("editipsec") diff --git a/ipsectools-model.lua b/ipsectools-model.lua index cab37ec..319cd73 100644 --- a/ipsectools-model.lua +++ b/ipsectools-model.lua @@ -39,7 +39,7 @@ local function racoonctl_table() local value = modelfunctions.run_executable({"ip", "xfrm", "state"}) -- Get rid of all lines that don't start with "src" local phase2details = string.gsub(value, "\n[^s][^\n]*", "") - + value = modelfunctions.run_executable({"racoonctl", "-lll", "show-sa", "isakmp"}) for i,line in pairs(format.string_to_table(value,"\n")) do if not ((string.find(line,"^Source")) or (#line == 0)) then @@ -113,7 +113,7 @@ end function mymodule.get_startstop(self, clientdata) return modelfunctions.get_startstop(processname) end - + function mymodule.startstop_service(self, startstop, action) return modelfunctions.startstop_service(startstop, action) end |