diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | opennhrp-editinterface-html.lsp | 4 | ||||
| -rw-r--r-- | opennhrp-listinterfaces-html.lsp | 2 | ||||
| -rw-r--r-- | opennhrp-model.lua | 12 | ||||
| -rw-r--r-- | opennhrp-show-html.lsp | 2 |
5 files changed, 11 insertions, 11 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/opennhrp-editinterface-html.lsp b/opennhrp-editinterface-html.lsp index 0872e4a..25b1a0f 100644 --- a/opennhrp-editinterface-html.lsp +++ b/opennhrp-editinterface-html.lsp @@ -1,4 +1,4 @@ -<% local form, viewlibrary, page_info, session = ... +<% local form, viewlibrary, page_info, session = ... htmlviewfunctions = require("htmlviewfunctions") html = require("acf.html") %> @@ -8,7 +8,7 @@ html = require("acf.html") document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>'); } </script> - + <script type="text/javascript"> function enabledisable(){ if ($("#type").val() == "NHRP Enabled") { diff --git a/opennhrp-listinterfaces-html.lsp b/opennhrp-listinterfaces-html.lsp index 68ad0c6..8918d2d 100644 --- a/opennhrp-listinterfaces-html.lsp +++ b/opennhrp-listinterfaces-html.lsp @@ -1,4 +1,4 @@ -<% local view, viewlibrary, page_info, session = ... +<% local view, viewlibrary, page_info, session = ... htmlviewfunctions = require("htmlviewfunctions") html = require("acf.html") %> diff --git a/opennhrp-model.lua b/opennhrp-model.lua index 1fa81bd..c179b6a 100644 --- a/opennhrp-model.lua +++ b/opennhrp-model.lua @@ -47,7 +47,7 @@ local function list_interfaces(self) reverseinterfaceslist[int.value.name.value] = #interfaceslist end interfaces:destroy() - end + end return interfaceslist, reverseinterfaceslist end @@ -70,7 +70,7 @@ local function parseconfigfile(configfilecontent) if word == "interface" then i = i+1 currentinterface = words[i] - if config[currentinterface] then + if config[currentinterface] then config[currentinterface].errtxt = "Syntax error - interface defined multiple times" else config[currentinterface] = {} @@ -151,8 +151,8 @@ local function validateinterfacedetails(interfacedetails) for i,map in ipairs(interfacedetails.value.map.value) do local words = {} for word in string.gmatch(map, "%S+") do words[#words+1] = word end - if not words[1] or not words[2] or - (words[3] and words[3] ~= "register" and words[3] ~= "cicso") or + if not words[1] or not words[2] or + (words[3] and words[3] ~= "register" and words[3] ~= "cicso") or (words[4] and words[4] ~= "register" and words[4] ~= "cisco") or words[5] then interfacedetails.value.map.errtxt = "Syntax error on line "..i success = false @@ -184,7 +184,7 @@ function mymodule.get_startstop(self, clientdata) end function mymodule.startstop_service(self, startstop, action) - return modelfunctions.startstop_service(startstop, action) + return modelfunctions.startstop_service(startstop, action) end function mymodule.getstatus() @@ -224,7 +224,7 @@ function mymodule.getinterfacedetails(interface) details.type = cfe({ type="select", value="Unused", label="Interface type", option={"Unused", "NHRP Enabled", "Shortcut Destination"}, seq=2 }) details.map = cfe({ type="list", value={}, label="Static Peers", descr="List of static peer mappings of protocol-address to nbma-address. Optional 'register' parameter specifies Registration Request sent to this peer on startup. If the statically mapped peer is running Cisco IOS, specify the cisco keyword. (protocol-address[/prefix] nbma-address [register] [cisco])", seq=3 }) details["dynamic-map"] = cfe({ type="list", value={}, label="Dynamic Peers", descr="List of dynamic peer mappings of protocol-address to nbma-domain-name. For each A record in the domain nbma-domain-name, opennhrp creates a dynamic NHS entry. (protocol-address/prefix nbma-domain-name)", seq=4 }) - + configfilecontent = configfilecontent or fs.read_file(configfile) or "" config = config or parseconfigfile(configfilecontent) if config and config[interface] then diff --git a/opennhrp-show-html.lsp b/opennhrp-show-html.lsp index 96b4ef2..772c6dd 100644 --- a/opennhrp-show-html.lsp +++ b/opennhrp-show-html.lsp @@ -1,4 +1,4 @@ -<% local data, viewlibrary, page_info = ... +<% local data, viewlibrary, page_info = ... htmlviewfunctions = require("htmlviewfunctions") html = require("acf.html") %> |