From 184f13334f470141420a189220dd3b951aac4480 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Mon, 31 Mar 2008 22:24:32 +0000
Subject: * Fixed haserl-lua Makefile * Fixed a bug in CBI that occured when
 target UCI is empty * Added frontend for port forwarding / firewall pages

---
 src/ffluci/model/cbi/admin_network/firewall.lua | 37 +++++++++++++++++++++++++
 src/ffluci/model/cbi/admin_network/portfw.lua   | 18 ++++++++++++
 src/ffluci/model/menu/00main.lua                |  2 ++
 src/ffluci/model/uci.lua                        |  4 +--
 4 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 src/ffluci/model/cbi/admin_network/firewall.lua
 create mode 100644 src/ffluci/model/cbi/admin_network/portfw.lua

(limited to 'src/ffluci/model')

diff --git a/src/ffluci/model/cbi/admin_network/firewall.lua b/src/ffluci/model/cbi/admin_network/firewall.lua
new file mode 100644
index 0000000000..fc7bea61bc
--- /dev/null
+++ b/src/ffluci/model/cbi/admin_network/firewall.lua
@@ -0,0 +1,37 @@
+-- ToDo: Translate, Add descriptions and help texts
+m = Map("luci_fw", "Firewall")
+
+s = m:section(TypedSection, "rule")
+s.addremove = true
+
+chain = s:option(ListValue, "chain", "Kette")
+chain:value("forward", "Forward")
+chain:value("input", "Input")
+chain:value("output", "Output")
+chain:value("prerouting", "Prerouting")
+chain:value("postrouting", "Postrouting")
+
+s:option(Value, "iface", "Eingangsschnittstelle").optional = true
+s:option(Value, "oface", "Ausgangsschnittstelle").optional = true
+s:option(Value, "proto", "Protokoll").optional = true
+s:option(Value, "source", "Quelladresse").optional = true
+s:option(Value, "destination", "Zieladresse").optional = true
+s:option(Value, "sport", "Quellports").optional = true
+s:option(Value, "dport", "Zielports").optional = true
+s:option(Value, "to", "Neues Ziel").optional = true
+
+state = s:option(MultiValue, "state", "Status")
+state.optional  = true
+state.delimiter = ","
+state:value("NEW", "neu")
+state:value("ESTABLISHED", "etabliert")
+state:value("RELATED", "zugehörig")
+state:value("INVALID", "ungültig")
+
+s:option(Value, "jump", "Aktion", "ACCEPT, REJECT, DROP, MASQUERADE, DNAT, SNAT, ...").optional = true
+
+
+add = s:option(Value, "command", "Befehl")
+add.size = 50
+
+return m
\ No newline at end of file
diff --git a/src/ffluci/model/cbi/admin_network/portfw.lua b/src/ffluci/model/cbi/admin_network/portfw.lua
new file mode 100644
index 0000000000..6f8822a89a
--- /dev/null
+++ b/src/ffluci/model/cbi/admin_network/portfw.lua
@@ -0,0 +1,18 @@
+-- ToDo: Translate, Add descriptions and help texts
+m = Map("luci_fw", "Portweiterleitung")
+
+s = m:section(TypedSection, "portfw")
+s.addremove = true
+s.anonymous = true
+
+iface = s:option(Value, "in_interface", "Externes Interface")
+
+proto = s:option(ListValue, "proto", "Protokoll")
+proto:value("tcp", "TCP")
+proto:value("udp", "UDP")
+
+dport = s:option(Value, "dport", "Externer Port", "Port[:Endport]")
+
+to = s:option(Value, "to", "Interne Adresse", "IP-Adresse[:Zielport[-Zielendport]]")
+
+return m
\ No newline at end of file
diff --git a/src/ffluci/model/menu/00main.lua b/src/ffluci/model/menu/00main.lua
index 64fc36462d..966c4228ce 100644
--- a/src/ffluci/model/menu/00main.lua
+++ b/src/ffluci/model/menu/00main.lua
@@ -17,6 +17,8 @@ act("vlan", "Switch")
 act("ifaces", "Schnittstellen")
 act("ptp", "PPPoE / PPTP")
 act("routes", "Statische Routen")
+act("portfw", "Portweiterleitung")
+act("firewall", "Firewall")
 
 add("admin", "wifi", "Drahtlos", 40)
 act("devices", "Geräte")
diff --git a/src/ffluci/model/uci.lua b/src/ffluci/model/uci.lua
index 94a385c7e1..8286597807 100644
--- a/src/ffluci/model/uci.lua
+++ b/src/ffluci/model/uci.lua
@@ -157,12 +157,12 @@ end
 
 function Session._uci3(self, cmd)
 	local res = ffluci.sys.execl(self.ucicmd .. " 2>&1 " .. cmd)
-	if res[1]:sub(1, ucicmd:len() + 1) == ucicmd .. ":" then
+	if res[1] and res[1]:sub(1, self.ucicmd:len()+1) == self.ucicmd..":" then
 		return nil, res[1]
 	end
 
 	table = {}
-	
+
 	for k,line in pairs(res) do
 		c, s, t = line:match("^([^.]-)%.([^.]-)=(.-)$")
 		if c then
-- 
cgit v1.2.3