Ticket #3241: t3241_kick_v6.3.patch
File t3241_kick_v6.3.patch, 28.2 KB (added by , 9 years ago) |
---|
-
binaries/data/mods/public/gui/common/network.js
1 function getDisconnectReason(id) 1 /** 2 * Get a human readable version of the given disconnect reason. 3 * 4 * @see source/network/NetHost.h 5 * @param reason {number} 6 * @returns {string} 7 */ 8 function getDisconnectReason(reason) 2 9 { 3 // Must be kept in sync with source/network/NetHost.h 4 switch (id) 10 switch (reason) 5 11 { 6 12 case 0: return translate("Unknown reason"); 7 13 case 1: return translate("Unexpected shutdown"); 8 14 case 2: return translate("Incorrect network protocol version"); 9 15 case 3: return translate("Game is loading, please try later"); 10 16 case 4: return translate("Game has already started, no observers allowed"); 11 default: return sprintf(translate("\\[Invalid value %(id)s]"), { "id": id }); 17 case 5: return translate("You have been kicked from the match"); 18 case 6: return translate("You have been banned from the match"); 19 default: return sprintf(translate("\\[Invalid value %(id)s]"), { "id": reason }); 12 20 } 13 21 } 14 22 23 /** 24 * Show the disconnect reason in a message box. 25 * 26 * @param {number} reason 27 */ 15 28 function reportDisconnect(reason) 16 29 { 17 var reasontext = getDisconnectReason(reason);18 19 30 messageBox(400, 200, 20 translate("Lost connection to the server.") + "\n\n" + sprintf(translate("Reason: %(reason)s."), { reason: reasontext }), 31 translate("Lost connection to the server.") + "\n\n" + 32 sprintf(translate("Reason: %(reason)s."), { "reason": getDisconnectReason(reason) }), 21 33 translate("Disconnected"), 2); 22 34 } 35 36 /** 37 * Get usernames sorted by player slot, observers last. 38 * Requires g_PlayerAssignments. 39 * 40 * @returns {string[]} 41 */ 42 function getUsernameList() 43 { 44 // First sort, then lookup name 45 return Object.keys(g_PlayerAssignments).sort((guidA, guidB) => 46 { 47 let slotA = g_PlayerAssignments[guidA].player; 48 let slotB = g_PlayerAssignments[guidB].player; 49 if (slotA == -1) return 1; 50 if (slotB == -1) return -1; 51 return slotA - slotB; 52 }).map(guid => g_PlayerAssignments[guid].name); 53 } 54 55 /** 56 * Execute a command locally. Requires addChatMessage. 57 * 58 * @param {string} input 59 * @returns {Boolean} whether a command was executed 60 */ 61 function executeNetworkCommand(input) 62 { 63 if (input.indexOf("/") != 0) 64 return false; 65 66 var command = input.split(" ", 1)[0]; 67 var argument = input.substr(command.length + 1); 68 69 switch (command) 70 { 71 case "/list": 72 addChatMessage({ "type": "clientlist", "guid": "local" }); 73 return true; 74 75 case "/kick": 76 Engine.KickPlayer(argument, false); 77 return true; 78 79 case "/ban": 80 Engine.KickPlayer(argument, true); 81 return true; 82 83 default: 84 return false; 85 } 86 } -
binaries/data/mods/public/gui/gamesetup/gamesetup.js
515 515 516 516 case "chat": 517 517 addChatMessage({ "type": "message", "guid": message.guid, "text": message.text }); 518 518 break; 519 519 520 case "kicked": 521 addChatMessage({ "type": message.ban ? "banned" : "kicked", "username": message.username }); 522 break; 523 520 524 // Singular client to host message 521 525 case "ready": 522 526 g_ReadyChanged -= 1; 523 527 if (g_ReadyChanged < 1 && g_PlayerAssignments[message.guid].player != -1) 524 528 addChatMessage({ "type": "ready", "guid": message.guid, "ready": +message.status == 1 }); … … 1708 1712 var input = Engine.GetGUIObjectByName("chatInput"); 1709 1713 var text = input.caption; 1710 1714 if (!text.length) 1711 1715 return; 1712 1716 1713 Engine.SendNetworkChat(text);1714 1717 input.caption = ""; 1718 1719 if (executeNetworkCommand(text)) 1720 return; 1721 1722 Engine.SendNetworkChat(text); 1715 1723 } 1716 1724 1717 1725 function addChatMessage(msg) 1718 1726 { 1719 1727 var username = ""; … … 1753 1761 case "disconnect": 1754 1762 var formattedUsername = '[color="'+ color +'"]' + username + '[/color]'; 1755 1763 formatted = '[font="sans-bold-13"] ' + sprintf(translate("== %(message)s"), { "message": sprintf(translate("%(username)s has left"), { "username": formattedUsername }) }) + '[/font]'; 1756 1764 break; 1757 1765 1766 case "clientlist": 1767 formatted = sprintf(translate("Users: %(users)s"), { "users": getUsernameList().join(",") }); 1768 break; 1769 1770 case "kicked": 1771 formatted = '[font="sans-bold-13"] ' + sprintf(translate("== %(message)s"), { "message": sprintf(translate("%(username)s has been kicked."), { "username": username }) }) + '[/font]'; 1772 break; 1773 1774 case "banned": 1775 formatted = '[font="sans-bold-13"] ' + sprintf(translate("== %(message)s"), { "message": sprintf(translate("%(username)s has been banned."), { "username": username }) }) + '[/font]'; 1776 break; 1777 1758 1778 case "message": 1759 1779 var formattedUsername = '[color="'+ color +'"]' + username + '[/color]'; 1760 1780 var formattedUsernamePrefix = '[font="sans-bold-13"]' + sprintf(translate("<%(username)s>"), { "username": formattedUsername }) + '[/font]'; 1761 1781 formatted = sprintf(translate("%(username)s %(message)s"), { "username": formattedUsernamePrefix, "message": message }); 1762 1782 break; -
binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml
2 2 3 3 <objects> 4 4 5 5 <script file="gui/common/network.js"/> 6 6 <script file="gui/common/functions_global_object.js"/> 7 <script file="gui/common/functions_utility.js"/> 7 8 <script file="gui/gamesetup/gamesetup_mp.js"/> 8 9 9 10 <!-- Add a translucent black background to fade out the menu page --> 10 11 <object type="image" sprite="ModernFade"/> 11 12 … … 46 47 </object> 47 48 48 49 <object hotkey="confirm" type="button" size="50%+5 100%-45 100%-18 100%-17" style="ModernButtonRed"> 49 50 <translatableAttribute id="caption">Continue</translatableAttribute> 50 51 <action on="Press"> 51 var joinPlayerName = Engine.GetGUIObjectByName("joinPlayerName").caption;52 var joinPlayerName = sanitizePlayerName(Engine.GetGUIObjectByName("joinPlayerName").caption, true, true); 52 53 var joinServer = Engine.GetGUIObjectByName("joinServer").caption; 53 54 if (startJoin(joinPlayerName, joinServer)) 54 55 switchSetupPage("pageJoin", "pageConnecting"); 55 56 </action> 56 57 </object> … … 88 89 </object> 89 90 90 91 <object type="button" size="50%+5 100%-45 100%-18 100%-17" style="ModernButtonRed"> 91 92 <translatableAttribute id="caption">Continue</translatableAttribute> 92 93 <action on="Press"> 93 var hostPlayerName = Engine.GetGUIObjectByName("hostPlayerName").caption;94 var hostPlayerName = sanitizePlayerName(Engine.GetGUIObjectByName("hostPlayerName").caption, true, true); 94 95 var hostServerName = Engine.GetGUIObjectByName("hostServerName").caption; 95 96 if (startHost(hostPlayerName, hostServerName)) 96 97 switchSetupPage("pageHost", "pageConnecting"); 97 98 </action> 98 99 </object> -
binaries/data/mods/public/gui/session/messages.js
267 267 obj.caption = translate("Connection to the server has been authenticated."); 268 268 obj.hidden = false; 269 269 break; 270 270 case "disconnected": 271 271 g_Disconnected = true; 272 obj.caption = translate("Connection to the server has been lost.") + "\n\n" + translate("The game has ended."); 272 obj.caption = translate("Connection to the server has been lost.") + "\n" + 273 sprintf(translate("Reason: %(reason)s."), { "reason": getDisconnectReason(message.reason) }) + "\n" + 274 translate("The game has ended."); 273 275 obj.hidden = false; 274 276 break; 275 277 default: 276 278 error("Unrecognised netstatus type '" + message.status + "'"); 277 279 break; … … 323 325 324 326 case "rejoined": 325 327 addChatMessage({ "type": "rejoined", "guid": message.guid }); 326 328 break; 327 329 330 case "kicked": 331 addChatMessage({ "type": message.ban ? "banned" : "kicked", "username": message.username }); 332 break; 333 328 334 // To prevent errors, ignore these message types that occur during autostart 329 335 case "gamesetup": 330 336 case "start": 331 337 break; 332 338 … … 356 362 toggleChatWindow(); 357 363 358 364 if (!text.length) 359 365 return; 360 366 367 if (executeNetworkCommand(text)) 368 return; 369 361 370 if (executeCheat(text)) 362 371 return; 363 372 364 373 // Observers should only be able to chat with everyone. 365 374 if (g_IsObserver && text.indexOf("/") == 0 && text.indexOf("/me ") != 0) 366 375 return; 367 376 368 377 if (Engine.GetGUIObjectByName("toggleTeamChat").checked) 369 378 text = "/team " + text; 370 379 371 if (g_IsNetworked) 372 Engine.SendNetworkChat(text); 373 else 374 addChatMessage({ "type": "message", "guid": "local", "text": text }); 380 submitChatDirectly(text); 375 381 } 376 382 377 383 function addChatMessage(msg) 378 384 { 379 385 var playerColor, username; … … 420 426 formatted = sprintf(translate("%(player)s has left the game."), { "player": "[color=\"" + playerColor + "\"]" + username + "[/color]" }); 421 427 break; 422 428 case "rejoined": 423 429 formatted = sprintf(translate("%(player)s has rejoined the game."), { "player": "[color=\"" + playerColor + "\"]" + username + "[/color]" }); 424 430 break; 431 case "clientlist": 432 formatted = sprintf(translate("Users: %(users)s"), { "users": getUsernameList().join(",") }); 433 break; 434 case "kicked": 435 formatted = sprintf(translate("%(username)s has been kicked."), { "username": msg.username }); 436 break; 437 case "banned": 438 formatted = sprintf(translate("%(username)s has been banned."), { "username": msg.username }); 439 break; 425 440 case "defeat": 426 441 // In singleplayer, the local player is "You". "You has" is incorrect. 427 442 if (!g_IsNetworked && msg.player == Engine.GetPlayerID()) 428 443 formatted = translate("You have been defeated."); 429 444 else -
binaries/data/mods/public/gui/session/session.xml
5 5 <script file="gui/common/colorFades.js"/> 6 6 <script file="gui/common/functions_civinfo.js"/> 7 7 <script file="gui/common/functions_global_object.js"/> 8 8 <script file="gui/common/functions_utility.js"/> 9 9 <script file="gui/common/l10n.js"/> 10 <script file="gui/common/network.js"/> 10 11 <script file="gui/common/music.js"/> 11 12 <script file="gui/common/timer.js"/> 12 13 <script file="gui/common/tooltips.js"/> 13 14 <!-- load all scripts in this directory --> 14 15 <script directory="gui/session/"/> -
source/gui/scripting/ScriptFunctions.cpp
345 345 SAFE_DELETE(g_NetServer); 346 346 SAFE_DELETE(g_NetClient); 347 347 SAFE_DELETE(g_Game); 348 348 } 349 349 350 void KickPlayer(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), CStrW playerName, bool ban) 351 { 352 if (g_NetServer) 353 g_NetServer->KickPlayer(playerName, ban); 354 } 355 350 356 JS::Value PollNetworkClient(ScriptInterface::CxPrivate* pCxPrivate) 351 357 { 352 358 if (!g_NetClient) 353 359 return JS::UndefinedValue(); 354 360 … … 954 960 scriptInterface.RegisterFunction<void, JS::HandleValue, int, &StartGame>("StartGame"); 955 961 scriptInterface.RegisterFunction<void, &Script_EndGame>("EndGame"); 956 962 scriptInterface.RegisterFunction<void, std::wstring, &StartNetworkHost>("StartNetworkHost"); 957 963 scriptInterface.RegisterFunction<void, std::wstring, std::string, &StartNetworkJoin>("StartNetworkJoin"); 958 964 scriptInterface.RegisterFunction<void, &DisconnectNetworkGame>("DisconnectNetworkGame"); 965 scriptInterface.RegisterFunction<void, CStrW, bool, &KickPlayer>("KickPlayer"); 959 966 scriptInterface.RegisterFunction<JS::Value, &PollNetworkClient>("PollNetworkClient"); 960 967 scriptInterface.RegisterFunction<void, JS::HandleValue, &SetNetworkGameAttributes>("SetNetworkGameAttributes"); 961 968 scriptInterface.RegisterFunction<void, int, std::string, &AssignNetworkPlayer>("AssignNetworkPlayer"); 962 969 scriptInterface.RegisterFunction<void, std::string, int, &SetNetworkPlayerStatus>("SetNetworkPlayerStatus"); 963 970 scriptInterface.RegisterFunction<void, &ClearAllPlayerReady>("ClearAllPlayerReady"); -
source/network/NetClient.cpp
91 91 92 92 AddTransition(NCS_PREGAME, (uint)NMT_CHAT, NCS_PREGAME, (void*)&OnChat, context); 93 93 AddTransition(NCS_PREGAME, (uint)NMT_READY, NCS_PREGAME, (void*)&OnReady, context); 94 94 AddTransition(NCS_PREGAME, (uint)NMT_GAME_SETUP, NCS_PREGAME, (void*)&OnGameSetup, context); 95 95 AddTransition(NCS_PREGAME, (uint)NMT_PLAYER_ASSIGNMENT, NCS_PREGAME, (void*)&OnPlayerAssignment, context); 96 AddTransition(NCS_PREGAME, (uint)NMT_KICKED, NCS_PREGAME, (void*)&OnKicked, context); 96 97 AddTransition(NCS_PREGAME, (uint)NMT_GAME_START, NCS_LOADING, (void*)&OnGameStart, context); 97 98 AddTransition(NCS_PREGAME, (uint)NMT_JOIN_SYNC_START, NCS_JOIN_SYNCING, (void*)&OnJoinSyncStart, context); 98 99 99 100 AddTransition(NCS_JOIN_SYNCING, (uint)NMT_CHAT, NCS_JOIN_SYNCING, (void*)&OnChat, context); 100 101 AddTransition(NCS_JOIN_SYNCING, (uint)NMT_GAME_SETUP, NCS_JOIN_SYNCING, (void*)&OnGameSetup, context); … … 108 109 AddTransition(NCS_LOADING, (uint)NMT_GAME_SETUP, NCS_LOADING, (void*)&OnGameSetup, context); 109 110 AddTransition(NCS_LOADING, (uint)NMT_PLAYER_ASSIGNMENT, NCS_LOADING, (void*)&OnPlayerAssignment, context); 110 111 AddTransition(NCS_LOADING, (uint)NMT_LOADED_GAME, NCS_INGAME, (void*)&OnLoadedGame, context); 111 112 112 113 AddTransition(NCS_INGAME, (uint)NMT_REJOINED, NCS_INGAME, (void*)&OnRejoined, context); 114 AddTransition(NCS_INGAME, (uint)NMT_KICKED, NCS_INGAME, (void*)&OnKicked, context); 113 115 AddTransition(NCS_INGAME, (uint)NMT_CHAT, NCS_INGAME, (void*)&OnChat, context); 114 116 AddTransition(NCS_INGAME, (uint)NMT_GAME_SETUP, NCS_INGAME, (void*)&OnGameSetup, context); 115 117 AddTransition(NCS_INGAME, (uint)NMT_PLAYER_ASSIGNMENT, NCS_INGAME, (void*)&OnPlayerAssignment, context); 116 118 AddTransition(NCS_INGAME, (uint)NMT_SIMULATION_COMMAND, NCS_INGAME, (void*)&OnInGame, context); 117 119 AddTransition(NCS_INGAME, (uint)NMT_SYNC_ERROR, NCS_INGAME, (void*)&OnInGame, context); … … 605 607 client->PushGuiMessage(msg); 606 608 607 609 return true; 608 610 } 609 611 612 bool CNetClient::OnKicked(void *context, CFsmEvent* event) 613 { 614 ENSURE(event->GetType() == (uint)NMT_KICKED); 615 616 CNetClient* client = (CNetClient*)context; 617 JSContext* cx = client->GetScriptInterface().GetContext(); 618 619 CKickedMessage* message = (CKickedMessage*)event->GetParamRef(); 620 JS::RootedValue msg(cx); 621 client->GetScriptInterface().Eval("({ 'type': 'kicked' })", &msg); 622 client->GetScriptInterface().SetProperty(msg, "username", message->m_Name, false); 623 client->GetScriptInterface().SetProperty(msg, "ban", message->m_Ban, false); 624 client->PushGuiMessage(msg); 625 626 return true; 627 } 628 610 629 bool CNetClient::OnLoadedGame(void* context, CFsmEvent* event) 611 630 { 612 631 ENSURE(event->GetType() == (uint)NMT_LOADED_GAME); 613 632 614 633 CNetClient* client = (CNetClient*)context; -
source/network/NetClient.h
199 199 static bool OnInGame(void* context, CFsmEvent* event); 200 200 static bool OnGameStart(void* context, CFsmEvent* event); 201 201 static bool OnJoinSyncStart(void* context, CFsmEvent* event); 202 202 static bool OnJoinSyncEndCommandBatch(void* context, CFsmEvent* event); 203 203 static bool OnRejoined(void* context, CFsmEvent* event); 204 static bool OnKicked(void* context, CFsmEvent* event); 204 205 static bool OnLoadedGame(void* context, CFsmEvent* event); 205 206 206 207 /** 207 208 * Take ownership of a session object, and use it for all network communication. 208 209 */ -
source/network/NetHost.h
61 61 { 62 62 NDR_UNKNOWN = 0, 63 63 NDR_UNEXPECTED_SHUTDOWN, 64 64 NDR_INCORRECT_PROTOCOL_VERSION, 65 65 NDR_SERVER_LOADING, 66 NDR_SERVER_ALREADY_IN_GAME 66 NDR_SERVER_ALREADY_IN_GAME, 67 NDR_KICKED, 68 NDR_BANNED 67 69 }; 68 70 69 71 class CNetHost 70 72 { 71 73 public: -
source/network/NetMessage.cpp
133 133 134 134 case NMT_REJOINED: 135 135 pNewMessage = new CRejoinedMessage; 136 136 break; 137 137 138 case NMT_KICKED: 139 pNewMessage = new CKickedMessage; 140 break; 141 138 142 case NMT_LOADED_GAME: 139 143 pNewMessage = new CLoadedGameMessage; 140 144 break; 141 145 142 146 case NMT_SERVER_HANDSHAKE: -
source/network/NetMessages.h
26 26 #include "ps/CStr.h" 27 27 #include "scriptinterface/ScriptVal.h" 28 28 29 29 #define PS_PROTOCOL_MAGIC 0x5073013f // 'P', 's', 0x01, '?' 30 30 #define PS_PROTOCOL_MAGIC_RESPONSE 0x50630121 // 'P', 'c', 0x01, '!' 31 #define PS_PROTOCOL_VERSION 0x0101000 7// Arbitrary protocol31 #define PS_PROTOCOL_VERSION 0x01010008 // Arbitrary protocol 32 32 #define PS_DEFAULT_PORT 0x5073 // 'P', 's' 33 33 34 34 // Defines the list of message types. The order of the list must not change. 35 35 // The message types having a negative value are used internally and not sent 36 36 // over the network. The message types used for network communication have … … 56 56 NMT_FILE_TRANSFER_ACK, 57 57 58 58 NMT_JOIN_SYNC_START, 59 59 60 60 NMT_REJOINED, 61 NMT_KICKED, 61 62 62 63 NMT_LOADED_GAME, 63 64 NMT_GAME_START, 64 65 NMT_END_COMMAND_BATCH, 65 66 NMT_SYNC_CHECK, // OOS-detection hash checking … … 159 160 160 161 START_NMT_CLASS_(Rejoined, NMT_REJOINED) 161 162 NMT_FIELD(CStr8, m_GUID) 162 163 END_NMT_CLASS() 163 164 165 START_NMT_CLASS_(Kicked, NMT_KICKED) 166 NMT_FIELD(CStrW, m_Name) 167 NMT_FIELD_INT(m_Ban, bool, 1) 168 END_NMT_CLASS() 169 164 170 START_NMT_CLASS_(LoadedGame, NMT_LOADED_GAME) 165 171 NMT_FIELD_INT(m_CurrentTurn, u32, 4) 166 172 END_NMT_CLASS() 167 173 168 174 START_NMT_CLASS_(GameStart, NMT_GAME_START) -
source/network/NetServer.cpp
119 119 120 120 CNetServerWorker::CNetServerWorker(int autostartPlayers) : 121 121 m_AutostartPlayers(autostartPlayers), 122 122 m_Shutdown(false), 123 123 m_ScriptInterface(NULL), 124 m_NextHostID(1), m_Host(NULL), m_ Stats(NULL)124 m_NextHostID(1), m_Host(NULL), m_HostGUID(), m_Stats(NULL) 125 125 { 126 126 m_State = SERVER_STATE_UNCONNECTED; 127 127 128 128 m_ServerTurnManager = NULL; 129 129 … … 604 604 session->SetFirstState(NSS_HANDSHAKE); 605 605 } 606 606 607 607 bool CNetServerWorker::HandleConnect(CNetServerSession* session) 608 608 { 609 CNetServerWorker& server = session->GetServer(); 610 611 // Disconnect banned IPs 612 if (std::find(server.m_BannedIPs.begin(), server.m_BannedIPs.end(), session->GetIPAddress()) != server.m_BannedIPs.end()) 613 { 614 session->Disconnect(NDR_BANNED); 615 return false; 616 } 617 618 // Send handshake challenge 609 619 CSrvHandshakeMessage handshake; 610 620 handshake.m_Magic = PS_PROTOCOL_MAGIC; 611 621 handshake.m_ProtocolVersion = PS_PROTOCOL_VERSION; 612 622 handshake.m_SoftwareVersion = PS_PROTOCOL_VERSION; 613 623 return session->SendMessage(&handshake); … … 615 625 616 626 void CNetServerWorker::OnUserJoin(CNetServerSession* session) 617 627 { 618 628 AddPlayer(session->GetGUID(), session->GetUserName()); 619 629 630 if (m_HostGUID.empty()) 631 m_HostGUID = session->GetGUID(); 632 620 633 CGameSetupMessage gameSetupMessage(GetScriptInterface()); 621 634 gameSetupMessage.m_Data = m_GameAttributes.get(); 622 635 session->SendMessage(&gameSetupMessage); 623 636 624 637 CPlayerAssignmentMessage assignMessage; … … 630 643 { 631 644 RemovePlayer(session->GetGUID()); 632 645 633 646 if (m_ServerTurnManager && session->GetCurrState() != NSS_JOIN_SYNCING) 634 647 m_ServerTurnManager->UninitialiseClient(session->GetHostID()); // TODO: only for non-observers 635 636 // TODO: ought to switch the player controlled by that client637 // back to AI control, or something?638 648 } 639 649 640 650 void CNetServerWorker::AddPlayer(const CStr& guid, const CStrW& name) 641 651 { 642 652 // Find all player IDs in active use; we mustn't give them to a second player (excluding the unassigned ID: -1) … … 707 717 it->second.m_Status = 0; 708 718 709 719 SendPlayerAssignments(); 710 720 } 711 721 722 void CNetServerWorker::KickPlayer(const CStrW& playerName, const bool ban) 723 { 724 // Find the user with that name 725 std::vector<CNetServerSession*>::iterator it = std::find_if(m_Sessions.begin(), m_Sessions.end(), 726 [&](CNetServerSession* session) { return session->GetUserName() == playerName; }); 727 728 // and return if no one or the host has that name 729 if (it == m_Sessions.end() || (*it)->GetGUID() == m_HostGUID) 730 return; 731 732 if (ban) 733 { 734 // Remember name 735 if (std::find(m_BannedPlayers.begin(), m_BannedPlayers.end(), playerName) == m_BannedPlayers.end()) 736 m_BannedPlayers.push_back(playerName); 737 738 // Remember IP address 739 CStr ipAddress = GetPlayerIPAddress(playerName); 740 if (std::find(m_BannedIPs.begin(), m_BannedIPs.end(), ipAddress) == m_BannedIPs.end()) 741 m_BannedIPs.push_back(ipAddress); 742 } 743 744 // Disconnect that user 745 (*it)->Disconnect(ban ? NDR_BANNED : NDR_KICKED); 746 747 // Send message notifying other clients 748 CKickedMessage kickedMessage; 749 kickedMessage.m_Name = playerName; 750 kickedMessage.m_Ban = ban; 751 Broadcast(&kickedMessage); 752 } 753 754 CStr CNetServerWorker::GetPlayerIPAddress(const CStrW& playerName) 755 { 756 for (CNetServerSession* session : m_Sessions) 757 if (session->GetUserName() == playerName) 758 return session->GetIPAddress(); 759 return "(error)"; 760 } 761 712 762 void CNetServerWorker::AssignPlayer(int playerID, const CStr& guid) 713 763 { 714 764 // Remove anyone who's already assigned to this player 715 765 for (PlayerAssignmentMap::iterator it = m_PlayerAssignments.begin(); it != m_PlayerAssignments.end(); ++it) 716 766 { … … 764 814 ENSURE(event->GetType() == (uint)NMT_CLIENT_HANDSHAKE); 765 815 766 816 CNetServerSession* session = (CNetServerSession*)context; 767 817 CNetServerWorker& server = session->GetServer(); 768 818 819 // Check protocol version 769 820 CCliHandshakeMessage* message = (CCliHandshakeMessage*)event->GetParamRef(); 770 821 if (message->m_ProtocolVersion != PS_PROTOCOL_VERSION) 771 822 { 772 823 session->Disconnect(NDR_INCORRECT_PROTOCOL_VERSION); 773 824 return false; 774 825 } 775 826 827 // Send handshake response 776 828 CSrvHandshakeResponseMessage handshakeResponse; 777 829 handshakeResponse.m_UseProtocolVersion = PS_PROTOCOL_VERSION; 778 830 handshakeResponse.m_Message = server.m_WelcomeMessage; 779 831 handshakeResponse.m_Flags = 0; 780 832 session->SendMessage(&handshakeResponse); … … 798 850 } 799 851 800 852 CAuthenticateMessage* message = (CAuthenticateMessage*)event->GetParamRef(); 801 853 CStrW username = server.DeduplicatePlayerName(SanitisePlayerName(message->m_Name)); 802 854 855 // Disconnect banned usernames 856 if (std::find(server.m_BannedPlayers.begin(), server.m_BannedPlayers.end(), username) != server.m_BannedPlayers.end()) 857 { 858 session->Disconnect(NDR_BANNED); 859 return true; 860 } 861 803 862 // Optionally allow observers to join after the game has started 804 863 bool observerLateJoin = false; 805 864 ScriptInterface& scriptInterface = server.GetScriptInterface(); 806 865 JSContext* cx = scriptInterface.GetContext(); 807 866 JSAutoRequest rq(cx); … … 1147 1206 bool CNetServer::SetupConnection() 1148 1207 { 1149 1208 return m_Worker->SetupConnection(); 1150 1209 } 1151 1210 1211 void CNetServer::KickPlayer(const CStrW& playerName, const bool ban) 1212 { 1213 CScopeLock lock(m_Worker->m_WorkerMutex); 1214 m_Worker->KickPlayer(playerName, ban); 1215 } 1216 1152 1217 void CNetServer::AssignPlayer(int playerID, const CStr& guid) 1153 1218 { 1154 1219 CScopeLock lock(m_Worker->m_WorkerMutex); 1155 1220 m_Worker->m_AssignPlayerQueue.emplace_back(playerID, guid); 1156 1221 } -
source/network/NetServer.h
120 120 * The given GUID will be (re)assigned to the given player ID. 121 121 * Any player currently using that ID will be unassigned. 122 122 * The changes will be asynchronously propagated to all clients. 123 123 */ 124 124 void AssignPlayer(int playerID, const CStr& guid); 125 125 126 126 /** 127 127 * Call from the GUI to update the player readiness. 128 128 * The changes will be asynchronously propagated to all clients. 129 129 */ 130 130 void SetPlayerReady(const CStr& guid, int ready); … … 132 132 /** 133 133 * Call from the GUI to set the all player readiness to 0. 134 134 * The changes will be asynchronously propagated to all clients. 135 135 */ 136 136 void ClearAllPlayerReady(); 137 137 138 /** 139 * Disconnects a player from the gamesetup / session. 140 */ 141 void KickPlayer(const CStrW& playerName, const bool ban); 142 138 143 /** 139 144 * Call from the GUI to asynchronously notify all clients that they should start loading the game. 140 145 */ 141 146 void StartGame(); 142 147 … … 181 186 * Send a message to the given network peer. 182 187 */ 183 188 bool SendMessage(ENetPeer* peer, const CNetMessage* message); 184 189 185 190 /** 191 * Disconnected a player from the match / gamesetup and optionally prevents him/her from rejoining. 192 */ 193 void KickPlayer(const CStrW& playerName, const bool ban); 194 195 /** 186 196 * Send a message to all clients who have completed the full connection process 187 197 * (i.e. are in the pre-game or in-game states). 188 198 */ 189 199 bool Broadcast(const CNetMessage* message); 190 200 201 /** 202 * Returns the IP address of the given connected player. 203 */ 204 CStr GetPlayerIPAddress(const CStrW& playerName); 205 191 206 private: 192 207 friend class CNetServer; 193 208 friend class CNetFileReceiveTask_ServerRejoin; 194 209 195 210 CNetServerWorker(int autostartPlayers); … … 243 258 */ 244 259 void SetTurnLength(u32 msecs); 245 260 246 261 void AddPlayer(const CStr& guid, const CStrW& name); 247 262 void RemovePlayer(const CStr& guid); 248 void SetPlayerReady(const CStr& guid, const int ready); 263 void SetPlayerReady(const CStr& guid, const int ready); 264 CStr GetHostGUID(); 249 265 void SendPlayerAssignments(); 250 266 void ClearAllPlayerReady(); 251 267 252 268 void SetupSession(CNetServerSession* session); 253 269 bool HandleConnect(CNetServerSession* session); … … 297 313 NetServerState m_State; 298 314 299 315 CStrW m_ServerName; 300 316 CStrW m_WelcomeMessage; 301 317 318 std::vector<CStr> m_BannedIPs; 319 std::vector<CStrW> m_BannedPlayers; 320 302 321 u32 m_NextHostID; 303 322 304 323 CNetServerTurnManager* m_ServerTurnManager; 305 324 325 CStr m_HostGUID; 326 306 327 /** 307 328 * A copy of all simulation commands received so far, indexed by 308 329 * turn number, to simplify support for rejoining etc. 309 330 * TODO: verify this doesn't use too much RAM. 310 331 */ -
source/network/NetSession.cpp
1 /* Copyright (C) 201 1Wildfire Games.1 /* Copyright (C) 2015 Wildfire Games. 2 2 * This file is part of 0 A.D. 3 3 * 4 4 * 0 A.D. is free software: you can redistribute it and/or modify 5 5 * it under the terms of the GNU General Public License as published by 6 6 * the Free Software Foundation, either version 2 of the License, or … … 173 173 CNetServerSession::CNetServerSession(CNetServerWorker& server, ENetPeer* peer) : 174 174 m_Server(server), m_FileTransferer(this), m_Peer(peer) 175 175 { 176 176 } 177 177 178 CStr CNetServerSession::GetIPAddress() 179 { 180 char ipAddress[256] = "(error)"; 181 enet_address_get_host_ip(&(m_Peer->address), ipAddress, ARRAY_SIZE(ipAddress)); 182 return CStr(ipAddress); 183 } 184 178 185 void CNetServerSession::Disconnect(u32 reason) 179 186 { 180 187 Update((uint)NMT_CONNECTION_LOST, NULL); 181 188 182 189 enet_peer_disconnect(m_Peer, reason); -
source/network/NetSession.h
1 /* Copyright (C) 201 1Wildfire Games.1 /* Copyright (C) 2015 Wildfire Games. 2 2 * This file is part of 0 A.D. 3 3 * 4 4 * 0 A.D. is free software: you can redistribute it and/or modify 5 5 * it under the terms of the GNU General Public License as published by 6 6 * the Free Software Foundation, either version 2 of the License, or … … 121 121 122 122 u32 GetHostID() const { return m_HostID; } 123 123 void SetHostID(u32 id) { m_HostID = id; } 124 124 125 125 /** 126 * Returns the IP address of the client. 127 */ 128 CStr GetIPAddress(); 129 130 /** 126 131 * Sends a disconnection notification to the client, 127 132 * and sends a NMT_CONNECTION_LOST message to the session FSM. 128 133 * The server will receive a disconnection notification after a while. 129 134 * The server will not receive any further messages sent via this session. 130 135 */