[TCPIP, IP]

[reactos.git] / lib / drivers / ip / transport / datagram / datagram.c

diff --git a/lib/drivers/ip/transport/datagram/datagram.c b/lib/drivers/ip/transport/datagram/datagram.c
index 7066060..bb60854 100644 (file)
--- a/lib/drivers/ip/transport/datagram/datagram.c
+++ b/lib/drivers/ip/transport/datagram/datagram.c
@@ -10,18 +10,19 @@
 
 #include "precomp.h"
 
-VOID DGRemoveIRP(
+BOOLEAN DGRemoveIRP(
     PADDRESS_FILE AddrFile,
     PIRP Irp)
 {
     PLIST_ENTRY ListEntry;
     PDATAGRAM_RECEIVE_REQUEST ReceiveRequest;
     KIRQL OldIrql;
+    BOOLEAN Found = FALSE;
 
     TI_DbgPrint(MAX_TRACE, ("Called (Cancel IRP %08x for file %08x).\n",
                             Irp, AddrFile));
 
-    KeAcquireSpinLock(&AddrFile->Lock, &OldIrql);
+    LockObject(AddrFile, &OldIrql);
 
     for( ListEntry = AddrFile->ReceiveQueue.Flink; 
          ListEntry != &AddrFile->ReceiveQueue;
@@ -35,14 +36,17 @@ VOID DGRemoveIRP(
         if (ReceiveRequest->Irp == Irp)
         {
             RemoveEntryList(&ReceiveRequest->ListEntry);
-            exFreePool(ReceiveRequest);
+            ExFreePoolWithTag(ReceiveRequest, DATAGRAM_RECV_TAG);
+            Found = TRUE;
             break;
         }
     }
 
-    KeReleaseSpinLock(&AddrFile->Lock, OldIrql);
+    UnlockObject(AddrFile, OldIrql);
 
     TI_DbgPrint(MAX_TRACE, ("Done.\n"));
+
+    return Found;
 }
 
 VOID DGDeliverData(
@@ -79,7 +83,7 @@ VOID DGDeliverData(
 
   TI_DbgPrint(MAX_TRACE, ("Called.\n"));
 
-  TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql);
+  LockObject(AddrFile, &OldIrql);
 
   if (AddrFile->Protocol == IPPROTO_UDP)
     {
@@ -136,7 +140,8 @@ VOID DGDeliverData(
                             &SrcAddress->Address.IPv4Address,
                             sizeof(SrcAddress->Address.IPv4Address) );
 
-              TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql);
+              ReferenceObject(AddrFile);
+              UnlockObject(AddrFile, OldIrql);
 
               /* Complete the receive request */
               if (Current->BufferSize < DataSize)
@@ -144,11 +149,12 @@ VOID DGDeliverData(
               else
                   Current->Complete(Current->Context, STATUS_SUCCESS, DataSize);
 
-              TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql);
+              LockObject(AddrFile, &OldIrql);
+              DereferenceObject(AddrFile);
          }
       }
 
-      TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql);
+      UnlockObject(AddrFile, OldIrql);
     }
   else if (AddrFile->RegisteredReceiveDatagramHandler)
     {
@@ -157,8 +163,6 @@ VOID DGDeliverData(
       ReceiveHandler = AddrFile->ReceiveDatagramHandler;
       HandlerContext = AddrFile->ReceiveDatagramHandlerContext;
 
-      TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql);
-
       if (SrcAddress->Type == IP_ADDRESS_V4)
         {
           AddressLength = sizeof(IPv4_RAW_ADDRESS);
@@ -170,6 +174,9 @@ VOID DGDeliverData(
           SourceAddress = SrcAddress->Address.IPv6Address;
         }
 
+      ReferenceObject(AddrFile);
+      UnlockObject(AddrFile, OldIrql);
+
       Status = (*ReceiveHandler)(HandlerContext,
         AddressLength,
         SourceAddress,
@@ -181,10 +188,12 @@ VOID DGDeliverData(
         &BytesTaken,
         DataBuffer,
         NULL);
+
+      DereferenceObject(AddrFile);
     }
   else
     {
-      TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql);
+      UnlockObject(AddrFile, OldIrql);
       TI_DbgPrint(MAX_TRACE, ("Discarding datagram.\n"));
     }
 
@@ -197,7 +206,7 @@ VOID DGReceiveComplete(PVOID Context, NTSTATUS Status, ULONG Count) {
        (PDATAGRAM_RECEIVE_REQUEST)Context;
     TI_DbgPrint(MAX_TRACE,("Called (%08x:%08x)\n", Status, Count));
     ReceiveRequest->UserComplete( ReceiveRequest->UserContext, Status, Count );
-    exFreePool( ReceiveRequest );
+    ExFreePoolWithTag( ReceiveRequest, DATAGRAM_RECV_TAG );
     TI_DbgPrint(MAX_TRACE,("Done\n"));
 }
 
@@ -228,76 +237,68 @@ NTSTATUS DGReceiveDatagram(
  *     This is the high level interface for receiving DG datagrams
  */
 {
-    KIRQL OldIrql;
     NTSTATUS Status;
     PDATAGRAM_RECEIVE_REQUEST ReceiveRequest;
+    KIRQL OldIrql;
 
     TI_DbgPrint(MAX_TRACE, ("Called.\n"));
 
-    TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql);
+    LockObject(AddrFile, &OldIrql);
 
-    if (AF_IS_VALID(AddrFile))
+    ReceiveRequest = ExAllocatePoolWithTag(NonPagedPool, sizeof(DATAGRAM_RECEIVE_REQUEST),
+                                           DATAGRAM_RECV_TAG);
+    if (ReceiveRequest)
     {
-       ReceiveRequest = exAllocatePool(NonPagedPool, sizeof(DATAGRAM_RECEIVE_REQUEST));
-       if (ReceiveRequest)
-        {
-           /* Initialize a receive request */
+       /* Initialize a receive request */
 
-           /* Extract the remote address filter from the request (if any) */
-           if ((ConnInfo->RemoteAddressLength != 0) &&
-               (ConnInfo->RemoteAddress))
-            {
-               Status = AddrGetAddress(ConnInfo->RemoteAddress,
-                                       &ReceiveRequest->RemoteAddress,
-                                       &ReceiveRequest->RemotePort);
-               if (!NT_SUCCESS(Status))
-                {
-                   TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql);
-                   exFreePool(ReceiveRequest);
-                   return Status;
-                }
-            }
-           else
+       /* Extract the remote address filter from the request (if any) */
+       if ((ConnInfo->RemoteAddressLength != 0) &&
+           (ConnInfo->RemoteAddress))
+        {
+           Status = AddrGetAddress(ConnInfo->RemoteAddress,
+                                   &ReceiveRequest->RemoteAddress,
+                                   &ReceiveRequest->RemotePort);
+           if (!NT_SUCCESS(Status))
             {
-               ReceiveRequest->RemotePort = 0;
-               AddrInitIPv4(&ReceiveRequest->RemoteAddress, 0);
+               ExFreePoolWithTag(ReceiveRequest, DATAGRAM_RECV_TAG);
+               UnlockObject(AddrFile, OldIrql);
+               return Status;
             }
+       }
+       else
+        {
+           ReceiveRequest->RemotePort = 0;
+           AddrInitIPv4(&ReceiveRequest->RemoteAddress, 0);
+        }
 
-           IoMarkIrpPending(Irp);
+       IoMarkIrpPending(Irp);
 
-           ReceiveRequest->ReturnInfo = ReturnInfo;
-           ReceiveRequest->Buffer = BufferData;
-           ReceiveRequest->BufferSize = ReceiveLength;
-           ReceiveRequest->UserComplete = Complete;
-           ReceiveRequest->UserContext = Context;
-           ReceiveRequest->Complete =
+       ReceiveRequest->ReturnInfo = ReturnInfo;
+       ReceiveRequest->Buffer = BufferData;
+       ReceiveRequest->BufferSize = ReceiveLength;
+       ReceiveRequest->UserComplete = Complete;
+       ReceiveRequest->UserContext = Context;
+       ReceiveRequest->Complete =
                (PDATAGRAM_COMPLETION_ROUTINE)DGReceiveComplete;
-           ReceiveRequest->Context = ReceiveRequest;
-            ReceiveRequest->AddressFile = AddrFile;
-            ReceiveRequest->Irp = Irp;
+       ReceiveRequest->Context = ReceiveRequest;
+        ReceiveRequest->AddressFile = AddrFile;
+        ReceiveRequest->Irp = Irp;
 
-           /* Queue receive request */
-           InsertTailList(&AddrFile->ReceiveQueue, &ReceiveRequest->ListEntry);
-           AF_SET_PENDING(AddrFile, AFF_RECEIVE);
+       /* Queue receive request */
+       InsertTailList(&AddrFile->ReceiveQueue, &ReceiveRequest->ListEntry);
 
-           TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql);
+       TI_DbgPrint(MAX_TRACE, ("Leaving (pending %08x).\n", ReceiveRequest));
 
-           TI_DbgPrint(MAX_TRACE, ("Leaving (pending %08x).\n", ReceiveRequest));
+       UnlockObject(AddrFile, OldIrql);
 
-           return STATUS_PENDING;
-        }
-       else
-        {
-           Status = STATUS_INSUFFICIENT_RESOURCES;
-        }
+       return STATUS_PENDING;
     }
     else
     {
-       Status = STATUS_INVALID_ADDRESS;
+       UnlockObject(AddrFile, OldIrql);
+        Status = STATUS_INSUFFICIENT_RESOURCES;
     }
 
-    TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql);
-
     TI_DbgPrint(MAX_TRACE, ("Leaving with errors (0x%X).\n", Status));
 
     return Status;