From fb3414852ce306d07f03717916757ef78cb3deda Mon Sep 17 00:00:00 2001 From: "ahrenholz@gmail.com" Date: Wed, 2 Apr 2014 21:19:41 +0000 Subject: [PATCH] fix hash calculation used to determine GRE tunnel keys for fixing tunnels between distributed controlnets (Boeing r1830) --- trunk/daemon/core/broker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trunk/daemon/core/broker.py b/trunk/daemon/core/broker.py index f3bcf72b..96865a50 100644 --- a/trunk/daemon/core/broker.py +++ b/trunk/daemon/core/broker.py @@ -286,7 +286,7 @@ class CoreBroker(ConfigurableManager): # this is the master session sid = self.session.sessionid - key = (sid << 16) | hash(n1num) | (hash(n2num) << 8) + key = (sid << 16) ^ hash(n1num) ^ (hash(n2num) << 8) return key & 0xFFFFFFFF def addtunnel(self, remoteip, n1num, n2num, localnum):