refactor: rename struct raw_layer to struct layer_private
This commit is contained in:
@@ -196,7 +196,7 @@ TEST(IPV4_REASSEMBLE, PADDING_ORDER)
|
||||
{
|
||||
struct packet pkt;
|
||||
struct packet *new_pkt;
|
||||
const struct raw_layer *layer;
|
||||
const struct layer_private *layer;
|
||||
struct ip_reassembly *assy;
|
||||
struct ip_reassembly_options opts = {
|
||||
.enable = true,
|
||||
@@ -245,7 +245,7 @@ TEST(IPV4_REASSEMBLE, PADDING_ORDER)
|
||||
EXPECT_TRUE(memcmp(new_pkt->data_ptr, expect, new_pkt->data_len) == 0);
|
||||
|
||||
// check IPv4
|
||||
layer = packet_get_innermost_raw_layer(new_pkt, LAYER_PROTO_IPV4);
|
||||
layer = packet_get_innermost_layer(new_pkt, LAYER_PROTO_IPV4);
|
||||
EXPECT_TRUE(layer);
|
||||
struct ip *hdr = (struct ip *)layer->hdr_ptr;
|
||||
EXPECT_TRUE(ip4_hdr_get_version(hdr) == 4);
|
||||
@@ -264,7 +264,7 @@ TEST(IPV4_REASSEMBLE, PADDING_ORDER)
|
||||
EXPECT_TRUE(ip4_hdr_get_opt_data(hdr) == NULL);
|
||||
|
||||
// check TCP
|
||||
layer = packet_get_innermost_raw_layer(new_pkt, LAYER_PROTO_TCP);
|
||||
layer = packet_get_innermost_layer(new_pkt, LAYER_PROTO_TCP);
|
||||
EXPECT_TRUE(layer);
|
||||
struct tcphdr *tcp_hdr = (struct tcphdr *)layer->hdr_ptr;
|
||||
EXPECT_TRUE(tcp_hdr_get_src_port(tcp_hdr) == 62629);
|
||||
@@ -291,7 +291,7 @@ TEST(IPV4_REASSEMBLE, PADDING_UNORDER)
|
||||
{
|
||||
struct packet pkt;
|
||||
struct packet *new_pkt;
|
||||
const struct raw_layer *layer;
|
||||
const struct layer_private *layer;
|
||||
struct ip_reassembly *assy;
|
||||
struct ip_reassembly_options opts = {
|
||||
.enable = true,
|
||||
@@ -340,7 +340,7 @@ TEST(IPV4_REASSEMBLE, PADDING_UNORDER)
|
||||
EXPECT_TRUE(memcmp(new_pkt->data_ptr, expect, new_pkt->data_len) == 0);
|
||||
|
||||
// check IPv4
|
||||
layer = packet_get_innermost_raw_layer(new_pkt, LAYER_PROTO_IPV4);
|
||||
layer = packet_get_innermost_layer(new_pkt, LAYER_PROTO_IPV4);
|
||||
EXPECT_TRUE(layer);
|
||||
struct ip *hdr = (struct ip *)layer->hdr_ptr;
|
||||
EXPECT_TRUE(ip4_hdr_get_version(hdr) == 4);
|
||||
@@ -359,7 +359,7 @@ TEST(IPV4_REASSEMBLE, PADDING_UNORDER)
|
||||
EXPECT_TRUE(ip4_hdr_get_opt_data(hdr) == NULL);
|
||||
|
||||
// check TCP
|
||||
layer = packet_get_innermost_raw_layer(new_pkt, LAYER_PROTO_TCP);
|
||||
layer = packet_get_innermost_layer(new_pkt, LAYER_PROTO_TCP);
|
||||
EXPECT_TRUE(layer);
|
||||
struct tcphdr *tcp_hdr = (struct tcphdr *)layer->hdr_ptr;
|
||||
EXPECT_TRUE(tcp_hdr_get_src_port(tcp_hdr) == 62629);
|
||||
@@ -439,7 +439,7 @@ TEST(IPV4_REASSEMBLE, DUP_FIRST_FRAG)
|
||||
{
|
||||
struct packet pkt;
|
||||
struct packet *new_pkt;
|
||||
const struct raw_layer *layer;
|
||||
const struct layer_private *layer;
|
||||
struct ip_reassembly *assy;
|
||||
struct ip_reassembly_options opts = {
|
||||
.enable = true,
|
||||
@@ -500,7 +500,7 @@ TEST(IPV4_REASSEMBLE, DUP_FIRST_FRAG)
|
||||
EXPECT_TRUE(memcmp(new_pkt->data_ptr, expect, new_pkt->data_len) == 0);
|
||||
|
||||
// check IPv4
|
||||
layer = packet_get_innermost_raw_layer(new_pkt, LAYER_PROTO_IPV4);
|
||||
layer = packet_get_innermost_layer(new_pkt, LAYER_PROTO_IPV4);
|
||||
EXPECT_TRUE(layer);
|
||||
struct ip *hdr = (struct ip *)layer->hdr_ptr;
|
||||
EXPECT_TRUE(ip4_hdr_get_version(hdr) == 4);
|
||||
@@ -519,7 +519,7 @@ TEST(IPV4_REASSEMBLE, DUP_FIRST_FRAG)
|
||||
EXPECT_TRUE(ip4_hdr_get_opt_data(hdr) == NULL);
|
||||
|
||||
// check TCP
|
||||
layer = packet_get_innermost_raw_layer(new_pkt, LAYER_PROTO_TCP);
|
||||
layer = packet_get_innermost_layer(new_pkt, LAYER_PROTO_TCP);
|
||||
EXPECT_TRUE(layer);
|
||||
struct tcphdr *tcp_hdr = (struct tcphdr *)layer->hdr_ptr;
|
||||
EXPECT_TRUE(tcp_hdr_get_src_port(tcp_hdr) == 62629);
|
||||
@@ -546,7 +546,7 @@ TEST(IPV4_REASSEMBLE, DUP_LAST_FRAG)
|
||||
{
|
||||
struct packet pkt;
|
||||
struct packet *new_pkt;
|
||||
const struct raw_layer *layer;
|
||||
const struct layer_private *layer;
|
||||
struct ip_reassembly *assy;
|
||||
struct ip_reassembly_options opts = {
|
||||
.enable = true,
|
||||
@@ -607,7 +607,7 @@ TEST(IPV4_REASSEMBLE, DUP_LAST_FRAG)
|
||||
EXPECT_TRUE(memcmp(new_pkt->data_ptr, expect, new_pkt->data_len) == 0);
|
||||
|
||||
// check IPv4
|
||||
layer = packet_get_innermost_raw_layer(new_pkt, LAYER_PROTO_IPV4);
|
||||
layer = packet_get_innermost_layer(new_pkt, LAYER_PROTO_IPV4);
|
||||
EXPECT_TRUE(layer);
|
||||
struct ip *hdr = (struct ip *)layer->hdr_ptr;
|
||||
EXPECT_TRUE(ip4_hdr_get_version(hdr) == 4);
|
||||
@@ -626,7 +626,7 @@ TEST(IPV4_REASSEMBLE, DUP_LAST_FRAG)
|
||||
EXPECT_TRUE(ip4_hdr_get_opt_data(hdr) == NULL);
|
||||
|
||||
// check TCP
|
||||
layer = packet_get_innermost_raw_layer(new_pkt, LAYER_PROTO_TCP);
|
||||
layer = packet_get_innermost_layer(new_pkt, LAYER_PROTO_TCP);
|
||||
EXPECT_TRUE(layer);
|
||||
struct tcphdr *tcp_hdr = (struct tcphdr *)layer->hdr_ptr;
|
||||
EXPECT_TRUE(tcp_hdr_get_src_port(tcp_hdr) == 62629);
|
||||
|
||||
Reference in New Issue
Block a user