afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
enable OSPFv2 fast convergence, and fix router-id for IPv6-only nodes
This commit is contained in:
bharnden 2020-04-30 13:18:05 -07:00 • committed by GitHub
commit 337c41528a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
daemon/core/services/quagga.py
View file

@ -260,7 +260,7 @@ class QuaggaService(CoreService):
if netaddr.valid_ipv4(a): if netaddr.valid_ipv4(a):
return a return a
# raise ValueError, "no IPv4 address found for router ID" # raise ValueError, "no IPv4 address found for router ID"
return "0.0.0.0" return "0.0.0.%d" % node.id
@staticmethod @staticmethod
def rj45check(ifc): def rj45check(ifc):
@ -347,9 +347,17 @@ class Ospfv2(QuaggaService):
return cfg return cfg
@classmethod @classmethod
def generatequaggaifcconfig(cls, node, ifc): def generatequaggaifcconfig(cls, node, ifc):
return cls.mtucheck(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): class Ospfv3(QuaggaService):
""" """