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, fifteen has been updated via cb92b363cf92326475df69ccee1684f3ae47b997 (commit) via 12b901f84668f0b4bfd9e3376547e644a83a6126 (commit) via 11ab2c7d9a5b91cbc3092defe1a32572acd0ba6d (commit) via 68f6312ac54728c20c08d1f100bc948e6f6a689e (commit) from c03d4a5e8a37c6fcbee55c5b7efa8930f9c98351 (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 cb92b363cf92326475df69ccee1684f3ae47b997 Merge: 12b901f 11ab2c7 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 31 15:35:34 2013 +0100

Merge remote-tracking branch 'amarx/firewall-fifteen' into fifteen

commit 12b901f84668f0b4bfd9e3376547e644a83a6126 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 31 15:34:40 2013 +0100

firewall: Fix wrong symbol for variable.

commit 11ab2c7d9a5b91cbc3092defe1a32572acd0ba6d Author: Alexander Marx amarx@ipfire.org Date: Wed Oct 30 15:49:21 2013 +0100

Firewall: added IP-Address to dropdown in DNAT part and now all ip-addresses are in brackets

commit 68f6312ac54728c20c08d1f100bc948e6f6a689e Author: Alexander Marx amarx@ipfire.org Date: Wed Oct 30 13:41:33 2013 +0100

Firewall: Show IP-Adresses in NAT-Source dropdown

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

Summary of changes: config/cfgroot/general-functions.pl | 6 ++++++ html/cgi-bin/firewall.cgi | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-)

Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 48d68a2..778a39b 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 8deeb1c..0b7c6fc 100755 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -1685,10 +1685,10 @@ END <td width='25%' align='right'>$Lang::tr{'dnat address'}:</td> <td width='30%'> <select name='dnat' style='width: 100%;'> - <option value='Default IP' $selected{'dnat'}{'Default IP'}>$Lang::tr{'default ip'}</option> + <option value='Default IP' $selected{'dnat'}{'Default IP'}>$Lang::tr{'default ip'} ($netsettings{'RED_ADDRESS'})</option> END foreach my $alias (sort keys %aliases) { - print "<option value='$alias' $selected{'dnat'}{$alias}>$alias</option>"; + print "<option value='$alias' $selected{'dnat'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>"; }

print "</select>"; @@ -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; @@ -2814,7 +2815,7 @@ END print <<END; <tr> <td align='center'> - <font color="&Header::colourblue">$Lang::tr{'blue'}</font> + <font color="$Header::colourblue">$Lang::tr{'blue'}</font> </td> <td align='center'> <font color="$Header::colourred">$Lang::tr{'red'}</font>

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