Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 13:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use a separate state that defines the status of the socket

Browse source
This commit is contained in:
smallmodel 2025-04-26 21:12:27 +02:00
parent 08a985d183
commit 007c680b45
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
code/gamespy/goaceng.h
View file

@ -77,7 +77,7 @@ lanlist - we are waiting for replies from servers on the LAN
querying - the servers on the list are being queried
connecting (added in OPM) - socket is currently connecting to the master server
*/
typedef enum {sl_idle, sl_listxfer, sl_lanlist, sl_querying, sl_connecting} GServerListState;
typedef enum {sl_idle, sl_listxfer, sl_lanlist, sl_querying} GServerListState;
/* Comparision types for the ServerListSort function
int - assume the values are int and do an integer compare

22
code/gamespy/gserverlist.c
View file

@ -78,6 +78,7 @@ typedef struct
} UpdateInfo;
typedef enum { pi_fieldcount, pi_fields, pi_servers } GParseInfoState;
typedef enum { ls_connecting, ls_connected, ls_finished } GListSocketState;
struct GServerListImplementation
{
@ -95,7 +96,9 @@ struct GServerListImplementation
void *instance;
char *sortkey;
gbool sortascending;
GListSocketState socketstate;
SOCKET slsocket;
//SOCKET slsockets;
unsigned long lanstarttime;
GQueryType querytype;
HashTable keylist;
@ -386,7 +389,7 @@ GError ServerListStartQuery(GServerList serverlist, gbool async)
{
GError error;
if (serverlist->state != sl_connecting) {
if (serverlist->socketstate != ls_connecting) {
return GE_BUSY;
}
@ -404,7 +407,7 @@ GError ServerListStartQuery(GServerList serverlist, gbool async)
getsockopt(serverlist->slsocket, SOL_SOCKET, SO_ERROR, &so_error, &len);
if (so_error) {
serverlist->state = sl_idle;
serverlist->socketstate = ls_connected;
return GE_NOCONNECT;
}
@ -415,7 +418,7 @@ GError ServerListStartQuery(GServerList serverlist, gbool async)
}
}
serverlist->state = sl_idle;
serverlist->socketstate = ls_connected;
error = SendListRequest(serverlist, serverlist->filter);
if (error) return error;
@ -452,7 +455,7 @@ GError ServerListUpdate2(GServerList serverlist, gbool async, char *filter, GQue
serverlist->cryptinfo.offset = -1;
strncpy(serverlist->filter, filter, sizeof(serverlist->filter));
serverlist->state = sl_connecting;
serverlist->socketstate = ls_connecting;
if (async) {
return 0;
@ -974,6 +977,14 @@ For use with Async Updates. This needs to be called every ~10ms for list process
updating to occur during async server list updates */
GError ServerListThink(GServerList serverlist)
{
switch(serverlist->socketstate)
{
case ls_connecting:
ServerListStartQuery(serverlist, 1);
break;
default:
break;
}
switch (serverlist->state)
{
@ -988,9 +999,6 @@ GError ServerListThink(GServerList serverlist)
//do some queries
return ServerListQueryLoop(serverlist);
break;
case sl_connecting:
return ServerListStartQuery(serverlist, 1);
break;
}