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

Renamed writeBytes method to sendBytes method

Browse Source
This commit is contained in:
sta 2014-07-29 21:43:58 +09:00
parent b27283390e
commit ae3dc7f7c8
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
websocket-sharp/WebSocket.cs
View File

@ -629,7 +629,7 @@ namespace WebSocketSharp
private bool closeHandshake (byte[] frameAsBytes, int millisecondsTimeout, Action release) private bool closeHandshake (byte[] frameAsBytes, int millisecondsTimeout, Action release)
{ {
var sent = frameAsBytes != null && writeBytes (frameAsBytes); var sent = frameAsBytes != null && sendBytes (frameAsBytes);
var received = var received =
millisecondsTimeout == 0 || millisecondsTimeout == 0 ||
(sent && _exitReceiving != null && _exitReceiving.WaitOne (millisecondsTimeout)); (sent && _exitReceiving != null && _exitReceiving.WaitOne (millisecondsTimeout));
@ -1045,7 +1045,7 @@ namespace WebSocketSharp
return false; return false;
} }
return writeBytes (frameAsBytes); return sendBytes (frameAsBytes);
} }
} }
@ -1135,7 +1135,7 @@ namespace WebSocketSharp
return false; return false;
} }
return writeBytes ( return sendBytes (
WebSocketFrame.CreateWebSocketFrame (fin, opcode, mask, data, compressed).ToByteArray ()); WebSocketFrame.CreateWebSocketFrame (fin, opcode, mask, data, compressed).ToByteArray ());
} }
} }
@ -1160,6 +1160,18 @@ namespace WebSocketSharp
null); null);
} }
private bool sendBytes (byte[] data)
{
try {
_stream.Write (data, 0, data.Length);
return true;
}
catch (Exception ex) {
_logger.Fatal (ex.ToString ());
return false;
}
}
// As client // As client
private HttpResponse sendHandshakeRequest () private HttpResponse sendHandshakeRequest ()
{ {
@ -1198,7 +1210,7 @@ namespace WebSocketSharp
private bool sendHttpResponse (HttpResponse response) private bool sendHttpResponse (HttpResponse response)
{ {
_logger.Debug ("A response to this request:\n" + response.ToString ()); _logger.Debug ("A response to this request:\n" + response.ToString ());
return writeBytes (response.ToByteArray ()); return sendBytes (response.ToByteArray ());
} }
// As client // As client
@ -1358,18 +1370,6 @@ namespace WebSocketSharp
return value == null || value == _version; return value == null || value == _version;
} }
private bool writeBytes (byte[] data)
{
try {
_stream.Write (data, 0, data.Length);
return true;
}
catch (Exception ex) {
_logger.Fatal (ex.ToString ());
return false;
}
}
#endregion #endregion
#region Internal Methods #region Internal Methods
@ -1487,7 +1487,7 @@ namespace WebSocketSharp
cache.Add (_compression, cached); cache.Add (_compression, cached);
} }
writeBytes (cached); sendBytes (cached);
} }
catch (Exception ex) { catch (Exception ex) {
_logger.Fatal (ex.ToString ()); _logger.Fatal (ex.ToString ());