GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-01-12 05:02:33 +01:00
Code Issues Projects Releases Wiki Activity

ts6: rewrite end-of-burst code (EOB is literally just a PING in ts6)

Browse Source
This commit is contained in:
James Lu 2016-01-23 13:11:31 -08:00
parent 5a68dc1bc5
commit 4b939ea641
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
protocols/ts6.py
View File

@ -25,6 +25,9 @@ class TS6Protocol(TS6BaseProtocol):
self.sidgen = utils.TS6SIDGenerator(self.irc) self.sidgen = utils.TS6SIDGenerator(self.irc)
self.uidgen = {} self.uidgen = {}
# Track whether we've received end-of-burst from the uplink.
self.has_eob = False
### OUTGOING COMMANDS ### OUTGOING COMMANDS
def spawnClient(self, nick, ident='null', host='null', realhost=None, modes=set(), def spawnClient(self, nick, ident='null', host='null', realhost=None, modes=set(),
@ -333,6 +336,10 @@ class TS6Protocol(TS6BaseProtocol):
f('SERVER %s 0 :%s' % (self.irc.serverdata["hostname"], f('SERVER %s 0 :%s' % (self.irc.serverdata["hostname"],
self.irc.serverdata.get('serverdesc') or self.irc.botdata['serverdesc'])) self.irc.serverdata.get('serverdesc') or self.irc.botdata['serverdesc']))
# Finally, end all the initialization with a PING - that's Charybdis'
# way of saying end-of-burst :)
self.ping()
def handle_pass(self, numeric, command, args): def handle_pass(self, numeric, command, args):
""" """
Handles the PASS command, used to send the server's SID and negotiate Handles the PASS command, used to send the server's SID and negotiate
@ -378,16 +385,6 @@ class TS6Protocol(TS6BaseProtocol):
log.debug('(%s) self.irc.connected set!', self.irc.name) log.debug('(%s) self.irc.connected set!', self.irc.name)
self.irc.connected.set() self.irc.connected.set()
# Charybdis doesn't have the idea of an explicit endburst; but some plugins
# like relay require it to know that the network's connected.
# We'll set a timer to manually call endburst. It's not beautiful,
# but it's the best we can do.
endburst_timer = threading.Timer(1, self.irc.callHooks,
args=([self.irc.uplink, 'ENDBURST', {}],))
log.debug('(%s) Starting delay to send ENDBURST', self.irc.name)
endburst_timer.start()
def handle_ping(self, source, command, args): def handle_ping(self, source, command, args):
"""Handles incoming PING commands.""" """Handles incoming PING commands."""
# PING: # PING:
@ -407,6 +404,15 @@ class TS6Protocol(TS6BaseProtocol):
if self.irc.isInternalServer(destination): if self.irc.isInternalServer(destination):
self._send(destination, 'PONG %s %s' % (destination, source)) self._send(destination, 'PONG %s %s' % (destination, source))
if destination == self.irc.sid and not self.has_eob:
# Charybdis' idea of endburst is just sending a PING. No, really!
# https://github.com/charybdis-ircd/charybdis/blob/dc336d1/modules/core/m_server.c#L484-L485
self.has_eob = True
# Return the endburst hook.
return {'parse_as': 'ENDBURST'}
def handle_pong(self, source, command, args): def handle_pong(self, source, command, args):
"""Handles incoming PONG commands.""" """Handles incoming PONG commands."""
if source == self.irc.uplink: if source == self.irc.uplink: