From d1fc5afc2bc186befa82ebbacdde3ba7f4dda55a Mon Sep 17 00:00:00 2001 From: marjohn56 Date: Tue, 14 Aug 2018 21:31:49 +0100 Subject: [PATCH] interfaces: remove use of adv_dhcp6_prefix_interface_statement_sla_id Section of code I've removed had been removed previously as during recent PR's the ability to iterate through the interfaces was added. This 'solo' bit of code appears to have made its way back in, don't know where and don't know when as the song goes. Remove SLA_ID from Prefix interface. It's collected from the LAN settings --- src/etc/inc/interfaces.inc | 11 ----------- src/opnsense/service/tests/config/config.xml | 1 - src/www/interfaces.php | 5 +---- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 0fc368d09..c7ddee158 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -3113,17 +3113,6 @@ function DHCP6_Config_File_Advanced($interface, $wancfg, $wanif) $id_assoc_statement_prefix .= ";\n"; } - if (is_numeric($wancfg['adv_dhcp6_prefix_interface_statement_sla_id'])) { - $id_assoc_statement_prefix .= " prefix-interface {$wanif} {\n"; - $id_assoc_statement_prefix .= " sla-id {$wancfg['adv_dhcp6_prefix_interface_statement_sla_id']};\n"; - if (($wancfg['adv_dhcp6_prefix_interface_statement_sla_len'] >= 0) && - ($wancfg['adv_dhcp6_prefix_interface_statement_sla_len'] <= 128) - ) { - $id_assoc_statement_prefix .= " sla-len {$wancfg['adv_dhcp6_prefix_interface_statement_sla_len']};\n"; - } - $id_assoc_statement_prefix .= " };\n"; - } - $iflist = link_interface_to_track6($interface); foreach ($iflist as $friendly => $ifcfg) { diff --git a/src/opnsense/service/tests/config/config.xml b/src/opnsense/service/tests/config/config.xml index cefcef5d4..643af571d 100644 --- a/src/opnsense/service/tests/config/config.xml +++ b/src/opnsense/service/tests/config/config.xml @@ -40,7 +40,6 @@ - diff --git a/src/www/interfaces.php b/src/www/interfaces.php index 59c95dded..b6f6e86cb 100644 --- a/src/www/interfaces.php +++ b/src/www/interfaces.php @@ -343,7 +343,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { "adv_dhcp6_id_assoc_statement_address_pltime", "adv_dhcp6_id_assoc_statement_address_vltime", "adv_dhcp6_id_assoc_statement_prefix_enable", "adv_dhcp6_id_assoc_statement_prefix", "adv_dhcp6_id_assoc_statement_prefix_id", "adv_dhcp6_id_assoc_statement_prefix_pltime", "adv_dhcp6_id_assoc_statement_prefix_vltime", - "adv_dhcp6_prefix_interface_statement_sla_id", "adv_dhcp6_prefix_interface_statement_sla_len", + "adv_dhcp6_prefix_interface_statement_sla_len", "adv_dhcp6_authentication_statement_authname", "adv_dhcp6_authentication_statement_protocol", "adv_dhcp6_authentication_statement_algorithm", "adv_dhcp6_authentication_statement_rdm", "adv_dhcp6_key_info_statement_keyname", "adv_dhcp6_key_info_statement_realm", "adv_dhcp6_key_info_statement_keyid", "adv_dhcp6_key_info_statement_secret", "adv_dhcp6_key_info_statement_expire", @@ -1110,7 +1110,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { $new_config['adv_dhcp6_id_assoc_statement_prefix_id'] = $pconfig['adv_dhcp6_id_assoc_statement_prefix_id']; $new_config['adv_dhcp6_id_assoc_statement_prefix_pltime'] = $pconfig['adv_dhcp6_id_assoc_statement_prefix_pltime']; $new_config['adv_dhcp6_id_assoc_statement_prefix_vltime'] = $pconfig['adv_dhcp6_id_assoc_statement_prefix_vltime']; - $new_config['adv_dhcp6_prefix_interface_statement_sla_id'] = $pconfig['adv_dhcp6_prefix_interface_statement_sla_id']; $new_config['adv_dhcp6_prefix_interface_statement_sla_len'] = $pconfig['adv_dhcp6_prefix_interface_statement_sla_len']; $new_config['adv_dhcp6_authentication_statement_authname'] = $pconfig['adv_dhcp6_authentication_statement_authname']; $new_config['adv_dhcp6_authentication_statement_protocol'] = $pconfig['adv_dhcp6_authentication_statement_protocol']; @@ -2678,8 +2677,6 @@ include("head.inc"); - -