NetworkPkg: IpSecDxe: Remove the redundant code.

The functions that are never called have been removed.
They are Ikev2OnPacketAccepted, Ikev2SaSessionOnDeleting,
Ikev2ChildSaSessionLookupByMid, Ikev2ChildSaSessionOnDeleting
and Ikev2ChildExchangeRekeySpi.

Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Cc: Siyuan Fu <siyuan.fu@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1064
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Songpeng Li <songpeng.li@intel.com>
Reviewed-by: Jiaxin Wu <jiaxin.wu@intel.com>

diff --git a/NetworkPkg/IpSecDxe/Ikev2/Payload.c b/NetworkPkg/IpSecDxe/Ikev2/Payload.c
index 218c26f9342952930eeef8ce341785ca87f24bd4..1bb5e2e5e53d216dd6cc7d1a86853911ed244903 100644 (file)
--- a/NetworkPkg/IpSecDxe/Ikev2/Payload.c
+++ b/NetworkPkg/IpSecDxe/Ikev2/Payload.c
@@ -3104,24 +3104,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-/**\r
-  Save some useful payloads after accepting the Packet.\r
-\r
-  @param[in] SessionCommon   Pointer to IKEV2_SESSION_COMMON related to the operation.\r
-  @param[in] IkePacket       Pointer to received IkePacet.\r
-  @param[in] IkeType         The type used to indicate it is in IkeSa or ChildSa or Info\r
-                             exchange.\r
-\r
-**/\r
-VOID\r
-Ikev2OnPacketAccepted (\r
-  IN IKEV2_SESSION_COMMON *SessionCommon,\r
-  IN IKE_PACKET           *IkePacket,\r
-  IN UINT8                IkeType\r
-  )\r
-{\r
-  return;\r
-}\r
 \r
 /**\r
 \r

diff --git a/NetworkPkg/IpSecDxe/Ikev2/Utility.c b/NetworkPkg/IpSecDxe/Ikev2/Utility.c
index 698aba1327d2a45c37f1d26615220e52804d003a..0c9c9297057d3573e069f1d6f578575022579a9e 100644 (file)
--- a/NetworkPkg/IpSecDxe/Ikev2/Utility.c
+++ b/NetworkPkg/IpSecDxe/Ikev2/Utility.c
@@ -290,21 +290,6 @@ Ikev2SaSessionRemove (
   return NULL;\r
 }\r
 \r
-/**\r
-  Marking a SA session as on deleting.\r
-\r
-  @param[in]  IkeSaSession  Pointer to IKEV2_SA_SESSION.\r
-\r
-  @retval     EFI_SUCCESS   Find the related SA session and marked it.\r
-\r
-**/\r
-EFI_STATUS\r
-Ikev2SaSessionOnDeleting (\r
-  IN IKEV2_SA_SESSION          *IkeSaSession\r
-  )\r
-{\r
-  return EFI_SUCCESS;\r
-}\r
 \r
 /**\r
   Free specified Seession Common. The session common would belong to a IKE SA or\r
@@ -659,33 +644,6 @@ Ikev2ChildSaSessionReg (
   return ;\r
 }\r
 \r
-/**\r
-  Find the ChildSaSession by it's MessagId.\r
-\r
-  @param[in] SaSessionList  Pointer to a ChildSaSession List.\r
-  @param[in] Mid            The messageId used to search ChildSaSession.\r
-\r
-  @return Pointer to IKEV2_CHILD_SA_SESSION or NULL.\r
-\r
-**/\r
-IKEV2_CHILD_SA_SESSION *\r
-Ikev2ChildSaSessionLookupByMid (\r
-  IN LIST_ENTRY           *SaSessionList,\r
-  IN UINT32               Mid\r
-  )\r
-{\r
-  LIST_ENTRY              *Entry;\r
-  IKEV2_CHILD_SA_SESSION  *ChildSaSession;\r
-\r
-  NET_LIST_FOR_EACH (Entry, SaSessionList) {\r
-    ChildSaSession  = IKEV2_CHILD_SA_SESSION_BY_IKE_SA (Entry);\r
-\r
-    if (ChildSaSession->MessageId == Mid) {\r
-      return ChildSaSession;\r
-    }\r
-  }\r
-  return NULL;\r
-}\r
 \r
 /**\r
   This function find the Child SA by the specified SPI.\r
@@ -776,22 +734,6 @@ Ikev2ChildSaSessionRemove (
   return NULL;\r
 }\r
 \r
-/**\r
-  Mark a specified Child SA Session as on deleting.\r
-\r
-  @param[in]  ChildSaSession   Pointer to IKEV2_CHILD_SA_SESSION.\r
-\r
-  @retval     EFI_SUCCESS      Operation is successful.\r
-\r
-**/\r
-EFI_STATUS\r
-Ikev2ChildSaSessionOnDeleting (\r
-  IN IKEV2_CHILD_SA_SESSION   *ChildSaSession\r
-  )\r
-{\r
-  return EFI_SUCCESS;\r
-}\r
-\r
 /**\r
   Free the memory located for the specified IKEV2_CHILD_SA_SESSION.\r
 \r
@@ -1137,24 +1079,6 @@ Ikev2ChildSaAssociateSpdEntry (
 }\r
 \r
 \r
-/**\r
-  This function finds the SPI from Create Child SA Exchange Packet.\r
-\r
-  @param[in] IkePacket       Pointer to IKE_PACKET to be searched.\r
-\r
-  @retval SPI number or 0 if it is not supported.\r
-\r
-**/\r
-UINT32\r
-Ikev2ChildExchangeRekeySpi (\r
-  IN IKE_PACKET               *IkePacket\r
-  )\r
-{\r
-  //\r
-  // Not support yet.\r
-  //\r
-  return 0;\r
-}\r
 \r
 /**\r
   Validate the IKE header of received IKE packet.\r

diff --git a/NetworkPkg/IpSecDxe/Ikev2/Utility.h b/NetworkPkg/IpSecDxe/Ikev2/Utility.h
index 8383ff8dd63a2cd92db7c7f50e758519d0c45f82..79def7740d21989825de0554185902dfefa3f6a0 100644 (file)
--- a/NetworkPkg/IpSecDxe/Ikev2/Utility.h
+++ b/NetworkPkg/IpSecDxe/Ikev2/Utility.h
@@ -104,19 +104,6 @@ Ikev2SaSessionRemove (
   );\r
 \r
 \r
-/**\r
-  Marking a SA session as on deleting.\r
-\r
-  @param[in]  IkeSaSession  Pointer to IKEV2_SA_SESSION.\r
-\r
-  @retval     EFI_SUCCESS   Find the related SA session and marked it.\r
-\r
-**/\r
-EFI_STATUS\r
-Ikev2SaSessionOnDeleting (\r
-  IN IKEV2_SA_SESSION          *IkeSaSession\r
-  );\r
-\r
 /**\r
   After IKE/Child SA is estiblished, close the time event and free sent packet.\r
 \r
@@ -211,20 +198,6 @@ Ikev2ChildSaSessionLookupBySpi (
   IN UINT32               Spi\r
   );\r
 \r
-/**\r
-  Find the ChildSaSession by it's MessagId.\r
-\r
-  @param[in] SaSessionList  Pointer to a ChildSaSession List.\r
-  @param[in] Mid            The messageId used to search ChildSaSession.\r
-\r
-  @return Pointer to IKEV2_CHILD_SA_SESSION.\r
-\r
-**/\r
-IKEV2_CHILD_SA_SESSION *\r
-Ikev2ChildSaSessionLookupByMid (\r
-  IN LIST_ENTRY           *SaSessionList,\r
-  IN UINT32               Mid\r
-  );\r
 \r
 /**\r
   Insert a Child SA Session into the specified ChildSa list..\r
@@ -257,18 +230,6 @@ Ikev2ChildSaSessionRemove (
   IN UINT8                ListType\r
   );\r
 \r
-/**\r
-  Mark a specified Child SA Session as on deleting.\r
-\r
-  @param[in]  ChildSaSession   Pointer to IKEV2_CHILD_SA_SESSION.\r
-\r
-  @retval     EFI_SUCCESS      Operation is successful.\r
-\r
-**/\r
-EFI_STATUS\r
-Ikev2ChildSaSessionOnDeleting (\r
-  IN IKEV2_CHILD_SA_SESSION   *ChildSaSession\r
-  );\r
 \r
 /**\r
   Free the memory located for the specified IKEV2_CHILD_SA_SESSION.\r
@@ -328,19 +289,6 @@ Ikev2ChildExchangeRequestType(
   IN IKE_PACKET               *IkePacket\r
   );\r
 \r
-/**\r
-  This function finds the SPI from Create Child Sa Exchange Packet.\r
-\r
-  @param[in] IkePacket       Pointer to IKE_PACKET to be searched.\r
-\r
-  @retval SPI number.\r
-\r
-**/\r
-UINT32\r
-Ikev2ChildExchangeRekeySpi(\r
-  IN IKE_PACKET               *IkePacket\r
-  );\r
-\r
 \r
 /**\r
   Associate a SPD selector to the Child SA Session.\r
@@ -882,21 +830,6 @@ Ikev2DecodePacket (
   IN     UINTN                 IkeType\r
   );\r
 \r
-/**\r
-  Save some useful payloads after accepting the Packet.\r
-\r
-  @param[in] SessionCommon   Pointer to IKEV2_SESSION_COMMON related to the operation.\r
-  @param[in] IkePacket       Pointer to received IkePacet.\r
-  @param[in] IkeType         The type used to indicate it is in IkeSa or ChildSa or Info\r
-                             exchange.\r
-\r
-**/\r
-VOID\r
-Ikev2OnPacketAccepted (\r
-  IN IKEV2_SESSION_COMMON *SessionCommon,\r
-  IN IKE_PACKET           *IkePacket,\r
-  IN UINT8                IkeType\r
-  );\r
 \r
 /**\r
   Send out IKEV2 packet.\r