From a9518178f9aeead27fa40aef0fd040682f6f07f2 Mon Sep 17 00:00:00 2001 From: Ermal Date: Tue, 19 Mar 2013 20:19:03 +0000 Subject: [PATCH] Remove functions that are not used now with once mode of rtsold --- etc/inc/interfaces.inc | 14 -------------- usr/local/www/interfaces.php | 3 --- 2 files changed, 17 deletions(-) diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 97b8c08de9..3935d7198b 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -1197,9 +1197,6 @@ function interface_bring_down($interface = "wan", $destroy = false, $ifacecfg = case "slaac": case "dhcp6": $pidv6 = find_dhcp6c_process($realif); - if($pidv6) - posix_kill($pidv6, SIGTERM); - $pidv6 = find_rtsold_process($realif); if($pidv6) posix_kill($pidv6, SIGTERM); sleep(3); @@ -2691,17 +2688,6 @@ function find_dhclient_process($interface) { return intval($pid); } -function find_rtsold_process($interface) { - global $g; - - if ($interface && isvalidpid("{$g['varrun_path']}/rtsold_{$interface}.pid")) - $pid = trim(file_get_contents("{$g['varrun_path']}/rtsold_{$interface}.pid"), " \n"); - else - return(false); - - return intval($pid); -} - function find_dhcp6c_process($interface) { global $g; diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index cd3b78fae9..901151bd9b 100755 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -727,9 +727,6 @@ if ($_POST['apply']) { $pid = find_dhcp6c_process($wancfg['if']); if($pid) posix_kill($pid, SIGTERM); - $pid = find_rtsold_process($wancfg['if']); - if($pid) - posix_kill($pid, SIGTERM); } else if ($wancfg['ipaddr'] == "dhcp") { $pid = find_dhclient_process($wancfg['if']); if($pid)