Fix loopback adapter locking and make traffic work consistently.

Fix zero-address binding.
Local tcp services should work now.

svn path=/trunk/; revision=39613

reactos/drivers/network/tcpip/tcpip/fileobjs.c

@@ -242,7 +242,6 @@ NTSTATUS FileOpenAddress(
   PVOID Options)
 {
   IPv4_RAW_ADDRESS IPv4Address;
-  BOOLEAN Matched;
   PADDRESS_FILE AddrFile;
 
   TI_DbgPrint(MID_TRACE, ("Called (Proto %d).\n", Protocol));
@@ -260,22 +259,20 @@ NTSTATUS FileOpenAddress(
   AddrFile->Free = AddrFileFree;
 
   /* Make sure address is a local unicast address or 0 */
-
-  /* Locate address entry. If specified address is 0, a random address is chosen */
-
   /* FIXME: IPv4 only */
   AddrFile->Family = Address->Address[0].AddressType;
   IPv4Address = Address->Address[0].Address[0].in_addr;
-  if (IPv4Address == 0)
+  if (IPv4Address != 0 &&
-      Matched = IPGetDefaultAddress(&AddrFile->Address);
+      !AddrLocateADEv4(IPv4Address, &AddrFile->Address)) {
-  else
-      Matched = AddrLocateADEv4(IPv4Address, &AddrFile->Address);
-
-  if (!Matched) {
 	  exFreePool(AddrFile);
 	  TI_DbgPrint(MIN_TRACE, ("Non-local address given (0x%X).\n", DN2H(IPv4Address)));
 	  return STATUS_INVALID_PARAMETER;
   }
+  else
+  {
+	  /* Bound to the default address ... Copy the address type */
+	  AddrFile->Address.Type = IP_ADDRESS_V4;
+  }
 
   TI_DbgPrint(MID_TRACE, ("Opening address %s for communication (P=%d U=%d).\n",
     A2S(&AddrFile->Address), Protocol, IPPROTO_UDP));

reactos/lib/drivers/ip/network/address.c

@@ -223,6 +223,7 @@ BOOLEAN AddrIsEqual(
 {
     if (Address1->Type != Address2->Type) {
         DbgPrint("AddrIsEqual: Unequal Address Types\n");
+		ASSERT(FALSE);
         return FALSE;
     }
 

reactos/lib/drivers/ip/network/ip.c

@@ -195,6 +195,8 @@ PIP_INTERFACE IPCreateInterface(
 
     INIT_TAG(IF, TAG('F','A','C','E'));
 
+	RtlZeroMemory(IF, sizeof(IP_INTERFACE));
+
     IF->Free       = FreeIF;
     IF->Context    = BindInfo->Context;
     IF->HeaderSize = BindInfo->HeaderSize;
@@ -210,6 +212,11 @@ PIP_INTERFACE IPCreateInterface(
     IF->AddressLength = BindInfo->AddressLength;
     IF->Transmit      = BindInfo->Transmit;
 
+	IF->Unicast.Type = IP_ADDRESS_V4;
+	IF->PointToPoint.Type = IP_ADDRESS_V4;
+	IF->Netmask.Type = IP_ADDRESS_V4;
+	IF->Broadcast.Type = IP_ADDRESS_V4;
+
     TcpipInitializeSpinLock(&IF->Lock);
 
 #ifdef __NTDRIVER__

reactos/lib/drivers/ip/network/loopback.c

@@ -32,11 +32,16 @@ VOID NTAPI LoopReceiveWorker( PVOID Context ) {
     UINT BytesTransferred;
     PNDIS_BUFFER NdisBuffer;
     IP_PACKET IPPacket;
+	KIRQL OldIrql;
 
     TI_DbgPrint(DEBUG_DATALINK, ("Called.\n"));
 
-    while( (ListEntry =
+	TcpipAcquireSpinLock( &LoopWorkLock, &OldIrql );
-	    ExInterlockedRemoveHeadList( &LoopWorkList, &LoopWorkLock )) ) {
+    while( !IsListEmpty(&LoopWorkList) )
+    {
+		ListEntry = RemoveHeadList( &LoopWorkList );
+		TcpipReleaseSpinLock( &LoopWorkLock, OldIrql );
+
 		WorkItem = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry);
 		
 		TI_DbgPrint(DEBUG_DATALINK, ("WorkItem: %x\n", WorkItem));
@@ -62,7 +67,8 @@ VOID NTAPI LoopReceiveWorker( PVOID Context ) {
         /* Determine which upper layer protocol that should receive
            this packet and pass it to the correct receive handler */
 		
-	TI_DbgPrint(MID_TRACE,
+		TI_DbgPrint
+			(MID_TRACE,
 			 ("ContigSize: %d, TotalSize: %d, BytesTransferred: %d\n",
 			  IPPacket.ContigSize, IPPacket.TotalSize,
 			  BytesTransferred));
@@ -72,9 +78,11 @@ VOID NTAPI LoopReceiveWorker( PVOID Context ) {
         IPReceive(Loopback, &IPPacket);
 		
 		FreeNdisPacket( Packet );
+		TcpipAcquireSpinLock( &LoopWorkLock, &OldIrql );
     }
     TI_DbgPrint(DEBUG_DATALINK, ("Leaving\n"));
     LoopReceiveWorkerBusy = FALSE;
+	TcpipReleaseSpinLock( &LoopWorkLock, OldIrql );
 }
 
 VOID LoopSubmitReceiveWork(

reactos/lib/drivers/ip/transport/udp/udp.c

@@ -10,7 +10,6 @@
 
 #include "precomp.h"
 
-
 BOOLEAN UDPInitialized = FALSE;
 PORT_SET UDPPorts;
 
@@ -164,6 +163,7 @@ NTSTATUS UDPSendDatagram(
     IP_PACKET Packet;
     PTA_IP_ADDRESS RemoteAddressTa = (PTA_IP_ADDRESS)ConnInfo->RemoteAddress;
     IP_ADDRESS RemoteAddress;
+	IP_ADDRESS LocalAddress;
     USHORT RemotePort;
     NTSTATUS Status;
     PNEIGHBOR_CACHE_ENTRY NCE;
@@ -184,10 +184,21 @@ NTSTATUS UDPSendDatagram(
 		return STATUS_UNSUCCESSFUL;
     }
 
+    if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) {
+		return STATUS_UNSUCCESSFUL;
+    }
+
+	LocalAddress = AddrFile->Address;
+	if (AddrIsUnspecified(&LocalAddress))
+	{
+		if (!IPGetDefaultAddress(&LocalAddress))
+			return FALSE;
+	}
+
     Status = BuildUDPPacket( &Packet,
 							 &RemoteAddress,
 							 RemotePort,
-			     &AddrFile->Address,
+							 &LocalAddress,
 							 AddrFile->Port,
 							 BufferData,
 							 DataSize );
@@ -195,11 +206,6 @@ NTSTATUS UDPSendDatagram(
     if( !NT_SUCCESS(Status) )
 		return Status;
 
-    if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) {
-        FreeNdisPacket(Packet.NdisPacket);
-	return STATUS_UNSUCCESSFUL;
-    }
-
     if (!NT_SUCCESS(Status = IPSendDatagram( &Packet, NCE, UDPSendPacketComplete, NULL )))
     {
         FreeNdisPacket(Packet.NdisPacket);