Project

General

Profile

« Previous | Next » 

Revision ccf8bd86

Added by Martin Wasley almost 8 years ago

dhcp6c Advanced Config prefix interface

Currently, when using dhcp6c advanced configuration the prefix interface is WAN, this is not very useful!

The changes here allow the user to select the interface that the PD will be applied on..

(cherry picked from commit 58a185aede55efe71cabc337938ed05f456eecea)

View differences:

src/usr/local/www/interfaces.php
121 121

  
122 122
$a_gateways = &$config['gateways']['gateway_item'];
123 123

  
124
$interfaces = get_configured_interface_with_descr();
124 125
$wancfg = &$config['interfaces'][$if];
125 126
$old_wancfg = $wancfg;
126 127
$old_wancfg['realif'] = get_real_interface($if);
......
259 260

  
260 261
$pconfig['adv_dhcp6_prefix_interface_statement_sla_id'] = $wancfg['adv_dhcp6_prefix_interface_statement_sla_id'];
261 262
$pconfig['adv_dhcp6_prefix_interface_statement_sla_len'] = $wancfg['adv_dhcp6_prefix_interface_statement_sla_len'];
263
$pconfig['adv_dhcp6_prefix_selected_interface'] = $wancfg['adv_dhcp6_prefix_selected_interface'];
262 264

  
263 265
$pconfig['adv_dhcp6_authentication_statement_authname'] = $wancfg['adv_dhcp6_authentication_statement_authname'];
264 266
$pconfig['adv_dhcp6_authentication_statement_protocol'] = $wancfg['adv_dhcp6_authentication_statement_protocol'];
......
1085 1087

  
1086 1088
		unset($wancfg['adv_dhcp6_prefix_interface_statement_sla_id']);
1087 1089
		unset($wancfg['adv_dhcp6_prefix_interface_statement_sla_len']);
1090
		unset($wancfg['adv_dhcp6_prefix_selected_interface']);
1088 1091

  
1089 1092
		unset($wancfg['adv_dhcp6_authentication_statement_authname']);
1090 1093
		unset($wancfg['adv_dhcp6_authentication_statement_protocol']);
......
1348 1351
				if (is_numericint($_POST['adv_dhcp6_prefix_interface_statement_sla_len'])) {
1349 1352
					$wancfg['adv_dhcp6_prefix_interface_statement_sla_len'] = $_POST['adv_dhcp6_prefix_interface_statement_sla_len'];
1350 1353
				}
1351

  
1354
				if (!empty($_POST['adv_dhcp6_prefix_selected_interface'])) {
1355
					$wancfg['adv_dhcp6_prefix_selected_interface'] = $_POST['adv_dhcp6_prefix_selected_interface'];
1356
				}
1352 1357
				if (!empty($_POST['adv_dhcp6_authentication_statement_authname'])) {
1353 1358
					$wancfg['adv_dhcp6_authentication_statement_authname'] = $_POST['adv_dhcp6_authentication_statement_authname'];
1354 1359
				}
......
2361 2366

  
2362 2367
$section->add($group);
2363 2368

  
2369
$group = new Form_Group('Select prefix interface');
2370
$section->addInput(new Form_Select(
2371
	'adv_dhcp6_prefix_selected_interface',
2372
	'Prefix Interface',
2373
	$pconfig['adv_dhcp6_prefix_selected_interface'],
2374
	$interfaces
2375
))->setHelp('Select the interface on which to apply the prefix delegation.');
2376

  
2364 2377
$group = new Form_Group('Authentication statement');
2365 2378

  
2366 2379
$group->add(new Form_Input(

Also available in: Unified diff