diff --git a/Example/bin/Debug_Ubuntu/example.exe b/Example/bin/Debug_Ubuntu/example.exe index 21bf2973..75506bba 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 1b56109c..6fa4d587 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 73f871b1..8cae1dca 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 a1edfc63..99662072 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/Example1/bin/Debug_Ubuntu/example1.exe b/Example1/bin/Debug_Ubuntu/example1.exe index 0bff4554..e7fd11ec 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 5c23c513..cdf6c7cd 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 73f871b1..8cae1dca 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 a1edfc63..99662072 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/Example2/bin/Debug_Ubuntu/example2.exe b/Example2/bin/Debug_Ubuntu/example2.exe index 57812160..16b3e636 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 526972c2..a18b9477 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 73f871b1..8cae1dca 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 a1edfc63..99662072 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/Example3/bin/Debug_Ubuntu/Example3.exe b/Example3/bin/Debug_Ubuntu/Example3.exe index b54ba17f..89bd6e5a 100755 Binary files a/Example3/bin/Debug_Ubuntu/Example3.exe and b/Example3/bin/Debug_Ubuntu/Example3.exe differ diff --git a/Example3/bin/Debug_Ubuntu/Example3.exe.mdb b/Example3/bin/Debug_Ubuntu/Example3.exe.mdb index c6934361..b0acc465 100644 Binary files a/Example3/bin/Debug_Ubuntu/Example3.exe.mdb and b/Example3/bin/Debug_Ubuntu/Example3.exe.mdb differ diff --git a/Example3/bin/Debug_Ubuntu/websocket-sharp.dll b/Example3/bin/Debug_Ubuntu/websocket-sharp.dll index 73f871b1..8cae1dca 100755 Binary files a/Example3/bin/Debug_Ubuntu/websocket-sharp.dll and b/Example3/bin/Debug_Ubuntu/websocket-sharp.dll differ diff --git a/Example3/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/Example3/bin/Debug_Ubuntu/websocket-sharp.dll.mdb index a1edfc63..99662072 100644 Binary files a/Example3/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/Example3/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ diff --git a/websocket-sharp/Ext.cs b/websocket-sharp/Ext.cs index 56a6783f..6f8bf77b 100644 --- a/websocket-sharp/Ext.cs +++ b/websocket-sharp/Ext.cs @@ -215,6 +215,19 @@ namespace WebSocketSharp { : null; } + internal static string GetMessage(this CloseStatusCode code) + { + if (code == CloseStatusCode.ABNORMAL) + return "What we've got here is a failure to communicate in the WebSocket protocol."; + + if (code == CloseStatusCode.TOO_BIG) + return String.Format( + "The size of received payload data is bigger than the allowable value ({0} bytes).", + PayloadData.MaxLength); + + return String.Empty; + } + internal static string GetValueInternal(this string nameAndValue, string separator) { int i = nameAndValue.IndexOf(separator); diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index b42b2639..12abf56a 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -903,8 +903,8 @@ namespace WebSocketSharp { #if DEBUG Console.WriteLine("WS: Info@processAbnormal: Start closing handshake."); #endif - var msg = "What we've got here is a failure to communicate in the WebSocket protocol."; - Close(CloseStatusCode.ABNORMAL, msg); + var code = CloseStatusCode.ABNORMAL; + Close(code, code.GetMessage()); return true; } @@ -1368,9 +1368,9 @@ namespace WebSocketSharp { else _exitReceiving.Set(); } - catch (WsReceivedTooBigMessageException ex) + catch (WebSocketException ex) { - Close(CloseStatusCode.TOO_BIG, ex.Message); + Close(ex.Code, ex.Message); } catch (Exception) { diff --git a/websocket-sharp/WsReceivedTooBigMessageException.cs b/websocket-sharp/WebSocketException.cs similarity index 57% rename from websocket-sharp/WsReceivedTooBigMessageException.cs rename to websocket-sharp/WebSocketException.cs index f6afcd02..14ad02b7 100644 --- a/websocket-sharp/WsReceivedTooBigMessageException.cs +++ b/websocket-sharp/WebSocketException.cs @@ -1,6 +1,6 @@ -#region MIT License +#region License /* - * WsReceivedTooBigMessageException.cs + * WebSocketException.cs * * The MIT License * @@ -30,24 +30,43 @@ using System; namespace WebSocketSharp { - public class WsReceivedTooBigMessageException : Exception + /// + /// Represents the exception that occurred when attempting to perform an operation on the WebSocket connection. + /// + public class WebSocketException : Exception { - private static readonly string _defaultMessage; + #region Internal Constructors - static WsReceivedTooBigMessageException() - { - _defaultMessage = String.Format( - "Size of received payload data is bigger than the allowable value({0} bytes).", PayloadData.MaxLength); - } - - public WsReceivedTooBigMessageException() - : this(_defaultMessage) + internal WebSocketException() + : this(CloseStatusCode.ABNORMAL) { } - public WsReceivedTooBigMessageException(string message) - : base(message) + internal WebSocketException(CloseStatusCode code) + : this(code, code.GetMessage()) { } + + internal WebSocketException(CloseStatusCode code, string message) + : base(message) + { + Code = code; + } + + #endregion + + #region Public Properties + + /// + /// Gets the associated with a . + /// + /// + /// One of the values that indicates the cause of the exception. + /// + public CloseStatusCode Code { + get; internal set; + } + + #endregion } } diff --git a/websocket-sharp/WsFrame.cs b/websocket-sharp/WsFrame.cs index c5c3f625..9d0d878f 100644 --- a/websocket-sharp/WsFrame.cs +++ b/websocket-sharp/WsFrame.cs @@ -485,7 +485,7 @@ namespace WebSocketSharp { } if (frame.PayloadLen > 126 && length > PayloadData.MaxLength) - throw new WsReceivedTooBigMessageException(); + throw new WebSocketException(CloseStatusCode.TOO_BIG); var buffer = length <= (ulong)_readBufferLen ? stream.ReadBytes((int)length) diff --git a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll index 73f871b1..8cae1dca 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 a1edfc63..99662072 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_Ubuntu/websocket-sharp.dll b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll index 4b57a6a1..d826c431 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/bin/Release_Ubuntu/websocket-sharp.xml b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml index 5413bae6..6eb4da88 100644 --- a/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml +++ b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml @@ -830,6 +830,19 @@ true if the WebSocket connection closed cleanly; otherwise, false. + + + Represents the exception that occurred when attempting to perform an operation on the WebSocket connection. + + + + + Gets the associated with a . + + + One of the values that indicates the cause of the exception. + + Contains the values that indicate whether the byte order is a Little-endian or Big-endian. diff --git a/websocket-sharp/doc/html/WebSocketSharp/WebSocketException.html b/websocket-sharp/doc/html/WebSocketSharp/WebSocketException.html new file mode 100644 index 00000000..064734ea --- /dev/null +++ b/websocket-sharp/doc/html/WebSocketSharp/WebSocketException.html @@ -0,0 +1,312 @@ + + + WebSocketSharp.WebSocketException + + + + + +
+ websocket-sharp : WebSocketSharp Namespace
+
+

+ Overview +

+

+ Signature +

+

+ Remarks +

+

+ Members +

+

+ Member Details +

+
+

WebSocketException Class

+

+ Represents the exception that occurred when attempting to perform an operation on the WebSocket connection. +

+
+

Syntax

+
public class WebSocketException : Exception
+
+
+

Remarks

+
+ Documentation for this section has not yet been entered. +
+

Requirements

+
+ Namespace: WebSocketSharp
Assembly: websocket-sharp (in websocket-sharp.dll)
+

Members

+
+

+ See Also: Inherited members from + Exception. +

+

Public Properties

+
+
+ + + + + + +
[read-only]
 + + Code + + + + CloseStatusCode + . + Gets the WebSocketSharp.CloseStatusCode associated with a WebSocketSharp.WebSocketException. +
+
+
+

Extension Methods

+
+
+ + + + + + + + + +
+
static
+ 		+ + IsNull<T> + (this T) : bool
+ Determines whether the specified object is null. +
+
static
+ 		+ + IsNullDo<T> + (this T, Action) : bool
+ Determines whether the specified object is null. + And invokes the specified Action delegate if the specified object is null. +
+
+
+
+
+
+

Member Details

+
+

Code Property

+
+

+ Gets the WebSocketSharp.CloseStatusCode associated with a WebSocketSharp.WebSocketException. +

+

Syntax

+
public CloseStatusCode Code { get; }
+

Value

+
+ One of the WebSocketSharp.CloseStatusCode values that indicates the cause of the exception. +
+

Remarks

+
+ Documentation for this section has not yet been entered. +
+

Requirements

+
+ Namespace: WebSocketSharp
Assembly: websocket-sharp (in websocket-sharp.dll)
+
+
+
+
+
+
+
+ + \ No newline at end of file diff --git a/websocket-sharp/doc/html/WebSocketSharp/index.html b/websocket-sharp/doc/html/WebSocketSharp/index.html index d9a07e4a..634afac8 100644 --- a/websocket-sharp/doc/html/WebSocketSharp/index.html +++ b/websocket-sharp/doc/html/WebSocketSharp/index.html @@ -276,11 +276,11 @@ - WsReceivedTooBigMessageException + WebSocketException - Documentation for this section has not yet been entered. - + Represents the exception that occurred when attempting to perform an operation on the WebSocket connection. + diff --git a/websocket-sharp/doc/html/index.html b/websocket-sharp/doc/html/index.html index e4bb4f3e..ab79b747 100644 --- a/websocket-sharp/doc/html/index.html +++ b/websocket-sharp/doc/html/index.html @@ -278,11 +278,11 @@ - WsReceivedTooBigMessageException + WebSocketException - Documentation for this section has not yet been entered. - + Represents the exception that occurred when attempting to perform an operation on the WebSocket connection. + diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp/WebSocketException.xml b/websocket-sharp/doc/mdoc/WebSocketSharp/WebSocketException.xml new file mode 100644 index 00000000..fc3a1edb --- /dev/null +++ b/websocket-sharp/doc/mdoc/WebSocketSharp/WebSocketException.xml @@ -0,0 +1,36 @@ + + + + + websocket-sharp + + + System.Exception + + + + + Represents the exception that occurred when attempting to perform an operation on the WebSocket connection. + + To be added. + + + + + + Property + + WebSocketSharp.CloseStatusCode + + + + Gets the associated with a . + + + One of the values that indicates the cause of the exception. + + To be added. + + + + diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp/WsReceivedTooBigMessageException.xml b/websocket-sharp/doc/mdoc/WebSocketSharp/WsReceivedTooBigMessageException.xml.remove similarity index 100% rename from websocket-sharp/doc/mdoc/WebSocketSharp/WsReceivedTooBigMessageException.xml rename to websocket-sharp/doc/mdoc/WebSocketSharp/WsReceivedTooBigMessageException.xml.remove diff --git a/websocket-sharp/doc/mdoc/index.xml b/websocket-sharp/doc/mdoc/index.xml index dff297a2..0da8b383 100644 --- a/websocket-sharp/doc/mdoc/index.xml +++ b/websocket-sharp/doc/mdoc/index.xml @@ -1,6 +1,6 @@ - + [00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 11 00 00 00 29 17 fb 89 fe c3 91 f7 2b cb 8b e2 61 d2 3f 05 93 6d 65 a8 9e 63 72 a6 f5 d5 2c f2 9d 20 fa 0b c0 70 6a f6 88 7e 8b 90 3f 39 f5 76 c8 48 e0 bb 7b b2 7b ed d3 10 a7 1a 0f 70 98 0f 7f f4 4b 53 09 d2 a5 ef 36 c3 56 b4 aa f0 91 72 63 25 07 89 e0 93 3e 3f 2e f2 b9 73 0e 12 15 5d 43 56 c3 f4 70 a5 89 fe f7 f6 ac 3e 77 c2 d8 d0 84 91 f4 0c d1 f3 8e dc c3 c3 b8 38 3d 0c bf 17 de 20 78 c1 ] @@ -43,7 +43,7 @@ - + diff --git a/websocket-sharp/websocket-sharp.csproj b/websocket-sharp/websocket-sharp.csproj index e2aa5260..45c536bd 100644 --- a/websocket-sharp/websocket-sharp.csproj +++ b/websocket-sharp/websocket-sharp.csproj @@ -67,7 +67,6 @@ - @@ -123,6 +122,7 @@ + diff --git a/websocket-sharp/websocket-sharp.pidb b/websocket-sharp/websocket-sharp.pidb index d0698d63..bf5a1ad4 100644 Binary files a/websocket-sharp/websocket-sharp.pidb and b/websocket-sharp/websocket-sharp.pidb differ