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: fix edge cases in make_ipv6_64_address()

Browse Source 
empty("00") != empty("0") so ::1000:0 would produce a suffix of ::1000
while ::1000:00 would correctly generate ::1000:00
This commit is contained in:
Franco Fichtner 2018-09-11 09:58:13 +00:00
parent 9d4552b5e7
commit 5eb0dd5f11
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4638,25 +4638,21 @@ function get_carp_interface_status($carpinterface)
function make_ipv6_64_address($prefix, $suffix)
{
$prefix_array = array();
$prefix_array = explode(':', $prefix);
$prefix_array[4] = '0';
$prefix_array[5] = '0';
$prefix_array[6] = '0';
$prefix_array[7] = '0';
$prefix_array = explode(':', Net_IPv6::uncompress($prefix));
$suffix_array = explode(':', Net_IPv6::uncompress($suffix));
$suffix_array = array();
$suffix_array = explode(':', $suffix);
$suffix_size = sizeof($suffix_array);
$loop = 7;
for ($count = $suffix_size - 1; $count > 0; $count--) {
if (!empty($suffix_array[$count])) {
$prefix_array[$loop] = $suffix_array[$count];
--$loop;
}
/* unconditionally merge right side of /64 */
foreach (array(4, 5, 6, 7) as $index) {
$prefix_array[$index] = $suffix_array[$index];
}
$address = implode(':', $prefix_array);
return $address;
/* XXX correctly merging the left side of /64 requires user-specified prefix length */
foreach (array(0, 1, 2, 3) as $index) {
if ((int)$suffix_array[$index] === 0) {
continue;
}
$prefix_array[$index] = $suffix_array[$index];
}
return implode(':', $prefix_array);
}