From 68f6312ac54728c20c08d1f100bc948e6f6a689e Mon Sep 17 00:00:00 2001
From: Alexander Marx <amarx@ipfire.org>
Date: Wed, 30 Oct 2013 13:41:33 +0100
Subject: [PATCH] Firewall: Show IP-Adresses in NAT-Source dropdown

---
 config/cfgroot/general-functions.pl | 6 ++++++
 html/cgi-bin/firewall.cgi           | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 48d68a2cd9..778a39b1ce 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -51,19 +51,23 @@ sub setup_default_networks
 	$defaultNetworks->{$Lang::tr{'fwhost any'}}{'NAME'} = "ALL";
 		
 	$defaultNetworks->{$Lang::tr{'green'}}{'IPT'} = "$netsettings{'GREEN_NETADDRESS'}/$netsettings{'GREEN_NETMASK'}";
+	$defaultNetworks->{$Lang::tr{'green'}}{'NET'} = "$netsettings{'GREEN_ADDRESS'}";
 	$defaultNetworks->{$Lang::tr{'green'}}{'NAME'} = "GREEN";
 
 	if ($netsettings{'RED_DEV'} ne ''){
 		$defaultNetworks->{$Lang::tr{'fwdfw red'}}{'IPT'} = "$netsettings{'RED_NETADDRESS'}/$netsettings{'RED_NETMASK'}";
+		$defaultNetworks->{$Lang::tr{'fwdfw red'}}{'NET'} = "$netsettings{'RED_ADDRESS'}";
 		$defaultNetworks->{$Lang::tr{'fwdfw red'}}{'NAME'} = "RED";
 	}
 	if ($netsettings{'ORANGE_DEV'} ne ''){
 		$defaultNetworks->{$Lang::tr{'orange'}}{'IPT'} = "$netsettings{'ORANGE_NETADDRESS'}/$netsettings{'ORANGE_NETMASK'}";
+		$defaultNetworks->{$Lang::tr{'orange'}}{'NET'} = "$netsettings{'ORANGE_ADDRESS'}";
 		$defaultNetworks->{$Lang::tr{'orange'}}{'NAME'} = "ORANGE";
 	}
 
 	if ($netsettings{'BLUE_DEV'} ne ''){
 		$defaultNetworks->{$Lang::tr{'blue'}}{'IPT'} = "$netsettings{'BLUE_NETADDRESS'}/$netsettings{'BLUE_NETMASK'}";
+		$defaultNetworks->{$Lang::tr{'blue'}}{'NET'} = "$netsettings{'BLUE_ADDRESS'}";
 		$defaultNetworks->{$Lang::tr{'blue'}}{'NAME'} = "BLUE";
 	}
 	
@@ -98,6 +102,7 @@ sub setup_default_networks
 			my @tempipsecsubnet = split("\/", $ipsecsettings{'RW_NET'});
 			$defaultNetworks->{'IPsec RW ' .$ip."/".$sub}{'ADR'} = $tempipsecsubnet[0];
 			$defaultNetworks->{'IPsec RW ' .$ip."/".$sub}{'NAME'} = "IPsec RW";
+			$defaultNetworks->{'IPsec RW ' .$ip."/".$sub}{'NET'} = &getnextip($ip);
 		}
 	}
 }
@@ -118,6 +123,7 @@ sub get_aliases
 				$temp[2] = "Alias $ctr : $temp[0]";
 			}
 			$defaultNetworks->{$temp[2]}{'IPT'} = "$temp[0]";
+			$defaultNetworks->{$temp[2]}{'NET'} = "$temp[0]";
 			
 			$ctr++;
 		}
diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 8deeb1ce71..db53a382ce 100755
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -1717,7 +1717,7 @@ END
 END
 
 		foreach my $alias (sort keys %aliases) {
-			print "<option value='$alias' $selected{'snat'}{$alias}>$alias</option>";
+			print "<option value='$alias' $selected{'snat'}{$alias}>$alias $aliases{$alias}{'IPT'}</option>";
 		}
 
 		# XXX this is composed in a very ugly fashion
@@ -1725,10 +1725,11 @@ END
 			next if($defaultNetworks{$network}{'NAME'} eq "IPFire");
 			next if($defaultNetworks{$network}{'NAME'} eq "ALL");
 			next if($defaultNetworks{$network}{'NAME'} =~ /OpenVPN/i);
+			next if($defaultNetworks{$network}{'NAME'} =~ /IPsec/i);
 
 			print "<option value='$defaultNetworks{$network}{'NAME'}'";
 			print " selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'nat'}} eq $defaultNetworks{$network}{'NAME'});
-			print ">$network</option>";
+			print ">$network $defaultNetworks{$network}{'NET'}</option>";
 		}
 
 		print <<END;
-- 
2.39.5