Use Mde library and definition instead of some native definitions in NetLib, to simpl...

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Ip4Dxe / Ip4Route.c

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.c
index 54d934250f5a66177f5d538c3b27983c7f41875e..fed1983515188affe0bc57f836f2c130c22c1580 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.c
@@ -44,13 +44,13 @@ Ip4CreateRouteEntry (
 {\r
   IP4_ROUTE_ENTRY           *RtEntry;\r
 \r
-  RtEntry = NetAllocatePool (sizeof (IP4_ROUTE_ENTRY));\r
+  RtEntry = AllocatePool (sizeof (IP4_ROUTE_ENTRY));\r
 \r
   if (RtEntry == NULL) {\r
     return NULL;\r
   }\r
 \r
-  NetListInit (&RtEntry->Link);\r
+  InitializeListHead (&RtEntry->Link);\r
 \r
   RtEntry->RefCnt  = 1;\r
   RtEntry->Dest    = Dest;\r
@@ -79,7 +79,7 @@ Ip4FreeRouteEntry (
   ASSERT (RtEntry->RefCnt > 0);\r
 \r
   if (--RtEntry->RefCnt == 0) {\r
-    NetFreePool (RtEntry);\r
+    gBS->FreePool (RtEntry);\r
   }\r
 }\r
 \r
@@ -108,13 +108,13 @@ Ip4CreateRouteCacheEntry (
 {\r
   IP4_ROUTE_CACHE_ENTRY     *RtCacheEntry;\r
 \r
-  RtCacheEntry = NetAllocatePool (sizeof (IP4_ROUTE_CACHE_ENTRY));\r
+  RtCacheEntry = AllocatePool (sizeof (IP4_ROUTE_CACHE_ENTRY));\r
 \r
   if (RtCacheEntry == NULL) {\r
     return NULL;\r
   }\r
 \r
-  NetListInit (&RtCacheEntry->Link);\r
+  InitializeListHead (&RtCacheEntry->Link);\r
 \r
   RtCacheEntry->RefCnt  = 1;\r
   RtCacheEntry->Dest    = Dst;\r
@@ -142,7 +142,7 @@ Ip4FreeRouteCacheEntry (
   ASSERT (RtCacheEntry->RefCnt > 0);\r
 \r
   if (--RtCacheEntry->RefCnt == 0) {\r
-    NetFreePool (RtCacheEntry);\r
+    gBS->FreePool (RtCacheEntry);\r
   }\r
 }\r
 \r
@@ -163,7 +163,7 @@ Ip4InitRouteCache (
   UINT32                    Index;\r
 \r
   for (Index = 0; Index < IP4_ROUTE_CACHE_HASH; Index++) {\r
-    NetListInit (&(RtCache->CacheBucket[Index]));\r
+    InitializeListHead (&(RtCache->CacheBucket[Index]));\r
   }\r
 }\r
 \r
@@ -182,8 +182,8 @@ Ip4CleanRouteCache (
   IN IP4_ROUTE_CACHE        *RtCache\r
   )\r
 {\r
-  NET_LIST_ENTRY            *Entry;\r
-  NET_LIST_ENTRY            *Next;\r
+  LIST_ENTRY                *Entry;\r
+  LIST_ENTRY                *Next;\r
   IP4_ROUTE_CACHE_ENTRY     *RtCacheEntry;\r
   UINT32                    Index;\r
 \r
@@ -191,7 +191,7 @@ Ip4CleanRouteCache (
     NET_LIST_FOR_EACH_SAFE (Entry, Next, &(RtCache->CacheBucket[Index])) {\r
       RtCacheEntry = NET_LIST_USER_STRUCT (Entry, IP4_ROUTE_CACHE_ENTRY, Link);\r
 \r
-      NetListRemoveEntry (Entry);\r
+      RemoveEntryList (Entry);\r
       Ip4FreeRouteCacheEntry (RtCacheEntry);\r
     }\r
   }\r
@@ -216,7 +216,7 @@ Ip4CreateRouteTable (
   IP4_ROUTE_TABLE           *RtTable;\r
   UINT32                    Index;\r
 \r
-  RtTable = NetAllocatePool (sizeof (IP4_ROUTE_TABLE));\r
+  RtTable = AllocatePool (sizeof (IP4_ROUTE_TABLE));\r
 \r
   if (RtTable == NULL) {\r
     return NULL;\r
@@ -226,7 +226,7 @@ Ip4CreateRouteTable (
   RtTable->TotalNum = 0;\r
 \r
   for (Index = 0; Index < IP4_MASK_NUM; Index++) {\r
-    NetListInit (&(RtTable->RouteArea[Index]));\r
+    InitializeListHead (&(RtTable->RouteArea[Index]));\r
   }\r
 \r
   RtTable->Next = NULL;\r
@@ -250,8 +250,8 @@ Ip4FreeRouteTable (
   IN IP4_ROUTE_TABLE        *RtTable\r
   )\r
 {\r
-  NET_LIST_ENTRY            *Entry;\r
-  NET_LIST_ENTRY            *Next;\r
+  LIST_ENTRY                *Entry;\r
+  LIST_ENTRY                *Next;\r
   IP4_ROUTE_ENTRY           *RtEntry;\r
   UINT32                    Index;\r
 \r
@@ -268,14 +268,14 @@ Ip4FreeRouteTable (
     NET_LIST_FOR_EACH_SAFE (Entry, Next, &(RtTable->RouteArea[Index])) {\r
       RtEntry = NET_LIST_USER_STRUCT (Entry, IP4_ROUTE_ENTRY, Link);\r
 \r
-      NetListRemoveEntry (Entry);\r
+      RemoveEntryList (Entry);\r
       Ip4FreeRouteEntry (RtEntry);\r
     }\r
   }\r
 \r
   Ip4CleanRouteCache (&RtTable->Cache);\r
 \r
-  NetFreePool (RtTable);\r
+  gBS->FreePool (RtTable);\r
 }\r
 \r
 \r
@@ -299,8 +299,8 @@ Ip4PurgeRouteCache (
   IN UINTN                  Tag\r
   )\r
 {\r
-  NET_LIST_ENTRY            *Entry;\r
-  NET_LIST_ENTRY            *Next;\r
+  LIST_ENTRY                *Entry;\r
+  LIST_ENTRY                *Next;\r
   IP4_ROUTE_CACHE_ENTRY     *RtCacheEntry;\r
   UINT32                    Index;\r
 \r
@@ -310,7 +310,7 @@ Ip4PurgeRouteCache (
       RtCacheEntry = NET_LIST_USER_STRUCT (Entry, IP4_ROUTE_CACHE_ENTRY, Link);\r
 \r
       if (RtCacheEntry->Tag == Tag) {\r
-        NetListRemoveEntry (Entry);\r
+        RemoveEntryList (Entry);\r
         Ip4FreeRouteCacheEntry (RtCacheEntry);\r
       }\r
     }\r
@@ -340,8 +340,8 @@ Ip4AddRoute (
   IN IP4_ADDR               Gateway\r
   )\r
 {\r
-  NET_LIST_ENTRY            *Head;\r
-  NET_LIST_ENTRY            *Entry;\r
+  LIST_ENTRY                *Head;\r
+  LIST_ENTRY                *Entry;\r
   IP4_ROUTE_ENTRY           *RtEntry;\r
 \r
   //\r
@@ -374,7 +374,7 @@ Ip4AddRoute (
     RtEntry->Flag = IP4_DIRECT_ROUTE;\r
   }\r
 \r
-  NetListInsertHead (Head, &RtEntry->Link);\r
+  InsertHeadList (Head, &RtEntry->Link);\r
   RtTable->TotalNum++;\r
 \r
   return EFI_SUCCESS;\r
@@ -402,9 +402,9 @@ Ip4DelRoute (
   IN IP4_ADDR             Gateway\r
   )\r
 {\r
-  NET_LIST_ENTRY            *Head;\r
-  NET_LIST_ENTRY            *Entry;\r
-  NET_LIST_ENTRY            *Next;\r
+  LIST_ENTRY                *Head;\r
+  LIST_ENTRY                *Entry;\r
+  LIST_ENTRY                *Next;\r
   IP4_ROUTE_ENTRY           *RtEntry;\r
 \r
   Head = &(RtTable->RouteArea[NetGetMaskLength (Netmask)]);\r
@@ -414,7 +414,7 @@ Ip4DelRoute (
 \r
     if (IP4_NET_EQUAL (RtEntry->Dest, Dest, Netmask) && (RtEntry->NextHop == Gateway)) {\r
       Ip4PurgeRouteCache (&RtTable->Cache, (UINTN) RtEntry);\r
-      NetListRemoveEntry (Entry);\r
+      RemoveEntryList (Entry);\r
       Ip4FreeRouteEntry  (RtEntry);\r
 \r
       RtTable->TotalNum--;\r
@@ -447,7 +447,7 @@ Ip4FindRouteCache (
   IN IP4_ADDR               Src\r
   )\r
 {\r
-  NET_LIST_ENTRY            *Entry;\r
+  LIST_ENTRY                *Entry;\r
   IP4_ROUTE_CACHE_ENTRY     *RtCacheEntry;\r
   UINT32                    Index;\r
 \r
@@ -489,7 +489,7 @@ Ip4FindRouteEntry (
   IN IP4_ADDR               Dst\r
   )\r
 {\r
-  NET_LIST_ENTRY            *Entry;\r
+  LIST_ENTRY                *Entry;\r
   IP4_ROUTE_ENTRY           *RtEntry;\r
   IP4_ROUTE_TABLE           *Table;\r
   INTN                      Index;\r
@@ -533,9 +533,9 @@ Ip4Route (
   IN IP4_ADDR               Src\r
   )\r
 {\r
-  NET_LIST_ENTRY            *Head;\r
-  NET_LIST_ENTRY            *Entry;\r
-  NET_LIST_ENTRY            *Next;\r
+  LIST_ENTRY                *Head;\r
+  LIST_ENTRY                *Entry;\r
+  LIST_ENTRY                *Next;\r
   IP4_ROUTE_CACHE_ENTRY     *RtCacheEntry;\r
   IP4_ROUTE_CACHE_ENTRY     *Cache;\r
   IP4_ROUTE_ENTRY           *RtEntry;\r
@@ -551,8 +551,8 @@ Ip4Route (
   // If found, promote the cache entry to the head of the hash bucket. LRU\r
   //\r
   if (RtCacheEntry != NULL) {\r
-    NetListRemoveEntry (&RtCacheEntry->Link);\r
-    NetListInsertHead (Head, &RtCacheEntry->Link);\r
+    RemoveEntryList (&RtCacheEntry->Link);\r
+    InsertHeadList (Head, &RtCacheEntry->Link);\r
     return RtCacheEntry;\r
   }\r
 \r
@@ -588,7 +588,7 @@ Ip4Route (
     return NULL;\r
   }\r
 \r
-  NetListInsertHead (Head, &RtCacheEntry->Link);\r
+  InsertHeadList (Head, &RtCacheEntry->Link);\r
   NET_GET_REF (RtCacheEntry);\r
 \r
   //\r
@@ -604,7 +604,7 @@ Ip4Route (
 \r
     Cache = NET_LIST_USER_STRUCT (Entry, IP4_ROUTE_CACHE_ENTRY, Link);\r
 \r
-    NetListRemoveEntry (Entry);\r
+    RemoveEntryList (Entry);\r
     Ip4FreeRouteCacheEntry (Cache);\r
   }\r
 \r
@@ -628,7 +628,7 @@ Ip4BuildEfiRouteTable (
   IN IP4_PROTOCOL           *IpInstance\r
   )\r
 {\r
-  NET_LIST_ENTRY            *Entry;\r
+  LIST_ENTRY                *Entry;\r
   IP4_ROUTE_TABLE           *RtTable;\r
   IP4_ROUTE_ENTRY           *RtEntry;\r
   EFI_IP4_ROUTE_TABLE       *Table;\r
@@ -638,7 +638,7 @@ Ip4BuildEfiRouteTable (
   RtTable = IpInstance->RouteTable;\r
 \r
   if (IpInstance->EfiRouteTable != NULL) {\r
-    NetFreePool (IpInstance->EfiRouteTable);\r
+    gBS->FreePool (IpInstance->EfiRouteTable);\r
 \r
     IpInstance->EfiRouteTable = NULL;\r
     IpInstance->EfiRouteCount = 0;\r
@@ -654,7 +654,7 @@ Ip4BuildEfiRouteTable (
     return EFI_SUCCESS;\r
   }\r
 \r
-  Table = NetAllocatePool (sizeof (EFI_IP4_ROUTE_TABLE) * Count);\r
+  Table = AllocatePool (sizeof (EFI_IP4_ROUTE_TABLE) * Count);\r
 \r
   if (Table == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r