gfwleak/stellar-stellar
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename struct layer_private to struct layer_internal

Browse Source
This commit is contained in:
luwenpeng
2024-10-31 18:30:02 +08:00
parent 159ad20ea5
commit 715f301275
16 changed files with 243 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
infra/ip_reassembly/ip_reassembly.c
View File

@@ -153,7 +153,7 @@ struct ip_reassembly
static int frag_key_init(struct frag_key *key, const struct packet *pkt)
{
memset(key, 0, sizeof(struct frag_key));
const struct layer_private *layer = pkt->frag_layer;
const struct layer_internal *layer = pkt->frag_layer;
if (layer->proto == LAYER_PROTO_IPV4)
{
const struct ip *hdr = (const struct ip *)layer->hdr_ptr;
@@ -183,7 +183,7 @@ static int frag_key_init(struct frag_key *key, const struct packet *pkt)
static void frag_encap_init(struct frag_encap *encap, const struct packet *pkt)
{
struct layer_private *layer = pkt->frag_layer;
struct layer_internal *layer = pkt->frag_layer;
encap->data = (void *)pkt->data_ptr;
encap->len = layer->hdr_offset + layer->hdr_len;
@@ -215,7 +215,7 @@ static void frag_encap_clean(struct frag_encap *encap)
static int frag_init(struct frag *frag, struct packet *pkt)
{
const struct layer_private *layer = pkt->frag_layer;
const struct layer_internal *layer = pkt->frag_layer;
if (layer->proto == LAYER_PROTO_IPV4)
{
const struct ip *hdr = (const struct ip *)layer->hdr_ptr;
@@ -757,8 +757,10 @@ uint64_t ip_reassembly_stat_get(struct ip_reassembly_stat *stat, enum ip_reass_s
{
switch (type)
{
#define XX(_type, _name) case _type: return stat->_name;
IP_REASS_STAT_MAP(XX)
#define XX(_type, _name) \
case _type: \
return stat->_name;
IP_REASS_STAT_MAP(XX)
#undef XX
default:
return 0;

6
infra/ip_reassembly/test/gtest_ipv4_reassembly.cpp
View File

@@ -7,7 +7,7 @@
static inline void packet_overwrite_v4_saddr(struct packet *pkt, uint32_t saddr)
{
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;
ip4_hdr_set_src_addr(hdr, saddr);
@@ -243,7 +243,7 @@ TEST(IPV4_REASSEMBLE, PADDING_ORDER)
struct packet frag_pkt2 = {};
struct packet *frag_pkt = NULL;
struct packet *defrag_pkt = NULL;
const struct layer_private *layer;
const struct layer_internal *layer;
struct ip_reassembly *ip_reass;
struct ip_reassembly_stat *curr_stat;
struct ip_reassembly_stat expect_stat;
@@ -360,7 +360,7 @@ TEST(IPV4_REASSEMBLE, PADDING_UNORDER)
struct packet frag_pkt2 = {};
struct packet *frag_pkt = NULL;
struct packet *defrag_pkt = NULL;
const struct layer_private *layer;
const struct layer_internal *layer;
struct ip_reassembly *ip_reass;
struct ip_reassembly_stat *curr_stat;
struct ip_reassembly_stat expect_stat;

6
infra/ip_reassembly/test/gtest_ipv6_reassembly.cpp
View File

@@ -7,7 +7,7 @@
static inline void packet_overwrite_v6_saddr(struct packet *pkt, struct in6_addr saddr)
{
const struct layer_private *ipv6_layer = packet_get_innermost_layer(pkt, LAYER_PROTO_IPV6);
const struct layer_internal *ipv6_layer = packet_get_innermost_layer(pkt, LAYER_PROTO_IPV6);
EXPECT_TRUE(ipv6_layer);
struct ip6_hdr *hdr = (struct ip6_hdr *)ipv6_layer->hdr_ptr;
ip6_hdr_set_src_in6_addr(hdr, saddr);
@@ -15,7 +15,7 @@ static inline void packet_overwrite_v6_saddr(struct packet *pkt, struct in6_addr
static inline void packet_overwrite_v6_frag_offset(struct packet *pkt, uint16_t offset)
{
const struct layer_private *ipv6_layer = packet_get_innermost_layer(pkt, LAYER_PROTO_IPV6);
const struct layer_internal *ipv6_layer = packet_get_innermost_layer(pkt, LAYER_PROTO_IPV6);
EXPECT_TRUE(ipv6_layer);
struct ip6_hdr *hdr = (struct ip6_hdr *)ipv6_layer->hdr_ptr;
struct ip6_frag *frag_hdr = ip6_hdr_get_frag_ext(hdr);
@@ -666,7 +666,7 @@ TEST(IPV6_REASSEMBLE, NORMAL)
struct packet frag_pkt4 = {};
struct packet *frag_pkt = NULL;
struct packet *defrag_pkt = NULL;
const struct layer_private *layer;
const struct layer_internal *layer;
struct ip_reassembly *ip_reass;
struct ip_reassembly_stat *curr_stat;
struct ip_reassembly_stat expect_stat;

14
infra/packet_manager/packet_builder.c
View File

@@ -141,14 +141,14 @@ static void calculate_length_and_checksum(const struct packet *origin_pkt, int l
struct gtp2_hdr *gtp2 = NULL;
struct gre0_hdr *gre0 = NULL;
struct gre1_hdr *gre1 = NULL;
struct layer_private *curr_layer = NULL;
struct layer_private *last_layer = NULL;
struct layer_internal *curr_layer = NULL;
struct layer_internal *last_layer = NULL;
struct fingerprint finger = {};
calc_packet_fingerprint(&finger);
for (int i = layer_count - 1; i >= 0; i--)
{
curr_layer = (struct layer_private *)packet_get_layer(origin_pkt, i);
last_layer = (struct layer_private *)packet_get_layer(origin_pkt, i + 1);
curr_layer = (struct layer_internal *)packet_get_layer(origin_pkt, i);
last_layer = (struct layer_internal *)packet_get_layer(origin_pkt, i + 1);
curr_hdr_ptr = new_pkt_data + curr_layer->hdr_offset;
last_hdr_ptr = last_layer ? new_pkt_data + last_layer->hdr_offset : NULL;
switch (curr_layer->proto)
@@ -261,7 +261,7 @@ struct packet *packet_build_tcp(const struct packet *origin_pkt, uint32_t tcp_se
// check the innermost layer of the original packet
int layer_count = packet_get_layer_count(origin_pkt);
const struct layer_private *tcp_layer = packet_get_layer(origin_pkt, layer_count - 1);
const struct layer_internal *tcp_layer = packet_get_layer(origin_pkt, layer_count - 1);
if (tcp_layer == NULL || tcp_layer->proto != LAYER_PROTO_TCP)
{
PACKET_BUILD_LOG_ERROR("build TCP packet failed, the innermost layer of the original packet is not TCP");
@@ -320,7 +320,7 @@ struct packet *packet_build_udp(const struct packet *origin_pkt, const char *udp
// check the innermost layer of the original packet
int layer_count = packet_get_layer_count(origin_pkt);
const struct layer_private *udp_layer = packet_get_layer(origin_pkt, layer_count - 1);
const struct layer_internal *udp_layer = packet_get_layer(origin_pkt, layer_count - 1);
if (udp_layer == NULL || udp_layer->proto != LAYER_PROTO_UDP)
{
PACKET_BUILD_LOG_ERROR("build UDP packet failed, the innermost layer of the original packet is not UDP");
@@ -369,7 +369,7 @@ struct packet *packet_build_l3(const struct packet *origin_pkt, uint8_t ip_proto
int i = 0;
int layers = packet_get_layer_count(origin_pkt);
const struct layer_private *l3_layer = NULL;
const struct layer_internal *l3_layer = NULL;
for (i = layers - 1; i >= 0; i--)
{
l3_layer = packet_get_layer(origin_pkt, i);

2
infra/packet_manager/packet_dump.c
View File

@@ -84,7 +84,7 @@ int packet_dump_str(const struct packet *pkt, char *buff, int size)
pkt->layers_used, pkt->layers_size);
for (uint8_t i = 0; i < pkt->layers_used; i++)
{
const struct layer_private *layer = &pkt->layers[i];
const struct layer_internal *layer = &pkt->layers[i];
used += snprintf(buff + used, size - used, "layer[%u]: %p, proto: %s, header: {offset: %u, ptr: %p, len: %u}, payload: {ptr: %p, len: %u}\n",
i, layer, layer_proto_to_str(layer->proto), layer->hdr_offset,
layer->hdr_ptr, layer->hdr_len, layer->pld_ptr, layer->pld_len);

6
infra/packet_manager/packet_filter.c
View File

@@ -30,9 +30,9 @@ struct packet_filter
// reutrn -1: error
static inline int packet_key_get(const struct packet *packet, struct packet_key *key)
{
const struct layer_private *ip_layer = packet_get_innermost_layer(packet, LAYER_PROTO_IPV4);
const struct layer_private *tcp_layer = packet_get_innermost_layer(packet, LAYER_PROTO_TCP);
const struct layer_private *udp_layer = packet_get_innermost_layer(packet, LAYER_PROTO_UDP);
const struct layer_internal *ip_layer = packet_get_innermost_layer(packet, LAYER_PROTO_IPV4);
const struct layer_internal *tcp_layer = packet_get_innermost_layer(packet, LAYER_PROTO_TCP);
const struct layer_internal *udp_layer = packet_get_innermost_layer(packet, LAYER_PROTO_UDP);
if (ip_layer == NULL || (tcp_layer == NULL && udp_layer == NULL))
{
return -1;

12
infra/packet_manager/packet_internal.h
View File

@@ -55,7 +55,7 @@ struct packet_origin
int thr_idx;
};
struct layer_private
struct layer_internal
{
enum layer_proto proto;
@@ -73,8 +73,8 @@ TAILQ_HEAD(packet_queue, packet);
struct packet
{
void *user_data;
struct layer_private layers[PACKET_MAX_LAYERS];
struct layer_private *frag_layer; // fragment layer
struct layer_internal layers[PACKET_MAX_LAYERS];
struct layer_internal *frag_layer; // fragment layer
int8_t layers_used;
int8_t layers_size;
int8_t need_free;
@@ -158,9 +158,9 @@ int packet_get_outermost_tuple6(const struct packet *pkt, struct tuple6 *tuple);
* layer uitls
******************************************************************************/
const struct layer_private *packet_get_layer(const struct packet *pkt, int idx);
const struct layer_private *packet_get_innermost_layer(const struct packet *pkt, enum layer_proto proto);
const struct layer_private *packet_get_outermost_layer(const struct packet *pkt, enum layer_proto proto);
const struct layer_internal *packet_get_layer(const struct packet *pkt, int idx);
const struct layer_internal *packet_get_innermost_layer(const struct packet *pkt, enum layer_proto proto);
const struct layer_internal *packet_get_outermost_layer(const struct packet *pkt, enum layer_proto proto);
/******************************************************************************
* load balance uitls

46
infra/packet_manager/packet_parser.c
View File

@@ -41,7 +41,7 @@
* Static API
******************************************************************************/
static inline struct layer_private *get_free_layer(struct packet *pkt);
static inline struct layer_internal *get_free_layer(struct packet *pkt);
// 数据链路层
static inline const char *parse_ether(struct packet *pkt, const char *data, uint16_t len);
@@ -78,7 +78,7 @@ static inline const char *parse_l4(struct packet *pkt, uint8_t next_proto, const
* Private API -- Utils
******************************************************************************/
static inline struct layer_private *get_free_layer(struct packet *pkt)
static inline struct layer_internal *get_free_layer(struct packet *pkt)
{
if (pkt->layers_used >= pkt->layers_size)
{
@@ -115,7 +115,7 @@ static inline const char *parse_ether(struct packet *pkt, const char *data, uint
return data;
}
struct layer_private *layer = get_free_layer(pkt);
struct layer_internal *layer = get_free_layer(pkt);
if (unlikely(layer == NULL))
{
return data;
@@ -143,7 +143,7 @@ static inline const char *parse_pweth(struct packet *pkt, const char *data, uint
return data;
}
struct layer_private *layer = get_free_layer(pkt);
struct layer_internal *layer = get_free_layer(pkt);
if (unlikely(layer == NULL))
{
return data;
@@ -214,7 +214,7 @@ static inline const char *parse_ppp(struct packet *pkt, const char *data, uint16
uint16_t hdr_len = 0;
uint16_t next_proto = 0;
struct layer_private *layer = NULL;
struct layer_internal *layer = NULL;
// ppp header 1 byte
next_proto = *((uint8_t *)data);
@@ -264,7 +264,7 @@ static inline const char *parse_l2tpv2_over_udp(struct packet *pkt, const char *
return data;
}
struct layer_private *layer = get_free_layer(pkt);
struct layer_internal *layer = get_free_layer(pkt);
if (unlikely(layer == NULL))
{
return data;
@@ -292,7 +292,7 @@ static inline const char *parse_l2tpv3_over_udp(struct packet *pkt, const char *
return data;
}
struct layer_private *layer = get_free_layer(pkt);
struct layer_internal *layer = get_free_layer(pkt);
if (unlikely(layer == NULL))
{
return data;
@@ -321,7 +321,7 @@ static inline const char *parse_l2tpv3_over_ip(struct packet *pkt, const char *d
return data;
}
struct layer_private *layer = get_free_layer(pkt);
struct layer_internal *layer = get_free_layer(pkt);
if (unlikely(layer == NULL))
{
return data;
@@ -349,7 +349,7 @@ static inline const char *parse_vlan(struct packet *pkt, const char *data, uint1
return data;
}
struct layer_private *layer = get_free_layer(pkt);
struct layer_internal *layer = get_free_layer(pkt);
if (unlikely(layer == NULL))
{
return data;
@@ -368,7 +368,7 @@ static inline const char *parse_pppoe_ses(struct packet *pkt, const char *data,
return data;
}
struct layer_private *layer = get_free_layer(pkt);
struct layer_internal *layer = get_free_layer(pkt);
if (unlikely(layer == NULL))
{
return data;
@@ -386,7 +386,7 @@ static inline const char *parse_mpls(struct packet *pkt, const char *data, uint1
return data;
}
struct layer_private *layer = get_free_layer(pkt);
struct layer_internal *layer = get_free_layer(pkt);
if (unlikely(layer == NULL))
{
return data;
@@ -435,7 +435,7 @@ static inline const char *parse_ipv4(struct packet *pkt, const char *data, uint1
return data;
}
struct layer_private *layer = get_free_layer(pkt);
struct layer_internal *layer = get_free_layer(pkt);
if (unlikely(layer == NULL))
{
return data;
@@ -509,7 +509,7 @@ static inline const char *parse_ipv6(struct packet *pkt, const char *data, uint1
return data;
}
struct layer_private *layer = get_free_layer(pkt);
struct layer_internal *layer = get_free_layer(pkt);
if (unlikely(layer == NULL))
{
return data;
@@ -621,7 +621,7 @@ static inline const char *parse_auth(struct packet *pkt, const char *data, uint1
return data;
}
struct layer_private *layer = get_free_layer(pkt);
struct layer_internal *layer = get_free_layer(pkt);
if (unlikely(layer == NULL))
{
return data;
@@ -640,7 +640,7 @@ static inline const char *parse_gre(struct packet *pkt, const char *data, uint16
return data;
}
struct layer_private *layer = get_free_layer(pkt);
struct layer_internal *layer = get_free_layer(pkt);
if (unlikely(layer == NULL))
{
return data;
@@ -659,7 +659,7 @@ static inline const char *parse_udp(struct packet *pkt, const char *data, uint16
return data;
}
struct layer_private *layer = get_free_layer(pkt);
struct layer_internal *layer = get_free_layer(pkt);
if (unlikely(layer == NULL))
{
return data;
@@ -733,7 +733,7 @@ static inline const char *parse_tcp(struct packet *pkt, const char *data, uint16
return data;
}
struct layer_private *layer = get_free_layer(pkt);
struct layer_internal *layer = get_free_layer(pkt);
if (unlikely(layer == NULL))
{
return data;
@@ -757,7 +757,7 @@ static inline const char *parse_icmp(struct packet *pkt, const char *data, uint1
return data;
}
struct layer_private *layer = get_free_layer(pkt);
struct layer_internal *layer = get_free_layer(pkt);
if (unlikely(layer == NULL))
{
return data;
@@ -775,7 +775,7 @@ static inline const char *parse_icmp6(struct packet *pkt, const char *data, uint
return data;
}
struct layer_private *layer = get_free_layer(pkt);
struct layer_internal *layer = get_free_layer(pkt);
if (unlikely(layer == NULL))
{
return data;
@@ -793,7 +793,7 @@ static inline const char *parse_vxlan(struct packet *pkt, const char *data, uint
return data;
}
struct layer_private *layer = get_free_layer(pkt);
struct layer_internal *layer = get_free_layer(pkt);
if (unlikely(layer == NULL))
{
return data;
@@ -822,7 +822,7 @@ static inline const char *parse_gtp_u(struct packet *pkt, const char *data, uint
if (hdr_len == len)
{
// only GTP-U header, no payload
struct layer_private *layer = get_free_layer(pkt);
struct layer_internal *layer = get_free_layer(pkt);
if (unlikely(layer == NULL))
{
return data;
@@ -839,7 +839,7 @@ static inline const char *parse_gtp_u(struct packet *pkt, const char *data, uint
return data;
}
struct layer_private *layer = get_free_layer(pkt);
struct layer_internal *layer = get_free_layer(pkt);
if (unlikely(layer == NULL))
{
return data;
@@ -869,7 +869,7 @@ static inline const char *parse_gtp_c(struct packet *pkt, const char *data, uint
return data;
}
struct layer_private *layer = get_free_layer(pkt);
struct layer_internal *layer = get_free_layer(pkt);
if (unlikely(layer == NULL))
{
return data;

70
infra/packet_manager/packet_utils.c
View File

@@ -164,7 +164,7 @@ void *packet_get_user_data(struct packet *pkt)
int packet_get_innermost_tuple2(const struct packet *pkt, struct tuple2 *tuple)
{
memset(tuple, 0, sizeof(struct tuple2));
const struct layer_private *layer = NULL;
const struct layer_internal *layer = NULL;
for (int8_t i = pkt->layers_used - 1; i >= 0; i--)
{
@@ -196,7 +196,7 @@ int packet_get_innermost_tuple2(const struct packet *pkt, struct tuple2 *tuple)
int packet_get_outermost_tuple2(const struct packet *pkt, struct tuple2 *tuple)
{
memset(tuple, 0, sizeof(struct tuple2));
const struct layer_private *layer = NULL;
const struct layer_internal *layer = NULL;
for (int8_t i = 0; i < pkt->layers_used; i++)
{
@@ -228,9 +228,9 @@ int packet_get_outermost_tuple2(const struct packet *pkt, struct tuple2 *tuple)
int packet_get_innermost_tuple4(const struct packet *pkt, struct tuple4 *tuple)
{
memset(tuple, 0, sizeof(struct tuple4));
const struct layer_private *layer_l3 = NULL;
const struct layer_private *layer_l4 = NULL;
const struct layer_private *layer = NULL;
const struct layer_internal *layer_l3 = NULL;
const struct layer_internal *layer_l4 = NULL;
const struct layer_internal *layer = NULL;
for (int8_t i = pkt->layers_used - 1; i >= 0; i--)
{
@@ -290,9 +290,9 @@ int packet_get_innermost_tuple4(const struct packet *pkt, struct tuple4 *tuple)
int packet_get_outermost_tuple4(const struct packet *pkt, struct tuple4 *tuple)
{
memset(tuple, 0, sizeof(struct tuple4));
const struct layer_private *layer_l3 = NULL;
const struct layer_private *layer_l4 = NULL;
const struct layer_private *layer = NULL;
const struct layer_internal *layer_l3 = NULL;
const struct layer_internal *layer_l4 = NULL;
const struct layer_internal *layer = NULL;
for (int8_t i = 0; i < pkt->layers_used; i++)
{
@@ -352,9 +352,9 @@ int packet_get_outermost_tuple4(const struct packet *pkt, struct tuple4 *tuple)
int packet_get_innermost_tuple6(const struct packet *pkt, struct tuple6 *tuple)
{
memset(tuple, 0, sizeof(struct tuple6));
const struct layer_private *layer_l3 = NULL;
const struct layer_private *layer_l4 = NULL;
const struct layer_private *layer = NULL;
const struct layer_internal *layer_l3 = NULL;
const struct layer_internal *layer_l4 = NULL;
const struct layer_internal *layer = NULL;
for (int8_t i = pkt->layers_used - 1; i >= 0; i--)
{
@@ -417,9 +417,9 @@ int packet_get_innermost_tuple6(const struct packet *pkt, struct tuple6 *tuple)
int packet_get_outermost_tuple6(const struct packet *pkt, struct tuple6 *tuple)
{
memset(tuple, 0, sizeof(struct tuple6));
const struct layer_private *layer_l3 = NULL;
const struct layer_private *layer_l4 = NULL;
const struct layer_private *layer = NULL;
const struct layer_internal *layer_l3 = NULL;
const struct layer_internal *layer_l4 = NULL;
const struct layer_internal *layer = NULL;
for (int8_t i = 0; i < pkt->layers_used; i++)
{
@@ -488,7 +488,7 @@ int packet_get_layer_count(const struct packet *pkt)
const struct layer *packet_get_layer_by_idx(const struct packet *pkt, int idx)
{
const struct layer_private *layer = packet_get_layer(pkt, idx);
const struct layer_internal *layer = packet_get_layer(pkt, idx);
if (layer == NULL)
{
return NULL;
@@ -499,7 +499,7 @@ const struct layer *packet_get_layer_by_idx(const struct packet *pkt, int idx)
}
}
const struct layer_private *packet_get_layer(const struct packet *pkt, int idx)
const struct layer_internal *packet_get_layer(const struct packet *pkt, int idx)
{
if (idx < 0 || idx >= pkt->layers_used)
{
@@ -508,9 +508,9 @@ const struct layer_private *packet_get_layer(const struct packet *pkt, int idx)
return &pkt->layers[idx];
}
const struct layer_private *packet_get_innermost_layer(const struct packet *pkt, enum layer_proto proto)
const struct layer_internal *packet_get_innermost_layer(const struct packet *pkt, enum layer_proto proto)
{
const struct layer_private *layer = NULL;
const struct layer_internal *layer = NULL;
for (int8_t i = pkt->layers_used - 1; i >= 0; i--)
{
@@ -524,9 +524,9 @@ const struct layer_private *packet_get_innermost_layer(const struct packet *pkt,
return NULL;
}
const struct layer_private *packet_get_outermost_layer(const struct packet *pkt, enum layer_proto proto)
const struct layer_internal *packet_get_outermost_layer(const struct packet *pkt, enum layer_proto proto)
{
const struct layer_private *layer = NULL;
const struct layer_internal *layer = NULL;
for (int8_t i = 0; i < pkt->layers_used; i++)
{
@@ -548,10 +548,10 @@ struct tunnel_detector
{
enum tunnel_type type;
int contain_layers;
int (*identify_func)(const struct layer_private *curr, const struct layer_private *next1, const struct layer_private *next2);
int (*identify_func)(const struct layer_internal *curr, const struct layer_internal *next1, const struct layer_internal *next2);
};
static int is_ipv4_tunnel(const struct layer_private *curr, const struct layer_private *next1, const struct layer_private *next2 __attribute__((unused)))
static int is_ipv4_tunnel(const struct layer_internal *curr, const struct layer_internal *next1, const struct layer_internal *next2 __attribute__((unused)))
{
if (curr && curr->proto == LAYER_PROTO_IPV4 &&
next1 && (next1->proto == LAYER_PROTO_IPV4 || next1->proto == LAYER_PROTO_IPV6))
@@ -562,7 +562,7 @@ static int is_ipv4_tunnel(const struct layer_private *curr, const struct layer_p
return 0;
}
static int is_ipv6_tunnel(const struct layer_private *curr, const struct layer_private *next1, const struct layer_private *next2 __attribute__((unused)))
static int is_ipv6_tunnel(const struct layer_internal *curr, const struct layer_internal *next1, const struct layer_internal *next2 __attribute__((unused)))
{
if (curr && curr->proto == LAYER_PROTO_IPV6 &&
next1 && (next1->proto == LAYER_PROTO_IPV4 || next1->proto == LAYER_PROTO_IPV6))
@@ -573,7 +573,7 @@ static int is_ipv6_tunnel(const struct layer_private *curr, const struct layer_p
return 0;
}
static int is_gre_tunnel(const struct layer_private *curr, const struct layer_private *next1, const struct layer_private *next2 __attribute__((unused)))
static int is_gre_tunnel(const struct layer_internal *curr, const struct layer_internal *next1, const struct layer_internal *next2 __attribute__((unused)))
{
if (curr && (curr->proto == LAYER_PROTO_IPV4 || curr->proto == LAYER_PROTO_IPV6) &&
next1 && next1->proto == LAYER_PROTO_GRE)
@@ -584,7 +584,7 @@ static int is_gre_tunnel(const struct layer_private *curr, const struct layer_pr
return 0;
}
static int is_gtp_tunnel(const struct layer_private *curr, const struct layer_private *next1, const struct layer_private *next2)
static int is_gtp_tunnel(const struct layer_internal *curr, const struct layer_internal *next1, const struct layer_internal *next2)
{
if (curr && (curr->proto == LAYER_PROTO_IPV4 || curr->proto == LAYER_PROTO_IPV6) &&
next1 && next1->proto == LAYER_PROTO_UDP &&
@@ -596,7 +596,7 @@ static int is_gtp_tunnel(const struct layer_private *curr, const struct layer_pr
return 0;
}
static int is_vxlan_tunnel(const struct layer_private *curr, const struct layer_private *next1, const struct layer_private *next2)
static int is_vxlan_tunnel(const struct layer_internal *curr, const struct layer_internal *next1, const struct layer_internal *next2)
{
if (curr && (curr->proto == LAYER_PROTO_IPV4 || curr->proto == LAYER_PROTO_IPV6) &&
next1 && next1->proto == LAYER_PROTO_UDP &&
@@ -608,7 +608,7 @@ static int is_vxlan_tunnel(const struct layer_private *curr, const struct layer_
return 0;
}
static int is_l2tp_tunnel(const struct layer_private *curr, const struct layer_private *next1, const struct layer_private *next2)
static int is_l2tp_tunnel(const struct layer_internal *curr, const struct layer_internal *next1, const struct layer_internal *next2)
{
if (curr && (curr->proto == LAYER_PROTO_IPV4 || curr->proto == LAYER_PROTO_IPV6) &&
next1 && next1->proto == LAYER_PROTO_UDP &&
@@ -620,7 +620,7 @@ static int is_l2tp_tunnel(const struct layer_private *curr, const struct layer_p
return 0;
}
static int is_teredo_tunnel(const struct layer_private *curr, const struct layer_private *next1, const struct layer_private *next2)
static int is_teredo_tunnel(const struct layer_internal *curr, const struct layer_internal *next1, const struct layer_internal *next2)
{
if (curr && curr->proto == LAYER_PROTO_IPV4 &&
next1 && next1->proto == LAYER_PROTO_UDP &&
@@ -643,7 +643,7 @@ static struct tunnel_detector detectors[] = {
};
// return index of detectors
static int detect_tunnel(const struct layer_private *curr, const struct layer_private *next1, const struct layer_private *next2)
static int detect_tunnel(const struct layer_internal *curr, const struct layer_internal *next1, const struct layer_internal *next2)
{
for (int i = 0; i < (int)(sizeof(detectors) / sizeof(detectors[0])); i++)
{
@@ -660,9 +660,9 @@ int packet_get_tunnel_count(const struct packet *pkt)
{
int count = 0;
int used = packet_get_layer_count(pkt);
const struct layer_private *curr = NULL;
const struct layer_private *next1 = NULL;
const struct layer_private *next2 = NULL;
const struct layer_internal *curr = NULL;
const struct layer_internal *next1 = NULL;
const struct layer_internal *next2 = NULL;
for (int i = 0; i < used; i++)
{
@@ -685,9 +685,9 @@ int packet_get_tunnel_by_idx(const struct packet *pkt, int idx, struct tunnel *o
int ret = -1;
int count = 0;
int used = packet_get_layer_count(pkt);
const struct layer_private *curr = NULL;
const struct layer_private *next1 = NULL;
const struct layer_private *next2 = NULL;
const struct layer_internal *curr = NULL;
const struct layer_internal *next1 = NULL;
const struct layer_internal *next2 = NULL;
memset(out, 0, sizeof(struct tunnel));
for (int i = 0; i < used; i++)

284
infra/packet_manager/test/gtest_packet_parser.cpp
View File

@@ -93,8 +93,8 @@ TEST(PACKET_PARSE, ETH_VLAN_VLAN_IP4_IP4_UDP)
******************************************************/
// LAYER_PROTO_ETHER
const struct layer_private *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_private *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
EXPECT_TRUE(outer_eth_record != nullptr);
EXPECT_TRUE(inner_eth_record != nullptr);
@@ -104,8 +104,8 @@ TEST(PACKET_PARSE, ETH_VLAN_VLAN_IP4_IP4_UDP)
EXPECT_TRUE(outer_eth_record->pld_len == 156);
// LAYER_PROTO_VLAN
const struct layer_private *outer_vlan_record = packet_get_outermost_layer(&handler, LAYER_PROTO_VLAN);
const struct layer_private *inner_vlan_record = packet_get_innermost_layer(&handler, LAYER_PROTO_VLAN);
const struct layer_internal *outer_vlan_record = packet_get_outermost_layer(&handler, LAYER_PROTO_VLAN);
const struct layer_internal *inner_vlan_record = packet_get_innermost_layer(&handler, LAYER_PROTO_VLAN);
EXPECT_TRUE(outer_vlan_record != nullptr);
EXPECT_TRUE(inner_vlan_record != nullptr);
@@ -117,8 +117,8 @@ TEST(PACKET_PARSE, ETH_VLAN_VLAN_IP4_IP4_UDP)
EXPECT_TRUE(inner_vlan_record->pld_len == 148);
// LAYER_PROTO_IPV4
const struct layer_private *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_private *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
EXPECT_TRUE(outer_ipv4_record != nullptr);
EXPECT_TRUE(inner_ipv4_record != nullptr);
@@ -130,8 +130,8 @@ TEST(PACKET_PARSE, ETH_VLAN_VLAN_IP4_IP4_UDP)
EXPECT_TRUE(inner_ipv4_record->pld_len == 108);
// LAYER_PROTO_UDP
const struct layer_private *outer_udp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_UDP);
const struct layer_private *inner_udp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_UDP);
const struct layer_internal *outer_udp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_UDP);
const struct layer_internal *inner_udp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_UDP);
EXPECT_TRUE(outer_udp_record != nullptr);
EXPECT_TRUE(inner_udp_record != nullptr);
@@ -297,8 +297,8 @@ TEST(PACKET_PARSE, ETH_IP6_IP4_TCP_SSH)
******************************************************/
// LAYER_PROTO_ETHER
const struct layer_private *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_private *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
EXPECT_TRUE(outer_eth_record != nullptr);
EXPECT_TRUE(inner_eth_record != nullptr);
@@ -308,8 +308,8 @@ TEST(PACKET_PARSE, ETH_IP6_IP4_TCP_SSH)
EXPECT_TRUE(outer_eth_record->pld_len == 712);
// LAYER_PROTO_IPV6
const struct layer_private *outer_ipv6_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV6);
const struct layer_private *inner_ipv6_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV6);
const struct layer_internal *outer_ipv6_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV6);
const struct layer_internal *inner_ipv6_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV6);
EXPECT_TRUE(outer_ipv6_record != nullptr);
EXPECT_TRUE(inner_ipv6_record != nullptr);
@@ -319,8 +319,8 @@ TEST(PACKET_PARSE, ETH_IP6_IP4_TCP_SSH)
EXPECT_TRUE(outer_ipv6_record->pld_len == 672);
// LAYER_PROTO_IPV4
const struct layer_private *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_private *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
EXPECT_TRUE(outer_ipv4_record != nullptr);
EXPECT_TRUE(inner_ipv4_record != nullptr);
@@ -330,8 +330,8 @@ TEST(PACKET_PARSE, ETH_IP6_IP4_TCP_SSH)
EXPECT_TRUE(outer_ipv4_record->pld_len == 652);
// LAYER_PROTO_TCP
const struct layer_private *outer_tcp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_TCP);
const struct layer_private *inner_tcp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_TCP);
const struct layer_internal *outer_tcp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_TCP);
const struct layer_internal *inner_tcp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_TCP);
EXPECT_TRUE(outer_tcp_record != nullptr);
EXPECT_TRUE(inner_tcp_record != nullptr);
@@ -490,8 +490,8 @@ TEST(PACKET_PARSE, ETH_VLAN_IP6_IP4_GRE_PPP_IP4_UDP_DNS)
******************************************************/
// LAYER_PROTO_ETHER
const struct layer_private *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_private *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
EXPECT_TRUE(outer_eth_record != nullptr);
EXPECT_TRUE(inner_eth_record != nullptr);
@@ -501,8 +501,8 @@ TEST(PACKET_PARSE, ETH_VLAN_IP6_IP4_GRE_PPP_IP4_UDP_DNS)
EXPECT_TRUE(outer_eth_record->pld_len == 258);
// LAYER_PROTO_VLAN
const struct layer_private *outer_vlan_record = packet_get_outermost_layer(&handler, LAYER_PROTO_VLAN);
const struct layer_private *inner_vlan_record = packet_get_innermost_layer(&handler, LAYER_PROTO_VLAN);
const struct layer_internal *outer_vlan_record = packet_get_outermost_layer(&handler, LAYER_PROTO_VLAN);
const struct layer_internal *inner_vlan_record = packet_get_innermost_layer(&handler, LAYER_PROTO_VLAN);
EXPECT_TRUE(outer_vlan_record != nullptr);
EXPECT_TRUE(inner_vlan_record != nullptr);
@@ -512,8 +512,8 @@ TEST(PACKET_PARSE, ETH_VLAN_IP6_IP4_GRE_PPP_IP4_UDP_DNS)
EXPECT_TRUE(outer_vlan_record->pld_len == 254);
// LAYER_PROTO_IPV6
const struct layer_private *outer_ipv6_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV6);
const struct layer_private *inner_ipv6_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV6);
const struct layer_internal *outer_ipv6_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV6);
const struct layer_internal *inner_ipv6_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV6);
EXPECT_TRUE(outer_ipv6_record != nullptr);
EXPECT_TRUE(inner_ipv6_record != nullptr);
@@ -523,7 +523,7 @@ TEST(PACKET_PARSE, ETH_VLAN_IP6_IP4_GRE_PPP_IP4_UDP_DNS)
EXPECT_TRUE(outer_ipv6_record->pld_len == 214);
// LAYER_PROTO_IPV4
const struct layer_private *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
EXPECT_TRUE(outer_ipv4_record != nullptr);
EXPECT_TRUE(outer_ipv4_record->hdr_offset == 58);
@@ -531,8 +531,8 @@ TEST(PACKET_PARSE, ETH_VLAN_IP6_IP4_GRE_PPP_IP4_UDP_DNS)
EXPECT_TRUE(outer_ipv4_record->pld_len == 194);
// LAYER_PROTO_GRE
const struct layer_private *outer_gre_record = packet_get_outermost_layer(&handler, LAYER_PROTO_GRE);
const struct layer_private *inner_ger_record = packet_get_innermost_layer(&handler, LAYER_PROTO_GRE);
const struct layer_internal *outer_gre_record = packet_get_outermost_layer(&handler, LAYER_PROTO_GRE);
const struct layer_internal *inner_ger_record = packet_get_innermost_layer(&handler, LAYER_PROTO_GRE);
EXPECT_TRUE(outer_gre_record != nullptr);
EXPECT_TRUE(inner_ger_record != nullptr);
@@ -542,8 +542,8 @@ TEST(PACKET_PARSE, ETH_VLAN_IP6_IP4_GRE_PPP_IP4_UDP_DNS)
EXPECT_TRUE(outer_gre_record->pld_len == 178);
// LAYER_PROTO_PPP
const struct layer_private *outer_ppp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_PPP);
const struct layer_private *inner_ppp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_PPP);
const struct layer_internal *outer_ppp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_PPP);
const struct layer_internal *inner_ppp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_PPP);
EXPECT_TRUE(outer_ppp_record != nullptr);
EXPECT_TRUE(inner_ppp_record != nullptr);
@@ -553,7 +553,7 @@ TEST(PACKET_PARSE, ETH_VLAN_IP6_IP4_GRE_PPP_IP4_UDP_DNS)
EXPECT_TRUE(outer_ppp_record->pld_len == 174);
// LAYER_PROTO_IPV4
const struct layer_private *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
EXPECT_TRUE(inner_ipv4_record != nullptr);
EXPECT_TRUE(inner_ipv4_record->hdr_offset == 98);
@@ -561,8 +561,8 @@ TEST(PACKET_PARSE, ETH_VLAN_IP6_IP4_GRE_PPP_IP4_UDP_DNS)
EXPECT_TRUE(inner_ipv4_record->pld_len == 154);
// LAYER_PROTO_UDP
const struct layer_private *outer_udp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_UDP);
const struct layer_private *inner_udp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_UDP);
const struct layer_internal *outer_udp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_UDP);
const struct layer_internal *inner_udp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_UDP);
EXPECT_TRUE(outer_udp_record != nullptr);
EXPECT_TRUE(inner_udp_record != nullptr);
@@ -697,8 +697,8 @@ TEST(PACKET_PARSE, ETH_IP4_IP6_TCP)
******************************************************/
// LAYER_PROTO_ETHER
const struct layer_private *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_private *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
EXPECT_TRUE(outer_eth_record != nullptr);
EXPECT_TRUE(inner_eth_record != nullptr);
@@ -708,8 +708,8 @@ TEST(PACKET_PARSE, ETH_IP4_IP6_TCP)
EXPECT_TRUE(outer_eth_record->pld_len == 92);
// LAYER_PROTO_IPV4
const struct layer_private *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_private *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
EXPECT_TRUE(outer_ipv4_record != nullptr);
EXPECT_TRUE(inner_ipv4_record != nullptr);
@@ -719,8 +719,8 @@ TEST(PACKET_PARSE, ETH_IP4_IP6_TCP)
EXPECT_TRUE(outer_ipv4_record->pld_len == 72);
// LAYER_PROTO_IPV6
const struct layer_private *outer_ipv6_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV6);
const struct layer_private *inner_ipv6_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV6);
const struct layer_internal *outer_ipv6_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV6);
const struct layer_internal *inner_ipv6_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV6);
EXPECT_TRUE(outer_ipv6_record != nullptr);
EXPECT_TRUE(inner_ipv6_record != nullptr);
@@ -730,8 +730,8 @@ TEST(PACKET_PARSE, ETH_IP4_IP6_TCP)
EXPECT_TRUE(outer_ipv6_record->pld_len == 32);
// LAYER_PROTO_TCP
const struct layer_private *outer_tcp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_TCP);
const struct layer_private *inner_tcp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_TCP);
const struct layer_internal *outer_tcp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_TCP);
const struct layer_internal *inner_tcp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_TCP);
EXPECT_TRUE(outer_tcp_record != nullptr);
EXPECT_TRUE(inner_tcp_record != nullptr);
@@ -852,8 +852,8 @@ TEST(PACKET_PARSE, ETH_IP6_IP6_UDP)
******************************************************/
// LAYER_PROTO_ETHER
const struct layer_private *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_private *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
EXPECT_TRUE(outer_eth_record != nullptr);
EXPECT_TRUE(inner_eth_record != nullptr);
@@ -863,7 +863,7 @@ TEST(PACKET_PARSE, ETH_IP6_IP6_UDP)
EXPECT_TRUE(outer_eth_record->pld_len == 92);
// LAYER_PROTO_IPV6
const struct layer_private *outer_ipv6_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV6);
const struct layer_internal *outer_ipv6_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV6);
EXPECT_TRUE(outer_ipv6_record != nullptr);
EXPECT_TRUE(outer_ipv6_record->hdr_offset == 14);
@@ -871,7 +871,7 @@ TEST(PACKET_PARSE, ETH_IP6_IP6_UDP)
EXPECT_TRUE(outer_ipv6_record->pld_len == 52);
// LAYER_PROTO_IPV6
const struct layer_private *inner_ipv6_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV6);
const struct layer_internal *inner_ipv6_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV6);
EXPECT_TRUE(inner_ipv6_record != nullptr);
EXPECT_TRUE(inner_ipv6_record->hdr_offset == 54);
@@ -879,8 +879,8 @@ TEST(PACKET_PARSE, ETH_IP6_IP6_UDP)
EXPECT_TRUE(inner_ipv6_record->pld_len == 12);
// LAYER_PROTO_UDP
const struct layer_private *outer_udp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_UDP);
const struct layer_private *inner_udp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_UDP);
const struct layer_internal *outer_udp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_UDP);
const struct layer_internal *inner_udp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_UDP);
EXPECT_TRUE(outer_udp_record != nullptr);
EXPECT_TRUE(inner_udp_record != nullptr);
@@ -1008,8 +1008,8 @@ TEST(PACKET_PARSE, ETH_MPLS_IP4_TCP)
******************************************************/
// LAYER_PROTO_ETHER
const struct layer_private *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_private *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
EXPECT_TRUE(outer_eth_record != nullptr);
EXPECT_TRUE(inner_eth_record != nullptr);
@@ -1019,8 +1019,8 @@ TEST(PACKET_PARSE, ETH_MPLS_IP4_TCP)
EXPECT_TRUE(outer_eth_record->pld_len == 56);
// LAYER_PROTO_MPLS
const struct layer_private *outer_mpls_record = packet_get_outermost_layer(&handler, LAYER_PROTO_MPLS);
const struct layer_private *inner_mpls_record = packet_get_innermost_layer(&handler, LAYER_PROTO_MPLS);
const struct layer_internal *outer_mpls_record = packet_get_outermost_layer(&handler, LAYER_PROTO_MPLS);
const struct layer_internal *inner_mpls_record = packet_get_innermost_layer(&handler, LAYER_PROTO_MPLS);
EXPECT_TRUE(outer_mpls_record != nullptr);
EXPECT_TRUE(inner_mpls_record != nullptr);
@@ -1030,8 +1030,8 @@ TEST(PACKET_PARSE, ETH_MPLS_IP4_TCP)
EXPECT_TRUE(outer_mpls_record->pld_len == 52);
// LAYER_PROTO_IPV4
const struct layer_private *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_private *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
EXPECT_TRUE(outer_ipv4_record != nullptr);
EXPECT_TRUE(inner_ipv4_record != nullptr);
@@ -1041,8 +1041,8 @@ TEST(PACKET_PARSE, ETH_MPLS_IP4_TCP)
EXPECT_TRUE(outer_ipv4_record->pld_len == 32);
// LAYER_PROTO_TCP
const struct layer_private *outer_tcp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_TCP);
const struct layer_private *inner_tcp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_TCP);
const struct layer_internal *outer_tcp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_TCP);
const struct layer_internal *inner_tcp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_TCP);
EXPECT_TRUE(outer_tcp_record != nullptr);
EXPECT_TRUE(inner_tcp_record != nullptr);
@@ -1175,8 +1175,8 @@ TEST(PACKET_PARSE, ETH_MPLS_MPLS_IP4_TCP)
******************************************************/
// LAYER_PROTO_ETHER
const struct layer_private *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_private *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
EXPECT_TRUE(outer_eth_record != nullptr);
EXPECT_TRUE(inner_eth_record != nullptr);
@@ -1186,7 +1186,7 @@ TEST(PACKET_PARSE, ETH_MPLS_MPLS_IP4_TCP)
EXPECT_TRUE(outer_eth_record->pld_len == 52);
// LAYER_PROTO_MPLS
const struct layer_private *outer_mpls_record = packet_get_outermost_layer(&handler, LAYER_PROTO_MPLS);
const struct layer_internal *outer_mpls_record = packet_get_outermost_layer(&handler, LAYER_PROTO_MPLS);
EXPECT_TRUE(outer_mpls_record != nullptr);
EXPECT_TRUE(outer_mpls_record->hdr_offset == 14);
@@ -1194,7 +1194,7 @@ TEST(PACKET_PARSE, ETH_MPLS_MPLS_IP4_TCP)
EXPECT_TRUE(outer_mpls_record->pld_len == 48);
// LAYER_PROTO_MPLS
const struct layer_private *inner_mpls_record = packet_get_innermost_layer(&handler, LAYER_PROTO_MPLS);
const struct layer_internal *inner_mpls_record = packet_get_innermost_layer(&handler, LAYER_PROTO_MPLS);
EXPECT_TRUE(inner_mpls_record != nullptr);
EXPECT_TRUE(inner_mpls_record->hdr_offset == 18);
@@ -1202,8 +1202,8 @@ TEST(PACKET_PARSE, ETH_MPLS_MPLS_IP4_TCP)
EXPECT_TRUE(inner_mpls_record->pld_len == 44);
// LAYER_PROTO_IPV4
const struct layer_private *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_private *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
EXPECT_TRUE(outer_ipv4_record != nullptr);
EXPECT_TRUE(inner_ipv4_record != nullptr);
@@ -1213,8 +1213,8 @@ TEST(PACKET_PARSE, ETH_MPLS_MPLS_IP4_TCP)
EXPECT_TRUE(outer_ipv4_record->pld_len == 24);
// LAYER_PROTO_TCP
const struct layer_private *outer_tcp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_TCP);
const struct layer_private *inner_tcp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_TCP);
const struct layer_internal *outer_tcp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_TCP);
const struct layer_internal *inner_tcp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_TCP);
EXPECT_TRUE(outer_tcp_record != nullptr);
EXPECT_TRUE(inner_tcp_record != nullptr);
@@ -1352,8 +1352,8 @@ TEST(PACKET_PARSE, ETH_VLAN_PPPOE_IP4_TCP)
******************************************************/
// LAYER_PROTO_ETHER
const struct layer_private *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_private *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
EXPECT_TRUE(outer_eth_record != nullptr);
EXPECT_TRUE(inner_eth_record != nullptr);
@@ -1363,8 +1363,8 @@ TEST(PACKET_PARSE, ETH_VLAN_PPPOE_IP4_TCP)
EXPECT_TRUE(outer_eth_record->pld_len == 64);
// LAYER_PROTO_VLAN
const struct layer_private *outer_vlan_record = packet_get_outermost_layer(&handler, LAYER_PROTO_VLAN);
const struct layer_private *inner_vlan_record = packet_get_innermost_layer(&handler, LAYER_PROTO_VLAN);
const struct layer_internal *outer_vlan_record = packet_get_outermost_layer(&handler, LAYER_PROTO_VLAN);
const struct layer_internal *inner_vlan_record = packet_get_innermost_layer(&handler, LAYER_PROTO_VLAN);
EXPECT_TRUE(outer_vlan_record != nullptr);
EXPECT_TRUE(inner_vlan_record != nullptr);
@@ -1374,8 +1374,8 @@ TEST(PACKET_PARSE, ETH_VLAN_PPPOE_IP4_TCP)
EXPECT_TRUE(outer_vlan_record->pld_len == 60);
// LAYER_PROTO_PPPOE
const struct layer_private *outer_pppoe_record = packet_get_outermost_layer(&handler, LAYER_PROTO_PPPOE);
const struct layer_private *inner_pppoe_record = packet_get_innermost_layer(&handler, LAYER_PROTO_PPPOE);
const struct layer_internal *outer_pppoe_record = packet_get_outermost_layer(&handler, LAYER_PROTO_PPPOE);
const struct layer_internal *inner_pppoe_record = packet_get_innermost_layer(&handler, LAYER_PROTO_PPPOE);
EXPECT_TRUE(outer_pppoe_record != nullptr);
EXPECT_TRUE(inner_pppoe_record != nullptr);
@@ -1385,8 +1385,8 @@ TEST(PACKET_PARSE, ETH_VLAN_PPPOE_IP4_TCP)
EXPECT_TRUE(outer_pppoe_record->pld_len == 54);
// LAYER_PROTO_PPP
const struct layer_private *outer_ppp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_PPP);
const struct layer_private *inner_ppp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_PPP);
const struct layer_internal *outer_ppp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_PPP);
const struct layer_internal *inner_ppp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_PPP);
EXPECT_TRUE(outer_ppp_record != nullptr);
EXPECT_TRUE(inner_ppp_record != nullptr);
@@ -1396,8 +1396,8 @@ TEST(PACKET_PARSE, ETH_VLAN_PPPOE_IP4_TCP)
EXPECT_TRUE(outer_ppp_record->pld_len == 52);
// LAYER_PROTO_IPV4
const struct layer_private *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_private *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
EXPECT_TRUE(outer_ipv4_record != nullptr);
EXPECT_TRUE(inner_ipv4_record != nullptr);
@@ -1408,8 +1408,8 @@ TEST(PACKET_PARSE, ETH_VLAN_PPPOE_IP4_TCP)
EXPECT_TRUE(outer_ipv4_record->pld_len == 32);
// LAYER_PROTO_TCP
const struct layer_private *outer_tcp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_TCP);
const struct layer_private *inner_tcp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_TCP);
const struct layer_internal *outer_tcp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_TCP);
const struct layer_internal *inner_tcp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_TCP);
EXPECT_TRUE(outer_tcp_record != nullptr);
EXPECT_TRUE(inner_tcp_record != nullptr);
@@ -1605,8 +1605,8 @@ TEST(PACKET_PARSE, ETH_IP6_UDP_GTP_IP6_TCP_TLS)
******************************************************/
// LAYER_PROTO_ETHER
const struct layer_private *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_private *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
EXPECT_TRUE(outer_eth_record != nullptr);
EXPECT_TRUE(inner_eth_record != nullptr);
@@ -1616,7 +1616,7 @@ TEST(PACKET_PARSE, ETH_IP6_UDP_GTP_IP6_TCP_TLS)
EXPECT_TRUE(outer_eth_record->pld_len == 1428);
// LAYER_PROTO_IPV6
const struct layer_private *outer_ipv6_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV6);
const struct layer_internal *outer_ipv6_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV6);
EXPECT_TRUE(outer_ipv6_record != nullptr);
EXPECT_TRUE(outer_ipv6_record->hdr_offset == 14);
@@ -1624,8 +1624,8 @@ TEST(PACKET_PARSE, ETH_IP6_UDP_GTP_IP6_TCP_TLS)
EXPECT_TRUE(outer_ipv6_record->pld_len == 1388);
// LAYER_PROTO_UDP
const struct layer_private *outer_udp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_UDP);
const struct layer_private *inner_udp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_UDP);
const struct layer_internal *outer_udp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_UDP);
const struct layer_internal *inner_udp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_UDP);
EXPECT_TRUE(outer_udp_record != nullptr);
EXPECT_TRUE(inner_udp_record != nullptr);
@@ -1635,8 +1635,8 @@ TEST(PACKET_PARSE, ETH_IP6_UDP_GTP_IP6_TCP_TLS)
EXPECT_TRUE(outer_udp_record->pld_len == 1380);
// LAYER_PROTO_GTP_U
const struct layer_private *outer_gtp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_GTP_U);
const struct layer_private *inner_gtp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_GTP_U);
const struct layer_internal *outer_gtp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_GTP_U);
const struct layer_internal *inner_gtp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_GTP_U);
EXPECT_TRUE(outer_gtp_record != nullptr);
EXPECT_TRUE(inner_gtp_record != nullptr);
@@ -1646,7 +1646,7 @@ TEST(PACKET_PARSE, ETH_IP6_UDP_GTP_IP6_TCP_TLS)
EXPECT_TRUE(outer_gtp_record->pld_len == 1372);
// LAYER_PROTO_IPV6
const struct layer_private *inner_ipv6_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV6);
const struct layer_internal *inner_ipv6_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV6);
EXPECT_TRUE(inner_ipv6_record != nullptr);
EXPECT_TRUE(inner_ipv6_record->hdr_offset == 70);
@@ -1654,8 +1654,8 @@ TEST(PACKET_PARSE, ETH_IP6_UDP_GTP_IP6_TCP_TLS)
EXPECT_TRUE(inner_ipv6_record->pld_len == 1332);
// LAYER_PROTO_TCP
const struct layer_private *outer_tcp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_TCP);
const struct layer_private *inner_tcp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_TCP);
const struct layer_internal *outer_tcp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_TCP);
const struct layer_internal *inner_tcp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_TCP);
EXPECT_TRUE(outer_tcp_record != nullptr);
EXPECT_TRUE(inner_tcp_record != nullptr);
@@ -1859,8 +1859,8 @@ TEST(PACKET_PARSE, ETH_IP6_UDP_GTP_IP4_TCP_TLS)
******************************************************/
// LAYER_PROTO_ETHER
const struct layer_private *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_private *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
EXPECT_TRUE(outer_eth_record != nullptr);
EXPECT_TRUE(inner_eth_record != nullptr);
@@ -1870,8 +1870,8 @@ TEST(PACKET_PARSE, ETH_IP6_UDP_GTP_IP4_TCP_TLS)
EXPECT_TRUE(outer_eth_record->pld_len == 1456);
// LAYER_PROTO_IPV6
const struct layer_private *outer_ipv6_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV6);
const struct layer_private *inner_ipv6_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV6);
const struct layer_internal *outer_ipv6_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV6);
const struct layer_internal *inner_ipv6_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV6);
EXPECT_TRUE(outer_ipv6_record != nullptr);
EXPECT_TRUE(inner_ipv6_record != nullptr);
@@ -1881,8 +1881,8 @@ TEST(PACKET_PARSE, ETH_IP6_UDP_GTP_IP4_TCP_TLS)
EXPECT_TRUE(outer_ipv6_record->pld_len == 1416);
// LAYER_PROTO_UDP
const struct layer_private *outer_udp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_UDP);
const struct layer_private *inner_udp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_UDP);
const struct layer_internal *outer_udp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_UDP);
const struct layer_internal *inner_udp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_UDP);
EXPECT_TRUE(outer_udp_record != nullptr);
EXPECT_TRUE(inner_udp_record != nullptr);
@@ -1892,8 +1892,8 @@ TEST(PACKET_PARSE, ETH_IP6_UDP_GTP_IP4_TCP_TLS)
EXPECT_TRUE(outer_udp_record->pld_len == 1408);
// LAYER_PROTO_GTP_U
const struct layer_private *outer_gtp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_GTP_U);
const struct layer_private *inner_gtp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_GTP_U);
const struct layer_internal *outer_gtp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_GTP_U);
const struct layer_internal *inner_gtp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_GTP_U);
EXPECT_TRUE(outer_gtp_record != nullptr);
EXPECT_TRUE(inner_gtp_record != nullptr);
@@ -1903,8 +1903,8 @@ TEST(PACKET_PARSE, ETH_IP6_UDP_GTP_IP4_TCP_TLS)
EXPECT_TRUE(outer_gtp_record->pld_len == 1400);
// LAYER_PROTO_IPV4
const struct layer_private *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_private *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
EXPECT_TRUE(outer_ipv4_record != nullptr);
EXPECT_TRUE(inner_ipv4_record != nullptr);
@@ -1914,8 +1914,8 @@ TEST(PACKET_PARSE, ETH_IP6_UDP_GTP_IP4_TCP_TLS)
EXPECT_TRUE(outer_ipv4_record->pld_len == 1380);
// LAYER_PROTO_TCP
const struct layer_private *outer_tcp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_TCP);
const struct layer_private *inner_tcp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_TCP);
const struct layer_internal *outer_tcp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_TCP);
const struct layer_internal *inner_tcp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_TCP);
EXPECT_TRUE(outer_tcp_record != nullptr);
EXPECT_TRUE(inner_tcp_record != nullptr);
@@ -2061,7 +2061,7 @@ TEST(PACKET_PARSE, ETH_IP4_UDP_VXLAN_ETH_IP4_UDP_DNS)
******************************************************/
// LAYER_PROTO_ETHER
const struct layer_private *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
EXPECT_TRUE(outer_eth_record != nullptr);
EXPECT_TRUE(outer_eth_record->hdr_offset == 0);
@@ -2069,7 +2069,7 @@ TEST(PACKET_PARSE, ETH_IP4_UDP_VXLAN_ETH_IP4_UDP_DNS)
EXPECT_TRUE(outer_eth_record->pld_len == 110);
// LAYER_PROTO_IPV4
const struct layer_private *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
EXPECT_TRUE(outer_ipv4_record != nullptr);
EXPECT_TRUE(outer_ipv4_record->hdr_offset == 14);
@@ -2077,7 +2077,7 @@ TEST(PACKET_PARSE, ETH_IP4_UDP_VXLAN_ETH_IP4_UDP_DNS)
EXPECT_TRUE(outer_ipv4_record->pld_len == 90);
// LAYER_PROTO_UDP
const struct layer_private *outer_udp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_UDP);
const struct layer_internal *outer_udp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_UDP);
EXPECT_TRUE(outer_udp_record != nullptr);
EXPECT_TRUE(outer_udp_record->hdr_offset == 34);
@@ -2085,8 +2085,8 @@ TEST(PACKET_PARSE, ETH_IP4_UDP_VXLAN_ETH_IP4_UDP_DNS)
EXPECT_TRUE(outer_udp_record->pld_len == 82);
// LAYER_PROTO_VXLAN
const struct layer_private *outer_g_vlan_record = packet_get_outermost_layer(&handler, LAYER_PROTO_VXLAN);
const struct layer_private *inner_g_vlan_record = packet_get_innermost_layer(&handler, LAYER_PROTO_VXLAN);
const struct layer_internal *outer_g_vlan_record = packet_get_outermost_layer(&handler, LAYER_PROTO_VXLAN);
const struct layer_internal *inner_g_vlan_record = packet_get_innermost_layer(&handler, LAYER_PROTO_VXLAN);
EXPECT_TRUE(outer_g_vlan_record != nullptr);
EXPECT_TRUE(inner_g_vlan_record != nullptr);
@@ -2097,7 +2097,7 @@ TEST(PACKET_PARSE, ETH_IP4_UDP_VXLAN_ETH_IP4_UDP_DNS)
EXPECT_TRUE(outer_g_vlan_record->pld_len == 74);
// LAYER_PROTO_ETHER
const struct layer_private *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
EXPECT_TRUE(inner_eth_record != nullptr);
EXPECT_TRUE(inner_eth_record->hdr_offset == 50);
@@ -2105,7 +2105,7 @@ TEST(PACKET_PARSE, ETH_IP4_UDP_VXLAN_ETH_IP4_UDP_DNS)
EXPECT_TRUE(inner_eth_record->pld_len == 60);
// LAYER_PROTO_IPV4
const struct layer_private *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
EXPECT_TRUE(inner_ipv4_record != nullptr);
EXPECT_TRUE(inner_ipv4_record->hdr_offset == 64);
@@ -2113,7 +2113,7 @@ TEST(PACKET_PARSE, ETH_IP4_UDP_VXLAN_ETH_IP4_UDP_DNS)
EXPECT_TRUE(inner_ipv4_record->pld_len == 40);
// LAYER_PROTO_UDP
const struct layer_private *inner_udp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_UDP);
const struct layer_internal *inner_udp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_UDP);
EXPECT_TRUE(inner_udp_record != nullptr);
EXPECT_TRUE(inner_udp_record->hdr_offset == 84);
@@ -2218,7 +2218,7 @@ TEST(PACKET_PARSE, ETH_MPLS_MPLS_PWETHCW_ETH_ARP)
******************************************************/
// LAYER_PROTO_ETHER
const struct layer_private *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
EXPECT_TRUE(outer_eth_record != nullptr);
EXPECT_TRUE(outer_eth_record->hdr_offset == 0);
@@ -2226,7 +2226,7 @@ TEST(PACKET_PARSE, ETH_MPLS_MPLS_PWETHCW_ETH_ARP)
EXPECT_TRUE(outer_eth_record->pld_len == 76);
// LAYER_PROTO_MPLS
const struct layer_private *outer_mpls_record = packet_get_outermost_layer(&handler, LAYER_PROTO_MPLS);
const struct layer_internal *outer_mpls_record = packet_get_outermost_layer(&handler, LAYER_PROTO_MPLS);
EXPECT_TRUE(outer_mpls_record != nullptr);
EXPECT_TRUE(outer_mpls_record->hdr_offset == 14);
@@ -2234,7 +2234,7 @@ TEST(PACKET_PARSE, ETH_MPLS_MPLS_PWETHCW_ETH_ARP)
EXPECT_TRUE(outer_mpls_record->pld_len == 72);
// LAYER_PROTO_MPLS
const struct layer_private *inner_mpls_record = packet_get_innermost_layer(&handler, LAYER_PROTO_MPLS);
const struct layer_internal *inner_mpls_record = packet_get_innermost_layer(&handler, LAYER_PROTO_MPLS);
EXPECT_TRUE(inner_mpls_record != nullptr);
EXPECT_TRUE(inner_mpls_record->hdr_offset == 18);
@@ -2242,7 +2242,7 @@ TEST(PACKET_PARSE, ETH_MPLS_MPLS_PWETHCW_ETH_ARP)
EXPECT_TRUE(inner_mpls_record->pld_len == 68);
// LAYER_PROTO_PWETHCW
const struct layer_private *inner_pweth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_PWETH);
const struct layer_internal *inner_pweth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_PWETH);
EXPECT_TRUE(inner_pweth_record != nullptr);
EXPECT_TRUE(inner_pweth_record->hdr_offset == 22);
@@ -2250,7 +2250,7 @@ TEST(PACKET_PARSE, ETH_MPLS_MPLS_PWETHCW_ETH_ARP)
EXPECT_TRUE(inner_pweth_record->pld_len == 64);
// LAYER_PROTO_ETHER
const struct layer_private *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
EXPECT_TRUE(inner_eth_record != nullptr);
EXPECT_TRUE(inner_eth_record->hdr_offset == 26);
@@ -2355,8 +2355,8 @@ TEST(PACKET_PARSE, ETH_IP4_ICMP)
******************************************************/
// LAYER_PROTO_ETHER
const struct layer_private *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_private *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
EXPECT_TRUE(outer_eth_record != nullptr);
EXPECT_TRUE(inner_eth_record != nullptr);
@@ -2366,8 +2366,8 @@ TEST(PACKET_PARSE, ETH_IP4_ICMP)
EXPECT_TRUE(outer_eth_record->pld_len == 84);
// LAYER_PROTO_IPV4
const struct layer_private *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_private *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
EXPECT_TRUE(outer_ipv4_record != nullptr);
EXPECT_TRUE(inner_ipv4_record != nullptr);
@@ -2377,8 +2377,8 @@ TEST(PACKET_PARSE, ETH_IP4_ICMP)
EXPECT_TRUE(outer_ipv4_record->pld_len == 64);
// LAYER_PROTO_ICMP
const struct layer_private *outer_icmp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ICMP);
const struct layer_private *inner_icmp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ICMP);
const struct layer_internal *outer_icmp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ICMP);
const struct layer_internal *inner_icmp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ICMP);
EXPECT_TRUE(outer_icmp_record != nullptr);
EXPECT_TRUE(inner_icmp_record != nullptr);
@@ -2461,8 +2461,8 @@ TEST(PACKET_PARSE, ETH_IP6_ICMP6)
******************************************************/
// LAYER_PROTO_ETHER
const struct layer_private *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_private *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
EXPECT_TRUE(outer_eth_record != nullptr);
EXPECT_TRUE(inner_eth_record != nullptr);
@@ -2472,8 +2472,8 @@ TEST(PACKET_PARSE, ETH_IP6_ICMP6)
EXPECT_TRUE(outer_eth_record->pld_len == 100);
// LAYER_PROTO_IPV6
const struct layer_private *outer_ipv6_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV6);
const struct layer_private *inner_ipv6_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV6);
const struct layer_internal *outer_ipv6_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV6);
const struct layer_internal *inner_ipv6_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV6);
EXPECT_TRUE(outer_ipv6_record != nullptr);
EXPECT_TRUE(inner_ipv6_record != nullptr);
@@ -2483,8 +2483,8 @@ TEST(PACKET_PARSE, ETH_IP6_ICMP6)
EXPECT_TRUE(outer_ipv6_record->pld_len == 60);
// LAYER_PROTO_ICMP6
const struct layer_private *outer_icmp6_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ICMP6);
const struct layer_private *inner_icmp6_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ICMP6);
const struct layer_internal *outer_icmp6_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ICMP6);
const struct layer_internal *inner_icmp6_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ICMP6);
EXPECT_TRUE(outer_icmp6_record != nullptr);
EXPECT_TRUE(inner_icmp6_record != nullptr);
@@ -2626,7 +2626,7 @@ TEST(PACKET_PARSE, ETH_IP4_UDP_L2TPV2_PPP_IP4_UDP)
******************************************************/
// LAYER_PROTO_ETHER
const struct layer_private *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
EXPECT_TRUE(outer_eth_record != nullptr);
EXPECT_TRUE(outer_eth_record->hdr_offset == 0);
@@ -2634,7 +2634,7 @@ TEST(PACKET_PARSE, ETH_IP4_UDP_L2TPV2_PPP_IP4_UDP)
EXPECT_TRUE(outer_eth_record->pld_len == 136);
// LAYER_PROTO_IPV4
const struct layer_private *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
EXPECT_TRUE(outer_ipv4_record != nullptr);
EXPECT_TRUE(outer_ipv4_record->hdr_offset == 14);
@@ -2642,7 +2642,7 @@ TEST(PACKET_PARSE, ETH_IP4_UDP_L2TPV2_PPP_IP4_UDP)
EXPECT_TRUE(outer_ipv4_record->pld_len == 116);
// LAYER_PROTO_UDP
const struct layer_private *outer_udp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_UDP);
const struct layer_internal *outer_udp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_UDP);
EXPECT_TRUE(outer_udp_record != nullptr);
EXPECT_TRUE(outer_udp_record->hdr_offset == 34);
@@ -2650,7 +2650,7 @@ TEST(PACKET_PARSE, ETH_IP4_UDP_L2TPV2_PPP_IP4_UDP)
EXPECT_TRUE(outer_udp_record->pld_len == 108);
// LAYER_PROTO_L2TP
const struct layer_private *outer_l2tpv2_record = packet_get_outermost_layer(&handler, LAYER_PROTO_L2TP);
const struct layer_internal *outer_l2tpv2_record = packet_get_outermost_layer(&handler, LAYER_PROTO_L2TP);
EXPECT_TRUE(outer_l2tpv2_record != nullptr);
EXPECT_TRUE(outer_l2tpv2_record->hdr_offset == 42);
@@ -2658,7 +2658,7 @@ TEST(PACKET_PARSE, ETH_IP4_UDP_L2TPV2_PPP_IP4_UDP)
EXPECT_TRUE(outer_l2tpv2_record->pld_len == 100);
// LAYER_PROTO_PPP
const struct layer_private *outer_ppp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_PPP);
const struct layer_internal *outer_ppp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_PPP);
EXPECT_TRUE(outer_ppp_record != nullptr);
EXPECT_TRUE(outer_ppp_record->hdr_offset == 50);
@@ -2666,7 +2666,7 @@ TEST(PACKET_PARSE, ETH_IP4_UDP_L2TPV2_PPP_IP4_UDP)
EXPECT_TRUE(outer_ppp_record->pld_len == 96);
// LAYER_PROTO_IPV4
const struct layer_private *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
EXPECT_TRUE(inner_ipv4_record != nullptr);
EXPECT_TRUE(inner_ipv4_record->hdr_offset == 54);
@@ -2674,7 +2674,7 @@ TEST(PACKET_PARSE, ETH_IP4_UDP_L2TPV2_PPP_IP4_UDP)
EXPECT_TRUE(inner_ipv4_record->pld_len == 76);
// LAYER_PROTO_UDP
const struct layer_private *inner_udp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_UDP);
const struct layer_internal *inner_udp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_UDP);
EXPECT_TRUE(inner_udp_record != nullptr);
EXPECT_TRUE(inner_udp_record->hdr_offset == 74);
@@ -2791,8 +2791,8 @@ TEST(PACKET_PARSE, ETH_IP4_TCP_PADDING)
******************************************************/
// LAYER_PROTO_ETHER
const struct layer_private *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_private *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
EXPECT_TRUE(outer_eth_record != nullptr);
EXPECT_TRUE(inner_eth_record != nullptr);
@@ -2802,8 +2802,8 @@ TEST(PACKET_PARSE, ETH_IP4_TCP_PADDING)
EXPECT_TRUE(outer_eth_record->pld_len == 46);
// LAYER_PROTO_IPV4
const struct layer_private *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_private *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
EXPECT_TRUE(outer_ipv4_record != nullptr);
EXPECT_TRUE(inner_ipv4_record != nullptr);
@@ -2813,8 +2813,8 @@ TEST(PACKET_PARSE, ETH_IP4_TCP_PADDING)
EXPECT_TRUE(outer_ipv4_record->pld_len == 20);
// LAYER_PROTO_TCP
const struct layer_private *outer_tcp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_TCP);
const struct layer_private *inner_tcp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_TCP);
const struct layer_internal *outer_tcp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_TCP);
const struct layer_internal *inner_tcp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_TCP);
EXPECT_TRUE(outer_tcp_record != nullptr);
EXPECT_TRUE(inner_tcp_record != nullptr);
@@ -2968,8 +2968,8 @@ TEST(PACKET_PARSE, ETH_IP6_UDP_GTP_IP4_UDP)
******************************************************/
// LAYER_PROTO_ETHER
const struct layer_private *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_private *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *outer_eth_record = packet_get_outermost_layer(&handler, LAYER_PROTO_ETHER);
const struct layer_internal *inner_eth_record = packet_get_innermost_layer(&handler, LAYER_PROTO_ETHER);
EXPECT_TRUE(outer_eth_record != nullptr);
EXPECT_TRUE(inner_eth_record != nullptr);
@@ -2979,8 +2979,8 @@ TEST(PACKET_PARSE, ETH_IP6_UDP_GTP_IP4_UDP)
EXPECT_TRUE(outer_eth_record->pld_len == 501);
// LAYER_PROTO_IPV6
const struct layer_private *outer_ipv6_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV6);
const struct layer_private *inner_ipv6_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV6);
const struct layer_internal *outer_ipv6_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV6);
const struct layer_internal *inner_ipv6_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV6);
EXPECT_TRUE(outer_ipv6_record != nullptr);
EXPECT_TRUE(inner_ipv6_record != nullptr);
@@ -2990,7 +2990,7 @@ TEST(PACKET_PARSE, ETH_IP6_UDP_GTP_IP4_UDP)
EXPECT_TRUE(outer_ipv6_record->pld_len == 461);
// LAYER_PROTO_UDP
const struct layer_private *outer_udp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_UDP);
const struct layer_internal *outer_udp_record = packet_get_outermost_layer(&handler, LAYER_PROTO_UDP);
EXPECT_TRUE(outer_udp_record != nullptr);
EXPECT_TRUE(outer_udp_record->hdr_offset == 54);
@@ -2998,8 +2998,8 @@ TEST(PACKET_PARSE, ETH_IP6_UDP_GTP_IP4_UDP)
EXPECT_TRUE(outer_udp_record->pld_len == 453);
// LAYER_PROTO_GTP_U
const struct layer_private *outer_gtpu_record = packet_get_outermost_layer(&handler, LAYER_PROTO_GTP_U);
const struct layer_private *inner_gtpu_record = packet_get_innermost_layer(&handler, LAYER_PROTO_GTP_U);
const struct layer_internal *outer_gtpu_record = packet_get_outermost_layer(&handler, LAYER_PROTO_GTP_U);
const struct layer_internal *inner_gtpu_record = packet_get_innermost_layer(&handler, LAYER_PROTO_GTP_U);
EXPECT_TRUE(outer_gtpu_record != nullptr);
EXPECT_TRUE(inner_gtpu_record != nullptr);
@@ -3009,8 +3009,8 @@ TEST(PACKET_PARSE, ETH_IP6_UDP_GTP_IP4_UDP)
EXPECT_TRUE(outer_gtpu_record->pld_len == 437);
// LAYER_PROTO_IPV4
const struct layer_private *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_private *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *inner_ipv4_record = packet_get_innermost_layer(&handler, LAYER_PROTO_IPV4);
const struct layer_internal *outer_ipv4_record = packet_get_outermost_layer(&handler, LAYER_PROTO_IPV4);
EXPECT_TRUE(inner_ipv4_record != nullptr);
EXPECT_TRUE(outer_ipv4_record != nullptr);
@@ -3020,7 +3020,7 @@ TEST(PACKET_PARSE, ETH_IP6_UDP_GTP_IP4_UDP)
EXPECT_TRUE(inner_ipv4_record->pld_len == 417);
// LAYER_PROTO_UDP
const struct layer_private *inner_udp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_UDP);
const struct layer_internal *inner_udp_record = packet_get_innermost_layer(&handler, LAYER_PROTO_UDP);
EXPECT_TRUE(inner_udp_record != nullptr);
EXPECT_TRUE(inner_udp_record->hdr_offset == 98);

8
infra/session_manager/session_manager_rte.c
View File

@@ -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);

4
infra/session_manager/test/gtest_state_tcp_active_to_closing.cpp
View File

@@ -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;

4
infra/session_manager/test/gtest_state_tcp_init_to_opening.cpp
View File

@@ -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);

4
infra/session_manager/test/gtest_state_tcp_opening_to_closing.cpp
View File

@@ -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;

4
infra/session_manager/test/test_utils.h
View File

@@ -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;

2
test/packet_tool/packet_tool.c
View File

@@ -97,7 +97,7 @@ static void tshark_format(const struct runtime *rte, const struct packet *pkt)
{
memset(tmp_src_buff, 0, sizeof(tmp_src_buff));
memset(tmp_dst_buff, 0, sizeof(tmp_dst_buff));
const struct layer_private *layer = packet_get_layer(pkt, i);
const struct layer_internal *layer = packet_get_layer(pkt, i);
switch (layer->proto)
{
case LAYER_PROTO_ETHER: