diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-10-15 15:02:28 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-10-15 15:02:28 +0300 |
| commit | 94dfececf6b4cf5d996ff2a12e7801bd640b1a57 (patch) | |
| tree | b0e6ac7c3f7463c0822cc37c350c8025dfe87382 /src/server.cpp | |
| parent | 74febd5c31c20369a35a82e9a36e50f18562ce9f (diff) | |
| download | minetest-94dfececf6b4cf5d996ff2a12e7801bd640b1a57.tar.gz minetest-94dfececf6b4cf5d996ff2a12e7801bd640b1a57.tar.bz2 minetest-94dfececf6b4cf5d996ff2a12e7801bd640b1a57.zip | |
strict_protocol_version_checking setting; PROTOCOL_VERSION in clientserver.h; clean up defaultsettings.cpp and minetest.conf.example
Diffstat (limited to 'src/server.cpp')
| -rw-r--r-- | src/server.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/server.cpp b/src/server.cpp index 59f7477a9..828eadbf3 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1927,11 +1927,14 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) } /* Uhh... this should actually be a warning but let's do it like this */ - if(net_proto_version < 2) + if(g_settings->getBool("strict_protocol_version_checking")) { - SendAccessDenied(m_con, peer_id, - L"Your client is too old. Please upgrade."); - return; + if(net_proto_version < PROTOCOL_VERSION) + { + SendAccessDenied(m_con, peer_id, + L"Your client is too old. Please upgrade."); + return; + } } /* @@ -2110,9 +2113,9 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) } // Warnings about protocol version can be issued here - if(getClient(peer->id)->net_proto_version < 3) + if(getClient(peer->id)->net_proto_version < PROTOCOL_VERSION) { - SendChatMessage(peer_id, L"# Server: WARNING: YOUR CLIENT IS OLD AND DOES NOT WORK PROPERLY WITH THIS SERVER"); + SendChatMessage(peer_id, L"# Server: WARNING: YOUR CLIENT IS OLD AND MAY WORK PROPERLY WITH THIS SERVER"); } /* |