GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-12-26 04:32:51 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/beta' into wip/ngircd

Browse Source 
Conflicts:
	protocols/ircs2s_common.py
	protocols/ts6.py
This commit is contained in:
James Lu 2017-07-05 02:24:10 -07:00
commit 1e5985b608
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
protocols/ircs2s_common.py
View File

@ -322,10 +322,6 @@ class IRCS2SProtocol(IRCCommonProtocol):
sender = self.uplink sender = self.uplink
args.insert(0, sender) args.insert(0, sender)
if self.is_internal_client(sender) or self.is_internal_server(sender):
log.warning("(%s) Received command %s being routed the wrong way!", self.name, command)
return
raw_command = args[1].upper() raw_command = args[1].upper()
args = args[2:] args = args[2:]
@ -336,6 +332,10 @@ class IRCS2SProtocol(IRCCommonProtocol):
if command != raw_command: if command != raw_command:
log.debug('(%s) Translating token %s to command %s', self.name, raw_command, command) log.debug('(%s) Translating token %s to command %s', self.name, raw_command, command)
if self.is_internal_client(sender) or self.is_internal_server(sender):
log.warning("(%s) Received command %s being routed the wrong way!", self.name, command)
return
if command == 'ENCAP': if command == 'ENCAP':
# Special case for TS6 encapsulated commands (ENCAP), in forms like this: # Special case for TS6 encapsulated commands (ENCAP), in forms like this:
# <- :00A ENCAP * SU 42XAAAAAC :GLolol # <- :00A ENCAP * SU 42XAAAAAC :GLolol