[edk2] [PATCH 2/5] NetworkPkg: IpSecDxe: Remove the redundant code.

Songpeng Li posted 5 patches 5 years, 9 months ago
[edk2] [PATCH 2/5] NetworkPkg: IpSecDxe: Remove the redundant code.
Posted by Songpeng Li 5 years, 9 months ago
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>
---
 NetworkPkg/IpSecDxe/Ikev2/Payload.c | 18 -------
 NetworkPkg/IpSecDxe/Ikev2/Utility.c | 76 -----------------------------
 NetworkPkg/IpSecDxe/Ikev2/Utility.h | 67 -------------------------
 3 files changed, 161 deletions(-)

diff --git a/NetworkPkg/IpSecDxe/Ikev2/Payload.c b/NetworkPkg/IpSecDxe/Ikev2/Payload.c
index 218c26f934..1bb5e2e5e5 100644
--- a/NetworkPkg/IpSecDxe/Ikev2/Payload.c
+++ b/NetworkPkg/IpSecDxe/Ikev2/Payload.c
@@ -3104,24 +3104,6 @@ ON_EXIT:
   return Status;
 }
 
-/**
-  Save some useful payloads after accepting the Packet.
-
-  @param[in] SessionCommon   Pointer to IKEV2_SESSION_COMMON related to the operation.
-  @param[in] IkePacket       Pointer to received IkePacet.
-  @param[in] IkeType         The type used to indicate it is in IkeSa or ChildSa or Info
-                             exchange.
-
-**/
-VOID
-Ikev2OnPacketAccepted (
-  IN IKEV2_SESSION_COMMON *SessionCommon,
-  IN IKE_PACKET           *IkePacket,
-  IN UINT8                IkeType
-  )
-{
-  return;
-}
 
 /**
 
diff --git a/NetworkPkg/IpSecDxe/Ikev2/Utility.c b/NetworkPkg/IpSecDxe/Ikev2/Utility.c
index 698aba1327..0c9c929705 100644
--- a/NetworkPkg/IpSecDxe/Ikev2/Utility.c
+++ b/NetworkPkg/IpSecDxe/Ikev2/Utility.c
@@ -290,21 +290,6 @@ Ikev2SaSessionRemove (
   return NULL;
 }
 
-/**
-  Marking a SA session as on deleting.
-
-  @param[in]  IkeSaSession  Pointer to IKEV2_SA_SESSION.
-
-  @retval     EFI_SUCCESS   Find the related SA session and marked it.
-
-**/
-EFI_STATUS
-Ikev2SaSessionOnDeleting (
-  IN IKEV2_SA_SESSION          *IkeSaSession
-  )
-{
-  return EFI_SUCCESS;
-}
 
 /**
   Free specified Seession Common. The session common would belong to a IKE SA or
@@ -659,33 +644,6 @@ Ikev2ChildSaSessionReg (
   return ;
 }
 
-/**
-  Find the ChildSaSession by it's MessagId.
-
-  @param[in] SaSessionList  Pointer to a ChildSaSession List.
-  @param[in] Mid            The messageId used to search ChildSaSession.
-
-  @return Pointer to IKEV2_CHILD_SA_SESSION or NULL.
-
-**/
-IKEV2_CHILD_SA_SESSION *
-Ikev2ChildSaSessionLookupByMid (
-  IN LIST_ENTRY           *SaSessionList,
-  IN UINT32               Mid
-  )
-{
-  LIST_ENTRY              *Entry;
-  IKEV2_CHILD_SA_SESSION  *ChildSaSession;
-
-  NET_LIST_FOR_EACH (Entry, SaSessionList) {
-    ChildSaSession  = IKEV2_CHILD_SA_SESSION_BY_IKE_SA (Entry);
-
-    if (ChildSaSession->MessageId == Mid) {
-      return ChildSaSession;
-    }
-  }
-  return NULL;
-}
 
 /**
   This function find the Child SA by the specified SPI.
@@ -776,22 +734,6 @@ Ikev2ChildSaSessionRemove (
   return NULL;
 }
 
-/**
-  Mark a specified Child SA Session as on deleting.
-
-  @param[in]  ChildSaSession   Pointer to IKEV2_CHILD_SA_SESSION.
-
-  @retval     EFI_SUCCESS      Operation is successful.
-
-**/
-EFI_STATUS
-Ikev2ChildSaSessionOnDeleting (
-  IN IKEV2_CHILD_SA_SESSION   *ChildSaSession
-  )
-{
-  return EFI_SUCCESS;
-}
-
 /**
   Free the memory located for the specified IKEV2_CHILD_SA_SESSION.
 
@@ -1137,24 +1079,6 @@ Ikev2ChildSaAssociateSpdEntry (
 }
 
 
-/**
-  This function finds the SPI from Create Child SA Exchange Packet.
-
-  @param[in] IkePacket       Pointer to IKE_PACKET to be searched.
-
-  @retval SPI number or 0 if it is not supported.
-
-**/
-UINT32
-Ikev2ChildExchangeRekeySpi (
-  IN IKE_PACKET               *IkePacket
-  )
-{
-  //
-  // Not support yet.
-  //
-  return 0;
-}
 
 /**
   Validate the IKE header of received IKE packet.
diff --git a/NetworkPkg/IpSecDxe/Ikev2/Utility.h b/NetworkPkg/IpSecDxe/Ikev2/Utility.h
index 8383ff8dd6..79def7740d 100644
--- a/NetworkPkg/IpSecDxe/Ikev2/Utility.h
+++ b/NetworkPkg/IpSecDxe/Ikev2/Utility.h
@@ -104,19 +104,6 @@ Ikev2SaSessionRemove (
   );
 
 
-/**
-  Marking a SA session as on deleting.
-
-  @param[in]  IkeSaSession  Pointer to IKEV2_SA_SESSION.
-
-  @retval     EFI_SUCCESS   Find the related SA session and marked it.
-
-**/
-EFI_STATUS
-Ikev2SaSessionOnDeleting (
-  IN IKEV2_SA_SESSION          *IkeSaSession
-  );
-
 /**
   After IKE/Child SA is estiblished, close the time event and free sent packet.
 
@@ -211,20 +198,6 @@ Ikev2ChildSaSessionLookupBySpi (
   IN UINT32               Spi
   );
 
-/**
-  Find the ChildSaSession by it's MessagId.
-
-  @param[in] SaSessionList  Pointer to a ChildSaSession List.
-  @param[in] Mid            The messageId used to search ChildSaSession.
-
-  @return Pointer to IKEV2_CHILD_SA_SESSION.
-
-**/
-IKEV2_CHILD_SA_SESSION *
-Ikev2ChildSaSessionLookupByMid (
-  IN LIST_ENTRY           *SaSessionList,
-  IN UINT32               Mid
-  );
 
 /**
   Insert a Child SA Session into the specified ChildSa list..
@@ -257,18 +230,6 @@ Ikev2ChildSaSessionRemove (
   IN UINT8                ListType
   );
 
-/**
-  Mark a specified Child SA Session as on deleting.
-
-  @param[in]  ChildSaSession   Pointer to IKEV2_CHILD_SA_SESSION.
-
-  @retval     EFI_SUCCESS      Operation is successful.
-
-**/
-EFI_STATUS
-Ikev2ChildSaSessionOnDeleting (
-  IN IKEV2_CHILD_SA_SESSION   *ChildSaSession
-  );
 
 /**
   Free the memory located for the specified IKEV2_CHILD_SA_SESSION.
@@ -328,19 +289,6 @@ Ikev2ChildExchangeRequestType(
   IN IKE_PACKET               *IkePacket
   );
 
-/**
-  This function finds the SPI from Create Child Sa Exchange Packet.
-
-  @param[in] IkePacket       Pointer to IKE_PACKET to be searched.
-
-  @retval SPI number.
-
-**/
-UINT32
-Ikev2ChildExchangeRekeySpi(
-  IN IKE_PACKET               *IkePacket
-  );
-
 
 /**
   Associate a SPD selector to the Child SA Session.
@@ -882,21 +830,6 @@ Ikev2DecodePacket (
   IN     UINTN                 IkeType
   );
 
-/**
-  Save some useful payloads after accepting the Packet.
-
-  @param[in] SessionCommon   Pointer to IKEV2_SESSION_COMMON related to the operation.
-  @param[in] IkePacket       Pointer to received IkePacet.
-  @param[in] IkeType         The type used to indicate it is in IkeSa or ChildSa or Info
-                             exchange.
-
-**/
-VOID
-Ikev2OnPacketAccepted (
-  IN IKEV2_SESSION_COMMON *SessionCommon,
-  IN IKE_PACKET           *IkePacket,
-  IN UINT8                IkeType
-  );
 
 /**
   Send out IKEV2 packet.
-- 
2.18.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel