diff --git a/Example/bin/Debug/example.exe b/Example/bin/Debug/example.exe index 7f4bacc3..1394bc56 100755 Binary files a/Example/bin/Debug/example.exe and b/Example/bin/Debug/example.exe differ diff --git a/Example/bin/Debug/example.exe.mdb b/Example/bin/Debug/example.exe.mdb index fdcdb6be..135cbe52 100644 Binary files a/Example/bin/Debug/example.exe.mdb and b/Example/bin/Debug/example.exe.mdb differ diff --git a/Example/bin/Debug/websocket-sharp.dll b/Example/bin/Debug/websocket-sharp.dll index dcb81762..f0aa8220 100755 Binary files a/Example/bin/Debug/websocket-sharp.dll and b/Example/bin/Debug/websocket-sharp.dll differ diff --git a/Example/bin/Debug/websocket-sharp.dll.mdb b/Example/bin/Debug/websocket-sharp.dll.mdb index 49c49bf0..2831da5c 100644 Binary files a/Example/bin/Debug/websocket-sharp.dll.mdb and b/Example/bin/Debug/websocket-sharp.dll.mdb differ diff --git a/Example/bin/Debug_Ubuntu/example.exe b/Example/bin/Debug_Ubuntu/example.exe index 652ce166..eda5eab2 100755 Binary files a/Example/bin/Debug_Ubuntu/example.exe and b/Example/bin/Debug_Ubuntu/example.exe differ diff --git a/Example/bin/Debug_Ubuntu/example.exe.mdb b/Example/bin/Debug_Ubuntu/example.exe.mdb index 653e7376..88bc3ffe 100644 Binary files a/Example/bin/Debug_Ubuntu/example.exe.mdb and b/Example/bin/Debug_Ubuntu/example.exe.mdb differ diff --git a/Example/bin/Debug_Ubuntu/websocket-sharp.dll b/Example/bin/Debug_Ubuntu/websocket-sharp.dll index e47edd9f..2de55bf2 100755 Binary files a/Example/bin/Debug_Ubuntu/websocket-sharp.dll and b/Example/bin/Debug_Ubuntu/websocket-sharp.dll differ diff --git a/Example/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/Example/bin/Debug_Ubuntu/websocket-sharp.dll.mdb index 2fc82474..1d02f140 100644 Binary files a/Example/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/Example/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ diff --git a/Example/bin/Release/example.exe b/Example/bin/Release/example.exe index 811b55ac..2a335bf2 100755 Binary files a/Example/bin/Release/example.exe and b/Example/bin/Release/example.exe differ diff --git a/Example/bin/Release/websocket-sharp.dll b/Example/bin/Release/websocket-sharp.dll index c9e0610a..c5ffe693 100755 Binary files a/Example/bin/Release/websocket-sharp.dll and b/Example/bin/Release/websocket-sharp.dll differ diff --git a/Example/bin/Release_Ubuntu/example.exe b/Example/bin/Release_Ubuntu/example.exe index 47576c65..5fc94b96 100755 Binary files a/Example/bin/Release_Ubuntu/example.exe and b/Example/bin/Release_Ubuntu/example.exe differ diff --git a/Example/bin/Release_Ubuntu/websocket-sharp.dll b/Example/bin/Release_Ubuntu/websocket-sharp.dll index 04a4870d..1be6167b 100755 Binary files a/Example/bin/Release_Ubuntu/websocket-sharp.dll and b/Example/bin/Release_Ubuntu/websocket-sharp.dll differ diff --git a/Example1/bin/Debug/example1.exe b/Example1/bin/Debug/example1.exe index f854ffb5..43394a98 100755 Binary files a/Example1/bin/Debug/example1.exe and b/Example1/bin/Debug/example1.exe differ diff --git a/Example1/bin/Debug/example1.exe.mdb b/Example1/bin/Debug/example1.exe.mdb index 1334f6fe..fd114361 100644 Binary files a/Example1/bin/Debug/example1.exe.mdb and b/Example1/bin/Debug/example1.exe.mdb differ diff --git a/Example1/bin/Debug/websocket-sharp.dll b/Example1/bin/Debug/websocket-sharp.dll index dcb81762..f0aa8220 100755 Binary files a/Example1/bin/Debug/websocket-sharp.dll and b/Example1/bin/Debug/websocket-sharp.dll differ diff --git a/Example1/bin/Debug/websocket-sharp.dll.mdb b/Example1/bin/Debug/websocket-sharp.dll.mdb index 49c49bf0..2831da5c 100644 Binary files a/Example1/bin/Debug/websocket-sharp.dll.mdb and b/Example1/bin/Debug/websocket-sharp.dll.mdb differ diff --git a/Example1/bin/Debug_Ubuntu/example1.exe b/Example1/bin/Debug_Ubuntu/example1.exe index fddb602e..07bd7aa3 100755 Binary files a/Example1/bin/Debug_Ubuntu/example1.exe and b/Example1/bin/Debug_Ubuntu/example1.exe differ diff --git a/Example1/bin/Debug_Ubuntu/example1.exe.mdb b/Example1/bin/Debug_Ubuntu/example1.exe.mdb index 79b43cf3..1f877488 100644 Binary files a/Example1/bin/Debug_Ubuntu/example1.exe.mdb and b/Example1/bin/Debug_Ubuntu/example1.exe.mdb differ diff --git a/Example1/bin/Debug_Ubuntu/websocket-sharp.dll b/Example1/bin/Debug_Ubuntu/websocket-sharp.dll index e47edd9f..2de55bf2 100755 Binary files a/Example1/bin/Debug_Ubuntu/websocket-sharp.dll and b/Example1/bin/Debug_Ubuntu/websocket-sharp.dll differ diff --git a/Example1/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/Example1/bin/Debug_Ubuntu/websocket-sharp.dll.mdb index 2fc82474..1d02f140 100644 Binary files a/Example1/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/Example1/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ diff --git a/Example1/bin/Release/example1.exe b/Example1/bin/Release/example1.exe index b4c2bd1c..0d9575ed 100755 Binary files a/Example1/bin/Release/example1.exe and b/Example1/bin/Release/example1.exe differ diff --git a/Example1/bin/Release/websocket-sharp.dll b/Example1/bin/Release/websocket-sharp.dll index c9e0610a..c5ffe693 100755 Binary files a/Example1/bin/Release/websocket-sharp.dll and b/Example1/bin/Release/websocket-sharp.dll differ diff --git a/Example1/bin/Release_Ubuntu/example1.exe b/Example1/bin/Release_Ubuntu/example1.exe index 5455ac05..2ee96c23 100755 Binary files a/Example1/bin/Release_Ubuntu/example1.exe and b/Example1/bin/Release_Ubuntu/example1.exe differ diff --git a/Example1/bin/Release_Ubuntu/websocket-sharp.dll b/Example1/bin/Release_Ubuntu/websocket-sharp.dll index 04a4870d..1be6167b 100755 Binary files a/Example1/bin/Release_Ubuntu/websocket-sharp.dll and b/Example1/bin/Release_Ubuntu/websocket-sharp.dll differ diff --git a/Example2/Example2.pidb b/Example2/Example2.pidb index 1afdf50e..1955e7c7 100644 Binary files a/Example2/Example2.pidb and b/Example2/Example2.pidb differ diff --git a/Example2/bin/Debug/example2.exe b/Example2/bin/Debug/example2.exe index 02d90595..513295f5 100755 Binary files a/Example2/bin/Debug/example2.exe and b/Example2/bin/Debug/example2.exe differ diff --git a/Example2/bin/Debug/example2.exe.mdb b/Example2/bin/Debug/example2.exe.mdb index 4b3fc658..52c1b174 100644 Binary files a/Example2/bin/Debug/example2.exe.mdb and b/Example2/bin/Debug/example2.exe.mdb differ diff --git a/Example2/bin/Debug/websocket-sharp.dll b/Example2/bin/Debug/websocket-sharp.dll index dcb81762..f0aa8220 100755 Binary files a/Example2/bin/Debug/websocket-sharp.dll and b/Example2/bin/Debug/websocket-sharp.dll differ diff --git a/Example2/bin/Debug/websocket-sharp.dll.mdb b/Example2/bin/Debug/websocket-sharp.dll.mdb index 49c49bf0..2831da5c 100644 Binary files a/Example2/bin/Debug/websocket-sharp.dll.mdb and b/Example2/bin/Debug/websocket-sharp.dll.mdb differ diff --git a/Example2/bin/Debug_Ubuntu/example2.exe b/Example2/bin/Debug_Ubuntu/example2.exe index e741ad70..27761a38 100755 Binary files a/Example2/bin/Debug_Ubuntu/example2.exe and b/Example2/bin/Debug_Ubuntu/example2.exe differ diff --git a/Example2/bin/Debug_Ubuntu/example2.exe.mdb b/Example2/bin/Debug_Ubuntu/example2.exe.mdb index 059c97c9..d2c62b94 100644 Binary files a/Example2/bin/Debug_Ubuntu/example2.exe.mdb and b/Example2/bin/Debug_Ubuntu/example2.exe.mdb differ diff --git a/Example2/bin/Debug_Ubuntu/websocket-sharp.dll b/Example2/bin/Debug_Ubuntu/websocket-sharp.dll index e47edd9f..2de55bf2 100755 Binary files a/Example2/bin/Debug_Ubuntu/websocket-sharp.dll and b/Example2/bin/Debug_Ubuntu/websocket-sharp.dll differ diff --git a/Example2/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/Example2/bin/Debug_Ubuntu/websocket-sharp.dll.mdb index 2fc82474..1d02f140 100644 Binary files a/Example2/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/Example2/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ diff --git a/Example2/bin/Release/example2.exe b/Example2/bin/Release/example2.exe index f5e3a3b9..f19a245c 100755 Binary files a/Example2/bin/Release/example2.exe and b/Example2/bin/Release/example2.exe differ diff --git a/Example2/bin/Release/websocket-sharp.dll b/Example2/bin/Release/websocket-sharp.dll index c9e0610a..c5ffe693 100755 Binary files a/Example2/bin/Release/websocket-sharp.dll and b/Example2/bin/Release/websocket-sharp.dll differ diff --git a/Example2/bin/Release_Ubuntu/example2.exe b/Example2/bin/Release_Ubuntu/example2.exe index 08dccde4..94570139 100755 Binary files a/Example2/bin/Release_Ubuntu/example2.exe and b/Example2/bin/Release_Ubuntu/example2.exe differ diff --git a/Example2/bin/Release_Ubuntu/websocket-sharp.dll b/Example2/bin/Release_Ubuntu/websocket-sharp.dll index 04a4870d..1be6167b 100755 Binary files a/Example2/bin/Release_Ubuntu/websocket-sharp.dll and b/Example2/bin/Release_Ubuntu/websocket-sharp.dll differ diff --git a/websocket-sharp.userprefs b/websocket-sharp.userprefs index 8a063dbf..9b182064 100644 --- a/websocket-sharp.userprefs +++ b/websocket-sharp.userprefs @@ -1,5 +1,5 @@  - + diff --git a/websocket-sharp/Server/IWebSocketServer.cs b/websocket-sharp/Server/IWebSocketServer.cs deleted file mode 100644 index 1afbd5b3..00000000 --- a/websocket-sharp/Server/IWebSocketServer.cs +++ /dev/null @@ -1,49 +0,0 @@ -#region MIT License -/** - * IWebSocketServer.cs - * - * The MIT License - * - * Copyright (c) 2012 sta.blockhead - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -#endregion - -using System; -using System.Collections.Generic; -using WebSocketSharp.Frame; - -namespace WebSocketSharp.Server -{ - public interface IWebSocketServer - { - WsServerState State { get; } - - void AddService(string id, WebSocketService service); - Dictionary PingAround(string data); - void Publish(TData data); - void RemoveService(string id); - void SendTo(string id, TData data); - void SendTo(IEnumerable group, TData data); - void Start(); - void Stop(); - void StopServices(CloseStatusCode code, string reason); - } -} diff --git a/websocket-sharp/Server/WebSocketServer.cs b/websocket-sharp/Server/WebSocketServer.cs index 4e82a3d3..3793fc82 100644 --- a/websocket-sharp/Server/WebSocketServer.cs +++ b/websocket-sharp/Server/WebSocketServer.cs @@ -34,20 +34,17 @@ using System.Collections.Generic; using System.Diagnostics; using System.Net; using System.Net.Sockets; -using System.Text; using System.Threading; using WebSocketSharp.Frame; namespace WebSocketSharp.Server { - public class WebSocketServer : IWebSocketServer + public class WebSocketServer where T : WebSocketService, new() { #region Private Fields - private object _forServices; private Dictionary _services; - private WsServerState _state; private TcpListener _tcpListener; private Uri _uri; @@ -70,11 +67,6 @@ namespace WebSocketSharp.Server get { return Endpoint.Port; } } - public WsServerState State - { - get { return _state; } - } - public string Url { get { return _uri.ToString(); } @@ -116,9 +108,7 @@ namespace WebSocketSharp.Server } _tcpListener = new TcpListener(IPAddress.Any, port); - _forServices = new object(); _services = new Dictionary(); - _state = WsServerState.READY; } #endregion @@ -139,7 +129,7 @@ namespace WebSocketSharp.Server TcpClient client = listener.EndAcceptTcpClient(ar); WebSocket socket = new WebSocket(_uri, client); T service = new T(); - service.Bind(this, socket); + service.Bind(socket, _services); service.Start(); } catch (ObjectDisposedException) @@ -180,116 +170,16 @@ namespace WebSocketSharp.Server #region Public Methods - public void AddService(string id, WebSocketService service) - { - lock (_forServices) - { - _services.Add(id, service); - } - } - - public Dictionary PingAround() - { - return PingAround(String.Empty); - } - - public Dictionary PingAround(string data) - { - var result = new Dictionary(); - - lock (_forServices) - { - foreach (WebSocketService service in _services.Values) - { - result.Add(service.ID, service.Ping(data)); - } - } - - return result; - } - - public void Publish(TData data) - { - WaitCallback broadcast = (state) => - { - lock (_forServices) - { - SendTo(_services.Keys, data); - } - }; - ThreadPool.QueueUserWorkItem(broadcast); - } - - public void RemoveService(string id) - { - lock (_forServices) - { - _services.Remove(id); - } - } - - public void SendTo(string id, TData data) - { - if (typeof(TData) != typeof(string) && - typeof(TData) != typeof(byte[])) - { - var msg = "Type of data must be string or byte[]."; - throw new ArgumentException(msg); - } - - lock (_forServices) - { - WebSocketService service; - - if (_services.TryGetValue(id, out service)) - { - if (typeof(TData) == typeof(string)) - { - string data_ = (string)(object)data; - service.Send(data_); - } - else if (typeof(TData) == typeof(byte[])) - { - byte[] data_ = (byte[])(object)data; - service.Send(data_); - } - } - } - } - - public void SendTo(IEnumerable group, TData data) - { - if (typeof(TData) != typeof(string) && - typeof(TData) != typeof(byte[])) - { - var msg = "Type of data must be string or byte[]."; - throw new ArgumentException(msg); - } - - lock (_forServices) - { - foreach (string id in group) - { - SendTo(id, data); - } - } - } - public void Start() { _tcpListener.Start(); _tcpListener.BeginAcceptTcpClient(acceptClient, _tcpListener); - _state = WsServerState.START; } public void Stop() { - _state = WsServerState.SHUTDOWN; - _tcpListener.Stop(); StopServices(); - - _state = WsServerState.STOP; } public void StopServices() @@ -299,7 +189,7 @@ namespace WebSocketSharp.Server public void StopServices(CloseStatusCode code, string reason) { - lock (_forServices) + lock (((ICollection)_services).SyncRoot) { foreach (WebSocketService service in _services.Values) { diff --git a/websocket-sharp/Server/WebSocketService.cs b/websocket-sharp/Server/WebSocketService.cs index 1af03dd7..84ca9111 100644 --- a/websocket-sharp/Server/WebSocketService.cs +++ b/websocket-sharp/Server/WebSocketService.cs @@ -27,7 +27,9 @@ #endregion using System; +using System.Collections; using System.Collections.Generic; +using System.Threading; using WebSocketSharp.Frame; namespace WebSocketSharp.Server @@ -36,8 +38,8 @@ namespace WebSocketSharp.Server { #region Private Fields - private IWebSocketServer _server; - private WebSocket _socket; + private Dictionary _services; + private WebSocket _socket; #endregion @@ -45,6 +47,7 @@ namespace WebSocketSharp.Server public string ID { get; private set; } public bool IsBound { get; private set; } + public bool IsStop { get; private set; } #endregion @@ -54,12 +57,21 @@ namespace WebSocketSharp.Server { ID = String.Empty; IsBound = false; + IsStop = false; } #endregion #region Private Method + private void addService(string id, WebSocketService service) + { + lock (((ICollection)_services).SyncRoot) + { + _services.Add(id, service); + } + } + private string getNewID() { return Guid.NewGuid().ToString("N"); @@ -70,18 +82,26 @@ namespace WebSocketSharp.Server _socket.OnOpen += (sender, e) => { ID = getNewID(); - _server.AddService(ID, this); + addService(ID, this); }; _socket.OnClose += (sender, e) => { - if (_server.State == WsServerState.START) + if (!IsStop) { - _server.RemoveService(ID); + removeService(ID); } }; } + private void removeService(string id) + { + lock (((ICollection)_services).SyncRoot) + { + _services.Remove(id); + } + } + #endregion #region Protected Methods @@ -106,10 +126,10 @@ namespace WebSocketSharp.Server #region Public Methods - public void Bind(IWebSocketServer server, WebSocket socket) + public void Bind(WebSocket socket, Dictionary services) { - _server = server; - _socket = socket; + _socket = socket; + _services = services; defaultBind(); _socket.OnOpen += onOpen; @@ -120,6 +140,18 @@ namespace WebSocketSharp.Server IsBound = true; } + public bool Ping() + { + return Ping(String.Empty); + } + + public bool Ping(string data) + { + return IsBound + ? _socket.Ping(data) + : false; + } + public Dictionary PingAround() { return PingAround(String.Empty); @@ -127,25 +159,67 @@ namespace WebSocketSharp.Server public Dictionary PingAround(string data) { - if (IsBound) return _server.PingAround(data); - return null; + if (!IsBound) return null; + + lock (((ICollection)_services).SyncRoot) + { + return PingTo(_services.Keys, data); + } } - public bool Ping() + public bool PingTo(string id) { - if (IsBound) return _socket.Ping(); - return false; + return PingTo(id, String.Empty); } - public bool Ping(string data) + public Dictionary PingTo(IEnumerable group) { - if (IsBound) return _socket.Ping(data); - return false; + return PingTo(group, String.Empty); + } + + public bool PingTo(string id, string data) + { + if (!IsBound) return false; + + lock (((ICollection)_services).SyncRoot) + { + WebSocketService service; + + return _services.TryGetValue(id, out service) + ? service.Ping(data) + : false; + } + } + + public Dictionary PingTo(IEnumerable group, string data) + { + if (!IsBound) return null; + + var result = new Dictionary(); + + lock (((ICollection)_services).SyncRoot) + { + foreach (string id in group) + { + result.Add(id, PingTo(id, data)); + } + } + + return result; } public void Publish(TData data) { - if (IsBound) _server.Publish(data); + if (!IsBound) return; + + WaitCallback broadcast = (state) => + { + lock (((ICollection)_services).SyncRoot) + { + SendTo(_services.Keys, data); + } + }; + ThreadPool.QueueUserWorkItem(broadcast); } public void Send(byte[] data) @@ -160,12 +234,53 @@ namespace WebSocketSharp.Server public void SendTo(string id, TData data) { - if (IsBound) _server.SendTo(id, data); + if (!IsBound) return; + + if (typeof(TData) != typeof(string) && + typeof(TData) != typeof(byte[])) + { + var msg = "Type of data must be string or byte[]."; + throw new ArgumentException(msg); + } + + lock (((ICollection)_services).SyncRoot) + { + WebSocketService service; + + if (_services.TryGetValue(id, out service)) + { + if (typeof(TData) == typeof(string)) + { + string data_ = (string)(object)data; + service.Send(data_); + } + else if (typeof(TData) == typeof(byte[])) + { + byte[] data_ = (byte[])(object)data; + service.Send(data_); + } + } + } } public void SendTo(IEnumerable group, TData data) { - if (IsBound) _server.SendTo(group, data); + if (!IsBound) return; + + if (typeof(TData) != typeof(string) && + typeof(TData) != typeof(byte[])) + { + var msg = "Type of data must be string or byte[]."; + throw new ArgumentException(msg); + } + + lock (((ICollection)_services).SyncRoot) + { + foreach (string id in group) + { + SendTo(id, data); + } + } } public void Start() @@ -175,12 +290,15 @@ namespace WebSocketSharp.Server public void Stop() { - if (IsBound) _socket.Close(); + Stop(CloseStatusCode.NORMAL, String.Empty); } public void Stop(CloseStatusCode code, string reason) { - if (IsBound) _socket.Close(code, reason); + if (!IsBound || IsStop) return; + + IsStop = true; + _socket.Close(code, reason); } #endregion diff --git a/websocket-sharp/Server/WsServerState.cs b/websocket-sharp/Server/WsServerState.cs deleted file mode 100644 index 9c764d6a..00000000 --- a/websocket-sharp/Server/WsServerState.cs +++ /dev/null @@ -1,40 +0,0 @@ -#region MIT License -/** - * WsServerState.cs - * - * The MIT License - * - * Copyright (c) 2012 sta.blockhead - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -#endregion - -using System; - -namespace WebSocketSharp.Server -{ - public enum WsServerState - { - READY, - START, - SHUTDOWN, - STOP - } -} diff --git a/websocket-sharp/bin/Debug/websocket-sharp.dll b/websocket-sharp/bin/Debug/websocket-sharp.dll index dcb81762..f0aa8220 100755 Binary files a/websocket-sharp/bin/Debug/websocket-sharp.dll and b/websocket-sharp/bin/Debug/websocket-sharp.dll differ diff --git a/websocket-sharp/bin/Debug/websocket-sharp.dll.mdb b/websocket-sharp/bin/Debug/websocket-sharp.dll.mdb index 49c49bf0..2831da5c 100644 Binary files a/websocket-sharp/bin/Debug/websocket-sharp.dll.mdb and b/websocket-sharp/bin/Debug/websocket-sharp.dll.mdb differ diff --git a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll index e47edd9f..2de55bf2 100755 Binary files a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll and b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll differ diff --git a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb index 2fc82474..1d02f140 100644 Binary files a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ diff --git a/websocket-sharp/bin/Release/websocket-sharp.dll b/websocket-sharp/bin/Release/websocket-sharp.dll index c9e0610a..c5ffe693 100755 Binary files a/websocket-sharp/bin/Release/websocket-sharp.dll and b/websocket-sharp/bin/Release/websocket-sharp.dll differ diff --git a/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll index 04a4870d..1be6167b 100755 Binary files a/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll and b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll differ diff --git a/websocket-sharp/websocket-sharp.csproj b/websocket-sharp/websocket-sharp.csproj index a805191e..19b710e1 100644 --- a/websocket-sharp/websocket-sharp.csproj +++ b/websocket-sharp/websocket-sharp.csproj @@ -74,10 +74,8 @@ - - diff --git a/websocket-sharp/websocket-sharp.pidb b/websocket-sharp/websocket-sharp.pidb index 632ec3c0..94a90d18 100644 Binary files a/websocket-sharp/websocket-sharp.pidb and b/websocket-sharp/websocket-sharp.pidb differ