edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-18 14:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce duplicate code for sending messages for dummy

Browse source 
Add parameter `int Conn` to `SendInfo` and `SendReady` functions and use existing `SendEnterGame` function to reduce duplicate code for sending the same messages for main and dummy connections.
This commit is contained in:
Robert Müller 2023-10-24 19:45:54 +02:00
parent 31031f5cc1
commit bade6f78fb
2 changed files with 13 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/engine/client/client.cpp
View file

@ -239,18 +239,18 @@ int CClient::SendMsgActive(CMsgPacker *pMsg, int Flags)
return SendMsg(g_Config.m_ClDummy, pMsg, Flags); return SendMsg(g_Config.m_ClDummy, pMsg, Flags);
} }
void CClient::SendInfo() void CClient::SendInfo(int Conn)
{ {
CMsgPacker MsgVer(NETMSG_CLIENTVER, true); CMsgPacker MsgVer(NETMSG_CLIENTVER, true);
MsgVer.AddRaw(&m_ConnectionID, sizeof(m_ConnectionID)); MsgVer.AddRaw(&m_ConnectionID, sizeof(m_ConnectionID));
MsgVer.AddInt(GameClient()->DDNetVersion()); MsgVer.AddInt(GameClient()->DDNetVersion());
MsgVer.AddString(GameClient()->DDNetVersionStr(), 0); MsgVer.AddString(GameClient()->DDNetVersionStr(), 0);
SendMsg(CONN_MAIN, &MsgVer, MSGFLAG_VITAL); SendMsg(Conn, &MsgVer, MSGFLAG_VITAL);
CMsgPacker Msg(NETMSG_INFO, true); CMsgPacker Msg(NETMSG_INFO, true);
Msg.AddString(GameClient()->NetVersion(), 128); Msg.AddString(GameClient()->NetVersion(), 128);
Msg.AddString(m_aPassword, 128); Msg.AddString(m_aPassword, 128);
SendMsg(CONN_MAIN, &Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH); SendMsg(Conn, &Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH);
} }
void CClient::SendEnterGame(int Conn) void CClient::SendEnterGame(int Conn)
@ -259,10 +259,10 @@ void CClient::SendEnterGame(int Conn)
SendMsg(Conn, &Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH); SendMsg(Conn, &Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH);
} }
void CClient::SendReady() void CClient::SendReady(int Conn)
{ {
CMsgPacker Msg(NETMSG_READY, true); CMsgPacker Msg(NETMSG_READY, true);
SendMsg(CONN_MAIN, &Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH); SendMsg(Conn, &Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH);
} }
void CClient::SendMapRequest() void CClient::SendMapRequest()
@ -1494,7 +1494,7 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
{ {
m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client/network", "loading done"); m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client/network", "loading done");
SetLoadingStateDetail(IClient::LOADING_STATE_DETAIL_SENDING_READY); SetLoadingStateDetail(IClient::LOADING_STATE_DETAIL_SENDING_READY);
SendReady(); SendReady(CONN_MAIN);
} }
else else
{ {
@ -2096,7 +2096,7 @@ void CClient::FinishMapDownload()
{ {
ResetMapDownload(); ResetMapDownload();
m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client/network", "loading done"); m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client/network", "loading done");
SendReady(); SendReady(CONN_MAIN);
} }
else if(m_pMapdownloadTask) // fallback else if(m_pMapdownloadTask) // fallback
{ {
@ -2329,7 +2329,7 @@ void CClient::PumpNetwork()
m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "client", "connected, sending info", gs_ClientNetworkPrintColor); m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "client", "connected, sending info", gs_ClientNetworkPrintColor);
SetState(IClient::STATE_LOADING); SetState(IClient::STATE_LOADING);
SetLoadingStateDetail(IClient::LOADING_STATE_DETAIL_INITIAL); SetLoadingStateDetail(IClient::LOADING_STATE_DETAIL_INITIAL);
SendInfo(); SendInfo(CONN_MAIN);
} }
} }
@ -2921,32 +2921,11 @@ void CClient::Run()
if(m_DummySendConnInfo && !m_aNetClient[CONN_DUMMY].SecurityTokenUnknown()) if(m_DummySendConnInfo && !m_aNetClient[CONN_DUMMY].SecurityTokenUnknown())
{ {
m_DummySendConnInfo = false; m_DummySendConnInfo = false;
SendInfo(CONN_DUMMY);
// send client info
CMsgPacker MsgVer(NETMSG_CLIENTVER, true);
MsgVer.AddRaw(&m_ConnectionID, sizeof(m_ConnectionID));
MsgVer.AddInt(GameClient()->DDNetVersion());
MsgVer.AddString(GameClient()->DDNetVersionStr(), 0);
SendMsg(CONN_DUMMY, &MsgVer, MSGFLAG_VITAL);
CMsgPacker MsgInfo(NETMSG_INFO, true);
MsgInfo.AddString(GameClient()->NetVersion(), 128);
MsgInfo.AddString(m_aPassword, 128);
SendMsg(CONN_DUMMY, &MsgInfo, MSGFLAG_VITAL | MSGFLAG_FLUSH);
// update netclient
m_aNetClient[CONN_DUMMY].Update(); m_aNetClient[CONN_DUMMY].Update();
SendReady(CONN_DUMMY);
// send ready
CMsgPacker MsgReady(NETMSG_READY, true);
SendMsg(CONN_DUMMY, &MsgReady, MSGFLAG_VITAL | MSGFLAG_FLUSH);
// startinfo
GameClient()->SendDummyInfo(true); GameClient()->SendDummyInfo(true);
SendEnterGame(CONN_DUMMY);
// send enter game an finish the connection
CMsgPacker MsgEnter(NETMSG_ENTERGAME, true);
SendMsg(CONN_DUMMY, &MsgEnter, MSGFLAG_VITAL | MSGFLAG_FLUSH);
} }
// update input // update input

4
src/engine/client/client.h
View file

@ -270,9 +270,9 @@ public:
// Send via the currently active client (main/dummy) // Send via the currently active client (main/dummy)
int SendMsgActive(CMsgPacker *pMsg, int Flags) override; int SendMsgActive(CMsgPacker *pMsg, int Flags) override;
void SendInfo(); void SendInfo(int Conn);
void SendEnterGame(int Conn); void SendEnterGame(int Conn);
void SendReady(); void SendReady(int Conn);
void SendMapRequest(); void SendMapRequest();
bool RconAuthed() const override { return m_aRconAuthed[g_Config.m_ClDummy] != 0; } bool RconAuthed() const override { return m_aRconAuthed[g_Config.m_ClDummy] != 0; }