Commit 1 in of this branch feature. This is one of many...
teravus
parent
d8d4e7f236
commit
27a0b3ecbd
|
|
@ -0,0 +1,50 @@
|
|||
using System;
|
||||
using System.Net.Sockets;
|
||||
|
||||
namespace OpenSim.Region.ClientStack.TCPJSONStream
|
||||
{
|
||||
/// <summary>
|
||||
/// Invoked when a client have been accepted by the <see cref="HttpListener"/>
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Can be used to revoke incoming connections
|
||||
/// </remarks>
|
||||
public class ClientAcceptedEventArgs : EventArgs
|
||||
{
|
||||
private readonly Socket _socket;
|
||||
private bool _revoke;
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="ClientAcceptedEventArgs"/> class.
|
||||
/// </summary>
|
||||
/// <param name="socket">The socket.</param>
|
||||
public ClientAcceptedEventArgs(Socket socket)
|
||||
{
|
||||
_socket = socket;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Accepted socket.
|
||||
/// </summary>
|
||||
public Socket Socket
|
||||
{
|
||||
get { return _socket; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Client should be revoked.
|
||||
/// </summary>
|
||||
public bool Revoked
|
||||
{
|
||||
get { return _revoke; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Client may not be handled.
|
||||
/// </summary>
|
||||
public void Revoke()
|
||||
{
|
||||
_revoke = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,143 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Net;
|
||||
using System.Net.Sockets;
|
||||
using System.Text;
|
||||
|
||||
namespace OpenSim.Region.ClientStack.TCPJSONStream
|
||||
{
|
||||
public class ClientNetworkContext
|
||||
{
|
||||
private Socket _socket;
|
||||
private string _remoteAddress;
|
||||
private string _remotePort;
|
||||
private WebSocketConnectionStage _wsConnectionStatus = WebSocketConnectionStage.Accept;
|
||||
private int _bytesLeft;
|
||||
private NetworkStream _stream;
|
||||
private byte[] _buffer;
|
||||
public event EventHandler<DisconnectedEventArgs> Disconnected = delegate { };
|
||||
|
||||
public ClientNetworkContext(IPEndPoint endPoint, int port, Stream stream, int buffersize, Socket sock)
|
||||
{
|
||||
_socket = sock;
|
||||
_remoteAddress = endPoint.Address.ToString();
|
||||
_remotePort = port.ToString();
|
||||
_stream = stream as NetworkStream;
|
||||
_buffer = new byte[buffersize];
|
||||
|
||||
|
||||
}
|
||||
|
||||
public void BeginRead()
|
||||
{
|
||||
_wsConnectionStatus = WebSocketConnectionStage.Http;
|
||||
try
|
||||
{
|
||||
_stream.BeginRead(_buffer, 0, _buffer.Length, OnReceive, _wsConnectionStatus);
|
||||
}
|
||||
catch (IOException err)
|
||||
{
|
||||
//m_log.Debug(err.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
private void OnReceive(IAsyncResult ar)
|
||||
{
|
||||
try
|
||||
{
|
||||
int bytesRead = _stream.EndRead(ar);
|
||||
if (bytesRead == 0)
|
||||
{
|
||||
|
||||
Disconnected(this, new DisconnectedEventArgs(SocketError.ConnectionReset));
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// send a whole buffer
|
||||
/// </summary>
|
||||
/// <param name="buffer">buffer to send</param>
|
||||
/// <exception cref="ArgumentNullException"></exception>
|
||||
public void Send(byte[] buffer)
|
||||
{
|
||||
if (buffer == null)
|
||||
throw new ArgumentNullException("buffer");
|
||||
Send(buffer, 0, buffer.Length);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Send data using the stream
|
||||
/// </summary>
|
||||
/// <param name="buffer">Contains data to send</param>
|
||||
/// <param name="offset">Start position in buffer</param>
|
||||
/// <param name="size">number of bytes to send</param>
|
||||
/// <exception cref="ArgumentNullException"></exception>
|
||||
/// <exception cref="ArgumentOutOfRangeException"></exception>
|
||||
public void Send(byte[] buffer, int offset, int size)
|
||||
{
|
||||
|
||||
if (offset + size > buffer.Length)
|
||||
throw new ArgumentOutOfRangeException("offset", offset, "offset + size is beyond end of buffer.");
|
||||
|
||||
if (_stream != null && _stream.CanWrite)
|
||||
{
|
||||
try
|
||||
{
|
||||
_stream.Write(buffer, offset, size);
|
||||
}
|
||||
catch (IOException)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
private void Reset()
|
||||
{
|
||||
if (_stream == null)
|
||||
return;
|
||||
_stream.Dispose();
|
||||
_stream = null;
|
||||
if (_socket == null)
|
||||
return;
|
||||
if (_socket.Connected)
|
||||
_socket.Disconnect(true);
|
||||
_socket = null;
|
||||
}
|
||||
}
|
||||
|
||||
public enum WebSocketConnectionStage
|
||||
{
|
||||
Reuse,
|
||||
Accept,
|
||||
Http,
|
||||
WebSocket,
|
||||
Closed
|
||||
}
|
||||
|
||||
public enum FrameOpCodesRFC6455
|
||||
{
|
||||
Continue = 0x0,
|
||||
Text = 0x1,
|
||||
Binary = 0x2,
|
||||
Close = 0x8,
|
||||
Ping = 0x9,
|
||||
Pong = 0xA
|
||||
}
|
||||
|
||||
public enum DataState
|
||||
{
|
||||
Empty = 0,
|
||||
Waiting = 1,
|
||||
Receiving = 2,
|
||||
Complete = 3,
|
||||
Closed = 4,
|
||||
Ping = 5,
|
||||
Pong = 6
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Net.Sockets;
|
||||
using System.Text;
|
||||
|
||||
namespace OpenSim.Region.ClientStack.TCPJSONStream
|
||||
{
|
||||
public class DisconnectedEventArgs:EventArgs
|
||||
{
|
||||
public SocketError Error { get; private set; }
|
||||
public DisconnectedEventArgs(SocketError err)
|
||||
{
|
||||
Error = err;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,73 @@
|
|||
/*
|
||||
* 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 OpenSimulator 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;
|
||||
using Nini.Config;
|
||||
using OpenSim.Framework;
|
||||
|
||||
namespace OpenSim.Region.ClientStack.TCPJSONStream
|
||||
{
|
||||
public sealed class TCPJsonWebSocketBase : IClientNetworkServer
|
||||
{
|
||||
private TCPJsonWebSocketServer m_tcpServer;
|
||||
|
||||
public TCPJsonWebSocketBase()
|
||||
{
|
||||
}
|
||||
|
||||
public void Initialise(IPAddress _listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource, AgentCircuitManager authenticateClass)
|
||||
{
|
||||
m_tcpServer = new TCPJsonWebSocketServer(_listenIP,ref port, proxyPortOffsetParm, allow_alternate_port,configSource,authenticateClass);
|
||||
}
|
||||
|
||||
public void NetworkStop()
|
||||
{
|
||||
m_tcpServer.Stop();
|
||||
}
|
||||
|
||||
public bool HandlesRegion(Location x)
|
||||
{
|
||||
return m_tcpServer.HandlesRegion(x);
|
||||
}
|
||||
|
||||
public void AddScene(IScene x)
|
||||
{
|
||||
m_tcpServer.AddScene(x);
|
||||
}
|
||||
|
||||
public void Start()
|
||||
{
|
||||
m_tcpServer.Start();
|
||||
}
|
||||
|
||||
public void Stop()
|
||||
{
|
||||
m_tcpServer.Stop();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,163 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Net;
|
||||
using System.Net.Sockets;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using Nini.Config;
|
||||
using OpenSim.Framework;
|
||||
using OpenSim.Region.Framework.Scenes;
|
||||
using log4net;
|
||||
|
||||
namespace OpenSim.Region.ClientStack.TCPJSONStream
|
||||
{
|
||||
public delegate void ExceptionHandler(object source, Exception exception);
|
||||
|
||||
public class TCPJsonWebSocketServer
|
||||
{
|
||||
private readonly IPAddress _address;
|
||||
private readonly int _port;
|
||||
private readonly ManualResetEvent _shutdownEvent = new ManualResetEvent(false);
|
||||
private TcpListener _listener;
|
||||
private int _pendingAccepts;
|
||||
private bool _shutdown;
|
||||
private int _backlogAcceptQueueLength = 5;
|
||||
private Scene m_scene;
|
||||
private Location m_location;
|
||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
public event EventHandler<ClientAcceptedEventArgs> Accepted = delegate { };
|
||||
|
||||
|
||||
public TCPJsonWebSocketServer(IPAddress _listenIP, ref uint port, int proxyPortOffsetParm,
|
||||
bool allow_alternate_port, IConfigSource configSource,
|
||||
AgentCircuitManager authenticateClass)
|
||||
{
|
||||
_address = _listenIP;
|
||||
_port = (int)port; //Why is a uint passed in?
|
||||
}
|
||||
public void Stop()
|
||||
{
|
||||
_shutdown = true;
|
||||
_listener.Stop();
|
||||
if (!_shutdownEvent.WaitOne())
|
||||
m_log.Error("[WEBSOCKETSERVER]: Failed to shutdown listener properly.");
|
||||
_listener = null;
|
||||
}
|
||||
|
||||
public bool HandlesRegion(Location x)
|
||||
{
|
||||
return x == m_location;
|
||||
}
|
||||
|
||||
public void AddScene(IScene scene)
|
||||
{
|
||||
if (m_scene != null)
|
||||
{
|
||||
m_log.Debug("[WEBSOCKETSERVER]: AddScene() called but I already have a scene.");
|
||||
return;
|
||||
}
|
||||
if (!(scene is Scene))
|
||||
{
|
||||
m_log.Error("[WEBSOCKETSERVER]: AddScene() called with an unrecognized scene type " + scene.GetType());
|
||||
return;
|
||||
}
|
||||
|
||||
m_scene = (Scene)scene;
|
||||
m_location = new Location(m_scene.RegionInfo.RegionHandle);
|
||||
}
|
||||
|
||||
public void Start()
|
||||
{
|
||||
_listener = new TcpListener(_address, _port);
|
||||
_listener.Start(_backlogAcceptQueueLength);
|
||||
Interlocked.Increment(ref _pendingAccepts);
|
||||
_listener.BeginAcceptSocket(OnAccept, null);
|
||||
}
|
||||
|
||||
private void OnAccept(IAsyncResult ar)
|
||||
{
|
||||
bool beginAcceptCalled = false;
|
||||
try
|
||||
{
|
||||
int count = Interlocked.Decrement(ref _pendingAccepts);
|
||||
if (_shutdown)
|
||||
{
|
||||
if (count == 0)
|
||||
_shutdownEvent.Set();
|
||||
return;
|
||||
}
|
||||
Interlocked.Increment(ref _pendingAccepts);
|
||||
_listener.BeginAcceptSocket(OnAccept, null);
|
||||
beginAcceptCalled = true;
|
||||
Socket socket = _listener.EndAcceptSocket(ar);
|
||||
if (!OnAcceptingSocket(socket))
|
||||
{
|
||||
socket.Disconnect(true);
|
||||
return;
|
||||
}
|
||||
ClientNetworkContext context = new ClientNetworkContext((IPEndPoint) socket.RemoteEndPoint, _port,
|
||||
new NetworkStream(socket), 16384, socket);
|
||||
HttpRequestParser parser;
|
||||
context.BeginRead();
|
||||
|
||||
}
|
||||
catch (Exception err)
|
||||
{
|
||||
if (ExceptionThrown == null)
|
||||
#if DEBUG
|
||||
throw;
|
||||
#else
|
||||
_logWriter.Write(this, LogPrio.Fatal, err.Message);
|
||||
// we can't really do anything but close the connection
|
||||
#endif
|
||||
if (ExceptionThrown != null)
|
||||
ExceptionThrown(this, err);
|
||||
|
||||
if (!beginAcceptCalled)
|
||||
RetryBeginAccept();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private void RetryBeginAccept()
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
_listener.BeginAcceptSocket(OnAccept, null);
|
||||
}
|
||||
catch (Exception err)
|
||||
{
|
||||
|
||||
if (ExceptionThrown == null)
|
||||
#if DEBUG
|
||||
throw;
|
||||
#else
|
||||
// we can't really do anything but close the connection
|
||||
#endif
|
||||
if (ExceptionThrown != null)
|
||||
ExceptionThrown(this, err);
|
||||
}
|
||||
}
|
||||
|
||||
private bool OnAcceptingSocket(Socket sock)
|
||||
{
|
||||
ClientAcceptedEventArgs args = new ClientAcceptedEventArgs(sock);
|
||||
Accepted(this, args);
|
||||
return !args.Revoked;
|
||||
}
|
||||
/// <summary>
|
||||
/// Catch exceptions not handled by the listener.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Exceptions will be thrown during debug mode if this event is not used,
|
||||
/// exceptions will be printed to console and suppressed during release mode.
|
||||
/// </remarks>
|
||||
public event ExceptionHandler ExceptionThrown = delegate { };
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
45
prebuild.xml
45
prebuild.xml
|
|
@ -1466,6 +1466,8 @@
|
|||
</Files>
|
||||
</Project>
|
||||
|
||||
|
||||
|
||||
<Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenCaps" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library">
|
||||
<Configuration name="Debug">
|
||||
<Options>
|
||||
|
|
@ -1508,6 +1510,49 @@
|
|||
</Files>
|
||||
</Project>
|
||||
|
||||
<Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.TCPJSONStream" path="OpenSim/Region/ClientStack/TCPJSONStream" type="Library">
|
||||
<Configuration name="Debug">
|
||||
<Options>
|
||||
<OutputPath>../../../../bin/</OutputPath>
|
||||
</Options>
|
||||
</Configuration>
|
||||
<Configuration name="Release">
|
||||
<Options>
|
||||
<OutputPath>../../../../bin/</OutputPath>
|
||||
</Options>
|
||||
</Configuration>
|
||||
|
||||
<ReferencePath>../../../../bin/</ReferencePath>
|
||||
<Reference name="System"/>
|
||||
<Reference name="System.Core"/>
|
||||
<Reference name="System.Drawing"/>
|
||||
<Reference name="System.Xml"/>
|
||||
<Reference name="System.Web"/>
|
||||
<Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
|
||||
<Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/>
|
||||
<Reference name="OpenMetaverse" path="../../../../bin/"/>
|
||||
<Reference name="OpenSim.Data"/>
|
||||
<Reference name="OpenSim.Framework"/>
|
||||
<Reference name="OpenSim.Framework.Monitoring"/>
|
||||
<Reference name="OpenSim.Framework.Servers"/>
|
||||
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
|
||||
<Reference name="OpenSim.Framework.Console"/>
|
||||
<Reference name="OpenSim.Framework.Communications"/>
|
||||
<Reference name="OpenSim.Region.ClientStack"/>
|
||||
<Reference name="OpenSim.Region.Framework"/>
|
||||
<Reference name="OpenSim.Services.Interfaces"/>
|
||||
<Reference name="Nini" path="../../../../bin/"/>
|
||||
<Reference name="log4net" path="../../../../bin/"/>
|
||||
<Reference name="C5" path="../../../../bin/"/>
|
||||
<Reference name="Nini" path="../../../../bin/"/>
|
||||
|
||||
<Files>
|
||||
<Match pattern="*.cs" recurse="true">
|
||||
<Exclude name="Tests" pattern="Tests"/>
|
||||
</Match>
|
||||
</Files>
|
||||
</Project>
|
||||
|
||||
<Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library">
|
||||
<Configuration name="Debug">
|
||||
<Options>
|
||||
|
|
|
|||
Loading…
Reference in New Issue