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

checked for the attachment of a server interface to a control net before establishing a GRE tunnel with peers.

Browse source
This commit is contained in:
tgoff0@gmail.com 2015-05-22 00:53:38 +00:00
parent 665ad661e0
commit cb59e0d929
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
trunk/daemon/core/broker.py
View file

@ -17,6 +17,7 @@ import os, socket, select, threading, sys
from core.api import coreapi from core.api import coreapi
from core.coreobj import PyCoreNode, PyCoreNet from core.coreobj import PyCoreNode, PyCoreNet
from core.emane.nodes import EmaneNet from core.emane.nodes import EmaneNet
from core.netns.nodes import CtrlNet
from core.phys.pnodes import PhysicalNode from core.phys.pnodes import PhysicalNode
from core.misc.ipaddr import IPAddr from core.misc.ipaddr import IPAddr
from core.conf import ConfigurableManager from core.conf import ConfigurableManager
@ -330,6 +331,10 @@ class CoreBroker(ConfigurableManager):
# add other nets here that do not require tunnels # add other nets here that do not require tunnels
if isinstance(net, EmaneNet): if isinstance(net, EmaneNet):
return None return None
if isinstance(net, CtrlNet):
if hasattr(net, 'serverintf'):
if net.serverintf is not None:
return None
servers = self.getserversbynode(n) servers = self.getserversbynode(n)
if len(servers) < 2: if len(servers) < 2: