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

refactor: rename packet_dump_stdio() to packet_print()

Browse Source
This commit is contained in:
luwenpeng
2024-08-21 14:00:51 +08:00
parent 7625f62a80
commit f2f5441b4c
9 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ip_reassembly/test/gtest_ipv4_reassembly.cpp
View File

@@ -239,7 +239,7 @@ TEST(IPV4_REASSEMBLE, PADDING_ORDER)
0, 0, 0, 0, 0, 0); // ip6: frags, frags_freed, frags_buffered, frags_bypass_no_buffer, frags_bypass_dup_fist_frag, frags_bypass_dup_last_frag
// check packet
packet_dump_stdio(new_pkt);
packet_print(new_pkt);
EXPECT_TRUE(new_pkt->data_len == 14 /* ETH */ + 20 /* IPv4 */ + 20 /* TCP */ + 28 /* DATA */);
EXPECT_TRUE(new_pkt->data_len == sizeof(expect));
EXPECT_TRUE(memcmp(new_pkt->data_ptr, expect, new_pkt->data_len) == 0);
@@ -334,7 +334,7 @@ TEST(IPV4_REASSEMBLE, PADDING_UNORDER)
0, 0, 0, 0, 0, 0); // ip6: frags, frags_freed, frags_buffered, frags_bypass_no_buffer, frags_bypass_dup_fist_frag, frags_bypass_dup_last_frag
// check packet
packet_dump_stdio(new_pkt);
packet_print(new_pkt);
EXPECT_TRUE(new_pkt->data_len == 14 /* ETH */ + 20 /* IPv4 */ + 20 /* TCP */ + 28 /* DATA */);
EXPECT_TRUE(new_pkt->data_len == sizeof(expect));
EXPECT_TRUE(memcmp(new_pkt->data_ptr, expect, new_pkt->data_len) == 0);
@@ -494,7 +494,7 @@ TEST(IPV4_REASSEMBLE, DUP_FIRST_FRAG)
0, 0, 0, 0, 0, 0); // ip6: frags, frags_freed, frags_buffered, frags_bypass_no_buffer, frags_bypass_dup_fist_frag, frags_bypass_dup_last_frag
// check packet
packet_dump_stdio(new_pkt);
packet_print(new_pkt);
EXPECT_TRUE(new_pkt->data_len == 14 /* ETH */ + 20 /* IPv4 */ + 20 /* TCP */ + 28 /* DATA */);
EXPECT_TRUE(new_pkt->data_len == sizeof(expect));
EXPECT_TRUE(memcmp(new_pkt->data_ptr, expect, new_pkt->data_len) == 0);
@@ -601,7 +601,7 @@ TEST(IPV4_REASSEMBLE, DUP_LAST_FRAG)
0, 0, 0, 0, 0, 0); // ip6: frags, frags_freed, frags_buffered, frags_bypass_no_buffer, frags_bypass_dup_fist_frag, frags_bypass_dup_last_frag
// check packet
packet_dump_stdio(new_pkt);
packet_print(new_pkt);
EXPECT_TRUE(new_pkt->data_len == 14 /* ETH */ + 20 /* IPv4 */ + 20 /* TCP */ + 28 /* DATA */);
EXPECT_TRUE(new_pkt->data_len == sizeof(expect));
EXPECT_TRUE(memcmp(new_pkt->data_ptr, expect, new_pkt->data_len) == 0);

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

@@ -674,7 +674,7 @@ TEST(IPV6_REASSEMBLE, NORMAL)
4, 4, 4, 0, 0, 0); // ip6: frags, frags_freed, frags_buffered, frags_bypass_no_buffer, frags_bypass_dup_fist_frag, frags_bypass_dup_last_frag
// check packet
packet_dump_stdio(new_pkt);
packet_print(new_pkt);
EXPECT_TRUE(new_pkt->data_len == 14 /* ETH */ + 40 /* IPv6 */ + 8 /* UDP */ + 5379 /* DATA */);
EXPECT_TRUE(new_pkt->data_len == sizeof(expect));
EXPECT_TRUE(memcmp(new_pkt->data_ptr, expect, new_pkt->data_len) == 0);
@@ -852,7 +852,7 @@ TEST(IPV6_REASSEMBLE, DUP_FIRST_FRAG)
5, 4, 4, 0, 1, 0); // ip6: frags, frags_freed, frags_buffered, frags_bypass_no_buffer, frags_bypass_dup_fist_frag, frags_bypass_dup_last_frag
// check packet
packet_dump_stdio(new_pkt);
packet_print(new_pkt);
EXPECT_TRUE(new_pkt->data_len == 14 /* ETH */ + 40 /* IPv6 */ + 8 /* UDP */ + 5379 /* DATA */);
EXPECT_TRUE(new_pkt->data_len == sizeof(expect));
EXPECT_TRUE(memcmp(new_pkt->data_ptr, expect, new_pkt->data_len) == 0);
@@ -977,7 +977,7 @@ TEST(IPV6_REASSEMBLE, DUP_LAST_FRAG)
5, 4, 4, 0, 0, 1); // ip6: frags, frags_freed, frags_buffered, frags_bypass_no_buffer, frags_bypass_dup_fist_frag, frags_bypass_dup_last_frag
// check packet
packet_dump_stdio(new_pkt);
packet_print(new_pkt);
EXPECT_TRUE(new_pkt->data_len == 14 /* ETH */ + 40 /* IPv6 */ + 8 /* UDP */ + 5379 /* DATA */);
EXPECT_TRUE(new_pkt->data_len == sizeof(expect));
EXPECT_TRUE(memcmp(new_pkt->data_ptr, expect, new_pkt->data_len) == 0);

2
src/packet/packet_dump.cpp
View File

@@ -167,7 +167,7 @@ int packet_dump_str(const struct packet *pkt, char *buff, int size)
return used;
}
void packet_dump_stdio(const struct packet *pkt)
void packet_print(const struct packet *pkt)
{
char buff[4096] = {};
packet_dump_str(pkt, buff, sizeof(buff));

2
src/packet/packet_dump.h
View File

@@ -13,7 +13,7 @@ int packet_dump_pcap(const struct packet *pkt, const char *file);
void packet_dump_hex(const struct packet *pkt, int fd);
// return number of bytes written
int packet_dump_str(const struct packet *pkt, char *buff, int size);
void packet_dump_stdio(const struct packet *pkt);
void packet_print(const struct packet *pkt);
#ifdef __cplusplus
}

28
src/packet/test/gtest_packet_builder.cpp
View File

@@ -127,12 +127,12 @@ TEST(PACKET_BUILD_TCP, ETH_IP4_TCP)
memset(&orig_pkt, 0, sizeof(orig_pkt));
packet_parse(&orig_pkt, (const char *)data1, sizeof(data1));
PRINT_GREEN("origin packet:");
packet_dump_stdio(&orig_pkt);
packet_print(&orig_pkt);
struct packet *new_pkt = packet_build_tcp(&orig_pkt, 1, 2, TH_ACK, (const char *)&ts_pad_opt, sizeof(ts_pad_opt), "Hello", 5);
EXPECT_TRUE(new_pkt != nullptr);
PRINT_GREEN("new packet:");
packet_dump_stdio(new_pkt);
packet_print(new_pkt);
packet_dump_hex(new_pkt, STDOUT_FILENO);
packet_dump_pcap(new_pkt, "craft-eth-ipv4-tcp.pcap");
@@ -265,12 +265,12 @@ TEST(PACKET_BUILD_TCP, ETH_IP4_IP6_TCP)
memset(&orig_pkt, 0, sizeof(orig_pkt));
packet_parse(&orig_pkt, (const char *)data2, sizeof(data2));
PRINT_GREEN("origin packet:");
packet_dump_stdio(&orig_pkt);
packet_print(&orig_pkt);
struct packet *new_pkt = packet_build_tcp(&orig_pkt, 1234, 2345, TH_ACK, NULL, 0, "Hello", 5);
EXPECT_TRUE(new_pkt != nullptr);
PRINT_GREEN("new packet:");
packet_dump_stdio(new_pkt);
packet_print(new_pkt);
packet_dump_hex(new_pkt, STDOUT_FILENO);
packet_dump_pcap(new_pkt, "craft-eth-ipv4-ipv6-tcp.pcap");
@@ -482,12 +482,12 @@ TEST(PACKET_BUILD_TCP, ETH_IP6_UDP_GTP_IP4_TCP)
memset(&orig_pkt, 0, sizeof(orig_pkt));
packet_parse(&orig_pkt, (const char *)data3, sizeof(data3));
PRINT_GREEN("origin packet:");
packet_dump_stdio(&orig_pkt);
packet_print(&orig_pkt);
struct packet *new_pkt = packet_build_tcp(&orig_pkt, 1, 2, TH_ACK, NULL, 0, "Hello", 5);
EXPECT_TRUE(new_pkt != nullptr);
PRINT_GREEN("new packet:");
packet_dump_stdio(new_pkt);
packet_print(new_pkt);
packet_dump_hex(new_pkt, STDOUT_FILENO);
packet_dump_pcap(new_pkt, "craft-eth-ipv6-udp-gtp-ipv4-tcp.pcap");
@@ -704,12 +704,12 @@ TEST(PACKET_BUILD_TCP, ETH_IP4_GRE_IP6_TCP)
memset(&orig_pkt, 0, sizeof(orig_pkt));
packet_parse(&orig_pkt, (const char *)data4, sizeof(data4));
PRINT_GREEN("origin packet:");
packet_dump_stdio(&orig_pkt);
packet_print(&orig_pkt);
struct packet *new_pkt = packet_build_tcp(&orig_pkt, 1, 2, TH_ACK, NULL, 0, "Hello", 5);
EXPECT_TRUE(new_pkt != nullptr);
PRINT_GREEN("new packet:");
packet_dump_stdio(new_pkt);
packet_print(new_pkt);
packet_dump_hex(new_pkt, STDOUT_FILENO);
packet_dump_pcap(new_pkt, "craft-eth-ipv4-gre-ipv6-tcp.pcap");
@@ -932,12 +932,12 @@ TEST(PACKET_BUILD_UDP, ETH_VLAN_IPv6_IPv4_GRE_PPP_IPv4_UDP_DNS)
memset(&orig_pkt, 0, sizeof(orig_pkt));
packet_parse(&orig_pkt, (const char *)data5, sizeof(data5));
PRINT_GREEN("origin packet:");
packet_dump_stdio(&orig_pkt);
packet_print(&orig_pkt);
struct packet *new_pkt = packet_build_udp(&orig_pkt, "Hello", 5);
EXPECT_TRUE(new_pkt != nullptr);
PRINT_GREEN("new packet:");
packet_dump_stdio(new_pkt);
packet_print(new_pkt);
packet_dump_hex(new_pkt, STDOUT_FILENO);
packet_dump_pcap(new_pkt, "craft-eth-vlan-ipv6-ipv4-gre-ppp-ipv4-udp-dns.pcap");
@@ -1057,7 +1057,7 @@ TEST(PACKET_BUILD_L3, ETH_IP4_ICMP)
memset(&orig_pkt, 0, sizeof(orig_pkt));
packet_parse(&orig_pkt, (const char *)data1, sizeof(data1));
PRINT_GREEN("origin packet:");
packet_dump_stdio(&orig_pkt);
packet_print(&orig_pkt);
struct icmphdr *icmp = (struct icmphdr *)icmp_resp;
icmp->checksum = 0;
@@ -1066,7 +1066,7 @@ TEST(PACKET_BUILD_L3, ETH_IP4_ICMP)
struct packet *new_pkt = packet_build_l3(&orig_pkt, IPPROTO_ICMP, (const char *)icmp_resp, sizeof(icmp_resp));
EXPECT_TRUE(new_pkt != nullptr);
PRINT_GREEN("new packet:");
packet_dump_stdio(new_pkt);
packet_print(new_pkt);
packet_dump_hex(new_pkt, STDOUT_FILENO);
packet_dump_pcap(new_pkt, "craft-eth-ipv4-icmpv4.pcap");
@@ -1143,7 +1143,7 @@ TEST(PACKET_BUILD_L3, ETH_IP6_ICMP)
memset(&orig_pkt, 0, sizeof(orig_pkt));
packet_parse(&orig_pkt, (const char *)data2, sizeof(data2));
PRINT_GREEN("origin packet:");
packet_dump_stdio(&orig_pkt);
packet_print(&orig_pkt);
struct icmp6_hdr *icmp = (struct icmp6_hdr *)icmp_resp;
icmp->icmp6_cksum = 0;
@@ -1163,7 +1163,7 @@ TEST(PACKET_BUILD_L3, ETH_IP6_ICMP)
struct packet *new_pkt = packet_build_l3(&orig_pkt, IPPROTO_ICMPV6, (const char *)icmp_resp, sizeof(icmp_resp));
EXPECT_TRUE(new_pkt != nullptr);
PRINT_GREEN("new packet:");
packet_dump_stdio(new_pkt);
packet_print(new_pkt);
packet_dump_hex(new_pkt, STDOUT_FILENO);
packet_dump_pcap(new_pkt, "craft-eth-ipv4-ipv6-icmpv6.pcap");

2
src/packet/test/gtest_packet_ldbc.cpp
View File

@@ -76,7 +76,7 @@ TEST(PACKET_LDBC, HASH_VALUE)
const char *payload = packet_parse(&handler, (const char *)data, sizeof(data));
EXPECT_TRUE(payload != nullptr);
EXPECT_TRUE((char *)payload - (char *)&data == 106);
packet_dump_stdio(&handler);
packet_print(&handler);
// buffer: "2001:da8:200:900e:200:5efe:d24d:58a3 0 2600:140e:6::1702:1058 0"
// buffer: "210.77.88.163 0 59.66.4.50 0"

34
src/packet/test/gtest_packet_parser.cpp
View File

@@ -86,7 +86,7 @@ TEST(PACKET_PARSE, ETH_VLAN_VLAN_IP4_IP4_UDP)
const char *payload = packet_parse(&handler, (const char *)data1, sizeof(data1));
EXPECT_TRUE(payload != nullptr);
EXPECT_TRUE((char *)payload - (char *)&data1 == 70);
packet_dump_stdio(&handler);
packet_print(&handler);
/******************************************************
* packet_get_outermost/innermost_layer
@@ -290,7 +290,7 @@ TEST(PACKET_PARSE, ETH_IP6_IP4_TCP_SSH)
const char *payload = packet_parse(&handler, (const char *)data2, sizeof(data2));
EXPECT_TRUE(payload != nullptr);
EXPECT_TRUE((char *)payload - (char *)&data2 == 94);
packet_dump_stdio(&handler);
packet_print(&handler);
/******************************************************
* packet_get_outermost/innermost_layer
@@ -483,7 +483,7 @@ TEST(PACKET_PARSE, ETH_VLAN_IP6_IP4_GRE_PPP_IP4_UDP_DNS)
const char *payload = packet_parse(&handler, (const char *)data3, sizeof(data3));
EXPECT_TRUE(payload != nullptr);
EXPECT_TRUE((char *)payload - (char *)&data3 == 126);
packet_dump_stdio(&handler);
packet_print(&handler);
/******************************************************
* packet_get_outermost/innermost_layer
@@ -690,7 +690,7 @@ TEST(PACKET_PARSE, ETH_IP4_IP6_TCP)
const char *payload = packet_parse(&handler, (const char *)data4, sizeof(data4));
EXPECT_TRUE(payload != nullptr);
EXPECT_TRUE((char *)payload - (char *)&data4 == 106);
packet_dump_stdio(&handler);
packet_print(&handler);
/******************************************************
* packet_get_outermost/innermost_layer
@@ -845,7 +845,7 @@ TEST(PACKET_PARSE, ETH_IP6_IP6_UDP)
const char *payload = packet_parse(&handler, (const char *)data5, sizeof(data5));
EXPECT_TRUE(payload != nullptr);
EXPECT_TRUE((char *)payload - (char *)&data5 == 102);
packet_dump_stdio(&handler);
packet_print(&handler);
/******************************************************
* packet_get_outermost/innermost_layer
@@ -1001,7 +1001,7 @@ TEST(PACKET_PARSE, ETH_MPLS_IP4_TCP)
const char *payload = packet_parse(&handler, (const char *)data6, sizeof(data6));
EXPECT_TRUE(payload != nullptr);
EXPECT_TRUE((char *)payload - (char *)&data6 == 70);
packet_dump_stdio(&handler);
packet_print(&handler);
/******************************************************
* packet_get_outermost/innermost_layer
@@ -1168,7 +1168,7 @@ TEST(PACKET_PARSE, ETH_MPLS_MPLS_IP4_TCP)
const char *payload = packet_parse(&handler, (const char *)data7, sizeof(data7));
EXPECT_TRUE(payload != nullptr);
EXPECT_TRUE((char *)payload - (char *)&data7 == 66);
packet_dump_stdio(&handler);
packet_print(&handler);
/******************************************************
* packet_get_outermost/innermost_layer
@@ -1345,7 +1345,7 @@ TEST(PACKET_PARSE, ETH_VLAN_PPPOE_IP4_TCP)
const char *payload = packet_parse(&handler, (const char *)data8, sizeof(data8));
EXPECT_TRUE(payload != nullptr);
EXPECT_TRUE((char *)payload - (char *)&data8 == 78);
packet_dump_stdio(&handler);
packet_print(&handler);
/******************************************************
* packet_get_outermost/innermost_layer
@@ -1598,7 +1598,7 @@ TEST(PACKET_PARSE, ETH_IP6_UDP_GTP_IP6_TCP_TLS)
const char *payload = packet_parse(&handler, (const char *)data9, sizeof(data9));
EXPECT_TRUE(payload != nullptr);
EXPECT_TRUE((char *)payload - (char *)&data9 == 130);
packet_dump_stdio(&handler);
packet_print(&handler);
/******************************************************
* packet_get_outermost/innermost_layer
@@ -1852,7 +1852,7 @@ TEST(PACKET_PARSE, ETH_IP6_UDP_GTP_IP4_TCP_TLS)
const char *payload = packet_parse(&handler, (const char *)data10, sizeof(data10));
EXPECT_TRUE(payload != nullptr);
EXPECT_TRUE((char *)payload - (char *)&data10 == 122);
packet_dump_stdio(&handler);
packet_print(&handler);
/******************************************************
* packet_get_outermost/innermost_layer
@@ -2054,7 +2054,7 @@ TEST(PACKET_PARSE, ETH_IP4_UDP_VXLAN_ETH_IP4_UDP_DNS)
const char *payload = packet_parse(&handler, (const char *)data11, sizeof(data11));
EXPECT_TRUE(payload != nullptr);
EXPECT_TRUE((char *)payload - (char *)&data11 == 92);
packet_dump_stdio(&handler);
packet_print(&handler);
/******************************************************
* packet_get_outermost/innermost_layer
@@ -2211,7 +2211,7 @@ TEST(PACKET_PARSE, ETH_MPLS_MPLS_PWETHCW_ETH_ARP)
const char *payload = packet_parse(&handler, (const char *)data12, sizeof(data12));
EXPECT_TRUE(payload != nullptr);
EXPECT_TRUE((char *)payload - (char *)&data12 == 40);
packet_dump_stdio(&handler);
packet_print(&handler);
/******************************************************
* packet_get_outermost/innermost_layer
@@ -2348,7 +2348,7 @@ TEST(PACKET_PARSE, ETH_IP4_ICMP)
const char *payload = packet_parse(&handler, (const char *)data13, sizeof(data13));
EXPECT_TRUE(payload != nullptr);
EXPECT_TRUE((char *)payload - (char *)&data13 == 14 + 20 + 8);
packet_dump_stdio(&handler);
packet_print(&handler);
/******************************************************
* packet_get_outermost/innermost_layer
@@ -2454,7 +2454,7 @@ TEST(PACKET_PARSE, ETH_IP6_ICMP6)
const char *payload = packet_parse(&handler, (const char *)data14, sizeof(data14));
EXPECT_TRUE(payload != nullptr);
EXPECT_TRUE((char *)payload - (char *)&data14 == 14 + 40 + 8);
packet_dump_stdio(&handler);
packet_print(&handler);
/******************************************************
* packet_get_outermost/innermost_layer
@@ -2619,7 +2619,7 @@ TEST(PACKET_PARSE, ETH_IP4_UDP_L2TPV2_PPP_IP4_UDP)
const char *payload = packet_parse(&handler, (const char *)data15, sizeof(data15));
EXPECT_TRUE(payload != nullptr);
EXPECT_TRUE((char *)payload - (char *)&data15 == 14 + 20 + 8 + 8 + 4 + 20 + 8);
packet_dump_stdio(&handler);
packet_print(&handler);
/******************************************************
* packet_get_outermost/innermost_layer
@@ -2784,7 +2784,7 @@ TEST(PACKET_PARSE, ETH_IP4_TCP_PADDING)
const char *payload = packet_parse(&handler, (const char *)data16, sizeof(data16));
EXPECT_TRUE(payload != nullptr);
EXPECT_TRUE((char *)payload - (char *)&data16 == 14 + 20 + 20);
packet_dump_stdio(&handler);
packet_print(&handler);
/******************************************************
* packet_get_outermost/innermost_layer
@@ -2961,7 +2961,7 @@ TEST(PACKET_PARSE, ETH_IP6_UDP_GTP_IP4_UDP)
const char *payload = packet_parse(&handler, (const char *)data17, sizeof(data17));
EXPECT_TRUE(payload != nullptr);
EXPECT_TRUE((char *)payload - (char *)&data17 == 14 + 40 + 8 + 16 + 20 + 8);
packet_dump_stdio(&handler);
packet_print(&handler);
/******************************************************
* packet_get_outermost/innermost_layer

12
src/packet/test/gtest_tunnel.cpp
View File

@@ -546,7 +546,7 @@ TEST(TUNNEL, IPV4)
memset(&pkt, 0, sizeof(pkt));
packet_parse(&pkt, (const char *)data1, sizeof(data1));
packet_dump_stdio(&pkt);
packet_print(&pkt);
EXPECT_TRUE(packet_get_tunnel_count(&pkt) == 1);
@@ -574,7 +574,7 @@ TEST(TUNNEL, GRE)
memset(&pkt, 0, sizeof(pkt));
packet_parse(&pkt, (const char *)data2, sizeof(data2));
packet_dump_stdio(&pkt);
packet_print(&pkt);
EXPECT_TRUE(packet_get_tunnel_count(&pkt) == 2);
@@ -608,7 +608,7 @@ TEST(TUNNEL, GTP)
memset(&pkt, 0, sizeof(pkt));
packet_parse(&pkt, (const char *)data3, sizeof(data3));
packet_dump_stdio(&pkt);
packet_print(&pkt);
EXPECT_TRUE(packet_get_tunnel_count(&pkt) == 1);
@@ -637,7 +637,7 @@ TEST(TUNNEL, VXLAN)
memset(&pkt, 0, sizeof(pkt));
packet_parse(&pkt, (const char *)data4, sizeof(data4));
packet_dump_stdio(&pkt);
packet_print(&pkt);
EXPECT_TRUE(packet_get_tunnel_count(&pkt) == 1);
@@ -666,7 +666,7 @@ TEST(TUNNEL, L2TP)
memset(&pkt, 0, sizeof(pkt));
packet_parse(&pkt, (const char *)data5, sizeof(data5));
packet_dump_stdio(&pkt);
packet_print(&pkt);
EXPECT_TRUE(packet_get_tunnel_count(&pkt) == 1);
@@ -695,7 +695,7 @@ TEST(TUNNEL, TEREDO)
memset(&pkt, 0, sizeof(pkt));
packet_parse(&pkt, (const char *)data6, sizeof(data6));
packet_dump_stdio(&pkt);
packet_print(&pkt);
EXPECT_TRUE(packet_get_tunnel_count(&pkt) == 1);

2
test/packet_tool/packet_tool.cpp
View File

@@ -249,7 +249,7 @@ static void packet_handler(u_char *user, const struct pcap_pkthdr *h, const u_ch
if (rte->print_verbose)
{
PRINT_GREEN("frame=%lu len=%u", rte->pcap_count, h->caplen);
packet_dump_stdio(&pkt);
packet_print(&pkt);
}
if (rte->tshark_format)