From 3260852179646734341fe691559e25a825c45403 Mon Sep 17 00:00:00 2001 From: "ahrenholz@gmail.com" Date: Mon, 16 Dec 2013 18:52:41 +0000 Subject: [PATCH] update MDR service to use broadcast interfaces for links to non-WLAN nets (Boeing r1812) --- trunk/daemon/core/services/quagga.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/trunk/daemon/core/services/quagga.py b/trunk/daemon/core/services/quagga.py index 226d0f44..5dbace8b 100644 --- a/trunk/daemon/core/services/quagga.py +++ b/trunk/daemon/core/services/quagga.py @@ -452,9 +452,10 @@ class Ospfv3mdr(Ospfv3): @classmethod def generatequaggaifcconfig(cls, node, ifc): cfg = cls.mtucheck(ifc) - - return cfg + """\ - ipv6 ospf6 instance-id 65 + cfg += " ipv6 ospf6 instance-id 65\n" + if ifc.net is not None and \ + isinstance(ifc.net, (nodes.WlanNode, nodes.EmaneNode)): + return cfg + """\ ipv6 ospf6 hello-interval 2 ipv6 ospf6 dead-interval 6 ipv6 ospf6 retransmit-interval 5 @@ -463,6 +464,8 @@ class Ospfv3mdr(Ospfv3): ipv6 ospf6 adjacencyconnectivity uniconnected ipv6 ospf6 lsafullness mincostlsa """ + else: + return cfg addservice(Ospfv3mdr)