modules/admin-full: display source and destination ports in conntrack view (#211)

[project/luci.git] / modules / admin-full / luasrc / view / admin_status / conntrack.htm

diff --git a/modules/admin-full/luasrc/view/admin_status/conntrack.htm b/modules/admin-full/luasrc/view/admin_status/conntrack.htm
index d0a86b6..2697c1c 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_status/conntrack.htm
+++ b/modules/admin-full/luasrc/view/admin_status/conntrack.htm
@@ -1,7 +1,7 @@
 <%#
 LuCI - Lua Configuration Interface
 Copyright 2008-2009 Steven Barth <steven@midlink.org>
-Copyright 2008-2009 Jo-Philipp Wich <xm@subsignal.org>
+Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,17 +21,17 @@ $Id$
 <%+header%>
 
 <div class="cbi-map" id="cbi-conntrack">
-       <h2><a id="content" name="content"><%:a_n_conntrack%></a></h2>
-       <div class="cbi-map-descr"><%:a_n_conntrack_desc%></div>
+       <h2><a id="content" name="content"><%:Active Connections%></a></h2>
+       <div class="cbi-map-descr"><%:This page gives an overview over currently active network connections.%></div>
 
        <fieldset class="cbi-section" id="cbi-table-table">
                <legend>ARP</legend>
                <div class="cbi-section-node">
                        <table class="cbi-section-table">
                                <tr class="cbi-section-table-titles">
-                                       <th class="cbi-section-table-cell"><%:ipaddress%></th>
-                                       <th class="cbi-section-table-cell"><%:macaddress%></th>
-                                       <th class="cbi-section-table-cell"><%:interface%></th>
+                                       <th class="cbi-section-table-cell"><%_<abbr title="Internet Protocol Version 4">IPv4</abbr>-Address%></th>
+                                       <th class="cbi-section-table-cell"><%_<abbr title="Media Access Control">MAC</abbr>-Address%></th>
+                                       <th class="cbi-section-table-cell"><%:Interface%></th>
                                </tr>
 
                                <% luci.sys.net.arptable(function(e) %>
@@ -47,22 +47,30 @@ $Id$
        <br />
 
        <fieldset class="cbi-section" id="cbi-table-table">
-               <legend><%:a_n_conntrack%></legend>
+               <legend><%:Active Connections%></legend>
                <div class="cbi-section-node">
                        <table class="cbi-section-table">
                                <tr class="cbi-section-table-titles">
-                                       <th class="cbi-section-table-cell"><%:network%></th>
-                                       <th class="cbi-section-table-cell"><%:protocol%></th>
-                                       <th class="cbi-section-table-cell"><%:source%></th>
-                                       <th class="cbi-section-table-cell"><%:destination%></th>
+                                       <th class="cbi-section-table-cell"><%:Network%></th>
+                                       <th class="cbi-section-table-cell"><%:Protocol%></th>
+                                       <th class="cbi-section-table-cell"><%:Source%></th>
+                                       <th class="cbi-section-table-cell"><%:Destination%></th>
                                </tr>
 
                                <% style = true; luci.sys.net.conntrack(function(c) %>
                                <tr class="cbi-section-table-row cbi-rowstyle-<%=(style and 1 or 2)%>">
                                        <td class="cbi-value-field"><%=c.layer3:upper()%></td>
                                        <td class="cbi-value-field"><%=c.layer4:upper()%></td>
-                                       <td class="cbi-value-field"><%=c.src%></td>
-                                       <td class="cbi-value-field"><%=c.dst%></td>
+                                       <td class="cbi-value-field"><%=
+                                               c.layer3 == "ipv6"
+                                                       and "[%s]:%d" %{ c.src, c.sport }
+                                                       or  "%s:%d"   %{ c.src, c.sport }
+                                       %></td>
+                                       <td class="cbi-value-field"><%=
+                                               c.layer3 == "ipv6"
+                                                       and "[%s]:%d" %{ c.dst, c.dport }
+                                                       or  "%s:%d"   %{ c.dst, c.dport }
+                                       %></td>
                                </tr>
                                <% style = not style; end) %>
                        </table>
@@ -70,6 +78,5 @@ $Id$
        </fieldset>
        <br />
 </div>
-       
-<%+footer%>
 
+<%+footer%>