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

Rework interface_bring_down function a bit. Remove un-needed unlink calls to mpd.links

Browse Source 
Moved three "unlink_if_exists" calls to happen after calling kill_by_pid for mpd processes.
The unlinked files are useful during the process of brining down the mpd interfaces
for calculating the link uptime in the "linkdown" script.
This commit is contained in:
gnhb 2010-04-10 20:28:59 +07:00
parent 673d29c002
commit 73ee49f204
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
etc/inc/interfaces.inc
View File

@ -816,24 +816,16 @@ function interface_bring_down($interface = "wan", $destroy = false) {
$realif = get_real_interface($interface);
/* remove interface up file if it exists */
unlink_if_exists("{$g['tmp_path']}/{$realif}up");
unlink_if_exists("{$g['vardb_path']}/{$interface}ip");
unlink_if_exists("{$g['tmp_path']}/{$realif}_router");
switch ($ifcfg['ipaddr']) {
case "pppoe":
killbypid("{$g['varrun_path']}/pppoe_{$interface}.pid");
sleep(2);
unlink_if_exists("{$g['varetc_path']}/mpd_{$interface}.conf");
unlink_if_exists("{$g['varetc_path']}/mpd_{$interface}.links");
break;
case "pptp":
killbypid("{$g['varrun_path']}/pptp_{$interface}.pid");
sleep(2);
unlink_if_exists("{$g['varetc_path']}/mpd_{$interface}.conf");
unlink_if_exists("{$g['varetc_path']}/mpd_{$interface}.links");
break;
case "carpdev-dhcp":
/*
@ -854,6 +846,8 @@ function interface_bring_down($interface = "wan", $destroy = false) {
break;
case "ppp":
killbypid("{$g['varrun_path']}/ppp_{$interface}.pid");
sleep(2);
unlink_if_exists("{$g['varetc_path']}/mpd_{$interface}.conf");
break;
default:
if(does_interface_exist("$realif")) {
@ -864,6 +858,11 @@ function interface_bring_down($interface = "wan", $destroy = false) {
break;
}
/* remove interface up file if it exists */
unlink_if_exists("{$g['tmp_path']}/{$realif}up");
unlink_if_exists("{$g['vardb_path']}/{$interface}ip");
unlink_if_exists("{$g['tmp_path']}/{$realif}_router");
/* hostapd and wpa_supplicant do not need to be running when the interface is down.
* They will also use 100% CPU if running after the wireless clone gets deleted. */
if (is_array($ifcfg['wireless'])) {