X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/0b6098d5181341bad81f5a23a709110e4678ce2c..7cc338f616a11e910933a1d2206d8a0811544195:/gameserv/tcpclient.cpp diff --git a/gameserv/tcpclient.cpp b/gameserv/tcpclient.cpp index 4220155..7230650 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 @@ -28,15 +29,13 @@ //#include //#include - - using std::ofstream; using std::ifstream; using std::cerr; using std::endl; char *PACKAGE = "GameServ"; -char *VERSION = "1.2.0 +devel"; +char *VERSION = "1.2.3 +devel"; int sock; int day; @@ -56,11 +55,15 @@ void closeall(int fd); int main(int argc, char *argv[]) { - char buffer[1024], buf[1024]; - int connected; - long lastidlecheck; - char *cmd, *source = NULL, *conf = "gameserv.conf"; - srand(time(NULL)); + char buffer[1024], buf[1024]; + memset(buffer, 0, 1024); + memset(buf, 0, 1024); + int connected; + long lastidlecheck; + char *cmd, *source = NULL, *conf; + srand(time(NULL)); + conf = new char[16]; + strcpy(conf, "gameserv.conf"); /* * This needs to be fixed to work for any number of arguments in any @@ -76,8 +79,8 @@ int main(int argc, char *argv[]) cout << "--help Displays this help dialogue" << endl; return 1; } - conf = new char[strlen(argv[1])]; - strcpy(conf, argv[1]); + delete []conf; + conf = argv[1]; } prettyIntro(); @@ -90,36 +93,55 @@ int main(int argc, char *argv[]) else exit(2); + if (argc <= 1) + delete []conf; + // Turn into a daemon if (daemon(1,0) < 0) { perror("Could not turn into a daemon"); - exit(2); + exit(3); } init_masters(); load_gs_dbase(); + cout << "Loading news" << endl; + loadNews(newsdata, todaysnews); if (load_monsters() == false) goto end; - shuttingdown = false; + 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.strength = 2500; boss.gold = 2000000000; boss.exp = 2000000000; + boss.maxhp = 6667; + boss.hp = 6667; 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; @@ -138,43 +160,57 @@ int main(int argc, char *argv[]) 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(ULTIMATE2) + raw("PASS %s :TS", remotepass); + raw("SERVER %s 1 :%s", servername, servername); + raw("NICK %S 1 %d %s %s %s 0 :GameServ", + time(NULL), gsident, gshost, servername); + if (isBOper()) + raw(":%S mode %S +o"); + raw(":%S JOIN %s", 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) raw("%s T %s :%s", gsnum, c_Forest, c_ForestTopic); raw("[] EB"); // End burst #else -#ifndef HYBRID - raw(":%S MODE %s +o %S", c_Forest); -#endif + #ifndef HYBRID + #if defined(ULTIMATE2) + raw(":%s MODE %s +o %S %ld", servername, c_Forest, + time(NULL)); + #else + raw(":%S MODE %s +o %S", c_Forest); + #endif + #endif raw(":%S TOPIC %s :%s", c_Forest, c_ForestTopic); #endif @@ -236,6 +272,7 @@ int main(int argc, char *argv[]) oldTime = currentTime; log("Saving to %s", playerdata); save_gs_dbase(); + saveNews(newsdata, todaysnews); } @@ -269,9 +306,8 @@ int main(int argc, char *argv[]) char *nick; unsigned long oldhv, newhv; nick = strtok(NULL, " "); - oldhv = HASH((unsigned char *) tempPtr->getNick(), - U_TABLE_SIZE); - newhv = HASH((unsigned char *) nick, U_TABLE_SIZE); + oldhv = iHASH((unsigned char *) tempPtr->getNick()); + newhv = iHASH((unsigned char *) nick); tempPtr->setNick(nick); clients[oldhv].remove(tempPtr); clients[newhv].insertAtBack(tempPtr); @@ -307,7 +343,7 @@ int main(int argc, char *argv[]) nick = strtok(NULL, " "); } #endif - aClient *newuser; + aClient *newuser, *temp; nick = strtok(NULL, " "); @@ -319,19 +355,64 @@ int main(int argc, char *argv[]) if (loaded) + + if (isWelcome()) + { + #ifdef P10 + notice(s_GameServ, nick, welcomemsg, realnick); + #else + notice(s_GameServ, nick, welcomemsg, nick); + #endif + } #ifdef P10 - notice(s_GameServ, nick, welcomemsg, realnick); - #else - notice(s_GameServ, nick, welcomemsg, nick); + 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) || defined(ULTIMATE2) + 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; + } + } + #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); + break; + } + } #endif - unsigned long hv = HASH((unsigned char *) nick, U_TABLE_SIZE); - clients[hv].insertAtBack(newuser); 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]; @@ -339,7 +420,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))) @@ -363,9 +456,7 @@ int main(int argc, char *argv[]) #endif quitter->stats->client = NULL; // Unidentify them } - - if (z == ':') - source--; + */ #if defined(P10) } else if (stricmp(cmd, "P") == 0) { @@ -382,7 +473,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); @@ -394,7 +485,7 @@ int main(int argc, char *argv[]) rest = strtok(NULL, ""); if (strnicmp(dest, s_GameServ, strlen(s_GameServ)) == 0) gameserv(source, rest); - else if (stricmp(dest, c_Forest) == 0) + else if (stricmp(dest, c_Forest) == 0 && isListenOnCF()) forest(source, rest); #endif #if defined(P10) @@ -468,6 +559,7 @@ int main(int argc, char *argv[]) end: save_gs_dbase(); + saveNews(newsdata, todaysnews); save_day(); delete_monsters(); @@ -497,7 +589,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; @@ -525,7 +617,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; @@ -550,7 +647,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(); @@ -569,7 +672,7 @@ 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; @@ -601,7 +704,12 @@ void check_idles() 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;