warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Ripped socket disconnect code

Browse source
This commit is contained in:
krrios 2007-04-26 05:17:31 +00:00
parent 2b54372249
commit 0338bd6a75
3 changed files with 39 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Server/Network/Listener.cs
View file

@ -31,13 +31,11 @@ namespace Server.Network
public class Listener : IDisposable
{
private Socket m_Listener;
private bool m_Disposed;
private Queue<Socket> m_Accepted;
private object m_AcceptedSyncRoot;
private AsyncCallback m_OnAccept;
private AsyncCallback m_OnDisconnect;
private static Socket[] m_EmptySockets = new Socket[0];
@ -57,11 +55,9 @@ namespace Server.Network
public Listener( int port )
{
m_Disposed = false;
m_Accepted = new Queue<Socket>();
m_AcceptedSyncRoot = ((ICollection)m_Accepted).SyncRoot;
m_OnAccept = new AsyncCallback( OnAccept );
m_OnDisconnect = new AsyncCallback( OnDisconnect );
m_Listener = Bind( IPAddress.Any, port );
@ -167,23 +163,11 @@ namespace Server.Network
}
try {
socket.BeginDisconnect( true, m_OnDisconnect, socket );
} catch ( SocketException ex ) {
NetState.TraceException( ex );
}
}
private void OnDisconnect( IAsyncResult asyncResult ) {
Socket socket = (Socket) asyncResult.AsyncState;
try {
socket.EndDisconnect( asyncResult );
socket.Close();
SocketPool.ReleaseSocket( socket );
} catch ( SocketException ex ) {
NetState.TraceException( ex );
} catch ( ObjectDisposedException ex ) {
NetState.TraceException( ex );
}
}
@ -204,8 +188,6 @@ namespace Server.Network
}
public void Dispose() {
m_Disposed = true;
Socket socket = Interlocked.Exchange<Socket>( ref m_Listener, null );
if ( socket != null ) {

60
Server/Network/NetState.cs
View file

@ -50,7 +50,7 @@ namespace Server.Network {
private SendQueue m_SendQueue;
private bool m_Seeded;
private bool m_Running;
private AsyncCallback m_OnReceive, m_OnSend, m_OnDisconnect;
private AsyncCallback m_OnReceive, m_OnSend;
private MessagePump m_MessagePump;
private ServerInfo[] m_ServerInfo;
private IAccount m_Account;
@ -137,7 +137,8 @@ namespace Server.Network {
try {
if ( ( ns.m_AsyncState & AsyncState.Pending ) == 0 )
ns.InternalBeginReceive();
} catch {
} catch ( Exception ex ) {
TraceException( ex );
ns.Dispose( false );
}
}
@ -517,7 +518,8 @@ namespace Server.Network {
try {
m_Address = Utility.Intern( ( ( IPEndPoint ) m_Socket.RemoteEndPoint ).Address );
m_ToString = m_Address.ToString();
} catch {
} catch ( Exception ex ) {
TraceException( ex );
m_Address = IPAddress.None;
m_ToString = "(error)";
}
@ -564,7 +566,8 @@ namespace Server.Network {
if ( gram != null ) {
try {
m_Socket.BeginSend( gram.Buffer, 0, gram.Length, SocketFlags.None, m_OnSend, m_Socket );
} catch {
} catch ( Exception ex ) {
TraceException( ex );
Dispose( false );
}
}
@ -612,7 +615,8 @@ namespace Server.Network {
try {
m_Socket.BeginSend( gram.Buffer, 0, gram.Length, SocketFlags.None, m_OnSend, m_Socket );
return true;
} catch {
} catch ( Exception ex ) {
TraceException( ex );
Dispose( false );
}
}
@ -655,9 +659,14 @@ namespace Server.Network {
}
if ( gram != null ) {
s.BeginSend( gram.Buffer, 0, gram.Length, SocketFlags.None, m_OnSend, s );
try {
s.BeginSend( gram.Buffer, 0, gram.Length, SocketFlags.None, m_OnSend, s );
} catch ( Exception ex ) {
TraceException( ex );
Dispose( false );
}
}
} catch {
} catch ( Exception ){
Dispose( false );
}
}
@ -665,7 +674,6 @@ namespace Server.Network {
public void Start() {
m_OnReceive = new AsyncCallback( OnReceive );
m_OnSend = new AsyncCallback( OnSend );
m_OnDisconnect = new AsyncCallback( OnDisconnect );
m_Running = true;
@ -679,7 +687,8 @@ namespace Server.Network {
InternalBeginReceive();
}
}
} catch {
} catch ( Exception ex ) {
TraceException( ex );
Dispose( false );
}
}
@ -728,7 +737,12 @@ namespace Server.Network {
m_AsyncState &= ~AsyncState.Pending;
if ( ( m_AsyncState & AsyncState.Paused ) == 0 ) {
InternalBeginReceive();
try {
InternalBeginReceive();
} catch ( Exception ex ) {
TraceException( ex );
Dispose( false );
}
}
}
} else {
@ -739,15 +753,6 @@ namespace Server.Network {
}
}
public void OnDisconnect( IAsyncResult asyncResult )
{
Socket s = (Socket)asyncResult.AsyncState;
s.EndDisconnect( asyncResult );
SocketPool.ReleaseSocket( s );
}
public void Dispose() {
Dispose( true );
}
@ -755,7 +760,7 @@ namespace Server.Network {
public static void TraceException( Exception ex ) {
try {
using ( StreamWriter op = new StreamWriter( "network-errors.log", true ) ) {
op.WriteLine( "# {0}", DateTime.UtcNow );
op.WriteLine( "# {0}", DateTime.Now );
op.WriteLine( ex );
@ -785,10 +790,17 @@ namespace Server.Network {
try {
m_Socket.Shutdown( SocketShutdown.Both );
} catch {
} catch ( SocketException ex ) {
TraceException( ex );
}
m_Socket.BeginDisconnect( true, m_OnDisconnect, m_Socket );
try {
m_Socket.Close();
SocketPool.ReleaseSocket( m_Socket );
} catch ( SocketException ex ) {
TraceException( ex );
}
if ( m_RecvBuffer != null )
m_ReceiveBufferPool.ReleaseBuffer( m_RecvBuffer );
@ -799,7 +811,6 @@ namespace Server.Network {
m_RecvBuffer = null;
m_OnReceive = null;
m_OnSend = null;
m_OnDisconnect = null;
m_Running = false;
m_Disposed.Enqueue( this );
@ -819,7 +830,8 @@ namespace Server.Network {
for ( int i = 0; i < m_Instances.Count; ++i ) {
m_Instances[i].CheckAlive();
}
} catch {
} catch ( Exception ex ) {
TraceException( ex );
}
}

4
Server/Network/SocketPool.cs
View file

@ -91,13 +91,13 @@ namespace Server.Network
public static void ReleaseSocket( Socket s )
{
if ( s == null )
/*if ( s == null )
return;
s.Close();
lock ( m_FreeSockets )
m_FreeSockets.Enqueue( s );
m_FreeSockets.Enqueue( s );*/
}
}
}