|
|
@@ -30,141 +30,14 @@
|
|
|
#include "network/netObject.h"
|
|
|
#include "game/gameConnection.h"
|
|
|
#include "network/serverQuery.h"
|
|
|
+#include "network/RemoteCommandEvent.h"
|
|
|
+
|
|
|
+#include "RemoteCommandEvent_ScriptBinding.h"
|
|
|
|
|
|
//----------------------------------------------------------------
|
|
|
// remote procedure call console functions
|
|
|
//----------------------------------------------------------------
|
|
|
|
|
|
-class RemoteCommandEvent : public NetEvent
|
|
|
-{
|
|
|
-public:
|
|
|
- enum {
|
|
|
- MaxRemoteCommandArgs = 20,
|
|
|
- CommandArgsBits = 5
|
|
|
- };
|
|
|
-
|
|
|
-private:
|
|
|
- S32 mArgc;
|
|
|
- char *mArgv[MaxRemoteCommandArgs + 1];
|
|
|
- NetStringHandle mTagv[MaxRemoteCommandArgs + 1];
|
|
|
- static char mBuf[1024];
|
|
|
-public:
|
|
|
- RemoteCommandEvent(S32 argc=0, const char **argv=NULL, NetConnection *conn = NULL)
|
|
|
- {
|
|
|
- mArgc = argc;
|
|
|
- for(S32 i = 0; i < argc; i++)
|
|
|
- {
|
|
|
- if(argv[i][0] == StringTagPrefixByte)
|
|
|
- {
|
|
|
- char buffer[256];
|
|
|
- mTagv[i+1] = NetStringHandle(dAtoi(argv[i]+1));
|
|
|
- if(conn)
|
|
|
- {
|
|
|
- dSprintf(buffer + 1, sizeof(buffer) - 1, "%d", conn->getNetSendId(mTagv[i+1]));
|
|
|
- buffer[0] = StringTagPrefixByte;
|
|
|
- mArgv[i+1] = dStrdup(buffer);
|
|
|
- }
|
|
|
- }
|
|
|
- else
|
|
|
- mArgv[i+1] = dStrdup(argv[i]);
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
-#ifdef TORQUE_DEBUG_NET
|
|
|
- const char *getDebugName()
|
|
|
- {
|
|
|
- static char buffer[256];
|
|
|
- dSprintf(buffer, sizeof(buffer), "%s [%s]", getClassName(), gNetStringTable->lookupString(dAtoi(mArgv[1] + 1)) );
|
|
|
- return buffer;
|
|
|
- }
|
|
|
-#endif
|
|
|
-
|
|
|
- ~RemoteCommandEvent()
|
|
|
- {
|
|
|
- for(S32 i = 0; i < mArgc; i++)
|
|
|
- dFree(mArgv[i+1]);
|
|
|
- }
|
|
|
-
|
|
|
- virtual void pack(NetConnection* conn, BitStream *bstream)
|
|
|
- {
|
|
|
- bstream->writeInt(mArgc, CommandArgsBits);
|
|
|
- // write it out reversed... why?
|
|
|
- // automatic string substitution with later arguments -
|
|
|
- // handled automatically by the system.
|
|
|
-
|
|
|
- for(S32 i = 0; i < mArgc; i++)
|
|
|
- conn->packString(bstream, mArgv[i+1]);
|
|
|
- }
|
|
|
-
|
|
|
- virtual void write(NetConnection* conn, BitStream *bstream)
|
|
|
- {
|
|
|
- pack(conn, bstream);
|
|
|
- }
|
|
|
-
|
|
|
- virtual void unpack(NetConnection* conn, BitStream *bstream)
|
|
|
- {
|
|
|
-
|
|
|
- mArgc = bstream->readInt(CommandArgsBits);
|
|
|
- // read it out backwards
|
|
|
- for(S32 i = 0; i < mArgc; i++)
|
|
|
- {
|
|
|
- conn->unpackString(bstream, mBuf);
|
|
|
- mArgv[i+1] = dStrdup(mBuf);
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- virtual void process(NetConnection *conn)
|
|
|
- {
|
|
|
- static char idBuf[10];
|
|
|
-
|
|
|
- // de-tag the command name
|
|
|
-
|
|
|
- for(S32 i = mArgc - 1; i >= 0; i--)
|
|
|
- {
|
|
|
- char *arg = mArgv[i+1];
|
|
|
- if(*arg == StringTagPrefixByte)
|
|
|
- {
|
|
|
- // it's a tag:
|
|
|
- U32 localTag = dAtoi(arg + 1);
|
|
|
- NetStringHandle tag = conn->translateRemoteStringId(localTag);
|
|
|
- NetStringTable::expandString( tag,
|
|
|
- mBuf,
|
|
|
- sizeof(mBuf),
|
|
|
- (mArgc - 1) - i,
|
|
|
- (const char**)(mArgv + i + 2) );
|
|
|
- dFree(mArgv[i+1]);
|
|
|
- mArgv[i+1] = dStrdup(mBuf);
|
|
|
- }
|
|
|
- }
|
|
|
- const char *rmtCommandName = dStrchr(mArgv[1], ' ') + 1;
|
|
|
- if(conn->isConnectionToServer())
|
|
|
- {
|
|
|
- dStrcpy(mBuf, "clientCmd");
|
|
|
- dStrcat(mBuf, rmtCommandName);
|
|
|
-
|
|
|
- char *temp = mArgv[1];
|
|
|
- mArgv[1] = mBuf;
|
|
|
-
|
|
|
- Con::execute(mArgc, (const char **) mArgv+1);
|
|
|
- mArgv[1] = temp;
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- dStrcpy(mBuf, "serverCmd");
|
|
|
- dStrcat(mBuf, rmtCommandName);
|
|
|
- char *temp = mArgv[1];
|
|
|
-
|
|
|
- dSprintf(idBuf, sizeof(idBuf), "%d", conn->getId());
|
|
|
- mArgv[0] = mBuf;
|
|
|
- mArgv[1] = idBuf;
|
|
|
-
|
|
|
- Con::execute(mArgc+1, (const char **) mArgv);
|
|
|
- mArgv[1] = temp;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- DECLARE_CONOBJECT(RemoteCommandEvent);
|
|
|
-};
|
|
|
char RemoteCommandEvent::mBuf[1024];
|
|
|
|
|
|
IMPLEMENT_CO_NETEVENT_V1(RemoteCommandEvent);
|
|
|
@@ -188,114 +61,3 @@ static void sendRemoteCommand(NetConnection *conn, S32 argc, const char **argv)
|
|
|
RemoteCommandEvent *cevt = new RemoteCommandEvent(argc, argv, conn);
|
|
|
conn->postNetEvent(cevt);
|
|
|
}
|
|
|
-
|
|
|
-ConsoleFunctionGroupBegin( Net, "Functions for use with the network; tagged strings and remote commands.");
|
|
|
-
|
|
|
-ConsoleFunction( commandToServer, void, 2, RemoteCommandEvent::MaxRemoteCommandArgs + 1, "( func [ , arg1, ... , argn ] ) Use the commandToServer function to issue a remote procedure call the server.\n"
|
|
|
- "All arguments may be in tagged or non-tagged format. See 'Remote Procedure Call Samples' below\n"
|
|
|
- "@param func The suffix of the remote procedure name to be executed on the client.\n"
|
|
|
- "@param arg1 ... argn - Optional arguments to be passed to the remote procedure.\n"
|
|
|
- "@return No return value.")
|
|
|
-{
|
|
|
- NetConnection *conn = NetConnection::getConnectionToServer();
|
|
|
- if(!conn)
|
|
|
- return;
|
|
|
- sendRemoteCommand(conn, argc - 1, argv + 1);
|
|
|
-}
|
|
|
-
|
|
|
-ConsoleFunction( commandToClient, void, 3, RemoteCommandEvent::MaxRemoteCommandArgs + 2, "( client, func [ , arg1, ... , argn ] ) Use the commandToClient function to issue a remote procedure call on a client.\n"
|
|
|
- "All arguments (excluding client) may be in tagged or non-tagged format. See 'Remote Procedure Call Samples' below\n"
|
|
|
- "@param client The numeric ID of a client gameConnection.\n"
|
|
|
- "@param func The suffix of the remote procedure name to be executed on the client.\n"
|
|
|
- "@param arg1 ... argn - Optional arguments to be passed to the remote procedure.\n"
|
|
|
- "@return No return value.")
|
|
|
-{
|
|
|
- NetConnection *conn;
|
|
|
- if(!Sim::findObject(argv[1], conn))
|
|
|
- return;
|
|
|
- sendRemoteCommand(conn, argc - 2, argv + 2);
|
|
|
-}
|
|
|
-
|
|
|
-ConsoleFunction(removeTaggedString, void, 2, 2, "( tag ) Use the removeTaggedSTring function to remove a previously tagged string from the NetStringTable.\n"
|
|
|
- "@param tag A number tag ID.\n"
|
|
|
- "@return No return value")
|
|
|
-{
|
|
|
- gNetStringTable->removeString(dAtoi(argv[1]+1), true);
|
|
|
-}
|
|
|
-
|
|
|
-ConsoleFunction( addTaggedString, const char*, 2, 2, "( string ) Use the addTaggedString function to tag a new string and add it to the NetStringTable.\n"
|
|
|
- "@param string The string to tagged and placed in the NetStringTable. Tagging ignores case, so tagging the same string (excluding case differences) will be ignored as a duplicated tag.\n"
|
|
|
- "@return Returns a string (containing a numeric value) equivalent to the string ID for the newly tagged string")
|
|
|
-{
|
|
|
- NetStringHandle s(argv[1]);
|
|
|
- gNetStringTable->incStringRefScript(s.getIndex());
|
|
|
-
|
|
|
- char *ret = Con::getReturnBuffer(10);
|
|
|
- ret[0] = StringTagPrefixByte;
|
|
|
- dSprintf(ret + 1, 9, "%d", s.getIndex());
|
|
|
- return ret;
|
|
|
-}
|
|
|
-
|
|
|
-ConsoleFunction( getTaggedString, const char*, 2, 2, "( tag ) Use the getTaggedString function to convert a tag to a string. This is not the same a detag() which can only be used within the context of a function that receives a tag. This function can be used any time and anywhere to convert a tag to a string.\n"
|
|
|
- "@param tag A numeric tag ID.\n"
|
|
|
- "@return Returns the string corresponding to the tag ID")
|
|
|
-{
|
|
|
- const char *indexPtr = argv[1];
|
|
|
- if (*indexPtr == StringTagPrefixByte)
|
|
|
- indexPtr++;
|
|
|
- return gNetStringTable->lookupString(dAtoi(indexPtr));
|
|
|
-}
|
|
|
-
|
|
|
-ConsoleFunction( buildTaggedString, const char*, 2, 11, "( format , <arg1, ...arg9> ) Use the buildTaggedString function to build a tagged string using the specified format.\n"
|
|
|
- "@param enable A boolean value. If set to true, network packet logging is enabled, otherwise it is disabled.\n"
|
|
|
- "@return No return value")
|
|
|
-{
|
|
|
- const char *indexPtr = argv[1];
|
|
|
- if (*indexPtr == StringTagPrefixByte)
|
|
|
- indexPtr++;
|
|
|
- const char *fmtString = gNetStringTable->lookupString(dAtoi(indexPtr));
|
|
|
- char *strBuffer = Con::getReturnBuffer(512);
|
|
|
- const char *fmtStrPtr = fmtString;
|
|
|
- char *strBufPtr = strBuffer;
|
|
|
- S32 strMaxLength = 511;
|
|
|
- if (!fmtString)
|
|
|
- goto done;
|
|
|
-
|
|
|
- //build the string
|
|
|
- while (*fmtStrPtr)
|
|
|
- {
|
|
|
- //look for an argument tag
|
|
|
- if (*fmtStrPtr == '%')
|
|
|
- {
|
|
|
- if (fmtStrPtr[1] >= '1' && fmtStrPtr[1] <= '9')
|
|
|
- {
|
|
|
- S32 argIndex = S32(fmtStrPtr[1] - '0') + 1;
|
|
|
- if (argIndex >= argc)
|
|
|
- goto done;
|
|
|
- const char *argStr = argv[argIndex];
|
|
|
- if (!argStr)
|
|
|
- goto done;
|
|
|
- S32 strLength = dStrlen(argStr);
|
|
|
- if (strLength > strMaxLength)
|
|
|
- goto done;
|
|
|
- dStrcpy(strBufPtr, argStr);
|
|
|
- strBufPtr += strLength;
|
|
|
- strMaxLength -= strLength;
|
|
|
- fmtStrPtr += 2;
|
|
|
- continue;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- //if we don't continue, just copy the character
|
|
|
- if (strMaxLength <= 0)
|
|
|
- goto done;
|
|
|
- *strBufPtr++ = *fmtStrPtr++;
|
|
|
- strMaxLength--;
|
|
|
- }
|
|
|
-
|
|
|
-done:
|
|
|
- *strBufPtr = '\0';
|
|
|
- return strBuffer;
|
|
|
-}
|
|
|
-
|
|
|
-ConsoleFunctionGroupEnd( Net );
|
Charlie Patterson