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

[Modify] Rename it to ToArray

Browse Source
This commit is contained in:
sta 2015-10-02 11:32:36 +09:00
parent 72ae755c50
commit e02b553739
5 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
websocket-sharp/Server/WebSocketServiceHost.cs
View File

@ -131,9 +131,7 @@ namespace WebSocketSharp.Server
{ {
var e = new CloseEventArgs (code, reason); var e = new CloseEventArgs (code, reason);
var send = !code.IsReserved (); var send = !code.IsReserved ();
var bytes = var bytes = send ? WebSocketFrame.CreateCloseFrame (e.PayloadData, false).ToArray () : null;
send ? WebSocketFrame.CreateCloseFrame (e.PayloadData, false).ToByteArray () : null;
var timeout = send ? WaitTime : TimeSpan.Zero; var timeout = send ? WaitTime : TimeSpan.Zero;
Sessions.Stop (e, bytes, timeout); Sessions.Stop (e, bytes, timeout);
} }

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

@ -361,7 +361,7 @@ namespace WebSocketSharp.Server
lock (_sync) { lock (_sync) {
_state = ServerState.ShuttingDown; _state = ServerState.ShuttingDown;
var bytes = send var bytes = send
? WebSocketFrame.CreateCloseFrame (e.PayloadData, false).ToByteArray () ? WebSocketFrame.CreateCloseFrame (e.PayloadData, false).ToArray ()
: null; : null;
var timeout = wait ? _waitTime : TimeSpan.Zero; var timeout = wait ? _waitTime : TimeSpan.Zero;
@ -582,7 +582,7 @@ namespace WebSocketSharp.Server
return null; return null;
} }
return broadping (WebSocketFrame.CreatePingFrame (data, false).ToByteArray (), _waitTime); return broadping (WebSocketFrame.CreatePingFrame (data, false).ToArray (), _waitTime);
} }
/// <summary> /// <summary>

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

@ -587,7 +587,7 @@ namespace WebSocketSharp.Server
return null; return null;
} }
return Broadping (WebSocketFrame.CreatePingFrame (data, false).ToByteArray (), _waitTime); return Broadping (WebSocketFrame.CreatePingFrame (data, false).ToArray (), _waitTime);
} }
/// <summary> /// <summary>

13
websocket-sharp/WebSocket.cs
View File

@ -749,7 +749,7 @@ namespace WebSocketSharp
_logger.Trace ("Begin closing the connection."); _logger.Trace ("Begin closing the connection.");
e.WasClean = closeHandshake ( e.WasClean = closeHandshake (
send ? WebSocketFrame.CreateCloseFrame (e.PayloadData, _client).ToByteArray () : null, send ? WebSocketFrame.CreateCloseFrame (e.PayloadData, _client).ToArray () : null,
wait ? _waitTime : TimeSpan.Zero, wait ? _waitTime : TimeSpan.Zero,
_client ? (Action) releaseClientResources : releaseServerResources); _client ? (Action) releaseClientResources : releaseServerResources);
@ -1066,7 +1066,7 @@ namespace WebSocketSharp
private bool processPingFrame (WebSocketFrame frame) private bool processPingFrame (WebSocketFrame frame)
{ {
if (send (new WebSocketFrame (Opcode.Pong, frame.PayloadData, _client).ToByteArray ())) if (send (new WebSocketFrame (Opcode.Pong, frame.PayloadData, _client).ToArray ()))
_logger.Trace ("Returned a Pong."); _logger.Trace ("Returned a Pong.");
if (_emitOnPing) if (_emitOnPing)
@ -1259,8 +1259,7 @@ namespace WebSocketSharp
return false; return false;
} }
return sendBytes ( return sendBytes (new WebSocketFrame (fin, opcode, data, compressed, _client).ToArray ());
new WebSocketFrame (fin, opcode, data, compressed, _client).ToByteArray ());
} }
} }
@ -1756,7 +1755,7 @@ namespace WebSocketSharp
data.Compress (_compression), data.Compress (_compression),
_compression != CompressionMethod.None, _compression != CompressionMethod.None,
false) false)
.ToByteArray (); .ToArray ();
cache.Add (_compression, cached); cache.Add (_compression, cached);
} }
@ -2226,7 +2225,7 @@ namespace WebSocketSharp
public bool Ping () public bool Ping ()
{ {
var bytes = _client var bytes = _client
? WebSocketFrame.CreatePingFrame (true).ToByteArray () ? WebSocketFrame.CreatePingFrame (true).ToArray ()
: WebSocketFrame.EmptyUnmaskPingBytes; : WebSocketFrame.EmptyUnmaskPingBytes;
return Ping (bytes, _waitTime); return Ping (bytes, _waitTime);
@ -2256,7 +2255,7 @@ namespace WebSocketSharp
return false; return false;
} }
return Ping (WebSocketFrame.CreatePingFrame (data, _client).ToByteArray (), _waitTime); return Ping (WebSocketFrame.CreatePingFrame (data, _client).ToArray (), _waitTime);
} }
/// <summary> /// <summary>

10
websocket-sharp/WebSocketFrame.cs
View File

@ -68,7 +68,7 @@ namespace WebSocketSharp
static WebSocketFrame () static WebSocketFrame ()
{ {
EmptyUnmaskPingBytes = CreatePingFrame (false).ToByteArray (); EmptyUnmaskPingBytes = CreatePingFrame (false).ToArray ();
} }
#endregion #endregion
@ -347,7 +347,7 @@ namespace WebSocketSharp
output.AppendFormat (headerFmt, String.Empty); output.AppendFormat (headerFmt, String.Empty);
var bytes = frame.ToByteArray (); var bytes = frame.ToArray ();
for (long i = 0; i <= cnt; i++) { for (long i = 0; i <= cnt; i++) {
var j = i * 4; var j = i * 4;
if (i < cnt) { if (i < cnt) {
@ -742,7 +742,7 @@ Extended Payload Length: {7}
public IEnumerator<byte> GetEnumerator () public IEnumerator<byte> GetEnumerator ()
{ {
foreach (var b in ToByteArray ()) foreach (var b in ToArray ())
yield return b; yield return b;
} }
@ -756,7 +756,7 @@ Extended Payload Length: {7}
return dumped ? dump (this) : print (this); return dumped ? dump (this) : print (this);
} }
public byte[] ToByteArray () public byte[] ToArray ()
{ {
using (var buff = new MemoryStream ()) { using (var buff = new MemoryStream ()) {
var header = (int) _fin; var header = (int) _fin;
@ -789,7 +789,7 @@ Extended Payload Length: {7}
public override string ToString () public override string ToString ()
{ {
return BitConverter.ToString (ToByteArray ()); return BitConverter.ToString (ToArray ());
} }
#endregion #endregion