Cut of remote server as AppDomains and even WCF can do it better (better means less code in this case)
Tedd Hansen
parent
18f490a30c
commit
b41acfb4cf
|
|
@ -33,7 +33,6 @@ using OpenSim.Framework.Console;
|
||||||
using OpenSim.Framework.Servers;
|
using OpenSim.Framework.Servers;
|
||||||
using OpenSim.Grid.ScriptServer.ScriptServer;
|
using OpenSim.Grid.ScriptServer.ScriptServer;
|
||||||
using OpenSim.Region.ScriptEngine.Common;
|
using OpenSim.Region.ScriptEngine.Common;
|
||||||
using OpenSim.Region.ScriptEngine.Common.TRPC;
|
|
||||||
|
|
||||||
namespace OpenSim.Grid.ScriptServer
|
namespace OpenSim.Grid.ScriptServer
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* * Neither the name of the OpenSim Project nor the
|
|
||||||
* names of its contributors may be used to endorse or promote products
|
|
||||||
* derived from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
namespace OpenSim.Region.ScriptEngine.Common.TRPC
|
|
||||||
{
|
|
||||||
class MyBase
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,141 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* * Neither the name of the OpenSim Project nor the
|
|
||||||
* names of its contributors may be used to endorse or promote products
|
|
||||||
* derived from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Diagnostics;
|
|
||||||
using System.Net;
|
|
||||||
using System.Net.Sockets;
|
|
||||||
|
|
||||||
namespace OpenSim.Region.ScriptEngine.Common.TRPC
|
|
||||||
{
|
|
||||||
public class TCPClient : TCPCommon.ClientInterface
|
|
||||||
{
|
|
||||||
public TCPClient()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
private readonly Dictionary<int, TCPSocket> Clients = new Dictionary<int, TCPSocket>();
|
|
||||||
private int ClientCount = 0;
|
|
||||||
|
|
||||||
public event TCPCommon.ClientConnectedDelegate ClientConnected;
|
|
||||||
public event TCPCommon.DataReceivedDelegate DataReceived;
|
|
||||||
public event TCPCommon.DataSentDelegate DataSent;
|
|
||||||
public event TCPCommon.CloseDelegate Close;
|
|
||||||
public event TCPCommon.ConnectErrorDelegate ConnectError;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Creates client connection
|
|
||||||
/// </summary>
|
|
||||||
public void Connect(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);
|
|
||||||
}
|
|
||||||
|
|
||||||
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();
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: unused
|
|
||||||
// void asyncConnected(IAsyncResult iar)
|
|
||||||
// {
|
|
||||||
// Socket client = (Socket)iar.AsyncState;
|
|
||||||
// client.EndConnect(iar);
|
|
||||||
// ProcessConnection(client);
|
|
||||||
// }
|
|
||||||
|
|
||||||
private int ProcessConnection(Socket client)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
int id = ClientCount++;
|
|
||||||
TCPSocket S = new TCPSocket(id, client);
|
|
||||||
|
|
||||||
// Add to dictionary
|
|
||||||
Clients.Add(id, S);
|
|
||||||
|
|
||||||
// Add event handlers
|
|
||||||
S.Close += new TCPSocket.CloseDelegate(S_Close);
|
|
||||||
S.DataReceived += new TCPSocket.DataReceivedDelegate(S_DataReceived);
|
|
||||||
S.DataSent += new TCPSocket.DataSentDelegate(S_DataSent);
|
|
||||||
|
|
||||||
// Start it
|
|
||||||
S.Start();
|
|
||||||
|
|
||||||
Debug.WriteLine("Connection established: " + client.RemoteEndPoint.ToString());
|
|
||||||
|
|
||||||
// Fire Connected-event
|
|
||||||
if (ClientConnected != null)
|
|
||||||
ClientConnected(id, client.RemoteEndPoint);
|
|
||||||
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
catch (SocketException sex)
|
|
||||||
{
|
|
||||||
if (ConnectError != null)
|
|
||||||
ConnectError(sex.Message);
|
|
||||||
}
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
void S_DataSent(int ID, int length)
|
|
||||||
{
|
|
||||||
if (DataSent != null)
|
|
||||||
DataSent(ID, length);
|
|
||||||
}
|
|
||||||
|
|
||||||
void S_DataReceived(int ID, byte[] data, int offset, int length)
|
|
||||||
{
|
|
||||||
if (DataReceived != null)
|
|
||||||
DataReceived(ID, data, offset, length);
|
|
||||||
}
|
|
||||||
|
|
||||||
void S_Close(int ID)
|
|
||||||
{
|
|
||||||
if (Close != null)
|
|
||||||
Close(ID);
|
|
||||||
Clients.Remove(ID);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Send(int clientID, byte[] data, int offset, int len)
|
|
||||||
{
|
|
||||||
Clients[clientID].Send(clientID, data, offset, len);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,62 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* * Neither the name of the OpenSim Project nor the
|
|
||||||
* names of its contributors may be used to endorse or promote products
|
|
||||||
* derived from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
using System.Net;
|
|
||||||
|
|
||||||
namespace OpenSim.Region.ScriptEngine.Common.TRPC
|
|
||||||
{
|
|
||||||
public class TCPCommon
|
|
||||||
{
|
|
||||||
public delegate void ClientConnectedDelegate(int ID, EndPoint Remote);
|
|
||||||
public delegate void DataReceivedDelegate(int ID, byte[] data, int offset, int length);
|
|
||||||
public delegate void DataSentDelegate(int ID, int length);
|
|
||||||
public delegate void CloseDelegate(int ID);
|
|
||||||
public delegate void ConnectErrorDelegate(string Reason);
|
|
||||||
|
|
||||||
public interface ServerAndClientInterface
|
|
||||||
{
|
|
||||||
void Send(int clientID, byte[] data, int offset, int len);
|
|
||||||
event ClientConnectedDelegate ClientConnected;
|
|
||||||
event DataReceivedDelegate DataReceived;
|
|
||||||
event DataSentDelegate DataSent;
|
|
||||||
event CloseDelegate Close;
|
|
||||||
}
|
|
||||||
|
|
||||||
public interface ClientInterface : ServerAndClientInterface
|
|
||||||
{
|
|
||||||
event ConnectErrorDelegate ConnectError;
|
|
||||||
void Connect(string RemoteHost, int RemotePort);
|
|
||||||
void Disconnect(int ID);
|
|
||||||
}
|
|
||||||
|
|
||||||
public interface ServerInterface : ServerAndClientInterface
|
|
||||||
{
|
|
||||||
void StartListen();
|
|
||||||
void StopListen();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,128 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* * Neither the name of the OpenSim Project nor the
|
|
||||||
* names of its contributors may be used to endorse or promote products
|
|
||||||
* derived from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Diagnostics;
|
|
||||||
using System.Net;
|
|
||||||
using System.Net.Sockets;
|
|
||||||
|
|
||||||
namespace OpenSim.Region.ScriptEngine.Common.TRPC
|
|
||||||
{
|
|
||||||
public class TCPServer: TCPCommon.ServerInterface
|
|
||||||
{
|
|
||||||
public readonly int LocalPort;
|
|
||||||
public TCPServer(int localPort)
|
|
||||||
{
|
|
||||||
LocalPort = localPort;
|
|
||||||
}
|
|
||||||
|
|
||||||
private Socket server;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Starts listening for new connections
|
|
||||||
/// </summary>
|
|
||||||
public void StartListen()
|
|
||||||
{
|
|
||||||
server = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
|
|
||||||
IPEndPoint ipe = new IPEndPoint(IPAddress.Any, LocalPort);
|
|
||||||
server.Bind(ipe);
|
|
||||||
server.Listen(10);
|
|
||||||
server.BeginAccept(new AsyncCallback(AsyncAcceptConnections), server);
|
|
||||||
}
|
|
||||||
/// <summary>
|
|
||||||
/// Stops listening for new connections
|
|
||||||
/// </summary>
|
|
||||||
public void StopListen()
|
|
||||||
{
|
|
||||||
server.Close();
|
|
||||||
server = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private readonly Dictionary<int, TCPSocket> Clients = new Dictionary<int, TCPSocket>();
|
|
||||||
private int ClientCount = 0;
|
|
||||||
|
|
||||||
public event TCPCommon.ClientConnectedDelegate ClientConnected;
|
|
||||||
public event TCPCommon.DataReceivedDelegate DataReceived;
|
|
||||||
public event TCPCommon.DataSentDelegate DataSent;
|
|
||||||
public event TCPCommon.CloseDelegate Close;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Async callback for new connections
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="ar"></param>
|
|
||||||
private void AsyncAcceptConnections(IAsyncResult ar)
|
|
||||||
{
|
|
||||||
int id = ClientCount++;
|
|
||||||
Socket oldserver = (Socket)ar.AsyncState;
|
|
||||||
Socket client = oldserver.EndAccept(ar);
|
|
||||||
TCPSocket S = new TCPSocket(id, client);
|
|
||||||
|
|
||||||
// Add to dictionary
|
|
||||||
Clients.Add(id, S);
|
|
||||||
|
|
||||||
// Add event handlers
|
|
||||||
S.Close += new TCPSocket.CloseDelegate(S_Close);
|
|
||||||
S.DataReceived += new TCPSocket.DataReceivedDelegate(S_DataReceived);
|
|
||||||
S.DataSent += new TCPSocket.DataSentDelegate(S_DataSent);
|
|
||||||
|
|
||||||
// Start it
|
|
||||||
S.Start();
|
|
||||||
|
|
||||||
Debug.WriteLine("Connection received: " + client.RemoteEndPoint.ToString());
|
|
||||||
|
|
||||||
// Fire Connected-event
|
|
||||||
if (ClientConnected != null)
|
|
||||||
ClientConnected(id, client.RemoteEndPoint);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void S_DataSent(int ID, int length)
|
|
||||||
{
|
|
||||||
if (DataSent != null)
|
|
||||||
DataSent(ID, length);
|
|
||||||
}
|
|
||||||
|
|
||||||
void S_DataReceived(int ID, byte[] data, int offset, int length)
|
|
||||||
{
|
|
||||||
if (DataReceived != null)
|
|
||||||
DataReceived(ID, data, offset, length);
|
|
||||||
}
|
|
||||||
|
|
||||||
void S_Close(int ID)
|
|
||||||
{
|
|
||||||
if (Close != null)
|
|
||||||
Close(ID);
|
|
||||||
Clients.Remove(ID);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Send(int clientID, byte[] data, int offset, int len)
|
|
||||||
{
|
|
||||||
Clients[clientID].Send(clientID, data, offset, len);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,111 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* * Neither the name of the OpenSim Project nor the
|
|
||||||
* names of its contributors may be used to endorse or promote products
|
|
||||||
* derived from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Net.Sockets;
|
|
||||||
|
|
||||||
namespace OpenSim.Region.ScriptEngine.Common.TRPC
|
|
||||||
{
|
|
||||||
public class TCPSocket
|
|
||||||
{
|
|
||||||
public readonly Socket Client;
|
|
||||||
public readonly int ID;
|
|
||||||
|
|
||||||
public delegate void DataReceivedDelegate(int ID, byte[] data, int offset, int length);
|
|
||||||
public delegate void DataSentDelegate(int ID, int length);
|
|
||||||
public delegate void CloseDelegate(int ID);
|
|
||||||
public event DataReceivedDelegate DataReceived;
|
|
||||||
public event DataSentDelegate DataSent;
|
|
||||||
public event CloseDelegate Close;
|
|
||||||
|
|
||||||
private byte[] RecvQueue = new byte[4096];
|
|
||||||
private int RecvQueueSize = 4096;
|
|
||||||
|
|
||||||
public TCPSocket(int id, Socket client)
|
|
||||||
{
|
|
||||||
ID = id;
|
|
||||||
Client = client;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Start()
|
|
||||||
{
|
|
||||||
// Start listening
|
|
||||||
BeginReceive();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void BeginReceive()
|
|
||||||
{
|
|
||||||
Client.BeginReceive(RecvQueue, 0, RecvQueueSize, SocketFlags.None, new AsyncCallback(asyncDataReceived), Client);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Callback for successful receive (or connection close)
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="ar"></param>
|
|
||||||
private void asyncDataReceived(IAsyncResult ar)
|
|
||||||
{
|
|
||||||
Socket client = (Socket)ar.AsyncState;
|
|
||||||
int recv = client.EndReceive(ar);
|
|
||||||
|
|
||||||
// Is connection closed?
|
|
||||||
if (recv == 0)
|
|
||||||
{
|
|
||||||
client.Close();
|
|
||||||
Close(ID);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Call receive event
|
|
||||||
DataReceived(ID, RecvQueue, 0, recv);
|
|
||||||
|
|
||||||
// Start new receive
|
|
||||||
BeginReceive();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Send(int clientID, byte[] data, int offset, int len)
|
|
||||||
{
|
|
||||||
Client.BeginSend(data, offset, len, SocketFlags.None, new AsyncCallback(asyncDataSent), Client);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Callback for successful send
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="ar"></param>
|
|
||||||
void asyncDataSent(IAsyncResult ar)
|
|
||||||
{
|
|
||||||
Socket client = (Socket)ar.AsyncState;
|
|
||||||
int sent = client.EndSend(ar);
|
|
||||||
DataSent(ID, sent);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Disconnect()
|
|
||||||
{
|
|
||||||
Client.Close();
|
|
||||||
Close(ID);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,204 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* * Neither the name of the OpenSim Project nor the
|
|
||||||
* names of its contributors may be used to endorse or promote products
|
|
||||||
* derived from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Diagnostics;
|
|
||||||
using System.Net;
|
|
||||||
using System.Text;
|
|
||||||
using System.Web;
|
|
||||||
using OpenMetaverse;
|
|
||||||
using OpenSim.Region.ScriptEngine.Common.TRPC;
|
|
||||||
|
|
||||||
namespace OpenSim.Region.ScriptEngine.Common
|
|
||||||
{
|
|
||||||
public class TRPC_Remote
|
|
||||||
{
|
|
||||||
public readonly int MaxQueueSize = 1024 * 10;
|
|
||||||
public readonly TCPCommon.ServerAndClientInterface TCPS;
|
|
||||||
|
|
||||||
public delegate void ReceiveCommandDelegate(int ID, string Command, params object[] p);
|
|
||||||
public event ReceiveCommandDelegate ReceiveCommand;
|
|
||||||
Dictionary<string, Type> TypeDictionary = new Dictionary<string, Type>();
|
|
||||||
Type[] Types =
|
|
||||||
{
|
|
||||||
typeof(String),
|
|
||||||
typeof(Int16),
|
|
||||||
typeof(Int32),
|
|
||||||
typeof(Int64),
|
|
||||||
typeof(Double),
|
|
||||||
typeof(Decimal),
|
|
||||||
typeof(Array),
|
|
||||||
typeof(UUID),
|
|
||||||
typeof(UInt16),
|
|
||||||
typeof(UInt32),
|
|
||||||
typeof(UInt64)
|
|
||||||
};
|
|
||||||
|
|
||||||
// TODO: Maybe we should move queue into TCPSocket so we won't have to keep one queue instance per connection
|
|
||||||
private Dictionary<int, InQueueStruct> InQueue = new Dictionary<int, InQueueStruct>();
|
|
||||||
private class InQueueStruct
|
|
||||||
{
|
|
||||||
public byte[] Queue;
|
|
||||||
public int QueueSize;
|
|
||||||
public object QueueLockObject = new object();
|
|
||||||
}
|
|
||||||
|
|
||||||
public TRPC_Remote(TCPCommon.ServerAndClientInterface TCPClientOrServer)
|
|
||||||
{
|
|
||||||
TCPS = TCPClientOrServer;
|
|
||||||
TCPS.Close += new TCPCommon.CloseDelegate(TCPS_Close);
|
|
||||||
TCPS.ClientConnected += new TCPCommon.ClientConnectedDelegate(TCPS_ClientConnected);
|
|
||||||
TCPS.DataReceived += new TCPCommon.DataReceivedDelegate(TCPS_DataReceived);
|
|
||||||
//TCPS.StartListen();
|
|
||||||
|
|
||||||
// Make a lookup dictionary for types
|
|
||||||
foreach (Type t in Types)
|
|
||||||
{
|
|
||||||
TypeDictionary.Add(t.ToString(), t);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void TCPS_ClientConnected(int ID, EndPoint Remote)
|
|
||||||
{
|
|
||||||
// Create a incoming queue for this connection
|
|
||||||
InQueueStruct iq = new InQueueStruct();
|
|
||||||
iq.Queue = new byte[MaxQueueSize];
|
|
||||||
iq.QueueSize = 0;
|
|
||||||
InQueue.Add(ID, iq);
|
|
||||||
}
|
|
||||||
|
|
||||||
void TCPS_Close(int ID)
|
|
||||||
{
|
|
||||||
// Remove queue
|
|
||||||
InQueue.Remove(ID);
|
|
||||||
}
|
|
||||||
|
|
||||||
void TCPS_DataReceived(int ID, byte[] data, int offset, int length)
|
|
||||||
{
|
|
||||||
// Copy new data to incoming queue
|
|
||||||
lock (InQueue[ID].QueueLockObject)
|
|
||||||
{
|
|
||||||
Array.Copy(data, offset, InQueue[ID].Queue, InQueue[ID].QueueSize, length);
|
|
||||||
InQueue[ID].QueueSize += length;
|
|
||||||
|
|
||||||
// Process incoming queue
|
|
||||||
ProcessQueue(ID);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ProcessQueue(int ID)
|
|
||||||
{
|
|
||||||
// This is just a temp implementation -- not so fast :)
|
|
||||||
|
|
||||||
InQueueStruct myIQS = InQueue[ID];
|
|
||||||
if (myIQS.QueueSize == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
string receivedData = Encoding.UTF8.GetString(myIQS.Queue, 0, myIQS.QueueSize);
|
|
||||||
Debug.WriteLine("RAW: " + receivedData);
|
|
||||||
|
|
||||||
byte newLine = 10;
|
|
||||||
while (true)
|
|
||||||
{
|
|
||||||
bool ShouldProcess = false;
|
|
||||||
int lineEndPos = 0;
|
|
||||||
|
|
||||||
// Look for newline
|
|
||||||
for (int i = 0; i < myIQS.QueueSize; i++)
|
|
||||||
{
|
|
||||||
if (myIQS.Queue[i] == newLine)
|
|
||||||
{
|
|
||||||
ShouldProcess = true;
|
|
||||||
lineEndPos = i;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Process it?
|
|
||||||
if (!ShouldProcess)
|
|
||||||
return;
|
|
||||||
// Yes
|
|
||||||
string cmdLine = Encoding.ASCII.GetString(myIQS.Queue, 0, lineEndPos);
|
|
||||||
Debug.WriteLine("Command: " + cmdLine);
|
|
||||||
|
|
||||||
// Fix remaining queue in an inefficient way
|
|
||||||
byte[] newQueue = new byte[MaxQueueSize];
|
|
||||||
Array.Copy(myIQS.Queue, lineEndPos, newQueue, 0, myIQS.QueueSize - lineEndPos);
|
|
||||||
myIQS.Queue = newQueue;
|
|
||||||
myIQS.QueueSize -= (lineEndPos + 1);
|
|
||||||
|
|
||||||
// Now back to the command
|
|
||||||
string[] parts = cmdLine.Split(',');
|
|
||||||
if (parts.Length > 0)
|
|
||||||
{
|
|
||||||
string cmd = parts[0];
|
|
||||||
int paramCount = parts.Length - 1;
|
|
||||||
object[] param = null;
|
|
||||||
|
|
||||||
if (paramCount > 0)
|
|
||||||
{
|
|
||||||
// Process all parameters (decoding them from URL encoding)
|
|
||||||
param = new object[paramCount];
|
|
||||||
for (int i = 1; i < parts.Length; i++)
|
|
||||||
{
|
|
||||||
string[] spl;
|
|
||||||
spl = HttpUtility.UrlDecode(parts[i]).Split('|');
|
|
||||||
string t = spl[0];
|
|
||||||
param[i - 1] = Convert.ChangeType(spl[1], TypeLookup(t));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ReceiveCommand(ID, cmd, param);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private Type TypeLookup(string t)
|
|
||||||
{
|
|
||||||
Type ret = TypeDictionary[t];
|
|
||||||
if (ret != null)
|
|
||||||
return ret;
|
|
||||||
return typeof(object);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void SendCommand(int ID, string Command, params object[] p)
|
|
||||||
{
|
|
||||||
// Call PacketFactory to have it create a packet for us
|
|
||||||
|
|
||||||
//string[] tmpP = new string[p.Length];
|
|
||||||
string tmpStr = Command;
|
|
||||||
for (int i = 0; i < p.Length; i++)
|
|
||||||
{
|
|
||||||
tmpStr += "," + p[i].GetType().ToString() + "|" + HttpUtility.UrlEncode(p[i].ToString()); // .Replace(",", "%44")
|
|
||||||
}
|
|
||||||
tmpStr += "\n";
|
|
||||||
byte[] byteData = Encoding.UTF8.GetBytes(tmpStr);
|
|
||||||
TCPS.Send(ID, byteData, 0, byteData.Length);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
72
prebuild.xml
72
prebuild.xml
|
|
@ -2163,78 +2163,6 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<Project name="OpenSim.Grid.ScriptServer" path="OpenSim/Grid/ScriptServer" type="Exe">
|
|
||||||
<Configuration name="Debug">
|
|
||||||
<Options>
|
|
||||||
<OutputPath>../../../bin/</OutputPath>
|
|
||||||
</Options>
|
|
||||||
</Configuration>
|
|
||||||
<Configuration name="Release">
|
|
||||||
<Options>
|
|
||||||
<OutputPath>../../../bin/</OutputPath>
|
|
||||||
</Options>
|
|
||||||
</Configuration>
|
|
||||||
|
|
||||||
<ReferencePath>../../../bin/</ReferencePath>
|
|
||||||
<ReferencePath>../../../bin/ScriptEngines/</ReferencePath>
|
|
||||||
<Reference name="System" localCopy="false"/>
|
|
||||||
<Reference name="System.Data" localCopy="false"/>
|
|
||||||
<Reference name="System.Runtime.Remoting" localCopy="false"/>
|
|
||||||
<Reference name="System.Xml" localCopy="false"/>
|
|
||||||
<Reference name="OpenSim"/>
|
|
||||||
<Reference name="OpenSim.Framework"/>
|
|
||||||
<Reference name="OpenSim.Framework.Console"/>
|
|
||||||
<Reference name="OpenSim.Framework.Communications"/>
|
|
||||||
<Reference name="OpenSim.Framework.Servers"/>
|
|
||||||
<Reference name="OpenSim.Data"/>
|
|
||||||
<Reference name="OpenSim.Region.Environment" />
|
|
||||||
<Reference name="OpenSim.Region.ScriptEngine.Common"/>
|
|
||||||
<Reference name="OpenMetaverseTypes.dll"/>
|
|
||||||
<Reference name="OpenMetaverse.dll"/>
|
|
||||||
<Reference name="XMLRPC.dll"/>
|
|
||||||
<Reference name="Nini.dll" />
|
|
||||||
<Reference name="log4net.dll"/>
|
|
||||||
|
|
||||||
<Files>
|
|
||||||
<Match pattern="*.cs" recurse="true"/>
|
|
||||||
</Files>
|
|
||||||
</Project>
|
|
||||||
|
|
||||||
|
|
||||||
<Project name="OpenSim.Region.ScriptEngine.RemoteServer" path="OpenSim/Region/ScriptEngine/RemoteServer" type="Library">
|
|
||||||
<Configuration name="Debug">
|
|
||||||
<Options>
|
|
||||||
<OutputPath>../../../../bin/ScriptEngines/</OutputPath>
|
|
||||||
</Options>
|
|
||||||
</Configuration>
|
|
||||||
<Configuration name="Release">
|
|
||||||
<Options>
|
|
||||||
<OutputPath>../../../../bin/ScriptEngines/</OutputPath>
|
|
||||||
</Options>
|
|
||||||
</Configuration>
|
|
||||||
|
|
||||||
<ReferencePath>../../../../bin/</ReferencePath>
|
|
||||||
<ReferencePath>../../../../bin/ScriptEngines/</ReferencePath>
|
|
||||||
<Reference name="System" localCopy="false"/>
|
|
||||||
<Reference name="System.Data" localCopy="false"/>
|
|
||||||
<Reference name="System.Xml" localCopy="false"/>
|
|
||||||
<Reference name="System.Runtime.Remoting" localCopy="false"/>
|
|
||||||
<Reference name="OpenSim.Region.Environment" />
|
|
||||||
<Reference name="OpenMetaverseTypes.dll"/>
|
|
||||||
<Reference name="OpenSim.Framework"/>
|
|
||||||
<Reference name="OpenSim.Framework.Console"/>
|
|
||||||
<Reference name="OpenSim.Region.ScriptEngine.Common"/>
|
|
||||||
<Reference name="OpenSim.Region.ScriptEngine.DotNetEngine"/>
|
|
||||||
<Reference name="Nini.dll" />
|
|
||||||
<Reference name="log4net.dll"/>
|
|
||||||
<!-- Reference name="OpenSim.Grid.ScriptServer"/ -->
|
|
||||||
|
|
||||||
<Files>
|
|
||||||
<Match pattern="*.cs" recurse="true"/>
|
|
||||||
</Files>
|
|
||||||
</Project>
|
|
||||||
|
|
||||||
<!-- Tools -->
|
<!-- Tools -->
|
||||||
<Project name="OpenSimExport" path="OpenSim/Tools/Export" type="Exe">
|
<Project name="OpenSimExport" path="OpenSim/Tools/Export" type="Exe">
|
||||||
<Configuration name="Debug">
|
<Configuration name="Debug">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue