Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-01 19:33:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Merge aicom-network-fixes up to r35899

Browse source 
svn path=/trunk/; revision=35901
This commit is contained in:
Cameron Gutman 2008-09-03 00:32:07 +00:00
parent cae5d127c8
commit a84ca6d5c6
4 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/lib/drivers/ip/network/arp.c
View file

@ -150,6 +150,8 @@ BOOLEAN ARPTransmit(PIP_ADDRESS Address, PIP_INTERFACE Interface)
&Address->Address, /* Target's (remote) protocol address */ &Address->Address, /* Target's (remote) protocol address */
ARP_OPCODE_REQUEST); /* ARP request */ ARP_OPCODE_REQUEST); /* ARP request */
if( !NdisPacket ) return FALSE;
ASSERT_KM_POINTER(NdisPacket); ASSERT_KM_POINTER(NdisPacket);
ASSERT_KM_POINTER(PC(NdisPacket)); ASSERT_KM_POINTER(PC(NdisPacket));
PC(NdisPacket)->DLComplete = ARPTransmitComplete; PC(NdisPacket)->DLComplete = ARPTransmitComplete;

7
reactos/lib/drivers/ip/transport/rawip/rawip.c
View file

@ -143,6 +143,13 @@ NTSTATUS BuildRawIpPacket(
break; break;
} }
if( !NT_SUCCESS(Status) ) {
TI_DbgPrint(MIN_TRACE, ("Cannot add header. Status = (0x%X)\n",
Status));
FreeNdisPacket(Packet->NdisPacket);
return Status;
}
TI_DbgPrint(MID_TRACE, ("Copying data (hdr %x data %x (%d))\n", TI_DbgPrint(MID_TRACE, ("Copying data (hdr %x data %x (%d))\n",
Packet->Header, Packet->Data, Packet->Header, Packet->Data,
(PCHAR)Packet->Data - (PCHAR)Packet->Header)); (PCHAR)Packet->Data - (PCHAR)Packet->Header));

2
reactos/lib/drivers/ip/transport/tcp/if.c
View file

@ -34,9 +34,9 @@ PVOID TCPPrepareInterface( PIP_INTERFACE IF ) {
NTSTATUS Status; NTSTATUS Status;
POSK_IFADDR ifaddr = exAllocatePool POSK_IFADDR ifaddr = exAllocatePool
( NonPagedPool, sizeof(*ifaddr) + 2 * sizeof( struct sockaddr_in ) ); ( NonPagedPool, sizeof(*ifaddr) + 2 * sizeof( struct sockaddr_in ) );
if( !ifaddr ) return NULL;
struct sockaddr_in *addr_in = (struct sockaddr_in *)&ifaddr[1]; struct sockaddr_in *addr_in = (struct sockaddr_in *)&ifaddr[1];
struct sockaddr_in *dstaddr_in = (struct sockaddr_in *)&addr_in[1]; struct sockaddr_in *dstaddr_in = (struct sockaddr_in *)&addr_in[1];
if( !ifaddr ) return NULL;
TI_DbgPrint(DEBUG_TCPIF,("Called\n")); TI_DbgPrint(DEBUG_TCPIF,("Called\n"));

2
reactos/lib/drivers/ip/transport/udp/udp.c
View file

@ -330,6 +330,8 @@ NTSTATUS UDPShutdown(
/* Deregister this protocol with IP layer */ /* Deregister this protocol with IP layer */
IPRegisterProtocol(IPPROTO_UDP, NULL); IPRegisterProtocol(IPPROTO_UDP, NULL);
UDPInitialized = FALSE;
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }