X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/3f243b0be519a8112e77adb77930bcb5f8a8a898..e3ede4a7b12fd781e2ea8f7a97adb7806629d59f:/gameserv/tcpclient.cpp

diff --git a/gameserv/tcpclient.cpp b/gameserv/tcpclient.cpp
index 5aa65b3..b54dba7 100644
--- a/gameserv/tcpclient.cpp
+++ b/gameserv/tcpclient.cpp
@@ -29,15 +29,13 @@
 //#include <sys/wait.h>
 //#include <errno.h>
 
-
-
 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.1 +devel";
 
 int sock;
 int day;
@@ -57,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
@@ -77,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();
@@ -91,6 +93,9 @@ int main(int argc, char *argv[])
   else
   	exit(2);
 
+    if (argc <= 1)
+	delete []conf;
+
     // Turn into a daemon
     if (daemon(1,0) < 0)
     {
@@ -156,27 +161,28 @@ int main(int argc, char *argv[])
 	raw("PROTOCTL NICKv2 VHP");
 	raw("PASS :%s", remotepass);
 	raw("SERVER %s 1 :%s", servername, servername);
-	raw("NICK %S 1 %d %S %s %s %d +wghraAxNt %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 +tn", c_Forest);
 #elif defined(BAHAMUT)
 	raw("PASS %s :TS", remotepass);
 	raw("SERVER %s 1 :%s", servername, servername);
-        raw("NICK %S 1 %d +w %s %s %s 0 :GameServ", time(NULL), gsident, gshost, 
-		servername);
+        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 +w %s %s %s :GameServ", time(NULL), gsident, gshost,
-		servername);
+	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("[] 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
 
@@ -343,7 +349,7 @@ int main(int argc, char *argv[])
 
 		temp = clients[hv].insertAtBack(newuser);
 
-		#ifdef HYBRID
+		#if defined(HYBRID) || defined(BAHAMUT)
 		    char *nickserver;
 		    strtok(NULL, " ");
 		    strtok(NULL, " ");
@@ -366,10 +372,10 @@ int main(int argc, char *argv[])
 	    }
       #if defined(P10)
 	} else if (stricmp(cmd, "Q") == 0) {
-	    unsigned long hv = sHASH((unsigned char *) source);
+//	    unsigned long hv = sHASH((unsigned char *) source);
       #else
 	} else if (stricmp(cmd, "QUIT") == 0) {
-	    unsigned long hv = iHASH((unsigned char *) source);
+//	    unsigned long hv = iHASH((unsigned char *) source);
       #endif
 	    aClient *quitter;
 	    char z = source[0];
@@ -430,7 +436,7 @@ int main(int argc, char *argv[])
 		delete [] longname;
 		gameserv(source, rest);
 	    }
-	    else if (stricmp(dest, c_Forest) == 0 && listenonc_forest)
+	    else if (stricmp(dest, c_Forest) == 0 && isListenOnCF())
 	    {
 		delete [] longname;
 		forest(source, rest);