BaseTools: Fix bug when converting iSCSI node

[mirror_edk2.git] / NetworkPkg / IpSecDxe / IkeCommon.h

diff --git a/NetworkPkg/IpSecDxe/IkeCommon.h b/NetworkPkg/IpSecDxe/IkeCommon.h
index 683264250a22f7e3469dca709fbdf67179d2db8b..eb7e913ee8e458c24cac86c6123e3d56cf176ccd 100644 (file)
--- a/NetworkPkg/IpSecDxe/IkeCommon.h
+++ b/NetworkPkg/IpSecDxe/IkeCommon.h
@@ -1,7 +1,7 @@
 /** @file\r
   Common operation of the IKE.\r
 \r
 /** @file\r
   Common operation of the IKE.\r
 \r

-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>\r

 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r


@@ -18,7 +18,7 @@
 \r
 #include <Protocol/Udp4.h>\r
 #include <Protocol/Udp6.h>\r
 \r
 #include <Protocol/Udp4.h>\r
 #include <Protocol/Udp6.h>\r

-#include <Protocol/Ip4Config.h>\r
+#include <Protocol/Ip4Config2.h>\r

  \r
 #include <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
  \r
 #include <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r


@@ -39,7 +39,7 @@
 #define IKE_DEFAULT_TIMEOUT_INTERVAL  10000 // 10s\r
 #define IKE_NONCE_SIZE                16\r
 #define IKE_MAX_RETRY                 4\r
 #define IKE_DEFAULT_TIMEOUT_INTERVAL  10000 // 10s\r
 #define IKE_NONCE_SIZE                16\r
 #define IKE_MAX_RETRY                 4\r

-#define IKE_SPI_BASE                  0x10000\r
+#define IKE_SPI_BASE                  0x100\r

 #define IKE_PAYLOAD_SIGNATURE         SIGNATURE_32('I','K','E','P')\r
 #define IKE_PAYLOAD_BY_PACKET(a)      CR(a,IKE_PAYLOAD,ByPacket,IKE_PAYLOAD_SIGNATURE)\r
 \r
 #define IKE_PAYLOAD_SIGNATURE         SIGNATURE_32('I','K','E','P')\r
 #define IKE_PAYLOAD_BY_PACKET(a)      CR(a,IKE_PAYLOAD,ByPacket,IKE_PAYLOAD_SIGNATURE)\r
 \r


@@ -130,14 +130,20 @@ IkePayloadFree (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Generate an unused SPI\r
-\r
-  @return a SPI in 4 bytes.\r
+  Generate an new SPI.\r
+  \r
+  @param[in]       IkeSaSession   Pointer to IKEV2_SA_SESSION related to this Child SA \r
+                                  Session.\r
+  @param[in, out]  SpiValue       Pointer to the new generated SPI value. \r
+                              \r
+  @retval EFI_SUCCESS         The operation performs successfully.\r
+  @retval Otherwise           The operation is failed.\r

 \r
 **/\r
 \r
 **/\r

-UINT32\r
+EFI_STATUS\r

 IkeGenerateSpi (\r
 IkeGenerateSpi (\r

-  VOID\r
+  IN     IKEV2_SA_SESSION         *IkeSaSession,\r
+  IN OUT UINT32                   *SpiValue\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -181,7 +187,6 @@ IkeSearchSpdEntry (
   IN EFI_IPSEC_SPD_SELECTOR             *SpdSel\r
   );\r
 \r
   IN EFI_IPSEC_SPD_SELECTOR             *SpdSel\r
   );\r
 \r

-extern EFI_GUID               mZeroGuid;\r

 extern MODP_GROUP             OakleyModpGroup[];\r
 extern IKE_ALG_GUID_INFO      mIPsecEncrAlgInfo[];\r
 extern IKE_ALG_GUID_INFO      mIPsecAuthAlgInfo[];\r
 extern MODP_GROUP             OakleyModpGroup[];\r
 extern IKE_ALG_GUID_INFO      mIPsecEncrAlgInfo[];\r
 extern IKE_ALG_GUID_INFO      mIPsecAuthAlgInfo[];\r