diff options
author | Chris Buechler <cmb@pfsense.org> | 2016-07-17 21:15:26 -0500 |
---|---|---|
committer | Chris Buechler <cmb@pfsense.org> | 2016-07-17 21:15:26 -0500 |
commit | 655fb9df95aaac301a2df3fb2198492050f40b49 (patch) | |
tree | 076ce091885fb40943f9c28f4698b6e6b84c5d1b /src/usr | |
parent | 8f70ba67a94b21e3a78728a7ba52057424b0a013 (diff) | |
parent | 8c661bc8555321b76656e8a9723b4a7189eceb30 (diff) | |
download | pfsense-655fb9df95aaac301a2df3fb2198492050f40b49.zip pfsense-655fb9df95aaac301a2df3fb2198492050f40b49.tar.gz |
Merge pull request #3055 from marjohn56/master
Diffstat (limited to 'src/usr')
-rw-r--r-- | src/usr/local/www/interfaces.php | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/usr/local/www/interfaces.php b/src/usr/local/www/interfaces.php index da695aa..21c75cf 100644 --- a/src/usr/local/www/interfaces.php +++ b/src/usr/local/www/interfaces.php @@ -284,6 +284,7 @@ switch ($wancfg['ipaddrv6']) { $pconfig['dhcp6prefixonly'] = isset($wancfg['dhcp6prefixonly']); $pconfig['dhcp6usev4iface'] = isset($wancfg['dhcp6usev4iface']); $pconfig['dhcp6debug'] = isset($wancfg['dhcp6debug']); + $pconfig['dhcp6withoutra'] = isset($wancfg['dhcp6withoutra']); break; case "6to4": $pconfig['type6'] = "6to4"; @@ -978,6 +979,7 @@ if ($_POST['apply']) { unset($wancfg['dhcp6debug']); unset($wancfg['track6-interface']); unset($wancfg['track6-prefix-id']); + unset($wancfg['dhcp6withoutra']); unset($wancfg['prefix-6rd']); unset($wancfg['prefix-6rd-v4plen']); unset($wancfg['gateway-6rd']); @@ -1225,6 +1227,9 @@ if ($_POST['apply']) { $wancfg['dhcp6debug'] = true; } + if ($_POST['dhcp6withoutra'] == "yes") { + $wancfg['dhcp6withoutra'] = true; + } if (!empty($_POST['adv_dhcp6_interface_statement_send_options'])) { $wancfg['adv_dhcp6_interface_statement_send_options'] = $_POST['adv_dhcp6_interface_statement_send_options']; } @@ -2121,7 +2126,12 @@ $section->addInput(new Form_Checkbox( 'Start DHCP6 client in debug mode', $pconfig['dhcp6debug'] )); - +$section->addInput(new Form_Checkbox( + 'dhcp6withoutra', + 'Do not wait for a RA', + 'Required by some ISPs, especially those not using PPPoE', + $pconfig['dhcp6withoutra'] +)); $section->addInput(new Form_Input( 'adv_dhcp6_config_file_override_path', 'Configuration File Override', |