From 8c661bc8555321b76656e8a9723b4a7189eceb30 Mon Sep 17 00:00:00 2001 From: marjohn56 Date: Sun, 10 Jul 2016 17:58:17 +0100 Subject: DHCP6 init before RA Some ISP BNG's require that a dhcp6c init is sent before RA. The additions to interfaces.php adds a new option flag 'dhcp6withoutra', this flag is set or unset in the WAN DHCP6 section 'Do not wait for a RA'. The interfaces.inc file handles this flag and either launches dhcp6c on interface_dhcpv6_configure or if the flag is not set will rtsold will launch dhcp6c on receipt of RA. An extra addition is the new function kill_dhcp6client_process($wanif). This is added to try and create a more robust termination of and dhcp6c clients that may be running. --- src/usr/local/www/interfaces.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/usr') diff --git a/src/usr/local/www/interfaces.php b/src/usr/local/www/interfaces.php index 1f6b9b1..5959c32 100644 --- a/src/usr/local/www/interfaces.php +++ b/src/usr/local/www/interfaces.php @@ -317,6 +317,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"; @@ -1011,6 +1012,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']); @@ -1258,6 +1260,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']; } @@ -2154,7 +2159,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', -- cgit v1.1