open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allocate_channel_id: use DB to get list of previous allocations

Browse Source
This commit is contained in:
Brian Warner 2015-04-10 21:32:42 -05:00
parent a03fb3900e
commit 1aab908091
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wormhole/servers/relay.py
View File

@ -199,17 +199,19 @@ class Relay(resource.Resource):
self.free_child(channel_id) self.free_child(channel_id)
def allocate_channel_id(self): def allocate_channel_id(self):
c = self.db.execute("SELECT DISTINCT `channel_id` FROM `allocations`")
allocated = set([row["channel_id"] for row in c.fetchall()])
for size in range(1,4): # stick to 1-999 for now for size in range(1,4): # stick to 1-999 for now
available = set() available = set()
for cid in range(10**(size-1), 10**size): for cid in range(10**(size-1), 10**size):
if cid not in self.channels: if cid not in allocated:
available.add(cid) available.add(cid)
if available: if available:
return random.choice(list(available)) return random.choice(list(available))
# ouch, 999 currently allocated. Try random ones for a while. # ouch, 999 currently allocated. Try random ones for a while.
for tries in range(1000): for tries in range(1000):
cid = random.randrange(1000, 1000*1000) cid = random.randrange(1000, 1000*1000)
if cid not in self.channels: if cid not in allocated:
return cid return cid
raise ValueError("unable to find a free channel-id") raise ValueError("unable to find a free channel-id")