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

Added the WebSocket.CheckSendParameter methods

Browse Source
This commit is contained in:
sta 2015-08-20 16:36:14 +09:00
parent f852a19746
commit 09a64d67be
4 changed files with 45 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
websocket-sharp/Ext.cs
View File

@ -241,21 +241,6 @@ namespace WebSocketSharp
: null;
}
internal static string CheckIfValidSendData (this byte[] data)
{
return data == null ? "'data' is null." : null;
}
internal static string CheckIfValidSendData (this FileInfo file)
{
return file == null ? "'file' is null." : null;
}
internal static string CheckIfValidSendData (this string data)
{
return data == null ? "'data' is null." : null;
}
internal static string CheckIfValidServicePath (this string path)
{
return path == null || path.Length == 0

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

@ -385,7 +385,9 @@ namespace WebSocketSharp.Server
/// </param>
public void Broadcast (byte[] data)
{
var msg = _state.CheckIfAvailable (false, true, false) ?? data.CheckIfValidSendData ();
var msg = _state.CheckIfAvailable (false, true, false) ??
WebSocket.CheckSendParameter (data);
if (msg != null) {
_logger.Error (msg);
return;
@ -405,7 +407,9 @@ namespace WebSocketSharp.Server
/// </param>
public void Broadcast (string data)
{
var msg = _state.CheckIfAvailable (false, true, false) ?? data.CheckIfValidSendData ();
var msg = _state.CheckIfAvailable (false, true, false) ??
WebSocket.CheckSendParameter (data);
if (msg != null) {
_logger.Error (msg);
return;
@ -434,7 +438,9 @@ namespace WebSocketSharp.Server
/// </param>
public void BroadcastAsync (byte[] data, Action completed)
{
var msg = _state.CheckIfAvailable (false, true, false) ?? data.CheckIfValidSendData ();
var msg = _state.CheckIfAvailable (false, true, false) ??
WebSocket.CheckSendParameter (data);
if (msg != null) {
_logger.Error (msg);
return;
@ -462,7 +468,9 @@ namespace WebSocketSharp.Server
/// </param>
public void BroadcastAsync (string data, Action completed)
{
var msg = _state.CheckIfAvailable (false, true, false) ?? data.CheckIfValidSendData ();
var msg = _state.CheckIfAvailable (false, true, false) ??
WebSocket.CheckSendParameter (data);
if (msg != null) {
_logger.Error (msg);
return;

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

@ -393,7 +393,9 @@ namespace WebSocketSharp.Server
/// </param>
public void Broadcast (byte[] data)
{
var msg = _state.CheckIfAvailable (false, true, false) ?? data.CheckIfValidSendData ();
var msg = _state.CheckIfAvailable (false, true, false) ??
WebSocket.CheckSendParameter (data);
if (msg != null) {
_logger.Error (msg);
return;
@ -413,7 +415,9 @@ namespace WebSocketSharp.Server
/// </param>
public void Broadcast (string data)
{
var msg = _state.CheckIfAvailable (false, true, false) ?? data.CheckIfValidSendData ();
var msg = _state.CheckIfAvailable (false, true, false) ??
WebSocket.CheckSendParameter (data);
if (msg != null) {
_logger.Error (msg);
return;
@ -442,7 +446,9 @@ namespace WebSocketSharp.Server
/// </param>
public void BroadcastAsync (byte[] data, Action completed)
{
var msg = _state.CheckIfAvailable (false, true, false) ?? data.CheckIfValidSendData ();
var msg = _state.CheckIfAvailable (false, true, false) ??
WebSocket.CheckSendParameter (data);
if (msg != null) {
_logger.Error (msg);
return;
@ -470,7 +476,9 @@ namespace WebSocketSharp.Server
/// </param>
public void BroadcastAsync (string data, Action completed)
{
var msg = _state.CheckIfAvailable (false, true, false) ?? data.CheckIfValidSendData ();
var msg = _state.CheckIfAvailable (false, true, false) ??
WebSocket.CheckSendParameter (data);
if (msg != null) {
_logger.Error (msg);
return;

27
websocket-sharp/WebSocket.cs
View File

@ -1625,6 +1625,21 @@ namespace WebSocketSharp
return bytes.Length > 125 ? "A message has greater than the allowable max size." : null;
}
internal static string CheckSendParameter (byte[] data)
{
return data == null ? "'data' is null." : null;
}
internal static string CheckSendParameter (FileInfo file)
{
return file == null ? "'file' is null." : null;
}
internal static string CheckSendParameter (string data)
{
return data == null ? "'data' is null." : null;
}
// As server
internal void Close (HttpResponse response)
{
@ -2249,7 +2264,7 @@ namespace WebSocketSharp
public void Send (byte[] data)
{
var msg = _readyState.CheckIfAvailable (false, true, false, false) ??
data.CheckIfValidSendData ();
CheckSendParameter (data);
if (msg != null) {
_logger.Error (msg);
@ -2270,7 +2285,7 @@ namespace WebSocketSharp
public void Send (FileInfo file)
{
var msg = _readyState.CheckIfAvailable (false, true, false, false) ??
file.CheckIfValidSendData ();
CheckSendParameter (file);
if (msg != null) {
_logger.Error (msg);
@ -2291,7 +2306,7 @@ namespace WebSocketSharp
public void Send (string data)
{
var msg = _readyState.CheckIfAvailable (false, true, false, false) ??
data.CheckIfValidSendData ();
CheckSendParameter (data);
if (msg != null) {
_logger.Error (msg);
@ -2320,7 +2335,7 @@ namespace WebSocketSharp
public void SendAsync (byte[] data, Action<bool> completed)
{
var msg = _readyState.CheckIfAvailable (false, true, false, false) ??
data.CheckIfValidSendData ();
CheckSendParameter (data);
if (msg != null) {
_logger.Error (msg);
@ -2350,7 +2365,7 @@ namespace WebSocketSharp
public void SendAsync (FileInfo file, Action<bool> completed)
{
var msg = _readyState.CheckIfAvailable (false, true, false, false) ??
file.CheckIfValidSendData ();
CheckSendParameter (file);
if (msg != null) {
_logger.Error (msg);
@ -2379,7 +2394,7 @@ namespace WebSocketSharp
public void SendAsync (string data, Action<bool> completed)
{
var msg = _readyState.CheckIfAvailable (false, true, false, false) ??
data.CheckIfValidSendData ();
CheckSendParameter (data);
if (msg != null) {
_logger.Error (msg);