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

Server: Only recv new packets when we know they are waiting

Browse source 
Reduces the number of syscalls
This commit is contained in:
def 2020-09-13 23:23:50 +02:00
parent 5228473ec9
commit 6ce04d93f1
2 changed files with 67 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

131
src/engine/server/server.cpp
View file

@ -2124,81 +2124,84 @@ void CServer::UpdateServerInfo(bool Resend)
m_ServerInfoNeedsUpdate = false; m_ServerInfoNeedsUpdate = false;
} }
void CServer::PumpNetwork() void CServer::PumpNetwork(bool PacketWaiting)
{ {
CNetChunk Packet; CNetChunk Packet;
SECURITY_TOKEN ResponseToken; SECURITY_TOKEN ResponseToken;
m_NetServer.Update(); m_NetServer.Update();
// process packets if(PacketWaiting)
while(m_NetServer.Recv(&Packet, &ResponseToken))
{ {
if(Packet.m_ClientID == -1) // process packets
while(m_NetServer.Recv(&Packet, &ResponseToken))
{ {
// stateless if(Packet.m_ClientID == -1)
if(!(Packet.m_Flags&NETSENDFLAG_CONNLESS))
{ {
m_RegSixup.FeedToken(Packet.m_Address, ResponseToken); // stateless
continue; if(!(Packet.m_Flags & NETSENDFLAG_CONNLESS))
}
if(ResponseToken != NET_SECURITY_TOKEN_UNKNOWN && g_Config.m_SvSixup &&
m_RegSixup.RegisterProcessPacket(&Packet, ResponseToken))
continue;
if(ResponseToken == NET_SECURITY_TOKEN_UNKNOWN && m_Register.RegisterProcessPacket(&Packet))
continue;
{
int ExtraToken = 0;
int Type = -1;
if(Packet.m_DataSize >= (int)sizeof(SERVERBROWSE_GETINFO)+1 &&
mem_comp(Packet.m_pData, SERVERBROWSE_GETINFO, sizeof(SERVERBROWSE_GETINFO)) == 0)
{ {
if(Packet.m_Flags&NETSENDFLAG_EXTENDED) m_RegSixup.FeedToken(Packet.m_Address, ResponseToken);
continue;
}
if(ResponseToken != NET_SECURITY_TOKEN_UNKNOWN && g_Config.m_SvSixup &&
m_RegSixup.RegisterProcessPacket(&Packet, ResponseToken))
continue;
if(ResponseToken == NET_SECURITY_TOKEN_UNKNOWN && m_Register.RegisterProcessPacket(&Packet))
continue;
{
int ExtraToken = 0;
int Type = -1;
if(Packet.m_DataSize >= (int)sizeof(SERVERBROWSE_GETINFO) + 1 &&
mem_comp(Packet.m_pData, SERVERBROWSE_GETINFO, sizeof(SERVERBROWSE_GETINFO)) == 0)
{ {
Type = SERVERINFO_EXTENDED; if(Packet.m_Flags & NETSENDFLAG_EXTENDED)
ExtraToken = (Packet.m_aExtraData[0] << 8) | Packet.m_aExtraData[1]; {
Type = SERVERINFO_EXTENDED;
ExtraToken = (Packet.m_aExtraData[0] << 8) | Packet.m_aExtraData[1];
}
else
Type = SERVERINFO_VANILLA;
} }
else else if(Packet.m_DataSize >= (int)sizeof(SERVERBROWSE_GETINFO_64_LEGACY) + 1 &&
Type = SERVERINFO_VANILLA; mem_comp(Packet.m_pData, SERVERBROWSE_GETINFO_64_LEGACY, sizeof(SERVERBROWSE_GETINFO_64_LEGACY)) == 0)
} {
else if(Packet.m_DataSize >= (int)sizeof(SERVERBROWSE_GETINFO_64_LEGACY)+1 && Type = SERVERINFO_64_LEGACY;
mem_comp(Packet.m_pData, SERVERBROWSE_GETINFO_64_LEGACY, sizeof(SERVERBROWSE_GETINFO_64_LEGACY)) == 0) }
{ if(Type == SERVERINFO_VANILLA && ResponseToken != NET_SECURITY_TOKEN_UNKNOWN && g_Config.m_SvSixup)
Type = SERVERINFO_64_LEGACY; {
} CUnpacker Unpacker;
if(Type == SERVERINFO_VANILLA && ResponseToken != NET_SECURITY_TOKEN_UNKNOWN && g_Config.m_SvSixup) Unpacker.Reset((unsigned char *)Packet.m_pData + sizeof(SERVERBROWSE_GETINFO), Packet.m_DataSize - sizeof(SERVERBROWSE_GETINFO));
{ int SrvBrwsToken = Unpacker.GetInt();
CUnpacker Unpacker; if(Unpacker.Error())
Unpacker.Reset((unsigned char*)Packet.m_pData+sizeof(SERVERBROWSE_GETINFO), Packet.m_DataSize-sizeof(SERVERBROWSE_GETINFO)); continue;
int SrvBrwsToken = Unpacker.GetInt();
if(Unpacker.Error())
continue;
CPacker Packer; CPacker Packer;
CNetChunk Response; CNetChunk Response;
GetServerInfoSixup(&Packer, SrvBrwsToken, RateLimitServerInfoConnless()); GetServerInfoSixup(&Packer, SrvBrwsToken, RateLimitServerInfoConnless());
Response.m_ClientID = -1; Response.m_ClientID = -1;
Response.m_Address = Packet.m_Address; Response.m_Address = Packet.m_Address;
Response.m_Flags = NETSENDFLAG_CONNLESS; Response.m_Flags = NETSENDFLAG_CONNLESS;
Response.m_pData = Packer.Data(); Response.m_pData = Packer.Data();
Response.m_DataSize = Packer.Size(); Response.m_DataSize = Packer.Size();
m_NetServer.SendConnlessSixup(&Response, ResponseToken); m_NetServer.SendConnlessSixup(&Response, ResponseToken);
} }
else if(Type != -1) else if(Type != -1)
{ {
int Token = ((unsigned char *)Packet.m_pData)[sizeof(SERVERBROWSE_GETINFO)]; int Token = ((unsigned char *)Packet.m_pData)[sizeof(SERVERBROWSE_GETINFO)];
Token |= ExtraToken << 8; Token |= ExtraToken << 8;
SendServerInfoConnless(&Packet.m_Address, Token, Type); SendServerInfoConnless(&Packet.m_Address, Token, Type);
}
} }
} }
} else
else {
{ ProcessClientPacket(&Packet);
ProcessClientPacket(&Packet); }
} }
} }
@ -2409,6 +2412,7 @@ int CServer::Run()
// start game // start game
{ {
bool NonActive = false; bool NonActive = false;
bool PacketWaiting = false;
m_Lastheartbeat = 0; m_Lastheartbeat = 0;
m_GameStartTime = time_get(); m_GameStartTime = time_get();
@ -2417,7 +2421,7 @@ int CServer::Run()
while(m_RunServer < STOPPING) while(m_RunServer < STOPPING)
{ {
if(NonActive) if(NonActive)
PumpNetwork(); PumpNetwork(PacketWaiting);
set_new_tick(); set_new_tick();
@ -2566,7 +2570,7 @@ int CServer::Run()
Antibot()->OnEngineTick(); Antibot()->OnEngineTick();
if(!NonActive) if(!NonActive)
PumpNetwork(); PumpNetwork(PacketWaiting);
NonActive = true; NonActive = true;
@ -2591,7 +2595,7 @@ int CServer::Run()
if(g_Config.m_SvShutdownWhenEmpty) if(g_Config.m_SvShutdownWhenEmpty)
m_RunServer = STOPPING; m_RunServer = STOPPING;
else else
net_socket_read_wait(m_NetServer.Socket(), 1000000); PacketWaiting = net_socket_read_wait(m_NetServer.Socket(), 1000000);
} }
else else
{ {
@ -2601,10 +2605,7 @@ int CServer::Run()
int64 t = time_get(); int64 t = time_get();
int x = (TickStartTime(m_CurrentGameTick+1) - t) * 1000000 / time_freq() + 1; int x = (TickStartTime(m_CurrentGameTick+1) - t) * 1000000 / time_freq() + 1;
if(x > 0) PacketWaiting = x > 0 ? net_socket_read_wait(m_NetServer.Socket(), x) : true;
{
net_socket_read_wait(m_NetServer.Socket(), x);
}
} }
} }
} }

2
src/engine/server/server.h
View file

@ -354,7 +354,7 @@ public:
void SendServerInfoConnless(const NETADDR *pAddr, int Token, int Type); void SendServerInfoConnless(const NETADDR *pAddr, int Token, int Type);
void UpdateServerInfo(bool Resend = false); void UpdateServerInfo(bool Resend = false);
void PumpNetwork(); void PumpNetwork(bool PacketWaiting);
char *GetMapName(); char *GetMapName();
int LoadMap(const char *pMapName); int LoadMap(const char *pMapName);