Mercurial > hg > openttd
changeset 6235:161135615aa1 draft
(svn r9038) -Fix [FS#115]: inactive connections are not automatically kicked, i.e. people who only open a telnet (or similar) connection to a server.
author | rubidium <rubidium@openttd.org> |
---|---|
date | Tue, 06 Mar 2007 22:00:42 +0000 |
parents | 5790700fdbd5 |
children | 6f924ebe51f9 |
files | src/console_cmds.cpp src/network/core/tcp.h src/network/network_server.cpp |
diffstat | 3 files changed, 13 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/console_cmds.cpp +++ b/src/console_cmds.cpp @@ -544,6 +544,7 @@ { static const char* const stat_str[] = { "inactive", + "authorizing", "authorized", "waiting", "loading map",
--- a/src/network/core/tcp.h +++ b/src/network/core/tcp.h @@ -73,6 +73,7 @@ /** Status of a client */ typedef enum { STATUS_INACTIVE, ///< The client is not connected nor active + STATUS_AUTHORIZING,///< The client is authorizing STATUS_AUTH, ///< The client is authorized STATUS_MAP_WAIT, ///< The client is waiting as someone else is downloading the map STATUS_MAP, ///< The client is downloading the map
--- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -214,6 +214,11 @@ // uint8: Type of password // + /* Invalid packet when status is AUTH or higher */ + if (cs->status >= STATUS_AUTH) return; + + cs->status = STATUS_AUTHORIZING; + Packet *p = NetworkSend_Init(PACKET_SERVER_NEED_PASSWORD); p->Send_uint8(type); cs->Send_Packet(p); @@ -1533,6 +1538,12 @@ IConsolePrintF(_icolour_err,"Client #%d is dropped because it took longer than %d ticks for him to join", cs->index, _network_max_join_time); NetworkCloseClient(cs); } + } else if (cs->status == STATUS_INACTIVE) { + int lag = NetworkCalculateLag(cs); + if (lag > 4 * DAY_TICKS) { + IConsolePrintF(_icolour_err,"Client #%d is dropped because it took longer than %d ticks to start the joining process", cs->index, 4 * DAY_TICKS); + NetworkCloseClient(cs); + } } if (cs->status >= STATUS_PRE_ACTIVE) {