From 026945ae09515980f972228442c857e1f9cb4f7f Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 13 Mar 2011 17:39:36 +0000
Subject: [PATCH] modules/admin-full: display source and destination ports in
 conntrack view (#211)

---
 .../luasrc/view/admin_status/conntrack.htm      | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/modules/admin-full/luasrc/view/admin_status/conntrack.htm b/modules/admin-full/luasrc/view/admin_status/conntrack.htm
index d21faf704..2697c1cda 100644
--- 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.
@@ -61,8 +61,16 @@ $Id$
 				<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%>
-- 
2.25.1