/** @file\r
- The definition of functions and MACROs used for IPsec debug information print.\r
+ The definition of functions and MACROs used for IPsec debug information printting.\r
\r
Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
\r
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
\r
**/\r
-\r
#ifndef _EFI_IPSEC_DEBUG_H_\r
#define _EFI_IPSEC_DEBUG_H_\r
\r
-#include <Library/DebugLib.h>\r
+#include "IkeCommon.h"\r
+#include "IkePacket.h"\r
\r
#define IPSEC_DUMP_ADDRESS(Level, Ip, Version) IpSecDumpAddress (Level, Ip, Version)\r
-#define IPSEC_DUMP_STATE(Previous, Current) IpSecDumpState (Previous, Current)\r
+#define IKEV1_DUMP_STATE(Previous, Current) IkeDumpState (Previous, Current, 1)\r
+#define IKEV2_DUMP_STATE(Previous, Current) IkeDumpState (Previous, Current, 2)\r
#define IPSEC_DUMP_PACKET(Packet, Direction, IpVersion) IpSecDumpPacket (Packet, Direction, IpVersion)\r
-#define IPSEC_DUMP_PAYLOAD(IkePayload) IpSecDumpPayload (IkePayload)\r
+#define IPSEC_DUMP_PAYLOAD(IkePayload) IpSecDumpPayload (IkePayload, 1)\r
+#define IKEV2_DUMP_PAYLOAD(IkePayload) IpSecDumpPayload (IkePayload, 2)\r
#define IPSEC_DUMP_BUF(Title, Data, DataSize) IpSecDumpBuf (Title, Data, DataSize)\r
\r
#define IPSEC_DEBUG_BYTE_PER_LINE 8\r
+#define IKE_STATE_NUM 7\r
+\r
\r
\r
/**\r
);\r
\r
/**\r
- Print IKEv1 Current states.\r
+ Print IKE Current states.\r
\r
- @param[in] Previous The Previous state of IKEv1.\r
- @param[in] Current The current state of IKEv1.\r
+ @param[in] Previous The Previous state of IKE.\r
+ @param[in] Current The current state of IKE.\r
+ @param[in] IkeVersion The version of IKE.\r
\r
**/\r
VOID\r
-IpSecDumpState (\r
+IkeDumpState (\r
IN UINT32 Previous,\r
- IN UINT32 Current\r
+ IN UINT32 Current, \r
+ IN UINT8 IkeVersion\r
);\r
\r
/**\r
- Print the Ike Packet.\r
+ Print the IKE Packet.\r
\r
@param[in] Packet Point to IKE packet to be printed.\r
@param[in] Direction Point to the IKE packet is inbound or outbound.\r
@param[in] IpVersion Specified IP Version.\r
\r
**/\r
-/*\r
VOID\r
IpSecDumpPacket (\r
IN IKE_PACKET *Packet,\r
IN EFI_IPSEC_TRAFFIC_DIR Direction,\r
IN UINT8 IpVersion\r
);\r
-*/\r
\r
/**\r
Print the IKE Paylolad.\r
\r
- @param[in] IkePayload Points to the payload to be printed.\r
-\r
+ @param[in] IkePayload Point to payload to be printed.\r
+ @param[in] IkeVersion The specified version of IKE.\r
+ \r
**/\r
-/*\r
VOID\r
IpSecDumpPayload (\r
- IN IKE_PAYLOAD *IkePayload\r
+ IN IKE_PAYLOAD *IkePayload,\r
+ IN UINT8 IkeVersion\r
);\r
-*/\r
+\r
/**\r
Print the buffer in form of Hex.\r
\r
@param[in] Title The strings to be printed before the data of the buffer.\r
- @param[in] Data Points to the buffer to be printed.\r
+ @param[in] Data Point to buffer to be printed.\r
@param[in] DataSize The size of the buffer to be printed.\r
\r
**/\r