diff --git a/Example/bin/Debug_Ubuntu/example.exe b/Example/bin/Debug_Ubuntu/example.exe index f6d8a82b..44dce630 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 48d9f9b0..795a58cb 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 e52c67b3..5cf4a381 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 c952480f..b5da622e 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 ec8c0d47..b13636c7 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 941a29b7..c71207eb 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 e52c67b3..5cf4a381 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 c952480f..b5da622e 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 e1fa3de4..9d4a50c5 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 7e1e77ab..cc8967da 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 e52c67b3..5cf4a381 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 c952480f..b5da622e 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 29338e41..67b68851 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 e25a657c..557fe8bd 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 e52c67b3..5cf4a381 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 c952480f..b5da622e 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 7c771ac0..a1082a5a 100644 --- a/websocket-sharp/Ext.cs +++ b/websocket-sharp/Ext.cs @@ -488,6 +488,40 @@ namespace WebSocketSharp { : null; } + /// + /// Determines whether the specified is in the allowable range of + /// the WebSocket close status code. + /// + /// + /// Not allowable ranges are the followings. + /// + /// + /// + /// Numbers in the range 0-999 are not used. + /// + /// + /// + /// + /// Numbers which are greater than 4999 are out of the reserved close status code ranges. + /// + /// + /// + /// + /// + /// true if is in the allowable range of the WebSocket close status code; otherwise, false. + /// + /// + /// A to test. + /// + public static bool IsCloseStatusCode(this ushort code) + { + return code < 1000 + ? false + : code > 4999 + ? false + : true; + } + /// /// Determines whether the specified is a . /// diff --git a/websocket-sharp/PayloadData.cs b/websocket-sharp/PayloadData.cs index 68966c56..13e8d031 100644 --- a/websocket-sharp/PayloadData.cs +++ b/websocket-sharp/PayloadData.cs @@ -82,9 +82,30 @@ namespace WebSocketSharp { #endregion - #region Properties + #region Internal Property + + internal bool ContainsReservedCloseStatusCode { + get { + if (Length >= 2) + { + var code = ToBytes().SubArray(0, 2).To(ByteOrder.BIG); + if (code == (ushort)CloseStatusCode.UNDEFINED || + code == (ushort)CloseStatusCode.NO_STATUS_CODE || + code == (ushort)CloseStatusCode.ABNORMAL || + code == (ushort)CloseStatusCode.TLS_HANDSHAKE_FAILURE) + return true; + } + + return false; + } + } + + #endregion + + #region Public Properties public byte[] ExtensionData { get; private set; } + public byte[] ApplicationData { get; private set; } public bool IsMasked { get; private set; } diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index b47d3c53..4f6480d3 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -327,38 +327,6 @@ namespace WebSocketSharp { return true; } - private bool canSendAsCloseFrame(PayloadData data) - { - if (data.Length >= 2) - { - var code = data.ToBytes().SubArray(0, 2).To(ByteOrder.BIG); - if (code == (ushort)CloseStatusCode.NO_STATUS_CODE || - code == (ushort)CloseStatusCode.ABNORMAL || - code == (ushort)CloseStatusCode.TLS_HANDSHAKE_FAILURE) - return false; - } - - return true; - } - - private bool checkCloseStatusCodeIsValid(ushort code, out string message) - { - if (code < 1000) - { - message = "Close status codes in the range 0-999 are not used: " + code; - return false; - } - - if (code > 4999) - { - message = "Out of reserved close status code range: " + code; - return false; - } - - message = String.Empty; - return true; - } - private bool checkFrameIsValid(WsFrame frame) { if (frame.IsNull()) @@ -428,12 +396,12 @@ namespace WebSocketSharp { #endif lock(_forClose) { - // Whether the closing handshake has been started already ? + // Whether the closing handshake has been started already? if (_readyState == WsState.CLOSING || _readyState == WsState.CLOSED) return; - // Whether the closing handshake as server is started before the connection has been established ? + // Whether the closing handshake on server is started before the connection has been established? if (_readyState == WsState.CONNECTING && !_client) { sendResponseHandshake(HttpStatusCode.BadRequest); @@ -445,8 +413,8 @@ namespace WebSocketSharp { _readyState = WsState.CLOSING; } - // Whether a close status code that must not be set for send is used ? - if (!canSendAsCloseFrame(data)) + // Whether a payload data contains the close status code which must not be set for send? + if (data.ContainsReservedCloseStatusCode) { onClose(new CloseEventArgs(data)); return; @@ -1107,11 +1075,15 @@ namespace WebSocketSharp { } /// - /// Closes the WebSocket connection with the specified - /// and releases all associated resources. + /// Closes the WebSocket connection with the specified and + /// releases all associated resources. /// + /// + /// Emits a event if is not in the allowable range of + /// the WebSocket close status code, and do nothing any more. + /// /// - /// A that contains a status code indicating the reason for closure. + /// A that indicates the status code for closure. /// public void Close(ushort code) { @@ -1119,12 +1091,11 @@ namespace WebSocketSharp { } /// - /// Closes the WebSocket connection with the specified - /// and releases all associated resources. + /// Closes the WebSocket connection with the specified and + /// releases all associated resources. /// /// - /// One of the values that contains a status code - /// indicating the reason for closure. + /// One of the values that indicates the status code for closure. /// public void Close(CloseStatusCode code) { @@ -1132,20 +1103,24 @@ namespace WebSocketSharp { } /// - /// Closes the WebSocket connection with the specified and , - /// and releases all associated resources. + /// Closes the WebSocket connection with the specified and , and + /// releases all associated resources. /// + /// + /// Emits a event if is not in the allowable range of + /// the WebSocket close status code, and do nothing any more. + /// /// - /// A that contains a status code indicating the reason for closure. + /// A that indicates the status code for closure. /// /// /// A that contains the reason for closure. /// public void Close(ushort code, string reason) { - string msg; - if (!checkCloseStatusCodeIsValid(code, out msg)) + if (!code.IsCloseStatusCode()) { + var msg = String.Format("Invalid close status code: {0}", code); onError(msg); return; } @@ -1154,12 +1129,11 @@ namespace WebSocketSharp { } /// - /// Closes the WebSocket connection with the specified and , - /// and releases all associated resources. + /// Closes the WebSocket connection with the specified and , and + /// releases all associated resources. /// /// - /// One of the values that contains a status code - /// indicating the reason for closure. + /// One of the values that indicates the status code for closure. /// /// /// A that contains the reason for closure. diff --git a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll index e52c67b3..5cf4a381 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 c952480f..b5da622e 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 4e8a4675..ea9a3734 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 7e8a20c3..a4204a65 100644 --- a/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml +++ b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml @@ -216,6 +216,25 @@ A that contains a separator string. + + + Determines whether the specified is in the allowable range of + the WebSocket close status code. + + + Not allowable ranges are the followings. + + Numbers in the range 0-999 are not used. + + Numbers which are greater than 4999 are out of the reserved close status code ranges. + + + true if is in the allowable range of the WebSocket close status code; otherwise, false. + + + A to test. + + Determines whether the specified is a . @@ -964,30 +983,37 @@ - Closes the WebSocket connection with the specified - and releases all associated resources. + Closes the WebSocket connection with the specified and + releases all associated resources. + + Emits a event if is not in the allowable range of + the WebSocket close status code, and do nothing any more. + - A that contains a status code indicating the reason for closure. + A that indicates the status code for closure. - Closes the WebSocket connection with the specified - and releases all associated resources. + Closes the WebSocket connection with the specified and + releases all associated resources. - One of the values that contains a status code - indicating the reason for closure. + One of the values that indicates the status code for closure. - Closes the WebSocket connection with the specified and , - and releases all associated resources. + Closes the WebSocket connection with the specified and , and + releases all associated resources. + + Emits a event if is not in the allowable range of + the WebSocket close status code, and do nothing any more. + - A that contains a status code indicating the reason for closure. + A that indicates the status code for closure. A that contains the reason for closure. @@ -995,12 +1021,11 @@ - Closes the WebSocket connection with the specified and , - and releases all associated resources. + Closes the WebSocket connection with the specified and , and + releases all associated resources. - One of the values that contains a status code - indicating the reason for closure. + One of the values that indicates the status code for closure. A that contains the reason for closure. diff --git a/websocket-sharp/doc/html/WebSocketSharp/Ext.html b/websocket-sharp/doc/html/WebSocketSharp/Ext.html index 398dfbe9..6406cc13 100644 --- a/websocket-sharp/doc/html/WebSocketSharp/Ext.html +++ b/websocket-sharp/doc/html/WebSocketSharp/Ext.html @@ -385,6 +385,18 @@ GetValue (this string, string) : string
Gets the value from the specified string that contains a pair of name and value are separated by a separator string. +
+ + + +
static
+ + + + IsCloseStatusCode + (this ushort) : bool
+ Determines whether the specified ushort is in the allowable range of + the WebSocket close status code.
@@ -1343,6 +1355,42 @@ Namespace: WebSocketSharp
Assembly: websocket-sharp (in websocket-sharp.dll)
+

IsCloseStatusCode Method

+
+

+ Determines whether the specified ushort is in the allowable range of + the WebSocket close status code. +

+

Syntax

+
public static bool IsCloseStatusCode (this ushort code)
+

Parameters

+
+
+
+ code +
+
+ A ushort to test. +
+
+
+

Returns

+
+ true if code is in the allowable range of the WebSocket close status code; otherwise, false. +
+

Remarks

+
+ Not allowable ranges are the followings. +
  • + Numbers in the range 0-999 are not used. +
  • + Numbers which are greater than 4999 are out of the reserved close status code ranges. +
+

Requirements

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

IsEmpty Method

diff --git a/websocket-sharp/doc/html/WebSocketSharp/WebSocket.html b/websocket-sharp/doc/html/WebSocketSharp/WebSocket.html index 115ac599..3fb4db81 100644 --- a/websocket-sharp/doc/html/WebSocketSharp/WebSocket.html +++ b/websocket-sharp/doc/html/WebSocketSharp/WebSocket.html @@ -381,8 +381,8 @@ Close (ushort)

- Closes the WebSocket connection with the specified code - and releases all associated resources. + Closes the WebSocket connection with the specified code and + releases all associated resources.
@@ -394,8 +394,8 @@ Close (CloseStatusCode)
- Closes the WebSocket connection with the specified code - and releases all associated resources. + Closes the WebSocket connection with the specified code and + releases all associated resources.
@@ -407,8 +407,8 @@ Close (ushort, string)
- Closes the WebSocket connection with the specified code and reason, - and releases all associated resources. + Closes the WebSocket connection with the specified code and reason, and + releases all associated resources.
@@ -420,8 +420,8 @@ Close (CloseStatusCode, string)
- Closes the WebSocket connection with the specified code and reason, - and releases all associated resources. + Closes the WebSocket connection with the specified code and reason, and + releases all associated resources.
@@ -805,8 +805,8 @@

Close Method

- Closes the WebSocket connection with the specified code - and releases all associated resources. + Closes the WebSocket connection with the specified code and + releases all associated resources.

Syntax

public void Close (ushort code)
@@ -817,14 +817,15 @@ code
- A ushort that contains a status code indicating the reason for closure. + A ushort that indicates the status code for closure.

Remarks

- Documentation for this section has not yet been entered. -
+ Emits a WebSocket.OnError event if code is not in the allowable range of + the WebSocket close status code, and do nothing any more. +

Requirements

Namespace: WebSocketSharp
Assembly: websocket-sharp (in websocket-sharp.dll)
@@ -833,8 +834,8 @@

Close Method

- Closes the WebSocket connection with the specified code - and releases all associated resources. + Closes the WebSocket connection with the specified code and + releases all associated resources.

Syntax

public void Close (CloseStatusCode code)
@@ -845,8 +846,7 @@ code
- One of the WebSocketSharp.CloseStatusCode values that contains a status code - indicating the reason for closure. + One of the WebSocketSharp.CloseStatusCode values that indicates the status code for closure.
@@ -862,8 +862,8 @@

Close Method

- Closes the WebSocket connection with the specified code and reason, - and releases all associated resources. + Closes the WebSocket connection with the specified code and reason, and + releases all associated resources.

Syntax

public void Close (ushort code, string reason)
@@ -874,7 +874,7 @@ code
- A ushort that contains a status code indicating the reason for closure. + A ushort that indicates the status code for closure.
reason @@ -886,8 +886,9 @@

Remarks

- Documentation for this section has not yet been entered. -
+ Emits a WebSocket.OnError event if code is not in the allowable range of + the WebSocket close status code, and do nothing any more. +

Requirements

Namespace: WebSocketSharp
Assembly: websocket-sharp (in websocket-sharp.dll)
@@ -896,8 +897,8 @@

Close Method

- Closes the WebSocket connection with the specified code and reason, - and releases all associated resources. + Closes the WebSocket connection with the specified code and reason, and + releases all associated resources.

Syntax

public void Close (CloseStatusCode code, string reason)
@@ -908,8 +909,7 @@ code
- One of the WebSocketSharp.CloseStatusCode values that contains a status code - indicating the reason for closure. + One of the WebSocketSharp.CloseStatusCode values that indicates the status code for closure.
reason diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp/Ext.xml b/websocket-sharp/doc/mdoc/WebSocketSharp/Ext.xml index 2e6395b0..d0485687 100644 --- a/websocket-sharp/doc/mdoc/WebSocketSharp/Ext.xml +++ b/websocket-sharp/doc/mdoc/WebSocketSharp/Ext.xml @@ -419,6 +419,36 @@ To be added. + + + + Method + + System.Boolean + + + + + + + A to test. + + + Determines whether the specified is in the allowable range of + the WebSocket close status code. + + + true if is in the allowable range of the WebSocket close status code; otherwise, false. + + + Not allowable ranges are the followings. + + Numbers in the range 0-999 are not used. + + Numbers which are greater than 4999 are out of the reserved close status code ranges. + + + diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp/WebSocket.xml b/websocket-sharp/doc/mdoc/WebSocketSharp/WebSocket.xml index b4033c83..8391936d 100644 --- a/websocket-sharp/doc/mdoc/WebSocketSharp/WebSocket.xml +++ b/websocket-sharp/doc/mdoc/WebSocketSharp/WebSocket.xml @@ -134,13 +134,16 @@ - A that contains a status code indicating the reason for closure. + A that indicates the status code for closure. - Closes the WebSocket connection with the specified - and releases all associated resources. + Closes the WebSocket connection with the specified and + releases all associated resources. - To be added. + + Emits a event if is not in the allowable range of + the WebSocket close status code, and do nothing any more. + @@ -155,12 +158,11 @@ - One of the values that contains a status code - indicating the reason for closure. + One of the values that indicates the status code for closure. - Closes the WebSocket connection with the specified - and releases all associated resources. + Closes the WebSocket connection with the specified and + releases all associated resources. To be added. @@ -178,16 +180,19 @@ - A that contains a status code indicating the reason for closure. + A that indicates the status code for closure. A that contains the reason for closure. - Closes the WebSocket connection with the specified and , - and releases all associated resources. + Closes the WebSocket connection with the specified and , and + releases all associated resources. - To be added. + + Emits a event if is not in the allowable range of + the WebSocket close status code, and do nothing any more. + @@ -203,15 +208,14 @@ - One of the values that contains a status code - indicating the reason for closure. + One of the values that indicates the status code for closure. A that contains the reason for closure. - Closes the WebSocket connection with the specified and , - and releases all associated resources. + Closes the WebSocket connection with the specified and , and + releases all associated resources. To be added. diff --git a/websocket-sharp/doc/mdoc/index.xml b/websocket-sharp/doc/mdoc/index.xml index 33c871bc..4d91bfdb 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 ] @@ -511,6 +511,32 @@ + + + + + + + + ExtensionMethod + + System.Boolean + + + + + + + A to test. + + + Determines whether the specified is in the allowable range of + the WebSocket close status code. + + + + + diff --git a/websocket-sharp/websocket-sharp.pidb b/websocket-sharp/websocket-sharp.pidb index 1d9c22dc..51ed3721 100644 Binary files a/websocket-sharp/websocket-sharp.pidb and b/websocket-sharp/websocket-sharp.pidb differ