mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run rtsold only for one reply since it will spam with dhcp6c processes otherwise. Also remove ambiguity by using curlies in functions

Browse Source
This commit is contained in:
Ermal 2013-03-19 19:56:55 +00:00
parent 10e000f7d1
commit 9b6010ffc5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
etc/inc/interfaces.inc
View File

@ -2694,10 +2694,12 @@ function find_dhclient_process($interface) {
function find_rtsold_process($interface) {
global $g;
if ($interface)
if ($interface) {
if (isvalidpid("{$g['varrun_path']}/rtsold_{$interface}.pid"))
$pid = trim(file_get_contents("{$g['varrun_path']}/rtsold_{$interface}.pid"), " \n");
else
else
retun (false);
} else
return(false);
return intval($pid);
@ -2706,10 +2708,12 @@ function find_rtsold_process($interface) {
function find_dhcp6c_process($interface) {
global $g;
if ($interface)
if ($interface) {
if (isvalidpid("{$g['varrun_path']}/dhcp6c_{$interface}.pid"))
$pid = trim(file_get_contents("{$g['varrun_path']}/dhcp6c_{$interface}.pid"), " \n");
else
else
retun (false);
} else
return(false);
return intval($pid);
@ -3577,7 +3581,7 @@ function interface_dhcpv6_configure($interface = "wan", $wancfg) {
/* fire up rtsold for IPv6 RAs first, this backgrounds immediately. It will call dhcp6c */
if (isvalidpid("{$g['varrun_path']}/rtsold_{$wanif}.pid"))
killbypid("{$g['varrun_path']}/rtsold_{$wanif}.pid");
mwexec("/usr/sbin/rtsold -m -p {$g['varrun_path']}/rtsold_{$wanif}.pid -O {$g['varetc_path']}/rtsold_{$wanif}_script.sh {$wanif}");
mwexec("/usr/sbin/rtsold -1 -p {$g['varrun_path']}/rtsold_{$wanif}.pid -O {$g['varetc_path']}/rtsold_{$wanif}_script.sh {$wanif}");
/* NOTE: will be called from rtsold invoked script
* link_interface_to_track6($interface, "update");