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

interfaces: properly pick up subnet6 for link-local scope

Browse Source
This commit is contained in:
Franco Fichtner 2016-07-16 19:05:17 +02:00
parent 01f3c1297c
commit b1161dfd96
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/etc/inc/interfaces.lib.inc
View File

@ -302,16 +302,19 @@ function _legacy_getall_interface_addresses($ifs)
break;
case 'inet6':
$addr = strtok($stat[1], '%');
/* throw error on ifconfig output scan fail: */
unset($mask);
for ($i = 0; $i < count($stat) - 1; ++$i) {
if ($stat[$i] == 'prefixlen') {
$mask = intval($stat[$i + 1]);
}
}
if (!isset($addrs['ipaddr6']) && strpos($addr, 'fe80:') !== 0) {
/* does not pick up link-local */
$addrs['subnetbits6'] = $mask;
$addrs['ipaddr6'] = $addr;
for ($i = 0; $i < count($stat); ++$i) {
if ($stat[$i] == 'prefixlen') {
$addrs['subnetbits6'] = intval($stat[$i+1]);
}
}
$addrs['compat'][] = $addr . '/' . $addrs['subnetbits6'];
}
$addrs['compat'][] = $addr . '/' . $mask;
break;
case 'ether':
$addrs['macaddr'] = $stat[1];