From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ee299e2ecf6e9fbc6dbf7fdc18c5a8980e122b12
Date: Tue, 16 Jun 2015 11:35:47 +0200 [thread overview]
Message-ID: <20150616093547.A04632236E@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2786 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 ee299e2ecf6e9fbc6dbf7fdc18c5a8980e122b12 (commit)
from 4b02b4045b619b207235b34882a000ef088f0df1 (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 ee299e2ecf6e9fbc6dbf7fdc18c5a8980e122b12
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Jun 16 11:33:43 2015 +0200
connections.cgi: Fix broken NAT rules when there is an empty destination IP address
Bug introduced with e60cd3a4042e95cf2748aac2de9d991c724ef24d
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Reported-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
html/cgi-bin/connections.cgi | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
Difference in files:
diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index 5c17d33..4eb9cd7 100644
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -540,7 +540,7 @@ foreach my $line (@conntrack) {
$ttl = format_time($ttl);
my $sip_extra;
- if ($sip ne $sip_ret) {
+ if ($sip_ret && $sip ne $sip_ret) {
$sip_extra = "<span style='color:#FFFFFF;'>></span> ";
$sip_extra .= "<a href='/cgi-bin/ipinfo.cgi?ip=$sip_ret'>";
$sip_extra .= " <span style='color:#FFFFFF;'>$sip_ret</span>";
@@ -548,7 +548,7 @@ foreach my $line (@conntrack) {
}
my $dip_extra;
- if ($dip ne $dip_ret) {
+ if ($dip_ret && $dip ne $dip_ret) {
$dip_extra = "<span style='color:#FFFFFF;'>></span> ";
$dip_extra .= "<a href='/cgi-bin/ipinfo.cgi?ip=$dip_ret'>";
$dip_extra .= " <span style='color:#FFFFFF;'>$dip_ret</span>";
@@ -661,15 +661,17 @@ sub ipcolour($) {
my ($ip) = $_[0];
my $found = 0;
- foreach my $line (@network) {
- if ($network[$id] eq '') {
- $id++;
- } else {
- if (!$found && ipv4_in_network($network[$id], $masklen[$id], $ip) ) {
- $found = 1;
- $colour = $colour[$id];
+ if ($ip) {
+ foreach my $line (@network) {
+ if ($network[$id] eq '') {
+ $id++;
+ } else {
+ if (!$found && ipv4_in_network($network[$id], $masklen[$id], $ip) ) {
+ $found = 1;
+ $colour = $colour[$id];
+ }
+ $id++;
}
- $id++;
}
}
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2015-06-16 9:35 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150616093547.A04632236E@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox