Cube  Diff

Differences From Artifact [92a8ff6795]:

To Artifact [01d1ff60c2]:


1


2
3
4


5
6

7
8
9
10



11
12
13

14
15
16


17
18
19
20
21
22
23
24
25

26

27
28
29


30
31
32
33



34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51

















52
53

54

55
56
57
58



59
60

61
62
63
64
65
66
67






68
69

70

71
72
73
74
75
76
77
78
79









80

81

82
83
84
85
86
87
88
89
90
91
92











93
94

95

96
97
98
99
100




101
102

103

104
105
106


107
108
109
110
111
112
113
114
115
116
117










118
119

120
121
122
123
124
125
126
127
128
129









130
131
132

133
134
135
136
137
138
139






140
141
142
143
144
145



146


147

148

149
150
151
152
153
154
155
156
157
158
159
160
161
162













163
164

165

166
167
168
169
170
171
172
173
174
175
176
177
178
179
180















181
182
183



184
185
186
187



188
189
190
191
192
193






194
195
196
197
198
199
200






201
202

203

204
205
206
207
208
209
210
211
212








213
214
215
216
217
218






219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
















235
236

237

238


239

240
241

242

243
244
245
246
247
248
249
250
251
252










253
254
255





256
257




258
259
260
261
262
263
264











265
266

267

268
269

270
271
272
273
274
275
276
277







278
279

280

281
282
283
284
285
286
287











288
289
290
291
292
293

294

295
296
297
298
299
300






301
302
303

1
2
3


4
5
6

7




8
9
10
11
12

13



14
15
16
17
18
19
20
21
22
23
24
25

26
27


28
29




30
31
32


















33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52

53
54



55
56
57
58

59







60
61
62
63
64
65
66
67
68

69
70








71
72
73
74
75
76
77
78
79
80
81

82
83










84
85
86
87
88
89
90
91
92
93
94
95
96
97

98
99




100
101
102
103
104
105
106

107
108


109
110











111
112
113
114
115
116
117
118
119
120


121










122
123
124
125
126
127
128
129
130
131
132

133







134
135
136
137
138
139
140
141
142
143
144
145
146
147
148

149
150
151
152

153
154













155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170

171
172














173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188


189
190
191
192



193
194
195






196
197
198
199
200
201







202
203
204
205
206
207
208
209
210

211
212








213
214
215
216
217
218
219
220






221
222
223
224
225
226
















227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245

246
247
248
249

250
251
252
253

254
255









256
257
258
259
260
261
262
263
264
265



266
267
268
269
270


271
272
273
274







275
276
277
278
279
280
281
282
283
284
285
286
287
288

289
290

291








292
293
294
295
296
297
298
299
300
301

302
303






304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321

322
323





324
325
326
327
328
329
330


-
+
+

-
-
+
+

-
+
-
-
-
-
+
+
+


-
+
-
-
-
+
+









+
-
+

-
-
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+


+
-
+

-
-
-
+
+
+

-
+
-
-
-
-
-
-
-
+
+
+
+
+
+


+
-
+

-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+

+
-
+

-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+


+
-
+

-
-
-
-
+
+
+
+


+
-
+

-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+


-
+
-
-
-
-
-
-
-
+
+
+
+
+
+






+
+
+
-
+
+

+
-
+

-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+


+
-
+

-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

-
-
+
+
+

-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+


+
-
+

-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+


+
-
+

+
+
-
+


+
-
+

-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+


+
-
+

-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+


+
-
+

-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+






+
-
+

-
-
-
-
-
+
+
+
+
+
+

-
-
// serverbrowser.cpp: eihrul's concurrent resolver, and server browser window management
// serverbrowser.cpp: eihrul's concurrent resolver, and server browser window
// management

#include "cube.h"
#include "SDL_thread.h"
#include "SDL_thread.h"
#include "cube.h"

struct resolverthread
struct resolverthread {
{
    SDL_Thread *thread;
    char *query;
    int starttime;
	SDL_Thread *thread;
	char *query;
	int starttime;
};

struct resolverresult
struct resolverresult {
{
    char *query;
    ENetAddress address;
	char *query;
	ENetAddress address;
};

vector<resolverthread> resolverthreads;
vector<char *> resolverqueries;
vector<resolverresult> resolverresults;
SDL_mutex *resolvermutex;
SDL_sem *resolversem;
int resolverlimit = 1000;

int
int resolverloop(void * data)
resolverloop(void *data)
{
    resolverthread *rt = (resolverthread *)data;
    for(;;)
	resolverthread *rt = (resolverthread *)data;
	for (;;) {
    {
        SDL_SemWait(resolversem);
        SDL_LockMutex(resolvermutex);
        if(resolverqueries.empty())
		SDL_SemWait(resolversem);
		SDL_LockMutex(resolvermutex);
		if (resolverqueries.empty()) {
        {
            SDL_UnlockMutex(resolvermutex);
            continue;
        }
        rt->query = resolverqueries.pop();
        rt->starttime = lastmillis;
        SDL_UnlockMutex(resolvermutex);
        ENetAddress address = { ENET_HOST_ANY, CUBE_SERVINFO_PORT };
        enet_address_set_host(&address, rt->query);
        SDL_LockMutex(resolvermutex);
        resolverresult &rr = resolverresults.add();
        rr.query = rt->query;
        rr.address = address;
        rt->query = NULL;
        rt->starttime = 0;
        SDL_UnlockMutex(resolvermutex);
    };
    return 0;
			SDL_UnlockMutex(resolvermutex);
			continue;
		}
		rt->query = resolverqueries.pop();
		rt->starttime = lastmillis;
		SDL_UnlockMutex(resolvermutex);
		ENetAddress address = {ENET_HOST_ANY, CUBE_SERVINFO_PORT};
		enet_address_set_host(&address, rt->query);
		SDL_LockMutex(resolvermutex);
		resolverresult &rr = resolverresults.add();
		rr.query = rt->query;
		rr.address = address;
		rt->query = NULL;
		rt->starttime = 0;
		SDL_UnlockMutex(resolvermutex);
	};
	return 0;
};

void
void resolverinit(int threads, int limit)
resolverinit(int threads, int limit)
{
    resolverlimit = limit;
    resolversem = SDL_CreateSemaphore(0);
    resolvermutex = SDL_CreateMutex();
	resolverlimit = limit;
	resolversem = SDL_CreateSemaphore(0);
	resolvermutex = SDL_CreateMutex();

    while(threads > 0)
	while (threads > 0) {
    {
        resolverthread &rt = resolverthreads.add();
        rt.query = NULL;
        rt.starttime = 0;
        rt.thread = SDL_CreateThread(resolverloop, &rt);
        --threads;
    };
		resolverthread &rt = resolverthreads.add();
		rt.query = NULL;
		rt.starttime = 0;
		rt.thread = SDL_CreateThread(resolverloop, &rt);
		--threads;
	};
};

void
void resolverstop(resolverthread &rt, bool restart)
resolverstop(resolverthread &rt, bool restart)
{
    SDL_LockMutex(resolvermutex);
    SDL_KillThread(rt.thread);
    rt.query = NULL;
    rt.starttime = 0;
    rt.thread = NULL;
    if(restart) rt.thread = SDL_CreateThread(resolverloop, &rt);
    SDL_UnlockMutex(resolvermutex);
}; 
	SDL_LockMutex(resolvermutex);
	SDL_KillThread(rt.thread);
	rt.query = NULL;
	rt.starttime = 0;
	rt.thread = NULL;
	if (restart)
		rt.thread = SDL_CreateThread(resolverloop, &rt);
	SDL_UnlockMutex(resolvermutex);
};

void
void resolverclear()
resolverclear()
{
    SDL_LockMutex(resolvermutex);
    resolverqueries.setsize(0);
    resolverresults.setsize(0);
    while (SDL_SemTryWait(resolversem) == 0);
    loopv(resolverthreads)
    {
        resolverthread &rt = resolverthreads[i];
        resolverstop(rt, true);
    };
    SDL_UnlockMutex(resolvermutex);
	SDL_LockMutex(resolvermutex);
	resolverqueries.setsize(0);
	resolverresults.setsize(0);
	while (SDL_SemTryWait(resolversem) == 0)
		;
	loopv(resolverthreads)
	{
		resolverthread &rt = resolverthreads[i];
		resolverstop(rt, true);
	};
	SDL_UnlockMutex(resolvermutex);
};

void
void resolverquery(char *name)
resolverquery(char *name)
{
    SDL_LockMutex(resolvermutex);
    resolverqueries.add(name);
    SDL_SemPost(resolversem);
    SDL_UnlockMutex(resolvermutex);
	SDL_LockMutex(resolvermutex);
	resolverqueries.add(name);
	SDL_SemPost(resolversem);
	SDL_UnlockMutex(resolvermutex);
};

bool
bool resolvercheck(char **name, ENetAddress *address)
resolvercheck(char **name, ENetAddress *address)
{
    SDL_LockMutex(resolvermutex);
    if(!resolverresults.empty())
	SDL_LockMutex(resolvermutex);
	if (!resolverresults.empty()) {
    {
        resolverresult &rr = resolverresults.pop();
        *name = rr.query;
        *address = rr.address;
        SDL_UnlockMutex(resolvermutex);
        return true;
    }
    loopv(resolverthreads)
    {
        resolverthread &rt = resolverthreads[i];
        if(rt.query)
		resolverresult &rr = resolverresults.pop();
		*name = rr.query;
		*address = rr.address;
		SDL_UnlockMutex(resolvermutex);
		return true;
	}
	loopv(resolverthreads)
	{
		resolverthread &rt = resolverthreads[i];
		if (rt.query) {
        {
            if(lastmillis - rt.starttime > resolverlimit)        
			if (lastmillis - rt.starttime > resolverlimit) {
            {
                resolverstop(rt, true);
                *name = rt.query;
                SDL_UnlockMutex(resolvermutex);
                return true;
            };
        };    
    };
    SDL_UnlockMutex(resolvermutex);
    return false;
				resolverstop(rt, true);
				*name = rt.query;
				SDL_UnlockMutex(resolvermutex);
				return true;
			};
		};
	};
	SDL_UnlockMutex(resolvermutex);
	return false;
};

struct serverinfo
struct serverinfo {
{
    string name;
    string full;
    string map;
    string sdesc;
    int mode, numplayers, ping, protocol, minremain;
    ENetAddress address;
	string name;
	string full;
	string map;
	string sdesc;
	int mode, numplayers, ping, protocol, minremain;
	ENetAddress address;
};

vector<serverinfo> servers;
ENetSocket pingsock = ENET_SOCKET_NULL;
int lastinfo = 0;

char *
getservername(int n)
{
char *getservername(int n) { return servers[n].name; };
	return servers[n].name;
};

void
void addserver(char *servername)
addserver(char *servername)
{
    loopv(servers) if(strcmp(servers[i].name, servername)==0) return;
    serverinfo &si = servers.insert(0, serverinfo());
    strcpy_s(si.name, servername);
    si.full[0] = 0;
    si.mode = 0;
    si.numplayers = 0;
    si.ping = 9999;
    si.protocol = 0;
    si.minremain = 0;
    si.map[0] = 0;
    si.sdesc[0] = 0;
    si.address.host = ENET_HOST_ANY;
    si.address.port = CUBE_SERVINFO_PORT;
	loopv(servers) if (strcmp(servers[i].name, servername) == 0) return;
	serverinfo &si = servers.insert(0, serverinfo());
	strcpy_s(si.name, servername);
	si.full[0] = 0;
	si.mode = 0;
	si.numplayers = 0;
	si.ping = 9999;
	si.protocol = 0;
	si.minremain = 0;
	si.map[0] = 0;
	si.sdesc[0] = 0;
	si.address.host = ENET_HOST_ANY;
	si.address.port = CUBE_SERVINFO_PORT;
};

void
void pingservers()
pingservers()
{
    ENetBuffer buf;
    uchar ping[MAXTRANS];
    uchar *p;
    loopv(servers)
    {
        serverinfo &si = servers[i];
        if(si.address.host == ENET_HOST_ANY) continue;
        p = ping;
        putint(p, lastmillis);
        buf.data = ping;
        buf.dataLength = p - ping;
        enet_socket_send(pingsock, &si.address, &buf, 1);
    };
    lastinfo = lastmillis;
	ENetBuffer buf;
	uchar ping[MAXTRANS];
	uchar *p;
	loopv(servers)
	{
		serverinfo &si = servers[i];
		if (si.address.host == ENET_HOST_ANY)
			continue;
		p = ping;
		putint(p, lastmillis);
		buf.data = ping;
		buf.dataLength = p - ping;
		enet_socket_send(pingsock, &si.address, &buf, 1);
	};
	lastinfo = lastmillis;
};
  
void checkresolver()

void
checkresolver()
{
    char *name = NULL;
    ENetAddress addr = { ENET_HOST_ANY, CUBE_SERVINFO_PORT };
    while(resolvercheck(&name, &addr))
	char *name = NULL;
	ENetAddress addr = {ENET_HOST_ANY, CUBE_SERVINFO_PORT};
	while (resolvercheck(&name, &addr)) {
    {
        if(addr.host == ENET_HOST_ANY) continue;
        loopv(servers)
        {
            serverinfo &si = servers[i];
            if(name == si.name)
		if (addr.host == ENET_HOST_ANY)
			continue;
		loopv(servers)
		{
			serverinfo &si = servers[i];
			if (name == si.name) {
            {
                si.address = addr;
                addr.host = ENET_HOST_ANY;
                break;
            }
        }
    }
				si.address = addr;
				addr.host = ENET_HOST_ANY;
				break;
			}
		}
	}
}

void
void checkpings()
checkpings()
{
    enet_uint32 events = ENET_SOCKET_WAIT_RECEIVE;
    ENetBuffer buf;
    ENetAddress addr;
    uchar ping[MAXTRANS], *p;
    char text[MAXTRANS];
    buf.data = ping; 
    buf.dataLength = sizeof(ping);
    while(enet_socket_wait(pingsock, &events, 0) >= 0 && events)
	enet_uint32 events = ENET_SOCKET_WAIT_RECEIVE;
	ENetBuffer buf;
	ENetAddress addr;
	uchar ping[MAXTRANS], *p;
	char text[MAXTRANS];
	buf.data = ping;
	buf.dataLength = sizeof(ping);
	while (enet_socket_wait(pingsock, &events, 0) >= 0 && events) {
    {
        if(enet_socket_receive(pingsock, &addr, &buf, 1) <= 0) return;  
        loopv(servers)
        {
            serverinfo &si = servers[i];
            if(addr.host == si.address.host)
		if (enet_socket_receive(pingsock, &addr, &buf, 1) <= 0)
			return;
		loopv(servers)
		{
			serverinfo &si = servers[i];
			if (addr.host == si.address.host) {
            {
                p = ping;
                si.ping = lastmillis - getint(p);
                si.protocol = getint(p);
                if(si.protocol!=PROTOCOL_VERSION) si.ping = 9998;
                si.mode = getint(p);
                si.numplayers = getint(p);
                si.minremain = getint(p);
                sgetstr();
                strcpy_s(si.map, text);
                sgetstr();
                strcpy_s(si.sdesc, text);                
                break;
            };
        };
    };
				p = ping;
				si.ping = lastmillis - getint(p);
				si.protocol = getint(p);
				if (si.protocol != PROTOCOL_VERSION)
					si.ping = 9998;
				si.mode = getint(p);
				si.numplayers = getint(p);
				si.minremain = getint(p);
				sgetstr();
				strcpy_s(si.map, text);
				sgetstr();
				strcpy_s(si.sdesc, text);
				break;
			};
		};
	};
};

int
int sicompare(const serverinfo *a, const serverinfo *b)
sicompare(const serverinfo *a, const serverinfo *b)
{
	return a->ping > b->ping
	           ? 1
    return a->ping>b->ping ? 1 : (a->ping<b->ping ? -1 : strcmp(a->name, b->name));
	           : (a->ping < b->ping ? -1 : strcmp(a->name, b->name));
};

void
void refreshservers()
refreshservers()
{
    checkresolver();
    checkpings();
    if(lastmillis - lastinfo >= 5000) pingservers();
    servers.sort((void *)sicompare);
    int maxmenu = 16;
    loopv(servers)
    {
        serverinfo &si = servers[i];
        if(si.address.host != ENET_HOST_ANY && si.ping != 9999)
	checkresolver();
	checkpings();
	if (lastmillis - lastinfo >= 5000)
		pingservers();
	servers.sort((void *)sicompare);
	int maxmenu = 16;
	loopv(servers)
	{
		serverinfo &si = servers[i];
		if (si.address.host != ENET_HOST_ANY && si.ping != 9999) {
        {
            if(si.protocol!=PROTOCOL_VERSION) sprintf_s(si.full)("%s [different cube protocol]", si.name);
            else sprintf_s(si.full)("%d\t%d\t%s, %s: %s %s", si.ping, si.numplayers, si.map[0] ? si.map : "[unknown]", modestr(si.mode), si.name, si.sdesc);
			if (si.protocol != PROTOCOL_VERSION)
				sprintf_s(si.full)(
				    "%s [different cube protocol]", si.name);
			else
				sprintf_s(si.full)("%d\t%d\t%s, %s: %s %s",
        }
        else
				    si.ping, si.numplayers,
				    si.map[0] ? si.map : "[unknown]",
				    modestr(si.mode), si.name, si.sdesc);
		} else {
        {
            sprintf_s(si.full)(si.address.host != ENET_HOST_ANY ? "%s [waiting for server response]" : "%s [unknown host]\t", si.name);
        }
        si.full[50] = 0; // cut off too long server descriptions
        menumanual(1, i, si.full);
        if(!--maxmenu) return;
    };
			sprintf_s(si.full)(
			    si.address.host != ENET_HOST_ANY
			        ? "%s [waiting for server response]"
			        : "%s [unknown host]\t",
			    si.name);
		}
		si.full[50] = 0; // cut off too long server descriptions
		menumanual(1, i, si.full);
		if (!--maxmenu)
			return;
	};
};

void
void servermenu()
servermenu()
{
    if(pingsock == ENET_SOCKET_NULL)
	if (pingsock == ENET_SOCKET_NULL) {
    {
        pingsock = enet_socket_create(ENET_SOCKET_TYPE_DATAGRAM, NULL);
        resolverinit(1, 1000);
    };
    resolverclear();
    loopv(servers) resolverquery(servers[i].name);
    refreshservers();
    menuset(1);
		pingsock = enet_socket_create(ENET_SOCKET_TYPE_DATAGRAM, NULL);
		resolverinit(1, 1000);
	};
	resolverclear();
	loopv(servers) resolverquery(servers[i].name);
	refreshservers();
	menuset(1);
};

void
void updatefrommaster()
updatefrommaster()
{
    const int MAXUPD = 32000;
    uchar buf[MAXUPD];
    uchar *reply = retrieveservers(buf, MAXUPD);
    if(!*reply || strstr((char *)reply, "<html>") || strstr((char *)reply, "<HTML>")) conoutf("master server not replying");
    else { servers.setsize(0); execute((char *)reply); };
    servermenu();
	const int MAXUPD = 32000;
	uchar buf[MAXUPD];
	uchar *reply = retrieveservers(buf, MAXUPD);
	if (!*reply || strstr((char *)reply, "<html>") ||
	    strstr((char *)reply, "<HTML>"))
		conoutf("master server not replying");
	else {
		servers.setsize(0);
		execute((char *)reply);
	};
	servermenu();
};

COMMAND(addserver, ARG_1STR);
COMMAND(servermenu, ARG_NONE);
COMMAND(updatefrommaster, ARG_NONE);

void
void writeservercfg()
writeservercfg()
{
    FILE *f = fopen("servers.cfg", "w");
    if(!f) return;
    fprintf(f, "// servers connected to are added here automatically\n\n");
    loopvrev(servers) fprintf(f, "addserver %s\n", servers[i].name);
    fclose(f);
	FILE *f = fopen("servers.cfg", "w");
	if (!f)
		return;
	fprintf(f, "// servers connected to are added here automatically\n\n");
	loopvrev(servers) fprintf(f, "addserver %s\n", servers[i].name);
	fclose(f);
};