Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-30 19:14:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

rawip: Removed the deallocation of the client-supplied mdl. This does not

Browse source 
appear to be part of the definition and is not done in the UDP case.
event: I moved the close notify into it's own function so that it can be
worked on separately.

svn path=/trunk/; revision=9665
This commit is contained in:
Art Yerkes 2004-06-14 01:40:48 +00:00
parent 6435dec245
commit f773e32aab
2 changed files with 47 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
reactos/drivers/net/tcpip/transport/rawip/rawip.c
View file

@ -20,7 +20,8 @@ BOOLEAN RawIPInitialized = FALSE;
NTSTATUS BuildRawIPPacket(
PVOID Context,
PIP_PACKET Packet,
UINT DataLength,
PIP_ADDRESS LocalAddress,
USHORT LocalPort )
/*
@ -37,24 +38,19 @@ NTSTATUS BuildRawIPPacket(
PVOID Header;
NDIS_STATUS NdisStatus;
PNDIS_BUFFER HeaderBuffer;
PDATAGRAM_SEND_REQUEST SendRequest = (PDATAGRAM_SEND_REQUEST)Context;
PIP_PACKET Packet = &SendRequest->Packet;
PNDIS_PACKET NdisPacket = Packet->NdisPacket;
/* Will be zeroed in packet by IPInitializePacket */
/* Prepare packet */
/* FIXME: Assumes IPv4 */
if (!Packet)
return STATUS_INSUFFICIENT_RESOURCES;
IPInitializePacket(Packet,IP_ADDRESS_V4);
Packet->Flags = IP_PACKET_FLAG_RAW; /* Don't touch IP header */
Packet->TotalSize = SendRequest->BufferSize;
Packet->TotalSize = DataLength;
Packet->NdisPacket = NdisPacket;
if (MaxLLHeaderSize != 0) {
Header = ExAllocatePool(NonPagedPool, MaxLLHeaderSize);
if (!Header) {
TI_DbgPrint(MIN_TRACE, ("Cannot allocate memory for packet headers.\n"));
FreeNdisPacket(Packet->NdisPacket);
return STATUS_INSUFFICIENT_RESOURCES;
}
@ -63,16 +59,17 @@ NTSTATUS BuildRawIPPacket(
/* Allocate NDIS buffer for maximum link level header */
NdisAllocateBuffer(&NdisStatus,
&HeaderBuffer,
GlobalBufferPool,
Header,
MaxLLHeaderSize);
&HeaderBuffer,
GlobalBufferPool,
Header,
MaxLLHeaderSize);
if (NdisStatus != NDIS_STATUS_SUCCESS) {
TI_DbgPrint(MIN_TRACE, ("Cannot allocate NDIS buffer for packet headers. NdisStatus = (0x%X)\n", NdisStatus));
ExFreePool(Header);
FreeNdisPacket(Packet->NdisPacket);
return STATUS_INSUFFICIENT_RESOURCES;
}
/* Chain header at front of packet */
NdisChainBufferAtFront(Packet->NdisPacket, HeaderBuffer);
}
@ -104,23 +101,26 @@ NTSTATUS RawIPSendDatagram(
UINT BufferLen;
PADDRESS_FILE AddrFile =
(PADDRESS_FILE)Request->Handle.AddressHandle;
PDATAGRAM_SEND_REQUEST SendRequest;
SendRequest = ExAllocatePool( NonPagedPool, sizeof(*SendRequest) );
IP_PACKET Packet;
NdisQueryBuffer( Buffer, &BufferData, &BufferLen );
Status = AllocatePacketWithBuffer( &SendRequest->Packet.NdisPacket,
Status = AllocatePacketWithBuffer( &Packet.NdisPacket,
BufferData,
BufferLen );
if( Status != NDIS_STATUS_SUCCESS ) {
BuildRawIPPacket( SendRequest,
(PIP_ADDRESS)&AddrFile->ADE->Address->Address.
IPv4Address,
AddrFile->Port );
Status = DGSendDatagram(Request, ConnInfo, &SendRequest->Packet);
NdisFreeBuffer( Buffer );
}
TI_DbgPrint(MID_TRACE,("Packet.NdisPacket %x\n", Packet.NdisPacket));
if( Status == NDIS_STATUS_SUCCESS )
Status = BuildRawIPPacket( &Packet,
BufferLen,
AddrFile->ADE->Address,
AddrFile->Port );
if( Status == NDIS_STATUS_SUCCESS )
Status = DGSendDatagram(Request, ConnInfo, &Packet);
else
FreeNdisPacket( Packet.NdisPacket );
/* NdisFreeBuffer( Buffer ); */
return Status;
}

21
reactos/drivers/net/tcpip/transport/tcp/event.c
View file

@ -101,7 +101,26 @@ void TCPRecvNotify( PCONNECTION_ENDPOINT Connection, UINT Flags ) {
}
void TCPCloseNotify( PCONNECTION_ENDPOINT Connection ) {
TCPRecvNotify( Connection, 0 );
NTSTATUS Status;
PTDI_IND_DISCONNECT DisconnectHandler;
PVOID HandlerContext;
DisconnectHandler = Connection->AddressFile->DisconnectHandler;
HandlerContext = Connection->AddressFile->DisconnectHandlerContext;
/* XXX Distinguish TDI_DISCONNECT_RELEASE from TDI_DISCONNECT_ABORT */
if( Connection->AddressFile->RegisteredDisconnectHandler )
Status = DisconnectHandler( HandlerContext,
NULL,
0,
NULL,
0,
NULL,
TDI_DISCONNECT_ABORT );
else
Status = STATUS_UNSUCCESSFUL;
return Status;
}
char *FlagNames[] = { "SEL_CONNECT",