lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 00:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

interfaces: stop modifying tracking ifs as fe80::1:1

Browse Source 
This is an experiement.
This commit is contained in:
Franco Fichtner 2018-10-31 12:33:14 +01:00
parent 028bfa10e8
commit 9d9251fd20
2 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/etc/inc/interfaces.inc
View File

@ -2572,26 +2572,6 @@ function interface_track6_configure($interface = 'lan', $lancfg, $linkupevent =
return;
}
$lladdr = !empty($lancfg['track6-lladdr']) ? $lancfg['track6-lladdr'] : 'fe80::1:1';
$realif = get_real_interface($interface, 'inet6');
/*
* Always configure a fixed link-local on the track6 interfaces.
*
* The history of this change is under dispute. It was originally
* added to be able to access the web GUI under easily remembered
* IPv6 address, but it has issues with CARP and other "two boxes
* in one network". Now we added the override for fe80::1:1, and
* in the end it should work either way and all of this could be
* removed. Still considering complete removal for 19.1.
*/
$linklocal = find_interface_ipv6_ll($realif);
if (!empty($linklocal)) {
mwexecf('/sbin/ifconfig %s inet6 %s delete', array($realif, $linklocal));
}
mwexecf('/sbin/ifconfig %s inet6 %s', array($realif, "{$lladdr}%{$realif}"));
switch ($trackcfg['ipaddrv6']) {
case '6to4':
interface_track6_6to4_configure($interface, $lancfg);

14
src/www/interfaces.php
View File

@ -426,7 +426,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
'subnet',
'subnetv6',
'track6-interface',
'track6-lladdr',
'track6-prefix-id',
'rfc3118_isp',
'rfc3118_username',
@ -795,9 +794,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
}
/* XXX should also check for duplicate delegation in peer trackers */
}
if (!empty($pconfig['track6-lladdr']) && (!is_ipaddrv6($pconfig['track6-lladdr']) || !is_linklocal($pconfig['track6-lladdr']))) {
$input_errors[] = gettext('A valid link-local tracking router address must be specified.');
}
break;
}
@ -1226,7 +1222,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
case 'track6':
$new_config['ipaddrv6'] = 'track6';
$new_config['track6-interface'] = $pconfig['track6-interface'];
$new_config['track6-lladdr'] = $pconfig['track6-lladdr'];
$new_config['track6-prefix-id'] = 0;
if (ctype_xdigit($pconfig['track6-prefix-id--hex'])) {
$new_config['track6-prefix-id'] = intval($pconfig['track6-prefix-id--hex'], 16);
@ -3027,15 +3022,6 @@ include("head.inc");
</div>
</td>
</tr>
<tr>
<td><a id="help_for_track6-lladdr" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?= gettext('Link-local router address') ?></td>
<td>
<input name="track6-lladdr" type="text" id="track6-lladdr" value="<?= html_safe($pconfig['track6-lladdr']) ?>" placeholder="fe80::1:1"/>
<div class="hidden" data-for="help_for_track6-lladdr">
<?= gettext('The value in this field is the link-local router address. Optionally overrides the recommended use of fe80::1:1.') ?>
</div>
</td>
</tr>
<tr>
<td><a id="help_for_dhcpd6_opt" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?= gettext('Manual configuration') ?></td>
<td>