[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

3 files changed, 27 insertions, 33 deletions

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
index 06f0231..229a355 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
@@ -178,7 +178,7 @@ Mtftp4OverrideValid (
   IP4_ADDR                  Gateway;

 

   CopyMem (&Ip, &Override->ServerIp, sizeof (IP4_ADDR));

-  if (!Ip4IsUnicast (NTOHL (Ip), 0)) {

+  if (!NetIp4IsUnicast (NTOHL (Ip), 0)) {

     return FALSE;

   }

 

@@ -194,7 +194,7 @@ Mtftp4OverrideValid (
     Netmask = NTOHL (Netmask);

     Ip      = NTOHL (Ip);

 

-    if (!Ip4IsUnicast (Gateway, Netmask) || !IP4_NET_EQUAL (Gateway, Ip, Netmask)) {

+    if (!NetIp4IsUnicast (Gateway, Netmask) || !IP4_NET_EQUAL (Gateway, Ip, Netmask)) {

       return FALSE;

     }

   }

@@ -653,18 +653,18 @@ EfiMtftp4Configure (
     Gateway  = NTOHL (Gateway);

     ServerIp = NTOHL (ServerIp);

 

-    if (!Ip4IsUnicast (ServerIp, 0)) {

+    if (!NetIp4IsUnicast (ServerIp, 0)) {

       return EFI_INVALID_PARAMETER;

     }

 

     if (!ConfigData->UseDefaultSetting &&

-       ((!IP4_IS_VALID_NETMASK (Netmask) || !Ip4IsUnicast (Ip, Netmask)))) {

+       ((!IP4_IS_VALID_NETMASK (Netmask) || !NetIp4IsUnicast (Ip, Netmask)))) {

 

       return EFI_INVALID_PARAMETER;

     }

 

     if ((Gateway != 0) &&

-        (!IP4_NET_EQUAL (Gateway, Ip, Netmask) || !Ip4IsUnicast (Gateway, Netmask))) {

+        (!IP4_NET_EQUAL (Gateway, Ip, Netmask) || !NetIp4IsUnicast (Gateway, Netmask))) {

 

       return EFI_INVALID_PARAMETER;

     }

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
index d4644c7..a1abf6f 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
@@ -48,20 +48,18 @@ typedef struct _MTFTP4_PROTOCOL MTFTP4_PROTOCOL;
 ///

 /// Some constant value of Mtftp service.

 ///

-typedef enum {

-  MTFTP4_SERVICE_SIGNATURE   = SIGNATURE_32 ('T', 'F', 'T', 'P'),

-  MTFTP4_PROTOCOL_SIGNATURE  = SIGNATURE_32 ('t', 'f', 't', 'p'),

-

-  MTFTP4_DEFAULT_SERVER_PORT = 69,

-  MTFTP4_DEFAULT_TIMEOUT     = 3,

-  MTFTP4_DEFAULT_RETRY       = 5,

-  MTFTP4_DEFAULT_BLKSIZE     = 512,

-  MTFTP4_TIME_TO_GETMAP      = 5,

-

-  MTFTP4_STATE_UNCONFIGED    = 0,

-  MTFTP4_STATE_CONFIGED,

-  MTFTP4_STATE_DESTORY

-} MTFTP4_SERVICE_CONST_VALUE;

+#define MTFTP4_SERVICE_SIGNATURE    SIGNATURE_32 ('T', 'F', 'T', 'P')

+#define MTFTP4_PROTOCOL_SIGNATURE   SIGNATURE_32 ('t', 'f', 't', 'p')

+

+#define MTFTP4_DEFAULT_SERVER_PORT  69

+#define MTFTP4_DEFAULT_TIMEOUT      3

+#define MTFTP4_DEFAULT_RETRY        5

+#define MTFTP4_DEFAULT_BLKSIZE      512

+#define MTFTP4_TIME_TO_GETMAP       5

+

+#define MTFTP4_STATE_UNCONFIGED     0

+#define MTFTP4_STATE_CONFIGED       1

+#define MTFTP4_STATE_DESTORY        2

 

 ///

 /// Mtftp service block

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h
index 3e45010..48687c1 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h
@@ -1,7 +1,7 @@
 /** @file

   Routines to process MTFTP4 options.

   

-Copyright (c) 2006 - 2007, Intel Corporation<BR>

+Copyright (c) 2006 - 2009, Intel Corporation<BR>

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -16,20 +16,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef __EFI_MTFTP4_OPTION_H__

 #define __EFI_MTFTP4_OPTION_H__

 

+#define MTFTP4_SUPPORTED_OPTIONS  4

+#define MTFTP4_OPCODE_LEN         2

+#define MTFTP4_ERRCODE_LEN        2

+#define MTFTP4_BLKNO_LEN          2

+#define MTFTP4_DATA_HEAD_LEN      4

 

-

-typedef enum {

-  MTFTP4_SUPPORTED_OPTIONS = 4,

-  MTFTP4_OPCODE_LEN        = 2,

-  MTFTP4_ERRCODE_LEN       = 2,

-  MTFTP4_BLKNO_LEN         = 2,

-  MTFTP4_DATA_HEAD_LEN     = 4,

-

-  MTFTP4_BLKSIZE_EXIST     = 0x01,

-  MTFTP4_TIMEOUT_EXIST     = 0x02,

-  MTFTP4_TSIZE_EXIST       = 0x04,

-  MTFTP4_MCAST_EXIST       = 0x08

-} MTFTP4_OPTION_CONST_VALUE;

+#define MTFTP4_BLKSIZE_EXIST      0x01

+#define MTFTP4_TIMEOUT_EXIST      0x02

+#define MTFTP4_TSIZE_EXIST        0x04

+#define MTFTP4_MCAST_EXIST        0x08

 

 typedef struct {

   UINT16                    BlkSize;