From b41acfb4cfe51c22ada1a234c60d64ef80fde330 Mon Sep 17 00:00:00 2001 From: Tedd Hansen Date: Fri, 12 Sep 2008 18:42:02 +0000 Subject: Cut of remote server as AppDomains and even WCF can do it better (better means less code in this case) --- OpenSim/Region/ScriptEngine/Common/TRPC/MyBase.cs | 33 ----- .../Region/ScriptEngine/Common/TRPC/TCPClient.cs | 141 --------------------- .../Region/ScriptEngine/Common/TRPC/TCPCommon.cs | 62 --------- .../Region/ScriptEngine/Common/TRPC/TCPServer.cs | 128 ------------------- .../Region/ScriptEngine/Common/TRPC/TCPSocket.cs | 111 ---------------- 5 files changed, 475 deletions(-) delete mode 100644 OpenSim/Region/ScriptEngine/Common/TRPC/MyBase.cs delete mode 100644 OpenSim/Region/ScriptEngine/Common/TRPC/TCPClient.cs delete mode 100644 OpenSim/Region/ScriptEngine/Common/TRPC/TCPCommon.cs delete mode 100644 OpenSim/Region/ScriptEngine/Common/TRPC/TCPServer.cs delete mode 100644 OpenSim/Region/ScriptEngine/Common/TRPC/TCPSocket.cs (limited to 'OpenSim/Region/ScriptEngine/Common/TRPC') diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC/MyBase.cs b/OpenSim/Region/ScriptEngine/Common/TRPC/MyBase.cs deleted file mode 100644 index 14c6078..0000000 --- a/OpenSim/Region/ScriptEngine/Common/TRPC/MyBase.cs +++ /dev/null @@ -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 - { - } -} diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPClient.cs b/OpenSim/Region/ScriptEngine/Common/TRPC/TCPClient.cs deleted file mode 100644 index 624c3bb..0000000 --- a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPClient.cs +++ /dev/null @@ -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 Clients = new Dictionary(); - 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; - - /// - /// Creates client connection - /// - 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); - } - } -} diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPCommon.cs b/OpenSim/Region/ScriptEngine/Common/TRPC/TCPCommon.cs deleted file mode 100644 index ab9d9b4..0000000 --- a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPCommon.cs +++ /dev/null @@ -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(); - } - } -} diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPServer.cs b/OpenSim/Region/ScriptEngine/Common/TRPC/TCPServer.cs deleted file mode 100644 index 26892a2..0000000 --- a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPServer.cs +++ /dev/null @@ -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; - - /// - /// Starts listening for new connections - /// - 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); - } - /// - /// Stops listening for new connections - /// - public void StopListen() - { - server.Close(); - server = null; - } - - private readonly Dictionary Clients = new Dictionary(); - private int ClientCount = 0; - - public event TCPCommon.ClientConnectedDelegate ClientConnected; - public event TCPCommon.DataReceivedDelegate DataReceived; - public event TCPCommon.DataSentDelegate DataSent; - public event TCPCommon.CloseDelegate Close; - - /// - /// Async callback for new connections - /// - /// - 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); - } - } -} diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPSocket.cs b/OpenSim/Region/ScriptEngine/Common/TRPC/TCPSocket.cs deleted file mode 100644 index 693ec6f..0000000 --- a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPSocket.cs +++ /dev/null @@ -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); - } - - /// - /// Callback for successful receive (or connection close) - /// - /// - 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); - } - - /// - /// Callback for successful send - /// - /// - void asyncDataSent(IAsyncResult ar) - { - Socket client = (Socket)ar.AsyncState; - int sent = client.EndSend(ar); - DataSent(ID, sent); - } - - public void Disconnect() - { - Client.Close(); - Close(ID); - } - } -} -- cgit v1.1