[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e60cd3a4042e95cf2748aac2de9d991c724ef24d

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e60cd3a4042e95cf2748aac2de9d991c724ef24d

[git]

[-- Attachment #1: Type: text/plain, Size: 1474 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  e60cd3a4042e95cf2748aac2de9d991c724ef24d (commit)
      from  dfea4f86c22c83e07d0f4a6f2a02166229ecb120 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e60cd3a4042e95cf2748aac2de9d991c724ef24d
Author: Dominik Hassler <hadfl(a)cpan.org>
Date:   Fri Mar 13 10:56:03 2015 +0100

    use colour of destination network for DNAT

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/connections.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index f1ed212..5c17d33 100644
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -520,7 +520,8 @@ foreach my $line (@conntrack) {
 	}
 
 	my $sip_colour = ipcolour($sip);
-	my $dip_colour = ipcolour($dip);
+	# use colour of destination network for DNAT
+	my $dip_colour = $dip ne $dip_ret ? ipcolour($dip_ret) : ipcolour($dip);
 
 	my $sserv = '';
 	if ($sport < 1024) {


hooks/post-receive
--
IPFire 2.x development tree