#include "sockhelp.h"
#include "options.h"
-#include "list.h"
#include "aClient.h"
#include "extern.h"
#include "flags.h"
#include <stdlib.h>
#include <fcntl.h>
#include <signal.h>
+#include <algorithm>
//#include <sys/types.h>
//#include <sys/wait.h>
using namespace std;
char *PACKAGE = "GameServ";
-char *VERSION = "1.3.2 +devel";
+char *VERSION = "1.3.3 +devel";
int sock;
long lastrefresh;
long lastrollover;
-List<aClient> clients[U_TABLE_SIZE];
+list<aClient*> clients[U_TABLE_SIZE];
void save_lastrefresh();
void load_lastrefresh();
void save_lastrollover();
void prettyIntro();
void check_idles();
+void clearClients();
+void clearPlayers();
// Make this a daemon
int daemon(int nochdir, int noclose);
ignore_pipe();
sock = conn(remoteserver, remoteport, localhost, 0);
// sock = make_connection(remoteport, SOCK_STREAM, remoteserver);
- if (sock == -1) {
- fprintf(stderr,"make_connection failed.\n");
- unload_config_file();
- return -1;
- }
+ if (sock == -1)
+ {
+ fprintf(stderr,"make_connection failed.\n");
+ unload_config_file();
+ return -1;
+ }
log("%S socket connected.");
#ifdef UNREAL
cmd = strtok(NULL, " ");
}
else
- cmd = strtok(buf, " ");
+ {
+ cmd = strtok(buf, " ");
+ }
#else
source = strtok(buf, " ");
cmd = strtok(NULL, " ");
// Refresh players and clear news if the time is up
currentTime = time(NULL);
-
+
if (isRolloverForestFights())
{
if (currentTime - lastrollover >= rolloverperiod)
#if !defined(P10)
- if (stricmp(cmd, "PING") == 0) {
- char *timestamp;
- timestamp = strtok(NULL, "");
- raw("PONG %s", timestamp);
- #else
- if (stricmp(cmd, "G") == 0) {
- char *timestamp;
- timestamp = strtok(NULL, " ");
- raw("[] Z [] %s 0 %s", timestamp + 1, timestamp);
- #endif
- #ifdef P10
- } else if (stricmp(cmd, "EB") == 0) {
- raw("[] EA");
- #endif
- } else if (stricmp(cmd, "VERSION") == 0) {
- char *server;
- server = strtok(NULL, " ");
- server++;
- raw(":%s 351 %s %s_%s. %s", servername, source+1, PACKAGE, VERSION, servername);
- #if !defined(P10)
- } else if (strncmp(cmd, "NICK", 4) == 0) {
- if (buffer[0] == ':')
- {
- aClient *tempPtr;
- if ((tempPtr = find((source + 1))))
+ if (stricmp(cmd, "PING") == 0)
{
- char *nick;
- unsigned long oldhv, newhv;
- nick = strtok(NULL, " ");
- oldhv = iHASH((unsigned char *) tempPtr->getNick());
- newhv = iHASH((unsigned char *) nick);
- tempPtr->setNick(nick);
- clients[oldhv].remove(tempPtr);
- clients[newhv].insertAtBack(tempPtr);
+ char *timestamp;
+ timestamp = strtok(NULL, "");
+ raw("PONG %s", timestamp);
}
- }
- else
- {
- char *nick;
- #else
+#else
+ // P10 Ping
+ if (stricmp(cmd, "G") == 0)
+ {
+ char *timestamp;
+ timestamp = strtok(NULL, " ");
+ raw("[] Z [] %s 0 %s", timestamp + 1, timestamp);
+ }
+#endif
+#ifdef P10
+ else if (stricmp(cmd, "EB") == 0)
+ {
+ raw("[] EA");
+ }
+#endif
+ else if (stricmp(cmd, "VERSION") == 0)
+ {
+ char *server;
+ server = strtok(NULL, " ");
+ server++;
+ raw(":%s 351 %s %s_%s. %s", servername, source+1, PACKAGE, VERSION, servername);
+ }
+ // Code indenting is clean up until here!
+#if !defined(P10)
+ else if (strncmp(cmd, "NICK", 4) == 0)
+ {
+ if (buffer[0] == ':')
+ {
+ aClient *tempPtr;
+ if ((tempPtr = find((source + 1))))
+ {
+ char *nick;
+ unsigned long oldhv, newhv;
+ nick = strtok(NULL, " ");
+ oldhv = iHASH((unsigned char *) tempPtr->getNick());
+ newhv = iHASH((unsigned char *) nick);
+ tempPtr->setNick(nick);
+ clients[oldhv].remove(tempPtr);
+ clients[newhv].push_back(tempPtr);
+ }
+ }
+ else
+ {
+ char *nick;
+#else
} else if (stricmp(cmd, "N") == 0 && strlen(source) == 2) {
{
char *nick, *realnick;
if (nick[0] == '+')
{
- #ifdef DEBUGMODE
+#ifdef DEBUGMODE
log ("aClient has modes");
- #endif
-
+#endif
// Searching for the +r mode (extra parameter)
for (unsigned int count = 1; count < strlen(nick); count++)
{
}
nick = strtok(NULL, " ");
}
- #endif
- aClient *newuser, *temp;
+#endif
+ aClient *newuser;
nick = strtok(NULL, " ");
- #ifdef P10
+#ifdef P10
newuser = new aClient(nick, realnick);
- #else
+#else
newuser = new aClient(nick);
- #endif
-
+#endif
- if (loaded)
- if (isWelcome())
- {
- #ifdef P10
- notice(s_GameServ, nick, welcomemsg, realnick);
- #else
- notice(s_GameServ, nick, welcomemsg, nick);
- #endif
- }
- #ifdef P10
+ if (loaded)
+ if (isWelcome())
+ {
+#ifdef P10
+ notice(s_GameServ, nick, welcomemsg, realnick);
+#else
+ notice(s_GameServ, nick, welcomemsg, nick);
+#endif
+ }
+#ifdef P10
unsigned long hv = sHASH((unsigned char *) nick);
- #else
+#else
unsigned long hv = iHASH((unsigned char *) nick);
- #endif
-
- temp = clients[hv].insertAtBack(newuser);
-
- #if defined(HYBRID) || defined(BAHAMUT) || defined(ULTIMATE2) || defined(PTLINK)
- char *nickserver;
- strtok(NULL, " ");
- strtok(NULL, " ");
- nickserver = strtok(NULL, " ");
- if (nickserver[0] == '+')
- strtok(NULL, " ");
- strtok(NULL, " ");
- nickserver = strtok(NULL, " ");
- for (int x = 0; x < 32; x++)
- {
+#endif
+
+#if defined(HYBRID) || defined(BAHAMUT) || defined(ULTIMATE2) || defined(PTLINK)
+ char *nickserver;
+ strtok(NULL, " ");
+ strtok(NULL, " ");
+ nickserver = strtok(NULL, " ");
+ if (nickserver[0] == '+')
+ strtok(NULL, " ");
+ strtok(NULL, " ");
+ nickserver = strtok(NULL, " ");
+ for (int x = 0; x < 32; x++)
+ {
if (stricmp(ignoreservers[x], nickserver) == 0)
- {
- setIgnore(temp);
+ {
+ setIgnore(newuser);
break;
- }
- }
- #elif defined(UNREAL)
- char *nickserver;
- strtok(NULL, " ");
- strtok(NULL, " ");
- strtok(NULL, " ");
- strtok(NULL, " ");
- nickserver = strtok(NULL, " ");
- for (int x = 0; x < 32; x++)
- {
+ }
+ }
+#elif defined(UNREAL)
+ char *nickserver;
+ strtok(NULL, " ");
+ strtok(NULL, " ");
+ strtok(NULL, " ");
+ strtok(NULL, " ");
+ nickserver = strtok(NULL, " ");
+ for (int x = 0; x < 32; x++)
+ {
if (stricmp(ignoreservers[x], nickserver) == 0)
- {
- setIgnore(temp);
+ {
+ setIgnore(newuser);
break;
- }
- }
- #endif
- delete newuser;
+ }
+ }
+#endif
+ clients[hv].push_back(newuser);
}
- #if defined(P10)
+#if defined(P10)
} else if (stricmp(cmd, "Q") == 0) {
// unsigned long hv = sHASH((unsigned char *) source);
- #else
+#else
} else if (stricmp(cmd, "QUIT") == 0)
{
-// unsigned long hv = iHASH((unsigned char *) source);
+
#endif
aClient *quitter;
char z = source[0];
if (z == ':')
source++;
-
+
+ unsigned long hv = iHASH((unsigned char *) source);
if (!(quitter = find(source)))
{
log("Fatal Error: could not find %s in the "\
goto end;
}
- logout(quitter);
+ clients[hv].remove(quitter);
+ logout(quitter);
+
delete quitter;
if (z == ':')
source--;
- /* Attempting to use the logout() function
- if ((quitter = find(source)))
- clients[hv].remove(quitter);
- if ((quitter = findIRCplayer(source)))
- {
- if (player_fight(quitter))
- {
- // Stop the fight on the other client
- aClient *otherplayer = quitter->stats->battle;
- otherplayer->stats->battle = NULL;
- notice(s_GameServ, otherplayer->getNick(), "%s "\
- "has quit IRC. The fight stops here.",
- quitter->stats->name);
- }
- quitter->stats->battle = NULL;
- quitter->stats->fight = NULL;
- quitter->stats->master = NULL;
-
- quitter->setNick("Not Playing");
- #ifdef P10
- quitter->setRealNick("Not Playing");
- #endif
- quitter->stats->client = NULL; // Unidentify them
- }
- */
-
- #if defined(P10)
+#if defined(P10)
} else if (stricmp(cmd, "P") == 0) {
char *rest, *dest;
char *longname;
delete [] longname;
forest(source, rest);
}
- #else
+#else
} else if (stricmp(cmd, "PRIVMSG") == 0) {
char *rest, *dest;
dest = strtok(NULL, " ");
gameserv(source, rest);
else if (stricmp(dest, c_Forest) == 0 && isListenOnCF())
forest(source, rest);
- #endif
- #if defined(P10)
+#endif
+#if defined(P10)
} else if (stricmp(cmd, "J") == 0) {
- #else
+#else
} else if (stricmp(cmd, "JOIN") == 0) {
- #endif
+#endif
char *channel;
aClient *joiner;
channel = strtok(NULL, " ");
if (z == ':')
source++;
- joiner = find(source);
+ joiner = find(source);
if (stricmp(channel, c_Forest) == 0 && is_playing(joiner))
{
- #ifdef DEBUGMODE
- log("Player %s (IRC: %s) joined %s",
- joiner->stats->getName().c_str(),
- #ifdef P10
- joiner->getRealNick(),
- #else
- joiner->getNick(),
- #endif
- c_Forest);
- #endif
- raw(":%S MODE %s +v %s", c_Forest, (source));
+#ifdef DEBUGMODE
+ log("Player %s (IRC: %s) joined %s",
+ joiner->stats->getName().c_str(),
+#ifdef P10
+ joiner->getRealNick(),
+#else
+ joiner->getNick(),
+#endif
+ c_Forest);
+#endif
+ raw(":%S MODE %s +v %s", c_Forest, (source));
}
if (z == ':')
source--;
- #if defined(BAHAMUT)
+#if defined(BAHAMUT)
} else if (stricmp(cmd, "SJOIN") == 0) {
char *channel, *nick, *tmp, *rest;
strtok(NULL, " "); // Ignore the TS
}
#endif
} else {
- #ifdef DEBUGMODE
+#ifdef DEBUGMODE
log("Unrecognized Message: cmd = %s source = %s", cmd, source);
- #endif
+#endif
}
}
save_gs_dbase();
save_dragon();
saveNews(newsdata, todaysnews);
+ clearClients();
+ clearPlayers();
delete_monsters();
- #ifdef DEBUGMODE
+#ifdef DEBUGMODE
log("<CLOSED>");
- #endif
+#endif
close(sock);
unload_config_file();
aClient *findbynick(char *nick)
{
- ListNode <aClient> *newPtr;
+ list<aClient*>::iterator iter;
#ifdef P10
unsigned long hv = sHASH((unsigned char *) nick);
#else
unsigned long hv = iHASH((unsigned char *) nick);
#endif
-
- newPtr = clients[hv].First();
-
+
aClient *client = NULL;
- while (newPtr)
+ for(iter = clients[hv].begin(); iter != clients[hv].end(); iter++)
{
- client = newPtr->getData();
+ client = (*iter);
#ifdef P10
if (strcmp(client->getNick(), nick) == 0)
{
return client;
}
client = NULL;
- newPtr = newPtr->Next();
}
- return client;
-}
-
-aClient *findIRCplayer(const char *nick)
-{
- ListNode <aClient> *newPtr;
- aClient *p = NULL;
-
- p = find(nick);
-
- if (!is_playing(p))
- return NULL;
-
- unsigned long hv = iHASH((unsigned char *) p->stats->getName().c_str());
-
- for (newPtr = players[hv].First(); newPtr; newPtr = newPtr->Next())
- {
- p = newPtr->getData();
-#ifdef P10
- if (strcmp(p->getNick(), nick) == 0)
- {
-#else
- if (stricmp(p->getNick(), nick) == 0)
- {
-#endif
- return p;
- }
- p = NULL;
- }
- return NULL;
+ return client;
}
-aClient *findplayer(const char *name)
+Player *findplayer(const char *name)
{
- ListNode <aClient> *newPtr;
- Player *p = NULL;
+ list<Player*>::iterator iter;
+ Player *p;
unsigned long hv = iHASH((unsigned char *) name);
- for (newPtr = players[hv].First(); newPtr; newPtr = newPtr->Next())
+ for (iter = players[hv].begin(); iter != players[hv].end(); iter++)
{
- p = newPtr->getData()->stats;
+ p = (*iter);
if (stricmp(p->getName().c_str(), name) == 0)
- return newPtr->getData();
+ return p;
p = NULL;
}
return NULL;
void check_idles()
{
- ListNode <aClient> *newPtr;
- Player *p = NULL;
-
- for (int x = 0; x < U_TABLE_SIZE; x++)
+ list<Player*>::iterator iter;
+ Player *p;
+
+ for (int x = 0; x < U_TABLE_SIZE; x++)
{
- for (newPtr = players[x].First(); newPtr; newPtr = newPtr->Next())
- {
- p = newPtr->getData()->stats;
- switch(p->getLevel())
- {
- case 1:
- if ((time(NULL) - p->lastlogin) / 86400 >= level1expire)
+ for (iter = players[x].begin(); iter != players[x].end(); iter++)
{
- logout(newPtr->getData());
- players[x].remove(newPtr->getData());
- return;
- }
- break;
+ p = (*iter);
- default:
- if ((time(NULL) - p->lastlogin) / 86400 >= defaultexpire)
- {
- logout(newPtr->getData());
- players[x].remove(newPtr->getData());
- return;
+ switch(p->getLevel())
+ {
+ case 1:
+ if ((time(NULL) - p->lastlogin) / 86400 >= level1expire)
+ {
+ logout(p->getClient());
+ return;
+ }
+ break;
+
+ default:
+ if ((time(NULL) - p->lastlogin) / 86400 >= defaultexpire)
+ {
+ logout(p->getClient());
+ return;
+ }
+ break;
+ }
+ if (timedOut(p))
+ {
+ timeOutEvent(p);
+ }
}
- break;
- }
- if (timedOut(p))
- {
- timeOutEvent(p);
- }
- }
}
}
aClient *findbynick(const char *nick)
{
- ListNode <aClient> *newPtr;
- #ifdef P10
- unsigned long hv = sHASH((unsigned char *) nick);
- #else
- unsigned long hv = iHASH((unsigned char *) nick);
- #endif
-
- newPtr = clients[hv].First();
-
- aClient *client = NULL;
-
- while (newPtr)
+ list<aClient*>::iterator iter;
+#ifdef P10
+ unsigned long hv = sHASH((unsigned char *) nick);
+#else
+ unsigned long hv = iHASH((unsigned char *) nick);
+#endif
+
+ aClient *client = NULL;
+
+ for (iter = clients[hv].begin(); iter != clients[hv].end(); iter++)
{
- client = newPtr->getData();
- #ifdef P10
- if (strcmp(client->getNick(), nick) == 0)
- #else
+ client = (*iter);
+#ifdef P10
+ if (strcmp(client->getNick(), nick) == 0)
+#else
if (stricmp(client->getNick(), nick) == 0)
- #endif
- return client;
- client = NULL;
- newPtr = newPtr->Next();
+#endif
+ return client;
+ client = NULL;
}
- return client;
+ return client;
}
/* daemon() - detach process from user and disappear into the background
infile.open(".gsrefresh");
if (infile.fail())
{
- #ifdef DEBUGMODE
+#ifdef DEBUGMODE
log("Error opening .gsrefresh");
- #endif
+#endif
generate:
long mytime = time(NULL);
- #ifdef DEBUGMODE
+#ifdef DEBUGMODE
log("Generating new refresh time");
- #endif
+#endif
// Just a safety measure... tho no one should
// get anywhere near the actual time as their refreshperiod
outfile << lastrollover << endl;
outfile.close();
}
+
+void clearClients()
+{
+ list<aClient*>::iterator iter;
+ for (unsigned long x = 0; x < U_TABLE_SIZE; x++)
+ {
+ for (iter = clients[x].begin(); iter != clients[x].end(); iter++)
+ {
+ delete (*iter);
+ clients[x].erase(iter);
+ }
+ }
+}
+void clearPlayers()
+{
+ list<Player*>::iterator iter;
+ for (unsigned long x = 0; x < U_TABLE_SIZE; x++)
+ {
+ for (iter = players[x].begin(); iter != players[x].end(); iter++)
+ {
+ delete (*iter);
+ players[x].erase(iter);
+ }
+ }
+}