Add connbytes support to QoS

6 files changed, 18 insertions, 10 deletions

diff --git a/applications/luci-qos/luasrc/i18n/qos.de.lua b/applications/luci-qos/luasrc/i18n/qos.de.lua
index 7efb75eda6..1ef5499bdb 100644
--- a/applications/luci-qos/luasrc/i18n/qos.de.lua
+++ b/applications/luci-qos/luasrc/i18n/qos.de.lua
@@ -14,3 +14,4 @@ qos_bulk = 'niedrig'
 qos_normal = 'normal'
 qos_express = 'express'
 qos_priority = 'priorisiert'
+qos_connbytes = 'Bytes gesendet'
diff --git a/applications/luci-qos/luasrc/i18n/qos.de.xml b/applications/luci-qos/luasrc/i18n/qos.de.xml
index bfebbf877a..c64d0f6d43 100644
--- a/applications/luci-qos/luasrc/i18n/qos.de.xml
+++ b/applications/luci-qos/luasrc/i18n/qos.de.xml
@@ -18,4 +18,5 @@
 <i18n:msg xml:id="qos_normal">normal</i18n:msg>
 <i18n:msg xml:id="qos_express">express</i18n:msg>
 <i18n:msg xml:id="qos_priority">priorisiert</i18n:msg>
+<i18n:msg xml:id="qos_connbytes">Bytes gesendet</i18n:msg>
 </i18n:msgs>
diff --git a/applications/luci-qos/luasrc/i18n/qos.en.lua b/applications/luci-qos/luasrc/i18n/qos.en.lua
index 5343b54fad..67494e71d2 100644
--- a/applications/luci-qos/luasrc/i18n/qos.en.lua
+++ b/applications/luci-qos/luasrc/i18n/qos.en.lua
@@ -15,3 +15,4 @@ qos_bulk = 'low'
 qos_normal = 'normal'
 qos_express = 'express'
 qos_priority = 'priority'
+qos_connbytes = 'Bytes sent'
diff --git a/applications/luci-qos/luasrc/i18n/qos.en.xml b/applications/luci-qos/luasrc/i18n/qos.en.xml
index df279a20d7..8a5eeca924 100644
--- a/applications/luci-qos/luasrc/i18n/qos.en.xml
+++ b/applications/luci-qos/luasrc/i18n/qos.en.xml
@@ -19,4 +19,5 @@
 <i18n:msg xml:id="qos_normal">normal</i18n:msg>
 <i18n:msg xml:id="qos_express">express</i18n:msg>
 <i18n:msg xml:id="qos_priority">priority</i18n:msg>
+<i18n:msg xml:id="qos_connbytes">Bytes sent</i18n:msg>
 </i18n:msgs>
diff --git a/applications/luci-qos/luasrc/model/cbi/qos/qos.lua b/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
index 707d98a7b2..ac5f3b27cb 100644
--- a/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
+++ b/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
@@ -66,11 +66,11 @@ 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:value("bit", "BIT")
+p2p:value("dc", "DC")
+p2p:value("edk", "EDK")
+p2p:value("gnu", "GNU")
+p2p:value("kazaa", "KAZ")
 p2p.rmempty = true
 
 p = s:option(Value, "proto", translate("protocol"))
@@ -84,4 +84,6 @@ ports = s:option(Value, "ports", translate("ports"))
 ports.rmempty = true
 ports:value("", translate("allf", translate("all")))
 
+bytes = s:option(Value, "connbytes", translate("qos_connbytes"))
+
 return m
diff --git a/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua b/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua
index a1825505be..e80e4e560e 100644
--- a/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua
+++ b/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua
@@ -59,11 +59,11 @@ 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:value("bit", "BIT")
+p2p:value("dc", "DC")
+p2p:value("edk", "EDK")
+p2p:value("gnu", "GNU")
+p2p:value("kazaa", "KAZ")
 p2p.rmempty = true
 
 p = s:option(ListValue, "proto", translate("protocol"))
@@ -77,4 +77,6 @@ ports = s:option(Value, "ports", translate("ports"))
 ports.rmempty = true
 ports:value("", translate("allf", translate("all")))
 
+bytes = s:option(Value, "connbytes", translate("qos_connbytes"))
+
 return m