Differences From Artifact [7081fc19b8]:
- File src/server.mm — part of check-in [a6b2705084] at 2025-03-15 23:05:30 on branch trunk — Fix accidentally dropped if statement (user: js, size: 12585) [annotate] [blame] [check-ins using]
To Artifact [bc477ab2a8]:
- File
src/server.mm
— part of check-in
[489124a92f]
at
2025-03-16 10:11:39
on branch trunk
— Use one autorelease pool per frame
This way, nowhere else autorelease pools need to be managed. (user: js, size: 12360) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
169 170 171 172 173 174 175 | no++; } } if (yes == 1 && no == 0) return true; // single player | < | < | | | < | 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 | no++; } } if (yes == 1 && no == 0) return true; // single player OFString *msg = [OFString stringWithFormat:@"%@ suggests %@ on map %@ (set map to vote)", clients[sender].name, modestr(reqmode), map]; sendservmsg(msg); if (yes / (float)(yes + no) <= 0.5f) return false; sendservmsg(@"vote passed"); resetvotes(); return true; |
| ︙ | ︙ | |||
211 212 213 214 215 216 217 |
switch ((type = getint(p))) {
case SV_TEXT:
sgetstr();
break;
case SV_INITC2S:
sgetstr();
| < | < < | | | < < | < | 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 |
switch ((type = getint(p))) {
case SV_TEXT:
sgetstr();
break;
case SV_INITC2S:
sgetstr();
clients[cn].name = @(text);
sgetstr();
getint(p);
break;
case SV_MAPCHANGE: {
sgetstr();
int reqmode = getint(p);
if (reqmode < 0)
reqmode = 0;
if (smapname.length > 0 && !mapreload &&
!vote(@(text), reqmode, sender))
return;
mapreload = false;
mode = reqmode;
minremain = mode & 1 ? 15 : 10;
mapend = lastsec + minremain * 60;
interm = 0;
smapname = @(text);
resetitems();
sender = -1;
break;
}
case SV_ITEMLIST: {
int n;
|
| ︙ | ︙ | |||
280 281 282 283 284 285 286 |
loopi(size - 2) getint(p);
break;
}
case SV_SENDMAP: {
sgetstr();
int mapsize = getint(p);
| < | < | 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 |
loopi(size - 2) getint(p);
break;
}
case SV_SENDMAP: {
sgetstr();
int mapsize = getint(p);
sendmaps(sender, @(text), mapsize, p);
return;
}
case SV_RECVMAP:
send(sender, recvmap(sender));
return;
|
| ︙ | ︙ | |||
325 326 327 328 329 330 331 | ENetPacket *packet = enet_packet_create(NULL, MAXTRANS, ENET_PACKET_FLAG_RELIABLE); uchar *start = packet->data; uchar *p = start + 2; putint(p, SV_INITS2C); putint(p, n); putint(p, PROTOCOL_VERSION); | < | < | 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 |
ENetPacket *packet =
enet_packet_create(NULL, MAXTRANS, ENET_PACKET_FLAG_RELIABLE);
uchar *start = packet->data;
uchar *p = start + 2;
putint(p, SV_INITS2C);
putint(p, n);
putint(p, PROTOCOL_VERSION);
putint(p, *smapname.UTF8String);
sendstring(serverpassword, p);
putint(p, clients.count > maxclients);
if (smapname.length > 0) {
putint(p, SV_MAPCHANGE);
sendstring(smapname, p);
putint(p, mode);
putint(p, SV_ITEMLIST);
|
| ︙ | ︙ | |||
489 490 491 492 493 494 495 |
switch (event.type) {
case ENET_EVENT_TYPE_CONNECT: {
Client *c = addclient();
c.type = ST_TCPIP;
c.peer = event.peer;
c.peer->data = (void *)(clients.count - 1);
char hn[1024];
| < < | | | | < | 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 |
switch (event.type) {
case ENET_EVENT_TYPE_CONNECT: {
Client *c = addclient();
c.type = ST_TCPIP;
c.peer = event.peer;
c.peer->data = (void *)(clients.count - 1);
char hn[1024];
c.hostname = (enet_address_get_host(
&c.peer->address, hn, sizeof(hn)) == 0
? @(hn)
: @"localhost");
[OFStdOut
writeFormat:@"client connected (%@)\n", c.hostname];
send_welcome(lastconnect = clients.count - 1);
break;
}
case ENET_EVENT_TYPE_RECEIVE:
brec += event.packet->dataLength;
|
| ︙ | ︙ | |||
562 563 564 565 566 567 568 |
serverpassword = passwd;
maxclients = maxcl;
servermsinit(master ? master : @"wouter.fov120.com/cube/masterserver/",
sdesc, dedicated);
if ((isdedicated = dedicated)) {
ENetAddress address = { ENET_HOST_ANY, CUBE_SERVER_PORT };
| < | | | < > > | | | > | 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 |
serverpassword = passwd;
maxclients = maxcl;
servermsinit(master ? master : @"wouter.fov120.com/cube/masterserver/",
sdesc, dedicated);
if ((isdedicated = dedicated)) {
ENetAddress address = { ENET_HOST_ANY, CUBE_SERVER_PORT };
if (ip.length > 0 &&
enet_address_set_host(&address, ip.UTF8String) < 0)
printf("WARNING: server ip not resolved");
serverhost = enet_host_create(&address, MAXCLIENTS, 0, uprate);
if (!serverhost)
fatal(@"could not create server host\n");
loopi(MAXCLIENTS) serverhost->peers[i].data = (void *)-1;
}
resetserverifempty();
// do not return, this becomes main loop
if (isdedicated) {
#ifdef _WIN32
SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS);
#endif
printf("dedicated server started, waiting for "
"clients...\nCtrl-C to exit\n\n");
atexit(cleanupserver);
atexit(enet_deinitialize);
for (;;)
@autoreleasepool {
serverslice(
/*enet_time_get_sec()*/ time(NULL), 5);
}
}
}
|