convert luci.fs users to nixio.fs api

[project/luci.git] / applications / luci-qos / luasrc / model / cbi / qos / qosmini.lua

diff --git a/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua b/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua
index f8a6bb5..cb79682 100644 (file)
--- a/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua
+++ b/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua
@@ -12,7 +12,10 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-require("luci.tools.webadmin")
+
+local wa = require "luci.tools.webadmin"
+local fs = require "nixio.fs"
+
 m = Map("qos")
 
 s = m:section(NamedSection, "wan", "interface", translate("m_n_inet"))
@@ -37,35 +40,25 @@ t.default = "Normal"
 srch = s:option(Value, "srchost")
 srch.rmempty = true
 srch:value("", translate("all"))
-luci.tools.webadmin.cbi_add_knownips(srch)
+wa.cbi_add_knownips(srch)
 
 dsth = s:option(Value, "dsthost")
 dsth.rmempty = true
 dsth:value("", translate("all"))
-luci.tools.webadmin.cbi_add_knownips(dsth)
+wa.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")
+local pats = fs.dir("/etc/l7-protocols")
 if pats then
-       for i,f in ipairs(pats) do
+       for f in 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("all", translate("all"))
-p2p:value("bit", "BitTorrent")
-p2p:value("dc", "DirectConnect")
-p2p:value("edk", "eDonkey")
-p2p:value("gnu", "Gnutella")
-p2p:value("kazaa", "Kazaa")
-p2p.rmempty = true
-
 p = s:option(ListValue, "proto", translate("protocol"))
 p:value("", translate("all"))
 p:value("tcp", "TCP")
@@ -75,6 +68,8 @@ p.rmempty = true
 
 ports = s:option(Value, "ports", translate("ports"))
 ports.rmempty = true
-ports:value("", translate("all"))
+ports:value("", translate("allf", translate("all")))
+
+bytes = s:option(Value, "connbytes", translate("qos_connbytes"))
 
-return m
\ No newline at end of file
+return m