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

Modified a few in WebSocketFrame.cs

Browse Source
This commit is contained in:
sta 2014-09-10 13:50:28 +09:00
parent 5a2be24002
commit 3f970d8ad5
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
websocket-sharp/WebSocketFrame.cs
View File

@ -313,8 +313,8 @@ namespace WebSocketSharp
} }
var spFmt = String.Format ("{{0,{0}}}", cntDigit); var spFmt = String.Format ("{{0,{0}}}", cntDigit);
var headerFmt = String.Format ( var headerFmt = String.Format (@"
@"{0} 01234567 89ABCDEF 01234567 89ABCDEF {0} 01234567 89ABCDEF 01234567 89ABCDEF
{0}+--------+--------+--------+--------+\n", spFmt); {0}+--------+--------+--------+--------+\n", spFmt);
var lineFmt = String.Format ("{0}|{{1,8}} {{2,8}} {{3,8}} {{4,8}}|\n", cntFmt); var lineFmt = String.Format ("{0}|{{1,8}} {{2,8}} {{3,8}} {{4,8}}|\n", cntFmt);
var footerFmt = String.Format ("{0}+--------+--------+--------+--------+", spFmt); var footerFmt = String.Format ("{0}+--------+--------+--------+--------+", spFmt);
@ -329,20 +329,20 @@ namespace WebSocketSharp
output.AppendFormat (headerFmt, String.Empty); output.AppendFormat (headerFmt, String.Empty);
var printLine = linePrinter (); var printLine = linePrinter ();
var frameAsBytes = frame.ToByteArray (); var bytes = frame.ToByteArray ();
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)
printLine ( printLine (
Convert.ToString (frameAsBytes[j], 2).PadLeft (8, '0'), Convert.ToString (bytes[j], 2).PadLeft (8, '0'),
Convert.ToString (frameAsBytes[j + 1], 2).PadLeft (8, '0'), Convert.ToString (bytes[j + 1], 2).PadLeft (8, '0'),
Convert.ToString (frameAsBytes[j + 2], 2).PadLeft (8, '0'), Convert.ToString (bytes[j + 2], 2).PadLeft (8, '0'),
Convert.ToString (frameAsBytes[j + 3], 2).PadLeft (8, '0')); Convert.ToString (bytes[j + 3], 2).PadLeft (8, '0'));
else if (rem > 0) else if (rem > 0)
printLine ( printLine (
Convert.ToString (frameAsBytes[j], 2).PadLeft (8, '0'), Convert.ToString (bytes[j], 2).PadLeft (8, '0'),
rem >= 2 ? Convert.ToString (frameAsBytes[j + 1], 2).PadLeft (8, '0') : String.Empty, rem >= 2 ? Convert.ToString (bytes[j + 1], 2).PadLeft (8, '0') : String.Empty,
rem == 3 ? Convert.ToString (frameAsBytes[j + 2], 2).PadLeft (8, '0') : String.Empty, rem == 3 ? Convert.ToString (bytes[j + 2], 2).PadLeft (8, '0') : String.Empty,
String.Empty); String.Empty);
} }
@ -372,13 +372,11 @@ namespace WebSocketSharp
/* Extended Payload Length */ /* Extended Payload Length */
var ext = frame._extPayloadLength; var extPayloadLen = payloadLen < 126
var size = ext.Length; ? String.Empty
var extPayloadLen = size == 2 : payloadLen == 126
? ext.ToUInt16 (ByteOrder.Big).ToString () ? frame._extPayloadLength.ToUInt16 (ByteOrder.Big).ToString ()
: size == 8 : frame._extPayloadLength.ToUInt64 (ByteOrder.Big).ToString ();
? ext.ToUInt64 (ByteOrder.Big).ToString ()
: String.Empty;
/* Masking Key */ /* Masking Key */
@ -389,14 +387,14 @@ namespace WebSocketSharp
var payload = payloadLen == 0 var payload = payloadLen == 0
? String.Empty ? String.Empty
: size > 0 : payloadLen > 125
? String.Format ("A {0} frame.", opcode.ToLower ()) ? String.Format ("A {0} frame.", opcode.ToLower ())
: !masked && !frame.IsFragmented && frame.IsText : !masked && !frame.IsFragmented && frame.IsText
? Encoding.UTF8.GetString (frame._payloadData.ApplicationData) ? Encoding.UTF8.GetString (frame._payloadData.ApplicationData)
: frame._payloadData.ToString (); : frame._payloadData.ToString ();
var fmt = var fmt = @"
@" FIN: {0} FIN: {0}
RSV1: {1} RSV1: {1}
RSV2: {2} RSV2: {2}
RSV3: {3} RSV3: {3}
@ -454,7 +452,7 @@ Extended Payload Length: {7}
if (isControl (opcode) && payloadLen > 125) if (isControl (opcode) && payloadLen > 125)
throw new WebSocketException ( throw new WebSocketException (
CloseStatusCode.InconsistentData, CloseStatusCode.InconsistentData,
"The length of payload data of a control frame is greater than 125 bytes."); "The length of payload data of a control frame is greater than the allowable length.");
var frame = new WebSocketFrame (); var frame = new WebSocketFrame ();
frame._fin = fin; frame._fin = fin;