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

Refactored a few for HttpConnection.cs

Browse Source
This commit is contained in:
sta 2015-04-10 16:15:05 +09:00
parent a6bd7c35c4
commit a058af8a01
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
websocket-sharp/Net/HttpConnection.cs
View File

@ -59,7 +59,7 @@ namespace WebSocketSharp.Net
#region Private Fields #region Private Fields
private byte[] _buffer; private byte[] _buffer;
private const int _bufferSize = 8192; private const int _bufferLength = 8192;
private bool _chunked; private bool _chunked;
private HttpListenerContext _context; private HttpListenerContext _context;
private bool _contextWasBound; private bool _contextWasBound;
@ -311,7 +311,7 @@ namespace WebSocketSharp.Net
return; return;
} }
conn._stream.BeginRead (conn._buffer, 0, _bufferSize, onRead, conn); conn._stream.BeginRead (conn._buffer, 0, _bufferLength, onRead, conn);
} }
} }
@ -326,11 +326,11 @@ namespace WebSocketSharp.Net
private bool processInput (byte[] data) private bool processInput (byte[] data)
{ {
var len = data.Length; var len = data.Length;
var used = 0; var nread = 0;
string line;
try { try {
while ((line = readLine (data, _position, len - _position, ref used)) != null) { string line;
_position += used; while ((line = readLineFrom (data, _position, len - _position, ref nread)) != null) {
_position += nread;
if (line.Length == 0) { if (line.Length == 0) {
if (_inputState == InputState.RequestLine) if (_inputState == InputState.RequestLine)
continue; continue;
@ -356,8 +356,8 @@ namespace WebSocketSharp.Net
return true; return true;
} }
_position += used; _position += nread;
if (used == len) { if (nread == len) {
_requestBuffer.SetLength (0); _requestBuffer.SetLength (0);
_position = 0; _position = 0;
} }
@ -365,15 +365,15 @@ namespace WebSocketSharp.Net
return false; return false;
} }
private string readLine (byte[] buffer, int offset, int length, ref int used) private string readLineFrom (byte[] buffer, int offset, int count, ref int read)
{ {
if (_currentLine == null) if (_currentLine == null)
_currentLine = new StringBuilder (); _currentLine = new StringBuilder ();
var last = offset + length; var last = offset + count;
used = 0; read = 0;
for (int i = offset; i < last && _lineState != LineState.LF; i++) { for (var i = offset; i < last && _lineState != LineState.LF; i++) {
used++; read++;
var b = buffer[i]; var b = buffer[i];
if (b == 13) if (b == 13)
_lineState = LineState.CR; _lineState = LineState.CR;
@ -383,14 +383,14 @@ namespace WebSocketSharp.Net
_currentLine.Append ((char) b); _currentLine.Append ((char) b);
} }
string res = null; string ret = null;
if (_lineState == LineState.LF) { if (_lineState == LineState.LF) {
_lineState = LineState.None; _lineState = LineState.None;
res = _currentLine.ToString (); ret = _currentLine.ToString ();
_currentLine.Length = 0; _currentLine.Length = 0;
} }
return res; return ret;
} }
private void removeConnection () private void removeConnection ()
@ -454,14 +454,14 @@ namespace WebSocketSharp.Net
public void BeginReadRequest () public void BeginReadRequest ()
{ {
if (_buffer == null) if (_buffer == null)
_buffer = new byte[_bufferSize]; _buffer = new byte[_bufferLength];
if (_reuses == 1) if (_reuses == 1)
_timeout = 15000; _timeout = 15000;
try { try {
_timer.Change (_timeout, Timeout.Infinite); _timer.Change (_timeout, Timeout.Infinite);
_stream.BeginRead (_buffer, 0, _bufferSize, onRead, this); _stream.BeginRead (_buffer, 0, _bufferLength, onRead, this);
} }
catch { catch {
close (); close ();
@ -473,7 +473,7 @@ namespace WebSocketSharp.Net
Close (false); Close (false);
} }
public RequestStream GetRequestStream (bool chunked, long contentlength) public RequestStream GetRequestStream (long contentLength, bool chunked)
{ {
if (_inputStream != null || _socket == null) if (_inputStream != null || _socket == null)
return _inputStream; return _inputStream;
@ -493,7 +493,7 @@ namespace WebSocketSharp.Net
} }
else { else {
_inputStream = new RequestStream ( _inputStream = new RequestStream (
_stream, buff, _position, len - _position, contentlength); _stream, buff, _position, len - _position, contentLength);
} }
return _inputStream; return _inputStream;

2
websocket-sharp/Net/HttpListenerRequest.cs
View File

@ -227,7 +227,7 @@ namespace WebSocketSharp.Net
get { get {
return _inputStream ?? return _inputStream ??
(_inputStream = HasEntityBody (_inputStream = HasEntityBody
? _context.Connection.GetRequestStream (_chunked, _contentLength) ? _context.Connection.GetRequestStream (_contentLength, _chunked)
: Stream.Null); : Stream.Null);
} }
} }