Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FORCEENDLINE is True by default so no need to set

Browse source 
Test also updated to check FORCEENDLINE after TTYPE is negotiated
This commit is contained in:
Ben Longden 2021-04-22 11:01:21 +01:00
parent 359842d554
commit 9099796258
2 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
evennia/server/portal/tests.py
View file

@ -231,7 +231,6 @@ class TestTelnet(TwistedTestCase):
self.transport.client = ["localhost"] self.transport.client = ["localhost"]
self.transport.setTcpKeepAlive = Mock() self.transport.setTcpKeepAlive = Mock()
d = self.proto.makeConnection(self.transport) d = self.proto.makeConnection(self.transport)
# test suppress_ga # test suppress_ga
self.assertTrue(self.proto.protocol_flags["NOGOAHEAD"]) self.assertTrue(self.proto.protocol_flags["NOGOAHEAD"])
self.proto.dataReceived(IAC + DONT + SUPPRESS_GA) self.proto.dataReceived(IAC + DONT + SUPPRESS_GA)
@ -246,13 +245,13 @@ class TestTelnet(TwistedTestCase):
self.assertEqual(self.proto.protocol_flags["SCREENHEIGHT"][0], 45) self.assertEqual(self.proto.protocol_flags["SCREENHEIGHT"][0], 45)
self.assertEqual(self.proto.handshakes, 6) self.assertEqual(self.proto.handshakes, 6)
# test ttype # test ttype
self.assertTrue(self.proto.protocol_flags["FORCEDENDLINE"])
self.assertFalse(self.proto.protocol_flags["TTYPE"]) self.assertFalse(self.proto.protocol_flags["TTYPE"])
self.assertTrue(self.proto.protocol_flags["ANSI"]) self.assertTrue(self.proto.protocol_flags["ANSI"])
self.proto.dataReceived(IAC + WILL + TTYPE) self.proto.dataReceived(IAC + WILL + TTYPE)
self.proto.dataReceived(b"".join([IAC, SB, TTYPE, IS, b"MUDLET", IAC, SE])) self.proto.dataReceived(b"".join([IAC, SB, TTYPE, IS, b"MUDLET", IAC, SE]))
self.assertTrue(self.proto.protocol_flags["XTERM256"]) self.assertTrue(self.proto.protocol_flags["XTERM256"])
self.assertEqual(self.proto.protocol_flags["CLIENTNAME"], "MUDLET") self.assertEqual(self.proto.protocol_flags["CLIENTNAME"], "MUDLET")
self.assertTrue(self.proto.protocol_flags["FORCEDENDLINE"])
self.proto.dataReceived(b"".join([IAC, SB, TTYPE, IS, b"XTERM", IAC, SE])) self.proto.dataReceived(b"".join([IAC, SB, TTYPE, IS, b"XTERM", IAC, SE]))
self.proto.dataReceived(b"".join([IAC, SB, TTYPE, IS, b"MTTS 137", IAC, SE])) self.proto.dataReceived(b"".join([IAC, SB, TTYPE, IS, b"MTTS 137", IAC, SE]))
self.assertEqual(self.proto.handshakes, 5) self.assertEqual(self.proto.handshakes, 5)

4
evennia/server/portal/ttype.py
View file

@ -119,10 +119,6 @@ class Ttype(object):
if clientname.startswith("MUDLET"): if clientname.startswith("MUDLET"):
# supports xterm256 stably since 1.1 (2010?) # supports xterm256 stably since 1.1 (2010?)
xterm256 = clientname.split("MUDLET", 1)[1].strip() >= "1.1" xterm256 = clientname.split("MUDLET", 1)[1].strip() >= "1.1"
self.protocol.protocol_flags["FORCEDENDLINE"] = True
if clientname.startswith("TINTIN++"):
self.protocol.protocol_flags["FORCEDENDLINE"] = True
if ( if (
clientname.startswith("XTERM") clientname.startswith("XTERM")