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

interfaces: small adjustments, fix debug read

Browse Source
This commit is contained in:
Franco Fichtner 2020-05-10 08:46:18 +02:00
parent 798bd7ec1d
commit bc5405bd54
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2919,23 +2919,28 @@ function interface_dhcpv6_configure($interface = 'wan', $wancfg)
mwexecf('/sbin/ifconfig %s inet6 accept_rtadv -ifdisabled', $realifv6);
/* Enable RFC6204w support for IPv6 Customer Edge (CE) router */
set_single_sysctl("net.inet6.ip6.rfc6204w3", "1");
set_single_sysctl('net.inet6.ip6.rfc6204w3', '1');
/* always kill rtsold in case of reconfigure */
killbypid("/var/run/rtsold.pid", 'TERM', true);
killbypid('/var/run/rtsold.pid', 'TERM', true);
/* fire up rtsold for IPv6 RAs first */
mwexecf(
'/usr/sbin/rtsold -p %s -O %s -R %s %s -a',
$rtsoldcommand = exec_safe(
'/usr/sbin/rtsold -p %s -O %s -R %s -a',
array(
"/var/run/rtsold.pid",
'/var/run/rtsold.pid',
'/var/etc/rtsold_script.sh',
'/usr/bin/true', /* XXX missing proper script to refresh resolv.conf */
empty($syscfg['dhcp6_debug']) ? '-d' : '-D',
)
);
if (!empty($syscfg['dhcp6_debug'])) {
$mode = [ '1' => ' -d', '2' => ' -D' ];
$rtsoldcommand .= $mode[$syscfg['dhcp6_debug']];
}
/* fire up rtsold for IPv6 RAs first */
mwexec($rtsoldcommand);
/* unconditional trigger for hybrid approach, reloads without advertisements */
mwexecf('/var/etc/rtsold_script.sh %s', array($realifv6));
}
@ -3018,10 +3023,10 @@ function interface_dhcpv6_prepare($interface = 'wan', $wancfg, $linkdownevent =
@chmod("/var/etc/dhcp6c_{$interface}_script.sh", 0755);
$dhcp6ccommand = exec_safe(
"/usr/local/sbin/dhcp6c -c %s -p %s",
'/usr/local/sbin/dhcp6c -c %s -p %s',
array(
"/var/etc/dhcp6c.conf",
"/var/run/dhcp6c.pid",
'/var/etc/dhcp6c.conf',
'/var/run/dhcp6c.pid',
)
);