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

When reconfiguring interfaces with dhcp types set try to kill any previous dhcp process of the interface already running

Browse Source
This commit is contained in:
Ermal 2013-03-19 11:15:37 +00:00
parent bd66cf325a
commit deb39cf2be
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/inc/interfaces.inc
View File

@ -1173,7 +1173,7 @@ function interface_bring_down($interface = "wan", $destroy = false, $ifacecfg =
case "dhcp":
$pid = find_dhclient_process($realif);
if($pid)
mwexec("/bin/kill {$pid}");
posix_kill($pid, SIGTERM);
sleep(1);
unlink_if_exists("{$g['varetc_path']}/dhclient_{$interface}.conf");
if(does_interface_exist("$realif")) {
@ -3546,6 +3546,9 @@ function interface_dhcpv6_configure($interface = "wan", $wancfg) {
if (!$g['booting'])
filter_configure_sync(false);
$pidv6 = find_dhcp6c_process($wanif);
if ($pidv6)
posix_kill($pidv6, SIGTERM);
/* fire up dhcp6c for IPv6 first, this backgrounds immediately */
mwexec("/usr/local/sbin/dhcp6c -d -c {$g['varetc_path']}/dhcp6c_{$interface}.conf -p {$g['varrun_path']}/dhcp6c_{$wanif}.pid {$wanif}");
sleep(1);
@ -3633,6 +3636,9 @@ EOD;
else
log_error(printf(gettext("Could not bring up %s interface in interface_dhcp_configure()"), $wanif));
$pid = find_dhclient_process($wanif);
if ($pid)
posix_kill($pid, SIGTERM);
/* fire up dhclient */
mwexec("/sbin/dhclient -c {$g['varetc_path']}/dhclient_{$interface}.conf {$wanif} > {$g['tmp_path']}/{$wanif}_output 2> {$g['tmp_path']}/{$wanif}_error_output");