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

dhcp: address issue found by @marjohn56

Browse Source 
PR: https://github.com/opnsense/core/pull/2077
This commit is contained in:
Franco Fichtner 2018-01-10 18:22:36 +01:00
parent c0f45feb0a
commit c62f01f993
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plist
View File

@ -569,6 +569,7 @@
/usr/local/opnsense/scripts/OPNsense/CaptivePortal/sql/init.sql
/usr/local/opnsense/scripts/OPNsense/CaptivePortal/strip_template.py
/usr/local/opnsense/scripts/dhcp/get_leases.py
/usr/local/opnsense/scripts/dhcp/prefixes.php
/usr/local/opnsense/scripts/dns/unbound_dhcpd.py
/usr/local/opnsense/scripts/filter/delete_table.py
/usr/local/opnsense/scripts/filter/download_geoip.py
@ -951,7 +952,6 @@
/usr/local/sbin/ppp-linkup
/usr/local/sbin/ppp-log-uptime.sh
/usr/local/sbin/ppp-uptime.sh
/usr/local/sbin/prefixes.php
/usr/local/wizard/openvpn.xml
/usr/local/wizard/system.xml
/usr/local/www/carp_status.php

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

@ -1324,7 +1324,7 @@ EOD;
/* fire up dhcpd in a chroot */
if (count($dhcpdv6ifs) > 0) {
mwexec('/usr/local/sbin/dhcpd -6 -user dhcpd -group dhcpd -chroot /var/dhcpd -cf /etc/dhcpdv6.conf -pf /var/run/dhcpdv6.pid ' . join(' ', $dhcpdv6ifs));
mwexec('/usr/local/sbin/dhcpleases6 -c "/usr/local/bin/php -f /usr/local/sbin/prefixes.php|/bin/sh" -l /var/dhcpd/var/db/dhcpd6.leases');
mwexec('/usr/local/sbin/dhcpleases6 -c "/usr/local/sbin/prefixes.php|/bin/sh" -l /var/dhcpd/var/db/dhcpd6.leases');
}
if ($verbose) {

4
src/sbin/prefixes.php → src/opnsense/scripts/dhcp/prefixes.php Normal file → Executable file
View File

@ -1,3 +1,4 @@
#!/usr/local/bin/php
<?php
$leases_file = "/var/dhcpd/var/db/dhcpd6.leases";
@ -60,7 +61,8 @@ foreach ($duid_arr as $entry) {
// echo "add routes\n";
if (count($routes) > 0) {
foreach ($routes as $address => $prefix) {
echo "/sbin/route change -inet6 {$prefix} {$address}\n";
echo "/sbin/route delete -inet6 {$prefix} {$address}\n";
echo "/sbin/route add -inet6 {$prefix} {$address}\n";
}
}