Revision bfb3e717
Added by Seth Mos over 14 years ago
| etc/inc/services.inc | ||
|---|---|---|
| 133 | 133 |
$rtadvdconf .= "\t:prefixlen#{$ifcfgsnv6}:\\\n";
|
| 134 | 134 |
$rtadvdconf .= "\t:raflags=\"mo\":\\\n"; |
| 135 | 135 |
$rtadvdconf .= "\t:tc=ether:\n"; |
| 136 |
$rtadvdconf .= "\n\n"; |
|
| 137 |
|
|
| 136 |
$rtadvdconf .= "\n\n"; |
|
| 138 | 137 |
} |
| 139 | 138 |
|
| 140 | 139 |
fwrite($fd, $rtadvdconf); |
| ... | ... | |
| 528 | 527 |
|
| 529 | 528 |
/* kill any running dhcpd */ |
| 530 | 529 |
if(is_process_running("dhcpd")) {
|
| 531 |
killbypid("{$g['dhcpd_chroot_path']}{$g['varrun_path']}/'dhcpdv6.pid");
|
|
| 530 |
killbypid("{$g['dhcpd_chroot_path']}{$g['varrun_path']}/dhcpdv6.pid");
|
|
| 532 | 531 |
} |
| 533 | 532 |
|
| 534 | 533 |
/* DHCP enabled on any interfaces? */ |
| ... | ... | |
| 613 | 612 |
$dhcpv6num = 0; |
| 614 | 613 |
foreach ($dhcpdv6cfg as $dhcpv6if => $dhcpv6ifconf) {
|
| 615 | 614 |
|
| 616 |
interfaces_staticarp_configure($dhcpv6if); |
|
| 617 |
|
|
| 618 | 615 |
if (!isset($dhcpv6ifconf['enable'])) |
| 619 | 616 |
continue; |
| 620 | 617 |
|
| ... | ... | |
| 683 | 680 |
|
| 684 | 681 |
if($is_olsr_enabled == true) |
| 685 | 682 |
if($dhcpv6ifconf['netmask']) |
| 686 |
$subnetmask = gen_subnet_mask($dhcpv6ifconf['netmask']); |
|
| 683 |
$subnetmask = gen_subnet_maskv6($dhcpv6ifconf['netmask']);
|
|
| 687 | 684 |
|
| 688 | 685 |
$dnscfgv6 = ""; |
| 689 | 686 |
|
| ... | ... | |
| 750 | 747 |
$dnscfgv6 |
| 751 | 748 |
|
| 752 | 749 |
EOD; |
| 750 |
|
|
| 751 |
if(is_ipaddrv6($dhcpv6ifconf['prefixrange']['from']) && is_ipaddrv6($dhcpv6ifconf['prefixrange']['to'])) {
|
|
| 752 |
$dhcpdv6conf .= " prefix6 {$dhcpv6ifconf['prefixrange']['from']} {$dhcpv6ifconf['prefixrange']['to']} /{$dhcpv6ifconf['prefixrange']['prefixlength']};\n";
|
|
| 753 |
|
|
| 754 |
} |
|
| 753 | 755 |
// default-lease-time |
| 754 | 756 |
if ($dhcpv6ifconf['defaultleasetime']) |
| 755 | 757 |
$dhcpdv6conf .= " default-lease-time {$dhcpv6ifconf['defaultleasetime']};\n";
|
Also available in: Unified diff
Add a prefix pool for prefix delegation. Doesn't work yet. ISC dhcpd complaining about the network mask being too short.