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

updates to rename utils.hash to utils.hashkey to avoid builtin conflict

Browse source
This commit is contained in:
Blake Harnden 2019-06-21 08:51:56 -07:00
parent a5f26e664a
commit c57089284f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/core/api/tlv/broker.py
View file

@ -394,7 +394,7 @@ class CoreBroker(object):
# this is the master session # this is the master session
sid = self.session.id sid = self.session.id
key = (sid << 16) ^ utils.hash(n1num) ^ (utils.hash(n2num) << 8) key = (sid << 16) ^ utils.hashkey(n1num) ^ (utils.hashkey(n2num) << 8)
return key & 0xFFFFFFFF return key & 0xFFFFFFFF
def addtunnel(self, remoteip, n1num, n2num, localnum): def addtunnel(self, remoteip, n1num, n2num, localnum):

2
daemon/core/utils.py
View file

@ -18,7 +18,7 @@ from core import CoreCommandError
DEVNULL = open(os.devnull, "wb") DEVNULL = open(os.devnull, "wb")
def hash(value): def hashkey(value):
""" """
Provide a consistent hash that can be used in place Provide a consistent hash that can be used in place
of the builtin hash, that no longer behaves consistently of the builtin hash, that no longer behaves consistently