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

services: dhcpv6 override PD range fix; closes #3047

Browse Source 
When using dhcpd6 overide, if the user does not enter a 'to' range
then at present the code writes an invalid PD range to dhcpd6.conf.
This change checks to see whether the user has entered a PD range,
if not then no PD range is written to the conf file.
This commit is contained in:
Martin Wasley 2018-12-16 06:46:26 +00:00 committed by Franco Fichtner
parent 7d07a15fe0
commit f41ca8d0fc
1 changed files with 53 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1175,60 +1175,62 @@ function services_dhcpdv6_configure($verbose = false, $blacklist = array())
'to' => make_ipv6_64_address($ifcfgipv6, $dhcpdv6cfg[$ifname]['range']['to']),
);
$pd_prefix_from_array = explode(':', $dhcpdv6cfg[$ifname]['prefixrange']['from']);
$pd_prefix_to_array = explode(':', $dhcpdv6cfg[$ifname]['prefixrange']['to']);
if (!empty($dhcpdv6cfg[$ifname]['prefixrange']['from']) && !empty($dhcpdv6cfg[$ifname]['prefixrange']['to']) ) {
$pd_prefix_from_array = explode(':', $dhcpdv6cfg[$ifname]['prefixrange']['from']);
$pd_prefix_to_array = explode(':', $dhcpdv6cfg[$ifname]['prefixrange']['to']);
$pd_prefix_from_array[2] = sprintf("%02s", $pd_prefix_from_array[2]);
$pd_prefix_to_array[2] = sprintf("%02s", $pd_prefix_to_array[2]);
$pd_prefix_from_array[2] = sprintf("%02s", $pd_prefix_from_array[2]);
$pd_prefix_to_array[2] = sprintf("%02s", $pd_prefix_to_array[2]);
for ($x = 0; $x < 4; $x++) {
/* make the prefx long format otherwise dhcpd complains */
$ifcfgipv6arr[$x] = sprintf("%04s", $ifcfgipv6arr[$x]);
for ($x = 0; $x < 4; $x++) {
/* make the prefx long format otherwise dhcpd complains */
$ifcfgipv6arr[$x] = sprintf("%04s", $ifcfgipv6arr[$x]);
}
$pd_prefix_from_array_out = $ifcfgipv6arr;
$pd_prefix_to_array_out = $ifcfgipv6arr;
$pdval = intval($dhcpdv6cfg[$ifname]['prefixrange']['prefixlength']);
switch ($pdval) {
// For PD sizes of /60 through /64, the user must do the math!
case 60:
case 62:
case 63:
case 64: // 3&4th bytes on 4th array
$pd_prefix_from_array_out[3] = sprintf("%04s", $ifcfgipv6arr[3]); // make it 4 bytes
$pd_prefix_from_array_out[3] = substr($pd_prefix_from_array_out[3], 0, 2) . $pd_prefix_from_array[2];
$pd_prefix_to_array_out[3] = sprintf("%04s", $ifcfgipv6arr[3]); // make it 4 bytes
$pd_prefix_to_array_out[3] = substr($pd_prefix_to_array_out[3], 0, 2) . $pd_prefix_to_array[2];
break;
case 56: // 1st&2nd bytes on 4th array
$pd_prefix_from_array[2] = str_pad($pd_prefix_from_array[2], 4, "0");
$pd_prefix_from_array_out[3] = sprintf("%s", $pd_prefix_from_array[2]); // make it 4 bytes
$pd_prefix_to_array[2] = str_pad($pd_prefix_to_array[2], 4, "0");
$pd_prefix_to_array_out[3] = sprintf("%s", $pd_prefix_to_array[2]); // make it 4 bytes
break;
case 52: // 1st byte on 4th array only, 0 to f, we only want one byte, but lookout for the user entering more
$len = strlen($pd_prefix_from_array[2]);
$pd_prefix_from_array[2] = substr($pd_prefix_from_array[2], $len - 1, 1);
$pd_prefix_from_array_out[3] = sprintf("%s000", substr($pd_prefix_from_array[2], 0, 1)); // first byte from entered value
$len = strlen($pd_prefix_to_array[2]);
$pd_prefix_to_array[2] = substr($pd_prefix_to_array[2], $len-1, 1);
$pd_prefix_to_array_out[3] = sprintf("%s000", substr($pd_prefix_to_array[2], 0, 1));
break;
case 48: // 4th byte on 2nd array
$pd_prefix_from_array[2] = substr($pd_prefix_from_array[2], 0, 1);
$pd_prefix_from_array_out[1] = substr(sprintf("%03s", $ifcfgipv6arr[1]), 0, 3) . $pd_prefix_from_array[2]; // get 1st 3 byte + nibble
$pd_prefix_to_array[2] = substr($pd_prefix_to_array[2], 0, 1);
$pd_prefix_to_array_out[1] = substr(sprintf("%03s", $ifcfgipv6arr[1]), 0, 3) . $pd_prefix_to_array[2]; // get 1st 3 byte + nibble
break;
}
$ipv6_from_pd_from = implode(':', $pd_prefix_from_array_out);
$ipv6_from_pd_to = implode(':', $pd_prefix_to_array_out);
$dhcpdv6cfg[$ifname]['prefixrange']['from'] = Net_IPv6::compress($ipv6_from_pd_from);
$dhcpdv6cfg[$ifname]['prefixrange']['to'] = Net_IPv6::compress($ipv6_from_pd_to);
}
$pd_prefix_from_array_out = $ifcfgipv6arr;
$pd_prefix_to_array_out = $ifcfgipv6arr;
$pdval = intval($dhcpdv6cfg[$ifname]['prefixrange']['prefixlength']);
switch ($pdval) {
// For PD sizes of /60 through /64, the user must do the math!
case 60:
case 62:
case 63:
case 64: // 3&4th bytes on 4th array
$pd_prefix_from_array_out[3] = sprintf("%04s", $ifcfgipv6arr[3]); // make it 4 bytes
$pd_prefix_from_array_out[3] = substr($pd_prefix_from_array_out[3], 0, 2) . $pd_prefix_from_array[2];
$pd_prefix_to_array_out[3] = sprintf("%04s", $ifcfgipv6arr[3]); // make it 4 bytes
$pd_prefix_to_array_out[3] = substr($pd_prefix_to_array_out[3], 0, 2) . $pd_prefix_to_array[2];
break;
case 56: // 1st&2nd bytes on 4th array
$pd_prefix_from_array[2] = str_pad($pd_prefix_from_array[2], 4, "0");
$pd_prefix_from_array_out[3] = sprintf("%s", $pd_prefix_from_array[2]); // make it 4 bytes
$pd_prefix_to_array[2] = str_pad($pd_prefix_to_array[2], 4, "0");
$pd_prefix_to_array_out[3] = sprintf("%s", $pd_prefix_to_array[2]); // make it 4 bytes
break;
case 52: // 1st byte on 4th array only, 0 to f, we only want one byte, but lookout for the user entering more
$len = strlen($pd_prefix_from_array[2]);
$pd_prefix_from_array[2] = substr($pd_prefix_from_array[2], $len - 1, 1);
$pd_prefix_from_array_out[3] = sprintf("%s000", substr($pd_prefix_from_array[2], 0, 1)); // first byte from entered value
$len = strlen($pd_prefix_to_array[2]);
$pd_prefix_to_array[2] = substr($pd_prefix_to_array[2], $len-1, 1);
$pd_prefix_to_array_out[3] = sprintf("%s000", substr($pd_prefix_to_array[2], 0, 1));
break;
case 48: // 4th byte on 2nd array
$pd_prefix_from_array[2] = substr($pd_prefix_from_array[2], 0, 1);
$pd_prefix_from_array_out[1] = substr(sprintf("%03s", $ifcfgipv6arr[1]), 0, 3) . $pd_prefix_from_array[2]; // get 1st 3 byte + nibble
$pd_prefix_to_array[2] = substr($pd_prefix_to_array[2], 0, 1);
$pd_prefix_to_array_out[1] = substr(sprintf("%03s", $ifcfgipv6arr[1]), 0, 3) . $pd_prefix_to_array[2]; // get 1st 3 byte + nibble
break;
}
$ipv6_from_pd_from = implode(':', $pd_prefix_from_array_out);
$ipv6_from_pd_to = implode(':', $pd_prefix_to_array_out);
$dhcpdv6cfg[$ifname]['prefixrange']['from'] = Net_IPv6::compress($ipv6_from_pd_from);
$dhcpdv6cfg[$ifname]['prefixrange']['to'] = Net_IPv6::compress($ipv6_from_pd_to);
}
}
}