lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 10:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

interfaces: minimum viable approach for #2394

Browse Source
This commit is contained in:
Franco Fichtner 2018-05-07 06:21:41 +00:00
parent 734e6f490e
commit 53994b097d
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/etc/inc/services.inc
View File

@ -286,10 +286,17 @@ function services_radvd_configure($blacklist = array())
if (isset($radvdifs[$realif])) {
continue;
}
$radvdifs[$realif] = 1;
$radvdifs[$realif] = 1;
$autotype = '';
if (isset($config['interfaces'][$trackif]['ipaddrv6'])) {
$autotype = $config['interfaces'][$trackif]['ipaddrv6'];
}
$subnetv6 = $autotype != 'slaac' ? '::' : '2000::';
$mtu = legacy_interface_stats($realif)['mtu'];
$dnslist = array();
$subnetv6 = '::';
$ifcfgsnv6 = '64';
$ifcfgipv6 = get_interface_ipv6($if);
@ -309,19 +316,18 @@ function services_radvd_configure($blacklist = array())
}
}
if (isset($config['interfaces'][$trackif]['ipaddrv6'])) {
$autotype = $config['interfaces'][$trackif]['ipaddrv6'];
$radvdconf .= "# Generated config for {$autotype} delegation from {$trackif} on {$if}\n";
}
$radvdconf .= "# Generated config for {$autotype} delegation from {$trackif} on {$if}\n";
$radvdconf .= "interface {$realif} {\n";
$radvdconf .= "\tAdvSendAdvert on;\n";
$radvdconf .= "\tMinRtrAdvInterval 3;\n";
$radvdconf .= "\tMaxRtrAdvInterval 10;\n";
$mtu = legacy_interface_stats($realif)['mtu'];
$radvdconf .= "\tAdvLinkMTU ". (is_numeric($mtu) ? $mtu : 1280) .";\n";
$radvdconf .= "\tAdvOtherConfigFlag on;\n";
$radvdconf .= "\tprefix {$subnetv6}/{$ifcfgsnv6} {\n";
if ($autotype == 'slaac') {
$realtrackif = get_real_interface($trackif, 'inet6');
$radvdconf .= "\t\tBase6Interface $realtrackif;\n";
}
$radvdconf .= "\t\tAdvOnLink on;\n";
$radvdconf .= "\t\tAdvAutonomous on;\n";
$radvdconf .= "\t\tAdvRouterAddr on;\n";

7
src/www/interfaces.php
View File

@ -2761,9 +2761,10 @@ include("head.inc");
<?php
foreach (get_configured_interface_with_descr(false, true) as $iface => $ifacename):
switch($config['interfaces'][$iface]['ipaddrv6']) {
case "6to4":
case "6rd":
case "dhcp6":
case '6rd':
case '6to4':
case 'dhcp6':
case 'slaac':
break;
default:
continue 2;