X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=net_main.c;h=0697022f4f73941626ce8354e9c884a5e2c731e0;hb=51b777708e8db285cd0d4f0911e92a90240d11f4;hp=39b57cca238ffa7b24afd6ba494254796679222a;hpb=23bc50c038a78e63f8686b9da4a814a5116d8c3f;p=xonotic%2Fdarkplaces.git diff --git a/net_main.c b/net_main.c index 39b57cca..0697022f 100644 --- a/net_main.c +++ b/net_main.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -20,10 +20,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // net_main.c #include "quakedef.h" +#include "net_master.h" -qsocket_t *net_activeSockets = NULL; -qsocket_t *net_freeSockets = NULL; -int net_numsockets = 0; +qsocket_t *net_activeSockets = NULL; +mempool_t *net_mempool; qboolean ipxAvailable = false; qboolean tcpipAvailable = false; @@ -47,6 +47,11 @@ static void Slist_Poll(void); PollProcedure slistSendProcedure = {NULL, 0.0, Slist_Send}; PollProcedure slistPollProcedure = {NULL, 0.0, Slist_Poll}; +static void InetSlist_Send(void); +static void InetSlist_Poll(void); +PollProcedure inetSlistSendProcedure = {NULL, 0.0, InetSlist_Send}; +PollProcedure inetSlistPollProcedure = {NULL, 0.0, InetSlist_Poll}; + sizebuf_t net_message; int net_activeconnections = 0; @@ -56,8 +61,8 @@ int messagesReceived = 0; int unreliableMessagesSent = 0; int unreliableMessagesReceived = 0; -cvar_t net_messagetimeout = {"net_messagetimeout","300"}; -cvar_t hostname = {"hostname", "UNNAMED"}; +cvar_t net_messagetimeout = {0, "net_messagetimeout","300"}; +cvar_t hostname = {CVAR_SAVE, "hostname", "UNNAMED"}; qboolean configRestored = false; @@ -72,7 +77,7 @@ double net_time; double SetNetTime(void) { - net_time = Sys_FloatTime(); + net_time = Sys_DoubleTime(); return net_time; } @@ -89,15 +94,10 @@ qsocket_t *NET_NewQSocket (void) { qsocket_t *sock; - if (net_freeSockets == NULL) - return NULL; - if (net_activeconnections >= svs.maxclients) return NULL; - // get one from free list - sock = net_freeSockets; - net_freeSockets = sock->next; + sock = Mem_Alloc(net_mempool, sizeof(qsocket_t)); // add it to active list sock->next = net_activeSockets; @@ -143,10 +143,7 @@ void NET_FreeQSocket(qsocket_t *sock) Sys_Error ("NET_FreeQSocket: not active\n"); } - // add it to free list - sock->next = net_freeSockets; - net_freeSockets = sock; - sock->disconnected = true; + Mem_Free(sock); } @@ -171,7 +168,7 @@ static void NET_Listen_f (void) static void MaxPlayers_f (void) { - int n; + int n; if (Cmd_Argc () != 2) { @@ -186,13 +183,9 @@ static void MaxPlayers_f (void) } n = atoi(Cmd_Argv(1)); - if (n < 1) - n = 1; - if (n > svs.maxclientslimit) - { - n = svs.maxclientslimit; + n = bound(1, n, MAX_SCOREBOARD); + if (svs.maxclients != n) Con_Printf ("\"maxplayers\" set to \"%u\"\n", n); - } if ((n == 1) && listening) Cbuf_AddText ("listen 0\n"); @@ -200,14 +193,7 @@ static void MaxPlayers_f (void) if ((n > 1) && (!listening)) Cbuf_AddText ("listen 1\n"); - svs.maxclients = n; - // LordHavoc: resetting deathmatch and coop was silly - /* - if (n == 1) - Cvar_Set ("deathmatch", "0"); - else - Cvar_Set ("deathmatch", "1"); - */ + SV_SetMaxClients(n); } @@ -240,6 +226,12 @@ static void NET_Port_f (void) } +static void NET_Heartbeat_f (void) +{ + NET_Heartbeat (2); +} + + static void PrintSlistHeader(void) { Con_Printf("Server Map Users\n"); @@ -268,31 +260,51 @@ static void PrintSlistTrailer(void) if (hostCacheCount) Con_Printf("== end list ==\n\n"); else - Con_Printf("No Quake servers found.\n\n"); + { + if (gamemode == GAME_TRANSFUSION) + Con_Printf("No Transfusion servers found.\n\n"); + else + Con_Printf("No Quake servers found.\n\n"); + } } -void NET_Slist_f (void) +void NET_SlistCommon (PollProcedure *sendProcedure, PollProcedure *pollProcedure) { if (slistInProgress) return; if (! slistSilent) { - Con_Printf("Looking for Quake servers...\n"); + if (gamemode == GAME_TRANSFUSION) + Con_Printf("Looking for Transfusion servers...\n"); + else + Con_Printf("Looking for Quake servers...\n"); PrintSlistHeader(); } slistInProgress = true; - slistStartTime = Sys_FloatTime(); + slistStartTime = Sys_DoubleTime(); - SchedulePollProcedure(&slistSendProcedure, 0.0); - SchedulePollProcedure(&slistPollProcedure, 0.1); + SchedulePollProcedure(sendProcedure, 0.0); + SchedulePollProcedure(pollProcedure, 0.1); hostCacheCount = 0; } +void NET_Slist_f (void) +{ + NET_SlistCommon (&slistSendProcedure, &slistPollProcedure); +} + + +void NET_InetSlist_f (void) +{ + NET_SlistCommon (&inetSlistSendProcedure, &inetSlistPollProcedure); +} + + static void Slist_Send(void) { for (net_driverlevel=0; net_driverlevel < net_numdrivers; net_driverlevel++) @@ -304,7 +316,7 @@ static void Slist_Send(void) dfunc.SearchForHosts (true); } - if ((Sys_FloatTime() - slistStartTime) < 0.5) + if ((Sys_DoubleTime() - slistStartTime) < 0.5) SchedulePollProcedure(&slistSendProcedure, 0.75); } @@ -323,7 +335,7 @@ static void Slist_Poll(void) if (! slistSilent) PrintSlist(); - if ((Sys_FloatTime() - slistStartTime) < 1.5) + if ((Sys_DoubleTime() - slistStartTime) < 1.5) { SchedulePollProcedure(&slistPollProcedure, 0.1); return; @@ -337,6 +349,60 @@ static void Slist_Poll(void) } +static void InetSlist_Send(void) +{ + const char* host; + + if (!slistInProgress) + return; + + while ((host = Master_BuildGetServers ()) != NULL) + { + for (net_driverlevel=0; net_driverlevel < net_numdrivers; net_driverlevel++) + { + if (!slistLocal && net_driverlevel == 0) + continue; + if (net_drivers[net_driverlevel].initialized == false) + continue; + dfunc.SearchForInetHosts (host); + } + } + + if ((Sys_DoubleTime() - slistStartTime) < 3.5) + SchedulePollProcedure(&inetSlistSendProcedure, 1.0); +} + + +static void InetSlist_Poll(void) +{ + for (net_driverlevel=0; net_driverlevel < net_numdrivers; net_driverlevel++) + { + if (!slistLocal && net_driverlevel == 0) + continue; + if (net_drivers[net_driverlevel].initialized == false) + continue; + // We stop as soon as we have one answer (FIXME: bad...) + if (dfunc.SearchForInetHosts (NULL)) + slistInProgress = false; + } + + if (! slistSilent) + PrintSlist(); + + if (slistInProgress && (Sys_DoubleTime() - slistStartTime) < 4.0) + { + SchedulePollProcedure(&inetSlistPollProcedure, 0.1); + return; + } + + if (! slistSilent) + PrintSlistTrailer(); + slistInProgress = false; + slistSilent = false; + slistLocal = true; +} + + /* =================== NET_Connect @@ -556,7 +622,7 @@ int NET_SendMessage (qsocket_t *sock, sizebuf_t *data) r = sfunc.QSendMessage(sock, data); if (r == 1 && sock->driver) messagesSent++; - + return r; } @@ -609,6 +675,34 @@ qboolean NET_CanSendMessage (qsocket_t *sock) } +/* +==================== +NET_Heartbeat + +Send an heartbeat to the master server(s) +==================== +*/ +void NET_Heartbeat (int priority) +{ + const char* host; + + if (! Master_AllowHeartbeat (priority)) + return; + + while ((host = Master_BuildHeartbeat ()) != NULL) + { + for (net_driverlevel=0 ; net_driverlevel blocktime) + if ((Sys_DoubleTime() - start) > blocktime) break; } return count; @@ -695,7 +789,6 @@ void NET_Init (void) { int i; int controlSocket; - qsocket_t *s; i = COM_CheckParm ("-port"); if (!i) @@ -712,32 +805,25 @@ void NET_Init (void) } net_hostport = DEFAULTnet_hostport; - if (COM_CheckParm("-listen") || cls.state == ca_dedicated) + if (COM_CheckParm("-listen") || cls.state == ca_dedicated || gamemode == GAME_TRANSFUSION) listening = true; - net_numsockets = svs.maxclientslimit; - if (cls.state != ca_dedicated) - net_numsockets++; SetNetTime(); - for (i = 0; i < net_numsockets; i++) - { - s = (qsocket_t *)Hunk_AllocName(sizeof(qsocket_t), "qsocket"); - s->next = net_freeSockets; - net_freeSockets = s; - s->disconnected = true; - } + net_mempool = Mem_AllocPool("qsocket"); // allocate space for network message buffer - SZ_Alloc (&net_message, NET_MAXMESSAGE); + SZ_Alloc (&net_message, NET_MAXMESSAGE, "net_message"); Cvar_RegisterVariable (&net_messagetimeout); Cvar_RegisterVariable (&hostname); - Cmd_AddCommand ("slist", NET_Slist_f); + Cmd_AddCommand ("net_slist", NET_Slist_f); + Cmd_AddCommand ("net_inetslist", NET_InetSlist_f); Cmd_AddCommand ("listen", NET_Listen_f); Cmd_AddCommand ("maxplayers", MaxPlayers_f); Cmd_AddCommand ("port", NET_Port_f); + Cmd_AddCommand ("heartbeat", NET_Heartbeat_f); // initialize all the drivers for (net_driverlevel=0 ; net_driverlevelnext) - NET_Close(sock); + while (net_activeSockets) + NET_Close(net_activeSockets); // // shutdown the drivers @@ -783,6 +869,8 @@ void NET_Shutdown (void) net_drivers[net_driverlevel].initialized = false; } } + + Mem_FreePool(&net_mempool); } @@ -811,7 +899,7 @@ void SchedulePollProcedure(PollProcedure *proc, double timeOffset) { PollProcedure *pp, *prev; - proc->nextTime = Sys_FloatTime() + timeOffset; + proc->nextTime = Sys_DoubleTime() + timeOffset; for (pp = pollProcedureList, prev = NULL; pp; pp = pp->next) { if (pp->nextTime >= proc->nextTime) @@ -829,3 +917,4 @@ void SchedulePollProcedure(PollProcedure *proc, double timeOffset) proc->next = pp; prev->next = proc; } +