/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2006, 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.
*
* ---
*
* Doug Hay, 1990
*/
+#include <config.h>
+
#include <stdio.h>
#if !defined(_WIN32)
#include <unistd.h>
#include "misc.h"
#include "nat.h"
#include "file.h"
-#include "keyword.h"
#include "wantupd.h"
#include "optlist.h"
#include "common.h"
}
static int
-demand_update_time(time_t * now)
+demand_update_time(time_t *now)
{
struct tm *tm;
- s_char *p;
- int curtime;
- int hour[2];
tm = localtime(now);
- curtime = tm->tm_min + tm->tm_hour * 60;
- p = update_demandtimes;
- if (*p == 0)
- return (1);
- while (NULL != (p = kw_parse(CF_TIMERANGE, p, &hour[0]))) {
- if (curtime >= hour[0] && curtime < hour[1])
- return (1);
- }
- return (0);
+ return is_daytime_allowed(60 * tm->tm_hour + tm->tm_min,
+ update_demandtimes);
}
/* When is the next regularly scheduled update from now. */
static void
-regular_update_time(time_t * now, time_t * tim, time_t * delta)
+regular_update_time(time_t *now, time_t *tim, time_t *delta)
{
time_t tw;
int secs_per_update;
/* Is this a valid time for a scheduled update. */
static int
-scheduled_update_time(time_t * now, int *which)
+scheduled_update_time(time_t *now)
{
struct tm *tm;
- s_char *p;
- int curtime;
- int hour;
-
- *which = -1;
- p = update_times;
- if (*p == 0)
- return (0);
tm = localtime(now);
- curtime = tm->tm_min + tm->tm_hour * 60;
- while (NULL != (p = kw_parse(CF_TIME, p, &hour))) {
- (*which)++;
- if (curtime >= hour && curtime < hour + hourslop)
- return (1);
- }
-
- return 0;
+ return is_daytime_near(60 * tm->tm_hour + tm->tm_min,
+ update_times, hourslop);
}
static int
-next_scheduled_time(time_t * now, time_t * tim, time_t * delta)
+next_scheduled_time(time_t *now, time_t *tim, time_t *delta)
{
struct tm *tm;
- s_char *p;
- int curtime;
- int hour;
- int mintime;
-
- p = update_times;
- if (*p == 0)
- return (0);
+ int d;
tm = localtime(now);
- curtime = tm->tm_min + tm->tm_hour * 60; /* now - in minutes */
- mintime = curtime + 24 * 60 + 1; /* start with now + 1 day */
- while (NULL != (p = kw_parse(CF_TIME, p, &hour))) {
- if (hour <= curtime)
- hour += 24 * 60; /* this must be tomorrow */
- if (hour < mintime)
- mintime = hour; /* this is best bet so far */
- }
- *delta = 60 * (mintime - curtime);
+ d = min_to_next_daytime(60 * tm->tm_hour + tm->tm_min, update_times);
+ if (d < 0)
+ return 0;
+ *delta = 60 * d;
*tim = *now + *delta - tm->tm_sec;
- return (1);
+ return 1;
}
int
for (cn = 1; 0 != (natp = getnatp(cn)); cn++) {
/* Only countries which are normal. */
/* Should probably include sanctuaries ..... */
- if (((natp->nat_stat & NORM) == NORM) &&
- ((natp->nat_stat & GOD) != GOD)) {
+ if (natp->nat_stat == STAT_ACTIVE) {
totpop++;
if ((natp->nat_update & WUPD_WANT) == WUPD_WANT) {
totwant++;
}
*want = totwant;
*pop = totpop;
- return (whichwants);
+ return whichwants;
}
static int
time(&cur);
-/*
- if (last_demand_update == 0){
- natp=getnatp(0);
- last_demand_update = natp->nat_reserve;
- }
-
- logerror("last_demand_update = %d\n",last_demand_update);
- logerror("update_between = %d\n",update_between());
- logerror("now = %d\n",cur);
- diff = (cur-(last_demand_update + update_between()));
- logerror("diff = %d\n",diff);
- if (diff >= 0){
- logerror("Forced update!\n");
- last_demand_update = cur;
- for (cn = 1; natp = getnatp(cn); cn++){
- if (((natp->nat_stat & NORM) == NORM) &&
- ((natp->nat_stat & GOD) != GOD)){
- natp->nat_missed = 0;
- }
- }
- return(1);
- }
-
- logerror("No forced update!\n");
-*/
if (0 == update_wantmin) {
logerror("no demand update allowed, wantmin = 0");
- return (0);
+ return 0;
}
demand_update_want(&want, &pop, 0);
if (want < update_wantmin) {
logerror("no demand update, want = %d, min = %d",
want, update_wantmin);
- return (0);
+ return 0;
}
time(&now);
if (!demand_update_time(&now)) {
logerror("no demand update, not within hours allowed.");
- return (0);
+ return 0;
}
veto = 0;
for (cn = 1; 0 != (natp = getnatp(cn)); cn++) {
- if (((natp->nat_stat & NORM) == NORM) &&
- ((natp->nat_stat & GOD) != GOD)) {
+ if (natp->nat_stat == STAT_ACTIVE) {
if (natp->nat_missed >= update_missed)
- veto = cn + 1;
+ veto = cn;
}
}
if (veto) {
logerror("no demand update, %d has missed more than %d updates",
- veto - 1, update_missed);
- return (0);
+ veto, update_missed);
+ return 0;
}
- last_demand_update = cur;
- natp = getnatp(0);
- /* A dumb way to do it, but simple */
- last_demand_update = natp->nat_reserve;
- return (1);
+ return 1;
}
/* Check if enough countries want an update,
{
if (UDDEM_COMSET != update_demandpolicy) {
logerror("no demand update, not policy.");
- return (0);
+ return 0;
}
- return (demand_check());
+ return demand_check();
}
/* Is it time for a regular or scheduled update?
* a demand update can occur.
*/
int
-updatetime(time_t * now)
+updatetime(time_t *now)
{
- int which;
-
if (opt_BLITZ && update_policy == UDP_BLITZ) {
logerror("BLITZ Update.");
- return (1);
+ return 1;
}
if (UDP_NORMAL == update_policy) {
logerror("Regular update, etu type.");
- return (1);
+ return 1;
}
if (UDP_TIMES == update_policy) {
- if (scheduled_update_time(now, &which)) {
- logerror("Scheduled update, %d.", which);
- return (1);
+ if (scheduled_update_time(now)) {
+ logerror("Scheduled update.");
+ return 1;
}
}
if (opt_DEMANDUPDATE) {
if (demand_check()) {
logerror("Demand update, at check time.");
- return (1);
+ return 1;
}
}
- return (0);
+ return 0;
}
/* Return the time, and delta seconds, of the next update.
* the next possible check.
*/
void
-next_update_time(time_t * now, time_t * tim, time_t * delta)
+next_update_time(time_t *now, time_t *tim, time_t *delta)
/* From when */
/* Time of next update */
/* Seconds till next update */
}
void
-next_update_check_time(time_t * now, time_t * tim, time_t * delta)
+next_update_check_time(time_t *now, time_t *tim, time_t *delta)
/* From when */
/* Time of next update */
/* Seconds till next update check */
projects / empserver / blobdiff