Do not ignore interface events even for pppoe/pptp it does no good.

This commit is contained in:
Ermal Lui 2009-03-01 17:32:08 +00:00
parent 78225e5b05
commit 5b70c17efd

View File

@ -34,29 +34,28 @@ require_once("globals.inc");
require_once("config.inc");
require_once("functions.inc");
function handle_argument_group($argument1, $argument2) {
function handle_argument_group($iface, $argument2) {
global $config;
$ipaddr = $config['interfaces'][$argument1]['ipaddr'];
$ipaddr = $config['interfaces'][$iface]['ipaddr'];
if (is_ipaddr($ipaddr)) {
log_error("Hotplug event detected for {$argument1} but ignoring since interface is configured with static ip({$ipaddr})");
exec("/usr/sbin/arp -d -i {$argument1} -a");
log_error("Hotplug event detected for {$iface} but ignoring since interface is configured with static ip({$ipaddr})");
$iface = get_real_interface($iface);
exec("/usr/sbin/arp -d -i {$iface} -a");
} else {
switch ($argument2) {
case "stop":
case "down":
log_error("DEVD Ethernet detached event for {$argument1}");
if ($ipaddr <> "pppoe" || $ipaddr <> "pptp")
interface_bring_down($iface);
exit;
break; /* LINT - NOTREACHED */
log_error("DEVD Ethernet detached event for {$iface}");
interface_bring_down($iface);
break;
case "start":
case "up":
log_error("DEVD Ethernet attached event for {$argument1}");
exec("/usr/sbin/arp -d -i {$argument1} -a");
log_error("HOTPLUG: Configuring interface {$argument1}");
if ($ipaddr <> "pppoe" || $ipaddr <> "pptp")
interface_configure($iface);
log_error("DEVD Ethernet attached event for {$iface}");
$riface = get_real_interface($iface);
exec("/usr/sbin/arp -d -i {$riface} -a");
log_error("HOTPLUG: Configuring interface {$iface}");
interface_configure($iface);
break;
}
}