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

Fixes a side effect of the #583 solution only showing up in certain connection timing combinations related to which protocols were supported in a given client. The portal<->server handhshake exchanged the session info an extra round depending on the internal timing of the connection. Also fixed a handshake bug in the MXP initialization.

Browse source
This commit is contained in:
Griatch 2014-10-20 22:14:58 +02:00
parent a5b4ddd1e9
commit 3eb347a076
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/server/portal/portalsessionhandler.py
View file

@ -64,10 +64,11 @@ class PortalSessionHandler(SessionHandler):
# only use if session already has sessid (i.e. has already connected)
sessdata = session.get_sync_data()
if self.portal.amp_protocol:
# we remove sessdata that could already have changed on the
# server level
# we only send sessdata that should not have changed
# at the server level at this point
sessdata = dict((key, val) for key, val in sessdata.items() if key in ("protocol_key",
"address",
"sessid",
"suid",
"conn_time",
"protocol_flags",