From eef01b14df77186f9c1205e9e5cb83f80407d7fd Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Wed, 13 Nov 2013 07:45:09 -0200 Subject: Add hybrid and disabled outbound NAT, fixes #2416: - Add 2 new outbound NAT modes, hybrid and disabled, manual and advanced keep working the same way - Hybrid mode applies manual rules first, automatic after - Disabled do no create any outbound NAT rules - Remove ipsecpassthru config field and rename advancedoutbound to outbound - Save mode on $config['nat']['outbound']['mode'] to simplify the logic - Modify config.default to reflect changes - Add code to upgrade config, and change latest_version to 10.3 - Use html to align modes and remove some hacks to align using   --- conf.default/config.xml | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) (limited to 'conf.default') diff --git a/conf.default/config.xml b/conf.default/config.xml index 6585795..b6c30db 100644 --- a/conf.default/config.xml +++ b/conf.default/config.xml @@ -401,9 +401,25 @@ --> - - - + + automatic + + -