Merge pull request #3788 from znerol/feature/master/bridge-ipv6-auto-linklocal

1 files changed, 21 insertions, 0 deletions

diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index 003738e..fcc6ba1 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -560,6 +560,8 @@ function interface_bridge_configure(&$bridge, $checkmember = 0) {
 
 	interface_bridge_configure_advanced($bridge);
 
+	interface_bridge_configure_ip6linklocal($bridge);
+
 	if ($bridge['bridgeif']) {
 		interfaces_bring_up($bridge['bridgeif']);
 	} else {
@@ -686,6 +688,25 @@ function interface_bridge_configure_advanced($bridge) {
 	}
 }
 
+function interface_bridge_configure_ip6linklocal($bridge) {
+	$bridgeif = $bridge['bridgeif'];
+
+	$members = explode(',', $bridge['members']);
+	if (!count($members)) {
+		return;
+	}
+
+	$auto_linklocal = isset($bridge['ip6linklocal']);
+	$bridgeop = $auto_linklocal ? '' : '-';
+	$memberop = $auto_linklocal ? '-' : '';
+
+	mwexec("/usr/sbin/ndp -i {$bridgeif} -- {$bridgeop}auto_linklocal");
+	foreach ($members as $member) {
+		$realif = get_real_interface($member);
+		mwexec("/usr/sbin/ndp -i {$realif} -- {$memberop}auto_linklocal");
+	}
+}
+
 function interface_bridge_add_member($bridgeif, $interface, $flagsapplied = false) {
 	global $config;