DevWiki/websocket-sharp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added the WebSocket.CheckSendParameters method

Browse Source
This commit is contained in:
sta 2015-08-21 16:31:50 +09:00
parent 09a64d67be
commit ddb5819a0e
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
websocket-sharp/Ext.cs
View File

@ -222,15 +222,6 @@ namespace WebSocketSharp
: null; : null;
} }
internal static string CheckIfCanRead (this Stream stream)
{
return stream == null
? "'stream' is null."
: !stream.CanRead
? "'stream' cannot be read."
: null;
}
internal static string CheckIfValidProtocols (this string[] protocols) internal static string CheckIfValidProtocols (this string[] protocols)
{ {
return protocols.Contains ( return protocols.Contains (

3
websocket-sharp/Server/WebSocketServiceManager.cs
View File

@ -503,8 +503,7 @@ namespace WebSocketSharp.Server
public void BroadcastAsync (Stream stream, int length, Action completed) public void BroadcastAsync (Stream stream, int length, Action completed)
{ {
var msg = _state.CheckIfAvailable (false, true, false) ?? var msg = _state.CheckIfAvailable (false, true, false) ??
stream.CheckIfCanRead () ?? WebSocket.CheckSendParameters (stream, length);
(length < 1 ? "'length' is less than 1." : null);
if (msg != null) { if (msg != null) {
_logger.Error (msg); _logger.Error (msg);

3
websocket-sharp/Server/WebSocketSessionManager.cs
View File

@ -511,8 +511,7 @@ namespace WebSocketSharp.Server
public void BroadcastAsync (Stream stream, int length, Action completed) public void BroadcastAsync (Stream stream, int length, Action completed)
{ {
var msg = _state.CheckIfAvailable (false, true, false) ?? var msg = _state.CheckIfAvailable (false, true, false) ??
stream.CheckIfCanRead () ?? WebSocket.CheckSendParameters (stream, length);
(length < 1 ? "'length' is less than 1." : null);
if (msg != null) { if (msg != null) {
_logger.Error (msg); _logger.Error (msg);

14
websocket-sharp/WebSocket.cs
View File

@ -1640,6 +1640,17 @@ namespace WebSocketSharp
return data == null ? "'data' is null." : null; return data == null ? "'data' is null." : null;
} }
internal static string CheckSendParameters (Stream stream, int length)
{
return stream == null
? "'stream' is null."
: !stream.CanRead
? "'stream' cannot be read."
: length < 1
? "'length' is less than 1."
: null;
}
// As server // As server
internal void Close (HttpResponse response) internal void Close (HttpResponse response)
{ {
@ -2427,8 +2438,7 @@ namespace WebSocketSharp
public void SendAsync (Stream stream, int length, Action<bool> completed) public void SendAsync (Stream stream, int length, Action<bool> completed)
{ {
var msg = _readyState.CheckIfAvailable (false, true, false, false) ?? var msg = _readyState.CheckIfAvailable (false, true, false, false) ??
stream.CheckIfCanRead () ?? CheckSendParameters (stream, length);
(length < 1 ? "'length' is less than 1." : null);
if (msg != null) { if (msg != null) {
_logger.Error (msg); _logger.Error (msg);