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

- Copy the datagram data to all matching receive requests instead of just the first one we find

Browse source 
- Fix (completely broken) datagram truncation

svn path=/trunk/; revision=42354
This commit is contained in:
Cameron Gutman 2009-08-02 23:17:39 +00:00
parent 341886a1c1
commit e975dfead9
1 changed files with 33 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
reactos/lib/drivers/ip/transport/datagram/datagram.c
View file

@ -95,67 +95,56 @@ VOID DGDeliverData(
{ {
PLIST_ENTRY CurrentEntry; PLIST_ENTRY CurrentEntry;
PDATAGRAM_RECEIVE_REQUEST Current = NULL; PDATAGRAM_RECEIVE_REQUEST Current = NULL;
BOOLEAN Found;
PTA_IP_ADDRESS RTAIPAddress; PTA_IP_ADDRESS RTAIPAddress;
TI_DbgPrint(MAX_TRACE, ("There is a receive request.\n")); TI_DbgPrint(MAX_TRACE, ("There is a receive request.\n"));
/* Search receive request list to find a match */ /* Search receive request list to find a match */
Found = FALSE;
CurrentEntry = AddrFile->ReceiveQueue.Flink; CurrentEntry = AddrFile->ReceiveQueue.Flink;
while((CurrentEntry != &AddrFile->ReceiveQueue) && (!Found)) { while(CurrentEntry != &AddrFile->ReceiveQueue) {
Current = CONTAINING_RECORD(CurrentEntry, DATAGRAM_RECEIVE_REQUEST, ListEntry); Current = CONTAINING_RECORD(CurrentEntry, DATAGRAM_RECEIVE_REQUEST, ListEntry);
CurrentEntry = CurrentEntry->Flink;
if( DstPort == AddrFile->Port && if( DstPort == AddrFile->Port &&
(AddrIsEqual(DstAddress, &AddrFile->Address) || (AddrIsEqual(DstAddress, &AddrFile->Address) ||
AddrIsUnspecified(&AddrFile->Address) || AddrIsUnspecified(&AddrFile->Address) ||
AddrIsUnspecified(DstAddress))) { AddrIsUnspecified(DstAddress))) {
Found = TRUE;
/* Remove the request from the queue */ /* Remove the request from the queue */
RemoveEntryList(&Current->ListEntry); RemoveEntryList(&Current->ListEntry);
break;
} else { TI_DbgPrint(MAX_TRACE, ("Suitable receive request found.\n"));
CurrentEntry = CurrentEntry->Flink;
TI_DbgPrint(MAX_TRACE,
("Target Buffer: %x, Source Buffer: %x, Size %d\n",
Current->Buffer, DataBuffer, DataSize));
/* Copy the data into buffer provided by the user */
RtlCopyMemory( Current->Buffer,
DataBuffer,
MIN(Current->BufferSize, DataSize) );
RTAIPAddress = (PTA_IP_ADDRESS)Current->ReturnInfo->RemoteAddress;
RTAIPAddress->TAAddressCount = 1;
RTAIPAddress->Address->AddressType = TDI_ADDRESS_TYPE_IP;
RTAIPAddress->Address->Address->sin_port = SrcPort;
TI_DbgPrint(MAX_TRACE, ("(A: %08x) Addr %08x Port %04x\n",
RTAIPAddress,
SrcAddress->Address.IPv4Address, SrcPort));
RtlCopyMemory( &RTAIPAddress->Address->Address->in_addr,
&SrcAddress->Address.IPv4Address,
sizeof(SrcAddress->Address.IPv4Address) );
/* Complete the receive request */
if (Current->BufferSize < DataSize)
Current->Complete(Current->Context, STATUS_BUFFER_OVERFLOW, Current->BufferSize);
else
Current->Complete(Current->Context, STATUS_SUCCESS, DataSize);
} }
} }
TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql);
if (Found)
{
TI_DbgPrint(MAX_TRACE, ("Suitable receive request found.\n"));
TI_DbgPrint(MAX_TRACE,
("Target Buffer: %x, Source Buffer: %x, Size %d\n",
Current->Buffer, DataBuffer, DataSize));
if (DataSize > Current->BufferSize)
{
Current->Complete(Current->Context, STATUS_BUFFER_TOO_SMALL, DataSize);
return;
}
/* Copy the data into buffer provided by the user */
RtlCopyMemory( Current->Buffer,
DataBuffer,
DataSize );
RTAIPAddress = (PTA_IP_ADDRESS)Current->ReturnInfo->RemoteAddress;
RTAIPAddress->TAAddressCount = 1;
RTAIPAddress->Address->AddressType = TDI_ADDRESS_TYPE_IP;
RTAIPAddress->Address->Address->sin_port = SrcPort;
TI_DbgPrint(MAX_TRACE, ("(A: %08x) Addr %08x Port %04x\n",
RTAIPAddress,
SrcAddress->Address.IPv4Address, SrcPort));
RtlCopyMemory( &RTAIPAddress->Address->Address->in_addr,
&SrcAddress->Address.IPv4Address,
sizeof(SrcAddress->Address.IPv4Address) );
/* Complete the receive request */
Current->Complete(Current->Context, STATUS_SUCCESS, DataSize);
}
} }
else if (AddrFile->RegisteredReceiveDatagramHandler) else if (AddrFile->RegisteredReceiveDatagramHandler)
{ {