diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-03-03 00:53:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-03 00:53:47 -0500 |
| commit | 9f8cbc668db3885f2a30ebf5ca62d2e1de3af98f (patch) | |
| tree | 4a9f055e10fa90384d74a635ca535e3de328f9bd /Emby.Common.Implementations/Net/SocketAcceptor.cs | |
| parent | 8e1c53aaf482ec89df00066ca827239e5dde3346 (diff) | |
| parent | 7cbc76af27637fca10bca21d0b343f96b1a02b6a (diff) | |
Merge pull request #2504 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Common.Implementations/Net/SocketAcceptor.cs')
| -rw-r--r-- | Emby.Common.Implementations/Net/SocketAcceptor.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Emby.Common.Implementations/Net/SocketAcceptor.cs b/Emby.Common.Implementations/Net/SocketAcceptor.cs index d4c6d33e5..11a8e5381 100644 --- a/Emby.Common.Implementations/Net/SocketAcceptor.cs +++ b/Emby.Common.Implementations/Net/SocketAcceptor.cs @@ -10,10 +10,10 @@ namespace Emby.Common.Implementations.Net private readonly ILogger _logger; private readonly Socket _originalSocket; private readonly Func<bool> _isClosed; - private readonly Action<ISocket> _onAccept; + private readonly Action<IAcceptSocket> _onAccept; private readonly bool _isDualMode; - public SocketAcceptor(ILogger logger, Socket originalSocket, Action<ISocket> onAccept, Func<bool> isClosed, bool isDualMode) + public SocketAcceptor(ILogger logger, Socket originalSocket, Action<IAcceptSocket> onAccept, Func<bool> isClosed, bool isDualMode) { if (logger == null) { @@ -54,7 +54,7 @@ namespace Emby.Common.Implementations.Net } else { - // socket must be cleared since the context object is being reused + // acceptSocket must be cleared since the context object is being reused acceptEventArg.AcceptSocket = null; } @@ -102,7 +102,7 @@ namespace Emby.Common.Implementations.Net return; } - // http://msdn.microsoft.com/en-us/library/system.net.sockets.socket.acceptasync%28v=vs.110%29.aspx + // http://msdn.microsoft.com/en-us/library/system.net.sockets.acceptSocket.acceptasync%28v=vs.110%29.aspx // Under certain conditions ConnectionReset can occur // Need to attept to re-accept if (e.SocketError == SocketError.ConnectionReset) @@ -117,7 +117,7 @@ namespace Emby.Common.Implementations.Net if (acceptSocket != null) { //ProcessAccept(acceptSocket); - _onAccept(new NetSocket(acceptSocket, _logger, _isDualMode)); + _onAccept(new NetAcceptSocket(acceptSocket, _logger, _isDualMode)); } // Accept the next connection request |
