Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 18:06:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make kernel not crash when trying to accept in incoming tcp connection. The problem is in TCPAcceptEventHandler, where calling the LibTCPAccept function would cause an assert to fail in LibTCPAccept. We just set the state of the pcb to LISTEN and after calling LibTCPAccept we set it to ESTABLISHED. The connection still fails but at least the kernel doesn't crash. Needs further serious investigation.

Browse source 
svn path=/branches/GSoC_2011/TcpIpDriver/; revision=51781
This commit is contained in:
Claudiu Mihail 2011-05-16 13:00:34 +00:00
parent 6c758f20d0
commit e1b7306f9b
1 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/drivers/ip/transport/tcp/event.c
View file

@ -114,7 +114,7 @@ TCPAcceptEventHandler(void *arg, struct tcp_pcb *newpcb)
NTSTATUS Status;
KIRQL OldIrql;
DbgPrint("TCPAcceptEventHandler\n");
DbgPrint("TCPAcceptEventHandler] Called\n");
ReferenceObject(Connection);
@ -126,7 +126,7 @@ TCPAcceptEventHandler(void *arg, struct tcp_pcb *newpcb)
Irp = Bucket->Request.RequestContext;
IrpSp = IoGetCurrentIrpStackLocation( Irp );
TI_DbgPrint(DEBUG_TCP,("Getting the socket\n"));
TI_DbgPrint(DEBUG_TCP,("[TCPAcceptEventHandler] Getting the socket\n"));
Status = TCPCheckPeerForAccept(newpcb,
(PTDI_REQUEST_KERNEL)&IrpSp->Parameters);
@ -136,22 +136,27 @@ TCPAcceptEventHandler(void *arg, struct tcp_pcb *newpcb)
Bucket->Status = Status;
Bucket->Information = 0;
DbgPrint("Associated with: 0x%x\n", Bucket->AssociatedEndpoint->SocketContext);
DbgPrint("[TCPAcceptEventHandler] Associated with: 0x%x\n", Bucket->AssociatedEndpoint->SocketContext);
DbgPrint("Completing accept event %x\n", Status);
DbgPrint("[TCPAcceptEventHandler] Completing accept event %x\n", Status);
Complete = Bucket->Request.RequestNotifyObject;
if (Status == STATUS_SUCCESS)
{
newpcb->state = LISTEN;
LockObject(Bucket->AssociatedEndpoint, &OldIrql);
Bucket->AssociatedEndpoint->SocketContext = newpcb;
DbgPrint("[TCPAcceptEventHandler] LibTCPAccept coming up\n");
LibTCPAccept(newpcb, Bucket->AssociatedEndpoint);
DbgPrint("[TCPAcceptEventHandler] Trying to unlock Bucket->AssociatedEndpoint\n");
UnlockObject(Bucket->AssociatedEndpoint, OldIrql);
newpcb->state = ESTABLISHED;
}
DbgPrint("Done!\n");
DbgPrint("[TCPAcceptEventHandler] Done!\n");
Complete(Bucket->Request.RequestContext, Bucket->Status, Bucket->Information);
@ -172,7 +177,7 @@ TCPSendEventHandler(void *arg, u16_t space)
NTSTATUS Status;
PMDL Mdl;
DbgPrint("TCPSendEventHandler\n");
DbgPrint("[TCPSendEventHandler] Called\n");
ReferenceObject(Connection);
@ -248,7 +253,7 @@ TCPRecvEventHandler(void *arg, struct pbuf *p)
ReferenceObject(Connection);
DbgPrint("TCPRecvEventHandler\n");
DbgPrint("[TCPRecvEventHandler] Called\n");
if ((Entry = ExInterlockedRemoveHeadList(&Connection->ReceiveRequest, &Connection->Lock))) {
Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
@ -304,18 +309,19 @@ TCPConnectEventHandler(void *arg, err_t err)
PTDI_BUCKET Bucket;
PLIST_ENTRY Entry;
DbgPrint("TCPConnectEventHandler\n");
DbgPrint("[TCPConnectEventHandler] Called\n");
ReferenceObject(Connection);
while ((Entry = ExInterlockedRemoveHeadList(&Connection->ConnectRequest, &Connection->Lock))) {
while ((Entry = ExInterlockedRemoveHeadList(&Connection->ConnectRequest, &Connection->Lock)))
{
Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
Bucket->Status = TCPTranslateError(err);
Bucket->Information = 0;
DbgPrint("Completing connection request! (0x%x)\n", err);
DbgPrint("[TCPConnectEventHandler] Completing connection request! (0x%x)\n", err);
Complete = Bucket->Request.RequestNotifyObject;
@ -323,6 +329,8 @@ TCPConnectEventHandler(void *arg, err_t err)
ExFreePoolWithTag(Bucket, TDI_BUCKET_TAG);
}
DbgPrint("[TCPConnectEventHandler] Done\n");
DereferenceObject(Connection);
}