empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up how quit and server shutdown trigger connection close

Browse source 
Simply set the player connection's EOF indicator.  Cleaner than
setting player->state to PS_SHUTDOWN from random places.

Move the assignment of PS_PLAYING from player_main() to its caller
play_cmd(), so that player->state is exclusively controlled in
login.c.
This commit is contained in:
Markus Armbruster 2012-01-29 10:44:28 +01:00
parent 0a7306a5ac
commit 8549efbc19
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib/player/login.c
View file

@ -86,7 +86,7 @@ player_login(void *ud)
pr_id(player, C_INIT, "Empire server ready\n"); pr_id(player, C_INIT, "Empire server ready\n");
while (player->state != PS_SHUTDOWN) { for (;;) {
io_output(player->iop, 1); io_output(player->iop, 1);
if (io_gets(player->iop, buf, sizeof(buf)) < 0) { if (io_gets(player->iop, buf, sizeof(buf)) < 0) {
res = io_input(player->iop, 1); res = io_input(player->iop, 1);
@ -355,9 +355,11 @@ play_cmd(void)
empth_set_name(empth_self(), buf); empth_set_name(empth_self(), buf);
logerror("%s logged in as country #%d", praddr(player), player->cnum); logerror("%s logged in as country #%d", praddr(player), player->cnum);
pr_id(player, C_INIT, "%d\n", CLIENTPROTO); pr_id(player, C_INIT, "%d\n", CLIENTPROTO);
player->state = PS_PLAYING;
player_main(player); player_main(player);
logerror("%s logged out, country #%d", praddr(player), player->cnum); logerror("%s logged out, country #%d", praddr(player), player->cnum);
player->state = PS_SHUTDOWN; if (CANT_HAPPEN(!io_eof(player->iop)))
io_set_eof(player->iop);
return RET_OK; return RET_OK;
} }

4
src/lib/player/player.c
View file

@ -59,7 +59,6 @@ player_main(struct player *p)
struct natstr *natp; struct natstr *natp;
char buf[128]; char buf[128];
p->state = PS_PLAYING;
player = p; player = p;
time(&player->curup); time(&player->curup);
update_timeused_login(player->curup); update_timeused_login(player->curup);
@ -174,7 +173,6 @@ status(void)
time(&player->curup); time(&player->curup);
update_timeused(player->curup); update_timeused(player->curup);
if (io_error(player->iop) || io_eof(player->iop) if (io_error(player->iop) || io_eof(player->iop)
|| player->state == PS_SHUTDOWN
|| !may_play_now(natp, player->curup)) || !may_play_now(natp, player->curup))
return 0; return 0;
@ -284,7 +282,7 @@ show_motd(void)
int int
quit(void) quit(void)
{ {
player->state = PS_SHUTDOWN; io_set_eof(player->iop);
return RET_OK; return RET_OK;
} }

4
src/server/main.c
View file

@ -419,9 +419,9 @@ shutdwn(int sig)
if (p->state != PS_PLAYING) if (p->state != PS_PLAYING)
continue; continue;
pr_flash(p, "Server shutting down...\n"); pr_flash(p, "Server shutting down...\n");
p->state = PS_SHUTDOWN; io_set_eof(p->iop);
p->aborted = 1;
p->may_sleep = PLAYER_SLEEP_NEVER; p->may_sleep = PLAYER_SLEEP_NEVER;
p->aborted++;
if (p->command) { if (p->command) {
pr_flash(p, "Shutdown aborting command\n"); pr_flash(p, "Shutdown aborting command\n");
} }