New ScriptServer protocol successfully implemented.

Still needs hooking up for all commands in both ends, separation of local and remote LSL-commands, etc.

3 files changed, 77 insertions, 14 deletions

diff --git a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
index bdd6f18..f86aaba 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
@@ -31,6 +31,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Grid.ScriptServer.ScriptServer;
 using OpenSim.Region.ScriptEngine.Common;
+using OpenSim.Region.ScriptEngine.Common.TRPC;
 
 namespace OpenSim.Grid.ScriptServer
 {
@@ -39,7 +40,7 @@ namespace OpenSim.Grid.ScriptServer
         //
         // Root object. Creates objects used.
         //
-        private int listenPort = 1234;
+        private int listenPort = 8010;
         private readonly string m_logFilename = ("scriptserver.log");
         private LogBase m_log;
 
@@ -49,12 +50,15 @@ namespace OpenSim.Grid.ScriptServer
         // Objects we use
         internal RegionCommManager RegionScriptDaemon; // Listen for incoming from region
         internal ScriptEngineManager ScriptEngines; // Loads scriptengines
-        internal RemotingServer m_RemotingServer;
+        //internal RemotingServer m_RemotingServer;
+        internal TCPServer m_TCPServer;
+        internal TRPC_Remote RPC;
 
-        public ScriptServerMain()
+                public ScriptServerMain()
         {
             m_log = CreateLog();
 
+
             // Set up script engine mananger
             ScriptEngines = new ScriptEngineManager(this, m_log);
 
@@ -62,10 +66,27 @@ namespace OpenSim.Grid.ScriptServer
             Engine = ScriptEngines.LoadEngine("DotNetEngine");
 
             // Set up server
-            m_RemotingServer = new RemotingServer(listenPort, "DotNetEngine");
+            //m_RemotingServer = new RemotingServer(listenPort, "DotNetEngine");
+            m_TCPServer = new TCPServer(listenPort);
+            RPC = new TRPC_Remote(m_TCPServer);
+                    RPC.ReceiveCommand += new TRPC_Remote.ReceiveCommandDelegate(RPC_ReceiveCommand);
+            m_TCPServer.StartListen();
+
             System.Console.ReadLine();
         }
 
+        private void RPC_ReceiveCommand(int ID, string Command, object[] p)
+        {
+            m_log.Notice("SERVER", "Received command: '" + Command + "'");
+            if (p != null)
+            {
+                for (int i = 0; i < p.Length; i++)
+                {
+                    m_log.Notice("SERVER", "Param " + i + ": " + p[i].ToString());
+                }
+            }
+        }
+
         ~ScriptServerMain()
         {
         }
diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPClient.cs b/OpenSim/Region/ScriptEngine/Common/TRPC/TCPClient.cs
index 3230614..e0a46c5 100644
--- a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPClient.cs
+++ b/OpenSim/Region/ScriptEngine/Common/TRPC/TCPClient.cs
@@ -7,7 +7,7 @@ using System.Text;
 

 namespace OpenSim.Region.ScriptEngine.Common.TRPC

 {

-    public class TCPClient: TCPCommon.ClientInterface

+    public class TCPClient : TCPCommon.ClientInterface

     {

 

         public TCPClient()

@@ -31,11 +31,19 @@ namespace OpenSim.Region.ScriptEngine.Common.TRPC
         {

             Socket newsock = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);

             IPEndPoint ipe = new IPEndPoint(IPAddress.Parse(RemoteHost), RemotePort);

-            newsock.BeginConnect(ipe, new AsyncCallback(asyncConnected), newsock);

-

-

+            //newsock.BeginConnect(ipe, new AsyncCallback(asyncConnected), newsock);

+            newsock.Connect(ipe);

+        }

+        public int ConnectAndReturnID(string RemoteHost, int RemotePort)

+        {

+            Socket newsock = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);

+            IPEndPoint ipe = new IPEndPoint(IPAddress.Parse(RemoteHost), RemotePort);

+            //newsock.BeginConnect(ipe, new AsyncCallback(asyncConnected), newsock);

+            newsock.Connect(ipe);

+            return ProcessConnection(newsock);

         }

 

+

         public void Disconnect(int ID)

         {

             Clients[ID].Disconnect();

@@ -44,9 +52,15 @@ namespace OpenSim.Region.ScriptEngine.Common.TRPC
         void asyncConnected(IAsyncResult iar)

         {

             Socket client = (Socket)iar.AsyncState;

+            client.EndConnect(iar);

+            ProcessConnection(client);

+        }

+

+        private int ProcessConnection(Socket client)

+        {

             try

             {

-                client.EndConnect(iar);

+                

 

 

                 int id = ClientCount++;

@@ -69,12 +83,14 @@ namespace OpenSim.Region.ScriptEngine.Common.TRPC
                 if (ClientConnected != null)

                     ClientConnected(id, client.RemoteEndPoint);

 

+                return id;

             }

             catch (SocketException sex)

             {

                 if (ConnectError != null)

                     ConnectError(sex.Message);

             }

+            return -1;

         }

 

 

diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs b/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs
index 1b37378..39f2695 100644
--- a/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs
@@ -30,6 +30,7 @@ using System;
 using libsecondlife;
 using OpenSim.Framework;
 using OpenSim.Region.ScriptEngine.Common;
+using OpenSim.Region.ScriptEngine.Common.TRPC;
 
 namespace OpenSim.Region.ScriptEngine.RemoteServer
 {
@@ -41,14 +42,23 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer
     {
 
         System.Collections.Generic.Dictionary<uint, ScriptServerInterfaces.ServerRemotingObject> remoteScript = new System.Collections.Generic.Dictionary<uint, ScriptServerInterfaces.ServerRemotingObject>();
+        TCPClient m_TCPClient;
+        TRPC_Remote RPC;
+        int myScriptServerID;
 
+        string remoteHost = "127.0.0.1";
+        int remotePort = 8010;
 
         private ScriptEngine myScriptEngine;
         public EventManager(ScriptEngine _ScriptEngine)
         {
             myScriptEngine = _ScriptEngine;
-
-
+            
+            m_TCPClient = new TCPClient();
+            RPC = new TRPC_Remote(m_TCPClient);
+            RPC.ReceiveCommand += new TRPC_Remote.ReceiveCommandDelegate(RPC_ReceiveCommand);
+            myScriptServerID = m_TCPClient.ConnectAndReturnID(remoteHost, remotePort);
+            
             myScriptEngine.Log.Verbose("RemoteEngine", "Hooking up to server events");
             //myScriptEngine.World.EventManager.OnObjectGrab += touch_start;
             myScriptEngine.World.EventManager.OnRezScript += OnRezScript;
@@ -57,16 +67,32 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer
 
         }
 
+        void RPC_ReceiveCommand(int ID, string Command, params object[] p)
+        {
+            myScriptEngine.Log.Notice("REMOTESERVER", "Received command: '" + Command + "'");
+            if (p != null)
+            {
+                for (int i = 0; i < p.Length; i++)
+                {
+                    myScriptEngine.Log.Notice("REMOTESERVER", "Param " + i + ": " + p[i].ToString());
+                }
+            }
+
+        }
+
 
         public void OnRezScript(uint localID, LLUUID itemID, string script)
         {
             // WE ARE CREATING A NEW SCRIPT ... CREATE SCRIPT, GET A REMOTEID THAT WE MAP FROM LOCALID
             myScriptEngine.Log.Verbose("RemoteEngine", "Creating new script (with connection)");
 
+            // Temp for now: We have one connection only - this is hardcoded in myScriptServerID
+            RPC.SendCommand(myScriptServerID, "OnRezScript", script);
 
-            ScriptServerInterfaces.ServerRemotingObject obj = myScriptEngine.m_RemoteServer.Connect("localhost", 1234);
-            remoteScript.Add(localID, obj);
-            remoteScript[localID].Events().OnRezScript(localID, itemID, script);
+            //ScriptServerInterfaces.ServerRemotingObject obj = myScriptEngine.m_RemoteServer.Connect("localhost", 1234);
+            //remoteScript.Add(localID, obj);
+            //remoteScript[localID].Events().OnRezScript(localID, itemID, script);
+            
             
         }