GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-01 01:09:22 +01:00
Code Issues Projects Releases Wiki Activity

protocols: add support for endburst_delay in spawnServer (#128)

Browse Source
This commit is contained in:
James Lu 2015-12-17 21:18:11 -08:00
parent f79524e9e1
commit 6b14a885bc
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
protocols/inspircd.py
View File

@ -2,6 +2,7 @@ import time
import sys import sys
import os import os
import re import re
import threading
# Import hacks to access utils and classes... # Import hacks to access utils and classes...
curdir = os.path.dirname(__file__) curdir = os.path.dirname(__file__)
@ -263,12 +264,17 @@ class InspIRCdProtocol(TS6BaseProtocol):
else: else:
self._send(source, 'AWAY') self._send(source, 'AWAY')
def spawnServer(self, name, sid=None, uplink=None, desc=None): def spawnServer(self, name, sid=None, uplink=None, desc=None, endburst_delay=0):
""" """
Spawns a server off a PyLink server. desc (server description) Spawns a server off a PyLink server. desc (server description)
defaults to the one in the config. uplink defaults to the main PyLink defaults to the one in the config. uplink defaults to the main PyLink
server, and sid (the server ID) is automatically generated if not server, and sid (the server ID) is automatically generated if not
given. given.
If endburst_delay is set greater than zero, the sending of ENDBURST
will be delayed by the amount given. This can be used to prevent
pseudoserver bursts from triggering IRCd join-flood preventions,
and prevent connections from filling up the snomasks too much.
""" """
# -> :0AL SERVER test.server * 1 0AM :some silly pseudoserver # -> :0AL SERVER test.server * 1 0AM :some silly pseudoserver
uplink = uplink or self.irc.sid uplink = uplink or self.irc.sid
@ -289,7 +295,13 @@ class InspIRCdProtocol(TS6BaseProtocol):
raise ValueError('Invalid server name %r' % name) raise ValueError('Invalid server name %r' % name)
self._send(uplink, 'SERVER %s * 1 %s :%s' % (name, sid, desc)) self._send(uplink, 'SERVER %s * 1 %s :%s' % (name, sid, desc))
self.irc.servers[sid] = IrcServer(uplink, name, internal=True, desc=desc) self.irc.servers[sid] = IrcServer(uplink, name, internal=True, desc=desc)
self._send(sid, 'ENDBURST')
endburstf = lambda: self._send(sid, 'ENDBURST')
if endburst_delay:
# Delay ENDBURST by X seconds if requested.
threading.Timer(endburst_delay, endburstf, ()).start()
else: # Else, send burst immediately
endburstf()
return sid return sid
def squitServer(self, source, target, text='No reason given'): def squitServer(self, source, target, text='No reason given'):

5
protocols/ts6_common.py
View File

@ -105,12 +105,15 @@ class TS6BaseProtocol(Protocol):
self.irc.channels[target].topic = text self.irc.channels[target].topic = text
self.irc.channels[target].topicset = True self.irc.channels[target].topicset = True
def spawnServer(self, name, sid=None, uplink=None, desc=None): def spawnServer(self, name, sid=None, uplink=None, desc=None, endburst_delay=0):
""" """
Spawns a server off a PyLink server. desc (server description) Spawns a server off a PyLink server. desc (server description)
defaults to the one in the config. uplink defaults to the main PyLink defaults to the one in the config. uplink defaults to the main PyLink
server, and sid (the server ID) is automatically generated if not server, and sid (the server ID) is automatically generated if not
given. given.
Note: TS6 doesn't use a specific ENDBURST command, so the endburst_delay
option will be ignored if given.
""" """
# -> :0AL SID test.server 1 0XY :some silly pseudoserver # -> :0AL SID test.server 1 0XY :some silly pseudoserver
uplink = uplink or self.irc.sid uplink = uplink or self.irc.sid