X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/7996e5fd7f1297346c2133c9669013852e87dfca..6f727d4c9eb5c886f14598577f40da583577444e:/gameserv/tcpclient.cpp?ds=sidebyside diff --git a/gameserv/tcpclient.cpp b/gameserv/tcpclient.cpp index a0440ae..7fb0376 100644 --- a/gameserv/tcpclient.cpp +++ b/gameserv/tcpclient.cpp @@ -17,6 +17,7 @@ #include "list.h" #include "aClient.h" #include "extern.h" +#include "flags.h" #include #include #include @@ -36,7 +37,7 @@ using std::cerr; using std::endl; char *PACKAGE = "GameServ"; -char *VERSION = "1.2.0 +devel"; +char *VERSION = "1.2.1 +devel"; int sock; int day; @@ -46,6 +47,7 @@ List clients[U_TABLE_SIZE]; void save_day(); void load_day(); void prettyIntro(); +void check_idles(); // Make this a daemon int daemon(int nochdir, int noclose); @@ -56,7 +58,10 @@ void closeall(int fd); int main(int argc, char *argv[]) { char buffer[1024], buf[1024]; - int connected = 1; + memset(buffer, 0, 1024); + memset(buf, 0, 1024); + int connected; + long lastidlecheck; char *cmd, *source = NULL, *conf = "gameserv.conf"; srand(time(NULL)); @@ -92,44 +97,90 @@ int main(int argc, char *argv[]) if (daemon(1,0) < 0) { perror("Could not turn into a daemon"); - exit(2); + exit(3); } + init_masters(); + load_gs_dbase(); + + if (load_monsters() == false) + goto end; + + shuttingdown = false; + + char ignoreservers[32][256]; + char *currentserver; + currentserver = strtok(ignoreserverslist, " "); + for (int server = 0; server < 32 && currentserver != NULL; server++) + { + strncpy(ignoreservers[server], currentserver, 255); + log("Placing %s on the server ignore list", currentserver); + currentserver = strtok(NULL, " "); + } + + strcpy(boss.name, "Red Dragon"); + strcpy(boss.weapon, "Breath of Unholy Fire"); + boss.strength = 6667; + boss.gold = 2000000000; + boss.exp = 2000000000; + strcpy(boss.death, "You finally snuff out the deadly murderous "\ + "dragon's dark flames. You have freed the land of its terror "\ + "filled reign from above!"); + + + // This loop will retry the connection 3 times + for (int retry = 0; retry < 3 && !shuttingdown; retry++) + { + connected = 1; + load_day(); + + + long int loadtime = time(NULL); + long int currentTime; + long int oldTime = loadtime; - ignore_pipe(); - sock = make_connection(remoteport, SOCK_STREAM, remoteserver); - if (sock == -1) { - fprintf(stderr,"make_connection failed.\n"); + lastidlecheck = loadtime; + + #ifdef DEBUGMODE + log("Setting primary Idle Check timestamp: %ld", lastidlecheck); + #endif + bool loaded = false; + + ignore_pipe(); + sock = make_connection(remoteport, SOCK_STREAM, remoteserver); + if (sock == -1) { + fprintf(stderr,"make_connection failed.\n"); unload_config_file(); return -1; } + log("%S socket connected."); #ifdef UNREAL raw("PROTOCTL NICKv2 VHP"); raw("PASS :%s", remotepass); raw("SERVER %s 1 :%s", servername, servername); - raw("NICK %S 1 %d %S %s %s %d +owghraAxNt %s :%s v%s", time(NULL), gshost, - servername, time(NULL), gshost, PACKAGE, VERSION); + raw("NICK %S 1 %d %S %s %s %d +w%s %s :%s v%s", time(NULL), gshost, + servername, time(NULL), (isBOper() ? "o" : ""), gshost, PACKAGE, VERSION); raw(":%S JOIN %s", c_Forest); - raw(":%S MODE %s +mtn", c_Forest); + raw(":%S MODE %s +tn", c_Forest); #elif defined(BAHAMUT) raw("PASS %s :TS", remotepass); raw("SERVER %s 1 :%s", servername, servername); - raw("NICK %S 1 %d +o %s %s %s 0 :GameServ", time(NULL), gsident, gshost, - servername); - raw(":%s SJOIN %d %d %s +mnt :@%S", servername, time(NULL), time(NULL), c_Forest); + raw("NICK %S 1 %d +w%s %s %s %s 0 :GameServ", time(NULL), (isBOper() ? "o" : ""), + gsident, gshost, servername); + raw(":%s SJOIN %d %d %s +nt :@%S", servername, time(NULL), time(NULL), c_Forest); #elif defined(HYBRID) raw("PASS %s :TS", remotepass); raw("SERVER %s 1 :%s", servername, servername); - raw("NICK %S 1 %d +o %s %s %s :GameServ", time(NULL), gsident, gshost, - servername); - // Sending a timestamp of 1 to force ops. - raw(":%s SJOIN 1 %s +ntm :@%S", servername, c_Forest); + raw("NICK %S 1 %d +w%s %s %s %s :GameServ", time(NULL), (isBOper() ? "o" : ""), + gsident, gshost, servername); + raw(":%s SJOIN %ld %s +nt :@%S", servername, time(NULL), c_Forest); #elif defined(P10) // Server numeric is: [] <-- must be unique raw("PASS :%s", remotepass); raw("SERVER %s 1 %d %d P10 []AAF :%s", servername, time(NULL), time(NULL), servername); - raw("[] N %S 1 %d %s %s DAqAoB %s :%S", time(NULL), gsident, gshost, gsnum); - raw("[] B %s %d +tnm %s:o", c_Forest, time(NULL) - 864000, gsnum); + raw("[] N %S 1 %d %s %s %s DAqAoB %s :%S", time(NULL), gsident, gshost, + (isBOper() ? "+o" : "") gsnum); + raw("[] B %s %d +tn %s:o", c_Forest, time(NULL) - 864000, gsnum); #endif #if defined(P10) @@ -151,26 +202,6 @@ int main(int argc, char *argv[]) log("Server: %s",buffer); #endif - strcpy(boss.name, "Red Dragon"); - strcpy(boss.weapon, "Breath of Unholy Fire"); - boss.strength = 6667; - boss.gold = 2000000000; - boss.exp = 2000000000; - strcpy(boss.death, "You finally snuff out the deadly murderous "\ - "dragon's dark flames. You have freed the land of its terror "\ - "filled reign from above!"); - - init_masters(); - load_gs_dbase(); - load_day(); - long int loadtime = time(NULL); - long int currentTime; - long int oldTime = loadtime; - bool loaded = false; - - if (load_monsters() == false) - goto end; - while (connected) { if (sock_gets(sock,buffer,sizeof(buffer)) == -1) { connected = 0; @@ -198,7 +229,19 @@ int main(int argc, char *argv[]) if (!loaded) { if (time(NULL) >= welcomedelay + loadtime) + { loaded = true; + retry = 0; // Start the reconnection cycle over + } + } + else + { + long TIME = time(NULL); + if (TIME - lastidlecheck >= idlecheckperiod) + { + check_idles(); + lastidlecheck = TIME; + } } // Save the player data every updateperiod seconds @@ -206,6 +249,7 @@ int main(int argc, char *argv[]) if (currentTime - oldTime >= updateperiod) { oldTime = currentTime; + log("Saving to %s", playerdata); save_gs_dbase(); } @@ -238,8 +282,13 @@ int main(int argc, char *argv[]) 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].insertAtBack(tempPtr); } } else @@ -272,7 +321,7 @@ int main(int argc, char *argv[]) nick = strtok(NULL, " "); } #endif - aClient *newuser; + aClient *newuser, *temp; nick = strtok(NULL, " "); @@ -289,14 +338,41 @@ int main(int argc, char *argv[]) #else notice(s_GameServ, nick, welcomemsg, nick); #endif - unsigned long hv = HASH((unsigned char *) nick, U_TABLE_SIZE); - clients[hv].insertAtBack(newuser); + #ifdef P10 + unsigned long hv = sHASH((unsigned char *) nick) + #else + unsigned long hv = iHASH((unsigned char *) nick); + #endif + + temp = clients[hv].insertAtBack(newuser); + + #if defined(HYBRID) || defined(BAHAMUT) + 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); + break; + } + } + #endif delete newuser; } #if defined(P10) } else if (stricmp(cmd, "Q") == 0) { +// unsigned long hv = sHASH((unsigned char *) source); #else } else if (stricmp(cmd, "QUIT") == 0) { +// unsigned long hv = iHASH((unsigned char *) source); #endif aClient *quitter; char z = source[0]; @@ -304,7 +380,19 @@ int main(int argc, char *argv[]) if (z == ':') source++; - unsigned long hv = HASH((unsigned char *) source, U_TABLE_SIZE); + if (!(quitter = find(source))) + { + log("Fatal Error: could not find %s in the "\ + "clients list", source); + goto end; + } + + logout(quitter); + + if (z == ':') + source--; + + /* Attempting to use the logout() function if ((quitter = find(source))) clients[hv].remove(quitter); if ((quitter = findIRCplayer(source))) @@ -322,15 +410,13 @@ int main(int argc, char *argv[]) quitter->stats->fight = NULL; quitter->stats->master = NULL; - quitter->setNick("!NULL!"); + quitter->setNick("Not Playing"); #ifdef P10 - quitter->setRealNick("!NULL!"); + quitter->setRealNick("Not Playing"); #endif - quitter->stats->user = NULL; // Unidentify them + quitter->stats->client = NULL; // Unidentify them } - - if (z == ':') - source--; + */ #if defined(P10) } else if (stricmp(cmd, "P") == 0) { @@ -347,7 +433,7 @@ int main(int argc, char *argv[]) delete [] longname; gameserv(source, rest); } - else if (stricmp(dest, c_Forest) == 0) + else if (stricmp(dest, c_Forest) == 0 && isListenOnCF()) { delete [] longname; forest(source, rest); @@ -428,6 +514,8 @@ int main(int argc, char *argv[]) } } + } // for loop for connection retry + end: save_gs_dbase(); @@ -460,7 +548,7 @@ aClient *find(const char *nick) aClient *findbyrealnick(char *realnick) { ListNode *newPtr; - unsigned long hv = HASH((unsigned char *) realnick, U_TABLE_SIZE); + unsigned long hv = sHASH((unsigned char *) realnick); newPtr = clients[hv].First(); aClient *client = NULL; @@ -488,7 +576,12 @@ aClient *findbyrealnick(char *realnick) aClient *findbynick(char *nick) { ListNode *newPtr; - unsigned long hv = HASH((unsigned char *) nick, U_TABLE_SIZE); + #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; @@ -513,7 +606,13 @@ aClient *findIRCplayer(const char *nick) ListNode *newPtr; aClient *p = NULL; - unsigned long hv = HASH((unsigned char *) nick, U_TABLE_SIZE); + p = find(nick); + + if (!is_playing(p)) + return NULL; + + unsigned long hv = iHASH((unsigned char *) p->stats->name); + for (newPtr = players[hv].First(); newPtr; newPtr = newPtr->Next()) { p = newPtr->getData(); @@ -527,11 +626,12 @@ aClient *findIRCplayer(const char *nick) } return NULL; } + aClient *findplayer(const char *name) { ListNode *newPtr; Player *p = NULL; - unsigned long hv = HASH((unsigned char *) name, U_TABLE_SIZE); + unsigned long hv = iHASH((unsigned char *) name); for (newPtr = players[hv].First(); newPtr; newPtr = newPtr->Next()) { p = newPtr->getData()->stats; @@ -542,10 +642,33 @@ aClient *findplayer(const char *name) return NULL; } +void check_idles() +{ + ListNode *newPtr; + Player *p = NULL; + + for (int x = 0; x < U_TABLE_SIZE; x++) + { + for (newPtr = players[x].First(); newPtr; newPtr = newPtr->Next()) + { + p = newPtr->getData()->stats; + if (timedOut(p)) + { + timeOutEvent(p); + } + } + } +} + aClient *findbynick(const char *nick) { ListNode *newPtr; - unsigned long hv = HASH((unsigned char *) nick, U_TABLE_SIZE); + #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;