Changeset 112 for trunk/src/trinitycore/RASocket.cpp

Timestamp:

11/19/08 13:37:14 (17 years ago)

Author:

yumileroy

Message:

[svn] * Merge CLI Commands with regular commands and give them level4 access. sec_console. Source mangos - thanks to ogeraisi for the amalgamated patch.
* Redid/Fixed/Added some lang strings.
* As usual remember this is a trunk rev so stability only guaranteed on northern countries of Mars and western parts of Pluto. No warranties outside the solar system, sorry :( . Check with your local government or dictator on regulations regarding export.

Original author: KingPin?
Date: 2008-10-26 13:32:42-05:00

Files:

• trunk/src/trinitycore/RASocket.cpp (modified) (3 diffs)

trunk/src/trinitycore/RASocket.cpp

@@ -45 +45 @@
 typedef int(* pPrintf)(const char*,...);
 
-void ParseCommand(pPrintf zprintf, char*command);
+void ParseCommand(CliCommandHolder::Print*, char*command);
 
 /// RASocket constructor
@@ -223 +223 @@
                 {
                     sLog.outRALog("Got '%s' cmd.\n",buff);
-                    ParseCommand(&RASocket::zprintf , buff);
+                    sWorld.QueueCliCommand(&RASocket::zprint , buff);
                 }
                 else
@@ -235 +235 @@
 
 /// Output function
-int RASocket::zprintf( const char * szText, ... )
-{
-    if( !szText ) return 0;
-    va_list ap;
-    va_start(ap, szText);
-    /// \todo Remove buffer length here. Can be >1024 (e.g. list of users)
-    char *megabuffer=new char[1024];
-    unsigned int sz=vsnprintf(megabuffer,1024,szText,ap);
+void RASocket::zprint( const char * szText )
+{
+    if( !szText )
+        return;
+
     #ifdef RA_CRYPT
+
+        char *megabuffer=strdup(szText);
+    unsigned int sz=strlen(megabuffer);
     Encrypt(megabuffer,sz);
+        send(r,megabuffer,sz,0);
+    delete [] megabuffer;
+    
+        #else
+
+    unsigned int sz=strlen(szText);
+    send(r,szText,sz,0);
+
     #endif
-
-    send(r,megabuffer,sz,0);
-    delete [] megabuffer;
-    va_end(ap);
-    return 0;
-}
+}