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

Make the address reporting homogenous to the IP for each protocol.

Browse source
This commit is contained in:
Griatch 2016-02-20 16:19:12 +01:00
parent ddb87d6aea
commit a28ae2728e
3 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/server/portal/portal.py
View file

@ -280,7 +280,7 @@ if SSH_ENABLED:
ssh_service.setName('EvenniaSSH%s' % pstring) ssh_service.setName('EvenniaSSH%s' % pstring)
PORTAL.services.addService(ssh_service) PORTAL.services.addService(ssh_service)
print(" ssl%s: %s" % (ifacestr, port)) print(" ssh%s: %s" % (ifacestr, port))
if WEBSERVER_ENABLED: if WEBSERVER_ENABLED:

1
evennia/server/portal/telnet.py
View file

@ -40,6 +40,7 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session):
self.iaw_mode = False self.iaw_mode = False
self.no_lb_mode = False self.no_lb_mode = False
client_address = self.transport.client client_address = self.transport.client
client_address = client_address[0] if client_address else None
# this number is counted down for every handshake that completes. # this number is counted down for every handshake that completes.
# when it reaches 0 the portal/server syncs their data # when it reaches 0 the portal/server syncs their data
self.handshakes = 7 # naws, ttype, mccp, mssp, msdp, gmcp, mxp self.handshakes = 7 # naws, ttype, mccp, mssp, msdp, gmcp, mxp

1
evennia/server/portal/webclient.py
View file

@ -50,6 +50,7 @@ class WebSocketClient(Protocol, Session):
""" """
client_address = self.transport.client client_address = self.transport.client
client_address = client_address[0] if client_address else None
self.init_session("websocket", client_address, self.factory.sessionhandler) self.init_session("websocket", client_address, self.factory.sessionhandler)
# watch for dead links # watch for dead links
self.transport.setTcpKeepAlive(1) self.transport.setTcpKeepAlive(1)