From a0dd23e0dcc5d5f4b5b07f7a4c5b0dc64ebf4731 Mon Sep 17 00:00:00 2001
From: Daniel Becker <razzfazz@gmail.com>
Date: Mon, 5 May 2014 15:35:32 -0700
Subject: add column for internal port on UPnP status page

---
 usr/local/www/status_upnp.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'usr')

diff --git a/usr/local/www/status_upnp.php b/usr/local/www/status_upnp.php
index 1cd3a62..e9c68da 100644
--- a/usr/local/www/status_upnp.php
+++ b/usr/local/www/status_upnp.php
@@ -87,14 +87,16 @@ if(!$config['installedpackages'] || !$config['installedpackages']['miniupnpd']['
           <td width="10%" class="listhdrr"><?=gettext("Port");?></td>
           <td width="10%" class="listhdrr"><?=gettext("Protocol");?></td>
           <td width="20%" class="listhdrr"><?=gettext("Internal IP");?></td>
-          <td width="60%" class="listhdr"><?=gettext("Description");?></td>
+          <td width="10%" class="listhdrr"><?=gettext("Int. Port");?></td>
+          <td width="50%" class="listhdr"><?=gettext("Description");?></td>
 		</tr>
 		<?php $i = 0; foreach ($rdr_entries as $rdr_entry) {
-			if (preg_match("/on (.*) inet proto (.*) from any to any port = (.*) label \"(.*)\" rtable [0-9] -> (.*) port (.*)/", $rdr_entry, $matches))
+			if (preg_match("/on (.*) inet proto (.*) from any to any port = (.*) keep state label \"(.*)\" rtable [0-9] -> (.*) port (.*)/", $rdr_entry, $matches))
 			$rdr_proto = $matches[2];
 			$rdr_port = $matches[3];
-			$rdr_ip = $matches[5];
 			$rdr_label =$matches[4];
+			$rdr_ip = $matches[5];
+			$rdr_iport = $matches[6];
 		?>
         <tr>
           <td class="listlr">
@@ -107,6 +109,9 @@ if(!$config['installedpackages'] || !$config['installedpackages']['miniupnpd']['
 		<?php print $rdr_ip;?>
           </td>
           <td class="listlr">
+		<?php print $rdr_iport;?>
+          </td>
+          <td class="listlr">
 		<?php print $rdr_label;?>
           </td>
         </tr>
-- 
cgit v1.1