2 files changed, 49 insertions, 37 deletions

diff --git a/src/LuaSL/LuaSL_main.c b/src/LuaSL/LuaSL_main.c
index 9a0f32f..f131429 100644
--- a/src/LuaSL/LuaSL_main.c
+++ b/src/LuaSL/LuaSL_main.c
@@ -252,45 +252,52 @@ static void _compileCbSingle(LuaCompiler *compiler)
     printf("Compile of %s failed!\n", compiler->file);
 }
 
-static boolean parser(void *data, Connection *connection, char *SID, char *command, char *arguments)
+static boolean _commandCompile(void *data, Connection *connection, char *SID, char *command, char *arguments)
+{
+  LuaCompiler *compiler;
+
+  compiler = createCompiler(SID, arguments, (compileCb) compileLSL, _compileCb);
+  compiler->client = connection;
+  PI("Compiling script %s", arguments);
+  compileScript(compiler, TRUE);
+
+  return TRUE;
+}
+
+static boolean _commandRun(void *data, Connection *connection, char *SID, char *command, char *arguments)
 {
   gameGlobals *ourGlobals = data;
-  char buf[PATH_MAX];
+  script *me = scriptAdd(arguments, SID, send2server, ourGlobals);
 
-//PD("PARSE COMMAND %s - %s (%s)", SID, command, arguments);
-    if (0 == strcmp(command, "compile"))
-    {
-        LuaCompiler *compiler;
+  me->client = connection;
+  eina_hash_add(ourGlobals->names, me->fileName, me);
+  me = getScript(SID);
+  if (me)
+  {
+    PI("Running script %s", me->fileName);
+    runScript(me);
+    releaseScript(me);
+  }
+  else
+    PE("Failed to run script %s", me->fileName);
 
-        compiler = createCompiler(SID, arguments, (compileCb) compileLSL, _compileCb);
-        compiler->client = connection;
-        PI("Compiling script %s", arguments);
-        compileScript(compiler, TRUE);
-    }
-    else if (0 == strcmp(command, "run"))
-    {
-        script *me = scriptAdd(arguments, SID, send2server, ourGlobals);
+  return TRUE;
+}
 
-        me->client = connection;
-        eina_hash_add(ourGlobals->names, me->fileName, me);
-        me = getScript(SID);
-        if (me)
-        {
-            PI("Running script %s", me->fileName);
-            runScript(me);
-            releaseScript(me);
-        }
-        else
-            PE("Failed to run script %s", me->fileName);
-    }
-    else if (0 == strcmp(command, "exit"))
-    {
-        PI("Told to exit.");
-        ecore_main_loop_quit();
-    }
-    else
-    {
-        // TODO - Even after moving the above into the command hash, this bit might still remain, unless script.return() can make it go away.
+static boolean _commandExit(void *data, Connection *connection, char *SID, char *command, char *arguments)
+{
+  PI("Told to exit.");
+  ecore_main_loop_quit();
+
+  return TRUE;
+}
+
+static boolean parser(void *data, Connection *connection, char *SID, char *command, char *arguments)
+{
+  char buf[PATH_MAX];
+
+//PD("PARSE COMMAND %s - %s (%s)", SID, command, arguments);
+        // TODO - This bit might still remain, unless script.return() can make it go away?
         //         Though perhaps the "else" part stays?
 //      if (0 == strcmp("return", command))
 //          snprintf(buf, sizeof(buf), "%s(%s)", command, arguments);
@@ -298,7 +305,6 @@ static boolean parser(void *data, Connection *connection, char *SID, char *comma
             snprintf(buf, sizeof(buf), "%s(%s)", command, arguments);
 //PD("Sending -> script %s :  %s", SID, buf);
         send2script(SID, buf);
-    }
 
    return TRUE;
 }
@@ -336,12 +342,18 @@ int main(int argc, char **argv)
       }
       else if (ecore_con_init())
       {
+        Connection *conn = NULL;
+
 //        PD("LuaSL is about to try creating a LuaSL server.");
-        if (openArms("LuaSL", ourGlobals.address, ourGlobals.port, &ourGlobals, NULL, NULL, NULL, parser, send2parser))
+        if ((conn = openArms("LuaSL", ourGlobals.address, ourGlobals.port, &ourGlobals, NULL, NULL, NULL, parser, send2parser)))
         {
             Eina_Iterator *scripts;
             script *me;
 
+            eina_hash_add(conn->commands, "compile",    _commandCompile);
+            eina_hash_add(conn->commands, "run",        _commandRun);
+            eina_hash_add(conn->commands, "exit",       _commandExit);
+
             result = 0;
             compilerSetup(&ourGlobals);
 
diff --git a/src/libraries/SledjHamr.c b/src/libraries/SledjHamr.c
index 1fae167..a217380 100644
--- a/src/libraries/SledjHamr.c
+++ b/src/libraries/SledjHamr.c
@@ -319,7 +319,7 @@ static Eina_Bool clientAdd(void *data, int type, Ecore_Con_Event_Client_Add *ev)
     conn->_del = connection->_del;
     conn->unknownInCommand = connection->unknownInCommand;
     conn->unknownOutCommand = connection->unknownOutCommand;
-    conn->commands = eina_hash_string_superfast_new(NULL);
+    conn->commands = connection->commands;
     ecore_con_client_data_set(ev->client, conn);
 
     if (connection->_add)