/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2015, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Ken Stevens, Steve McClure, Markus Armbruster
*
- * This program is free software; you can redistribute it and/or modify
+ * Empire is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* ---
*
* ---
*
* login.c: Allow the player to login
- *
+ *
* Known contributors to this file:
* Dave Pare, 1994
* Steve McClure, 2000
+ * Markus Armbruster, 2004-2012
+ * Ron Koenderink, 2005-2009
*/
#include <config.h>
-#include <string.h>
-#include "prototypes.h"
-#include "misc.h"
-#include "proto.h"
-#include "player.h"
#include "com.h"
-#include "empthread.h"
#include "empio.h"
+#include "empthread.h"
+#include "file.h"
+#include "journal.h"
#include "match.h"
-#include "nsc.h"
+#include "misc.h"
#include "nat.h"
+#include "nsc.h"
#include "optlist.h"
-#include "file.h"
-#include "subs.h"
-#include "common.h"
-#include "gen.h"
-
-#if !defined(_WIN32)
-#include <netinet/in.h>
-#endif
-#include <errno.h>
-
-extern struct cmndstr login_coms[];
-
+#include "player.h"
+#include "proto.h"
+#include "prototypes.h"
+#include "server.h"
+
+static int client_cmd(void);
+static int coun_cmd(void);
+static int kill_cmd(void);
+static int options_cmd(void);
+static int pass_cmd(void);
+static int play_cmd(void);
+static int quit_cmd(void);
+static int sanc_cmd(void);
+static int user_cmd(void);
+
+static struct cmndstr login_coms[] = {
+ {"client client-id...", 0, client_cmd, 0, 0},
+ {"coun country", 0, coun_cmd, 0, 0},
+ {"kill", 0, kill_cmd, 0, 0},
+ {"options option=value...", 0, options_cmd, 0, 0},
+ {"pass password", 0, pass_cmd, 0, 0},
+ {"play [user [country [password]]]", 0, play_cmd, 0, 0},
+ {"quit", 0, quit_cmd, 0, 0},
+ {"sanc", 0, sanc_cmd, 0, 0},
+ {"user name", 0, user_cmd, 0, 0},
+ {NULL, 0, NULL, 0, 0}
+};
/*ARGSUSED*/
void
player_login(void *ud)
{
+ time_t deadline;
char buf[128];
char space[128];
- int ac;
- int cmd;
+ int res, ac, cmd, prev_state;
player->proc = empth_self();
pr_id(player, C_INIT, "Empire server ready\n");
- while (!io_eof(player->iop) && !io_error(player->iop)) {
- io_output(player->iop, IO_WAIT);
+ for (;;) {
+ deadline = player_io_deadline(player, 0);
+ if (io_outputwaiting(player->iop)) {
+ if (io_output(player->iop, deadline) <= 0)
+ break;
+ continue;
+ }
if (io_gets(player->iop, buf, sizeof(buf)) < 0) {
- io_input(player->iop, IO_WAIT);
+ res = io_input(player->iop, deadline);
+ if (res <= 0)
+ break;
+ continue;
+ }
+ journal_input(buf);
+ ac = parse(buf, space, player->argp, NULL, NULL, NULL);
+ if (ac <= 0) {
+ pr_id(player, C_BADCMD, "Can't parse command\n");
continue;
}
- ac = parse(buf, player->argp, NULL, space, NULL);
cmd = comtch(player->argp[0], login_coms, 0);
if (cmd < 0) {
pr_id(player, C_BADCMD, "Command %s not found\n", player->argp[0]);
default:
break;
}
- if (player->state >= PS_SHUTDOWN)
- break;
}
+ prev_state = player->state;
player->state = PS_SHUTDOWN;
- if (!io_eof(player->iop)) {
- pr_id(player, C_EXIT, "so long...\n");
- io_noblocking(player->iop, 0);
- while (io_output(player->iop, IO_WAIT) > 0) ;
- }
+ if (prev_state == PS_PLAYING)
+ empth_rwlock_unlock(shutdown_lock);
+ pr_id(player, C_EXIT, "so long...\n");
player_delete(player);
empth_exit();
/*NOTREACHED*/
static int
client_cmd(void)
{
- int i;
+ int i, sz;
+ char *p, *end;
if (!player->argp[1])
return RET_SYN;
+ p = player->client;
+ end = player->client + sizeof(player->client) - 1;
for (i = 1; player->argp[i]; ++i) {
if (i > 1)
- strncat(player->client, " ", sizeof(player->client) - 1);
- strncat(player->client, player->argp[i], sizeof(player->client) - 1);
+ *p++ = ' ';
+ sz = strlen(player->argp[i]);
+ sz = MIN(sz, end - p);
+ memcpy(p, player->argp[i], sz);
+ p += sz;
}
- player->client[sizeof(player->client) - 1] = '\0';
+ *p = 0;
pr_id(player, C_CMDOK, "talking to %s\n", player->client);
return RET_OK;
}
{
if (!player->argp[1])
return RET_SYN;
- if (player->cnum == 255) {
+ if (player->cnum == NATID_BAD) {
pr_id(player, C_CMDERR, "need country first\n");
return RET_FAIL;
}
int val;
};
static struct logoptstr login_opts[] = {
- { "utf-8", PF_UTF8 }
+ { "utf-8", PF_UTF8 },
+ { NULL, 0 }
};
char **ap;
char *p;
unsigned i;
if (!player->argp[1]) {
- for (i = 0; i < sizeof(login_opts) / sizeof(*login_opts); ++i)
+ for (i = 0; login_opts[i].name; ++i)
pr_id(player, C_DATA, "%s=%d\n",
login_opts[i].name,
(player->flags & login_opts[i].val) != 0);
{
struct natstr *np;
- if (player->cnum == 255 || !player->authenticated) {
+ if (player->cnum == NATID_BAD || !player->authenticated) {
pr_id(player, C_CMDERR, "need country and password\n");
return 0;
}
&& !strstr(privip, player->hostaddr)) {
logerror("Deity login from untrusted host attempted by %s",
praddr(player));
+ logerror("To allow this, add %s to econfig key privip",
+ player->hostaddr);
pr_id(player, C_EXIT,
- "Deity login only from IPs in econfig key privip!\n");
+ "Deity login not allowed from this IP!"
+ " See log for help on how to allow it.\n");
return 0;
}
return 1;
natid cnum;
struct natstr *natp;
char **ap;
+ char buf[128];
ap = player->argp;
if (*++ap) {
}
if (!may_play())
return RET_FAIL;
- other = getplayer((natid)player->cnum);
+ other = getplayer(player->cnum);
if (other) {
natp = getnatp(player->cnum);
if (natp->nat_stat != STAT_VIS) {
}
return RET_FAIL;
}
+ snprintf(buf, sizeof(buf), "Play#%d", player->cnum);
logerror("%s logged in as country #%d", praddr(player), player->cnum);
+ journal_login();
+ empth_set_name(empth_self(), buf);
pr_id(player, C_INIT, "%d\n", CLIENTPROTO);
+ empth_rwlock_rdlock(shutdown_lock);
+ player->state = PS_PLAYING;
player_main(player);
+ journal_logout();
logerror("%s logged out, country #%d", praddr(player), player->cnum);
- player->state = PS_SHUTDOWN;
+ if (!io_eof(player->iop) && !io_error(player->iop))
+ io_set_eof(player->iop);
return RET_OK;
}
return RET_FAIL;
}
logerror("%s killed country #%d", praddr(player), player->cnum);
- io_shutdown(other->iop, IO_READ | IO_WRITE);
- pr_id(player, C_EXIT, "closed socket of offending job\n");
+ pr_flash(other, "Disconnected by %s\n", praddr(player));
+ io_set_eof(other->iop);
+ other->aborted = 1;
+ other->may_sleep = PLAYER_SLEEP_NEVER;
+ empth_wakeup(other->proc);
+ pr_id(player, C_EXIT, "terminated %s's connection\n", praddr(other));
return RET_OK;
}
static int
quit_cmd(void)
{
- pr_id(player, C_EXIT, "so long\n");
- io_shutdown(player->iop, IO_READ);
+ io_set_eof(player->iop);
return RET_OK;
}
-
-struct cmndstr login_coms[] = {
- {"client client-id...", 0, client_cmd, 0, 0},
- {"coun country", 0, coun_cmd, 0, 0},
- {"kill", 0, kill_cmd, 0, 0},
- {"options option=value...", 0, options_cmd, 0, 0},
- {"pass password", 0, pass_cmd, 0, 0},
- {"play [user [country [password]]]", 0, play_cmd, 0, 0},
- {"quit", 0, quit_cmd, 0, 0},
- {"sanc", 0, sanc_cmd, 0, 0},
- {"user name", 0, user_cmd, 0, 0},
- {0, 0, 0, 0, 0}
-};
projects / empserver / blobdiff