Differential D3184 Diff 14737 source/network/NetClient.cpp

Changeset View

Standalone View

source/network/NetClient.cpp

Show All 19 Lines
#include "NetClient.h"		#include "NetClient.h"

#include "NetClientTurnManager.h"		#include "NetClientTurnManager.h"
#include "NetMessage.h"		#include "NetMessage.h"
#include "NetSession.h"		#include "NetSession.h"

#include "lib/byte_order.h"		#include "lib/byte_order.h"
#include "lib/external_libraries/enet.h"		#include "lib/external_libraries/enet.h"
		#include "lib/external_libraries/libsdl.h"
#include "lib/sysdep/sysdep.h"		#include "lib/sysdep/sysdep.h"
#include "lobby/IXmppClient.h"		#include "lobby/IXmppClient.h"
#include "ps/CConsole.h"		#include "ps/CConsole.h"
#include "ps/CLogger.h"		#include "ps/CLogger.h"
#include "ps/Compress.h"		#include "ps/Compress.h"
#include "ps/CStr.h"		#include "ps/CStr.h"
#include "ps/Game.h"		#include "ps/Game.h"
#include "ps/Loader.h"		#include "ps/Loader.h"
#include "scriptinterface/ScriptInterface.h"		#include "scriptinterface/ScriptInterface.h"
#include "simulation2/Simulation2.h"		#include "simulation2/Simulation2.h"
		#include "network/StunClient.h"

CNetClient *g_NetClient = NULL;		CNetClient *g_NetClient = NULL;
		SilierAuthorUnsubmitted Done Inline Actions ok, need to solve this one Silier: ok, need to solve this one

/**		/**
* Async task for receiving the initial game state when rejoining an		* Async task for receiving the initial game state when rejoining an
* in-progress network game.		* in-progress network game.
*/		*/
class CNetFileReceiveTask_ClientRejoin : public CNetFileReceiveTask		class CNetFileReceiveTask_ClientRejoin : public CNetFileReceiveTask
{		{
NONCOPYABLE(CNetFileReceiveTask_ClientRejoin);		NONCOPYABLE(CNetFileReceiveTask_ClientRejoin);
Show All 21 Lines

CNetClient::CNetClient(CGame* game, bool isLocalClient) :		CNetClient::CNetClient(CGame* game, bool isLocalClient) :
m_Session(NULL),		m_Session(NULL),
m_UserName(L"anonymous"),		m_UserName(L"anonymous"),
m_HostID((u32)-1), m_ClientTurnManager(NULL), m_Game(game),		m_HostID((u32)-1), m_ClientTurnManager(NULL), m_Game(game),
m_GameAttributes(game->GetSimulation2()->GetScriptInterface().GetGeneralJSContext()),		m_GameAttributes(game->GetSimulation2()->GetScriptInterface().GetGeneralJSContext()),
m_IsLocalClient(isLocalClient),		m_IsLocalClient(isLocalClient),
m_LastConnectionCheck(0),		m_LastConnectionCheck(0),
		m_ServerAddress(""),
		m_ServerPort(0),
m_Rejoin(false)		m_Rejoin(false)
{		{
m_Game->SetTurnManager(NULL); // delete the old local turn manager so we don't accidentally use it		m_Game->SetTurnManager(NULL); // delete the old local turn manager so we don't accidentally use it

void* context = this;		void* context = this;

JS_AddExtraGCRootsTracer(GetScriptInterface().GetGeneralJSContext(), CNetClient::Trace, this);		JS_AddExtraGCRootsTracer(GetScriptInterface().GetGeneralJSContext(), CNetClient::Trace, this);

▲ Show 20 Lines • Show All 75 Lines • ▼ Show 20 Lines	void CNetClient::SetUserName(const CStrW& username)
m_UserName = username;		m_UserName = username;
}		}

void CNetClient::SetHostingPlayerName(const CStr& hostingPlayerName)		void CNetClient::SetHostingPlayerName(const CStr& hostingPlayerName)
{		{
m_HostingPlayerName = hostingPlayerName;		m_HostingPlayerName = hostingPlayerName;
}		}

bool CNetClient::SetupConnection(const CStr& server, const u16 port, ENetHost* enetClient)		bool CNetClient::SetupConnection(ENetHost* enetClient)
{		{
		wraitiiUnsubmitted Not Done Inline Actions Likewise, I'd `ENSURE(!m_serverAddress.empty())` wraitii: Likewise, I'd `ENSURE(!m_serverAddress.empty())`
		SilierAuthorUnsubmitted Done Inline Actions vs does not like it Silier: vs does not like it
CNetClientSession* session = new CNetClientSession(*this);		CNetClientSession* session = new CNetClientSession(*this);
bool ok = session->Connect(server, port, m_IsLocalClient, enetClient);		bool ok = session->Connect(m_ServerAddress, m_ServerPort, m_IsLocalClient, enetClient);
SetAndOwnSession(session);		SetAndOwnSession(session);
return ok;		return ok;
}		}

		void CNetClient::SetupServerData(CStr address, u16 port, bool stun)
		{
		if (m_Session)
		return;
		wraitiiUnsubmitted Done Inline Actions I would `ENSURE (!m_Session)`, this is called from C++ code only. wraitii: I would `ENSURE (!m_Session)`, this is called from C++ code only.

		m_ServerAddress = address;
		m_ServerPort = port;
		m_UseSTUN = stun;
		}

		void CNetClient::OnGetServerDataFailed(const CStr& error)
		StanUnsubmitted Not Done Inline Actions This method and the onr below could be const I think Stan: This method and the onr below could be const I think
		SilierAuthorUnsubmitted Done Inline Actions cant, pushguimessage is function of CNetClient and cant be const Silier: cant, pushguimessage is function of CNetClient and cant be const
		{
		if (m_Session)
		return;

		PushGuiMessage(
		"type", "serverdata",
		SilierAuthorUnsubmitted Done Inline Actions nuke Silier: nuke
		"status", "failed",
		"reason", error
		);
		}

		bool CNetClient::TryToConnect(const CStr& hostJID)
		wraitiiUnsubmitted Not Done Inline Actions I think you should use this function elsewhere, as you're introducing duplication otherwise. wraitii: I think you should use this function elsewhere, as you're introducing duplication otherwise.
		{
		if (m_Session)
		return false;
		SilierAuthorUnsubmitted Done Inline Actions nuke Silier: nuke

		if (m_ServerAddress.empty())
		{
		PushGuiMessage(
		"type", "netstatus",
		StanUnsubmitted Not Done Inline Actions Isn't it above? also I believe Unix takes a capitalized letter. Stan: Isn't it above? also I believe Unix takes a capitalized letter.
		SilierAuthorUnsubmitted Done Inline Actions what do you mean by above? Silier: what do you mean by above?
		StanUnsubmitted Not Done Inline Actions I mean 1024 + something is usually above 1024 no? Stan: I mean 1024 + something is usually above 1024 no?
		"status", "disconnected",
		"reason", static_cast<i32>(NDR_SERVER_REFUSED));
		return false;
		}
		SilierAuthorUnsubmitted Done Inline Actions gui message Silier: gui message

		ENetHost* enetClient = nullptr;
		if (g_XmppClient && m_UseSTUN)
		{
		// Find an unused port
		for (int i = 0; i < 5 && !enetClient; ++i)
		{
		// Ports below 1024 are privileged on unix
		u16 port = 1024 + rand() % (UINT16_MAX - 1024);
		ENetAddress hostAddr{ ENET_HOST_ANY, port };
		SilierAuthorUnsubmitted Done Inline Actions gui message Silier: gui message
		enetClient = enet_host_create(&hostAddr, 1, 1, 0, 0);
		++hostAddr.port;
		}
		vladislavbelovUnsubmitted Not Done Inline Actions No need to search for a port for the client. The code seems weird. vladislavbelov: No need to search for a port for the client. The code seems weird.
		SilierAuthorUnsubmitted Done Inline Actions see JSI_Network::StartNetworkJoin Silier: see JSI_Network::StartNetworkJoin

		SilierAuthorUnsubmitted Done Inline Actions nukr Silier: nukr
		if (!enetClient)
		{
		PushGuiMessage(
		SilierAuthorUnsubmitted Done Inline Actions nuke Silier: nuke
		"type", "netstatus",
		"status", "disconnected",
		"reason", static_cast<i32>(NDR_STUN_PORT_FAILED));
		return false;
		SilierAuthorUnsubmitted Done Inline Actions nuke Silier: nuke
		}

		StunClient::StunEndpoint stunEndpoint;
		ImarokUnsubmitted Not Done Inline Actions Not sure, but can't you use the state machine or so for that. Blocking the whole game for one second doesn't sound like a good idea. Imarok: Not sure, but can't you use the state machine or so for that. Blocking the whole game for one…
		if (!StunClient::FindStunEndpointJoin(*enetClient, stunEndpoint))
		SilierAuthorUnsubmitted Done Inline Actions gui message Silier: gui message
		{
		PushGuiMessage(
		"type", "netstatus",
		"status", "disconnected",
		"reason", static_cast<i32>(NDR_STUN_ENDPOINT_FAILED));
		return false;
		}

		g_XmppClient->SendStunEndpointToHost(stunEndpoint, hostJID);

		SDL_Delay(1000);
		vladislavbelovUnsubmitted Not Done Inline Actions Why so? And on which thread? vladislavbelov: Why so? And on which thread?
		SilierAuthorUnsubmitted Done Inline Actions Because we need to wait for answer ref: JSI_Network::StartNetworkJoin Silier: Because we need to wait for answer ref: JSI_Network::StartNetworkJoin
		StanUnsubmitted Not Done Inline Actions I assume there is no callback? Stan: I assume there is no callback?

		StunClient::SendHolePunchingMessages(*enetClient, m_ServerAddress, m_ServerPort);
		}

		if (!g_NetClient->SetupConnection(enetClient))
		{
		PushGuiMessage(
		"type", "netstatus",
		"status", "disconnected",
		"reason", static_cast<i32>(NDR_UNKNOWN));
		return false;
		}

		return true;
		}

void CNetClient::SetAndOwnSession(CNetClientSession* session)		void CNetClient::SetAndOwnSession(CNetClientSession* session)
{		{
delete m_Session;		delete m_Session;
m_Session = session;		m_Session = session;
}		}

void CNetClient::DestroyConnection()		void CNetClient::DestroyConnection()
{		{
▲ Show 20 Lines • Show All 678 Lines • Show Last 20 Lines