/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
*
* ---
*
- * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- * related information and legal notices. It is expected that any future
- * projects/authors will amend these files as needed.
+ * See files README, COPYING and CREDITS in the root of the source
+ * tree for related information and legal notices. It is expected
+ * that future projects/authors will amend these files as needed.
*
* ---
*
* player.c: Main command loop for a player
- *
+ *
* Known contributors to this file:
* Steve McClure, 2000
- *
+ * Markus Armbruster, 2004-2008
+ * Ron Koenderink, 2004-2007
*/
#include <config.h>
-#include "prototypes.h"
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "proto.h"
+#include <errno.h>
+#include <stdio.h>
#include "com.h"
-#include "nat.h"
-#include "sect.h"
-#include "file.h"
-#include "proto.h"
#include "empio.h"
#include "empthread.h"
-#include "tel.h"
-#include "gen.h"
-#include "subs.h"
-#include "common.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"
-#if !defined(_WIN32)
-#include <unistd.h>
-#include <sys/time.h>
-#endif
-#include <stdio.h>
-#include <errno.h>
-#include <fcntl.h>
+static int command(void);
static int status(void);
struct player *player;
time(&player->lasttime);
time(&player->curup);
show_motd();
- if (init_nats() < 0)
- return;
- natp = getnatp(player->cnum);
- if (player->god && !match_user(authfil, player)) {
- logerror("NON-AUTHed Login attempted by %s", praddr(player));
- pr("You're not a deity!\n");
+ if (init_nats() < 0) {
+ pr("Server confused, try again later\n");
return;
}
+ natp = getnatp(player->cnum);
if (!gamehours(player->curup)) {
pr("Empire hours restriction in force\n");
if (natp->nat_stat != STAT_GOD)
time(&natp->nat_last_login);
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()) {
- if (command() == 0 && !player->aborted)
- break;
- player->aborted = 0;
+ command();
+ player->aborted = player->eof;
empth_yield();
}
/* #*# I put the following line in to prevent server crash -KHS */
* charging at least 15 seconds.
*/
time(&natp->nat_last_logout);
- secs = max(natp->nat_last_logout - player->lasttime, 15);
+ secs = MAX(natp->nat_last_logout - player->lasttime, 15);
natp->nat_minused += secs / 60;
secs = secs % 60;
if (chance(secs / 60.0))
natp->nat_minused += 1;
putnat(natp);
pr("Bye-bye\n");
+ journal_logout();
}
-int
+static int
command(void)
{
- unsigned int x;
char *redir; /* UTF-8 */
char scanspace[1024];
if (getcommand(player->combuf) < 0)
return 0;
- if (parse(player->combuf, player->argp, &player->condarg,
- scanspace, &redir) < 0) {
+ if (parse(player->combuf, scanspace, player->argp, player->comtail,
+ &player->condarg, &redir) < 0) {
pr("See \"info Syntax\"?\n");
} else {
- /* XXX don't use alarm; use a scavenger thread */
- /* DONT USE IT!!!! alarm and sleep may and dont work
- together -- Sasha */
- /* alarm((unsigned int)60*60); 1 hour */
- if (player->condarg != NULL)
- for (x = 0; x < strlen(player->condarg); x++)
- if (isupper(*(player->condarg + x)))
- *(player->condarg + x) =
- tolower(*(player->condarg + x));
if (dispatch(player->combuf, redir) < 0)
pr("Try \"list of commands\" or \"info\"\n");
}
status(void)
{
struct natstr *natp;
- int minute;
- struct sctstr sect;
+ int old_nstat, minute;
char buf[128];
- if (player->state == PS_SHUTDOWN)
+ if (player->eof || player->state == PS_SHUTDOWN)
return 0;
natp = getnatp(player->cnum);
- if (io_error(player->iop) || io_eof(player->iop)) {
- putnat(natp);
- return 0;
- }
- player->visitor = natp->nat_stat < STAT_SANCT;
+ if (player->dolcost > 100.0)
+ pr("That just cost you $%.2f\n", player->dolcost);
+ else if (player->dolcost < -100.0)
+ pr("You just made $%.2f\n", -player->dolcost);
if (player->dolcost != 0.0) {
- if (player->dolcost > 100.0)
- pr("That just cost you $%.2f\n", player->dolcost);
- else if (player->dolcost < -100.0)
- pr("You just made $%.2f\n", -player->dolcost);
- if (natp->nat_money < player->dolcost && !player->broke) {
- player->broke = 1;
- player->nstat &= ~MONEY;
- pr("You are now broke; industries are on strike.\n");
- } else if (player->broke && natp->nat_money - player->dolcost > 0) {
- player->broke = 0;
- player->nstat |= MONEY;
- pr("You are no longer broke!\n");
- }
+ /*
+ * Hackish work around for a race condition in the nightly
+ * build's regression tests: sometimes the update starts right
+ * after the force command yields, sometimes a bit later. If
+ * it is late, we use one random number here, for the bye,
+ * and throwing off the random sequence.
+ */
natp->nat_money -= roundavg(player->dolcost);
player->dolcost = 0.0;
- } else {
- if (natp->nat_money < 0.0 && !player->broke) {
- player->broke = 1;
- player->nstat &= ~MONEY;
- pr("You are now broke; industries are on strike.\n");
- }
- if (player->broke && natp->nat_money > 0) {
- player->broke = 0;
- player->nstat |= MONEY;
- pr("You are no longer broke!\n");
- }
}
- getsect(natp->nat_xcap, natp->nat_ycap, §);
- if (influx(natp))
- player->nstat &= ~CAP;
- else
- player->nstat |= CAP;
- player->ncomstat = player->nstat;
- if (player->god)
- player->ncomstat |= CAP | MONEY;
+
+ old_nstat = player->nstat;
+ player_set_nstat(player, natp);
+ if ((old_nstat & MONEY) && !(player->nstat & MONEY))
+ pr("You are now broke; industries are on strike.\n");
+ if (!(old_nstat & MONEY) && (player->nstat & MONEY))
+ pr("You are no longer broke!\n");
+
time(&player->curup);
minute = (player->curup - player->lasttime) / 60;
if (minute > 0) {
}
if (natp->nat_stat == STAT_ACTIVE && natp->nat_minused > m_m_p_d) {
pr("Max minutes per day limit exceeded.\n");
- player->ncomstat = VIS;
+ player->nstat = (player->nstat & ~NORM) | VIS;
}
if (player->btused) {
natp->nat_btu -= player->btused;
numstr(buf, natp->nat_ann));
natp->nat_ann = 0;
}
- if (!player->visitor && !player->god && (player->nstat & CAP) == 0)
+ if (natp->nat_stat == STAT_ACTIVE && (player->nstat & CAP) == 0)
pr("You lost your capital... better designate one\n");
putnat(natp);
if (gamedown() && !player->god) {
}
/*
- * actually a command; redirection and piping ignored.
* XXX This whole mess should be redone; execute block should
* start with "exec start", and should end with "exec end".
* We'll wait until 1.2 I guess.
char scanspace[1024];
failed = 0;
- redir = NULL;
-
- p = getstarg(player->argp[1], "File? ", buf);
+ if (player->comtail[1])
+ p = player->comtail[1];
+ else
+ p = getstring("File? ", buf);
if (p == NULL || *p == '\0')
return RET_SYN;
-
- /* FIXME should use raw argument here, to support UTF-8 file names */
- prexec(player->argp[1]);
+ prexec(p);
while (!failed && status()) {
+ player->nstat &= ~EXEC;
if (recvclient(buf, sizeof(buf)) < 0)
break;
- if (parse(buf, player->argp, &player->condarg,
- scanspace, &redir) < 0) {
+ if (parse(buf, scanspace, player->argp, player->comtail,
+ &player->condarg, &redir) < 0) {
failed = 1;
continue;
}
- if (redir == NULL)
- pr("\nExecute : %s\n", buf);
- if (dispatch(buf, redir) < 0)
+ pr("\nExecute : %s\n", buf);
+ if (redir) {
+ pr("Execute : redirection not supported\n");
+ failed = 1;
+ } else if (dispatch(buf, NULL) < 0)
failed = 1;
}
if (failed) {
while (recvclient(buf, sizeof(buf)) >= 0) ;
}
- if (redir == NULL)
- pr("Execute : %s\n", failed ? "aborted" : "terminated");
+
+ pr("Execute : %s\n", failed ? "aborted" : "terminated");
+ player->eof = 0;
return RET_OK;
}
char buf[MAXTELSIZE + 1]; /* UTF-8 */
if ((motd_fp = fopen(motdfil, "rb")) == NULL) {
- if (errno == ENOENT)
+ if (errno == ENOENT)
return RET_OK;
else {
pr ("Could not open motd.\n");
logerror("Could not open motd (%s).\n", motdfil);
- return RET_SYS;
+ return RET_FAIL;
}
}
if (fread(&tgm, sizeof(tgm), 1, motd_fp) != 1) {
return RET_OK;
}
-int
-match_user(char *file, struct player *p)
-{
- FILE *fp;
- int match = 0;
- char host[256];
- char user[256];
-
- if ((fp = fopen(file, "r")) == NULL) {
- /*logerror("Cannot find file %s", file); */
- return 0;
- }
- match = 0;
- while (!feof(fp) && !match) {
- if (fgets(host, sizeof(host), fp) == NULL)
- break;
- if (host[0] == '#')
- continue;
- if (fgets(user, sizeof(user), fp) == NULL)
- break;
- host[strlen(host) - 1] = '\0';
- user[strlen(user) - 1] = '\0';
- if (strstr(p->userid, user) &&
- (strstr(p->hostaddr, host) ||
- strstr(p->hostname, host)))
- ++match;
- }
- fclose(fp);
- return match;
-}
-
int
quit(void)
{
projects / empserver / blobdiff