diff --git a/evennia/server/inputfuncs.py b/evennia/server/inputfuncs.py index 04135a630b..24f74af19f 100644 --- a/evennia/server/inputfuncs.py +++ b/evennia/server/inputfuncs.py @@ -606,6 +606,7 @@ def msdp_send(session, *args, **kwargs): out[varname] = _monitorable[varname.lower()] session.msg(send=((), out)) + # client specific diff --git a/evennia/server/portal/mssp.py b/evennia/server/portal/mssp.py index 81095b0cd9..d939bcc37b 100644 --- a/evennia/server/portal/mssp.py +++ b/evennia/server/portal/mssp.py @@ -86,8 +86,8 @@ class Mssp(object): "NAME": settings.SERVERNAME, "PLAYERS": self.get_player_count, "UPTIME": self.get_uptime, - "PORT": list(str(port) for port in - reversed(settings.TELNET_PORTS) + "PORT": list( + str(port) for port in reversed(settings.TELNET_PORTS) ), # most important port should be last in list # Evennia auto-filled "CRAWL DELAY": "-1", @@ -120,10 +120,15 @@ class Mssp(object): if utils.is_iter(value): for partval in value: varlist += ( - MSSP_VAR + bytes(str(variable), "utf-8") + MSSP_VAL + bytes(str(partval), "utf-8") + MSSP_VAR + + bytes(str(variable), "utf-8") + + MSSP_VAL + + bytes(str(partval), "utf-8") ) else: - varlist += MSSP_VAR + bytes(str(variable), "utf-8") + MSSP_VAL + bytes(str(value), "utf-8") + varlist += ( + MSSP_VAR + bytes(str(variable), "utf-8") + MSSP_VAL + bytes(str(value), "utf-8") + ) # send to crawler by subnegotiation self.protocol.requestNegotiation(MSSP, varlist) diff --git a/evennia/server/portal/telnet.py b/evennia/server/portal/telnet.py index 0a926ab6d9..4dbee60f7d 100644 --- a/evennia/server/portal/telnet.py +++ b/evennia/server/portal/telnet.py @@ -197,8 +197,7 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session): if option == LINEMODE: # make sure to activate line mode with local editing for all clients self.requestNegotiation( - LINEMODE, MODE + bytes(chr(ord(LINEMODE_EDIT) + - ord(LINEMODE_TRAPSIG)), "ascii") + LINEMODE, MODE + bytes(chr(ord(LINEMODE_EDIT) + ord(LINEMODE_TRAPSIG)), "ascii") ) return True else: @@ -258,6 +257,7 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session): return super().disableLocal(option) except Exception: from evennia.utils import logger + logger.log_trace() def connectionLost(self, reason): diff --git a/evennia/server/portal/telnet_oob.py b/evennia/server/portal/telnet_oob.py index d160ed9e56..7931dcb2a4 100644 --- a/evennia/server/portal/telnet_oob.py +++ b/evennia/server/portal/telnet_oob.py @@ -29,6 +29,7 @@ import re import json from evennia.utils.utils import is_iter from twisted.python.compat import _bytesChr as bchr + # General Telnet from twisted.conch.telnet import IAC, SB, SE @@ -46,7 +47,6 @@ MSDP_ARRAY_CLOSE = bchr(6) GMCP = bchr(201) - # pre-compiled regexes # returns 2-tuple msdp_regex_table = re.compile(