diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-07-12 09:47:51 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-07-12 09:47:51 -0300 |
| commit | 74aff49c2e38851147c02e5da25ddd1ecb637532 (patch) | |
| tree | b680ba12e73c23fb85a4020198a62a90343d1aee /usr/local/www/firewall_nat_out.php | |
| parent | 05facb3e72e43e6ff0b112e38b21f7feb6dafbd3 (diff) | |
| parent | 68cbabcbfd0f09814e4077e91f20fcf7b447b6a2 (diff) | |
| download | pfsense-74aff49c2e38851147c02e5da25ddd1ecb637532.zip pfsense-74aff49c2e38851147c02e5da25ddd1ecb637532.tar.gz | |
Merge remote branch 'mainline/master' into 2_firewall
Conflicts:
usr/local/www/firewall_nat_out.php
usr/local/www/firewall_rules.php
usr/local/www/firewall_rules_edit.php
Diffstat (limited to 'usr/local/www/firewall_nat_out.php')
| -rwxr-xr-x | usr/local/www/firewall_nat_out.php | 63 |
1 files changed, 37 insertions, 26 deletions
diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php index 296fb4b..59d6cb4 100755 --- a/usr/local/www/firewall_nat_out.php +++ b/usr/local/www/firewall_nat_out.php @@ -305,37 +305,35 @@ include("head.inc"); <tr> <td> <div id="mainarea"> - <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0"> - <tr> - <td class="vtable"><p> - <input name="advancedoripsec" type="radio" id="ipsecpassthru" value="ipsecpassthru" <?php if (isset($config['nat']['ipsecpassthru']['enable'])) echo "checked";?>> - <strong><?=gettext("Automatic outbound NAT rule generation (IPsec passthrough)");?></strong></p> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr><td align="right"><b>Mode:</b></td> + <td> + <input name="advancedoripsec" type="radio" id="ipsecpassthru" value="ipsecpassthru" <?php if (isset($config['nat']['ipsecpassthru']['enable'])) echo "checked";?>> + <strong><?=gettext("Automatic outbound NAT rule generation<br/> (IPsec passthrough included)");?></strong> </td> - </tr> - <tr> - <td class="vtable"><p> - <input name="advancedoripsec" type="radio" id="advancedoutbound" value="advancedoutboundnat" <?php if (isset($config['nat']['advancedoutbound']['enable'])) echo "checked";?>> - <strong><?=gettext("Manual Outbound NAT rule generation (Advanced Outbound NAT (AON))");?></strong></p></td> - </tr> - <tr> - <td> <input name="save" type="submit" class="formbtn" value="<?=gettext("Save");?>"> + + <td> + <input name="advancedoripsec" type="radio" id="advancedoutbound" value="advancedoutboundnat" <?php if (isset($config['nat']['advancedoutbound']['enable'])) echo "checked";?>> + <strong><?=gettext("Manual Outbound NAT rule generation") . "<br/> " . gettext("(AON - Advanced Outbound NAT)");?></strong></td> + <td valign="middle" align="left"> + <input name="save" type="submit" class="formbtn" value="<?=gettext("Save");?>"> + <br/> </td> </tr> - <tr> - <td colspan="2"><p><span class="vexpl"><span class="red"><strong>Note:<br> - </strong></span><?=gettext("If advanced outbound NAT is enabled, no outbound NAT ". - "rules will be automatically generated any longer. Instead, only the mappings ". - "you specify below will be used. With advanced outbound NAT disabled, ". - "a mapping is automatically created for each interface's subnet ". - "(except WAN). If you use target addresses other than the WAN interface's ". - "IP address, then depending on the way your WAN connection is setup, you ". - "may also need a ");?><a href="firewall_virtual_ip.php"><?=gettext("Virtual IP");?></a>.</span><br> - <br> - <?=gettext("You may enter your own mappings below.");?></p> - </td> - </tr> + <tr> + <td colspan="5"> + + </td> + </tr> + <tr> + <td class="vtable" colspan="5"> + + </td> + </tr> </table> <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr><td colspan="5"><b> Mappings:</b></td></tr> + <tr><td> </td></tr> <tr id="frheader"> <td width="3%" class="list"> </td> <td width="3%" class="list"> </td> @@ -455,6 +453,19 @@ include("head.inc"); </tr> </table></td> </tr> + <tr> + <td colspan="12"> + <p><span class="vexpl"><span class="red"><strong>Note:<br> + </strong></span>If advanced outbound NAT is enabled, no outbound NAT + rules will be automatically generated any longer. Instead, only the mappings + you specify below will be used. With advanced outbound NAT disabled, + a mapping is automatically created for each interface's subnet + (except WAN). If you use target addresses other than the WAN interface's + IP address, then depending on the way your WAN connection is setup, you + may also need a <a href="firewall_virtual_ip.php">Virtual IP</a>.</span><br> + </td> + </tr> + </table> </div> </td> |
