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

Added the internal Ext.CheckIfAvailable (ServerState, bool, bool, bool) method

Browse Source
This commit is contained in:
sta
2015-08-14 16:05:00 +09:00
parent 80a0107bab
commit 999e777517
6 changed files with 65 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -393,7 +393,7 @@ namespace WebSocketSharp.Server
/// </param>
public void Broadcast (byte[] data)
{
var msg = _state.CheckIfStart () ?? data.CheckIfValidSendData ();
var msg = _state.CheckIfAvailable (false, true, false) ?? data.CheckIfValidSendData ();
if (msg != null) {
_logger.Error (msg);
return;
@@ -413,7 +413,7 @@ namespace WebSocketSharp.Server
/// </param>
public void Broadcast (string data)
{
var msg = _state.CheckIfStart () ?? data.CheckIfValidSendData ();
var msg = _state.CheckIfAvailable (false, true, false) ?? data.CheckIfValidSendData ();
if (msg != null) {
_logger.Error (msg);
return;
@@ -442,7 +442,7 @@ namespace WebSocketSharp.Server
/// </param>
public void BroadcastAsync (byte[] data, Action completed)
{
var msg = _state.CheckIfStart () ?? data.CheckIfValidSendData ();
var msg = _state.CheckIfAvailable (false, true, false) ?? data.CheckIfValidSendData ();
if (msg != null) {
_logger.Error (msg);
return;
@@ -470,7 +470,7 @@ namespace WebSocketSharp.Server
/// </param>
public void BroadcastAsync (string data, Action completed)
{
var msg = _state.CheckIfStart () ?? data.CheckIfValidSendData ();
var msg = _state.CheckIfAvailable (false, true, false) ?? data.CheckIfValidSendData ();
if (msg != null) {
_logger.Error (msg);
return;
@@ -502,7 +502,7 @@ namespace WebSocketSharp.Server
/// </param>
public void BroadcastAsync (Stream stream, int length, Action completed)
{
var msg = _state.CheckIfStart () ??
var msg = _state.CheckIfAvailable (false, true, false) ??
stream.CheckIfCanRead () ??
(length < 1 ? "'length' is less than 1." : null);
@@ -545,7 +545,7 @@ namespace WebSocketSharp.Server
/// </returns>
public Dictionary<string, bool> Broadping ()
{
var msg = _state.CheckIfStart ();
var msg = _state.CheckIfAvailable (false, true, false);
if (msg != null) {
_logger.Error (msg);
return null;
@@ -572,7 +572,9 @@ namespace WebSocketSharp.Server
return Broadping ();
byte[] data = null;
var msg = _state.CheckIfStart () ?? WebSocket.CheckPingParameter (message, out data);
var msg = _state.CheckIfAvailable (false, true, false) ??
WebSocket.CheckPingParameter (message, out data);
if (msg != null) {
_logger.Error (msg);
return null;
@@ -831,7 +833,7 @@ namespace WebSocketSharp.Server
/// </param>
public bool TryGetSession (string id, out IWebSocketSession session)
{
var msg = _state.CheckIfStart () ?? id.CheckIfValidSessionID ();
var msg = _state.CheckIfAvailable (false, true, false) ?? id.CheckIfValidSessionID ();
if (msg != null) {
_logger.Error (msg);
session = null;