summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/Makefile3
-rw-r--r--src/common/core.c132
-rw-r--r--src/common/core.h23
-rw-r--r--src/common/db.c424
-rw-r--r--src/common/db.h102
-rw-r--r--src/common/grfio.c1189
-rw-r--r--src/common/grfio.h29
-rw-r--r--src/common/lock.c27
-rw-r--r--src/common/lock.h11
-rw-r--r--src/common/malloc.c68
-rw-r--r--src/common/malloc.h27
-rw-r--r--src/common/md5calc.c505
-rw-r--r--src/common/md5calc.h67
-rw-r--r--src/common/mmo.h125
-rw-r--r--src/common/mt_rand.c86
-rw-r--r--src/common/mt_rand.h26
-rw-r--r--src/common/nullpo.c56
-rw-r--r--src/common/nullpo.h254
-rw-r--r--src/common/sanity.h36
-rw-r--r--src/common/socket.c420
-rw-r--r--src/common/socket.h197
-rw-r--r--src/common/timer.c328
-rw-r--r--src/common/timer.h86
-rw-r--r--src/common/utils.c121
-rw-r--r--src/common/utils.h49
-rw-r--r--src/common/version.h43
26 files changed, 1420 insertions, 3014 deletions
diff --git a/src/common/Makefile b/src/common/Makefile
index 549268b..43552dc 100644
--- a/src/common/Makefile
+++ b/src/common/Makefile
@@ -1,5 +1,5 @@
include ../../make.defs
-all: core.o socket.o timer.o grfio.o db.o lock.o nullpo.o malloc.o mt_rand.o md5calc.o
+all: core.o socket.o timer.o grfio.o db.o lock.o nullpo.o mt_rand.o md5calc.o
core.o: core.c core.h
socket.o: socket.c socket.h mmo.h
@@ -8,7 +8,6 @@ grfio.o: grfio.c grfio.h
db.o: db.c db.h
lock.o: lock.c lock.h
nullpo.o: nullpo.c nullpo.h
-malloc.o: malloc.c malloc.h
mt_rand.o: mt_rand.c mt_rand.h
md5calc.o: md5calc.c md5calc.h
diff --git a/src/common/core.c b/src/common/core.c
index bf48dfc..2b1b67c 100644
--- a/src/common/core.c
+++ b/src/common/core.c
@@ -1,11 +1,6 @@
-// $Id: core.c,v 1.1.1.1 2004/09/10 17:44:49 MagicalTux Exp $
-// original : core.c 2003/02/26 18:03:12 Rev 1.7
-
#include <stdio.h>
#include <stdlib.h>
-#ifndef LCCWIN32
#include <unistd.h>
-#endif
#include <signal.h>
#include <sys/wait.h>
@@ -14,84 +9,23 @@
#include "timer.h"
#include "version.h"
#include "mt_rand.h"
+#include "nullpo.h"
-#ifdef MEMWATCH
-#include "memwatch.h"
-#endif
-
-static void (*term_func) (void) = NULL;
-
-/*======================================
- * CORE : Set function
- *--------------------------------------
- */
-void set_termfunc (void (*termfunc) (void))
-{
- term_func = termfunc;
-}
-
-/*======================================
- * CORE : Signal Sub Function
- *--------------------------------------
- */
+/// Defined by each server
+extern int do_init (int, char **);
+extern void term_func (void);
-static void sig_proc (int sn)
+static void chld_proc (int UNUSED)
{
- int i;
- switch (sn)
- {
- case SIGINT:
- case SIGTERM:
- if (term_func)
- term_func ();
- for (i = 0; i < fd_max; i++)
- {
- if (!session[i])
- continue;
- close (i);
- }
- exit (0);
- break;
- case SIGCHLD:
- wait (&i);
- break;
- }
+ wait(NULL);
}
-
-int eathena_interactive_session = 1; // [fate] interactive session: print pretty graphics
-
-/*======================================
- * CORE : Display title
- *--------------------------------------
- */
-
-static void display_title (void)
+static void sig_proc (int UNUSED)
{
- // for help with the console colors look here:
- // http://www.edoceo.com/liberum/?doc=printf-with-color
- // some code explanation (used here):
- // \033[2J : clear screen and go up/left (0, 0 position)
- // \033[K : clear line from actual position to end of the line
- // \033[0m : reset color parameter
- // \033[1m : use bold for font
- if (eathena_interactive_session)
- {
- printf ("\033[2J"); // clear screen and go up/left (0, 0 position in text)
- printf ("\033[37;44m (=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=)\033[K\033[0m\n"); // white writing (37) on blue background (44), \033[K clean until end of file
- printf ("\033[0;44m (\033[1;33m (c)2004 eAthena Development Team presents \033[0;44m)\033[K\033[0m\n"); // yellow writing (33)
- printf ("\033[0;44m (\033[1m ______ __ __ \033[0;44m)\033[K\033[0m\n"); // 1: bold char, 0: normal char
- printf ("\033[0;44m (\033[1m /\\ _ \\/\\ \\__/\\ \\ v%2d.%02d.%02d \033[0;44m)\033[K\033[0m\n", ATHENA_MAJOR_VERSION, ATHENA_MINOR_VERSION, ATHENA_REVISION); // 1: bold char, 0: normal char
- printf ("\033[0;44m (\033[1m __\\ \\ \\_\\ \\ \\ ,_\\ \\ \\___ __ ___ __ \033[0;44m)\033[K\033[0m\n"); // 1: bold char, 0: normal char
- printf ("\033[0;44m (\033[1m /'__`\\ \\ __ \\ \\ \\/\\ \\ _ `\\ /'__`\\/' _ `\\ /'__`\\ \033[0;44m)\033[K\033[0m\n"); // 1: bold char, 0: normal char
- printf ("\033[0;44m (\033[1m /\\ __/\\ \\ \\/\\ \\ \\ \\_\\ \\ \\ \\ \\/\\ __//\\ \\/\\ \\/\\ \\_\\.\\_ \033[0;44m)\033[K\033[0m\n"); // 1: bold char, 0: normal char
- printf ("\033[0;44m (\033[1m \\ \\____\\\\ \\_\\ \\_\\ \\__\\\\ \\_\\ \\_\\ \\____\\ \\_\\ \\_\\ \\__/.\\_\\ \033[0;44m)\033[K\033[0m\n"); // 1: bold char, 0: normal char
- printf ("\033[0;44m (\033[1m \\/____/ \\/_/\\/_/\\/__/ \\/_/\\/_/\\/____/\\/_/\\/_/\\/__/\\/_/ \033[0;44m)\033[K\033[0m\n"); // 1: bold char, 0: normal char
- printf ("\033[0;44m (\033[1m _ _ _ _ _ _ _ _ _ _ _ _ _ \033[0;44m)\033[K\033[0m\n"); // 1: bold char, 0: normal char
- printf ("\033[0;44m (\033[1m / \\ / \\ / \\ / \\ / \\ / \\ / \\ / \\ / \\ / \\ / \\ / \\ / \\ \033[0;44m)\033[K\033[0m\n"); // 1: bold char, 0: normal char
- printf ("\033[0;44m (\033[1m ( e | n | g | l | i | s | h ) ( A | t | h | e | n | a ) \033[0;44m)\033[K\033[0m\n"); // 1: bold char, 0: normal char
- printf ("\033[0;44m (\033[1m \\_/ \\_/ \\_/ \\_/ \\_/ \\_/ \\_/ \\_/ \\_/ \\_/ \\_/ \\_/ \\_/ \033[0;44m)\033[K\033[0m\n"); // 1: bold char, 0: normal char
- printf ("\033[37;44m (=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=)\033[K\033[0m\n\n"); // reset color
- }
+ term_func ();
+ for (int i = 0; i < fd_max; i++)
+ if (session[i])
+ close (i);
+ exit (0);
}
// Added by Gabuzomeu
@@ -100,69 +34,45 @@ static void display_title (void)
// (sigaction() is POSIX; signal() is not.) Taken from Stevens' _Advanced
// Programming in the UNIX Environment_.
//
-#ifndef SIGPIPE
-#define SIGPIPE SIGINT
-#endif
-
-#ifndef POSIX
-#define compat_signal(signo, func) signal(signo, func)
-#else
-sigfunc *compat_signal (int signo, sigfunc * func)
+typedef void (*sigfunc)(int);
+sigfunc compat_signal (int signo, sigfunc func)
{
struct sigaction sact, oact;
sact.sa_handler = func;
sigemptyset (&sact.sa_mask);
sact.sa_flags = 0;
-#ifdef SA_INTERRUPT
- sact.sa_flags |= SA_INTERRUPT; /* SunOS */
-#endif
if (sigaction (signo, &sact, &oact) < 0)
- return (SIG_ERR);
+ return SIG_ERR;
- return (oact.sa_handler);
+ return oact.sa_handler;
}
-#endif
-/*======================================
- * CORE : MAINROUTINE
- *--------------------------------------
- */
-
-int runflag = 1;
+bool runflag = true;
int main (int argc, char **argv)
{
- int next;
-
- mt_seed (time (NULL) ^ getpid () ^ getppid ());
+ /// Note that getpid() and getppid() may be very close
+ mt_seed (time (NULL) ^ (getpid () << 16) ^ (getppid () << 8));
- Net_Init ();
do_socket ();
compat_signal (SIGPIPE, SIG_IGN);
compat_signal (SIGTERM, sig_proc);
compat_signal (SIGINT, sig_proc);
- compat_signal (SIGCHLD, sig_proc);
+ compat_signal (SIGCHLD, chld_proc);
// Signal to create coredumps by system when necessary (crash)
compat_signal (SIGSEGV, SIG_DFL);
-#ifndef LCCWIN32
compat_signal (SIGBUS, SIG_DFL);
compat_signal (SIGTRAP, SIG_DFL);
-#endif
compat_signal (SIGILL, SIG_DFL);
- // [fate] detect interactive session
- eathena_interactive_session = isatty (0);
- display_title ();
do_init (argc, argv);
while (runflag)
{
- next = do_timer (gettick_nocache ());
- do_sendrecv (next);
+ do_sendrecv (do_timer (gettick_nocache ()));
do_parsepacket ();
}
- return 0;
}
diff --git a/src/common/core.h b/src/common/core.h
index 90d8303..6722ca2 100644
--- a/src/common/core.h
+++ b/src/common/core.h
@@ -1,12 +1,19 @@
-// original : core.h 2003/03/14 11:55:25 Rev 1.4
+#ifndef CORE_H
+#define CORE_H
+#include <stdbool.h>
+/// core.c contains a server-independent main() function
+/// and then runs a do_sendrecv loop
-#ifndef _CORE_H_
-#define _CORE_H_
+/// When this is cleared, the server exits gracefully
+/// only used by map server's GM command: @mapexit
+extern bool runflag;
-extern int runflag;
+/// This is an external function defined by each server
+/// This function must register stuff for the parse loop
+extern int do_init (int, char **);
-int do_init (int, char **);
+/// Cleanup function called whenever a signal kills us
+/// NOT currently called when exit() is called
+extern void term_func (void);
-void set_termfunc (void (*termfunc) (void));
-
-#endif // _CORE_H_
+#endif // CORE_H
diff --git a/src/common/db.c b/src/common/db.c
index 07b08c8..cee17df 100644
--- a/src/common/db.c
+++ b/src/common/db.c
@@ -1,125 +1,93 @@
-// $Id: db.c,v 1.2 2004/09/23 14:43:06 MouseJstr Exp $
-// #define MALLOC_DBN
+#include "db.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "db.h"
-#include "utils.h"
-#ifdef MEMWATCH
-#include "memwatch.h"
-#endif
+#include "utils.h"
#define ROOT_SIZE 4096
-#ifdef MALLOC_DBN
-static struct dbn *dbn_root[512], *dbn_free;
-static int dbn_root_rest = 0, dbn_root_num = 0;
-
-static void *malloc_dbn (void)
-{
- struct dbn *ret;
-
- if (dbn_free == NULL)
- {
- if (dbn_root_rest <= 0)
- {
- CREATE (dbn_root[dbn_root_num], struct dbn, ROOT_SIZE);
-
- dbn_root_rest = ROOT_SIZE;
- dbn_root_num++;
- }
- return &(dbn_root[dbn_root_num - 1][--dbn_root_rest]);
- }
- ret = dbn_free;
- dbn_free = dbn_free->parent;
- return ret;
-}
-
-static void free_dbn (struct dbn *add_dbn)
-{
- add_dbn->parent = dbn_free;
- dbn_free = add_dbn;
-}
-#endif
-static int strdb_cmp (struct dbt *table, void *a, void *b)
+static int strdb_cmp (struct dbt *table, const char *a, const char* b)
{
if (table->maxlen)
return strncmp (a, b, table->maxlen);
return strcmp (a, b);
}
-static unsigned int strdb_hash (struct dbt *table, void *a)
+static hash_t strdb_hash (struct dbt *table, const char *a)
{
- int i;
- unsigned int h;
- unsigned char *p = a;
-
- i = table->maxlen;
+ size_t i = table->maxlen;
if (i == 0)
- i = 0x7fffffff;
- for (h = 0; *p && --i >= 0;)
+ i = (size_t)-1;
+ hash_t h = 0;
+ const unsigned char *p = (const unsigned char*)a;
+ while (*p && i--)
{
h = (h * 33 + *p++) ^ (h >> 24);
}
return h;
}
-struct dbt *strdb_init (int maxlen)
+struct dbt *strdb_init (size_t maxlen)
{
- int i;
struct dbt *table;
-
CREATE (table, struct dbt, 1);
-
- table->cmp = strdb_cmp;
- table->hash = strdb_hash;
+ table->type = DB_STRING;
table->maxlen = maxlen;
- for (i = 0; i < HASH_SIZE; i++)
- table->ht[i] = NULL;
return table;
}
-static int numdb_cmp (struct dbt *table, void *a, void *b)
+static int numdb_cmp (numdb_key_t a, numdb_key_t b)
{
- int ia, ib;
-
- ia = (int) a;
- ib = (int) b;
-
- if ((ia ^ ib) & 0x80000000)
- return ia < 0 ? -1 : 1;
-
- return ia - ib;
+ if (a == b)
+ return 0;
+ if (a < b)
+ return -1;
+ return 1;
}
-static unsigned int numdb_hash (struct dbt *table, void *a)
+static hash_t numdb_hash (numdb_key_t a)
{
- return (unsigned int) a;
+ return (hash_t) a;
}
struct dbt *numdb_init (void)
{
- int i;
struct dbt *table;
-
CREATE (table, struct dbt, 1);
-
- table->cmp = numdb_cmp;
- table->hash = numdb_hash;
- table->maxlen = sizeof (int);
- for (i = 0; i < HASH_SIZE; i++)
- table->ht[i] = NULL;
+ table->type = DB_NUMBER;
return table;
}
-void *db_search (struct dbt *table, void *key)
+static int table_cmp (struct dbt *table, db_key_t a, db_key_t b)
+{
+ switch(table->type)
+ {
+ case DB_NUMBER: return numdb_cmp (a.i, b.i);
+ case DB_STRING: return strdb_cmp (table, a.s, b.s);
+ }
+ abort();
+}
+
+static hash_t table_hash (struct dbt *table, db_key_t key)
+{
+ switch(table->type)
+ {
+ case DB_NUMBER: return numdb_hash (key.i);
+ case DB_STRING: return strdb_hash (table, key.s);
+ }
+ abort();
+}
+
+/// Search for a node with the given key
+db_val_t db_search (struct dbt *table, db_key_t key)
{
- struct dbn *p;
+ struct dbn *p = table->ht[table_hash (table, key) % HASH_SIZE];
- for (p = table->ht[table->hash (table, key) % HASH_SIZE]; p;)
+ while (p)
{
- int c = table->cmp (table, key, p->key);
+ int c = table_cmp (table, key, p->key);
if (c == 0)
return p->data;
if (c < 0)
@@ -130,52 +98,12 @@ void *db_search (struct dbt *table, void *key)
return NULL;
}
-void *db_search2 (struct dbt *table, const char *key)
-{
- int i, sp;
- struct dbn *p, *pn, *stack[64];
- int slen = strlen (key);
-
- for (i = 0; i < HASH_SIZE; i++)
- {
- if ((p = table->ht[i]) == NULL)
- continue;
- sp = 0;
- while (1)
- {
- if (strncasecmp (key, p->key, slen) == 0)
- return p->data;
- if ((pn = p->left) != NULL)
- {
- if (p->right)
- {
- stack[sp++] = p->right;
- }
- p = pn;
- }
- else
- {
- if (p->right)
- {
- p = p->right;
- }
- else
- {
- if (sp == 0)
- break;
- p = stack[--sp];
- }
- }
- }
- }
- return 0;
-}
-
+// Tree maintainance methods
static void db_rotate_left (struct dbn *p, struct dbn **root)
{
struct dbn *y = p->right;
p->right = y->left;
- if (y->left != 0)
+ if (y->left)
y->left->parent = p;
y->parent = p->parent;
@@ -193,7 +121,7 @@ static void db_rotate_right (struct dbn *p, struct dbn **root)
{
struct dbn *y = p->left;
p->left = y->right;
- if (y->right != 0)
+ if (y->right)
y->right->parent = p;
y->parent = p->parent;
@@ -211,7 +139,7 @@ static void db_rebalance (struct dbn *p, struct dbn **root)
{
p->color = RED;
while (p != *root && p->parent->color == RED)
- { // rootは必ず黒で親は赤いので親の親は必ず存在する
+ {
if (p->parent == p->parent->parent->left)
{
struct dbn *y = p->parent->parent->right;
@@ -260,23 +188,26 @@ static void db_rebalance (struct dbn *p, struct dbn **root)
(*root)->color = BLACK;
}
+// param z = node to remove
static void db_rebalance_erase (struct dbn *z, struct dbn **root)
{
- struct dbn *y = z, *x = NULL, *x_parent = NULL;
+ struct dbn *y = z;
+ struct dbn *x = NULL;
- if (y->left == NULL)
+ if (!y->left)
x = y->right;
- else if (y->right == NULL)
+ else if (!y->right)
x = y->left;
else
{
y = y->right;
- while (y->left != NULL)
+ while (y->left)
y = y->left;
x = y->right;
}
+ struct dbn *x_parent = NULL;
if (y != z)
- { // 左右が両方埋まっていた時 yをzの位置に持ってきてzを浮かせる
+ {
z->left->parent = y;
y->left = z->left;
if (y != z->right)
@@ -305,7 +236,7 @@ static void db_rebalance_erase (struct dbn *z, struct dbn **root)
y = z;
}
else
- { // どちらか空いていた場合 xをzの位置に持ってきてzを浮かせる
+ {
x_parent = y->parent;
if (x)
x->parent = y->parent;
@@ -316,10 +247,9 @@ static void db_rebalance_erase (struct dbn *z, struct dbn **root)
else
z->parent->right = x;
}
- // ここまで色の移動の除いて通常の2分木と同じ
if (y->color != RED)
- { // 赤が消える分には影響無し
- while (x != *root && (x == NULL || x->color == BLACK))
+ {
+ while (x != *root && (!x || x->color == BLACK))
if (x == x_parent->left)
{
struct dbn *w = x_parent->right;
@@ -330,17 +260,16 @@ static void db_rebalance_erase (struct dbn *z, struct dbn **root)
db_rotate_left (x_parent, root);
w = x_parent->right;
}
- if ((w->left == NULL ||
- w->left->color == BLACK) &&
- (w->right == NULL || w->right->color == BLACK))
+ if ((!w->left || w->left->color == BLACK) &&
+ (!w->right || w->right->color == BLACK))
{
w->color = RED;
x = x_parent;
- x_parent = x_parent->parent;
+ x_parent = x->parent;
}
else
{
- if (w->right == NULL || w->right->color == BLACK)
+ if (!w->right|| w->right->color == BLACK)
{
if (w->left)
w->left->color = BLACK;
@@ -357,7 +286,8 @@ static void db_rebalance_erase (struct dbn *z, struct dbn **root)
}
}
else
- { // same as above, with right <-> left.
+ {
+ // same as above, with right <-> left.
struct dbn *w = x_parent->left;
if (w->color == RED)
{
@@ -366,9 +296,8 @@ static void db_rebalance_erase (struct dbn *z, struct dbn **root)
db_rotate_right (x_parent, root);
w = x_parent->left;
}
- if ((w->right == NULL ||
- w->right->color == BLACK) &&
- (w->left == NULL || w->left->color == BLACK))
+ if ((!w->right || w->right->color == BLACK) &&
+ (!w->left || w->left->color == BLACK))
{
w->color = RED;
x = x_parent;
@@ -376,7 +305,7 @@ static void db_rebalance_erase (struct dbn *z, struct dbn **root)
}
else
{
- if (w->left == NULL || w->left->color == BLACK)
+ if (!w->left || w->left->color == BLACK)
{
if (w->right)
w->right->color = BLACK;
@@ -397,46 +326,33 @@ static void db_rebalance_erase (struct dbn *z, struct dbn **root)
}
}
-struct dbn *db_insert (struct dbt *table, void *key, void *data)
+struct dbn *db_insert (struct dbt *table, db_key_t key, db_val_t data)
{
- struct dbn *p, *priv;
- int c, hash;
-
- hash = table->hash (table, key) % HASH_SIZE;
- for (c = 0, priv = NULL, p = table->ht[hash]; p;)
+ hash_t hash = table_hash (table, key) % HASH_SIZE;
+ int c = 0;
+ struct dbn *prev = NULL;
+ struct dbn *p = table->ht[hash];
+ while (p)
{
- c = table->cmp (table, key, p->key);
+ c = table_cmp (table, key, p->key);
if (c == 0)
- { // replace
+ {
+ // key found in table, replace
+ // Tell the user of the table to free the key and value
if (table->release)
- table->release (p, 3);
+ table->release (p->key, p->data);
p->data = data;
p->key = key;
return p;
}
- priv = p;
+ // prev is always p->parent?
+ prev = p;
if (c < 0)
- {
p = p->left;
- }
else
- {
p = p->right;
- }
}
-#ifdef MALLOC_DBN
- p = malloc_dbn ();
-#else
CREATE (p, struct dbn, 1);
-#endif
- if (p == NULL)
- {
- printf ("out of memory : db_insert\n");
- return NULL;
- }
- p->parent = NULL;
- p->left = NULL;
- p->right = NULL;
p->key = key;
p->data = data;
p->color = RED;
@@ -444,37 +360,28 @@ struct dbn *db_insert (struct dbt *table, void *key, void *data)
{ // hash entry is empty
table->ht[hash] = p;
p->color = BLACK;
+ return p;
}
+ p->parent = prev;
+ if (c < 0)
+ prev->left = p;
else
+ prev->right = p;
+ if (prev->color == RED)
{
- if (c < 0)
- { // left node
- priv->left = p;
- p->parent = priv;
- }
- else
- { // right node
- priv->right = p;
- p->parent = priv;
- }
- if (priv->color == RED)
- { // must rebalance
- db_rebalance (p, &table->ht[hash]);
- }
+ // must rebalance
+ db_rebalance (p, &table->ht[hash]);
}
return p;
}
-void *db_erase (struct dbt *table, void *key)
+db_val_t db_erase (struct dbt *table, db_key_t key)
{
- void *data;
- struct dbn *p;
- int c, hash;
-
- hash = table->hash (table, key) % HASH_SIZE;
- for (c = 0, p = table->ht[hash]; p;)
+ hash_t hash = table_hash (table, key) % HASH_SIZE;
+ struct dbn *p = table->ht[hash];
+ while (p)
{
- c = table->cmp (table, key, p->key);
+ int c = table_cmp (table, key, p->key);
if (c == 0)
break;
if (c < 0)
@@ -484,103 +391,156 @@ void *db_erase (struct dbt *table, void *key)
}
if (!p)
return NULL;
- data = p->data;
+ db_val_t data = p->data;
db_rebalance_erase (p, &table->ht[hash]);
-#ifdef MALLOC_DBN
- free_dbn (p);
-#else
free (p);
-#endif
return data;
}
+#ifdef SMART_WALK_TREE
+static inline void db_walk_tree (bool dealloc, struct dbn* p, db_func_t func, va_list ap)
+{
+ if (!p)
+ return;
+ if (!dealloc && !func)
+ {
+ fprintf(stderr, "DEBUG: Must walk tree to either free or invoke a function.\n");
+ abort();
+ }
+ if (p->parent)
+ {
+ fprintf(stderr, "DEBUG: Root nodes must not have parents\n");
+ abort();
+ }
+ while (true)
+ {
+ // apply_func loop
+ if (func)
+ func (p->key, p->data, ap);
+ if (p->left)
+ {
+ // continue descending
+ p = p->left;
+ continue; //goto apply_func;
+ }
+ if (p->right)
+ {
+ // descending the other side
+ p = p->right;
+ continue; //goto apply_func;
+ }
+ while (true)
+ {
+ // backtrack loop
+ if (!p->parent)
+ {
+ if (dealloc)
+ free (p);
+ // if we have already done both children, there is no more to do
+ return;
+ }
+ if (p->parent->left == p && p->parent->right)
+ {
+ // finished the left tree, now walk the right tree
+ p = p->parent->right;
+ if (dealloc)
+ free (p->parent->left);
+ break; //goto apply_func;
+ }
+ // p->parent->right == p
+ // or p->parent->left == p but p->parent->right == NULL
+ // keep backtracking
+ p = p->parent;
+ if (dealloc)
+ free (p->right?:p->left);
+ } //backtrack loop
+ } // apply_func loop
+}
+#endif // SMART_WALK_TREE
-void db_foreach (struct dbt *table, int (*func) (void *, void *, va_list),
- ...)
+void db_foreach (struct dbt *table, db_func_t func, ...)
{
- int i, sp;
- // red-black treeなので64個stackがあれば2^32個ノードまで大丈夫
- struct dbn *p, *pn, *stack[64];
va_list ap;
-
va_start (ap, func);
- for (i = 0; i < HASH_SIZE; i++)
+
+ for (int i = 0; i < HASH_SIZE; i++)
{
- if ((p = table->ht[i]) == NULL)
+#ifdef SMART_WALK_TREE
+ db_walk_tree (false, table->ht[i], func, ap);
+#else
+ struct dbn *p = table->ht[i];
+ if (!p)
continue;
- sp = 0;
+ struct dbn *stack[64];
+ int sp = 0;
while (1)
{
func (p->key, p->data, ap);
- if ((pn = p->left) != NULL)
+ struct dbn *pn = p->left;
+ if (pn)
{
if (p->right)
- {
stack[sp++] = p->right;
- }
p = pn;
}
- else
+ else // pn == NULL, time to do the right branch
{
if (p->right)
- {
p = p->right;
- }
else
{
if (sp == 0)
break;
p = stack[--sp];
}
- }
- }
- }
+ } // if pn else if !pn
+ } // while true
+#endif // else ! SMART_WALK_TREE
+ } // for i
va_end (ap);
}
-void db_final (struct dbt *table, int (*func) (void *, void *, va_list), ...)
+// This function is suspiciously similar to the previous
+void db_final (struct dbt *table, db_func_t func, ...)
{
- int i, sp;
- struct dbn *p, *pn, *stack[64];
va_list ap;
-
va_start (ap, func);
- for (i = 0; i < HASH_SIZE; i++)
+
+ for (int i = 0; i < HASH_SIZE; i++)
{
- if ((p = table->ht[i]) == NULL)
+#ifdef SMART_WALK_TREE
+ db_walk_tree (true, table->ht[i], func, ap);
+#else
+ struct dbn *p = table->ht[i];
+ if (!p)
continue;
- sp = 0;
+ struct dbn *stack[64];
+ int sp = 0;
while (1)
{
if (func)
func (p->key, p->data, ap);
- if ((pn = p->left) != NULL)
+ struct dbn *pn = p->left;
+ if (pn)
{
if (p->right)
- {
stack[sp++] = p->right;
- }
}
- else
+ else // pn == NULL, check the right
{
if (p->right)
- {
pn = p->right;
- }
else
{
if (sp == 0)
break;
pn = stack[--sp];
}
- }
-#ifdef MALLOC_DBN
- free_dbn (p);
-#else
+ } // if pn else if !pn
free (p);
-#endif
p = pn;
- }
- }
+ } // while true
+#endif // else ! SMART_WALK_TREE
+ } // for i
free (table);
va_end (ap);
}
diff --git a/src/common/db.h b/src/common/db.h
index 8de32d5..7152854 100644
--- a/src/common/db.h
+++ b/src/common/db.h
@@ -1,49 +1,87 @@
-#ifndef _DB_H_
-#define _DB_H_
+// WARNING: there is a system header by this name
+#ifndef DB_H
+#define DB_H
+# include "sanity.h"
-#include <stdarg.h>
+# include <stdarg.h>
-#define HASH_SIZE (256+27)
+/// Number of tree roots
+// Somewhat arbitrary - larger wastes more space but is faster for large trees
+// num % HASH_SIZE minimize collisions even for similar num
+# define HASH_SIZE (256+27)
-#define RED 0
-#define BLACK 1
+typedef enum dbn_color
+{
+ RED,
+ BLACK
+} dbn_color;
+
+typedef intptr_t numdb_key_t;
+typedef union db_key_t
+{
+ char *ms __attribute__((deprecated));
+ const char* s;
+ numdb_key_t i;
+} db_key_t;
+typedef void* db_val_t;
+typedef uint32_t hash_t;
+typedef void (*db_func_t)(db_key_t, db_val_t, va_list);
+/// DataBase Node
struct dbn
{
struct dbn *parent, *left, *right;
- int color;
- void *key;
- void *data;
+ dbn_color color;
+ db_key_t key;
+ db_val_t data;
};
+typedef enum dbt_type
+{
+ DB_NUMBER,
+ DB_STRING,
+} dbt_type;
+
+/// DataBase Table
struct dbt
{
- int (*cmp) (struct dbt *, void *, void *);
- unsigned int (*hash) (struct dbt *, void *);
- // which 1 - key, 2 - data, 3 - both
- void (*release) (struct dbn *, int which);
- int maxlen;
+ dbt_type type;
+ /// Note, before replacement, key/values to be replaced
+ // TODO refactor to decrease/eliminate the uses of this?
+ void (*release) (db_key_t, db_val_t) __attribute__((deprecated));
+ /// Maximum length of a string key - TODO refactor to ensure all strings are NUL-terminated
+ size_t maxlen __attribute__((deprecated));
+ /// The root trees
struct dbn *ht[HASH_SIZE];
};
-#define strdb_search(t,k) db_search((t),(void*)(k))
-#define strdb_insert(t,k,d) db_insert((t),(void*)(k),(void*)(d))
-#define strdb_erase(t,k) db_erase ((t),(void*)(k))
-#define strdb_foreach db_foreach
-#define strdb_final db_final
-#define numdb_search(t,k) db_search((t),(void*)(k))
-#define numdb_insert(t,k,d) db_insert((t),(void*)(k),(void*)(d))
-#define numdb_erase(t,k) db_erase ((t),(void*)(k))
-#define numdb_foreach db_foreach
-#define numdb_final db_final
-
-struct dbt *strdb_init (int maxlen);
+# define strdb_search(t,k) db_search((t),(db_key_t)(k))
+# define strdb_insert(t,k,d) db_insert((t),(db_key_t)(k),(db_val_t)(d))
+# define strdb_erase(t,k) db_erase ((t),(db_key_t)(k))
+# define strdb_foreach db_foreach
+# define strdb_final db_final
+# define numdb_search(t,k) db_search((t),(db_key_t)(k))
+# define numdb_insert(t,k,d) db_insert((t),(db_key_t)(k),(db_val_t)(d))
+# define numdb_erase(t,k) db_erase ((t),(db_key_t)(k))
+# define numdb_foreach db_foreach
+# define numdb_final db_final
+
+/// Create a map from char* to void*, with strings possibly not null-terminated
+struct dbt *strdb_init (size_t maxlen);
+/// Create a map from int to void*
struct dbt *numdb_init (void);
-void *db_search (struct dbt *table, void *key);
-void *db_search2 (struct dbt *table, const char *key); // [MouseJstr]
-struct dbn *db_insert (struct dbt *table, void *key, void *data);
-void *db_erase (struct dbt *table, void *key);
-void db_foreach (struct dbt *, int (*)(void *, void *, va_list), ...);
-void db_final (struct dbt *, int (*)(void *, void *, va_list), ...);
+/// Return the value corresponding to the key, or NULL if not found
+db_val_t db_search (struct dbt *table, db_key_t key);
+/// Add or replace table[key] = data
+// if it was already there, call release
+struct dbn *db_insert (struct dbt *table, db_key_t key, db_val_t data);
+/// Remove a key from the table, returning the data
+db_val_t db_erase (struct dbt *table, db_key_t key);
+
+/// Execute a function for every element, in unspecified order
+void db_foreach (struct dbt *, db_func_t, ...);
+// opposite of init? Calls release for every element and frees memory
+// This probably isn't really needed: we don't have to free memory while exiting
+void db_final (struct dbt *, db_func_t, ...) __attribute__((deprecated));
#endif
diff --git a/src/common/grfio.c b/src/common/grfio.c
index b460dc6..5e03b7c 100644
--- a/src/common/grfio.c
+++ b/src/common/grfio.c
@@ -1,1159 +1,212 @@
-/*********************************************************************
- *
- * Ragnarok Online Emulator : grfio.c -- grf file I/O Module
- *--------------------------------------------------------------------
- * special need library : zlib
- *********************************************************************
- * $Id: grfio.c,v 1.2 2004/09/29 17:31:49 kalaspuff Exp $
- *
- * 2002/12/18... the original edition
- * 2003/01/23 ... Code correction
- * 2003/02/01 ... An addition and decryption processing are improved for LocalFile and two or more GRF(s) check processing.
- * 2003/02/02 ... Even if there is no grf it does not stop -- as -- correction
- * 2003/02/02... grf reading specification can be added later -- as -- correction (grfio_add function addition)
- * 2003/02 / 03... at the time of grfio_resourcecheck processing the entry addition processing method -- correction
- * 2003/02/05... change of the processing in grfio_init
- * 2003/02/23... a local file check -- GRFIO_LOCAL -- switch (Defoe -- Function Off)
- * 2003/10/21 ... The data of alpha client was read.
- * 2003/11/10 ... Ready new grf format.
- * 2003/11/11 ... version check fix & bug fix
- */
-
+// Reads .gat files by name-mapping .wlk files
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <sys/stat.h>
-#include <zlib.h>
-
#include "utils.h"
#include "grfio.h"
#include "mmo.h"
#include "socket.h"
-#ifdef MEMWATCH
-#include "memwatch.h"
-#endif
-
-typedef unsigned char BYTE;
-typedef unsigned short WORD;
-typedef unsigned long DWORD;
-
-static char data_file[1024] = ""; // "data.grf";
-static char sdata_file[1024] = ""; // "sdata.grf";
-static char adata_file[1024] = ""; // "adata.grf";
-static char data_dir[1024] = ""; // "../";
-
-// accessor to data_file,adata_file,sdata_file
-char *grfio_setdatafile (const char *str)
-{
- strcpy (data_file, str);
- return data_file;
-}
-
-char *grfio_setadatafile (const char *str)
-{
- strcpy (adata_file, str);
- return adata_file;
-}
-
-char *grfio_setsdatafile (const char *str)
-{
- strcpy (sdata_file, str);
- return sdata_file;
-}
-
//----------------------------
// file entry table struct
//----------------------------
typedef struct
{
- int srclen; // compressed size
- int srclen_aligned; //
- int declen; // original size
- int srcpos;
- short next;
- char cycle;
- char type;
- char fn[128 - 4 * 5]; // file name
- char gentry; // read grf file select
+ size_t declen;
+ int16_t next; // next index into the filelist[] array, or -1
+ char fn[128 - 4 - 2]; // file name
} FILELIST;
-//gentry ... 0 : It acquires from a local file.
-// It acquires from the resource file of 1>=:gentry_table[gentry-1].
-// 1<=: Check a local file.
-// If it is, after re-setting to 0, it acquires from a local file.
-// If there is nothing, mark reversal will be carried out, and it will re-set, and will acquire from a resource file as well as 1>=.
-//Since char defines *FILELIST.gentry, the maximum which can be added by grfio_add becomes by 127 pieces.
+#define FILELIST_LIMIT 32768 // limit to number of filelists - if you increase this, change all shorts to int
+#define FILELIST_ADDS 1024 // amount to increment when reallocing
-#define GENTRY_LIMIT 127
-#define FILELIST_LIMIT 32768 // temporary maximum, and a theory top maximum are 2G.
+static FILELIST *filelist = NULL;
+/// Number of entries used
+static uint16_t filelist_entrys = 0;
+/// Number of FILELIST entries actually allocated
+static uint16_t filelist_maxentry = 0;
-static FILELIST *filelist;
-static int filelist_entrys;
-static int filelist_maxentry;
+/// First index of the given hash, into the filelist[] array
+static int16_t filelist_hash[256] = {[0 ... 255] = -1};
-static char **gentry_table;
-static int gentry_entrys;
-static int gentry_maxentry;
-
-//----------------------------
-// file list hash table
-//----------------------------
-static int filelist_hash[256];
-
-//----------------------------
-// grf decode data table
-//----------------------------
-static unsigned char BitMaskTable[8] = {
- 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01
-};
-
-static char BitSwapTable1[64] = {
- 58, 50, 42, 34, 26, 18, 10, 2, 60, 52, 44, 36, 28, 20, 12, 4,
- 62, 54, 46, 38, 30, 22, 14, 6, 64, 56, 48, 40, 32, 24, 16, 8,
- 57, 49, 41, 33, 25, 17, 9, 1, 59, 51, 43, 35, 27, 19, 11, 3,
- 61, 53, 45, 37, 29, 21, 13, 5, 63, 55, 47, 39, 31, 23, 15, 7
-};
-
-static char BitSwapTable2[64] = {
- 40, 8, 48, 16, 56, 24, 64, 32, 39, 7, 47, 15, 55, 23, 63, 31,
- 38, 6, 46, 14, 54, 22, 62, 30, 37, 5, 45, 13, 53, 21, 61, 29,
- 36, 4, 44, 12, 52, 20, 60, 28, 35, 3, 43, 11, 51, 19, 59, 27,
- 34, 2, 42, 10, 50, 18, 58, 26, 33, 1, 41, 9, 49, 17, 57, 25
-};
-
-static char BitSwapTable3[32] = {
- 16, 7, 20, 21, 29, 12, 28, 17, 1, 15, 23, 26, 5, 18, 31, 10,
- 2, 8, 24, 14, 32, 27, 3, 9, 19, 13, 30, 6, 22, 11, 4, 25
-};
-
-static unsigned char NibbleData[4][64] = {
- {
- 0xef, 0x03, 0x41, 0xfd, 0xd8, 0x74, 0x1e, 0x47, 0x26, 0xef, 0xfb, 0x22,
- 0xb3, 0xd8, 0x84, 0x1e,
- 0x39, 0xac, 0xa7, 0x60, 0x62, 0xc1, 0xcd, 0xba, 0x5c, 0x96, 0x90, 0x59,
- 0x05, 0x3b, 0x7a, 0x85,
- 0x40, 0xfd, 0x1e, 0xc8, 0xe7, 0x8a, 0x8b, 0x21, 0xda, 0x43, 0x64, 0x9f,
- 0x2d, 0x14, 0xb1, 0x72,
- 0xf5, 0x5b, 0xc8, 0xb6, 0x9c, 0x37, 0x76, 0xec, 0x39, 0xa0, 0xa3, 0x05,
- 0x52, 0x6e, 0x0f, 0xd9,
- }, {
- 0xa7, 0xdd, 0x0d, 0x78, 0x9e, 0x0b, 0xe3, 0x95, 0x60, 0x36, 0x36,
- 0x4f, 0xf9, 0x60, 0x5a, 0xa3,
- 0x11, 0x24, 0xd2, 0x87, 0xc8, 0x52, 0x75, 0xec, 0xbb, 0xc1, 0x4c,
- 0xba, 0x24, 0xfe, 0x8f, 0x19,
- 0xda, 0x13, 0x66, 0xaf, 0x49, 0xd0, 0x90, 0x06, 0x8c, 0x6a, 0xfb,
- 0x91, 0x37, 0x8d, 0x0d, 0x78,
- 0xbf, 0x49, 0x11, 0xf4, 0x23, 0xe5, 0xce, 0x3b, 0x55, 0xbc, 0xa2,
- 0x57, 0xe8, 0x22, 0x74, 0xce,
- }, {
- 0x2c, 0xea, 0xc1, 0xbf, 0x4a, 0x24, 0x1f, 0xc2, 0x79, 0x47, 0xa2,
- 0x7c, 0xb6, 0xd9, 0x68, 0x15,
- 0x80, 0x56, 0x5d, 0x01, 0x33, 0xfd, 0xf4, 0xae, 0xde, 0x30, 0x07,
- 0x9b, 0xe5, 0x83, 0x9b, 0x68,
- 0x49, 0xb4, 0x2e, 0x83, 0x1f, 0xc2, 0xb5, 0x7c, 0xa2, 0x19, 0xd8,
- 0xe5, 0x7c, 0x2f, 0x83, 0xda,
- 0xf7, 0x6b, 0x90, 0xfe, 0xc4, 0x01, 0x5a, 0x97, 0x61, 0xa6, 0x3d,
- 0x40, 0x0b, 0x58, 0xe6, 0x3d,
- }, {
- 0x4d, 0xd1, 0xb2, 0x0f, 0x28, 0xbd, 0xe4, 0x78, 0xf6, 0x4a,
- 0x0f, 0x93, 0x8b, 0x17, 0xd1, 0xa4,
- 0x3a, 0xec, 0xc9, 0x35, 0x93, 0x56, 0x7e, 0xcb, 0x55, 0x20,
- 0xa0, 0xfe, 0x6c, 0x89, 0x17, 0x62,
- 0x17, 0x62, 0x4b, 0xb1, 0xb4, 0xde, 0xd1, 0x87, 0xc9, 0x14,
- 0x3c, 0x4a, 0x7e, 0xa8, 0xe2, 0x7d,
- 0xa0, 0x9f, 0xf6, 0x5c, 0x6a, 0x09, 0x8d, 0xf0, 0x0f, 0xe3,
- 0x53, 0x25, 0x95, 0x36, 0x28, 0xcb,
- }
-};
-
-/*-----------------
- * long data get
- */
-static unsigned int getlong (unsigned char *p)
+/// Hash a filename
+static uint8_t filehash (const char *fname)
{
- return *p + p[1] * 256 + (p[2] + p[3] * 256) * 65536;
-}
-
-/*==========================================
- * Grf data decode : Subs
- *------------------------------------------
- */
-static void NibbleSwap (BYTE * Src, int len)
-{
- for (; 0 < len; len--, Src++)
- {
- *Src = (*Src >> 4) | (*Src << 4);
- }
-}
-
-static void BitConvert (BYTE * Src, char *BitSwapTable)
-{
- int lop, prm;
- BYTE tmp[8];
- *(DWORD *) tmp = *(DWORD *) (tmp + 4) = 0;
- for (lop = 0; lop != 64; lop++)
- {
- prm = BitSwapTable[lop] - 1;
- if (Src[(prm >> 3) & 7] & BitMaskTable[prm & 7])
- {
- tmp[(lop >> 3) & 7] |= BitMaskTable[lop & 7];
- }
- }
- *(DWORD *) Src = *(DWORD *) tmp;
- *(DWORD *) (Src + 4) = *(DWORD *) (tmp + 4);
-}
-
-static void BitConvert4 (BYTE * Src)
-{
- int lop, prm;
- BYTE tmp[8];
- tmp[0] = ((Src[7] << 5) | (Src[4] >> 3)) & 0x3f; // ..0 vutsr
- tmp[1] = ((Src[4] << 1) | (Src[5] >> 7)) & 0x3f; // ..srqpo n
- tmp[2] = ((Src[4] << 5) | (Src[5] >> 3)) & 0x3f; // ..o nmlkj
- tmp[3] = ((Src[5] << 1) | (Src[6] >> 7)) & 0x3f; // ..kjihg f
- tmp[4] = ((Src[5] << 5) | (Src[6] >> 3)) & 0x3f; // ..g fedcb
- tmp[5] = ((Src[6] << 1) | (Src[7] >> 7)) & 0x3f; // ..cba98 7
- tmp[6] = ((Src[6] << 5) | (Src[7] >> 3)) & 0x3f; // ..8 76543
- tmp[7] = ((Src[7] << 1) | (Src[4] >> 7)) & 0x3f; // ..43210 v
-
- for (lop = 0; lop != 4; lop++)
- {
- tmp[lop] = (NibbleData[lop][tmp[lop * 2]] & 0xf0)
- | (NibbleData[lop][tmp[lop * 2 + 1]] & 0x0f);
- }
-
- *(DWORD *) (tmp + 4) = 0;
- for (lop = 0; lop != 32; lop++)
- {
- prm = BitSwapTable3[lop] - 1;
- if (tmp[prm >> 3] & BitMaskTable[prm & 7])
- {
- tmp[(lop >> 3) + 4] |= BitMaskTable[lop & 7];
- }
- }
- *(DWORD *) Src ^= *(DWORD *) (tmp + 4);
-}
-
-static void decode_des_etc (BYTE * buf, int len, int type, int cycle)
-{
- int lop, cnt = 0;
- if (cycle < 3)
- cycle = 3;
- else if (cycle < 5)
- cycle++;
- else if (cycle < 7)
- cycle += 9;
- else
- cycle += 15;
-
- for (lop = 0; lop * 8 < len; lop++, buf += 8)
- {
- if (lop < 20 || (type == 0 && lop % cycle == 0))
- { // des
- BitConvert (buf, BitSwapTable1);
- BitConvert4 (buf);
- BitConvert (buf, BitSwapTable2);
- }
- else
- {
- if (cnt == 7 && type == 0)
- {
- int a;
- BYTE tmp[8];
- *(DWORD *) tmp = *(DWORD *) buf;
- *(DWORD *) (tmp + 4) = *(DWORD *) (buf + 4);
- cnt = 0;
- buf[0] = tmp[3];
- buf[1] = tmp[4];
- buf[2] = tmp[6];
- buf[3] = tmp[0];
- buf[4] = tmp[1];
- buf[5] = tmp[2];
- buf[6] = tmp[5];
- a = tmp[7];
- if (a == 0x00)
- a = 0x2b;
- else if (a == 0x2b)
- a = 0x00;
- else if (a == 0x01)
- a = 0x68;
- else if (a == 0x68)
- a = 0x01;
- else if (a == 0x48)
- a = 0x77;
- else if (a == 0x77)
- a = 0x48;
- else if (a == 0x60)
- a = 0xff;
- else if (a == 0xff)
- a = 0x60;
- else if (a == 0x6c)
- a = 0x80;
- else if (a == 0x80)
- a = 0x6c;
- else if (a == 0xb9)
- a = 0xc0;
- else if (a == 0xc0)
- a = 0xb9;
- else if (a == 0xeb)
- a = 0xfe;
- else if (a == 0xfe)
- a = 0xeb;
- buf[7] = a;
- }
- cnt++;
- }
- }
-}
-
-/*==========================================
- * Grf data decode sub : zip
- *------------------------------------------
- */
-static int decode_zip (Bytef * dest, uLongf * destLen, const Bytef * source,
- uLong sourceLen)
-{
- z_stream stream;
- int err;
-
- stream.next_in = (Bytef *) source;
- stream.avail_in = (uInt) sourceLen;
- /* Check for source > 64K on 16-bit machine: */
- if ((uLong) stream.avail_in != sourceLen)
- return Z_BUF_ERROR;
-
- stream.next_out = dest;
- stream.avail_out = (uInt) * destLen;
- if ((uLong) stream.avail_out != *destLen)
- return Z_BUF_ERROR;
-
- stream.zalloc = (alloc_func) 0;
- stream.zfree = (free_func) 0;
-
- err = inflateInit (&stream);
- if (err != Z_OK)
- return err;
-
- err = inflate (&stream, Z_FINISH);
- if (err != Z_STREAM_END)
- {
- inflateEnd (&stream);
- return err == Z_OK ? Z_BUF_ERROR : err;
- }
- *destLen = stream.total_out;
-
- err = inflateEnd (&stream);
- return err;
-}
-
-/***********************************************************
- *** File List Sobroutines ***
- ***********************************************************/
-
-/*==========================================
- * File List : Hash make
- *------------------------------------------
- */
-static int filehash (unsigned char *fname)
-{
- unsigned int hash = 0;
+ // Larger than the return type - upper bits are used in the process
+ uint32_t hash = 0;
while (*fname)
{
- hash = ((hash << 1) + (hash >> 7) * 9 + tolower (*fname));
+ hash = (hash << 1) + (hash >> 7) * 9 + (unsigned char)*fname;
fname++;
}
- return hash & 255;
-}
-
-/*==========================================
- * File List : Hash initalize
- *------------------------------------------
- */
-static void hashinit (void)
-{
- int lop;
- for (lop = 0; lop < 256; lop++)
- filelist_hash[lop] = -1;
+ return hash;
}
-/*==========================================
- * File List : File find
- *------------------------------------------
- */
-FILELIST *filelist_find (char *fname)
+/// Find the filelist entry for the given filename, or NULL if it is not
+FILELIST *filelist_find (const char *fname)
{
- int hash;
-
- for (hash = filelist_hash[filehash (fname)]; hash >= 0;
- hash = filelist[hash].next)
+ int16_t index = filelist_hash[filehash (fname)];
+ while (index >= 0)
{
- if (strcasecmp (filelist[hash].fn, fname) == 0)
- break;
+ if (strcmp (filelist[index].fn, fname) == 0)
+ return &filelist[index];
+ index = filelist[index].next;
}
-
- return (hash >= 0) ? &filelist[hash] : NULL;
+ return NULL;
}
-/*==========================================
- * File List : Filelist add
- *------------------------------------------
- */
-#define FILELIST_ADDS 1024 // number increment of file lists `
-
+/// Copy a temporary entry into the hash map
static FILELIST *filelist_add (FILELIST * entry)
{
- int hash;
-
if (filelist_entrys >= FILELIST_LIMIT)
{
- printf ("filelist limit : filelist_add\n");
+ fprintf (stderr, "filelist limit : filelist_add\n");
exit (1);
}
if (filelist_entrys >= filelist_maxentry)
{
- FILELIST *new_filelist = (FILELIST *) realloc ((void *) filelist,
- (filelist_maxentry +
- FILELIST_ADDS) *
- sizeof (FILELIST));
- if (new_filelist != NULL)
- {
- filelist = new_filelist;
- memset (filelist + filelist_maxentry, '\0',
- FILELIST_ADDS * sizeof (FILELIST));
- filelist_maxentry += FILELIST_ADDS;
- }
- else
- {
- printf ("out of memory : filelist_add\n");
- exit (1);
- }
+ RECREATE(filelist, FILELIST, filelist_maxentry + FILELIST_ADDS);
+ memset (filelist + filelist_maxentry, '\0',
+ FILELIST_ADDS * sizeof (FILELIST));
+ filelist_maxentry += FILELIST_ADDS;
}
- memcpy (&filelist[filelist_entrys], entry, sizeof (FILELIST));
-
- hash = filehash (entry->fn);
- filelist[filelist_entrys].next = filelist_hash[hash];
- filelist_hash[hash] = filelist_entrys;
+ uint16_t new_index = filelist_entrys++;
+ uint8_t hash = filehash (entry->fn);
+ entry->next = filelist_hash[hash];
+ filelist_hash[hash] = new_index;
- filelist_entrys++;
+ filelist[new_index] = *entry;
- return &filelist[filelist_entrys - 1];
+ return &filelist[new_index];
}
static FILELIST *filelist_modify (FILELIST * entry)
{
- FILELIST *fentry;
- if ((fentry = filelist_find (entry->fn)) != NULL)
- {
- int tmp = fentry->next;
- memcpy (fentry, entry, sizeof (FILELIST));
- fentry->next = tmp;
- }
- else
- {
- fentry = filelist_add (entry);
- }
- return fentry;
-}
-
-/*==========================================
- * File List : filelist size adjust
- *------------------------------------------
- */
-static void filelist_adjust (void)
-{
- if (filelist != NULL)
+ FILELIST *fentry = filelist_find (entry->fn);
+ if (fentry)
{
- if (filelist_maxentry > filelist_entrys)
- {
- FILELIST *new_filelist = (FILELIST *) realloc ((void *) filelist,
- filelist_entrys *
- sizeof (FILELIST));
- if (new_filelist != NULL)
- {
- filelist = new_filelist;
- filelist_maxentry = filelist_entrys;
- }
- else
- {
- printf ("out of memory : filelist\n");
- exit (1);
- }
- }
+ entry->next = fentry->next;
+ *fentry = *entry;
+ return fentry;
}
+ return filelist_add (entry);
}
-/***********************************************************
- *** Grfio Sobroutines ***
- ***********************************************************/
-/*==========================================
- * Grfio : Resnametable replace
- *------------------------------------------
- */
-char *grfio_resnametable (char *fname, char *lfname)
+/// Change fname data/*.gat to lfname data/*.wlk
+// TODO even if the file exists, don't keep reopening it every time one loads
+void grfio_resnametable (const char *fname, char *lfname)
{
- FILE *fp;
- char *p;
- char w1[256], w2[256], restable[256], line[512];
-
- sprintf (restable, "%sdata\\resnametable.txt", data_dir);
+ char restable[] = "data/resnametable.txt";
- for (p = &restable[0]; *p != 0; p++)
- if (*p == '\\')
- *p = '/';
-
- fp = fopen_ (restable, "rb");
+ FILE *fp = fopen_ (restable, "rb");
if (fp == NULL)
{
- printf ("%s not found\n", restable);
- exit (1); // 1:not found error
+ fprintf(stderr, "No resnametable, can't look for %s\n", fname);
+ strcpy(lfname, fname);
+ char* ext = lfname + strlen(lfname) - 4;
+ if (!strcmp(ext, ".gat"))
+ strcpy(ext, ".wlk");
+ return;
}
- while (fgets (line, 508, fp))
+ char line[512];
+ while (fgets (line, sizeof (line), fp))
{
- if ((sscanf (line, "%[^#]#%[^#]#", w1, w2) == 2)
- && (sscanf (fname, "%*5s%s", lfname) == 1)
- && (!strcmpi (w1, lfname)))
+ char w1[256], w2[256];
+ if (
+ // line is of the form foo.gat#foo.wlk#
+ (sscanf (line, "%[^#]#%[^#]#", w1, w2) == 2)
+ // strip data/ from foo.gat before comparing
+ && (!strcmp (w1, fname + 5)))
{
- sprintf (lfname, "data\\%s", w2);
+ strcpy (lfname, "data/");
+ strcpy (lfname + 5, w2);
fclose_ (fp);
- return lfname;
+ return;
}
}
+ fprintf(stderr, "Unable to find resource: %s\n", fname);
fclose_ (fp);
- return fname;
-
-}
-
-/*==========================================
- * Grfio : Resource file size get
- *------------------------------------------
- */
-int grfio_size (char *fname)
-{
- FILELIST *entry;
-
- entry = filelist_find (fname);
-
- if (entry == NULL || entry->gentry < 0)
- { // LocalFileCheck
- char lfname[256], rname[256], *p;
- FILELIST lentry;
- struct stat st;
- //printf("%s\t",fname);
- sprintf (rname, "%s", grfio_resnametable (fname, lfname));
- //printf("%s\n",rname);
- sprintf (lfname, "%s%s", data_dir, rname);
- //printf("%s\n",lfname);
-
- for (p = &lfname[0]; *p != 0; p++)
- if (*p == '\\')
- *p = '/'; // * At the time of Unix
-
- if (stat (lfname, &st) == 0)
- {
- strncpy (lentry.fn, fname, sizeof (lentry.fn) - 1);
- lentry.declen = st.st_size;
- lentry.gentry = 0; // 0:LocalFile
- entry = filelist_modify (&lentry);
- }
- else if (entry == NULL)
- {
- printf ("%s not found\n", fname);
- //exit(1);
- return -1;
- }
- }
- return entry->declen;
+ strcpy(lfname, fname);
+ char* ext = lfname + strlen(lfname) - 4;
+ if (!strcmp(ext, ".gat"))
+ strcpy(ext, ".wlk");
+ return;
}
-/*==========================================
- * Grfio : Resource file read & size get
- *------------------------------------------
- */
-void *grfio_reads (char *fname, int *size)
+/// Size of resource
+size_t grfio_size (const char *fname)
{
- FILE *in = NULL;
- unsigned char *buf = NULL, *buf2 = NULL;
- char *gfname;
- FILELIST *entry;
+ FILELIST *entry = filelist_find (fname);
+ if (entry)
+ return entry->declen;
- entry = filelist_find (fname);
+ char lfname[256];
+ FILELIST lentry;
+ struct stat st;
- if (entry == NULL || entry->gentry <= 0)
- { // LocalFileCheck
- char lfname[256], rname[256], *p;
- FILELIST lentry;
+ grfio_resnametable (fname, lfname);
- strncpy (lfname, fname, 255);
- sprintf (rname, "%s", grfio_resnametable (fname, lfname));
- sprintf (lfname, "%s%s", data_dir, rname);
- //printf("%s\n",lfname);
-
- for (p = &lfname[0]; *p != 0; p++)
- if (*p == '\\')
- *p = '/'; // * At the time of Unix
-
- in = fopen_ (lfname, "rb");
- if (in != NULL)
- {
- if (entry != NULL && entry->gentry == 0)
- {
- lentry.declen = entry->declen;
- }
- else
- {
- fseek (in, 0, 2); // SEEK_END
- lentry.declen = ftell (in);
- }
- fseek (in, 0, 0); // SEEK_SET
- buf2 = calloc (lentry.declen + 1024, 1);
- if (buf2 == NULL)
- {
- printf ("file read memory allocate error : declen\n");
- goto errret;
- }
- if (!fread (buf2, 1, lentry.declen, in))
- goto errret;
- fclose_ (in);
- in = NULL;
- strncpy (lentry.fn, fname, sizeof (lentry.fn) - 1);
- lentry.gentry = 0; // 0:LocalFile
- entry = filelist_modify (&lentry);
- }
- else
- {
- if (entry != NULL && entry->gentry < 0)
- {
- entry->gentry = -entry->gentry; // local file checked
- }
- else
- {
- printf ("%s not found\n", fname);
- //goto errret;
- free (buf2);
- return NULL;
- }
- }
- }
- if (entry != NULL && entry->gentry > 0)
- { // Archive[GRF] File Read
- buf = calloc (entry->srclen_aligned + 1024, 1);
- if (buf == NULL)
- {
- printf ("file read memory allocate error : srclen_aligned\n");
- goto errret;
- }
- gfname = gentry_table[entry->gentry - 1];
- in = fopen_ (gfname, "rb");
- if (in == NULL)
- {
- printf ("%s not found\n", gfname);
- //goto errret;
- free (buf);
- return NULL;
- }
- fseek (in, entry->srcpos, 0);
- if (!fread (buf, 1, entry->srclen_aligned, in))
- goto errret;
- fclose_ (in);
- buf2 = calloc (entry->declen + 1024, 1);
- if (buf2 == NULL)
- {
- printf ("file decode memory allocate error\n");
- goto errret;
- }
- if (entry->type == 1 || entry->type == 3 || entry->type == 5)
- {
- uLongf len;
- if (entry->cycle >= 0)
- {
- decode_des_etc (buf, entry->srclen_aligned, entry->cycle == 0,
- entry->cycle);
- }
- len = entry->declen;
- decode_zip (buf2, &len, buf, entry->srclen);
- if (len != entry->declen)
- {
- printf ("decode_zip size miss match err: %d != %d\n",
- (int) len, entry->declen);
- goto errret;
- }
- }
- else
- {
- memcpy (buf2, buf, entry->declen);
- }
- free (buf);
- }
- if (size != NULL && entry != NULL)
- *size = entry->declen;
- return buf2;
- errret:
- if (buf != NULL)
- free (buf);
- if (buf2 != NULL)
- free (buf2);
- if (in != NULL)
- fclose_ (in);
- exit (1); //return NULL;
-}
-
-/*==========================================
- * Grfio : Resource file read
- *------------------------------------------
- */
-void *grfio_read (char *fname)
-{
- return grfio_reads (fname, NULL);
-}
-
-/*==========================================
- * Resource filename decode
- *------------------------------------------
- */
-static unsigned char *decode_filename (unsigned char *buf, int len)
-{
- int lop;
- for (lop = 0; lop < len; lop += 8)
- {
- NibbleSwap (&buf[lop], 8);
- BitConvert (&buf[lop], BitSwapTable1);
- BitConvert4 (&buf[lop]);
- BitConvert (&buf[lop], BitSwapTable2);
- }
- return buf;
-}
-
-/*==========================================
- * Grfio : Entry table read
- *------------------------------------------
- */
-static int grfio_entryread (char *gfname, int gentry)
-{
- FILE *fp;
- int grf_size, list_size;
- unsigned char grf_header[0x2e];
- int lop, entry, entrys, ofs, grf_version;
- unsigned char *fname;
- unsigned char *grf_filelist;
+ for (char *p = lfname; *p; p++)
+ if (*p == '\\')
+ *p = '/';
- fp = fopen_ (gfname, "rb");
- if (fp == NULL)
+ if (stat (lfname, &st) == 0)
{
- printf ("%s not found\n", gfname);
- return 1; // 1:not found error
- }
-
- fseek (fp, 0, 2); // SEEK_END
- grf_size = ftell (fp);
- fseek (fp, 0, 0); // SEEK_SET
- if (!fread (grf_header, 1, 0x2e, fp))
- return 2;
-
- if (strcmp (grf_header, "Master of Magic")
- || fseek (fp, getlong (grf_header + 0x1e), 1))
- { // SEEK_CUR
- fclose_ (fp);
- printf ("%s read error\n", gfname);
- return 2; // 2:file format error
- }
-
- grf_version = getlong (grf_header + 0x2a) >> 8;
-
- if (grf_version == 0x01)
- { //****** Grf version 01xx ******
- list_size = grf_size - ftell (fp);
- grf_filelist = calloc (list_size, 1);
- if (grf_filelist == NULL)
- {
- fclose_ (fp);
- printf ("out of memory : grf_filelist\n");
- return 3; // 3:memory alloc error
- }
- if (!fread (grf_filelist, 1, list_size, fp))
- return 2;
- fclose_ (fp);
-
- entrys =
- getlong (grf_header + 0x26) - getlong (grf_header + 0x22) - 7;
-
- // Get an entry
- for (entry = 0, ofs = 0; entry < entrys; entry++)
- {
- int ofs2, srclen, srccount, type;
- char *period_ptr;
- FILELIST aentry;
-
- ofs2 = ofs + getlong (grf_filelist + ofs) + 4;
- type = grf_filelist[ofs2 + 12];
- if (type != 0)
- { // Directory Index ... skip
- fname =
- decode_filename (grf_filelist + ofs + 6,
- grf_filelist[ofs] - 6);
- if (strlen (fname) > sizeof (aentry.fn) - 1)
- {
- printf ("file name too long : %s\n", fname);
- free (grf_filelist);
- exit (1);
- }
- srclen = 0;
- if ((period_ptr = rindex (fname, '.')) != NULL)
- {
- for (lop = 0; lop < 4; lop++)
- {
- if (strcasecmp
- (period_ptr,
- ".gnd\0.gat\0.act\0.str" + lop * 5) == 0)
- break;
- }
- srclen =
- getlong (grf_filelist + ofs2) -
- getlong (grf_filelist + ofs2 + 8) - 715;
- if (lop == 4)
- {
- for (lop = 10, srccount = 1; srclen >= lop;
- lop = lop * 10, srccount++);
- }
- else
- {
- srccount = 0;
- }
- }
- else
- {
- srccount = 0;
- }
-
- aentry.srclen = srclen;
- aentry.srclen_aligned =
- getlong (grf_filelist + ofs2 + 4) - 37579;
- aentry.declen = getlong (grf_filelist + ofs2 + 8);
- aentry.srcpos = getlong (grf_filelist + ofs2 + 13) + 0x2e;
- aentry.cycle = srccount;
- aentry.type = type;
- strncpy (aentry.fn, fname, sizeof (aentry.fn) - 1);
-#ifdef GRFIO_LOCAL
- aentry.gentry = -(gentry + 1); // As Flag for making it a negative number carrying out the first time LocalFileCheck
-#else
- aentry.gentry = gentry + 1; // With no first time LocalFileCheck
-#endif
- filelist_modify (&aentry);
- }
- ofs = ofs2 + 17;
- }
- free (grf_filelist);
-
- }
- else if (grf_version == 0x02)
- { //****** Grf version 02xx ******
- unsigned char eheader[8];
- unsigned char *rBuf;
- uLongf rSize, eSize;
-
- if (!fread (eheader, 1, 8, fp))
- return 4;
-
- rSize = getlong (eheader); // Read Size
- eSize = getlong (eheader + 4); // Extend Size
-
- if (rSize > grf_size - ftell (fp))
- {
- fclose_ (fp);
- printf ("Illegal data format : grf compress entry size\n");
- return 4;
- }
-
- rBuf = calloc (rSize, 1); // Get a Read Size
- if (rBuf == NULL)
- {
- fclose_ (fp);
- printf ("out of memory : grf compress entry table buffer\n");
- return 3;
- }
- grf_filelist = calloc (eSize, 1); // Get a Extend Size
- if (grf_filelist == NULL)
- {
- free (rBuf);
- fclose_ (fp);
- printf ("out of memory : grf extract entry table buffer\n");
- return 3;
- }
-
- if (!fread (rBuf, 1, rSize, fp))
- return 4;
-
- fclose_ (fp);
- decode_zip (grf_filelist, &eSize, rBuf, rSize); // Decode function
- list_size = eSize;
- free (rBuf);
-
- entrys = getlong (grf_header + 0x26) - 7;
-
- // Get an entry
- for (entry = 0, ofs = 0; entry < entrys; entry++)
- {
- int ofs2, srclen, srccount, type;
- FILELIST aentry;
-
- fname = grf_filelist + ofs;
- if (strlen (fname) > sizeof (aentry.fn) - 1)
- {
- printf ("grf : file name too long : %s\n", fname);
- free (grf_filelist);
- exit (1);
- }
- ofs2 = ofs + strlen (grf_filelist + ofs) + 1;
- type = grf_filelist[ofs2 + 12];
- if (type == 1 || type == 3 || type == 5)
- {
- srclen = getlong (grf_filelist + ofs2);
- if (grf_filelist[ofs2 + 12] == 3)
- {
- for (lop = 10, srccount = 1; srclen >= lop;
- lop = lop * 10, srccount++);
- }
- else if (grf_filelist[ofs2 + 12] == 5)
- {
- srccount = 0;
- }
- else
- { // if (grf_filelist[ofs2+12]==1) {
- srccount = -1;
- }
-
- aentry.srclen = srclen;
- aentry.srclen_aligned = getlong (grf_filelist + ofs2 + 4);
- aentry.declen = getlong (grf_filelist + ofs2 + 8);
- aentry.srcpos = getlong (grf_filelist + ofs2 + 13) + 0x2e;
- aentry.cycle = srccount;
- aentry.type = type;
- strncpy (aentry.fn, fname, sizeof (aentry.fn) - 1);
-#ifdef GRFIO_LOCAL
- aentry.gentry = -(gentry + 1); // As Flag for making it a negative number carrying out the first time LocalFileCheck
-#else
- aentry.gentry = gentry + 1; // With no first time LocalFileCheck
-#endif
- filelist_modify (&aentry);
- }
- ofs = ofs2 + 17;
- }
- free (grf_filelist);
-
+ strncpy (lentry.fn, fname, sizeof (lentry.fn) - 1);
+ lentry.declen = st.st_size;
+ entry = filelist_modify (&lentry);
}
else
- { //****** Grf Other version ******
- fclose_ (fp);
- printf ("not support grf versions : %04x\n",
- getlong (grf_header + 0x2a));
- return 4;
- }
-
- filelist_adjust (); // Unnecessary area release of filelist
-
- return 0; // 0:no error
-}
-
-/*==========================================
- * Grfio : Resource file check
- *------------------------------------------
- */
-static void grfio_resourcecheck ()
-{
- int size;
- unsigned char *buf, *ptr;
- char w1[256], w2[256], src[256], dst[256];
- FILELIST *entry;
-
- buf = grfio_reads ("data\\resnametable.txt", &size);
- buf[size] = 0;
-
- for (ptr = buf; ptr - buf < size;)
{
- if (sscanf (ptr, "%[^#]#%[^#]#", w1, w2) == 2)
- {
- if (strstr (w2, "bmp"))
- {
- sprintf (src, "data\\texture\\%s", w1);
- sprintf (dst, "data\\texture\\%s", w2);
- }
- else
- {
- sprintf (src, "data\\%s", w1);
- sprintf (dst, "data\\%s", w2);
- }
- entry = filelist_find (dst);
- if (entry != NULL)
- {
- FILELIST fentry;
- memcpy (&fentry, entry, sizeof (FILELIST));
- strncpy (fentry.fn, src, sizeof (fentry.fn) - 1);
- filelist_modify (&fentry);
- }
- else
- {
- //printf("file not found in data.grf : %s < %s\n",dst,src);
- }
- }
- ptr = strchr (ptr, '\n'); // Next line
- if (!ptr)
- break;
- ptr++;
+ printf ("%s not found\n", fname);
+ return 0;
}
- free (buf);
- filelist_adjust (); // Unnecessary area release of filelist
+ return entry->declen;
}
-/*==========================================
- * Grfio : Resource add
- *------------------------------------------
- */
-#define GENTRY_ADDS 16 // The number increment of gentry_table entries
-
-int grfio_add (char *fname)
+void *grfio_reads (const char *fname, size_t *size)
{
- int len, result;
- char *buf;
-
- if (gentry_entrys >= GENTRY_LIMIT)
- {
- printf ("gentrys limit : grfio_add\n");
- exit (1);
- }
+ char lfname[256];
+ grfio_resnametable (fname, lfname);
- printf ("%s file reading...\n", fname);
+ for (char *p = &lfname[0]; *p != 0; p++)
+ if (*p == '\\')
+ *p = '/'; // * At the time of Unix
- if (gentry_entrys >= gentry_maxentry)
+ FILE *in = fopen_ (lfname, "rb");
+ if (!in)
{
- char **new_gentry = (char **) realloc ((void *) gentry_table,
- (gentry_maxentry +
- GENTRY_ADDS) *
- sizeof (char *));
- if (new_gentry != NULL)
- {
- int lop;
- gentry_table = new_gentry;
- gentry_maxentry += GENTRY_ADDS;
- for (lop = gentry_entrys; lop < gentry_maxentry; lop++)
- gentry_table[lop] = NULL;
- }
- else
- {
- printf ("out of memory : grfio_add\n");
- exit (1);
- }
- }
- len = strlen (fname);
- buf = calloc (len + 1, 1);
- if (buf == NULL)
- {
- printf ("out of memory : gentry\n");
- exit (1);
+ fprintf (stderr, "%s not found\n", fname);
+ return NULL;
}
- strcpy (buf, fname);
- gentry_table[gentry_entrys++] = buf;
-
- result = grfio_entryread (fname, gentry_entrys - 1);
-
- if (result == 0)
+ FILELIST lentry;
+ FILELIST *entry = filelist_find (fname);
+ if (entry)
{
- // Resource check
- grfio_resourcecheck ();
+ lentry.declen = entry->declen;
}
-
- return result;
-}
-
-/*==========================================
- * Grfio : Finalize
- *------------------------------------------
- */
-void grfio_final (void)
-{
- int lop;
-
- if (filelist != NULL)
- free (filelist);
- filelist = NULL;
- filelist_entrys = filelist_maxentry = 0;
-
- if (gentry_table != NULL)
+ else
{
- for (lop = 0; lop < gentry_entrys; lop++)
- {
- if (gentry_table[lop] != NULL)
- {
- free (gentry_table[lop]);
- }
- }
- free (gentry_table);
+ fseek (in, 0, SEEK_END);
+ lentry.declen = ftell (in);
+ fseek (in, 0, SEEK_SET);
+ strncpy (lentry.fn, fname, sizeof (lentry.fn) - 1);
+ entry = filelist_modify (&lentry);
}
- gentry_table = NULL;
- gentry_entrys = gentry_maxentry = 0;
-}
-
-/*==========================================
- * Grfio : Initialize
- *------------------------------------------
- */
-void grfio_init (char *fname)
-{
- FILE *data_conf;
- char line[1024], w1[1024], w2[1024];
- int result = 0, result2 = 0, result3 = 0;
-
- data_conf = fopen_ (fname, "r");
+ uint8_t *buf2;
+ CREATE (buf2, uint8_t, lentry.declen + 1024);
+ if (!fread (buf2, 1, lentry.declen, in))
+ exit(1);
+ fclose_ (in);
+ in = NULL;
- // It will read, if there is grf-files.txt.
- if (data_conf)
- {
- while (fgets (line, 1020, data_conf))
- {
- if (sscanf (line, "%[^:]: %[^\r\n]", w1, w2) == 2)
- {
- if (strcmp (w1, "data") == 0)
- strcpy (data_file, w2);
- else if (strcmp (w1, "sdata") == 0)
- strcpy (sdata_file, w2);
- else if (strcmp (w1, "adata") == 0)
- strcpy (adata_file, w2);
- else if (strcmp (w1, "data_dir") == 0)
- strcpy (data_dir, w2);
- }
- }
-
- fclose_ (data_conf);
- printf ("read %s done\n", fname);
- } // end of reading grf-files.txt
-
- hashinit (); // hash table initialization
-
- filelist = NULL;
- filelist_entrys = filelist_maxentry = 0;
- gentry_table = NULL;
- gentry_entrys = gentry_maxentry = 0;
- atexit (grfio_final); // End processing definition
-
- // Entry table reading
-
- if (strcmp (data_file, "") != 0) // If data directive exists in grf-files.txt (i.e. data_file is not equal to "")
- result = grfio_add (data_file); // Primary data file
-
- if (strcmp (sdata_file, "") != 0) // If sdata directive exists in grf-files.txt (i.e. sdata_file is not equal to "")
- result2 = grfio_add (sdata_file); // Sakray data file
-
- if (strcmp (adata_file, "") != 0) // If data directive exists in grf-files.txt (i.e. adata_file is not equal to "")
- result3 = grfio_add (adata_file); // Alpha version data file
-
- if (result != 0 && result2 != 0 && result3 != 0)
- {
- printf ("not grf file readed exit!!\n");
- exit (1); // It ends, if a resource cannot read one.
- }
+ if (size)
+ *size = entry->declen;
+ return buf2;
}
diff --git a/src/common/grfio.h b/src/common/grfio.h
index 5d3f69c..4919a7b 100644
--- a/src/common/grfio.h
+++ b/src/common/grfio.h
@@ -1,16 +1,17 @@
-// $Id: grfio.h,v 1.1.1.1 2004/09/10 17:44:49 MagicalTux Exp $
-#ifndef _GRFIO_H_
-#define _GRFIO_H_
+/// Accessor to the .gat map virtual files
+// Note .gat files are mapped to .wlk files by data/resnametable.txt
+// Note that there currently is a 1-1 correlation between them,
+// but it is possible for a single .wlk to have multiple .gats reference it
+#ifndef GRFIO_H
+#define GRFIO_H
-void grfio_init (char *); // GRFIO Initialize
-int grfio_add (char *); // GRFIO Resource file add
-void *grfio_read (char *); // GRFIO data file read
-void *grfio_reads (char *, int *); // GRFIO data file read & size get
-int grfio_size (char *); // GRFIO data file size get
+/// Load file into memory
+# define grfio_read(resourcename) grfio_reads (resourcename, NULL)
+/// Load file into memory and possibly record length
+// For some reason, this allocates an extra 1024 bytes at the end
+void *grfio_reads (const char *resourcename, size_t *size);
+/// Get size of file
+// This is only called once, and that is to check the existence of a file.
+size_t grfio_size (const char *resourcename) __attribute__((deprecated));
-// Accessor to GRF filenames
-char *grfio_setdatafile (const char *str);
-char *grfio_setadatafile (const char *str);
-char *grfio_setsdatafile (const char *str);
-
-#endif // _GRFIO_H_
+#endif // GRFIO_H
diff --git a/src/common/lock.c b/src/common/lock.c
index bed657f..dd42ef2 100644
--- a/src/common/lock.c
+++ b/src/common/lock.c
@@ -1,45 +1,36 @@
-
#include <unistd.h>
#include <stdio.h>
#include "lock.h"
#include "socket.h"
-// 書き込みファイルの保護処理
-// （書き込みが終わるまで、旧ファイルを保管しておく）
+/// Protected file writing
+/// (Until the file is closed, it keeps the old file)
-// 新しいファイルの書き込み開始
+// Start writing a tmpfile
FILE *lock_fopen (const char *filename, int *info)
{
char newfile[512];
FILE *fp;
int no = getpid ();
- // 安全なファイル名を得る（手抜き）
+ // Get a filename that doesn't already exist
do
{
sprintf (newfile, "%s_%d.tmp", filename, no++);
}
- while ((fp = fopen_ (newfile, "r")) && fclose_ (fp));
+ while ((fp = fopen_ (newfile, "r")) && (fclose_ (fp), 1));
*info = --no;
return fopen_ (newfile, "w");
}
-// 旧ファイルを削除＆新ファイルをリネーム
-int lock_fclose (FILE * fp, const char *filename, int *info)
+// Delete the old file and rename the new file
+void lock_fclose (FILE * fp, const char *filename, int *info)
{
- int ret = 0;
char newfile[512];
- if (fp != NULL)
+ if (fp)
{
- ret = fclose_ (fp);
+ fclose_ (fp);
sprintf (newfile, "%s_%d.tmp", filename, *info);
- remove (filename);
- // このタイミングで落ちると最悪。
rename (newfile, filename);
- return ret;
- }
- else
- {
- return 1;
}
}
diff --git a/src/common/lock.h b/src/common/lock.h
index 6175241..2f087fd 100644
--- a/src/common/lock.h
+++ b/src/common/lock.h
@@ -1,7 +1,8 @@
-#ifndef _LOCK_H_
-#define _LOCK_H_
-
+#ifndef LOCK_H
+#define LOCK_H
+/// Locked FILE I/O
+// Changes are made in a separate file until lock_fclose
FILE *lock_fopen (const char *filename, int *info);
-int lock_fclose (FILE * fp, const char *filename, int *info);
+void lock_fclose (FILE * fp, const char *filename, int *info);
-#endif
+#endif // LOCK_H
diff --git a/src/common/malloc.c b/src/common/malloc.c
deleted file mode 100644
index 8d68bee..0000000
--- a/src/common/malloc.c
+++ /dev/null
@@ -1,68 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "malloc.h"
-
-#define SHOW_MEMORY_ERROR(file, line, func, type, msg) \
- fprintf (stderr, "%s:%d: in func %s(): %s() error, %s\n", \
- file, line, func, type, msg)
-
-void *aMalloc_ (size_t size, const char *file, int line, const char *func)
-{
- void *ret = malloc (size);
-
- /* printf ("%s:%d: in func %s(): malloc(%d)\n", file, line, func, size); */
- if (ret == NULL)
- {
- SHOW_MEMORY_ERROR (file, line, func, "malloc", "out of memory");
- exit (EXIT_FAILURE);
- }
-
- return ret;
-}
-
-void *aCalloc_ (size_t num, size_t size, const char *file, int line,
- const char *func)
-{
- void *ret = calloc (num, size);
-
- /* printf ("%s:%d: in func %s(): calloc(%d, %d)\n", file, line, func, num,
- size); */
- if (ret == NULL)
- {
- SHOW_MEMORY_ERROR (file, line, func, "calloc", "out of memory");
- exit (EXIT_FAILURE);
- }
-
- return ret;
-}
-
-void *aRealloc_ (void *p, size_t size, const char *file, int line,
- const char *func)
-{
- void *ret = realloc (p, size);
-
- /* printf ("%s:%d: in func %s(): realloc(%p, %d)\n", file, line, func, p,
- size); */
- if (ret == NULL)
- {
- SHOW_MEMORY_ERROR (file, line, func, "realloc", "out of memory");
- exit (EXIT_FAILURE);
- }
-
- return ret;
-}
-
-char *aStrdup_ (const char *p, const char *file, int line, const char *func)
-{
- char *ret = strdup (p);
-
- /* printf ("%s:%d: in func %s(): strdup(%p)\n", file, line, func, p); */
- if (ret == NULL)
- {
- SHOW_MEMORY_ERROR (file, line, func, "strdup", "out of memory");
- exit (EXIT_FAILURE);
- }
-
- return ret;
-}
diff --git a/src/common/malloc.h b/src/common/malloc.h
deleted file mode 100644
index 5fc8cbe..0000000
--- a/src/common/malloc.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _MALLOC_H_
-#define _MALLOC_H_
-
-#if __STDC_VERSION__ < 199901L
-# if __GNUC__ >= 2
-# define __func__ __FUNCTION__
-# else
-# define __func__ ""
-# endif
-#endif
-
-#define ALC_MARK __FILE__, __LINE__, __func__
-
-void *aMalloc_ (size_t, const char *, int, const char *);
-void *aCalloc_ (size_t, size_t, const char *, int, const char *);
-void *aRealloc_ (void *, size_t, const char *, int, const char *);
-char *aStrdup_ (const char *, const char *, int, const char *);
-
-#define aMalloc(n) aMalloc_(n,ALC_MARK)
-#define aMallocA(n) aMalloc_(n,ALC_MARK)
-#define aCalloc(m,n) aCalloc_(m,n,ALC_MARK)
-#define aCallocA(m,n) aCalloc_(m,n,ALC_MARK)
-#define aRealloc(p,n) aRealloc_(p,n,ALC_MARK)
-#define aStrdup(p) aStrdup_(p,ALC_MARK)
-#define aFree(p) aFree_(p,ALC_MARK)
-
-#endif
diff --git a/src/common/md5calc.c b/src/common/md5calc.c
index 6069070..d5ebcf8 100644
--- a/src/common/md5calc.c
+++ b/src/common/md5calc.c
@@ -1,335 +1,310 @@
-// $Id: md5calc.c,v 1.1.1.1 2004/09/10 17:26:54 MagicalTux Exp $
-/***********************************************************
- * md5 calculation algorithm
- *
- * The source code referred to the following URL.
- * http://www.geocities.co.jp/SiliconValley-Oakland/8878/lab17/lab17.html
- *
- ***********************************************************/
-
#include "md5calc.h"
#include <string.h>
-#include <stdio.h>
#include "mt_rand.h"
-#ifndef UINT_MAX
-#define UINT_MAX 4294967295U
-#endif
-
-// Global variable
-static unsigned int *pX;
-
-// Stirng Table
-static const unsigned int T[] = {
+// auxilary data
+/*
+sin() constant table
+# Reformatted output of:
+echo 'scale=40; obase=16; for (i=1;i<=64;i++) print 2^32 * sin(i), "\n"' |
+bc | sed 's/^-//;s/^/0x/;s/\..*$/,/'
+*/
+static const uint32_t T[64] =
+{
+ // used by round 1
0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee, //0
0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501, //4
0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be, //8
0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821, //12
+ // used by round 2
0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa, //16
- 0xd62f105d, 0x2441453, 0xd8a1e681, 0xe7d3fbc8, //20
+ 0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8, //20
0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed, //24
0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a, //28
+ // used by round 3
0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c, //32
0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70, //36
- 0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x4881d05, //40
+ 0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05, //40
0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665, //44
+ // used by round 4
0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039, //48
0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1, //52
0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1, //56
- 0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391 //60
+ 0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391, //60
};
-// ROTATE_LEFT The left is made to rotate x [ n-bit ]. This is diverted as it is from RFC.
-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
+// auxilary functions
+// note - the RFC defines these by non-CS conventions: or=v, and=(empty)
+static inline uint32_t rotate_left(uint32_t val, unsigned shift)
+{
+ return val << shift | val >> (32-shift);
+}
-// The function used for other calculation
-static unsigned int F (unsigned int X, unsigned int Y, unsigned int Z)
+static inline uint32_t F(uint32_t X, uint32_t Y, uint32_t Z)
{
return (X & Y) | (~X & Z);
}
-
-static unsigned int G (unsigned int X, unsigned int Y, unsigned int Z)
+static inline uint32_t G(uint32_t X, uint32_t Y, uint32_t Z)
{
return (X & Z) | (Y & ~Z);
}
-
-static unsigned int H (unsigned int X, unsigned int Y, unsigned int Z)
+static inline uint32_t H(uint32_t X, uint32_t Y, uint32_t Z)
{
return X ^ Y ^ Z;
}
-
-static unsigned int I (unsigned int X, unsigned int Y, unsigned int Z)
+static inline uint32_t I(uint32_t X, uint32_t Y, uint32_t Z)
{
return Y ^ (X | ~Z);
}
-static unsigned int Round (unsigned int a, unsigned int b, unsigned int FGHI,
- unsigned int k, unsigned int s, unsigned int i)
+static const struct
{
- return b + ROTATE_LEFT (a + FGHI + pX[k] + T[i], s);
+ uint8_t k : 4;
+ uint8_t : 0;
+ uint8_t s : 5;
+// uint8_t i : 6; just increments constantly, from 1 .. 64 over all rounds
}
+MD5_round1[16] =
+{
+ { 0, 7}, { 1, 12}, { 2, 17}, { 3, 22},
+ { 4, 7}, { 5, 12}, { 6, 17}, { 7, 22},
+ { 8, 7}, { 9, 12}, {10, 17}, {11, 22},
+ {12, 7}, {13, 12}, {14, 17}, {15, 22},
+},
+MD5_round2[16] =
+{
+ { 1, 5}, { 6, 9}, {11, 14}, { 0, 20},
+ { 5, 5}, {10, 9}, {15, 14}, { 4, 20},
+ { 9, 5}, {14, 9}, { 3, 14}, { 8, 20},
+ {13, 5}, { 2, 9}, { 7, 14}, {12, 20},
+},
+MD5_round3[16] =
+{
+ { 5, 4}, { 8, 11}, {11, 16}, {14, 23},
+ { 1, 4}, { 4, 11}, { 7, 16}, {10, 23},
+ {13, 4}, { 0, 11}, { 3, 16}, { 6, 23},
+ { 9, 4}, {12, 11}, {15, 16}, { 2, 23},
+},
+MD5_round4[16] =
+{
+ { 0, 6}, { 7, 10}, {14, 15}, { 5, 21},
+ {12, 6}, { 3, 10}, {10, 15}, { 1, 21},
+ { 8, 6}, {15, 10}, { 6, 15}, {13, 21},
+ { 4, 6}, {11, 10}, { 2, 15}, { 9, 21},
+};
-static void Round1 (unsigned int *a, unsigned int b, unsigned int c,
- unsigned int d, unsigned int k, unsigned int s,
- unsigned int i)
+
+void MD5_init(MD5_state* state)
{
- *a = Round (*a, b, F (b, c, d), k, s, i);
+ // in the RFC, these are specified as bytes, interpreted as little-endian
+ state->val[0] = 0x67452301;
+ state->val[1] = 0xEFCDAB89;
+ state->val[2] = 0x98BADCFE;
+ state->val[3] = 0x10325476;
}
-static void Round2 (unsigned int *a, unsigned int b, unsigned int c,
- unsigned int d, unsigned int k, unsigned int s,
- unsigned int i)
+void MD5_do_block(MD5_state* state, MD5_block block)
{
- *a = Round (*a, b, G (b, c, d), k, s, i);
+#define X block.data
+#define a state->val[(16-i)%4]
+#define b state->val[(17-i)%4]
+#define c state->val[(18-i)%4]
+#define d state->val[(19-i)%4]
+ // save the values
+ const MD5_state saved = *state;
+ // round 1
+ for (int i=0; i<16; i++)
+ {
+#define k MD5_round1[i].k
+#define s MD5_round1[i].s
+ a = b + rotate_left(a + F(b,c,d) + X[k] + T[i+0x0], s);
+#undef k
+#undef s
+ }
+ // round 2
+ for (int i=0; i<16; i++)
+ {
+#define k MD5_round2[i].k
+#define s MD5_round2[i].s
+ a = b + rotate_left(a + G(b,c,d) + X[k] + T[i+0x10], s);
+#undef k
+#undef s
+ }
+ // round 3
+ for (int i=0; i<16; i++)
+ {
+#define k MD5_round3[i].k
+#define s MD5_round3[i].s
+ a = b + rotate_left(a + H(b,c,d) + X[k] + T[i+0x20], s);
+#undef k
+#undef s
+ }
+ // round 4
+ for (int i=0; i<16; i++)
+ {
+#define k MD5_round4[i].k
+#define s MD5_round4[i].s
+ a = b + rotate_left(a + I(b,c,d) + X[k] + T[i+0x30], s);
+#undef k
+#undef s
+ }
+ // adjust state based on original
+ state->val[0] += saved.val[0];
+ state->val[1] += saved.val[1];
+ state->val[2] += saved.val[2];
+ state->val[3] += saved.val[3];
+#undef a
+#undef b
+#undef c
+#undef d
}
-static void Round3 (unsigned int *a, unsigned int b, unsigned int c,
- unsigned int d, unsigned int k, unsigned int s,
- unsigned int i)
+void MD5_to_bin(MD5_state state, uint8_t out[0x10])
{
- *a = Round (*a, b, H (b, c, d), k, s, i);
+ for (int i=0; i<0x10; i++)
+ out[i] = state.val[i/4] >> 8*(i%4);
}
-static void Round4 (unsigned int *a, unsigned int b, unsigned int c,
- unsigned int d, unsigned int k, unsigned int s,
- unsigned int i)
+static const char hex[0x10] = "0123456789abcdef";
+
+void MD5_to_str(MD5_state state, char out[0x21])
{
- *a = Round (*a, b, I (b, c, d), k, s, i);
+ uint8_t bin[16];
+ MD5_to_bin(state, bin);
+ for (int i=0; i<0x10; i++)
+ out[2*i] = hex[bin[i] >> 4],
+ out[2*i+1] = hex[bin[i] & 0xf];
+ out[0x20] = '\0';
}
-static void MD5_Round_Calculate (const unsigned char *block,
- unsigned int *A2, unsigned int *B2,
- unsigned int *C2, unsigned int *D2)
+MD5_state MD5_from_string(const char* msg, const size_t msglen)
{
- //create X It is since it is required.
- unsigned int X[16]; //512bit 64byte
- int j, k;
-
- //Save A as AA, B as BB, C as CC, and and D as DD (saving of A, B, C, and D)
- unsigned int A = *A2, B = *B2, C = *C2, D = *D2;
- unsigned int AA = A, BB = B, CC = C, DD = D;
-
- //It is a large region variable reluctantly because of calculation of a round. . . for Round1...4
- pX = X;
-
- //Copy block(padding_message) i into X
- for (j = 0, k = 0; j < 64; j += 4, k++)
- X[k] = ((unsigned int) block[j]) // 8byte*4 -> 32byte conversion
- | (((unsigned int) block[j + 1]) << 8) // A function called Decode as used in the field of RFC
- | (((unsigned int) block[j + 2]) << 16)
- | (((unsigned int) block[j + 3]) << 24);
-
- //Round 1
- Round1 (&A, B, C, D, 0, 7, 0);
- Round1 (&D, A, B, C, 1, 12, 1);
- Round1 (&C, D, A, B, 2, 17, 2);
- Round1 (&B, C, D, A, 3, 22, 3);
- Round1 (&A, B, C, D, 4, 7, 4);
- Round1 (&D, A, B, C, 5, 12, 5);
- Round1 (&C, D, A, B, 6, 17, 6);
- Round1 (&B, C, D, A, 7, 22, 7);
- Round1 (&A, B, C, D, 8, 7, 8);
- Round1 (&D, A, B, C, 9, 12, 9);
- Round1 (&C, D, A, B, 10, 17, 10);
- Round1 (&B, C, D, A, 11, 22, 11);
- Round1 (&A, B, C, D, 12, 7, 12);
- Round1 (&D, A, B, C, 13, 12, 13);
- Round1 (&C, D, A, B, 14, 17, 14);
- Round1 (&B, C, D, A, 15, 22, 15);
-
- //Round 2
- Round2 (&A, B, C, D, 1, 5, 16);
- Round2 (&D, A, B, C, 6, 9, 17);
- Round2 (&C, D, A, B, 11, 14, 18);
- Round2 (&B, C, D, A, 0, 20, 19);
- Round2 (&A, B, C, D, 5, 5, 20);
- Round2 (&D, A, B, C, 10, 9, 21);
- Round2 (&C, D, A, B, 15, 14, 22);
- Round2 (&B, C, D, A, 4, 20, 23);
- Round2 (&A, B, C, D, 9, 5, 24);
- Round2 (&D, A, B, C, 14, 9, 25);
- Round2 (&C, D, A, B, 3, 14, 26);
- Round2 (&B, C, D, A, 8, 20, 27);
- Round2 (&A, B, C, D, 13, 5, 28);
- Round2 (&D, A, B, C, 2, 9, 29);
- Round2 (&C, D, A, B, 7, 14, 30);
- Round2 (&B, C, D, A, 12, 20, 31);
-
- //Round 3
- Round3 (&A, B, C, D, 5, 4, 32);
- Round3 (&D, A, B, C, 8, 11, 33);
- Round3 (&C, D, A, B, 11, 16, 34);
- Round3 (&B, C, D, A, 14, 23, 35);
- Round3 (&A, B, C, D, 1, 4, 36);
- Round3 (&D, A, B, C, 4, 11, 37);
- Round3 (&C, D, A, B, 7, 16, 38);
- Round3 (&B, C, D, A, 10, 23, 39);
- Round3 (&A, B, C, D, 13, 4, 40);
- Round3 (&D, A, B, C, 0, 11, 41);
- Round3 (&C, D, A, B, 3, 16, 42);
- Round3 (&B, C, D, A, 6, 23, 43);
- Round3 (&A, B, C, D, 9, 4, 44);
- Round3 (&D, A, B, C, 12, 11, 45);
- Round3 (&C, D, A, B, 15, 16, 46);
- Round3 (&B, C, D, A, 2, 23, 47);
-
- //Round 4
- Round4 (&A, B, C, D, 0, 6, 48);
- Round4 (&D, A, B, C, 7, 10, 49);
- Round4 (&C, D, A, B, 14, 15, 50);
- Round4 (&B, C, D, A, 5, 21, 51);
- Round4 (&A, B, C, D, 12, 6, 52);
- Round4 (&D, A, B, C, 3, 10, 53);
- Round4 (&C, D, A, B, 10, 15, 54);
- Round4 (&B, C, D, A, 1, 21, 55);
- Round4 (&A, B, C, D, 8, 6, 56);
- Round4 (&D, A, B, C, 15, 10, 57);
- Round4 (&C, D, A, B, 6, 15, 58);
- Round4 (&B, C, D, A, 13, 21, 59);
- Round4 (&A, B, C, D, 4, 6, 60);
- Round4 (&D, A, B, C, 11, 10, 61);
- Round4 (&C, D, A, B, 2, 15, 62);
- Round4 (&B, C, D, A, 9, 21, 63);
-
- // Then perform the following additions. (let's add)
- *A2 = A + AA;
- *B2 = B + BB;
- *C2 = C + CC;
- *D2 = D + DD;
-
- //The clearance of confidential information
- memset (pX, 0, sizeof (X));
+ MD5_state state;
+ MD5_init(&state);
+ MD5_block block;
+ size_t rem = msglen;
+ while (rem >= 64)
+ {
+ for (int i=0; i<0x10; i++)
+ X[i] = msg[4*i+0] | msg[4*i+1]<<8 | msg[4*i+2]<<16 | msg[4*i+3]<<24;
+ MD5_do_block(&state, block);
+ msg += 64;
+ rem -= 64;
+ }
+ // now pad 1-512 bits + the 64-bit length - may be two blocks
+ uint8_t buf[0x40] = {};
+ memcpy (buf, msg, rem);
+ buf[rem] = 0x80; // a single one bit
+ if (64 - rem > 8)
+ {
+ for (int i=0; i<8; i++)
+ buf[0x38+i] = (msglen*8) >> (i*8);
+ }
+ for (int i=0; i<0x10; i++)
+ X[i] = buf[4*i+0] | buf[4*i+1]<<8 | buf[4*i+2]<<16 | buf[4*i+3]<<24;
+ MD5_do_block(&state, block);
+ if (64 - rem <= 8)
+ {
+ memset(buf,'\0', 0x38);
+ for (int i=0; i<8; i++)
+ buf[0x38+i] = (msglen*8) >> (i*8);
+ for (int i=0; i<0x10; i++)
+ X[i] = buf[4*i+0] | buf[4*i+1]<<8 | buf[4*i+2]<<16 | buf[4*i+3]<<24;
+ MD5_do_block(&state, block);
+ }
+ return state;
}
-//-------------------------------------------------------------------
-// The function for the exteriors
-
-/** output is the coded binary in the character sequence which wants to code string. */
-void MD5_String2binary (const char *string, char *output)
+// This could be reimplemented without the strlen()
+MD5_state MD5_from_cstring(const char* msg)
{
-//var
- /*8bit */
- unsigned char padding_message[64]; //Extended message 512bit 64byte
- unsigned char *pstring; //The position of string in the present scanning notes is held.
-
-// unsigned char digest[16];
- /*32bit */
- unsigned int string_byte_len, //The byte chief of string is held.
- string_bit_len, //The bit length of string is held.
- copy_len, //The number of bytes which is used by 1-3 and which remained
- msg_digest[4]; //Message digest 128bit 4byte
- unsigned int *A = &msg_digest[0], //The message digest in accordance with RFC (reference)
- *B = &msg_digest[1], *C = &msg_digest[2], *D = &msg_digest[3];
- int i;
+ return MD5_from_string(msg, strlen(msg));
+}
-//prog
- //Step 3.Initialize MD Buffer (although it is the initialization; step 3 of A, B, C, and D -- unavoidable -- a head)
- *A = 0x67452301;
- *B = 0xefcdab89;
- *C = 0x98badcfe;
- *D = 0x10325476;
+MD5_state MD5_from_FILE(FILE* in) {
+ uint64_t total_len = 0;
- //Step 1.Append Padding Bits (extension of a mark bit)
- //1-1
- string_byte_len = strlen (string); //The byte chief of a character sequence is acquired.
- pstring = (unsigned char *) string; //The position of the present character sequence is set.
+ uint8_t buf[0x40];
+ uint8_t block_len = 0;
- //1-2 Repeat calculation until length becomes less than 64 bytes.
- for (i = string_byte_len; 64 <= i; i -= 64, pstring += 64)
- MD5_Round_Calculate (pstring, A, B, C, D);
+ MD5_state state;
+ MD5_init(&state);
- //1-3
- copy_len = string_byte_len % 64; //The number of bytes which remained is computed.
- strncpy ((char *) padding_message, (char *) pstring, copy_len); //A message is copied to an extended bit sequence.
- memset (padding_message + copy_len, 0, 64 - copy_len); //It buries by 0 until it becomes extended bit length.
- padding_message[copy_len] |= 0x80; //The next of a message is 1.
+ MD5_block block;
- //1-4
- //If 56 bytes or more (less than 64 bytes) of remainder becomes, it will calculate by extending to 64 bytes.
- if (56 <= copy_len)
+ while (true)
{
- MD5_Round_Calculate (padding_message, A, B, C, D);
- memset (padding_message, 0, 56); //56 bytes is newly fill uped with 0.
+ size_t rv = fread(buf + block_len, 1, 0x40 - block_len, in);
+ if (!rv)
+ break;
+ total_len += 8*rv; // in bits
+ block_len += rv;
+ if (block_len != 0x40)
+ continue;
+ for (int i=0; i<0x10; i++)
+ X[i] = buf[4*i+0] | buf[4*i+1]<<8 | buf[4*i+2]<<16 | buf[4*i+3]<<24;
+ MD5_do_block(&state, block);
+ block_len = 0;
}
-
- //Step 2.Append Length (the information on length is added)
- string_bit_len = string_byte_len * 8; //From the byte chief to bit length (32 bytes of low rank)
- memcpy (&padding_message[56], &string_bit_len, 4); //32 bytes of low rank is set.
-
- //When bit length cannot be expressed in 32 bytes of low rank, it is a beam raising to a higher rank.
- if (UINT_MAX / 8 < string_byte_len)
+ // no more input, just pad and append the length
+ buf[block_len] = 0x80;
+ memset(buf + block_len + 1, '\0', 0x40 - block_len - 1);
+ if (block_len < 0x38)
{
- unsigned int high = (string_byte_len - UINT_MAX / 8) * 8;
- memcpy (&padding_message[60], &high, 4);
+ for (int i=0; i<8; i++)
+ buf[0x38+i] = total_len >> i*8;
}
- else
- memset (&padding_message[60], 0, 4); //In this case, it is good for a higher rank at 0.
-
- //Step 4.Process Message in 16-Word Blocks (calculation of MD5)
- MD5_Round_Calculate (padding_message, A, B, C, D);
-
- //Step 5.Output (output)
- memcpy (output, msg_digest, 16);
-// memcpy (digest, msg_digest, and 16); //8 byte*4 < - 32byte conversion A function called Encode as used in the field of RFC
-/* sprintf(output,
- "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
- digest[ 0], digest[ 1], digest[ 2], digest[ 3],
- digest[ 4], digest[ 5], digest[ 6], digest[ 7],
- digest[ 8], digest[ 9], digest[10], digest[11],
- digest[12], digest[13], digest[14], digest[15]);*/
+ for (int i=0; i<0x10; i++)
+ X[i] = buf[4*i+0] | buf[4*i+1]<<8 | buf[4*i+2]<<16 | buf[4*i+3]<<24;
+ MD5_do_block(&state, block);
+ if (0x38 <= block_len)
+ {
+ memset(buf, '\0', 0x38);
+ for (int i=0; i<8; i++)
+ buf[0x38+i] = total_len >> i*8;
+ for (int i=0; i<0x10; i++)
+ X[i] = buf[4*i+0] | buf[4*i+1]<<8 | buf[4*i+2]<<16 | buf[4*i+3]<<24;
+ MD5_do_block(&state, block);
+ }
+ return state;
}
-/** output is the coded character sequence in the character sequence which wants to code string. */
-void MD5_String (const char *string, char *output)
-{
- unsigned char digest[16];
-
- MD5_String2binary (string, digest);
- sprintf (output,
- "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
- digest[0], digest[1], digest[2], digest[3],
- digest[4], digest[5], digest[6], digest[7],
- digest[8], digest[9], digest[10], digest[11],
- digest[12], digest[13], digest[14], digest[15]);
-}
// Hash a password with a salt.
-char *MD5_saltcrypt(const char *key, const char *salt)
+// Whoever wrote this FAILS programming
+const char *MD5_saltcrypt(const char *key, const char *salt)
{
- char buf[66], *sbuf = buf+32;
- static char obuf[33];
+ char buf[65];
- // hash the key then the salt
- // buf ends up as a 64char null terminated string
- MD5_String(key, buf);
- MD5_String(salt, sbuf);
+ // hash the key then the salt
+ // buf ends up as a 64-char NUL-terminated string
+ MD5_to_str(MD5_from_cstring(key), buf);
+ MD5_to_str(MD5_from_cstring(salt), buf+32);
- // Hash the buffer back into sbuf
- MD5_String(buf, sbuf);
+ // Hash the buffer back into sbuf - this is stupid
+ // (luckily, putting the result into itself is safe)
+ MD5_to_str(MD5_from_cstring(buf), buf+32);
- snprintf(obuf, 32, "!%s$%s", salt, sbuf);
- return(obuf);
+ static char obuf[33];
+ // This truncates the string, but we have to keep it like that for compatibility
+ snprintf(obuf, 32, "!%s$%s", salt, buf+32);
+ return obuf;
}
-char *make_salt() {
- static char salt[6];
- int i;
- for (i=0; i<5; i++)
- salt[i] = (char)((mt_rand() % 78) + 48);
- salt[5] = '\0';
- return(salt);
+const char *make_salt() {
+ static char salt[6];
+ for (int i=0; i<5; i++)
+ salt[i] = MPRAND(48, 78);
+ return salt;
}
-int pass_ok(const char *password, const char *crypted) {
- char buf[40], *salt=buf+1;
+bool pass_ok(const char *password, const char *crypted) {
+ char buf[40];
+ strncpy(buf, crypted, 40);
+ char *salt = buf + 1;
+ *strchr(salt, '$') = '\0';
- strncpy(buf, crypted, 40);
- *strchr(buf, '$') = '\0';
-
- if (!strcmp(crypted, MD5_saltcrypt(password, salt)))
- return(1);
-
- return(0);
+ return !strcmp(crypted, MD5_saltcrypt(password, salt));
}
// [M|h]ashes up an IP address and a secret key
@@ -337,13 +312,13 @@ int pass_ok(const char *password, const char *crypted) {
in_addr_t MD5_ip(char *secret, in_addr_t ip)
{
char ipbuf[32];
- char obuf[16];
+ uint8_t obuf[16];
union {
struct bytes {
- unsigned char b1;
- unsigned char b2;
- unsigned char b3;
- unsigned char b4;
+ uint8_t b1;
+ uint8_t b2;
+ uint8_t b3;
+ uint8_t b4;
} bytes;
in_addr_t ip;
} conv;
@@ -351,7 +326,8 @@ in_addr_t MD5_ip(char *secret, in_addr_t ip)
// MD5sum a secret + the IP address
memset(&ipbuf, 0, sizeof(ipbuf));
snprintf(ipbuf, sizeof(ipbuf), "%lu%s", (unsigned long)ip, secret);
- MD5_String2binary(ipbuf, obuf);
+ /// TODO stop it from being a cstring
+ MD5_to_bin(MD5_from_cstring(ipbuf), obuf);
// Fold the md5sum to 32 bits, pack the bytes to an in_addr_t
conv.bytes.b1 = obuf[0] ^ obuf[1] ^ obuf[8] ^ obuf[9];
@@ -361,4 +337,3 @@ in_addr_t MD5_ip(char *secret, in_addr_t ip)
return conv.ip;
}
-
diff --git a/src/common/md5calc.h b/src/common/md5calc.h
index 5994376..cf1425f 100644
--- a/src/common/md5calc.h
+++ b/src/common/md5calc.h
@@ -1,13 +1,64 @@
-// $Id: md5calc.h,v 1.1.1.1 2004/09/10 17:26:54 MagicalTux Exp $
-#ifndef _MD5CALC_H_
-#define _MD5CALC_H_
+#ifndef MD5CALC_H
+#define MD5CALC_H
+
+#include "sanity.h"
+
#include <netinet/in.h>
-void MD5_String (const char *string, char *output);
-void MD5_String2binary (const char *string, char *output);
-char *MD5_saltcrypt(const char *key, const char *salt);
-char *make_salt();
-int pass_ok(const char *password, const char *crypted);
+#include <stdint.h> // uint32_t, uint8_t
+#include <stddef.h> // size_t
+#include <stdio.h> // FILE*
+
+/// The digest state - becomes the output
+typedef struct
+{
+ // classically named {A,B,C,D}
+ // but use an so we can index
+ uint32_t val[4];
+} MD5_state;
+typedef struct
+{
+ uint32_t data[16];
+} MD5_block;
+
+// Implementation
+void MD5_init(MD5_state* state);
+void MD5_do_block(MD5_state* state, MD5_block block);
+
+// Output formatting
+void MD5_to_bin(MD5_state state, uint8_t out[0x10]);
+void MD5_to_str(MD5_state state, char out[0x21]);
+
+// Convenience
+MD5_state MD5_from_string(const char* msg, const size_t msglen);
+MD5_state MD5_from_cstring(const char* msg);
+MD5_state MD5_from_FILE(FILE* in);
+
+
+/// Output in ASCII - with lowercase hex digits, null-terminated
+// these may overlap safely
+static void MD5_String (const char *string, char output[33]) __attribute__((deprecated));
+static inline void MD5_String (const char *string, char output[33]) {
+ MD5_to_str(MD5_from_cstring(string), output);
+}
+/// Output in binary
+static void MD5_String2binary (const char *string, uint8_t output[16]) __attribute__((deprecated));
+static inline void MD5_String2binary (const char *string, uint8_t output[16]) {
+ MD5_to_bin(MD5_from_cstring(string), output);
+}
+
+// statically-allocated output
+// whoever wrote this fails basic understanding of
+const char *MD5_saltcrypt(const char *key, const char *salt);
+
+/// return some random characters (statically allocated)
+// Currently, returns a 5-char string
+const char *make_salt();
+
+/// check plaintext password against saved saltcrypt
+bool pass_ok(const char *password, const char *crypted);
+
+/// This returns an in_addr_t because it is configurable whether it gets called at all
in_addr_t MD5_ip(char *secret, in_addr_t ip);
#endif
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 279bf4a..906f5c1 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -1,69 +1,67 @@
-// $Id: mmo.h,v 1.3 2004/09/25 20:12:25 PoW Exp $
-// Original : mmo.h 2003/03/14 12:07:02 Rev.1.7
+/// Global structures and defines
+#ifndef MMO_H
+#define MMO_H
-#ifndef _MMO_H_
-#define _MMO_H_
+# include <time.h>
+# include "utils.h" // LCCWIN32
-#include <time.h>
-#include "utils.h" // LCCWIN32
+# ifdef CYGWIN
+# define RETCODE "\r\n"
+# else
+# define RETCODE "\n"
+# endif
-#ifdef CYGWIN
-#define RETCODE "\r\n" // (CR/LF：Windows系)
-#else
-#define RETCODE "\n" // (LF：Unix系）
-#endif
-
-#define FIFOSIZE_SERVERLINK 256*1024
+# define FIFOSIZE_SERVERLINK 256*1024
// set to 0 to not check IP of player between each server.
// set to another value if you want to check (1)
-#define CMP_AUTHFIFO_IP 1
-
-#define CMP_AUTHFIFO_LOGIN2 1
-
-#define MAX_MAP_PER_SERVER 512
-#define MAX_INVENTORY 100
-#define MAX_AMOUNT 30000
-#define MAX_ZENY 1000000000 // 1G zeny
-#define MAX_CART 100
-#define MAX_SKILL 450
-#define GLOBAL_REG_NUM 96
-#define ACCOUNT_REG_NUM 16
-#define ACCOUNT_REG2_NUM 16
-#define DEFAULT_WALK_SPEED 150
-#define MIN_WALK_SPEED 0
-#define MAX_WALK_SPEED 1000
-#define MAX_STORAGE 300
-#define MAX_GUILD_STORAGE 1000
-#define MAX_PARTY 12
-#define MAX_GUILD 120 // increased max guild members to accomodate for +2 increase for extension levels [Valaris] (removed) [PoW]
-#define MAX_GUILDPOSITION 20 // increased max guild positions to accomodate for all members [Valaris] (removed) [PoW]
-#define MAX_GUILDEXPLUSION 32
-#define MAX_GUILDALLIANCE 16
-#define MAX_GUILDSKILL 8
-#define MAX_GUILDCASTLE 24 // increased to include novice castles [Valaris]
-#define MAX_GUILDLEVEL 50
-
-#define MIN_HAIR_STYLE battle_config.min_hair_style
-#define MAX_HAIR_STYLE battle_config.max_hair_style
-#define MIN_HAIR_COLOR battle_config.min_hair_color
-#define MAX_HAIR_COLOR battle_config.max_hair_color
-#define MIN_CLOTH_COLOR battle_config.min_cloth_color
-#define MAX_CLOTH_COLOR battle_config.max_cloth_color
+# define CMP_AUTHFIFO_IP 1
+
+# define CMP_AUTHFIFO_LOGIN2 1
+
+# define MAX_MAP_PER_SERVER 512
+# define MAX_INVENTORY 100
+# define MAX_AMOUNT 30000
+# define MAX_ZENY 1000000000 // 1G zeny
+# define MAX_CART 100
+# define MAX_SKILL 450
+# define GLOBAL_REG_NUM 96
+# define ACCOUNT_REG_NUM 16
+# define ACCOUNT_REG2_NUM 16
+# define DEFAULT_WALK_SPEED 150
+# define MIN_WALK_SPEED 0
+# define MAX_WALK_SPEED 1000
+# define MAX_STORAGE 300
+# define MAX_GUILD_STORAGE 1000
+# define MAX_PARTY 12
+# define MAX_GUILD 120 // increased max guild members to accomodate for +2 increase for extension levels [Valaris] (removed) [PoW]
+# define MAX_GUILDPOSITION 20 // increased max guild positions to accomodate for all members [Valaris] (removed) [PoW]
+# define MAX_GUILDEXPLUSION 32
+# define MAX_GUILDALLIANCE 16
+# define MAX_GUILDSKILL 8
+# define MAX_GUILDCASTLE 24 // increased to include novice castles [Valaris]
+# define MAX_GUILDLEVEL 50
+
+# define MIN_HAIR_STYLE battle_config.min_hair_style
+# define MAX_HAIR_STYLE battle_config.max_hair_style
+# define MIN_HAIR_COLOR battle_config.min_hair_color
+# define MAX_HAIR_COLOR battle_config.max_hair_color
+# define MIN_CLOTH_COLOR battle_config.min_cloth_color
+# define MAX_CLOTH_COLOR battle_config.max_cloth_color
// for produce
-#define MIN_ATTRIBUTE 0
-#define MAX_ATTRIBUTE 4
-#define ATTRIBUTE_NORMAL 0
-#define MIN_STAR 0
-#define MAX_STAR 3
+# define MIN_ATTRIBUTE 0
+# define MAX_ATTRIBUTE 4
+# define ATTRIBUTE_NORMAL 0
+# define MIN_STAR 0
+# define MAX_STAR 3
-#define MIN_PORTAL_MEMO 0
-#define MAX_PORTAL_MEMO 2
+# define MIN_PORTAL_MEMO 0
+# define MAX_PORTAL_MEMO 2
-#define MAX_STATUS_TYPE 5
+# define MAX_STATUS_TYPE 5
-#define CHAR_CONF_NAME "conf/char_athena.conf"
+# define CHAR_CONF_NAME "conf/char_athena.conf"
struct item
{
@@ -288,19 +286,4 @@ enum
};
-#ifndef LCCWIN32
-#ifndef strcmpi
-#define strcmpi strcasecmp
-#endif
-#ifndef stricmp
-#define stricmp strcasecmp
-#endif
-#ifndef strncmpi
-#define strncmpi strncasecmp
-#endif
-#ifndef strnicmp
-#define strnicmp strncasecmp
-#endif
-#endif
-
-#endif // _MMO_H_
+#endif // MMO_H
diff --git a/src/common/mt_rand.c b/src/common/mt_rand.c
index 627d9dd..e4e8d12 100644
--- a/src/common/mt_rand.c
+++ b/src/common/mt_rand.c
@@ -48,71 +48,69 @@
#include <time.h>
#include "mt_rand.h"
-#define N (624) /* length of state vector */
-#define M (397) /* a period parameter */
-#define K (0x9908B0DFU) /* a magic constant */
-#define hiBit(u) ((u) & 0x80000000U) /* mask all but highest bit of u */
-#define loBit(u) ((u) & 0x00000001U) /* mask all but lowest bit of u */
-#define loBits(u) ((u) & 0x7FFFFFFFU) /* mask the highest bit of u */
-#define mixBits(u, v) (hiBit(u)|loBits(v)) /* move hi bit of u to hi bit of v */
+#define N 624 // length of state vector
+#define M 397 // a period parameter
+#define K 0x9908B0DFU // a magic constant
-static unsigned long state[N + 1]; /* state vector + 1 extra to not violate ANSI C */
-static unsigned long *next; /* next random value is computed from here */
-static int left = -1; /* can *next++ this many times before reloading */
+#define hiBit(u) ((u) & 0x80000000U) // mask all but highest bit of u
+#define loBit(u) ((u) & 0x00000001U) // mask all but lowest bit of u
+#define loBits(u) ((u) & 0x7FFFFFFFU) // mask the highest bit of u
+#define mixBits(u, v) (hiBit(u)|loBits(v)) // move hi bit of u to hi bit of v
-void mt_seed (unsigned long seed)
+static uint32_t state[N+1]; // state vector the +1 is needed due to the coding
+static uint32_t *next; // next random value is computed from here
+static int left = -1; // can *next++ this many times before reloading
+
+void mt_seed (uint32_t seed)
{
- register unsigned long x = (seed | 1U) & 0xFFFFFFFFU, *s = state;
- register int j;
+ uint32_t x = seed | 1U;
+ uint32_t *s = state;
+ left = 0;
- for (left = 0, *s++ = x, j = N; --j; *s++ = (x *= 69069U) & 0xFFFFFFFFU);
+ for (int j = N; *s++ = x, --j; x *= 69069U);
}
-unsigned long mt_reload (void)
+void mt_reload (void)
{
- register unsigned long *p0 = state, *p2 = state + 2, *pM =
- state + M, s0, s1;
- register int j;
-
+ // if mt_seed has never been called
if (left < -1)
mt_seed (time (NULL));
- left = N - 1, next = state + 1;
+ // conceptually, these are indices into the state that wrap
+ uint32_t *p0 = state;
+ uint32_t *p2 = state + 2;
+ uint32_t *pM = state + M;
+
+ uint32_t s0 = state[0];
+ uint32_t s1 = state[1];
- for (s0 = state[0], s1 = state[1], j = N - M + 1; --j;
- s0 = s1, s1 = *p2++)
+ // regenerate the lower N-M elements of the state
+ for (int j = N-M+1; --j != 0; s0 = s1, s1 = *p2++)
*p0++ = *pM++ ^ (mixBits (s0, s1) >> 1) ^ (loBit (s1) ? K : 0U);
- for (pM = state, j = M; --j; s0 = s1, s1 = *p2++)
+ pM = state;
+ // regenerate the next M-1 elements of the state
+ // note that s1 is set to state[N] at the end, but discarded
+ for (int j = M; --j != 0; s0 = s1, s1 = *p2++)
*p0++ = *pM++ ^ (mixBits (s0, s1) >> 1) ^ (loBit (s1) ? K : 0U);
- s1 = state[0], *p0 =
- *pM ^ (mixBits (s0, s1) >> 1) ^ (loBit (s1) ? K : 0U);
- s1 ^= (s1 >> 11);
- s1 ^= (s1 << 7) & 0x9D2C5680U;
- s1 ^= (s1 << 15) & 0xEFC60000U;
- return (s1 ^ (s1 >> 18));
+ // regenerate the last 1 element of the state
+ s1 = state[0];
+ *p0 = *pM ^ (mixBits (s0, s1) >> 1) ^ (loBit (s1) ? K : 0U);
+
+ // ready for the normal mt_random algorithm
+ left = N;
+ next = state;
}
-unsigned long mt_random (void)
+uint32_t mt_random (void)
{
- unsigned long y;
-
if (--left < 0)
- return (mt_reload ());
+ mt_reload ();
- y = *next++;
+ uint32_t y = *next++;
y ^= (y >> 11);
y ^= (y << 7) & 0x9D2C5680U;
y ^= (y << 15) & 0xEFC60000U;
- return (y ^ (y >> 18));
-}
-
-int mt_rand (void)
-{
- unsigned long r = mt_random ();
- while (r >> 16)
- r = (r & 0xFFFF) + (r >> 16);
-
- return (r);
+ return y ^ (y >> 18);
}
diff --git a/src/common/mt_rand.h b/src/common/mt_rand.h
index d798fee..95f30e5 100644
--- a/src/common/mt_rand.h
+++ b/src/common/mt_rand.h
@@ -1,9 +1,21 @@
-#ifndef __mt_rand_h
-#define __mt_rand_h
+#ifndef MT_RAND_H
+#define MT_RAND_H
-void mt_seed (unsigned long seed);
-unsigned long mt_reload (void);
-unsigned long mt_random (void);
-int mt_rand (void);
+# include "sanity.h"
-#endif /* __mt_rand_h */
+/// Initialize the generator (called automatically with time() if you don't)
+void mt_seed (uint32_t seed);
+/// Get a random number
+uint32_t mt_random (void);
+
+/**
+ * ModuloRand and ModuloPlusRand
+ * These macros are used to replace the vast number of calls to rand()%mod
+ * TODO eliminate the rest of the calls to rand()
+ * MRAND(10) returns 0..9
+ * MPRAND(5,10) returns 5..14
+ */
+# define MRAND(mod) (mt_random() % (mod))
+# define MPRAND(add, mod) ((add) + MRAND(mod))
+
+#endif // MT_RAND_H
diff --git a/src/common/nullpo.c b/src/common/nullpo.c
index 3205293..de10517 100644
--- a/src/common/nullpo.c
+++ b/src/common/nullpo.c
@@ -2,21 +2,17 @@
#include <stdarg.h>
#include <string.h>
#include "nullpo.h"
-// #include "logs.h" // 布石してみる
static void nullpo_info_core (const char *file, int line, const char *func,
const char *fmt, va_list ap);
-/*======================================
- * Nullチェック 及び 情報出力
- *--------------------------------------
- */
-int nullpo_chk_f (const char *file, int line, const char *func,
- const void *target, const char *fmt, ...)
+/// Null check and print format
+bool nullpo_chk_f (const char *file, int line, const char *func,
+ const void *target, const char *fmt, ...)
{
va_list ap;
- if (target != NULL)
+ if (target)
return 0;
va_start (ap, fmt);
@@ -24,21 +20,17 @@ int nullpo_chk_f (const char *file, int line, const char *func,
va_end (ap);
return 1;
}
-
-int nullpo_chk (const char *file, int line, const char *func,
- const void *target)
+bool nullpo_chk (const char *file, int line, const char *func,
+ const void *target)
{
- if (target != NULL)
+ if (target)
return 0;
nullpo_info_core (file, line, func, NULL, NULL);
return 1;
}
-/*======================================
- * nullpo情報出力(外部呼出し向けラッパ)
- *--------------------------------------
- */
+/// External functions
void nullpo_info_f (const char *file, int line, const char *func,
const char *fmt, ...)
{
@@ -48,39 +40,25 @@ void nullpo_info_f (const char *file, int line, const char *func,
nullpo_info_core (file, line, func, fmt, ap);
va_end (ap);
}
-
void nullpo_info (const char *file, int line, const char *func)
{
nullpo_info_core (file, line, func, NULL, NULL);
}
-/*======================================
- * nullpo情報出力(Main)
- *--------------------------------------
- */
+/// Actual output function
static void nullpo_info_core (const char *file, int line, const char *func,
const char *fmt, va_list ap)
{
- if (file == NULL)
+ if (!file)
file = "??";
+ if (!func || !*func)
+ func = "unknown";
- func = func == NULL ? "unknown" : func[0] == '\0' ? "unknown" : func;
-
- printf ("--- nullpo info --------------------------------------------\n");
- printf ("%s:%d: in func `%s'\n", file, line, func);
- if (fmt != NULL)
+ fprintf (stderr, "%s:%d: in func `%s': NULL pointer\n", file, line, func);
+ if (fmt && *fmt)
{
- if (fmt[0] != '\0')
- {
- vprintf (fmt, ap);
-
- // 最後に改行したか確認
- if (fmt[strlen (fmt) - 1] != '\n')
- printf ("\n");
- }
+ vfprintf (stderr, fmt, ap);
+ if (fmt[strlen (fmt) - 1] != '\n')
+ fputc('\n', stderr);
}
- printf ("--- end nullpo info ----------------------------------------\n");
-
- // ここらでnullpoログをファイルに書き出せたら
- // まとめて提出できるなと思っていたり。
}
diff --git a/src/common/nullpo.h b/src/common/nullpo.h
index baeacdc..9b33b4b 100644
--- a/src/common/nullpo.h
+++ b/src/common/nullpo.h
@@ -1,215 +1,61 @@
-#ifndef _NULLPO_H_
-#define _NULLPO_H_
-
-#define NULLPO_CHECK 1
- // 全体のスイッチを宣言しているヘッダがあれば
- // そこに移動していただけると
-
-#if __STDC_VERSION__ < 199901L
-# if __GNUC__ >= 2
-# define __func__ __FUNCTION__
-# else
-# define __func__ ""
-# endif
-#endif
-
-#ifdef LCCWIN32
-#define __attribute__(x) /* nothing */
-#endif
-
-#define NLP_MARK __FILE__, __LINE__, __func__
-
-/*----------------------------------------------------------------------------
- * Macros
- *----------------------------------------------------------------------------
- */
-/*======================================
- * Nullチェック 及び 情報出力後 return
- *・展開するとifとかreturn等が出るので
- * 一行単体で使ってください。
- *・nullpo_ret(x = func());
- * のような使用法も想定しています。
- *--------------------------------------
- * nullpo_ret(t)
- * 戻り値 0固定
- * [引数]
- * t チェック対象
- *--------------------------------------
- * nullpo_retv(t)
- * 戻り値 なし
- * [引数]
- * t チェック対象
- *--------------------------------------
- * nullpo_retr(ret, t)
- * 戻り値 指定
- * [引数]
- * ret return(ret);
- * t チェック対象
- *--------------------------------------
- * nullpo_ret_f(t, fmt, ...)
- * 詳細情報出力用
- * 戻り値 0
- * [引数]
- * t チェック対象
- * fmt ... vprintfに渡される
- * 備考や関係変数の書き出しなどに
- *--------------------------------------
- * nullpo_retv_f(t, fmt, ...)
- * 詳細情報出力用
- * 戻り値 なし
- * [引数]
- * t チェック対象
- * fmt ... vprintfに渡される
- * 備考や関係変数の書き出しなどに
- *--------------------------------------
- * nullpo_retr_f(ret, t, fmt, ...)
- * 詳細情報出力用
- * 戻り値 指定
- * [引数]
- * ret return(ret);
- * t チェック対象
- * fmt ... vprintfに渡される
- * 備考や関係変数の書き出しなどに
- *--------------------------------------
- */
-
-#if NULLPO_CHECK
-
-#define nullpo_ret(t) \
- if (nullpo_chk(NLP_MARK, (void *)(t))) {return(0);}
-
-#define nullpo_retv(t) \
- if (nullpo_chk(NLP_MARK, (void *)(t))) {return;}
-
-#define nullpo_retr(ret, t) \
- if (nullpo_chk(NLP_MARK, (void *)(t))) {return(ret);}
-
-// 可変引数マクロに関する条件コンパイル
-#if __STDC_VERSION__ >= 199901L
-/* C99に対応 */
-#define nullpo_ret_f(t, fmt, ...) \
- if (nullpo_chk_f(NLP_MARK, (void *)(t), (fmt), __VA_ARGS__)) {return(0);}
-
-#define nullpo_retv_f(t, fmt, ...) \
- if (nullpo_chk_f(NLP_MARK, (void *)(t), (fmt), __VA_ARGS__)) {return;}
-
-#define nullpo_retr_f(ret, t, fmt, ...) \
- if (nullpo_chk_f(NLP_MARK, (void *)(t), (fmt), __VA_ARGS__)) {return(ret);}
-
-#elif __GNUC__ >= 2
-/* GCC用 */
-#define nullpo_ret_f(t, fmt, args...) \
- if (nullpo_chk_f(NLP_MARK, (void *)(t), (fmt), ## args)) {return(0);}
-
-#define nullpo_retv_f(t, fmt, args...) \
- if (nullpo_chk_f(NLP_MARK, (void *)(t), (fmt), ## args)) {return;}
-
-#define nullpo_retr_f(ret, t, fmt, args...) \
- if (nullpo_chk_f(NLP_MARK, (void *)(t), (fmt), ## args)) {return(ret);}
-
-#else
-
-/* その他の場合・・・ orz */
-
-#endif
-
-#else /* NULLPO_CHECK */
-/* No Nullpo check */
-
-// if((t)){;}
-// 良い方法が思いつかなかったので・・・苦肉の策です。
-// 一応ワーニングは出ないはず
-
-#define nullpo_ret(t) if((t)){;}
-#define nullpo_retv(t) if((t)){;}
-#define nullpo_retr(ret, t) if((t)){;}
-
-// 可変引数マクロに関する条件コンパイル
-#if __STDC_VERSION__ >= 199901L
-/* C99に対応 */
-#define nullpo_ret_f(t, fmt, ...) if((t)){;}
-#define nullpo_retv_f(t, fmt, ...) if((t)){;}
-#define nullpo_retr_f(ret, t, fmt, ...) if((t)){;}
-
-#elif __GNUC__ >= 2
-/* GCC用 */
-#define nullpo_ret_f(t, fmt, args...) if((t)){;}
-#define nullpo_retv_f(t, fmt, args...) if((t)){;}
-#define nullpo_retr_f(ret, t, fmt, args...) if((t)){;}
-
-#else
-/* その他の場合・・・ orz */
-#endif
-
-#endif /* NULLPO_CHECK */
-
-/*----------------------------------------------------------------------------
- * Functions
- *----------------------------------------------------------------------------
- */
-/*======================================
- * nullpo_chk
- * Nullチェック 及び 情報出力
- * [引数]
- * file __FILE__
- * line __LINE__
- * func __func__ (関数名)
- * これらには NLP_MARK を使うとよい
- * target チェック対象
- * [返り値]
- * 0 OK
- * 1 NULL
- *--------------------------------------
- */
-int nullpo_chk (const char *file, int line, const char *func,
+/// return wrappers for unexpected NULL pointers
+#ifndef NULLPO_H
+#define NULLPO_H
+/// Comment this out to live dangerously
+# define NULLPO_CHECK
+
+/// All functions print to standard error (was: standard output)
+/// nullpo_ret(cond) - return 0 if given pointer is NULL
+/// nullpo_retv(cond) - just return (function returns void)
+/// nullpo_retr(rv, cond) - return given value instead
+/// the _f variants take a printf-format string and arguments
+
+# ifdef NULLPO_CHECK
+# define NLP_MARK __FILE__, __LINE__, __func__
+# define nullpo_ret(t) \
+ if (nullpo_chk(NLP_MARK, t)) \
+ return 0;
+# define nullpo_retv(t) \
+ if (nullpo_chk(NLP_MARK, t)) \
+ return;
+# define nullpo_retr(ret, t) \
+ if (nullpo_chk(NLP_MARK, t)) \
+ return ret;
+# define nullpo_ret_f(t, fmt, ...) \
+ if (nullpo_chk_f(NLP_MARK, t, fmt, ##__VA_ARGS__)) \
+ return 0;
+# define nullpo_retv_f(t, fmt, ...) \
+ if (nullpo_chk_f(NLP_MARK, t, fmt, ##__VA_ARGS__)) \
+ return;
+# define nullpo_retr_f(ret, t, fmt, ...) \
+ if (nullpo_chk_f(NLP_MARK, t, fmt, ##__VA_ARGS__)) \
+ return ret;
+# else // NULLPO_CHECK
+# define nullpo_ret(t) t;
+# define nullpo_retv(t) t;
+# define nullpo_retr(ret, t) t;
+# define nullpo_ret_f(t, fmt, ...) t;
+# define nullpo_retv_f(t, fmt, ...) t;
+# define nullpo_retr_f(ret, t, fmt, ...) t;
+# endif // NULLPO_CHECK
+
+# include "sanity.h"
+
+/// Used by macros in this header
+bool nullpo_chk (const char *file, int line, const char *func,
const void *target);
-/*======================================
- * nullpo_chk_f
- * Nullチェック 及び 詳細な情報出力
- * [引数]
- * file __FILE__
- * line __LINE__
- * func __func__ (関数名)
- * これらには NLP_MARK を使うとよい
- * target チェック対象
- * fmt ... vprintfに渡される
- * 備考や関係変数の書き出しなどに
- * [返り値]
- * 0 OK
- * 1 NULL
- *--------------------------------------
- */
-int nullpo_chk_f (const char *file, int line, const char *func,
+/// Used by macros in this header
+bool nullpo_chk_f (const char *file, int line, const char *func,
const void *target, const char *fmt, ...)
__attribute__ ((format (printf, 5, 6)));
-/*======================================
- * nullpo_info
- * nullpo情報出力
- * [引数]
- * file __FILE__
- * line __LINE__
- * func __func__ (関数名)
- * これらには NLP_MARK を使うとよい
- *--------------------------------------
- */
+/// Used only by map/battle.c
void nullpo_info (const char *file, int line, const char *func);
-/*======================================
- * nullpo_info_f
- * nullpo詳細情報出力
- * [引数]
- * file __FILE__
- * line __LINE__
- * func __func__ (関数名)
- * これらには NLP_MARK を使うとよい
- * fmt ... vprintfに渡される
- * 備考や関係変数の書き出しなどに
- *--------------------------------------
- */
+/// Not used
void nullpo_info_f (const char *file, int line, const char *func,
const char *fmt, ...)
__attribute__ ((format (printf, 4, 5)));
-#endif
+#endif // NULLPO_H
diff --git a/src/common/sanity.h b/src/common/sanity.h
new file mode 100644
index 0000000..168671f
--- /dev/null
+++ b/src/common/sanity.h
@@ -0,0 +1,36 @@
+/// return wrappers for unexpected NULL pointers
+#ifndef SANITY_H
+#define SANITY_H
+# if __STDC_VERSION__ < 199901L
+# error "Please compile in C99 mode"
+# endif
+# if __GNUC__ < 3
+// I don't specifically know what version this requires,
+// but GCC 3 was the beginning of modern GCC
+# error "Please upgrade your compiler to at least GCC 3"
+# endif
+# ifndef __i386__
+// Known platform dependencies:
+// endianness for the [RW]FIFO.* macros
+// possibly, some signal-handling
+# error "Unsupported platform"
+# endif
+# ifdef __x86_64__
+// I'm working on it - I know there are some pointer-size assumptions.
+# error "Sorry, this code is believed not to be 64-bit safe"
+# error "please compile with -m32"
+# endif
+
+/// A name for unused function arguments - can be repeated
+# define UNUSED UNUSED_IMPL(__COUNTER__)
+// Don't you just love the hoops the preprocessor makes you go through?
+# define UNUSED_IMPL(arg) UNUSED_IMPL2(arg)
+# define UNUSED_IMPL2(suffix) unused_ ## suffix __attribute__((unused))
+/// Convert conditions to use the bool type
+# include <stdbool.h>
+/// Convert type assumptions to use the standard types here
+# include <stdint.h>
+/// size_t, NULL
+# include <stddef.h>
+
+#endif // SANITY_H
diff --git a/src/common/socket.c b/src/common/socket.c
index dbf19c1..7c86b1a 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -6,17 +6,11 @@
#include <sys/types.h>
#include <errno.h>
-#ifdef LCCWIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <winsock2.h>
-#else
#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <sys/time.h>
#include <unistd.h>
-#endif
#include <fcntl.h>
#include <string.h>
@@ -25,191 +19,115 @@
#include "socket.h"
#include "utils.h"
-#ifdef MEMWATCH
-#include "memwatch.h"
-#endif
-
fd_set readfds;
int fd_max;
int currentuse;
-int rfifo_size = 65536;
-int wfifo_size = 65536;
+const uint32_t rfifo_size = 65536;
+const uint32_t wfifo_size = 65536;
struct socket_data *session[FD_SETSIZE];
-static int null_parse (int fd);
-static int (*default_func_parse) (int) = null_parse;
+/// Discard all input
+static void null_parse (int fd);
+/// Default parser for new connections
+static void (*default_func_parse) (int) = null_parse;
-/*======================================
- * CORE : Set function
- *--------------------------------------
- */
-void set_defaultparse (int (*defaultparse) (int))
+void set_defaultparse (void (*defaultparse) (int))
{
default_func_parse = defaultparse;
}
-/*======================================
- * CORE : Socket Sub Function
- *--------------------------------------
- */
-
-static int recv_to_fifo (int fd)
+/// Read from socket to the queue
+static void recv_to_fifo (int fd)
{
- int len;
-
- //printf("recv_to_fifo : %d %d\n",fd,session[fd]->eof);
if (session[fd]->eof)
- return -1;
-
-#ifdef LCCWIN32
- len =
- recv (fd, session[fd]->rdata + session[fd]->rdata_size,
- RFIFOSPACE (fd), 0);
-#else
- len =
- read (fd, session[fd]->rdata + session[fd]->rdata_size,
- RFIFOSPACE (fd));
-#endif
+ return;
-// printf (":::RECEIVE:::\n");
-// dump(session[fd]->rdata, len); printf ("\n");
+ ssize_t len = read (fd, session[fd]->rdata + session[fd]->rdata_size,
+ RFIFOSPACE (fd));
- //{ int i; printf("recv %d : ",fd); for(i=0;i<len;i++){ printf("%02x ",RFIFOB(fd,session[fd]->rdata_size+i)); } printf("\n");}
if (len > 0)
{
session[fd]->rdata_size += len;
- if (!session[fd]->connected)
- session[fd]->connected = 1;
+ session[fd]->connected = 1;
}
- else if (len <= 0)
+ else
{
- // value of connection is not necessary the same
-// if (fd == 4) // Removed [Yor]
-// printf("Char-Server Has Disconnected.\n");
-// else if (fd == 5) // Removed [Yor]
-// printf("Attempt To Log In Successful.\n");
-// else if (fd == 7) // Removed [Yor]
-// printf("Char-Server Has Disconnected.\n");
-// else if (fd == 8) // Removed [Valaris]
-// printf("%s has logged off your server.\n",RFIFOP(fd,6)); // Removed [Valaris]
-
-// else if (fd != 8) // [Valaris]
- printf ("set eof : connection #%d\n", fd);
session[fd]->eof = 1;
}
- return 0;
}
-static int send_from_fifo (int fd)
+static void send_from_fifo (int fd)
{
- int len;
-
- //printf("send_from_fifo : %d\n",fd);
if (session[fd]->eof)
- return -1;
-
-#ifdef LCCWIN32
- len = send (fd, session[fd]->wdata, session[fd]->wdata_size, 0);
-#else
- len = write (fd, session[fd]->wdata, session[fd]->wdata_size);
-#endif
+ return;
-// printf (":::SEND:::\n");
-// dump(session[fd]->wdata, len); printf ("\n");
+ ssize_t len = write (fd, session[fd]->wdata, session[fd]->wdata_size);
- //{ int i; printf("send %d : ",fd); for(i=0;i<len;i++){ printf("%02x ",session[fd]->wdata[i]); } printf("\n");}
if (len > 0)
{
- if (len < session[fd]->wdata_size)
+ session[fd]->wdata_size -= len;
+ if (len < (ssize_t)session[fd]->wdata_size)
{
memmove (session[fd]->wdata, session[fd]->wdata + len,
- session[fd]->wdata_size - len);
- session[fd]->wdata_size -= len;
+ session[fd]->wdata_size);
}
- else
- {
- session[fd]->wdata_size = 0;
- }
- if (!session[fd]->connected)
- session[fd]->connected = 1;
+ session[fd]->connected = 1;
}
else
{
- printf ("set eof :%d\n", fd);
session[fd]->eof = 1;
}
- return 0;
}
-static int null_parse (int fd)
+static void null_parse (int fd)
{
printf ("null_parse : %d\n", fd);
RFIFOSKIP (fd, RFIFOREST (fd));
- return 0;
}
-/*======================================
- * CORE : Socket Function
- *--------------------------------------
- */
-static int connect_client (int listen_fd)
+static void connect_client (int listen_fd)
{
- int fd;
struct sockaddr_in client_address;
- unsigned int len;
- int result;
- int yes = 1; // reuse fix
-
- //printf("connect_client : %d\n",listen_fd);
-
- printf ("used: %d, max FDs: %d, SOFT: %d\n", currentuse, FD_SETSIZE,
- SOFT_LIMIT);
-
- len = sizeof (client_address);
+ socklen_t len = sizeof (client_address);
- fd = accept (listen_fd, (struct sockaddr *) &client_address, &len);
- if (fd_max <= fd)
+ int fd = accept (listen_fd, (struct sockaddr *) &client_address, &len);
+ if (fd == -1)
{
- fd_max = fd + 1;
+ perror ("accept");
+ return;
}
- else if (fd == -1)
+ if (fd_max <= fd)
{
- perror ("accept");
- return -1;
+ fd_max = fd + 1;
}
if (!free_fds ())
- { // gracefully end the connecting if no free FD
- printf ("softlimit reached, disconnecting : %d\n", fd);
+ {
+ fprintf (stderr, "softlimit reached, disconnecting : %d\n", fd);
delete_session (fd);
- return -1;
+ return;
}
-// setsockopt(fd,SOL_SOCKET,SO_REUSEADDR,NULL,0);
- setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, (char *) &yes, sizeof yes); // reuse fix
-#ifdef SO_REUSEPORT
-// setsockopt(fd,SOL_SOCKET,SO_REUSEPORT,NULL,0);
- setsockopt (fd, SOL_SOCKET, SO_REUSEPORT, (char *) &yes, sizeof yes); //reuse fix
-#endif
-// setsockopt(fd,IPPROTO_TCP,TCP_NODELAY,NULL,0);
- setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (char *) &yes, sizeof yes); // reuse fix
+ const int yes = 1;
+ /// Allow to bind() again after the server restarts.
+ // Since the socket is still in the TIME_WAIT, there's a possibility
+ // that formerly lost packets might be delivered and confuse the server.
+ setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof yes);
+ /// Send packets as soon as possible
+ /// even if the kernel thinks there is too little for it to be worth it!
+ // I'm not convinced this is a good idea; although in minimizes the
+ // latency for an individual write, it increases traffic in general.
+ setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &yes, sizeof yes);
FD_SET (fd, &readfds);
-#ifdef LCCWIN32
- {
- unsigned long val = 1;
- ioctlsocket (fd, FIONBIO, &val);
- }
-#else
- result = fcntl (fd, F_SETFL, O_NONBLOCK);
-#endif
+ fcntl (fd, F_SETFL, O_NONBLOCK);
CREATE (session[fd], struct socket_data, 1);
- CREATE (session[fd]->rdata, unsigned char, rfifo_size);
- CREATE (session[fd]->wdata, unsigned char, wfifo_size);
+ CREATE (session[fd]->rdata, uint8_t, rfifo_size);
+ CREATE (session[fd]->wdata, uint8_t, wfifo_size);
session[fd]->max_rdata = rfifo_size;
session[fd]->max_wdata = wfifo_size;
@@ -221,59 +139,44 @@ static int connect_client (int listen_fd)
session[fd]->connected = 0;
currentuse++;
-
- //printf("new_session : %d %d\n",fd,session[fd]->eof);
- return fd;
}
-int make_listen_port (int port)
+int make_listen_port (uint16_t port)
{
struct sockaddr_in server_address;
- int fd;
- int result;
- int yes = 1; // reuse fix
-
- fd = socket (AF_INET, SOCK_STREAM, 0);
- if (fd_max <= fd)
- fd_max = fd + 1;
- else if (fd == -1)
+ int fd = socket (AF_INET, SOCK_STREAM, 0);
+ if (fd == -1)
{
- perror ("connect");
+ perror ("socket");
return -1;
}
+ if (fd_max <= fd)
+ fd_max = fd + 1;
-#ifdef LCCWIN32
- {
- unsigned long val = 1;
- ioctlsocket (fd, FIONBIO, &val);
- }
-#else
- result = fcntl (fd, F_SETFL, O_NONBLOCK);
-#endif
-
-// setsockopt(fd,SOL_SOCKET,SO_REUSEADDR,NULL,0);
- setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, (char *) &yes, sizeof yes); // reuse fix
-#ifdef SO_REUSEPORT
-// setsockopt(fd,SOL_SOCKET,SO_REUSEPORT,NULL,0);
- setsockopt (fd, SOL_SOCKET, SO_REUSEPORT, (char *) &yes, sizeof yes); //reuse fix
-#endif
-// setsockopt(fd,IPPROTO_TCP,TCP_NODELAY,NULL,0);
- setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (char *) &yes, sizeof yes); // reuse fix
+ fcntl (fd, F_SETFL, O_NONBLOCK);
+
+ const int yes = 1;
+ /// Allow to bind() again after the server restarts.
+ // Since the socket is still in the TIME_WAIT, there's a possibility
+ // that formerly lost packets might be delivered and confuse the server.
+ setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof yes);
+ /// Send packets as soon as possible
+ /// even if the kernel thinks there is too little for it to be worth it!
+ // I'm not convinced this is a good idea; although in minimizes the
+ // latency for an individual write, it increases traffic in general.
+ setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &yes, sizeof yes);
server_address.sin_family = AF_INET;
server_address.sin_addr.s_addr = htonl (INADDR_ANY);
server_address.sin_port = htons (port);
- result =
- bind (fd, (struct sockaddr *) &server_address,
- sizeof (server_address));
- if (result == -1)
+ if (bind (fd, (struct sockaddr *) &server_address,
+ sizeof (server_address)) == -1)
{
perror ("bind");
exit (1);
}
- result = listen (fd, 5);
- if (result == -1)
+ if (listen (fd, 5) == -1)
{ /* error */
perror ("listen");
exit (1);
@@ -283,12 +186,6 @@ int make_listen_port (int port)
CREATE (session[fd], struct socket_data, 1);
- if (session[fd] == NULL)
- {
- printf ("out of memory : make_listen_port\n");
- exit (1);
- }
- memset (session[fd], 0, sizeof (*session[fd]));
session[fd]->func_recv = connect_client;
session[fd]->created = time (NULL);
session[fd]->connected = 1;
@@ -297,53 +194,45 @@ int make_listen_port (int port)
return fd;
}
-int make_connection (long ip, int port)
+int make_connection (uint32_t ip, uint16_t port)
{
struct sockaddr_in server_address;
- int fd;
- int result;
- int yes = 1; // reuse fix
-
- fd = socket (AF_INET, SOCK_STREAM, 0);
- if (fd_max <= fd)
- fd_max = fd + 1;
- else if (fd == -1)
+ int fd = socket (AF_INET, SOCK_STREAM, 0);
+ if (fd == -1)
{
perror ("socket");
return -1;
}
+ if (fd_max <= fd)
+ fd_max = fd + 1;
-// setsockopt(fd,SOL_SOCKET,SO_REUSEADDR,NULL,0);
- setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, (char *) &yes, sizeof yes); // reuse fix
-#ifdef SO_REUSEPORT
-// setsockopt(fd,SOL_SOCKET,SO_REUSEPORT,NULL,0);
- setsockopt (fd, SOL_SOCKET, SO_REUSEPORT, (char *) &yes, sizeof yes); //reuse fix
-#endif
-// setsockopt(fd,IPPROTO_TCP,TCP_NODELAY,NULL,0);
- setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (char *) &yes, sizeof yes); // reuse fix
+ const int yes = 1;
+ /// Allow to bind() again after the server restarts.
+ // Since the socket is still in the TIME_WAIT, there's a possibility
+ // that formerly lost packets might be delivered and confuse the server.
+ setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof yes);
+ /// Send packets as soon as possible
+ /// even if the kernel thinks there is too little for it to be worth it!
+ // I'm not convinced this is a good idea; although in minimizes the
+ // latency for an individual write, it increases traffic in general.
+ setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &yes, sizeof yes);
server_address.sin_family = AF_INET;
server_address.sin_addr.s_addr = ip;
server_address.sin_port = htons (port);
-#ifdef LCCWIN32
- {
- unsigned long val = 1;
- ioctlsocket (fd, FIONBIO, &val);
- }
-#else
- result = fcntl (fd, F_SETFL, O_NONBLOCK);
-#endif
+ fcntl (fd, F_SETFL, O_NONBLOCK);
- result =
- connect (fd, (struct sockaddr *) (&server_address),
- sizeof (struct sockaddr_in));
+ /// Errors not caught - we must not block
+ /// Let the main select() loop detect when we know the state
+ connect (fd, (struct sockaddr *) &server_address,
+ sizeof (struct sockaddr_in));
FD_SET (fd, &readfds);
CREATE (session[fd], struct socket_data, 1);
- CREATE (session[fd]->rdata, unsigned char, rfifo_size);
- CREATE (session[fd]->wdata, unsigned char, wfifo_size);
+ CREATE (session[fd]->rdata, uint8_t, rfifo_size);
+ CREATE (session[fd]->wdata, uint8_t, wfifo_size);
session[fd]->max_rdata = rfifo_size;
session[fd]->max_wdata = wfifo_size;
@@ -357,51 +246,53 @@ int make_connection (long ip, int port)
return fd;
}
-int delete_session (int fd)
+void delete_session (int fd)
{
if (fd < 0 || fd >= FD_SETSIZE)
- return -1;
+ return;
+ // If this was the highest fd, decrease it
+ // We could add a loop to decrement fd_max further for every null session,
+ // but this is cheap and good enough for the typical case
+ if (fd == fd_max - 1)
+ fd_max--;
FD_CLR (fd, &readfds);
if (session[fd])
{
- if (session[fd]->rdata)
- free (session[fd]->rdata);
- if (session[fd]->wdata)
- free (session[fd]->wdata);
- if (session[fd]->session_data)
- free (session[fd]->session_data);
+ free (session[fd]->rdata);
+ free (session[fd]->wdata);
+ free (session[fd]->session_data);
free (session[fd]);
}
session[fd] = NULL;
+
+ // just close() would try to keep sending buffers
shutdown (fd, SHUT_RDWR);
close (fd);
currentuse--;
if (currentuse < 0)
{
- printf ("delete_session: current sessions negative!\n");
+ fprintf (stderr, "delete_session: current sessions negative!\n");
currentuse = 0;
}
- //printf("delete_session:%d\n",fd);
- return 0;
+ return;
}
-int realloc_fifo (int fd, int rfifo_size, int wfifo_size)
+void realloc_fifo (int fd, size_t rfifo_size, size_t wfifo_size)
{
struct socket_data *s = session[fd];
if (s->max_rdata != rfifo_size && s->rdata_size < rfifo_size)
{
- RECREATE (s->rdata, unsigned char, rfifo_size);
+ RECREATE (s->rdata, uint8_t, rfifo_size);
s->max_rdata = rfifo_size;
}
if (s->max_wdata != wfifo_size && s->wdata_size < wfifo_size)
{
- RECREATE (s->wdata, unsigned char, wfifo_size);
+ RECREATE (s->wdata, uint8_t, wfifo_size);
s->max_wdata = wfifo_size;
}
- return 0;
}
-int WFIFOSET (int fd, int len)
+void WFIFOSET (int fd, size_t len)
{
struct socket_data *s = session[fd];
if (s->wdata_size + len + 16384 > s->max_wdata)
@@ -409,64 +300,49 @@ int WFIFOSET (int fd, int len)
realloc_fifo (fd, s->max_rdata, s->max_wdata << 1);
printf ("socket: %d wdata expanded to %d bytes.\n", fd, s->max_wdata);
}
- s->wdata_size = (s->wdata_size + (len) + 2048 < s->max_wdata) ?
- s->wdata_size + len : (printf ("socket: %d wdata lost !!\n", fd),
- s->wdata_size);
- return 0;
+ if (s->wdata_size + len + 2048 < s->max_wdata)
+ s->wdata_size += len;
+ else
+ fprintf (stderr, "socket: %d wdata lost !!\n", fd), abort ();
}
-int do_sendrecv (int next)
+void do_sendrecv (uint32_t next)
{
- fd_set rfd, wfd;
- struct timeval timeout;
- int ret, i;
-
- rfd = readfds;
+ fd_set rfd = readfds, wfd;
FD_ZERO (&wfd);
- for (i = 0; i < fd_max; i++)
+ for (int i = 0; i < fd_max; i++)
{
- if (!session[i] && FD_ISSET (i, &readfds))
- {
- printf ("force clr fds %d\n", i);
- FD_CLR (i, &readfds);
- continue;
- }
- if (!session[i])
- continue;
- if (session[i]->wdata_size)
+ if (session[i] && session[i]->wdata_size)
FD_SET (i, &wfd);
}
+ struct timeval timeout;
timeout.tv_sec = next / 1000;
timeout.tv_usec = next % 1000 * 1000;
- ret = select (fd_max, &rfd, &wfd, NULL, &timeout);
- if (ret <= 0)
- return 0;
- for (i = 0; i < fd_max; i++)
+ if (select (fd_max, &rfd, &wfd, NULL, &timeout) <= 0)
+ return;
+ for (int i = 0; i < fd_max; i++)
{
if (!session[i])
continue;
if (FD_ISSET (i, &wfd))
{
- //printf("write:%d\n",i);
if (session[i]->func_send)
//send_from_fifo(i);
session[i]->func_send (i);
}
if (FD_ISSET (i, &rfd))
{
- //printf("read:%d\n",i);
if (session[i]->func_recv)
//recv_to_fifo(i);
+ //or connect_client(i);
session[i]->func_recv (i);
}
}
- return 0;
}
-int do_parsepacket (void)
+void do_parsepacket (void)
{
- int i;
- for (i = 0; i < fd_max; i++)
+ for (int i = 0; i < fd_max; i++)
{
if (!session[i])
continue;
@@ -476,76 +352,54 @@ int do_parsepacket (void)
printf ("Session #%d timed out\n", i);
session[i]->eof = 1;
}
- if (session[i]->rdata_size == 0 && session[i]->eof == 0)
+ if (!session[i]->rdata_size && !session[i]->eof)
continue;
if (session[i]->func_parse)
{
session[i]->func_parse (i);
+ /// some func_parse may call delete_session
if (!session[i])
continue;
}
+ /// Reclaim buffer space for what was read
RFIFOFLUSH (i);
}
- return 0;
}
void do_socket (void)
{
FD_ZERO (&readfds);
- currentuse = 2;
+ currentuse = 3;
}
-int RFIFOSKIP (int fd, int len)
+void RFIFOSKIP (int fd, size_t len)
{
struct socket_data *s = session[fd];
+ s->rdata_pos += len;
- if (s->rdata_size - s->rdata_pos - len < 0)
+ if (s->rdata_size < s->rdata_pos)
{
fprintf (stderr, "too many skip\n");
- exit (1);
+ abort ();
}
-
- s->rdata_pos = s->rdata_pos + len;
-
- return 0;
}
-int Net_Init (void)
+void fclose_ (FILE * fp)
{
-#ifdef LCCWIN32
- /* Start up the windows networking */
- WORD version_wanted = MAKEWORD (1, 1);
- WSADATA wsaData;
-
- if (WSAStartup (version_wanted, &wsaData) != 0)
- {
- printf ("SYSERR: WinSock not available!\n");
- exit (1);
- }
-#endif
-
- return (0);
-}
-
-int fclose_ (FILE * fp)
-{
- int res = fclose (fp);
- if (res == 0)
- currentuse--;
-// printf("file closed: used: %d\n",currentuse);
- return res;
+ if (fclose (fp))
+ perror ("fclose"), abort ();
+ currentuse--;
}
FILE *fopen_ (const char *path, const char *mode)
{
FILE *f = fopen (path, mode);
- if (f != NULL)
+ if (f)
currentuse++;
-// printf("file opened: used: %d\n",currentuse);
return f;
}
-int free_fds ()
+bool free_fds ()
{
- return (currentuse + 1 < SOFT_LIMIT) ? 1 : 0;
+ return currentuse < SOFT_LIMIT;
}
diff --git a/src/common/socket.h b/src/common/socket.h
index aa4f91f..0e15f5b 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -1,110 +1,135 @@
-// original : core.h 2003/03/14 11:55:25 Rev 1.4
-
-#ifndef _SOCKET_H_
-#define _SOCKET_H_
-
-#include <stdio.h>
-
-#ifdef LCCWIN32
-#include <winsock.h>
-#else
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#endif
-#include <time.h>
-
-// define declaration
-
-#define RFIFOP(fd,pos) (session[fd]->rdata+session[fd]->rdata_pos+(pos))
-#define RFIFOB(fd,pos) (*(unsigned char*)(session[fd]->rdata+session[fd]->rdata_pos+(pos)))
-#define RFIFOW(fd,pos) (*(unsigned short*)(session[fd]->rdata+session[fd]->rdata_pos+(pos)))
-#define RFIFOL(fd,pos) (*(unsigned int*)(session[fd]->rdata+session[fd]->rdata_pos+(pos)))
-//#define RFIFOSKIP(fd,len) ((session[fd]->rdata_size-session[fd]->rdata_pos-(len)<0) ? (fprintf(stderr,"too many skip\n"),exit(1)) : (session[fd]->rdata_pos+=(len)))
-#define RFIFOREST(fd) (session[fd]->rdata_size-session[fd]->rdata_pos)
-#define RFIFOFLUSH(fd) (memmove(session[fd]->rdata,RFIFOP(fd,0),RFIFOREST(fd)),session[fd]->rdata_size=RFIFOREST(fd),session[fd]->rdata_pos=0)
-#define RFIFOSPACE(fd) (session[fd]->max_rdata-session[fd]->rdata_size)
-#define RBUFP(p,pos) (((unsigned char*)(p))+(pos))
-#define RBUFB(p,pos) (*(unsigned char*)RBUFP((p),(pos)))
-#define RBUFW(p,pos) (*(unsigned short*)RBUFP((p),(pos)))
-#define RBUFL(p,pos) (*(unsigned int*)RBUFP((p),(pos)))
-
-#define WFIFOSPACE(fd) (session[fd]->max_wdata-session[fd]->wdata_size)
-#define WFIFOP(fd,pos) (session[fd]->wdata+session[fd]->wdata_size+(pos))
-#define WFIFOB(fd,pos) (*(unsigned char*)(session[fd]->wdata+session[fd]->wdata_size+(pos)))
-#define WFIFOW(fd,pos) (*(unsigned short*)(session[fd]->wdata+session[fd]->wdata_size+(pos)))
-#define WFIFOL(fd,pos) (*(unsigned int*)(session[fd]->wdata+session[fd]->wdata_size+(pos)))
-// use function instead of macro.
-//#define WFIFOSET(fd,len) (session[fd]->wdata_size = (session[fd]->wdata_size+(len)+2048 < session[fd]->max_wdata) ? session[fd]->wdata_size+len : session[fd]->wdata_size)
-#define WBUFP(p,pos) (((unsigned char*)(p))+(pos))
-#define WBUFB(p,pos) (*(unsigned char*)WBUFP((p),(pos)))
-#define WBUFW(p,pos) (*(unsigned short*)WBUFP((p),(pos)))
-#define WBUFL(p,pos) (*(unsigned int*)WBUFP((p),(pos)))
-
-#ifdef __INTERIX
-#define FD_SETSIZE 4096
-#endif // __INTERIX
-
-/* Removed Cygwin FD_SETSIZE declarations, now are directly passed on to the compiler through Makefile [Valaris] */
+#ifndef SOCKET_H
+#define SOCKET_H
+
+# include "sanity.h"
+
+# include <stdio.h>
+
+# include <sys/types.h>
+# include <sys/socket.h>
+# include <netinet/in.h>
+
+# include <time.h>
+
+/// Check how much can be read
+# define RFIFOREST(fd) (session[fd]->rdata_size-session[fd]->rdata_pos)
+/// Read from the queue
+# define RFIFOP(fd,pos) (session[fd]->rdata+session[fd]->rdata_pos+(pos))
+# define RFIFOB(fd,pos) (*(uint8_t*)(RFIFOP(fd, pos)))
+# define RFIFOW(fd,pos) (*(uint16_t*)(RFIFOP(fd, pos)))
+# define RFIFOL(fd,pos) (*(uint32_t*)(RFIFOP(fd, pos)))
+/// Done reading
+void RFIFOSKIP (int fd, size_t len);
+/// Internal - clean up by discarding handled bytes
+// Atm this is also called in char/char.c, but that is unnecessary
+# define RFIFOFLUSH(fd) (memmove(session[fd]->rdata,RFIFOP(fd,0),RFIFOREST(fd)),\
+session[fd]->rdata_size=RFIFOREST(fd),\
+session[fd]->rdata_pos=0)
+
+/// Used internally - how much room there is to read more data
+# define RFIFOSPACE(fd) (session[fd]->max_rdata-session[fd]->rdata_size)
+
+/// Read from an arbitrary buffer
+# define RBUFP(p,pos) (((uint8_t*)(p))+(pos))
+# define RBUFB(p,pos) (*(uint8_t*)RBUFP((p),(pos)))
+# define RBUFW(p,pos) (*(uint16_t*)RBUFP((p),(pos)))
+# define RBUFL(p,pos) (*(uint32_t*)RBUFP((p),(pos)))
+
+
+
+/// Unused - check how much data can be written
+# define WFIFOSPACE(fd) (session[fd]->max_wdata-session[fd]->wdata_size)
+/// Write to the queue
+# define WFIFOP(fd,pos) (session[fd]->wdata+session[fd]->wdata_size+(pos))
+# define WFIFOB(fd,pos) (*(uint8_t*)(WFIFOP(fd,pos)))
+# define WFIFOW(fd,pos) (*(uint16_t*)(WFIFOP(fd,pos)))
+# define WFIFOL(fd,pos) (*(uint32_t*)(WFIFOP(fd,pos)))
+/// Finish writing
+void WFIFOSET (int fd, size_t len);
+
+/// Write to an arbitrary buffer
+#define WBUFP(p,pos) (((uint8_t*)(p))+(pos))
+#define WBUFB(p,pos) (*(uint8_t*)WBUFP((p),(pos)))
+#define WBUFW(p,pos) (*(uint16_t*)WBUFP((p),(pos)))
+#define WBUFL(p,pos) (*(uint32_t*)WBUFP((p),(pos)))
// Struct declaration
struct socket_data
{
- int eof;
+ /// Checks whether a newly-connected socket actually does anything
time_t created;
- int connected;
- unsigned char *rdata, *wdata;
- int max_rdata, max_wdata;
- int rdata_size, wdata_size;
- int rdata_pos;
- struct sockaddr_in client_addr;
- int (*func_recv) (int);
- int (*func_send) (int);
- int (*func_parse) (int);
- void *session_data;
-};
+ bool connected;
-// Data prototype declaration
+ /// Flag needed since structure must be freed in a server-dependent manner
+ bool eof;
-#ifdef LCCWIN32
+ /// Since this is a single-threaded application, it can't block
+ /// These are the read/write queues
+ uint8_t *rdata, *wdata;
+ size_t max_rdata, max_wdata;
+ /// How much is actually in the queue
+ size_t rdata_size, wdata_size;
+ /// How much has already been read from the queue
+ /// Note that there is no need for a wdata_pos
+ size_t rdata_pos;
-#undef FD_SETSIZE
-#define FD_SETSIZE 4096
+ struct sockaddr_in client_addr;
-#endif
+ /// Send or recieve
+ /// Only called when select() indicates the socket is ready
+ /// If, after that, nothing is read, it sets eof
+ // These could probably be hard-coded with a little work
+ void (*func_recv) (int);
+ void (*func_send) (int);
+ /// This is the important one
+ /// Set to different functions depending on whether the connection
+ /// is a player or a server/ladmin
+ /// Can be set explicitly or via set_defaultparse
+ void (*func_parse) (int);
+ /// Server-specific data type
+ void *session_data;
+};
// save file descriptors for important stuff
-#define SOFT_LIMIT (FD_SETSIZE - 50)
+# define SOFT_LIMIT (FD_SETSIZE - 50)
// socket timeout to establish a full connection in seconds
-#define CONNECT_TIMEOUT 15
+# define CONNECT_TIMEOUT 15
+/// Everyone who has connected
+// note: call delete_session(i) to null out an element
extern struct socket_data *session[FD_SETSIZE];
-extern int rfifo_size, wfifo_size;
+/// Maximum used FD, +1
extern int fd_max;
-// Function prototype declaration
-
-int make_listen_port (int);
-int make_connection (long, int);
-int delete_session (int);
-int realloc_fifo (int fd, int rfifo_size, int wfifo_size);
-int WFIFOSET (int fd, int len);
-int RFIFOSKIP (int fd, int len);
-
-int do_sendrecv (int next);
-int do_parsepacket (void);
+/// open a socket, bind, and listen. Return an fd, or -1 if socket() fails,
+/// but exit if bind() or listen() fails
+int make_listen_port (uint16_t port);
+/// Connect to an address, return a connected socket or -1
+// FIXME - this is IPv4 only!
+int make_connection (uint32_t ip, uint16_t port);
+/// free() the structure and close() the fd
+void delete_session (int);
+/// Make a the internal queues bigger
+void realloc_fifo (int fd, size_t rfifo_size, size_t wfifo_size);
+/// Update all sockets that can be read/written from the queues
+void do_sendrecv (uint32_t next);
+/// Call the parser function for every socket that has read data
+void do_parsepacket (void);
+
+/// An init function
void do_socket (void);
-void set_defaultparse (int (*defaultparse) (int));
+/// Change the default parser for newly connected clients
+// typically called once per server, but individual clients may identify
+// themselves as servers
+void set_defaultparse (void (*defaultparse) (int));
-int Net_Init (void);
-
-int fclose_ (FILE * fp);
+/// Wrappers to track number of free FDs
+void fclose_ (FILE * fp);
FILE *fopen_ (const char *path, const char *mode);
+bool free_fds ();
-int free_fds ();
-
-#endif // _SOCKET_H_
+#endif // SOCKET_H
diff --git a/src/common/timer.c b/src/common/timer.c
index fca6f42..bf21c8e 100644
--- a/src/common/timer.c
+++ b/src/common/timer.c
@@ -1,184 +1,127 @@
-// $Id: timer.c,v 1.1.1.1 2004/09/10 17:44:49 MagicalTux Exp $
-// original : core.c 2003/02/26 18:03:12 Rev 1.7
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
-#ifdef LCCWIN32
-#include <winsock.h>
-#else
#include <sys/socket.h>
#include <sys/time.h>
-#endif
#include "timer.h"
#include "utils.h"
-#ifdef MEMWATCH
-#include "memwatch.h"
-#endif
-
static struct TimerData *timer_data;
-static int timer_data_max, timer_data_num;
-static int *free_timer_list;
-static int free_timer_list_max, free_timer_list_pos;
-
-static int timer_heap_max;
-static int *timer_heap = NULL;
-
-// for debug
-struct timer_func_list
-{
- int (*func) (int, unsigned int, int, int);
- struct timer_func_list *next;
- char *name;
-};
-static struct timer_func_list *tfl_root;
-
-#if defined(LCCWIN32)
-void gettimeofday (struct timeval *t, struct timezone *dummy)
-{
- DWORD millisec = GetTickCount ();
-
- t->tv_sec = (int) (millisec / 1000);
- t->tv_usec = (millisec % 1000) * 1000;
-}
-
-#endif
-
-//
-int add_timer_func_list (int (*func) (int, unsigned int, int, int),
- char *name)
-{
- struct timer_func_list *tfl;
-
- CREATE (tfl, struct timer_func_list, 1);
- CREATE (tfl->name, char, strlen (name) + 1);
-
- tfl->next = tfl_root;
- tfl->func = func;
- strcpy (tfl->name, name);
- tfl_root = tfl;
-
- return 0;
-}
-
-char *search_timer_func_list (int (*func) (int, unsigned int, int, int))
-{
- struct timer_func_list *tfl;
- for (tfl = tfl_root; tfl; tfl = tfl->next)
- {
- if (func == tfl->func)
- return tfl->name;
- }
- return "???";
-}
-
-/*----------------------------
- * Get tick time
- *----------------------------*/
-static unsigned int gettick_cache;
-static int gettick_count;
-unsigned int gettick_nocache (void)
+static uint32_t timer_data_max, timer_data_num;
+static timer_id *free_timer_list;
+static uint32_t free_timer_list_max, free_timer_list_pos;
+
+/// Okay, I think I understand this structure now:
+/// the timer heap is a magic queue that allows inserting timers and then popping them in order
+/// designed to copy only log2(N) entries instead of N
+// timer_heap[0] is the size (greatest index into the heap)
+// timer_heap[1] is the first actual element
+// timer_heap_max increases 256 at a time and never decreases
+static uint32_t timer_heap_max = 256;
+/// FIXME: refactor the code to put the size in a separate variable
+//nontrivial because indices get multiplied
+static timer_id *timer_heap = NULL;
+
+
+static uint32_t gettick_cache;
+static uint8_t gettick_count = 0;
+
+uint32_t gettick_nocache (void)
{
struct timeval tval;
+ // BUG: This will cause strange behavior if the system clock is changed!
+ // it should be reimplemented in terms of clock_gettime(CLOCK_MONOTONIC, )
gettimeofday (&tval, NULL);
- gettick_count = 256;
+ gettick_count = 255;
return gettick_cache = tval.tv_sec * 1000 + tval.tv_usec / 1000;
}
-unsigned int gettick (void)
+uint32_t gettick (void)
{
- gettick_count--;
- if (gettick_count < 0)
- return gettick_nocache ();
- return gettick_cache;
+ if (gettick_count--)
+ return gettick_cache;
+ return gettick_nocache ();
}
-/*======================================
- * CORE : Timer Heap
- *--------------------------------------
- */
-static void push_timer_heap (int index)
+static void push_timer_heap (timer_id index)
{
- int i, h;
-
- if (timer_heap == NULL || timer_heap[0] + 1 >= timer_heap_max)
+ if (timer_heap == NULL)
{
- int first = timer_heap == NULL;
-
timer_heap_max += 256;
- RECREATE (timer_heap, int, timer_heap_max);
- memset (timer_heap + (timer_heap_max - 256), 0, sizeof (int) * 256);
- if (first)
- timer_heap[0] = 0;
+ CREATE (timer_heap, timer_id, timer_heap_max);
}
-
+// timer_heap[0] is the greatest index into the heap, which increases
timer_heap[0]++;
+ if (timer_heap[0] >= timer_heap_max)
+ {
+ timer_heap_max += 256;
+ RECREATE (timer_heap, timer_id, timer_heap_max);
+ memset (timer_heap + (timer_heap_max - 256), 0, 4 * 256);
+ }
- for (h = timer_heap[0] - 1, i = (h - 1) / 2;
- h > 0 && DIFF_TICK (timer_data[index].tick,
- timer_data[timer_heap[i + 1]].tick) < 0;
- i = (h - 1) / 2)
+ timer_id h = timer_heap[0]-1, i = (h - 1) / 2;
+ while (h)
{
+ // avoid wraparound problems, it really means this:
+ // timer_data[index].tick >= timer_data[timer_heap[i+1]].tick
+ if ( DIFF_TICK(timer_data[index].tick, timer_data[timer_heap[i+1]].tick) >= 0)
+ break;
timer_heap[h + 1] = timer_heap[i + 1];
h = i;
+ i = (h - 1) / 2;
}
timer_heap[h + 1] = index;
}
-static int top_timer_heap ()
+static timer_id top_timer_heap ()
{
- if (timer_heap == NULL || timer_heap[0] <= 0)
+ if (!timer_heap || !timer_heap[0])
return -1;
-
return timer_heap[1];
}
-static int pop_timer_heap ()
+static timer_id pop_timer_heap ()
{
- int i, h, k;
- int ret, last;
-
- if (timer_heap == NULL || timer_heap[0] <= 0)
+ if (!timer_heap || !timer_heap[0])
return -1;
- ret = timer_heap[1];
- last = timer_heap[timer_heap[0]];
+ timer_id ret = timer_heap[1];
+ timer_id last = timer_heap[timer_heap[0]];
timer_heap[0]--;
+ uint32_t h, k;
for (h = 0, k = 2; k < timer_heap[0]; k = k * 2 + 2)
{
- if (DIFF_TICK
- (timer_data[timer_heap[k + 1]].tick,
- timer_data[timer_heap[k]].tick) > 0)
+ if (DIFF_TICK(timer_data[timer_heap[k + 1]].tick, timer_data[timer_heap[k]].tick) > 0)
k--;
timer_heap[h + 1] = timer_heap[k + 1], h = k;
}
if (k == timer_heap[0])
timer_heap[h + 1] = timer_heap[k], h = k - 1;
- for (i = (h - 1) / 2;
- h > 0
- && DIFF_TICK (timer_data[timer_heap[i + 1]].tick,
- timer_data[last].tick) > 0; i = (h - 1) / 2)
+ uint32_t i = (h - 1) / 2;
+ while (h)
{
- timer_heap[h + 1] = timer_heap[i + 1], h = i;
+ if (DIFF_TICK(timer_data[timer_heap[i + 1]].tick, timer_data[last].tick) <= 0)
+ timer_heap[h + 1] = timer_heap[i + 1];
+ h = i;
+ i = (h - 1) / 2;
}
timer_heap[h + 1] = last;
return ret;
}
-int add_timer (unsigned int tick, int (*func) (int, unsigned int, int, int),
- int id, int data)
+timer_id add_timer (tick_t tick, timer_func func, custom_id_t id, custom_data_t data)
{
- struct TimerData *td;
- int i;
+ timer_id i;
if (free_timer_list_pos)
{
+ // Retrieve a freed timer id instead of a new one
+ // I think it should be possible to avoid the loop somehow
do
{
i = free_timer_list[--free_timer_list_pos];
@@ -187,12 +130,13 @@ int add_timer (unsigned int tick, int (*func) (int, unsigned int, int, int),
}
else
i = timer_data_num;
+
+ // I have no idea what this is doing
if (i >= timer_data_num)
- for (i = timer_data_num; i < timer_data_max && timer_data[i].type;
- i++);
+ for (i = timer_data_num; i < timer_data_max && timer_data[i].type; i++)
+ ;
if (i >= timer_data_num && i >= timer_data_max)
{
- int j;
if (timer_data_max == 0)
{
timer_data_max = 256;
@@ -202,143 +146,112 @@ int add_timer (unsigned int tick, int (*func) (int, unsigned int, int, int),
{
timer_data_max += 256;
RECREATE (timer_data, struct TimerData, timer_data_max);
- if (timer_data == NULL)
- {
- printf ("out of memory : add_timer timer_data\n");
- exit (1);
- }
memset (timer_data + (timer_data_max - 256), 0,
sizeof (struct TimerData) * 256);
}
- for (j = timer_data_max - 256; j < timer_data_max; j++)
- timer_data[j].type = 0;
}
- td = &timer_data[i];
- td->tick = tick;
- td->func = func;
- td->id = id;
- td->data = data;
- td->type = TIMER_ONCE_AUTODEL;
- td->interval = 1000;
+ timer_data[i].tick = tick;
+ timer_data[i].func = func;
+ timer_data[i].id = id;
+ timer_data[i].data = data;
+ timer_data[i].type = TIMER_ONCE_AUTODEL;
+ timer_data[i].interval = 1000;
push_timer_heap (i);
if (i >= timer_data_num)
timer_data_num = i + 1;
return i;
}
-int add_timer_interval (unsigned int tick,
- int (*func) (int, unsigned int, int, int), int id,
- int data, int interval)
+timer_id add_timer_interval (tick_t tick, timer_func func, custom_id_t id,
+ custom_data_t data, interdb_val_t interval)
{
- int tid;
- tid = add_timer (tick, func, id, data);
+ timer_id tid = add_timer (tick, func, id, data);
timer_data[tid].type = TIMER_INTERVAL;
timer_data[tid].interval = interval;
return tid;
}
-int delete_timer (int id, int (*func) (int, unsigned int, int, int))
+void delete_timer (timer_id id, timer_func func)
{
- if (id <= 0 || id >= timer_data_num)
+ if (id == 0 || id >= timer_data_num)
{
- printf ("delete_timer error : no such timer %d\n", id);
- return -1;
+ fprintf (stderr, "delete_timer error : no such timer %d\n", id);
+ abort ();
}
if (timer_data[id].func != func)
{
- printf
- ("delete_timer error : function dismatch %08x(%s) != %08x(%s)\n",
- (int) timer_data[id].func,
- search_timer_func_list (timer_data[id].func), (int) func,
- search_timer_func_list (func));
- return -2;
+ fprintf (stderr, "Timer mismatch\n");
+ abort ();
}
- // そのうち消えるにまかせる
+ // "to let them disappear" - is this just in case?
timer_data[id].func = NULL;
timer_data[id].type = TIMER_ONCE_AUTODEL;
timer_data[id].tick -= 60 * 60 * 1000;
- return 0;
}
-int addtick_timer (int tid, unsigned int tick)
+tick_t addtick_timer (timer_id tid, interdb_val_t tick)
{
return timer_data[tid].tick += tick;
}
-struct TimerData *get_timer (int tid)
+struct TimerData *get_timer (timer_id tid)
{
return &timer_data[tid];
}
-int do_timer (unsigned int tick)
+interdb_val_t do_timer (tick_t tick)
{
- int i, nextmin = 1000;
-
-#if 0
- static int disp_tick = 0;
- if (DIFF_TICK (disp_tick, tick) < -5000
- || DIFF_TICK (disp_tick, tick) > 5000)
- {
- printf ("timer %d(%d + %d)\n", timer_data_num, timer_heap[0],
- free_timer_list_pos);
- disp_tick = tick;
- }
-#endif
+ timer_id i;
+ /// Number of milliseconds until it calls this again
+ // this says to wait 1 sec if all timers get popped
+ interdb_val_t nextmin = 1000;
- while ((i = top_timer_heap ()) >= 0)
+ while ((i = top_timer_heap ()) != (timer_id)-1)
{
+ // while the heap is not empty and
if (DIFF_TICK (timer_data[i].tick, tick) > 0)
{
+ /// Return the time until the next timer needs to goes off
nextmin = DIFF_TICK (timer_data[i].tick, tick);
break;
}
pop_timer_heap ();
- timer_data[i].type |= TIMER_REMOVE_HEAP;
if (timer_data[i].func)
{
if (DIFF_TICK (timer_data[i].tick, tick) < -1000)
{
- // 1秒以上の大幅な遅延が発生しているので、
- // timer処理タイミングを現在値とする事で
- // 呼び出し時タイミング(引数のtick)相対で処理してる
- // timer関数の次回処理タイミングを遅らせる
- timer_data[i].func (i, tick, timer_data[i].id,
- timer_data[i].data);
+ // If we are too far past the requested tick, call with the current tick instead to fix reregistering problems
+ timer_data[i].func (i, tick, timer_data[i].id, timer_data[i].data);
}
else
{
- timer_data[i].func (i, timer_data[i].tick, timer_data[i].id,
- timer_data[i].data);
+ timer_data[i].func (i, timer_data[i].tick, timer_data[i].id, timer_data[i].data);
}
}
- if (timer_data[i].type & TIMER_REMOVE_HEAP)
+ switch (timer_data[i].type)
{
- switch (timer_data[i].type & ~TIMER_REMOVE_HEAP)
- {
- case TIMER_ONCE_AUTODEL:
- timer_data[i].type = 0;
- if (free_timer_list_pos >= free_timer_list_max)
- {
- free_timer_list_max += 256;
- RECREATE (free_timer_list, int, free_timer_list_max);
- memset (free_timer_list + (free_timer_list_max - 256),
- 0, 256 * sizeof (free_timer_list[0]));
- }
- free_timer_list[free_timer_list_pos++] = i;
- break;
- case TIMER_INTERVAL:
- if (DIFF_TICK (timer_data[i].tick, tick) < -1000)
- {
- timer_data[i].tick = tick + timer_data[i].interval;
- }
- else
- {
- timer_data[i].tick += timer_data[i].interval;
- }
- timer_data[i].type &= ~TIMER_REMOVE_HEAP;
- push_timer_heap (i);
- break;
- }
+ case TIMER_ONCE_AUTODEL:
+ timer_data[i].type = 0;
+ if (free_timer_list_pos >= free_timer_list_max)
+ {
+ free_timer_list_max += 256;
+ RECREATE (free_timer_list, uint32_t, free_timer_list_max);
+ memset (free_timer_list + (free_timer_list_max - 256),
+ 0, 256 * sizeof (timer_id));
+ }
+ free_timer_list[free_timer_list_pos++] = i;
+ break;
+ case TIMER_INTERVAL:
+ if (DIFF_TICK (timer_data[i].tick, tick) < -1000)
+ {
+ timer_data[i].tick = tick + timer_data[i].interval;
+ }
+ else
+ {
+ timer_data[i].tick += timer_data[i].interval;
+ }
+ push_timer_heap (i);
+ break;
}
}
@@ -346,8 +259,3 @@ int do_timer (unsigned int tick)
nextmin = 10;
return nextmin;
}
-
-void timer_final ()
-{
- free (timer_data);
-}
diff --git a/src/common/timer.h b/src/common/timer.h
index c6c4b52..4fa5db8 100644
--- a/src/common/timer.h
+++ b/src/common/timer.h
@@ -1,47 +1,67 @@
-// original : core.h 2003/03/14 11:55:25 Rev 1.4
+#ifndef TIMER_H
+#define TIMER_H
-#ifndef _TIMER_H_
-#define _TIMER_H_
+# include "sanity.h"
-#define BASE_TICK 5
-
-#define TIMER_ONCE_AUTODEL 1
-#define TIMER_INTERVAL 2
-#define TIMER_REMOVE_HEAP 16
-
-#define DIFF_TICK(a,b) ((int)((a)-(b)))
+enum TIMER_TYPE {
+ TIMER_ONCE_AUTODEL = 1,
+ TIMER_INTERVAL = 2,
+};
+/// This is needed to produce a signed result when 2 ticks are subtracted
+# define DIFF_TICK(a,b) ((int32_t)((a)-(b)))
-// Struct declaration
+// TODO replace with signed 64-bit to make code more clear and protect from the future
+typedef uint32_t tick_t;
+typedef uint32_t interdb_val_t;
+typedef uint32_t timer_id;
+// BUG: pointers are stored in here
+typedef int32_t custom_id_t;
+typedef int32_t custom_data_t;
+typedef void (*timer_func) (timer_id, tick_t, custom_id_t, custom_data_t);
struct TimerData
{
- unsigned int tick;
- int (*func) (int, unsigned int, int, int);
- int id;
- int data;
- int type;
- int interval;
- int heap_pos;
+ /// When it will be triggered
+ tick_t tick;
+ /// What will be done
+ timer_func func;
+ /// Arbitrary data. WARNING, callers are stupid and put pointers in here
+ // Should we change to void* or intptr_t ?
+ custom_id_t id;
+ custom_data_t data;
+ /// Type of timer - 0 initially
+ enum TIMER_TYPE type;
+ /// Repeat rate
+ uint32_t interval;
};
-// Function prototype declaration
-
-unsigned int gettick_nocache (void);
-unsigned int gettick (void);
+/// Server time, in milliseconds, since the epoch,
+/// but use of 32-bit integers means it wraps every 49 days.
+// The only external caller of this function is the core.c main loop, but that makes sense
+// in fact, it might make more sense if gettick() ALWAYS returned that cached value
+tick_t gettick_nocache (void);
+/// This function is called enough that it's worth caching the result for
+/// the next 255 times
+tick_t gettick (void);
-int add_timer (unsigned int, int (*)(int, unsigned int, int, int), int, int);
-int add_timer_interval (unsigned int, int (*)(int, unsigned int, int, int),
- int, int, int);
-int delete_timer (int, int (*)(int, unsigned int, int, int));
+timer_id add_timer (tick_t tick, timer_func func, custom_id_t id,
+ custom_data_t data);
+timer_id add_timer_interval (tick_t tick, timer_func func, custom_id_t id,
+ custom_data_t data, interdb_val_t interval);
+void delete_timer (timer_id, timer_func);
-int addtick_timer (int tid, unsigned int tick);
-struct TimerData *get_timer (int tid);
+tick_t addtick_timer (timer_id tid, interdb_val_t tick);
+struct TimerData *get_timer (timer_id tid);
-int do_timer (unsigned int tick);
+/// Do all timers scheduled before tick, and return the number of milliseconds until the next timer happens
+interdb_val_t do_timer (tick_t tick);
-int add_timer_func_list (int (*)(int, unsigned int, int, int), char *);
-char *search_timer_func_list (int (*)(int, unsigned int, int, int));
+// debugging
+static void add_timer_func_list (timer_func, char *) __attribute__((deprecated));
+static inline void add_timer_func_list (timer_func UNUSED, char *UNUSED) {}
-extern void timer_final ();
+// used to just call free(), which doesn't matter when we're exiting
+static void timer_final () __attribute__((deprecated));
+static inline void timer_final() {};
-#endif // _TIMER_H_
+#endif // TIMER_H
diff --git a/src/common/utils.c b/src/common/utils.c
deleted file mode 100644
index 1433a5e..0000000
--- a/src/common/utils.c
+++ /dev/null
@@ -1,121 +0,0 @@
-#include <string.h>
-#include "utils.h"
-#include <stdio.h>
-
-void dump (unsigned char *buffer, int num)
-{
- int icnt, jcnt;
-
- printf
- (" Hex ASCII\n");
- printf
- (" ----------------------------------------------- ----------------");
-
- for (icnt = 0; icnt < num; icnt += 16)
- {
- printf ("\n%p ", &buffer[icnt]);
- for (jcnt = icnt; jcnt < icnt + 16; ++jcnt)
- {
- if (jcnt < num)
- {
- printf ("%02hX ", buffer[jcnt]);
- }
- else
- printf (" ");
- }
-
- printf (" | ");
-
- for (jcnt = icnt; jcnt < icnt + 16; ++jcnt)
- {
- if (jcnt < num)
- {
- if (buffer[jcnt] > 31 && buffer[jcnt] < 127)
- printf ("%c", buffer[jcnt]);
- else
- printf (".");
- }
- else
- printf (" ");
- }
- }
- printf ("\n");
-}
-
-#ifdef LCCWIN32
-char *rindex (char *str, char c)
-{
- char *sptr;
-
- sptr = str;
- while (*sptr)
- ++sptr;
- if (c == '\0')
- return (sptr);
- while (str != sptr)
- if (*sptr-- == c)
- return (++sptr);
- return (NULL);
-}
-
-int strcasecmp (const char *arg1, const char *arg2)
-{
- int chk, i;
-
- if (arg1 == NULL || arg2 == NULL)
- {
- printf ("SYSERR: str_cmp() passed a NULL pointer, %p or %p.\n", arg1,
- arg2);
- return (0);
- }
-
- for (i = 0; arg1[i] || arg2[i]; i++)
- if ((chk = LOWER (arg1[i]) - LOWER (arg2[i])) != 0)
- return (chk); /* not equal */
-
- return (0);
-}
-
-int strncasecmp (const char *arg1, const char *arg2, int n)
-{
- int chk, i;
-
- if (arg1 == NULL || arg2 == NULL)
- {
- printf ("SYSERR: strn_cmp() passed a NULL pointer, %p or %p.\n", arg1,
- arg2);
- return (0);
- }
-
- for (i = 0; (arg1[i] || arg2[i]) && (n > 0); i++, n--)
- if ((chk = LOWER (arg1[i]) - LOWER (arg2[i])) != 0)
- return (chk); /* not equal */
-
- return (0);
-}
-
-void str_upper (char *name)
-{
-
- int len = strlen (name);
- while (len--)
- {
- if (*name >= 'a' && *name <= 'z')
- *name -= ('a' - 'A');
- name++;
- }
-}
-
-void str_lower (char *name)
-{
- int len = strlen (name);
-
- while (len--)
- {
- if (*name >= 'A' && *name <= 'Z')
- *name += ('a' - 'A');
- name++;
- }
-}
-
-#endif
diff --git a/src/common/utils.h b/src/common/utils.h
index 10c10ad..961d960 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -1,39 +1,18 @@
-#include "mt_rand.h"
-
-#ifndef NULL
-#define NULL (void *)0
-#endif
-
-#define LOWER(c) (((c)>='A' && (c) <= 'Z') ? ((c)+('a'-'A')) : (c))
-#define UPPER(c) (((c)>='a' && (c) <= 'z') ? ((c)+('A'-'a')) : (c) )
-
-/* strcasecmp -> stricmp -> str_cmp */
-
-#ifdef LCCWIN32
-int strcasecmp (const char *arg1, const char *arg2);
-int strncasecmp (const char *arg1, const char *arg2, int n);
-void str_upper (char *name);
-void str_lower (char *name);
-char *rindex (char *str, char c);
-#endif
-
-void dump (unsigned char *buffer, int num);
-
-#define CREATE(result, type, number) do {\
- if ((number) * sizeof(type) <= 0) \
- printf("SYSERR: Zero bytes or less requested at %s:%d.\n", __FILE__, __LINE__); \
+#ifndef UTILS_H
+#define UTILS_H
+/*
+Notes about memory allocation in tmwAthena:
+There used to be 3 sources of allocation: these macros,
+a{C,M,Re}alloc in common/malloc.{h,c}, and direct calls.
+I deleted malloc.{h,c} because it was redundant;
+future calls should either use this or depend on the coming segfault.
+*/
+# define CREATE(result, type, number) \
if (!((result) = (type *) calloc ((number), sizeof(type)))) \
- { perror("SYSERR: malloc failure"); abort(); } } while(0)
+ { perror("SYSERR: malloc failure"); abort(); } else (void)0
-#define RECREATE(result,type,number) do {\
+# define RECREATE(result,type,number) \
if (!((result) = (type *) realloc ((result), sizeof(type) * (number))))\
- { printf("SYSERR: realloc failure"); abort(); } } while(0)
+ { perror("SYSERR: realloc failure"); abort(); } else (void)0
-/*
- * ModuloRand and ModuloPlusRand. These macros are used to replace the
- * vast number of calls to rand()%mod ..
- * MRAND(10), returns 0-9.
- * MPRAND(5,10) returns 5-14.
- */
-#define MRAND(mod) (int) (mt_random() % (mod))
-#define MPRAND(add, mod) add + MRAND(mod)
+#endif //UTILS_H
diff --git a/src/common/version.h b/src/common/version.h
index cd9808e..46165aa 100644
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -1,27 +1,24 @@
-// $Id: version.h,v 1.2 2004/09/22 09:49:06 PoW Exp $
-#ifndef _VERSION_H_
-#define _VERSION_H_
+/// Some constants to identify the version of (e)Athena
+/// The values are different if the client connects (-1,'T','M','W',flags32)
+// These numbers have never been changed while TMW
+#ifndef VERSION_H
+#define VERSION_H
+//When a server receives a 0x7530 packet from an admin connection,
+//it sends an 0x7531 packet with the following bytes
+# define ATHENA_MAJOR_VERSION 1 // Major Version
+# define ATHENA_MINOR_VERSION 0 // Minor Version
+# define ATHENA_REVISION 0 // Revision
-#define ATHENA_MAJOR_VERSION 1 // Major Version
-#define ATHENA_MINOR_VERSION 0 // Minor Version
-#define ATHENA_REVISION 0 // Revision
+# define ATHENA_RELEASE_FLAG 1 // 1=Develop,0=Stable
+# define ATHENA_OFFICIAL_FLAG 1 // 1=Mod,0=Official
-#define ATHENA_RELEASE_FLAG 1 // 1=Develop,0=Stable
-#define ATHENA_OFFICIAL_FLAG 1 // 1=Mod,0=Official
+// and a bitmask of these (the char server sends char and inter)
+# define ATHENA_SERVER_LOGIN 1 // login server
+# define ATHENA_SERVER_CHAR 2 // char server
+# define ATHENA_SERVER_INTER 4 // inter server
+# define ATHENA_SERVER_MAP 8 // map server
-#define ATHENA_SERVER_LOGIN 1 // login server
-#define ATHENA_SERVER_CHAR 2 // char server
-#define ATHENA_SERVER_INTER 4 // inter server
-#define ATHENA_SERVER_MAP 8 // map server
+// and this as two bytes
+# define ATHENA_MOD_VERSION 1052 // mod version (patch No.)
-// ATHENA_MOD_VERSIONはパッチ番号です。
-// これは無理に変えなくても気が向いたら変える程度の扱いで。
-// （毎回アップロードの度に変更するのも面倒と思われるし、そもそも
-// 　この項目を参照する人がいるかどうかで疑問だから。）
-// その程度の扱いなので、サーバーに問い合わせる側も、あくまで目安程度の扱いで
-// あんまり信用しないこと。
-// 鯖snapshotの時や、大きな変更があった場合は設定してほしいです。
-// C言語の仕様上、最初に0を付けると8進数になるので間違えないで下さい。
-#define ATHENA_MOD_VERSION 1052 // mod version (patch No.)
-
-#endif
+#endif // VERSION_H
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-09 19:20:14 +0000