From cd479193fc3e9fcae44a8f465dd8960402bbeaac Mon Sep 17 00:00:00 2001 From: tgoff0 Date: Fri, 22 May 2015 00:53:38 +0000 Subject: [PATCH] checked for the attachment of a server interface to a control net before establishing a GRE tunnel with peers. --- daemon/core/broker.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/daemon/core/broker.py b/daemon/core/broker.py index 23cb5623..7aa2e457 100644 --- a/daemon/core/broker.py +++ b/daemon/core/broker.py @@ -17,6 +17,7 @@ import os, socket, select, threading, sys from core.api import coreapi from core.coreobj import PyCoreNode, PyCoreNet from core.emane.nodes import EmaneNet +from core.netns.nodes import CtrlNet from core.phys.pnodes import PhysicalNode from core.misc.ipaddr import IPAddr from core.conf import ConfigurableManager @@ -330,6 +331,10 @@ class CoreBroker(ConfigurableManager): # add other nets here that do not require tunnels if isinstance(net, EmaneNet): return None + if isinstance(net, CtrlNet): + if hasattr(net, 'serverintf'): + if net.serverintf is not None: + return None servers = self.getserversbynode(n) if len(servers) < 2: