|
|
|
@ -38,6 +38,10 @@ def getChanFree(net, new):
|
|
|
|
|
if i in new:
|
|
|
|
|
continue
|
|
|
|
|
name = net + str(i)
|
|
|
|
|
if name not in main.IRCPool.keys():
|
|
|
|
|
continue
|
|
|
|
|
if not main.IRCPool[name].isconnected:
|
|
|
|
|
continue
|
|
|
|
|
chanfree[i] = main.IRCPool[name].chanlimit - len(main.IRCPool[name].channels)
|
|
|
|
|
chanlimits.add(main.IRCPool[name].chanlimit)
|
|
|
|
|
if not len(chanlimits) == 1:
|
|
|
|
@ -131,20 +135,15 @@ def keepChannels(net, listinfo, mean, sigrelay, relay):
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def joinSingle(net, channel):
|
|
|
|
|
if allRelaysActive(net):
|
|
|
|
|
# Use the algorithm to allocate our channel to a relay
|
|
|
|
|
eca = emptyChanAllocate(net, [channel], None, [])
|
|
|
|
|
if not len(eca.keys()) == 1:
|
|
|
|
|
return False
|
|
|
|
|
num = list(eca.keys())[0]
|
|
|
|
|
name = f"{net}{num}"
|
|
|
|
|
if name not in main.IRCPool:
|
|
|
|
|
return False
|
|
|
|
|
main.IRCPool[name].join(channel)
|
|
|
|
|
return num
|
|
|
|
|
else:
|
|
|
|
|
error("All relays for %s are not active" % net)
|
|
|
|
|
eca = emptyChanAllocate(net, [channel], None, [])
|
|
|
|
|
if not len(eca.keys()) == 1:
|
|
|
|
|
return False
|
|
|
|
|
num = list(eca.keys())[0]
|
|
|
|
|
name = f"{net}{num}"
|
|
|
|
|
if name not in main.IRCPool:
|
|
|
|
|
return False
|
|
|
|
|
main.IRCPool[name].join(channel)
|
|
|
|
|
return num
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def partSingle(net, channel):
|
|
|
|
|