[Change summary]:

1. Update NetLib to a combined NetLib support dual network stack:
1) Add Network Debug facility for IPv4 stack.
2) Extend the library APIs to support IPv6 stack:
   a. NetIp6IsUnspecifiedAddr
   b. NetIp6IsLinkLocalAddr   
   c. NetIp6IsNetEqual
   d. NetLibCreateIPv6DPathNode.
   e. NetIp6PseudoHeadChecksum
   f. NetIp6IsValidUnicast
3) Update the structure definitions:
   a. Update NET_BUF to add EFI_IP6_HEADER and EFI_UDP_HEADER
   b. Add NET_IP6_PSEUDO_HDR
4) Update Ip4IsUnicast to NetIp4IsUnicast

2. Update the impacted modules to adopt the combined NetLib.

3. Clean up coding style errors in all network drivers and libraries.


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9391 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 9 insertions, 9 deletions

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
index 659f638930..e04ae3a8ae 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
@@ -176,7 +176,7 @@ IcmpErrorListenHandlerDpc (
   }

 

   if (EFI_IP4 (RxData->Header->SourceAddress) != 0 &&

-      !Ip4IsUnicast (EFI_NTOHL (RxData->Header->SourceAddress), 0)) {

+      !NetIp4IsUnicast (EFI_NTOHL (RxData->Header->SourceAddress), 0)) {

     //

     // The source address is not zero and it's not a unicast IP address, discard it.

     //

@@ -1044,11 +1044,11 @@ EfiPxeBcMtftp (
   EFI_PXE_BASE_CODE_MODE  *Mode;

   EFI_MAC_ADDRESS         TempMacAddr;

 

-  if ((This == NULL)                                                       ||

-      (Filename == NULL)                                                   ||

-      (BufferSize == NULL)                                                 ||

-      ((ServerIp == NULL) || !Ip4IsUnicast (NTOHL (ServerIp->Addr[0]), 0)) ||

-      ((BufferPtr == NULL) && DontUseBuffer)                               ||

+  if ((This == NULL)                                                          ||

+      (Filename == NULL)                                                      ||

+      (BufferSize == NULL)                                                    ||

+      ((ServerIp == NULL) || !NetIp4IsUnicast (NTOHL (ServerIp->Addr[0]), 0)) ||

+      ((BufferPtr == NULL) && DontUseBuffer)                                  ||

       ((BlockSize != NULL) && (*BlockSize < 512))) {

 

     return EFI_INVALID_PARAMETER;

@@ -1243,7 +1243,7 @@ EfiPxeBcUdpWrite (
     return EFI_INVALID_PARAMETER;

   }

 

-  if ((GatewayIp != NULL) && !Ip4IsUnicast (NTOHL (GatewayIp->Addr[0]), 0)) {

+  if ((GatewayIp != NULL) && !NetIp4IsUnicast (NTOHL (GatewayIp->Addr[0]), 0)) {

     //

     // Gateway is provided but it's not a unicast IP address.

     //

@@ -1783,7 +1783,7 @@ EfiPxeBcSetIpFilter (
       DEBUG ((EFI_D_ERROR, "There is broadcast address in NewFilter.\n"));

       return EFI_INVALID_PARAMETER;

     }

-    if (Ip4IsUnicast (EFI_IP4 (NewFilter->IpList[Index].v4), 0) &&

+    if (NetIp4IsUnicast (EFI_IP4 (NewFilter->IpList[Index].v4), 0) &&

         (NewFilter->Filters & EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP)

        ) {

       //

@@ -2110,7 +2110,7 @@ EfiPxeBcSetStationIP (
     return EFI_INVALID_PARAMETER;

   }

 

-  if (NewStationIp != NULL && !Ip4IsUnicast (NTOHL (NewStationIp->Addr[0]), 0)) {

+  if (NewStationIp != NULL && !NetIp4IsUnicast (NTOHL (NewStationIp->Addr[0]), 0)) {

     return EFI_INVALID_PARAMETER;

   }