Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:32:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[IP]

Browse source 
- Handle socket operations that can be completed immediately before terminating the socket to avoid losing data sitting in the receive buffer

svn path=/trunk/; revision=47704
This commit is contained in:
Cameron Gutman 2010-06-09 04:45:17 +00:00
parent 82cd2aad07
commit 4829efbb66
1 changed files with 9 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

82
reactos/lib/drivers/ip/transport/tcp/tcp.c
View file

@ -25,7 +25,6 @@ VOID HandleSignalledConnection(PCONNECTION_ENDPOINT Connection)
NTSTATUS Status; NTSTATUS Status;
PIRP Irp; PIRP Irp;
PMDL Mdl; PMDL Mdl;
ULONG SocketError = 0;
KIRQL OldIrql; KIRQL OldIrql;
PTCP_COMPLETION_ROUTINE Complete; PTCP_COMPLETION_ROUTINE Complete;
@ -35,69 +34,6 @@ VOID HandleSignalledConnection(PCONNECTION_ENDPOINT Connection)
TI_DbgPrint(MID_TRACE,("Handling signalled state on %x (%x)\n", TI_DbgPrint(MID_TRACE,("Handling signalled state on %x (%x)\n",
Connection, Connection->SocketContext)); Connection, Connection->SocketContext));
if( Connection->SignalState & SEL_FIN ) {
TI_DbgPrint(DEBUG_TCP, ("EOF From socket\n"));
/* If OskitTCP initiated the disconnect, try to read the socket error that occurred */
if (Connection->SocketContext)
SocketError = TCPTranslateError(OskitTCPGetSocketError(Connection->SocketContext));
/* Default to STATUS_CANCELLED if we initiated the disconnect or no socket error was reported */
if (!Connection->SocketContext || !SocketError)
SocketError = STATUS_CANCELLED;
while (!IsListEmpty(&Connection->ReceiveRequest))
{
Entry = RemoveHeadList( &Connection->ReceiveRequest );
Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
Bucket->Status = SocketError;
Bucket->Information = 0;
InsertTailList(&Connection->CompletionQueue, &Bucket->Entry);
}
while (!IsListEmpty(&Connection->SendRequest))
{
Entry = RemoveHeadList( &Connection->SendRequest );
Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
Bucket->Status = SocketError;
Bucket->Information = 0;
InsertTailList(&Connection->CompletionQueue, &Bucket->Entry);
}
while (!IsListEmpty(&Connection->ListenRequest))
{
Entry = RemoveHeadList( &Connection->ListenRequest );
Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
Bucket->Status = SocketError;
Bucket->Information = 0;
DereferenceObject(Bucket->AssociatedEndpoint);
InsertTailList(&Connection->CompletionQueue, &Bucket->Entry);
}
while (!IsListEmpty(&Connection->ConnectRequest))
{
Entry = RemoveHeadList( &Connection->ConnectRequest );
Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
Bucket->Status = SocketError;
Bucket->Information = 0;
InsertTailList(&Connection->CompletionQueue, &Bucket->Entry);
}
Connection->SignalState = SEL_FIN;
}
/* Things that can happen when we try the initial connection */ /* Things that can happen when we try the initial connection */
if( Connection->SignalState & SEL_CONNECT ) { if( Connection->SignalState & SEL_CONNECT ) {
while (!IsListEmpty(&Connection->ConnectRequest)) { while (!IsListEmpty(&Connection->ConnectRequest)) {
@ -140,11 +76,11 @@ VOID HandleSignalledConnection(PCONNECTION_ENDPOINT Connection)
TI_DbgPrint(DEBUG_TCP,("Socket: Status: %x\n")); TI_DbgPrint(DEBUG_TCP,("Socket: Status: %x\n"));
if( Status == STATUS_PENDING ) { if( Status == STATUS_PENDING && !(Connection->SignalState & SEL_FIN) ) {
InsertHeadList( &Connection->ListenRequest, &Bucket->Entry ); InsertHeadList( &Connection->ListenRequest, &Bucket->Entry );
break; break;
} else { } else {
Bucket->Status = Status; Bucket->Status = (Status == STATUS_PENDING) ? STATUS_CANCELLED : Status;
Bucket->Information = 0; Bucket->Information = 0;
DereferenceObject(Bucket->AssociatedEndpoint); DereferenceObject(Bucket->AssociatedEndpoint);
@ -194,7 +130,7 @@ VOID HandleSignalledConnection(PCONNECTION_ENDPOINT Connection)
TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Received)); TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Received));
if( Status == STATUS_PENDING ) { if( Status == STATUS_PENDING && !(Connection->SignalState & SEL_FIN) ) {
InsertHeadList( &Connection->ReceiveRequest, &Bucket->Entry ); InsertHeadList( &Connection->ReceiveRequest, &Bucket->Entry );
break; break;
} else { } else {
@ -202,8 +138,8 @@ VOID HandleSignalledConnection(PCONNECTION_ENDPOINT Connection)
("Completing Receive request: %x %x\n", ("Completing Receive request: %x %x\n",
Bucket->Request, Status)); Bucket->Request, Status));
Bucket->Status = Status; Bucket->Status = (Status == STATUS_PENDING) ? STATUS_CANCELLED : Status;
Bucket->Information = (Status == STATUS_SUCCESS) ? Received : 0; Bucket->Information = (Bucket->Status == STATUS_SUCCESS) ? Received : 0;
InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); InsertTailList(&Connection->CompletionQueue, &Bucket->Entry);
} }
@ -248,7 +184,7 @@ VOID HandleSignalledConnection(PCONNECTION_ENDPOINT Connection)
TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Sent)); TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Sent));
if( Status == STATUS_PENDING ) { if( Status == STATUS_PENDING && !(Connection->SignalState & SEL_FIN) ) {
InsertHeadList( &Connection->SendRequest, &Bucket->Entry ); InsertHeadList( &Connection->SendRequest, &Bucket->Entry );
break; break;
} else { } else {
@ -256,8 +192,8 @@ VOID HandleSignalledConnection(PCONNECTION_ENDPOINT Connection)
("Completing Send request: %x %x\n", ("Completing Send request: %x %x\n",
Bucket->Request, Status)); Bucket->Request, Status));
Bucket->Status = Status; Bucket->Status = (Status == STATUS_PENDING) ? STATUS_CANCELLED : Status;
Bucket->Information = (Status == STATUS_SUCCESS) ? Sent : 0; Bucket->Information = (Bucket->Status == STATUS_SUCCESS) ? Sent : 0;
InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); InsertTailList(&Connection->CompletionQueue, &Bucket->Entry);
} }
@ -737,7 +673,7 @@ NTSTATUS TCPClose
Connection->SocketContext = NULL; Connection->SocketContext = NULL;
/* Don't try to close again if the other side closed us already */ /* Don't try to close again if the other side closed us already */
if (Connection->SignalState != SEL_FIN) if (!(Connection->SignalState & SEL_FIN))
{ {
/* We need to close here otherwise oskit will never indicate /* We need to close here otherwise oskit will never indicate
* SEL_FIN and we will never fully close the connection */ * SEL_FIN and we will never fully close the connection */