Merge pull request #202 from coreemu/bugfix/quagga-ipv6-only-and-fast-convergence

enable OSPFv2 fast convergence, and fix router-id for IPv6-only nodes

daemon/core/services/quagga.py

@@ -260,7 +260,7 @@ class QuaggaService(CoreService):
                 if netaddr.valid_ipv4(a):
                     return a
         # raise ValueError,  "no IPv4 address found for router ID"
-        return "0.0.0.0"
+        return "0.0.0.%d" % node.id
 
     @staticmethod
     def rj45check(ifc):
@@ -347,9 +347,17 @@ class Ospfv2(QuaggaService):
         return cfg
 
     @classmethod
-    def generatequaggaifcconfig(cls, node, ifc):
-        return cls.mtucheck(ifc)
-
+    def generatequaggaifcconfig(cls,  node,  ifc):
+        cfg = cls.mtucheck(ifc)
+        # external RJ45 connections will use default OSPF timers
+        if cls.rj45check(ifc):
+            return cfg
+        cfg += cls.ptpcheck(ifc)
+        return cfg + """\
+  ip ospf hello-interval 2
+  ip ospf dead-interval 6
+  ip ospf retransmit-interval 5
+"""
 
 class Ospfv3(QuaggaService):
     """