rename struct layer_private to struct layer_internal

5 files changed, 12 insertions, 12 deletions

diff --git a/infra/session_manager/session_manager_rte.c b/infra/session_manager/session_manager_rte.c
index 40beac2..d0c9ebf 100644
--- a/infra/session_manager/session_manager_rte.c
+++ b/infra/session_manager/session_manager_rte.c
@@ -151,7 +151,7 @@ static int tcp_init(struct session_manager_rte *sess_mgr_rte, struct session *se
     return 0;
 }
 
-static void tcp_update(struct session_manager_rte *sess_mgr_rte, struct session *sess, enum flow_type type, const struct layer_private *tcp_layer)
+static void tcp_update(struct session_manager_rte *sess_mgr_rte, struct session *sess, enum flow_type type, const struct layer_internal *tcp_layer)
 {
     struct tcp_segment *seg;
     struct tcphdr *hdr = (struct tcphdr *)tcp_layer->hdr_ptr;
@@ -523,7 +523,7 @@ static struct session *session_manager_rte_lookup_tcp_session(struct session_man
         return NULL;
     }
 
-    const struct layer_private *tcp_layer = packet_get_innermost_layer(pkt, LAYER_PROTO_TCP);
+    const struct layer_internal *tcp_layer = packet_get_innermost_layer(pkt, LAYER_PROTO_TCP);
     const struct tcphdr *hdr = (const struct tcphdr *)tcp_layer->hdr_ptr;
     uint8_t flags = tcp_hdr_get_flags(hdr);
     if ((flags & TH_SYN) == 0)
@@ -554,7 +554,7 @@ static struct session *session_manager_rte_lookup_udp_session(struct session_man
 
 static struct session *session_manager_rte_new_tcp_session(struct session_manager_rte *sess_mgr_rte, const struct packet *pkt, const struct tuple6 *key)
 {
-    const struct layer_private *tcp_layer = packet_get_innermost_layer(pkt, LAYER_PROTO_TCP);
+    const struct layer_internal *tcp_layer = packet_get_innermost_layer(pkt, LAYER_PROTO_TCP);
     const struct tcphdr *hdr = (const struct tcphdr *)tcp_layer->hdr_ptr;
     uint8_t flags = tcp_hdr_get_flags(hdr);
     if (!(flags & TH_SYN))
@@ -645,7 +645,7 @@ static struct session *session_manager_rte_new_udp_session(struct session_manage
 
 static int session_manager_rte_update_tcp_session(struct session_manager_rte *sess_mgr_rte, struct session *sess, const struct packet *pkt, const struct tuple6 *key)
 {
-    const struct layer_private *tcp_layer = packet_get_innermost_layer(pkt, LAYER_PROTO_TCP);
+    const struct layer_internal *tcp_layer = packet_get_innermost_layer(pkt, LAYER_PROTO_TCP);
     const struct tcphdr *hdr = (const struct tcphdr *)tcp_layer->hdr_ptr;
     enum flow_type type = identify_flow_type_by_history(sess, key);
     uint8_t flags = tcp_hdr_get_flags(hdr);
diff --git a/infra/session_manager/test/gtest_state_tcp_active_to_closing.cpp b/infra/session_manager/test/gtest_state_tcp_active_to_closing.cpp
index f84a59f..63aa0c0 100644
--- a/infra/session_manager/test/gtest_state_tcp_active_to_closing.cpp
+++ b/infra/session_manager/test/gtest_state_tcp_active_to_closing.cpp
@@ -151,7 +151,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_C2S_RST)
     memcpy(tcp_pkt_c2s_rst, tcp_pkt9_c2s_fin, sizeof(tcp_pkt9_c2s_fin));
     memset(&pkt, 0, sizeof(pkt));
     packet_parse(&pkt, (const char *)tcp_pkt_c2s_rst, sizeof(tcp_pkt9_c2s_fin));
-    const struct layer_private *tcp_layer = packet_get_innermost_layer(&pkt, LAYER_PROTO_TCP);
+    const struct layer_internal *tcp_layer = packet_get_innermost_layer(&pkt, LAYER_PROTO_TCP);
     EXPECT_TRUE(tcp_layer);
     struct tcphdr *hdr = (struct tcphdr *)tcp_layer->hdr_ptr;
     hdr->th_flags = TH_RST;
@@ -238,7 +238,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_S2C_RST)
     memcpy(tcp_pkt_s2c_rst, tcp_pkt10_s2c_fin, sizeof(tcp_pkt10_s2c_fin));
     memset(&pkt, 0, sizeof(pkt));
     packet_parse(&pkt, (const char *)tcp_pkt_s2c_rst, sizeof(tcp_pkt10_s2c_fin));
-    const struct layer_private *tcp_layer = packet_get_innermost_layer(&pkt, LAYER_PROTO_TCP);
+    const struct layer_internal *tcp_layer = packet_get_innermost_layer(&pkt, LAYER_PROTO_TCP);
     EXPECT_TRUE(tcp_layer);
     struct tcphdr *hdr = (struct tcphdr *)tcp_layer->hdr_ptr;
     hdr->th_flags = TH_RST;
diff --git a/infra/session_manager/test/gtest_state_tcp_init_to_opening.cpp b/infra/session_manager/test/gtest_state_tcp_init_to_opening.cpp
index 3ae89ff..5ea61bb 100644
--- a/infra/session_manager/test/gtest_state_tcp_init_to_opening.cpp
+++ b/infra/session_manager/test/gtest_state_tcp_init_to_opening.cpp
@@ -393,7 +393,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_RETRANSMISSION)
     memcpy(syn_retransmission, tcp_pkt1_c2s_syn, sizeof(tcp_pkt1_c2s_syn));
     memset(&pkt, 0, sizeof(pkt));
     packet_parse(&pkt, (const char *)syn_retransmission, sizeof(tcp_pkt1_c2s_syn));
-    const struct layer_private *ipv4_layer = packet_get_innermost_layer(&pkt, LAYER_PROTO_IPV4);
+    const struct layer_internal *ipv4_layer = packet_get_innermost_layer(&pkt, LAYER_PROTO_IPV4);
     struct ip *hdr = (struct ip *)ipv4_layer->hdr_ptr;
     hdr->ip_id = htons(0x1234);
     printf("<= Packet Parse: done\n\n");
@@ -492,7 +492,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYNACK_RETRANSMISSION)
     memcpy(tcp_pkt_s2c_synack_retransmission, tcp_pkt2_s2c_syn_ack, sizeof(tcp_pkt2_s2c_syn_ack));
     memset(&pkt, 0, sizeof(pkt));
     packet_parse(&pkt, (const char *)tcp_pkt_s2c_synack_retransmission, sizeof(tcp_pkt2_s2c_syn_ack));
-    const struct layer_private *ipv4_layer = packet_get_innermost_layer(&pkt, LAYER_PROTO_IPV4);
+    const struct layer_internal *ipv4_layer = packet_get_innermost_layer(&pkt, LAYER_PROTO_IPV4);
     EXPECT_TRUE(ipv4_layer);
     struct ip *hdr = (struct ip *)ipv4_layer->hdr_ptr;
     hdr->ip_id = htons(0x1234);
diff --git a/infra/session_manager/test/gtest_state_tcp_opening_to_closing.cpp b/infra/session_manager/test/gtest_state_tcp_opening_to_closing.cpp
index 7a28bfd..61d0a4c 100644
--- a/infra/session_manager/test/gtest_state_tcp_opening_to_closing.cpp
+++ b/infra/session_manager/test/gtest_state_tcp_opening_to_closing.cpp
@@ -140,7 +140,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_C2S_RST)
     memcpy(tcp_pkt_c2s_rst, tcp_pkt9_c2s_fin, sizeof(tcp_pkt9_c2s_fin));
     memset(&pkt, 0, sizeof(pkt));
     packet_parse(&pkt, (const char *)tcp_pkt_c2s_rst, sizeof(tcp_pkt9_c2s_fin));
-    const struct layer_private *tcp_layer = packet_get_innermost_layer(&pkt, LAYER_PROTO_TCP);
+    const struct layer_internal *tcp_layer = packet_get_innermost_layer(&pkt, LAYER_PROTO_TCP);
     EXPECT_TRUE(tcp_layer);
     struct tcphdr *hdr = (struct tcphdr *)tcp_layer->hdr_ptr;
     hdr->th_flags = TH_RST;
@@ -237,7 +237,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_S2C_RST)
     memcpy(tcp_pkt_s2c_rst, tcp_pkt10_s2c_fin, sizeof(tcp_pkt10_s2c_fin));
     memset(&pkt, 0, sizeof(pkt));
     packet_parse(&pkt, (const char *)tcp_pkt_s2c_rst, sizeof(tcp_pkt10_s2c_fin));
-    const struct layer_private *tcp_layer = packet_get_innermost_layer(&pkt, LAYER_PROTO_TCP);
+    const struct layer_internal *tcp_layer = packet_get_innermost_layer(&pkt, LAYER_PROTO_TCP);
     EXPECT_TRUE(tcp_layer);
     struct tcphdr *hdr = (struct tcphdr *)tcp_layer->hdr_ptr;
     hdr->th_flags = TH_RST;
diff --git a/infra/session_manager/test/test_utils.h b/infra/session_manager/test/test_utils.h
index 64df5dd..c3ceedb 100644
--- a/infra/session_manager/test/test_utils.h
+++ b/infra/session_manager/test/test_utils.h
@@ -78,7 +78,7 @@ __attribute__((unused)) static struct session_manager_cfg sess_mgr_cfg = {
 
 static inline void packet_overwrite_ipid(struct packet *pkt, uint16_t ip_id)
 {
-    const struct layer_private *ipv4_layer = packet_get_innermost_layer(pkt, LAYER_PROTO_IPV4);
+    const struct layer_internal *ipv4_layer = packet_get_innermost_layer(pkt, LAYER_PROTO_IPV4);
     EXPECT_TRUE(ipv4_layer);
     struct ip *hdr = (struct ip *)ipv4_layer->hdr_ptr;
     hdr->ip_id = htons(ip_id);
@@ -86,7 +86,7 @@ static inline void packet_overwrite_ipid(struct packet *pkt, uint16_t ip_id)
 
 static inline void packet_overwrite_v4_saddr(struct packet *pkt, struct in_addr *addr)
 {
-    const struct layer_private *ipv4_layer = packet_get_innermost_layer(pkt, LAYER_PROTO_IPV4);
+    const struct layer_internal *ipv4_layer = packet_get_innermost_layer(pkt, LAYER_PROTO_IPV4);
     EXPECT_TRUE(ipv4_layer);
     struct ip *hdr = (struct ip *)ipv4_layer->hdr_ptr;
     hdr->ip_src = *addr;