From d9eac32097d87e96b6bb62bb3b0ddab53a57eb43 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Fri, 5 Aug 2016 15:13:13 -0300 Subject: Ignore linkup eventos for interfaces that are member of bridges and have no IP address configured --- src/etc/rc.linkup | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/etc/rc.linkup b/src/etc/rc.linkup index 2078369..6179371 100755 --- a/src/etc/rc.linkup +++ b/src/etc/rc.linkup @@ -76,8 +76,18 @@ function handle_argument_group($iface, $argument2) { return; } - $ipaddr = $config['interfaces'][$iface]['ipaddr']; - $ip6addr = $config['interfaces'][$iface]['ipaddrv6']; + if (empty($config['interfaces'][$iface]['ipaddr'])) { + $ipaddr = ''; + } else { + $ipaddr = $config['interfaces'][$iface]['ipaddr']; + } + + if (empty($config['interfaces'][$iface]['ipaddrv6'])) { + $ip6addr = ''; + } else { + $ip6addr = $config['interfaces'][$iface]['ipaddrv6']; + } + $staticv4 = false; if (empty($ipaddr)) { $staticv4 = true; @@ -90,6 +100,15 @@ function handle_argument_group($iface, $argument2) { } else { $staticv6 = is_ipaddrv6($ip6addr); } + + /* Take care of events on bridge members when IP is configured on bridge */ + $bridge_if = link_interface_to_bridge($iface); + if (!empty($bridge_if) && empty($ipaddr) && empty($ip6addr)) { + log_error("Ignoring link event for bridge member without IP config"); + + return; + } + if ($staticv4 === true && $staticv6 === true) { $friendly = convert_friendly_interface_to_friendly_descr($iface); log_error("Hotplug event detected for {$friendly}({$iface}) static IP ({$ipaddr} {$ip6addr})"); -- cgit v1.1