Updated the Change log

[irc/gameservirc.git] / gameserv / tcpclient.cpp

diff --git a/gameserv/tcpclient.cpp b/gameserv/tcpclient.cpp
index 62cf3f6f783222b45167d590fb659f6b6fa30044..723b546fa8c59d0c8c89ae539dfa0afce5c0f8d0 100644 (file)
--- a/gameserv/tcpclient.cpp
+++ b/gameserv/tcpclient.cpp
@@ -20,13 +20,14 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
-#include <iostream.h>
-#include <fstream.h>
-#include <iomanip.h>
+#include <fstream>
 #include <stdlib.h>
 
+using std::ofstream;
+using std::ifstream;
+
 char *PACKAGE = "GameServ";
-char *VERSION = "1.1.8";
+char *VERSION = "1.1.7";
 
 int sock;
 long timestamp;
@@ -68,16 +69,31 @@ int main()
         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);
+#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);
 #endif
+
+#if defined(P10)
+       raw("%s T %s :%s", gsnum, c_Forest, c_ForestTopic);
+       raw("[] EB");  // End burst
+#else   
        raw(":%S MODE %s +o %S", c_Forest);
        raw(":%S TOPIC %s :%s", c_Forest, c_ForestTopic);
+#endif
 
   sock_gets(sock,buffer,sizeof(buffer)-1); /* -1 added thanks to
     David Duchene <dave@ltd.com> for pointing out the possible
     buffer overflow resulting from the linefeed added below. */
 
 
-  printf("Server: %s\n",buffer);
+  #ifdef DEBUGMODE
+      log("Server: %s",buffer);
+  #endif
+
   init_masters();
   load_gs_dbase();
   load_timestamp();
@@ -95,6 +111,7 @@ int main()
       }
        strcpy(buf, buffer);
 
+      #if !defined(P10)
         if (buffer[0] == ':')
        {
            source = strtok(buf, " ");
@@ -102,8 +119,14 @@ int main()
        }
        else
            cmd = strtok(buf, " ");
+      #else
+           source = strtok(buf, " ");
+           cmd = strtok(NULL, " ");
+      #endif
 
-       cout << "Server: " << buffer << endl << flush;
+       #ifdef DEBUGMODE
+           log("Server: %s", buffer);
+       #endif
 
        // Wait N seconds then we're loaded.
         if (!loaded)
@@ -120,15 +143,28 @@ int main()
            save_gs_dbase();
        }
 
+
+      #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] == ':')
            {
@@ -143,8 +179,36 @@ int main()
            else
            {
                char *nick;
+      #else
+       } else if (stricmp(cmd, "N") == 0 && strlen(source) == 2) {
+           {   
+               char *nick;
+
+               for (int x = 0; x < 6; x++)
+                     nick = strtok(NULL, " ");
+
+               if (nick[0] == '+')
+               {
+                   #ifdef DEBUGMODE
+                   log ("aClient has modes");
+                   #endif
+
+                   // Searching for the +r mode (extra parameter)
+                   for (unsigned int count = 1; count < strlen(nick); count++)
+                   {
+                       if (nick[count] == 'r')
+                       {
+                           nick = strtok(NULL, " ");
+                           break;
+                       }
+                   }
+                   nick = strtok(NULL, " ");
+               }
+      #endif
                aClient *newuser;
+
                nick = strtok(NULL, " ");
+
                newuser = new aClient(nick);
                if (loaded)
                    notice(s_GameServ, nick, welcomemsg, nick);
@@ -152,16 +216,49 @@ int main()
                clients.insertAtBack(newuser);
                delete newuser;
            }
+      #if defined(P10)
+       } else if (stricmp(cmd, "Q") == 0) {
+      #else
        } else if (stricmp(cmd, "QUIT") == 0) {
+      #endif
            aClient *quitter;
-           if ((quitter = find(source + 1)))
+           char z = source[0];
+
+           if (z == ':')
+               source++;
+
+           if ((quitter = find(source)))
                clients.remove(quitter);
-           if ((quitter = findIRCplayer(source + 1)))
+           if ((quitter = findIRCplayer(source)))
            {
                quitter->setNick("!NULL!");
                quitter->stats->user = NULL; // Unidentify them
            }
 
+           if (z == ':')
+               source--;
+
+      #if defined(P10)
+       } else if (stricmp(cmd, "P") == 0) {
+           char *rest, *dest;
+           char *longname;
+           longname = new char[strlen(s_GameServ) + strlen(servername) + 2];
+
+           sprintf(longname, "%S@%s", servername);
+
+           dest = strtok(NULL, " ");
+           rest = strtok(NULL, "");
+           if (stricmp(dest, gsnum) == 0 || stricmp(dest, longname) == 0)
+           {
+               delete [] longname;
+               gameserv(source, rest);
+           }
+           else if (stricmp(dest, c_Forest) == 0)
+           {
+               delete [] longname;
+               forest(source, rest);
+           }
+      #else
        } else if (stricmp(cmd, "PRIVMSG") == 0) {
            char *rest, *dest;
            dest = strtok(NULL, " ");
@@ -170,6 +267,7 @@ int main()
                gameserv(source, rest);
            else if (stricmp(dest, c_Forest) == 0)
                forest(source, rest);
+      #endif
        } else if (stricmp(cmd, "JOIN") == 0) {
            char *channel;
            channel = strtok(NULL, " ");
@@ -190,8 +288,9 @@ int main()
        #endif
 
        } else {
-          // cout << "Unrecognized Message: cmd = " << cmd << setw(30) << "source = " << 
-          //       source << endl;
+           #ifdef DEBUGMODE
+               log("Unrecognized Message: cmd = %s   source = %s", cmd, source);
+           #endif
        }
   }
 
@@ -203,7 +302,10 @@ int main()
   delete_monsters();
   delete_masters();
 
-  printf("<CLOSED>\n");
+  #ifdef DEBUGMODE
+      log("<CLOSED>");
+  #endif
+
   close(sock);
   unload_config_file();
   return 0;
@@ -293,9 +395,14 @@ void load_timestamp()
 
     if (infile.fail())
     {
-       cout << "Error opening .gstimestamp" << endl;
-       cout << "Generating new timestamp" << endl;
+       #ifdef DEBUGMODE
+           log("Error opening .gstimestamp");
+       #endif
+
        generate:
+        #ifdef DEBUGMODE
+           log("Generating new timestamp");
+       #endif
        timestamp = midnight();
         save_timestamp();
        return;
@@ -315,7 +422,7 @@ void save_timestamp()
 
     if (outfile.fail())
     {
-       cout << "Error creating new file." << endl;
+       log("Error creating new file .gstimestamp");
        return;
     }