X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-qos%2Fluasrc%2Fmodel%2Fcbi%2Fqos%2Fqos.lua;h=e051347ab23b6093dd064179128fd62c8213fb0f;hp=ea535cea23d8f1b60cc00a3430f94779b2fa098f;hb=8e437b3125b7d55babc99901f3cfca85357b2546;hpb=211c6394a0d145d3215893b827241723bb358a13

diff --git a/applications/luci-qos/luasrc/model/cbi/qos/qos.lua b/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
index ea535cea2..e051347ab 100644
--- a/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
+++ b/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
@@ -11,6 +11,7 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
+require("luci.tools.webadmin")
 m = Map("qos")
 
 s = m:section(TypedSection, "interface", translate("interfaces"))
@@ -29,39 +30,58 @@ s:option(Value, "download", nil, "kb/s")
 s:option(Value, "upload", nil, "kb/s")
 
 s = m:section(TypedSection, "classify")
-
+s.template = "cbi/tblsection"
 s.anonymous = true
 s.addremove = true
 
 t = s:option(ListValue, "target")
-t:value("Priority")
-t:value("Express")
-t:value("Normal")
-t:value("Bulk")
+t:value("Priority", translate("qos_priority"))
+t:value("Express", translate("qos_express"))
+t:value("Normal", translate("qos_normal"))
+t:value("Bulk", translate("qos_bulk"))
 t.default = "Normal"
 
-s:option(Value, "srchost").optional = true
-s:option(Value, "dsthost").optional = true
-s:option(Value, "layer7", "Layer 7").optional = true
+srch = s:option(Value, "srchost")
+srch.rmempty = true
+srch:value("", translate("all"))
+luci.tools.webadmin.cbi_add_knownips(srch)
+
+dsth = s:option(Value, "dsthost")
+dsth.rmempty = true
+dsth:value("", translate("all"))
+luci.tools.webadmin.cbi_add_knownips(dsth)
+
+l7 = s:option(ListValue, "layer7", translate("service"))
+l7.rmempty = true
+l7:value("", translate("all"))
+local pats = luci.fs.dir("/etc/l7-protocols")
+if pats then
+	for i,f in ipairs(pats) do
+		if f:sub(-4) == ".pat" then
+			l7:value(f:sub(1, #f-4))
+		end
+	end
+end
 
 p2p = s:option(ListValue, "ipp2p", "P2P")
-p2p:value("")
+p2p:value("", "-")
 p2p:value("all", translate("all"))
 p2p:value("bit", "BitTorrent")
 p2p:value("dc", "DirectConnect")
 p2p:value("edk", "eDonkey")
 p2p:value("gnu", "Gnutella")
 p2p:value("kazaa", "Kazaa")
-p2p.optional = true
+p2p.rmempty = true
 
 p = s:option(ListValue, "proto", translate("protocol"))
-p:value("")
+p:value("", translate("all"))
 p:value("tcp", "TCP")
 p:value("udp", "UDP")
 p:value("icmp", "ICMP")
-p.optional = true
+p.rmempty = true
 
-s:option(Value, "ports", translate("port")).optional = true
-s:option(Value, "portrange").optional = true
+ports = s:option(Value, "ports", translate("ports"))
+ports.rmempty = true
+ports:value("", translate("allf", translate("all")))
 
-return m
\ No newline at end of file
+return m