summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2008-09-09 20:28:42 +0000
committerTed Trask <ttrask01@yahoo.com>2008-09-09 20:28:42 +0000
commite986a42e901c866aa1eb8b4850495b7c336355a6 (patch)
treedb9e876d78e2720df401aef7301bec5bc57896da
parent7ff51f8f8eeab042b973443bf635ae72ad7651eb (diff)
downloadacf-quagga-e986a42e901c866aa1eb8b4850495b7c336355a6.tar.bz2
acf-quagga-e986a42e901c866aa1eb8b4850495b7c336355a6.tar.xz
Minor clean-up of quaggav0.3.0
git-svn-id: svn://svn.alpinelinux.org/acf/quagga/trunk@1454 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r--bgp-controller.lua3
-rw-r--r--bgp-details-html.lsp2
-rw-r--r--bgp-model.lua7
-rw-r--r--zebra-controller.lua3
-rw-r--r--zebra.roles2
5 files changed, 4 insertions, 13 deletions
diff --git a/bgp-controller.lua b/bgp-controller.lua
index b344230..0938a89 100644
--- a/bgp-controller.lua
+++ b/bgp-controller.lua
@@ -5,9 +5,6 @@ require("controllerfunctions")
default_action = "status"
-function welcome()
-end
-
function status(self)
return self.model.getstatus()
end
diff --git a/bgp-details-html.lsp b/bgp-details-html.lsp
index 025dab2..9a946fd 100644
--- a/bgp-details-html.lsp
+++ b/bgp-details-html.lsp
@@ -10,6 +10,6 @@ io.write("</span>")
<H2>BGP routes</H2>
<PRE>
-<% io.write(tostring(data.showipbgp.value)) %>
+<% io.write(tostring(data.value.showipbgp.value)) %>
</PRE>
diff --git a/bgp-model.lua b/bgp-model.lua
index c1426f9..07c5b24 100644
--- a/bgp-model.lua
+++ b/bgp-model.lua
@@ -57,11 +57,8 @@ end
function getdetails()
local status = {}
- status.showipbgp = cfe({
- name="showipbgp",
- label="BGP routes",
- })
+ status.showipbgp = cfe({ label="BGP routes" })
status.showipbgp.value,status.showipbgp.errtxt = telnetshowipbgp()
- return status
+ return cfe({ type="group", value=status, label="BGP Details" })
end
diff --git a/zebra-controller.lua b/zebra-controller.lua
index 90aacdd..8e65d57 100644
--- a/zebra-controller.lua
+++ b/zebra-controller.lua
@@ -5,9 +5,6 @@ require("controllerfunctions")
default_action = "status"
-function welcome()
-end
-
function status(self)
return self.model.getstatus()
end
diff --git a/zebra.roles b/zebra.roles
index 3c86963..c03bfdb 100644
--- a/zebra.roles
+++ b/zebra.roles
@@ -1,2 +1,2 @@
-READ=zebra:welcome,zebra:status,zebra:details,
+READ=zebra:status,zebra:details,
UPDATE=zebra:startstop,zebra:expert,