Firewall: Show IP-Adresses in NAT-Source dropdown

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 48d68a2cd9acbb497f2a8f53cd298978e3bbc823..778a39b1ceec918398ca413e40f02d972ce544b7 100644 (file)
--- 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 8deeb1ce71dc128951ef632bd2a63f1ade7a9cdf..db53a382ce4cad3843b8f5c280c0521452ef8a01 100755 (executable)
--- 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;