webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-13 20:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

connections.cgi: Fix broken NAT rules when there is an empty destination IP address

Browse Source 
Bug introduced with e60cd3a404

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Reported-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
This commit is contained in:
Michael Tremer
2015-06-16 11:33:43 +02:00
parent 4b02b4045b
commit ee299e2ecf
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
html/cgi-bin/connections.cgi
View File

@@ -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;'>&gt;</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;'>&gt;</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++;
}
}