/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2018, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure, Markus Armbruster
*
* Empire is free software: you can redistribute it and/or modify
*
* Known contributors to this file:
* Steve McClure, 2000
- * Markus Armbruster, 2004-2011
+ * Markus Armbruster, 2004-2017
* Ron Koenderink, 2004-2009
*/
#include <config.h>
-#include "com.h"
+#include "chance.h"
#include "empio.h"
#include "empthread.h"
-#include "file.h"
-#include "journal.h"
#include "misc.h"
#include "nat.h"
#include "optlist.h"
#include "player.h"
-#include "proto.h"
#include "prototypes.h"
-#include "tel.h"
-
+#include "version.h"
static int command(void);
static int status(void);
struct natstr *natp;
char buf[128];
- p->state = PS_PLAYING;
player = p;
time(&player->curup);
update_timeused_login(player->curup);
show_motd();
+ if (running_test_suite)
+ pr("\n"
+ "*** Server configured for testing ***\n"
+ "*** If you see this in a game, it is misconfigured! ***\n");
+ else if (strstr(version, "UNKNOWN-"))
+ pr("\n"
+ "*** Server version is unknown ***\n"
+ "*** If you see this in a game, it was built incorrectly! ***\n");
+
if (init_nats() < 0) {
pr("Server confused, try again later\n");
return;
natp->nat_last_login <= natp->nat_last_logout
? ctime(&natp->nat_last_logout) : "?");
pr(" by: %s@%s\n",
- natp->nat_userid,
- *natp->nat_hostname ? natp->nat_hostname : natp->nat_hostaddr);
+ natp->nat_userid, natp->nat_hostaddr);
}
strcpy(natp->nat_userid, player->userid);
- strcpy(natp->nat_hostname, player->hostname);
strcpy(natp->nat_hostaddr, player->hostaddr);
natp->nat_last_login = player->curup;
putnat(natp);
- journal_login();
if (natp->nat_flags & NF_INFORM && natp->nat_tgms > 0) {
if (natp->nat_tgms == 1)
pr("You have a new telegram waiting ...\n");
}
while (status() && command()) {
- player->aborted = player->eof;
+ if (player->got_ctld)
+ io_set_eof(player->iop);
+ player->aborted = 0;
empth_yield();
}
/* #*# I put the following line in to prevent server crash -KHS */
update_timeused(natp->nat_last_logout);
enforce_minimum_session_time();
pr("Bye-bye\n");
- journal_logout();
}
static int
time(&player->curup);
update_timeused(player->curup);
- if (player->eof || player->state == PS_SHUTDOWN
+ if (io_error(player->iop) || io_eof(player->iop)
|| !may_play_now(natp, player->curup))
return 0;
}
/*
- * Make all objects stale if ARG is one of the player's command arguments.
+ * Make all objects stale if @arg is one of the player's command arguments.
* See ef_make_stale() for what "making stale" means.
* Useful for functions that prompt for missing arguments.
* These can yield the processor, so we'd like to call ef_make_stale()
return RET_SYN;
prexec(p);
- while (!failed && status()) {
+ while (!failed && status() && !player->got_ctld) {
player->nstat &= ~EXEC;
if (getcommand(player->combuf) < 0)
break;
continue;
}
pr("\nExecute : ");
- uprnf(buf);
+ uprnf(player->combuf);
pr("\n");
if (redir) {
pr("Execute : redirection not supported\n");
failed = 1;
- } else if (dispatch(buf, NULL) < 0)
+ } else if (dispatch(player->combuf, NULL) < 0)
failed = 1;
+ /* player->aborted not reset; makes next getcommand() fail */
+ empth_yield();
}
if (failed) {
while (recvclient(buf, sizeof(buf)) >= 0) ;
}
pr("Execute : %s\n", failed ? "aborted" : "terminated");
- player->eof = 0;
+ player->got_ctld = 0;
return RET_OK;
}
int
quit(void)
{
- player->state = PS_SHUTDOWN;
+ io_set_eof(player->iop);
return RET_OK;
}
char *
praddr(struct player *p)
{
- return prbuf("%s@%s", p->userid,
- *p->hostname ? p->hostname : p->hostaddr);
+ return prbuf("%s@%s", p->userid, p->hostaddr);
}