ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-31 19:26:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Merge aicom-network-fixes up to r36973

Browse Source 
svn path=/trunk/; revision=36974
This commit is contained in:
Cameron Gutman
2008-10-25 23:44:41 +00:00
parent f4ab2b4a4b
commit 6089f9fe0b
5 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/drivers/network/afd/afd/main.c
-4
View File
@@ -221,10 +221,6 @@ VOID DestroySocket( PAFD_FCB FCB ) {
ExFreePool( FCB->LocalAddress );
if( FCB->RemoteAddress )
ExFreePool( FCB->RemoteAddress );
if( FCB->ListenIrp.ConnectionReturnInfo )
ExFreePool( FCB->ListenIrp.ConnectionReturnInfo );
if( FCB->ListenIrp.ConnectionCallInfo )
ExFreePool( FCB->ListenIrp.ConnectionCallInfo );
if( FCB->TdiDeviceName.Buffer )
ExFreePool(FCB->TdiDeviceName.Buffer);
reactos/drivers/network/tcpip/datalink/lan.c
+5 -4
View File
@@ -628,6 +628,11 @@ VOID LANTransmit(
("Called( NdisPacket %x, Offset %d, Adapter %x )\n",
NdisPacket, Offset, Adapter));
if (Adapter->State != LAN_STATE_STARTED) {
ProtocolSendComplete(Context, NdisPacket, NDIS_STATUS_NOT_ACCEPTED);
return;
}
TI_DbgPrint(DEBUG_DATALINK,
("Adapter Address [%02x %02x %02x %02x %02x %02x]\n",
Adapter->HWAddress[0] & 0xff,
@@ -643,7 +648,6 @@ VOID LANTransmit(
LanChainCompletion( Adapter, NdisPacket );
if (Adapter->State == LAN_STATE_STARTED) {
switch (Adapter->Media) {
case NdisMedium802_3:
EHeader = (PETH_HEADER)Data;
@@ -713,9 +717,6 @@ VOID LANTransmit(
* the situation with IRPs. */
if (NdisStatus != NDIS_STATUS_PENDING)
ProtocolSendComplete((NDIS_HANDLE)Context, NdisPacket, NdisStatus);
} else {
ProtocolSendComplete((NDIS_HANDLE)Context, NdisPacket, NDIS_STATUS_CLOSED);
}
}
static NTSTATUS
reactos/lib/drivers/ip/network/neighbor.c
+3
View File
@@ -29,6 +29,9 @@ VOID NBSendPackets( PNEIGHBOR_CACHE_ENTRY NCE ) {
PLIST_ENTRY PacketEntry;
PNEIGHBOR_PACKET Packet;
if(!(NCE->State & NUD_CONNECTED))
return;
/* Send any waiting packets */
PacketEntry = ExInterlockedRemoveHeadList(&NCE->PacketQueue,
&NCE->Table->Lock);
reactos/lib/drivers/ip/transport/tcp/accept.c
+6 -6
View File
@@ -87,13 +87,13 @@ NTSTATUS TCPListen( PCONNECTION_ENDPOINT Connection, UINT Backlog ) {
TI_DbgPrint(DEBUG_TCP,("AddressToBind - %x:%x\n", AddressToBind.sin_addr, AddressToBind.sin_port));
OskitTCPBind( Connection->SocketContext,
Connection,
&AddressToBind,
sizeof(AddressToBind) );
Status = TCPTranslateError( OskitTCPBind( Connection->SocketContext,
Connection,
&AddressToBind,
sizeof(AddressToBind) ) );
Status = TCPTranslateError( OskitTCPListen( Connection->SocketContext,
Backlog ) );
if (NT_SUCCESS(Status))
Status = TCPTranslateError( OskitTCPListen( Connection->SocketContext, Backlog ) );
TcpipRecursiveMutexLeave( &TCPLock );
reactos/lib/drivers/ip/transport/tcp/tcp.c
+14 -11
View File
@@ -577,21 +577,24 @@ NTSTATUS TCPConnect
AddressToConnect.sin_family = AF_INET;
AddressToBind = AddressToConnect;
OskitTCPBind( Connection->SocketContext,
Status = TCPTranslateError
( OskitTCPBind( Connection->SocketContext,
Connection,
&AddressToBind,
sizeof(AddressToBind) );
sizeof(AddressToBind) ) );
memcpy( &AddressToConnect.sin_addr,
&RemoteAddress.Address.IPv4Address,
sizeof(AddressToConnect.sin_addr) );
AddressToConnect.sin_port = RemotePort;
if (NT_SUCCESS(Status)) {
memcpy( &AddressToConnect.sin_addr,
&RemoteAddress.Address.IPv4Address,
sizeof(AddressToConnect.sin_addr) );
AddressToConnect.sin_port = RemotePort;
Status = TCPTranslateError
( OskitTCPConnect( Connection->SocketContext,
Connection,
&AddressToConnect,
sizeof(AddressToConnect) ) );
Status = TCPTranslateError
( OskitTCPConnect( Connection->SocketContext,
Connection,
&AddressToConnect,
sizeof(AddressToConnect) ) );
}
TcpipRecursiveMutexLeave( &TCPLock );