OpenWrt
/
luci
mirror of https://git.openwrt.org/project/luci.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

luci-0.8: merge r4776-r4777

This commit is contained in:
Jo-Philipp Wich 2009-06-07 13:06:54 +00:00
parent 76ba4dff83
commit 0f60f1be22
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/sys/luasrc/sys/iptparser.lua
View File

@ -19,7 +19,7 @@ luci.util = require "luci.util"
luci.sys = require "luci.sys" luci.sys = require "luci.sys"
luci.ip = require "luci.ip" luci.ip = require "luci.ip"
local tonumber, ipairs = tonumber, ipairs local tonumber, ipairs, table = tonumber, ipairs, table
--- LuCI iptables parser and query library --- LuCI iptables parser and query library
-- @cstyle instance -- @cstyle instance
@ -279,6 +279,11 @@ function IptParser._parse_rules( self )
local rule_parts = luci.util.split( rule, "%s+", nil, true ) local rule_parts = luci.util.split( rule, "%s+", nil, true )
local rule_details = { } local rule_details = { }
-- cope with rules that have no target assigned
if rule:match("^%d+%s+%d+%s+%d+%s%s") then
table.insert(rule_parts, 4, nil)
end
rule_details["table"] = tbl rule_details["table"] = tbl
rule_details["chain"] = self._chain rule_details["chain"] = self._chain
rule_details["index"] = tonumber(rule_parts[1]) rule_details["index"] = tonumber(rule_parts[1])

2
modules/admin-full/luasrc/view/admin_status/iptables.htm
View File

@ -99,7 +99,7 @@ $Id$
<td><%=rule.index%></td> <td><%=rule.index%></td>
<td><%=rule.packets%></td> <td><%=rule.packets%></td>
<td><%=wba.byte_format(rule.bytes)%></td> <td><%=wba.byte_format(rule.bytes)%></td>
<td><%=link_target(tbl, rule.target)%></td> <td><%=rule.target and link_target(tbl, rule.target) or "-"%></td>
<td><%=rule.protocol%></td> <td><%=rule.protocol%></td>
<td><%=rule.flags%></td> <td><%=rule.flags%></td>
<td><%=link_iface(rule.inputif)%></td> <td><%=link_iface(rule.inputif)%></td>