diff --git a/src/packet/packet.cpp b/src/packet/packet.cpp index 9813645..151b3ad 100644 --- a/src/packet/packet.cpp +++ b/src/packet/packet.cpp @@ -21,7 +21,7 @@ #define PACKET_LOG_DATA_INSUFFICIENCY(type) \ { \ PACKET_LOG_ERROR("layer: %s, data insufficiency", \ - layer_type_tostring((type))); \ + layer_type_to_str((type))); \ } #define PACKET_LOG_UNSUPPORT_PROTO(tag, next_proto) \ @@ -30,26 +30,26 @@ (tag), (next_proto)); \ } -#define PACKET_LOG_UNSUPPORT_ETHPROTO(tag, next_proto) \ - { \ - PACKET_LOG_ERROR("%s: unsupport next proto %d: %s", \ - (tag), (next_proto), ethproto_tostring(next_proto)); \ +#define PACKET_LOG_UNSUPPORT_ETHPROTO(tag, next_proto) \ + { \ + PACKET_LOG_ERROR("%s: unsupport next proto %d: %s", \ + (tag), (next_proto), ethproto_to_str(next_proto)); \ } -#define PACKET_LOG_UNSUPPORT_IPPROTO(tag, next_proto) \ - { \ - PACKET_LOG_ERROR("%s: unsupport next proto %d: %s", \ - (tag), (next_proto), ipproto_tostring(next_proto)); \ +#define PACKET_LOG_UNSUPPORT_IPPROTO(tag, next_proto) \ + { \ + PACKET_LOG_ERROR("%s: unsupport next proto %d: %s", \ + (tag), (next_proto), ipproto_to_str(next_proto)); \ } /****************************************************************************** * Static API ******************************************************************************/ -static const char *ethproto_tostring(uint16_t proto); -static const char *ipproto_tostring(uint16_t proto); -static inline const char *ldbc_method_tostring(enum ldbc_method method); -static inline const char *layer_type_tostring(enum layer_type type); +static const char *ethproto_to_str(uint16_t proto); +static const char *ipproto_to_str(uint16_t proto); +static inline const char *ldbc_method_to_str(enum ldbc_method method); +static inline const char *layer_type_to_str(enum layer_type type); static inline void set_tuple2(const char *data, enum layer_type type, struct tuple2 *tuple); static inline void set_tuple4(const char *data, enum layer_type type, struct tuple4 *tuple); @@ -86,7 +86,7 @@ static inline const char *parse_l4(struct packet *handler, uint8_t next_proto, c * Private API -- Utils ******************************************************************************/ -static const char *ethproto_tostring(uint16_t proto) +static const char *ethproto_to_str(uint16_t proto) { switch (proto) { @@ -193,7 +193,7 @@ static const char *ethproto_tostring(uint16_t proto) } } -static const char *ipproto_tostring(uint16_t proto) +static const char *ipproto_to_str(uint16_t proto) { switch (proto) { @@ -258,7 +258,7 @@ static const char *ipproto_tostring(uint16_t proto) } } -static inline const char *ldbc_method_tostring(enum ldbc_method method) +static inline const char *ldbc_method_to_str(enum ldbc_method method) { switch (method) { @@ -277,7 +277,7 @@ static inline const char *ldbc_method_tostring(enum ldbc_method method) } } -static inline const char *layer_type_tostring(enum layer_type type) +static inline const char *layer_type_to_str(enum layer_type type) { switch (type) { @@ -432,7 +432,7 @@ static inline struct layer_record *get_free_layer(struct packet *handler) (_layer)->pld_len = (_len) - (_hdr_len); \ (_handler)->layers_used++; \ PACKET_LOG_DEBUG("layer[%d/%d]: %s, hdr_offset: %d, hdr_ptr: %p, hdr_len: %d, pld_ptr: %p, pld_len: %d", \ - (_handler)->layers_used - 1, (_handler)->layers_size, layer_type_tostring((_type)), \ + (_handler)->layers_used - 1, (_handler)->layers_size, layer_type_to_str((_type)), \ (_layer)->hdr_offset, (_layer)->hdr_ptr, (_layer)->hdr_len, (_layer)->pld_ptr, (_layer)->pld_len); \ } @@ -1134,7 +1134,7 @@ void packet_print(const struct packet *handler) { const struct layer_record *layer = &handler->layers[i]; printf(" layer[%u]: %p, type: %s, hdr_offset: %u, hdr_ptr: %p, hdr_len: %u, pld_ptr: %p, pld_len: %u\n", - i, layer, layer_type_tostring(layer->type), layer->hdr_offset, + i, layer, layer_type_to_str(layer->type), layer->hdr_offset, layer->hdr_ptr, layer->hdr_len, layer->pld_ptr, layer->pld_len); } for (uint16_t i = 0; i < handler->data_len; i++) diff --git a/src/packet/test/gtest_packet.cpp b/src/packet/test/gtest_packet.cpp index 357aa6d..beae0ff 100644 --- a/src/packet/test/gtest_packet.cpp +++ b/src/packet/test/gtest_packet.cpp @@ -182,10 +182,10 @@ TEST(PACKET, ETH_VLAN_VLAN_IP4_IP4_UDP) EXPECT_TRUE(packet_get_outermost_tuple2(&handler, &outer_tuple2) == 0); EXPECT_TRUE(packet_get_innermost_tuple2(&handler, &inner_tuple2) == 0); memset(buffer, 0, sizeof(buffer)); - tuple2_tostring(&outer_tuple2, buffer, sizeof(buffer)); + tuple2_to_str(&outer_tuple2, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "69.67.35.146 -> 41.202.46.110"); memset(buffer, 0, sizeof(buffer)); - tuple2_tostring(&inner_tuple2, buffer, sizeof(buffer)); + tuple2_to_str(&inner_tuple2, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "10.10.100.25 -> 10.10.101.2"); /****************************************************** @@ -197,10 +197,10 @@ TEST(PACKET, ETH_VLAN_VLAN_IP4_IP4_UDP) EXPECT_TRUE(packet_get_outermost_tuple4(&handler, &outer_tuple4) == 0); EXPECT_TRUE(packet_get_innermost_tuple4(&handler, &inner_tuple4) == 0); memset(buffer, 0, sizeof(buffer)); - tuple4_tostring(&outer_tuple4, buffer, sizeof(buffer)); + tuple4_to_str(&outer_tuple4, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "10.10.100.25:62367 -> 10.10.101.2:17000"); memset(buffer, 0, sizeof(buffer)); - tuple4_tostring(&inner_tuple4, buffer, sizeof(buffer)); + tuple4_to_str(&inner_tuple4, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "10.10.100.25:62367 -> 10.10.101.2:17000"); /****************************************************** @@ -212,10 +212,10 @@ TEST(PACKET, ETH_VLAN_VLAN_IP4_IP4_UDP) EXPECT_TRUE(packet_get_outermost_tuple6(&handler, &outer_tuple6) == 0); EXPECT_TRUE(packet_get_innermost_tuple6(&handler, &inner_tuple6) == 0); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(&outer_tuple6, buffer, sizeof(buffer)); + tuple6_to_str(&outer_tuple6, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "10.10.100.25:62367 -> 10.10.101.2:17000, proto: 17, domain: 0"); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(&inner_tuple6, buffer, sizeof(buffer)); + tuple6_to_str(&inner_tuple6, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "10.10.100.25:62367 -> 10.10.101.2:17000, proto: 17, domain: 0"); } #endif @@ -409,10 +409,10 @@ TEST(PACKET, ETH_IP6_IP4_TCP_SSH) EXPECT_TRUE(packet_get_outermost_tuple2(&handler, &outer_tuple2) == 0); EXPECT_TRUE(packet_get_innermost_tuple2(&handler, &inner_tuple2) == 0); memset(buffer, 0, sizeof(buffer)); - tuple2_tostring(&outer_tuple2, buffer, sizeof(buffer)); + tuple2_to_str(&outer_tuple2, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "2001::192:168:40:134 -> 2001::192:168:40:133"); memset(buffer, 0, sizeof(buffer)); - tuple2_tostring(&inner_tuple2, buffer, sizeof(buffer)); + tuple2_to_str(&inner_tuple2, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "1.1.1.1 -> 2.2.2.2"); /****************************************************** @@ -424,9 +424,9 @@ TEST(PACKET, ETH_IP6_IP4_TCP_SSH) EXPECT_TRUE(packet_get_outermost_tuple4(&handler, &outer_tuple4) == 0); EXPECT_TRUE(packet_get_innermost_tuple4(&handler, &inner_tuple4) == 0); memset(buffer, 0, sizeof(buffer)); - tuple4_tostring(&outer_tuple4, buffer, sizeof(buffer)); + tuple4_to_str(&outer_tuple4, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "1.1.1.1:57639 -> 2.2.2.2:22"); - tuple4_tostring(&inner_tuple4, buffer, sizeof(buffer)); + tuple4_to_str(&inner_tuple4, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "1.1.1.1:57639 -> 2.2.2.2:22"); /****************************************************** @@ -438,10 +438,10 @@ TEST(PACKET, ETH_IP6_IP4_TCP_SSH) EXPECT_TRUE(packet_get_outermost_tuple6(&handler, &outer_tuple6) == 0); EXPECT_TRUE(packet_get_innermost_tuple6(&handler, &inner_tuple6) == 0); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(&outer_tuple6, buffer, sizeof(buffer)); + tuple6_to_str(&outer_tuple6, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "1.1.1.1:57639 -> 2.2.2.2:22, proto: 6, domain: 0"); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(&inner_tuple6, buffer, sizeof(buffer)); + tuple6_to_str(&inner_tuple6, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "1.1.1.1:57639 -> 2.2.2.2:22, proto: 6, domain: 0"); } #endif @@ -691,10 +691,10 @@ TEST(PACKET, ETH_VLAN_IP6_IP4_GRE_PPP_IP4_UDP_DNS) EXPECT_TRUE(packet_get_outermost_tuple2(&handler, &outer_tuple2) == 0); EXPECT_TRUE(packet_get_innermost_tuple2(&handler, &inner_tuple2) == 0); memset(buffer, 0, sizeof(buffer)); - tuple2_tostring(&outer_tuple2, buffer, sizeof(buffer)); + tuple2_to_str(&outer_tuple2, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "2607:fcd0:100:2300::b108:2a6b -> 2402:f000:1:8e01::5555"); memset(buffer, 0, sizeof(buffer)); - tuple2_tostring(&inner_tuple2, buffer, sizeof(buffer)); + tuple2_to_str(&inner_tuple2, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "8.8.8.8 -> 172.16.44.3"); /****************************************************** @@ -706,10 +706,10 @@ TEST(PACKET, ETH_VLAN_IP6_IP4_GRE_PPP_IP4_UDP_DNS) EXPECT_TRUE(packet_get_outermost_tuple4(&handler, &outer_tuple4) == 0); EXPECT_TRUE(packet_get_innermost_tuple4(&handler, &inner_tuple4) == 0); memset(buffer, 0, sizeof(buffer)); - tuple4_tostring(&outer_tuple4, buffer, sizeof(buffer)); + tuple4_to_str(&outer_tuple4, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "8.8.8.8:53 -> 172.16.44.3:9879"); memset(buffer, 0, sizeof(buffer)); - tuple4_tostring(&inner_tuple4, buffer, sizeof(buffer)); + tuple4_to_str(&inner_tuple4, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "8.8.8.8:53 -> 172.16.44.3:9879"); /****************************************************** @@ -721,10 +721,10 @@ TEST(PACKET, ETH_VLAN_IP6_IP4_GRE_PPP_IP4_UDP_DNS) EXPECT_TRUE(packet_get_outermost_tuple6(&handler, &outer_tuple6) == 0); EXPECT_TRUE(packet_get_innermost_tuple6(&handler, &inner_tuple6) == 0); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(&outer_tuple6, buffer, sizeof(buffer)); + tuple6_to_str(&outer_tuple6, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "8.8.8.8:53 -> 172.16.44.3:9879, proto: 17, domain: 0"); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(&inner_tuple6, buffer, sizeof(buffer)); + tuple6_to_str(&inner_tuple6, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "8.8.8.8:53 -> 172.16.44.3:9879, proto: 17, domain: 0"); } #endif @@ -890,10 +890,10 @@ TEST(PACKET, ETH_IP4_IP6_TCP) EXPECT_TRUE(packet_get_outermost_tuple2(&handler, &outer_tuple2) == 0); EXPECT_TRUE(packet_get_innermost_tuple2(&handler, &inner_tuple2) == 0); memset(buffer, 0, sizeof(buffer)); - tuple2_tostring(&outer_tuple2, buffer, sizeof(buffer)); + tuple2_to_str(&outer_tuple2, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "210.77.88.163 -> 59.66.4.50"); memset(buffer, 0, sizeof(buffer)); - tuple2_tostring(&inner_tuple2, buffer, sizeof(buffer)); + tuple2_to_str(&inner_tuple2, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "2001:da8:200:900e:200:5efe:d24d:58a3 -> 2600:140e:6::1702:1058"); /****************************************************** @@ -905,10 +905,10 @@ TEST(PACKET, ETH_IP4_IP6_TCP) EXPECT_TRUE(packet_get_outermost_tuple4(&handler, &outer_tuple4) == 0); EXPECT_TRUE(packet_get_innermost_tuple4(&handler, &inner_tuple4) == 0); memset(buffer, 0, sizeof(buffer)); - tuple4_tostring(&outer_tuple4, buffer, sizeof(buffer)); + tuple4_to_str(&outer_tuple4, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "2001:da8:200:900e:200:5efe:d24d:58a3:52556 -> 2600:140e:6::1702:1058:80"); memset(buffer, 0, sizeof(buffer)); - tuple4_tostring(&inner_tuple4, buffer, sizeof(buffer)); + tuple4_to_str(&inner_tuple4, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "2001:da8:200:900e:200:5efe:d24d:58a3:52556 -> 2600:140e:6::1702:1058:80"); /****************************************************** @@ -920,10 +920,10 @@ TEST(PACKET, ETH_IP4_IP6_TCP) EXPECT_TRUE(packet_get_outermost_tuple6(&handler, &outer_tuple6) == 0); EXPECT_TRUE(packet_get_innermost_tuple6(&handler, &inner_tuple6) == 0); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(&outer_tuple6, buffer, sizeof(buffer)); + tuple6_to_str(&outer_tuple6, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "2001:da8:200:900e:200:5efe:d24d:58a3:52556 -> 2600:140e:6::1702:1058:80, proto: 6, domain: 0"); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(&inner_tuple6, buffer, sizeof(buffer)); + tuple6_to_str(&inner_tuple6, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "2001:da8:200:900e:200:5efe:d24d:58a3:52556 -> 2600:140e:6::1702:1058:80, proto: 6, domain: 0"); } #endif @@ -1069,10 +1069,10 @@ TEST(PACKET, ETH_IP6_IP6_UDP) EXPECT_TRUE(packet_get_outermost_tuple2(&handler, &outer_tuple2) == 0); EXPECT_TRUE(packet_get_innermost_tuple2(&handler, &inner_tuple2) == 0); memset(buffer, 0, sizeof(buffer)); - tuple2_tostring(&outer_tuple2, buffer, sizeof(buffer)); + tuple2_to_str(&outer_tuple2, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "2001:4f8:4:7:2e0:81ff:fe52:ffff -> 2001:4f8:4:7:2e0:81ff:fe52:9a6b"); memset(buffer, 0, sizeof(buffer)); - tuple2_tostring(&inner_tuple2, buffer, sizeof(buffer)); + tuple2_to_str(&inner_tuple2, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "dead::beef -> cafe::babe"); /****************************************************** @@ -1084,10 +1084,10 @@ TEST(PACKET, ETH_IP6_IP6_UDP) EXPECT_TRUE(packet_get_outermost_tuple4(&handler, &outer_tuple4) == 0); EXPECT_TRUE(packet_get_innermost_tuple4(&handler, &inner_tuple4) == 0); memset(buffer, 0, sizeof(buffer)); - tuple4_tostring(&outer_tuple4, buffer, sizeof(buffer)); + tuple4_to_str(&outer_tuple4, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "dead::beef:30000 -> cafe::babe:13000"); memset(buffer, 0, sizeof(buffer)); - tuple4_tostring(&inner_tuple4, buffer, sizeof(buffer)); + tuple4_to_str(&inner_tuple4, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "dead::beef:30000 -> cafe::babe:13000"); /****************************************************** @@ -1099,10 +1099,10 @@ TEST(PACKET, ETH_IP6_IP6_UDP) EXPECT_TRUE(packet_get_outermost_tuple6(&handler, &outer_tuple6) == 0); EXPECT_TRUE(packet_get_innermost_tuple6(&handler, &inner_tuple6) == 0); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(&outer_tuple6, buffer, sizeof(buffer)); + tuple6_to_str(&outer_tuple6, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "dead::beef:30000 -> cafe::babe:13000, proto: 17, domain: 0"); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(&inner_tuple6, buffer, sizeof(buffer)); + tuple6_to_str(&inner_tuple6, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "dead::beef:30000 -> cafe::babe:13000, proto: 17, domain: 0"); } #endif @@ -1267,10 +1267,10 @@ TEST(PACKET, ETH_MPLS_IP4_TCP) EXPECT_TRUE(packet_get_outermost_tuple2(&handler, &outer_tuple2) == 0); EXPECT_TRUE(packet_get_innermost_tuple2(&handler, &inner_tuple2) == 0); memset(buffer, 0, sizeof(buffer)); - tuple2_tostring(&outer_tuple2, buffer, sizeof(buffer)); + tuple2_to_str(&outer_tuple2, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "119.40.37.65 -> 123.125.29.250"); memset(buffer, 0, sizeof(buffer)); - tuple2_tostring(&inner_tuple2, buffer, sizeof(buffer)); + tuple2_to_str(&inner_tuple2, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "119.40.37.65 -> 123.125.29.250"); /****************************************************** @@ -1282,10 +1282,10 @@ TEST(PACKET, ETH_MPLS_IP4_TCP) EXPECT_TRUE(packet_get_outermost_tuple4(&handler, &outer_tuple4) == 0); EXPECT_TRUE(packet_get_innermost_tuple4(&handler, &inner_tuple4) == 0); memset(buffer, 0, sizeof(buffer)); - tuple4_tostring(&outer_tuple4, buffer, sizeof(buffer)); + tuple4_to_str(&outer_tuple4, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "119.40.37.65:61853 -> 123.125.29.250:80"); memset(buffer, 0, sizeof(buffer)); - tuple4_tostring(&inner_tuple4, buffer, sizeof(buffer)); + tuple4_to_str(&inner_tuple4, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "119.40.37.65:61853 -> 123.125.29.250:80"); /****************************************************** @@ -1297,10 +1297,10 @@ TEST(PACKET, ETH_MPLS_IP4_TCP) EXPECT_TRUE(packet_get_outermost_tuple6(&handler, &outer_tuple6) == 0); EXPECT_TRUE(packet_get_innermost_tuple6(&handler, &inner_tuple6) == 0); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(&outer_tuple6, buffer, sizeof(buffer)); + tuple6_to_str(&outer_tuple6, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "119.40.37.65:61853 -> 123.125.29.250:80, proto: 6, domain: 0"); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(&inner_tuple6, buffer, sizeof(buffer)); + tuple6_to_str(&inner_tuple6, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "119.40.37.65:61853 -> 123.125.29.250:80, proto: 6, domain: 0"); } #endif @@ -1478,10 +1478,10 @@ TEST(PACKET, ETH_MPLS_MPLS_IP4_TCP) EXPECT_TRUE(packet_get_outermost_tuple2(&handler, &outer_tuple2) == 0); EXPECT_TRUE(packet_get_innermost_tuple2(&handler, &inner_tuple2) == 0); memset(buffer, 0, sizeof(buffer)); - tuple2_tostring(&outer_tuple2, buffer, sizeof(buffer)); + tuple2_to_str(&outer_tuple2, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "10.31.0.1 -> 10.34.0.1"); memset(buffer, 0, sizeof(buffer)); - tuple2_tostring(&inner_tuple2, buffer, sizeof(buffer)); + tuple2_to_str(&inner_tuple2, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "10.31.0.1 -> 10.34.0.1"); /****************************************************** @@ -1493,10 +1493,10 @@ TEST(PACKET, ETH_MPLS_MPLS_IP4_TCP) EXPECT_TRUE(packet_get_outermost_tuple4(&handler, &outer_tuple4) == 0); EXPECT_TRUE(packet_get_innermost_tuple4(&handler, &inner_tuple4) == 0); memset(buffer, 0, sizeof(buffer)); - tuple4_tostring(&outer_tuple4, buffer, sizeof(buffer)); + tuple4_to_str(&outer_tuple4, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "10.31.0.1:11001 -> 10.34.0.1:23"); memset(buffer, 0, sizeof(buffer)); - tuple4_tostring(&inner_tuple4, buffer, sizeof(buffer)); + tuple4_to_str(&inner_tuple4, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "10.31.0.1:11001 -> 10.34.0.1:23"); /****************************************************** @@ -1508,10 +1508,10 @@ TEST(PACKET, ETH_MPLS_MPLS_IP4_TCP) EXPECT_TRUE(packet_get_outermost_tuple6(&handler, &outer_tuple6) == 0); EXPECT_TRUE(packet_get_innermost_tuple6(&handler, &inner_tuple6) == 0); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(&outer_tuple6, buffer, sizeof(buffer)); + tuple6_to_str(&outer_tuple6, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "10.31.0.1:11001 -> 10.34.0.1:23, proto: 6, domain: 0"); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(&inner_tuple6, buffer, sizeof(buffer)); + tuple6_to_str(&inner_tuple6, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "10.31.0.1:11001 -> 10.34.0.1:23, proto: 6, domain: 0"); } #endif @@ -1701,9 +1701,9 @@ TEST(PACKET, ETH_VLAN_PPPOE_IP4_TCP) EXPECT_TRUE(packet_get_outermost_tuple2(&handler, &outer_tuple2) == 0); EXPECT_TRUE(packet_get_innermost_tuple2(&handler, &inner_tuple2) == 0); memset(buffer, 0, sizeof(buffer)); - tuple2_tostring(&outer_tuple2, buffer, sizeof(buffer)); + tuple2_to_str(&outer_tuple2, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "100.65.55.0 -> 91.185.14.33"); - tuple2_tostring(&inner_tuple2, buffer, sizeof(buffer)); + tuple2_to_str(&inner_tuple2, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "100.65.55.0 -> 91.185.14.33"); /****************************************************** @@ -1715,10 +1715,10 @@ TEST(PACKET, ETH_VLAN_PPPOE_IP4_TCP) EXPECT_TRUE(packet_get_outermost_tuple4(&handler, &outer_tuple4) == 0); EXPECT_TRUE(packet_get_innermost_tuple4(&handler, &inner_tuple4) == 0); memset(buffer, 0, sizeof(buffer)); - tuple4_tostring(&outer_tuple4, buffer, sizeof(buffer)); + tuple4_to_str(&outer_tuple4, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "100.65.55.0:34532 -> 91.185.14.33:443"); memset(buffer, 0, sizeof(buffer)); - tuple4_tostring(&inner_tuple4, buffer, sizeof(buffer)); + tuple4_to_str(&inner_tuple4, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "100.65.55.0:34532 -> 91.185.14.33:443"); /****************************************************** @@ -1730,10 +1730,10 @@ TEST(PACKET, ETH_VLAN_PPPOE_IP4_TCP) EXPECT_TRUE(packet_get_outermost_tuple6(&handler, &outer_tuple6) == 0); EXPECT_TRUE(packet_get_innermost_tuple6(&handler, &inner_tuple6) == 0); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(&outer_tuple6, buffer, sizeof(buffer)); + tuple6_to_str(&outer_tuple6, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "100.65.55.0:34532 -> 91.185.14.33:443, proto: 6, domain: 0"); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(&inner_tuple6, buffer, sizeof(buffer)); + tuple6_to_str(&inner_tuple6, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "100.65.55.0:34532 -> 91.185.14.33:443, proto: 6, domain: 0"); } #endif @@ -1980,10 +1980,10 @@ TEST(PACKET, ETH_IP6_UDP_GTP_IP6_TCP_TLS) EXPECT_TRUE(packet_get_outermost_tuple2(&handler, &outer_tuple2) == 0); EXPECT_TRUE(packet_get_innermost_tuple2(&handler, &inner_tuple2) == 0); memset(buffer, 0, sizeof(buffer)); - tuple2_tostring(&outer_tuple2, buffer, sizeof(buffer)); + tuple2_to_str(&outer_tuple2, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "2409:8034:4040:5300::105 -> 2409:8034:4025::60:61"); memset(buffer, 0, sizeof(buffer)); - tuple2_tostring(&inner_tuple2, buffer, sizeof(buffer)); + tuple2_to_str(&inner_tuple2, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "2409:8c34:4400:700:0:4:0:3 -> 2409:8934:5082:2100:ecad:e0e4:530a:c269"); /****************************************************** @@ -1995,10 +1995,10 @@ TEST(PACKET, ETH_IP6_UDP_GTP_IP6_TCP_TLS) EXPECT_TRUE(packet_get_outermost_tuple4(&handler, &outer_tuple4) == 0); EXPECT_TRUE(packet_get_innermost_tuple4(&handler, &inner_tuple4) == 0); memset(buffer, 0, sizeof(buffer)); - tuple4_tostring(&outer_tuple4, buffer, sizeof(buffer)); + tuple4_to_str(&outer_tuple4, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "2409:8034:4040:5300::105:2152 -> 2409:8034:4025::60:61:2152"); memset(buffer, 0, sizeof(buffer)); - tuple4_tostring(&inner_tuple4, buffer, sizeof(buffer)); + tuple4_to_str(&inner_tuple4, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "2409:8c34:4400:700:0:4:0:3:443 -> 2409:8934:5082:2100:ecad:e0e4:530a:c269:46582"); /****************************************************** @@ -2010,10 +2010,10 @@ TEST(PACKET, ETH_IP6_UDP_GTP_IP6_TCP_TLS) EXPECT_TRUE(packet_get_outermost_tuple6(&handler, &outer_tuple6) == 0); EXPECT_TRUE(packet_get_innermost_tuple6(&handler, &inner_tuple6) == 0); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(&outer_tuple6, buffer, sizeof(buffer)); + tuple6_to_str(&outer_tuple6, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "2409:8034:4040:5300::105:2152 -> 2409:8034:4025::60:61:2152, proto: 17, domain: 0"); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(&inner_tuple6, buffer, sizeof(buffer)); + tuple6_to_str(&inner_tuple6, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "2409:8c34:4400:700:0:4:0:3:443 -> 2409:8934:5082:2100:ecad:e0e4:530a:c269:46582, proto: 6, domain: 0"); } #endif @@ -2273,10 +2273,10 @@ TEST(PACKET, ETH_IP6_UDP_GTP_IP4_TCP_TLS) EXPECT_TRUE(packet_get_outermost_tuple2(&handler, &outer_tuple2) == 0); EXPECT_TRUE(packet_get_innermost_tuple2(&handler, &inner_tuple2) == 0); memset(buffer, 0, sizeof(buffer)); - tuple2_tostring(&outer_tuple2, buffer, sizeof(buffer)); + tuple2_to_str(&outer_tuple2, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "2409:8034:4025::50:a31 -> 2409:8034:4040:5301::204"); memset(buffer, 0, sizeof(buffer)); - tuple2_tostring(&inner_tuple2, buffer, sizeof(buffer)); + tuple2_to_str(&inner_tuple2, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "10.49.115.138 -> 121.196.250.66"); /****************************************************** @@ -2288,10 +2288,10 @@ TEST(PACKET, ETH_IP6_UDP_GTP_IP4_TCP_TLS) EXPECT_TRUE(packet_get_outermost_tuple4(&handler, &outer_tuple4) == 0); EXPECT_TRUE(packet_get_innermost_tuple4(&handler, &inner_tuple4) == 0); memset(buffer, 0, sizeof(buffer)); - tuple4_tostring(&outer_tuple4, buffer, sizeof(buffer)); + tuple4_to_str(&outer_tuple4, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "2409:8034:4025::50:a31:2152 -> 2409:8034:4040:5301::204:2152"); memset(buffer, 0, sizeof(buffer)); - tuple4_tostring(&inner_tuple4, buffer, sizeof(buffer)); + tuple4_to_str(&inner_tuple4, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "10.49.115.138:50081 -> 121.196.250.66:443"); /****************************************************** @@ -2303,10 +2303,10 @@ TEST(PACKET, ETH_IP6_UDP_GTP_IP4_TCP_TLS) EXPECT_TRUE(packet_get_outermost_tuple6(&handler, &outer_tuple6) == 0); EXPECT_TRUE(packet_get_innermost_tuple6(&handler, &inner_tuple6) == 0); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(&outer_tuple6, buffer, sizeof(buffer)); + tuple6_to_str(&outer_tuple6, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "2409:8034:4025::50:a31:2152 -> 2409:8034:4040:5301::204:2152, proto: 17, domain: 0"); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(&inner_tuple6, buffer, sizeof(buffer)); + tuple6_to_str(&inner_tuple6, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "10.49.115.138:50081 -> 121.196.250.66:443, proto: 6, domain: 0"); } #endif @@ -2505,10 +2505,10 @@ TEST(PACKET, ETH_IP4_UDP_VXLAN_ETH_IP4_UDP_DNS) EXPECT_TRUE(packet_get_outermost_tuple2(&handler, &outer_tuple2) == 0); EXPECT_TRUE(packet_get_innermost_tuple2(&handler, &inner_tuple2) == 0); memset(buffer, 0, sizeof(buffer)); - tuple2_tostring(&outer_tuple2, buffer, sizeof(buffer)); + tuple2_to_str(&outer_tuple2, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "10.1.1.1 -> 192.168.1.10"); memset(buffer, 0, sizeof(buffer)); - tuple2_tostring(&inner_tuple2, buffer, sizeof(buffer)); + tuple2_to_str(&inner_tuple2, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.11.193 -> 114.114.114.114"); /****************************************************** @@ -2520,10 +2520,10 @@ TEST(PACKET, ETH_IP4_UDP_VXLAN_ETH_IP4_UDP_DNS) EXPECT_TRUE(packet_get_outermost_tuple4(&handler, &outer_tuple4) == 0); EXPECT_TRUE(packet_get_innermost_tuple4(&handler, &inner_tuple4) == 0); memset(buffer, 0, sizeof(buffer)); - tuple4_tostring(&outer_tuple4, buffer, sizeof(buffer)); + tuple4_to_str(&outer_tuple4, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "10.1.1.1:50709 -> 192.168.1.10:4789"); memset(buffer, 0, sizeof(buffer)); - tuple4_tostring(&inner_tuple4, buffer, sizeof(buffer)); + tuple4_to_str(&inner_tuple4, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.11.193:65290 -> 114.114.114.114:53"); /****************************************************** @@ -2535,10 +2535,10 @@ TEST(PACKET, ETH_IP4_UDP_VXLAN_ETH_IP4_UDP_DNS) EXPECT_TRUE(packet_get_outermost_tuple6(&handler, &outer_tuple6) == 0); EXPECT_TRUE(packet_get_innermost_tuple6(&handler, &inner_tuple6) == 0); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(&outer_tuple6, buffer, sizeof(buffer)); + tuple6_to_str(&outer_tuple6, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "10.1.1.1:50709 -> 192.168.1.10:4789, proto: 17, domain: 0"); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(&inner_tuple6, buffer, sizeof(buffer)); + tuple6_to_str(&inner_tuple6, buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.11.193:65290 -> 114.114.114.114:53, proto: 17, domain: 0"); } #endif diff --git a/src/session/session.cpp b/src/session/session.cpp index be8d9a2..d6a6466 100644 --- a/src/session/session.cpp +++ b/src/session/session.cpp @@ -392,7 +392,7 @@ void session_run_expirecb(struct session *sess) * session dump ******************************************************************************/ -static void tcp_state_tostring(enum tcp_state state, char *buffer, size_t buffer_len) +static void tcp_state_to_str(enum tcp_state state, char *buffer, size_t buffer_len) { if (state == 0) { @@ -451,7 +451,7 @@ static void tcp_state_tostring(enum tcp_state state, char *buffer, size_t buffer } } -static void udp_state_tostring(enum udp_state state, char *buffer, size_t buffer_len) +static void udp_state_to_str(enum udp_state state, char *buffer, size_t buffer_len) { if (state == 0) { @@ -470,7 +470,7 @@ static void udp_state_tostring(enum udp_state state, char *buffer, size_t buffer } } -const char *session_closing_reason_tostring(enum closing_reason reason) +const char *session_closing_reason_to_str(enum closing_reason reason) { switch (reason) { @@ -491,7 +491,7 @@ const char *session_closing_reason_tostring(enum closing_reason reason) } } -const char *session_state_tostring(enum session_state state) +const char *session_state_to_str(enum session_state state) { switch (state) { @@ -508,7 +508,7 @@ const char *session_state_tostring(enum session_state state) } } -const char *session_type_tostring(enum session_type type) +const char *session_type_to_str(enum session_type type) { switch (type) { @@ -521,7 +521,7 @@ const char *session_type_tostring(enum session_type type) } } -const char *session_dir_tostring(enum session_dir dir) +const char *session_dir_to_str(enum session_dir dir) { switch (dir) { @@ -534,7 +534,7 @@ const char *session_dir_tostring(enum session_dir dir) } } -const char *dup_traffic_flag_tostring(enum dup_traffic_flag flag) +const char *dup_traffic_flag_to_str(enum dup_traffic_flag flag) { switch (flag) { @@ -550,15 +550,15 @@ const char *dup_traffic_flag_tostring(enum dup_traffic_flag flag) void session_dump(struct session *sess) { char buffer[1024] = {0}; - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); printf("session id : %" PRIu64 "\n", session_get_id(sess)); printf("session key : %s\n", buffer); - printf("session key dir : %s\n", session_dir_tostring(session_get_key_dir(sess))); - printf("session state : %s\n", session_state_tostring(session_get_state(sess))); - printf("session type : %s\n", session_type_tostring(session_get_type(sess))); - printf("session dup traffic flag : %s\n", dup_traffic_flag_tostring(session_get_dup_traffic_flag(sess))); - printf("session closing reason : %s\n", session_closing_reason_tostring(session_get_closing_reason(sess))); + printf("session key dir : %s\n", session_dir_to_str(session_get_key_dir(sess))); + printf("session state : %s\n", session_state_to_str(session_get_state(sess))); + printf("session type : %s\n", session_type_to_str(session_get_type(sess))); + printf("session dup traffic flag : %s\n", dup_traffic_flag_to_str(session_get_dup_traffic_flag(sess))); + printf("session closing reason : %s\n", session_closing_reason_to_str(session_get_closing_reason(sess))); printf("session c2s packets : %" PRIu64 "\n", session_get_c2s_packets(sess)); printf("session c2s bytes : %" PRIu64 "\n", session_get_c2s_bytes(sess)); printf("session s2c packets : %" PRIu64 "\n", session_get_s2c_packets(sess)); @@ -568,17 +568,17 @@ void session_dump(struct session *sess) if (session_get_type(sess) == SESSION_TYPE_TCP) { memset(buffer, 0, sizeof(buffer)); - tcp_state_tostring(session_get_tcp_state(sess), buffer, sizeof(buffer)); + tcp_state_to_str(session_get_tcp_state(sess), buffer, sizeof(buffer)); printf("session tcp state : %s\n", buffer); } else if (session_get_type(sess) == SESSION_TYPE_UDP) { memset(buffer, 0, sizeof(buffer)); - udp_state_tostring(session_get_udp_state(sess), buffer, sizeof(buffer)); + udp_state_to_str(session_get_udp_state(sess), buffer, sizeof(buffer)); printf("session udp state : %s\n", buffer); } printf("session current packet ptr : %p\n", (void *)session_get0_cur_pkt(sess)); - printf("session current packet dir : %s\n", session_dir_tostring(session_get_cur_dir(sess))); + printf("session current packet dir : %s\n", session_dir_to_str(session_get_cur_dir(sess))); printf("session ex data: \n"); for (uint8_t i = 0; i < g_ex_manager.count; i++) { diff --git a/src/session/session.h b/src/session/session.h index be478dc..f8ca719 100644 --- a/src/session/session.h +++ b/src/session/session.h @@ -192,10 +192,10 @@ void session_run_expirecb(struct session *sess); * session dump ******************************************************************************/ -const char *session_closing_reason_tostring(enum closing_reason reason); -const char *session_state_tostring(enum session_state state); -const char *session_type_tostring(enum session_type type); -const char *session_dir_tostring(enum session_dir dir); +const char *session_closing_reason_to_str(enum closing_reason reason); +const char *session_state_to_str(enum session_state state); +const char *session_type_to_str(enum session_type type); +const char *session_dir_to_str(enum session_dir dir); void session_dump(struct session *sess); #ifdef __cpluscplus diff --git a/src/session/session_manager.cpp b/src/session/session_manager.cpp index 2ebb644..5b8497c 100644 --- a/src/session/session_manager.cpp +++ b/src/session/session_manager.cpp @@ -847,7 +847,7 @@ static inline struct session *session_manager_new_tcp_session(struct session_man session_update_tcp_state(sess, tcp_layer, curr_dir); char buffer[128] = {0}; - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); SESSION_LOG_DEBUG("session new: %lu %s", session_get_id(sess), buffer); SESSION_LOG_DEBUG("TCP %s received, session %lu init -> opening", (curr_dir == SESSION_DIR_C2S ? "SYN" : "SYNACK"), session_get_id(sess)); @@ -900,7 +900,7 @@ static inline struct session *session_manager_new_udp_session(struct session_man session_table_add_session(mgr->udp_sess_table, key, sess); char buffer[128] = {0}; - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); SESSION_LOG_DEBUG("session new: %lu %s", session_get_id(sess), buffer); SESSION_LOG_DEBUG("UDP %s first packet received, session %lu init -> opening", (curr_dir == SESSION_DIR_C2S ? "C2S" : "S2C"), session_get_id(sess)); @@ -981,7 +981,7 @@ static inline void session_manager_free_session(struct session_manager *mgr, str { if (sess) { - SESSION_LOG_DEBUG("%s, session %lu closing -> closed", session_closing_reason_tostring(session_get_closing_reason(sess)), session_get_id(sess)); + SESSION_LOG_DEBUG("%s, session %lu closing -> closed", session_closing_reason_to_str(session_get_closing_reason(sess)), session_get_id(sess)); session_manager_update_session_to_closed(mgr, sess); if (session_get_type(sess) == SESSION_TYPE_TCP) { diff --git a/src/session/test/gtest_state_tcp_active_to_closing.cpp b/src/session/test/gtest_state_tcp_active_to_closing.cpp index 8aba97f..92a40b7 100644 --- a/src/session/test/gtest_state_tcp_active_to_closing.cpp +++ b/src/session/test/gtest_state_tcp_active_to_closing.cpp @@ -15,7 +15,7 @@ static void build_active_tcp_session(struct session_manager *mgr, struct session EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -50,7 +50,7 @@ static void build_active_tcp_session(struct session_manager *mgr, struct session EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE); @@ -105,7 +105,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_FIN_FIN) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE); @@ -139,7 +139,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_FIN_FIN) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING); @@ -203,7 +203,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_C2S_RST) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING); @@ -267,7 +267,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_S2C_RST) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING); @@ -350,7 +350,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_C2S_HALF_CLOSED_TIMEOUT) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE); @@ -407,7 +407,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_S2C_HALF_CLOSED_TIMEOUT) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE); diff --git a/src/session/test/gtest_state_tcp_init_to_opening.cpp b/src/session/test/gtest_state_tcp_init_to_opening.cpp index 49eb8aa..691c697 100644 --- a/src/session/test/gtest_state_tcp_init_to_opening.cpp +++ b/src/session/test/gtest_state_tcp_init_to_opening.cpp @@ -27,7 +27,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -82,7 +82,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYNACK) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "93.184.216.34:80 -> 192.168.38.105:60111, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_S2C); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -137,7 +137,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_SYNACK) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -172,7 +172,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_SYNACK) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -227,7 +227,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_SYNACK_ACK) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -262,7 +262,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_SYNACK_ACK) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -297,7 +297,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_SYNACK_ACK) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -353,7 +353,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_RETRANSMISSION) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -394,7 +394,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_RETRANSMISSION) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -451,7 +451,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYNACK_RETRANSMISSION) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "93.184.216.34:80 -> 192.168.38.105:60111, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_S2C); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -492,7 +492,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYNACK_RETRANSMISSION) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "93.184.216.34:80 -> 192.168.38.105:60111, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_S2C); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -547,7 +547,7 @@ TEST(TCP_INIT_TO_OPENING, BY_C2S_ASMMETRIC) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -582,7 +582,7 @@ TEST(TCP_INIT_TO_OPENING, BY_C2S_ASMMETRIC) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -637,7 +637,7 @@ TEST(TCP_INIT_TO_OPENING, BY_S2C_ASMMETRIC) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "93.184.216.34:80 -> 192.168.38.105:60111, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_S2C); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -672,7 +672,7 @@ TEST(TCP_INIT_TO_OPENING, BY_S2C_ASMMETRIC) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "93.184.216.34:80 -> 192.168.38.105:60111, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_S2C); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); diff --git a/src/session/test/gtest_state_tcp_init_to_opening_to_active_to_closing_to_closed.cpp b/src/session/test/gtest_state_tcp_init_to_opening_to_active_to_closing_to_closed.cpp index 87a0b25..8498571 100644 --- a/src/session/test/gtest_state_tcp_init_to_opening_to_active_to_closing_to_closed.cpp +++ b/src/session/test/gtest_state_tcp_init_to_opening_to_active_to_closing_to_closed.cpp @@ -24,7 +24,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_id(sess) != 0); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -60,7 +60,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_id(sess) != 0); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -95,7 +95,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_id(sess) != 0); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -130,7 +130,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_id(sess) != 0); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE); @@ -165,7 +165,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_id(sess) != 0); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE); @@ -200,7 +200,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_id(sess) != 0); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE); @@ -235,7 +235,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_id(sess) != 0); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE); @@ -270,7 +270,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_id(sess) != 0); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE); @@ -305,7 +305,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_id(sess) != 0); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE); @@ -340,7 +340,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_id(sess) != 0); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING); @@ -375,7 +375,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_id(sess) != 0); memset(buffer, 0, sizeof(buffer)); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING); diff --git a/src/session/test/gtest_state_tcp_opening_to_active.cpp b/src/session/test/gtest_state_tcp_opening_to_active.cpp index 6a855a1..0131db9 100644 --- a/src/session/test/gtest_state_tcp_opening_to_active.cpp +++ b/src/session/test/gtest_state_tcp_opening_to_active.cpp @@ -27,7 +27,7 @@ TEST(TCP_OPENING_TO_ACTIVE, BY_SYN_C2S_DATA) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -62,7 +62,7 @@ TEST(TCP_OPENING_TO_ACTIVE, BY_SYN_C2S_DATA) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE); @@ -116,7 +116,7 @@ TEST(TCP_OPENING_TO_ACTIVE, BY_SYNACK_S2C_DATA) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "93.184.216.34:80 -> 192.168.38.105:60111, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_S2C); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -151,7 +151,7 @@ TEST(TCP_OPENING_TO_ACTIVE, BY_SYNACK_S2C_DATA) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "93.184.216.34:80 -> 192.168.38.105:60111, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_S2C); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE); diff --git a/src/session/test/gtest_state_tcp_opening_to_closing.cpp b/src/session/test/gtest_state_tcp_opening_to_closing.cpp index 4a9e155..f585691 100644 --- a/src/session/test/gtest_state_tcp_opening_to_closing.cpp +++ b/src/session/test/gtest_state_tcp_opening_to_closing.cpp @@ -15,7 +15,7 @@ static void build_opening_tcp_session(struct session_manager *mgr, struct sessio EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -71,7 +71,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_FIN_FIN) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -105,7 +105,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_FIN_FIN) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING); @@ -169,7 +169,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_C2S_RST) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING); @@ -233,7 +233,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_S2C_RST) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING); @@ -316,7 +316,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_HANDSHAKE_TIMEOUT) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -374,7 +374,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_DATA_TIMEOUT) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -409,7 +409,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_DATA_TIMEOUT) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -466,7 +466,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_C2S_HALF_CLOSED_TIMEOUT) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -523,7 +523,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_S2C_HALF_CLOSED_TIMEOUT) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); diff --git a/src/session/test/gtest_state_udp_init_to_opening_to_active_to_closing.cpp b/src/session/test/gtest_state_udp_init_to_opening_to_active_to_closing.cpp index ddb6203..afeb68c 100644 --- a/src/session/test/gtest_state_udp_init_to_opening_to_active_to_closing.cpp +++ b/src/session/test/gtest_state_udp_init_to_opening_to_active_to_closing.cpp @@ -31,7 +31,7 @@ TEST(UDP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING, TEST) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:61099 -> 121.14.154.93:53, proto: 17, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -66,7 +66,7 @@ TEST(UDP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING, TEST) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:61099 -> 121.14.154.93:53, proto: 17, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE); diff --git a/src/session/test/gtest_state_udp_init_to_opening_to_closing.cpp b/src/session/test/gtest_state_udp_init_to_opening_to_closing.cpp index 2270508..47b9f2f 100644 --- a/src/session/test/gtest_state_udp_init_to_opening_to_closing.cpp +++ b/src/session/test/gtest_state_udp_init_to_opening_to_closing.cpp @@ -29,7 +29,7 @@ TEST(UDP_INIT_TO_OPENING_TO_CLOSING, BY_C2S) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:61099 -> 121.14.154.93:53, proto: 17, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); @@ -86,7 +86,7 @@ TEST(UDP_INIT_TO_OPENING_TO_CLOSING, BY_S2C) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get0_key(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "121.14.154.93:53 -> 192.168.38.105:61099, proto: 17, domain: 0"); EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_S2C); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); diff --git a/src/tuple/test/gtest_tuple.cpp b/src/tuple/test/gtest_tuple.cpp index bdc080e..278a17d 100644 --- a/src/tuple/test/gtest_tuple.cpp +++ b/src/tuple/test/gtest_tuple.cpp @@ -25,22 +25,22 @@ TEST(TUPLE, TUPLE2) inet_pton(AF_INET6, "2001:db8::ff00:42:8329", &tuple_b.src_addr.v6); inet_pton(AF_INET6, "2001:db8::ff00:42:832a", &tuple_b.dst_addr.v6); - // tostring + // to_str memset(buf, 0, sizeof(buf)); - tuple2_tostring(&tuple_a, buf, sizeof(buf)); + tuple2_to_str(&tuple_a, buf, sizeof(buf)); EXPECT_STREQ(buf, "192.168.1.2 -> 192.168.1.3"); memset(buf, 0, sizeof(buf)); - tuple2_tostring(&tuple_b, buf, sizeof(buf)); + tuple2_to_str(&tuple_b, buf, sizeof(buf)); EXPECT_STREQ(buf, "2001:db8::ff00:42:8329 -> 2001:db8::ff00:42:832a"); // reverse tuple2_reverse(&tuple_a, &reversed_tuple_a); tuple2_reverse(&tuple_b, &reversed_tuple_b); memset(buf, 0, sizeof(buf)); - tuple2_tostring(&reversed_tuple_a, buf, sizeof(buf)); + tuple2_to_str(&reversed_tuple_a, buf, sizeof(buf)); EXPECT_STREQ(buf, "192.168.1.3 -> 192.168.1.2"); memset(buf, 0, sizeof(buf)); - tuple2_tostring(&reversed_tuple_b, buf, sizeof(buf)); + tuple2_to_str(&reversed_tuple_b, buf, sizeof(buf)); EXPECT_STREQ(buf, "2001:db8::ff00:42:832a -> 2001:db8::ff00:42:8329"); // hash @@ -88,22 +88,22 @@ TEST(TUPLE, TUPLE4) tuple_b.src_port = htons(1234); tuple_b.dst_port = htons(5678); - // tostring + // to_str memset(buf, 0, sizeof(buf)); - tuple4_tostring(&tuple_a, buf, sizeof(buf)); + tuple4_to_str(&tuple_a, buf, sizeof(buf)); EXPECT_STREQ(buf, "192.168.1.2:1234 -> 192.168.1.3:5678"); memset(buf, 0, sizeof(buf)); - tuple4_tostring(&tuple_b, buf, sizeof(buf)); + tuple4_to_str(&tuple_b, buf, sizeof(buf)); EXPECT_STREQ(buf, "2001:db8::ff00:42:8329:1234 -> 2001:db8::ff00:42:832a:5678"); // reverse tuple4_reverse(&tuple_a, &reversed_tuple_a); tuple4_reverse(&tuple_b, &reversed_tuple_b); memset(buf, 0, sizeof(buf)); - tuple4_tostring(&reversed_tuple_a, buf, sizeof(buf)); + tuple4_to_str(&reversed_tuple_a, buf, sizeof(buf)); EXPECT_STREQ(buf, "192.168.1.3:5678 -> 192.168.1.2:1234"); memset(buf, 0, sizeof(buf)); - tuple4_tostring(&reversed_tuple_b, buf, sizeof(buf)); + tuple4_to_str(&reversed_tuple_b, buf, sizeof(buf)); EXPECT_STREQ(buf, "2001:db8::ff00:42:832a:5678 -> 2001:db8::ff00:42:8329:1234"); // hash @@ -153,22 +153,22 @@ TEST(TUPLE, TUPLE5) tuple_b.dst_port = htons(5678); tuple_b.ip_proto = IPPROTO_UDP; - // tostring + // to_str memset(buf, 0, sizeof(buf)); - tuple5_tostring(&tuple_a, buf, sizeof(buf)); + tuple5_to_str(&tuple_a, buf, sizeof(buf)); EXPECT_STREQ(buf, "192.168.1.2:1234 -> 192.168.1.3:5678, proto: 6"); memset(buf, 0, sizeof(buf)); - tuple5_tostring(&tuple_b, buf, sizeof(buf)); + tuple5_to_str(&tuple_b, buf, sizeof(buf)); EXPECT_STREQ(buf, "2001:db8::ff00:42:8329:1234 -> 2001:db8::ff00:42:832a:5678, proto: 17"); // reverse tuple5_reverse(&tuple_a, &reversed_tuple_a); tuple5_reverse(&tuple_b, &reversed_tuple_b); memset(buf, 0, sizeof(buf)); - tuple5_tostring(&reversed_tuple_a, buf, sizeof(buf)); + tuple5_to_str(&reversed_tuple_a, buf, sizeof(buf)); EXPECT_STREQ(buf, "192.168.1.3:5678 -> 192.168.1.2:1234, proto: 6"); memset(buf, 0, sizeof(buf)); - tuple5_tostring(&reversed_tuple_b, buf, sizeof(buf)); + tuple5_to_str(&reversed_tuple_b, buf, sizeof(buf)); EXPECT_STREQ(buf, "2001:db8::ff00:42:832a:5678 -> 2001:db8::ff00:42:8329:1234, proto: 17"); // hash @@ -220,22 +220,22 @@ TEST(TUPLE, TUPLE6) tuple_b.ip_proto = IPPROTO_UDP; tuple_b.domain = 0; - // tostring + // to_str memset(buf, 0, sizeof(buf)); - tuple6_tostring(&tuple_a, buf, sizeof(buf)); + tuple6_to_str(&tuple_a, buf, sizeof(buf)); EXPECT_STREQ(buf, "192.168.1.2:1234 -> 192.168.1.3:5678, proto: 6, domain: 0"); memset(buf, 0, sizeof(buf)); - tuple6_tostring(&tuple_b, buf, sizeof(buf)); + tuple6_to_str(&tuple_b, buf, sizeof(buf)); EXPECT_STREQ(buf, "2001:db8::ff00:42:8329:1234 -> 2001:db8::ff00:42:832a:5678, proto: 17, domain: 0"); // reverse tuple6_reverse(&tuple_a, &reversed_tuple_a); tuple6_reverse(&tuple_b, &reversed_tuple_b); memset(buf, 0, sizeof(buf)); - tuple6_tostring(&reversed_tuple_a, buf, sizeof(buf)); + tuple6_to_str(&reversed_tuple_a, buf, sizeof(buf)); EXPECT_STREQ(buf, "192.168.1.3:5678 -> 192.168.1.2:1234, proto: 6, domain: 0"); memset(buf, 0, sizeof(buf)); - tuple6_tostring(&reversed_tuple_b, buf, sizeof(buf)); + tuple6_to_str(&reversed_tuple_b, buf, sizeof(buf)); EXPECT_STREQ(buf, "2001:db8::ff00:42:832a:5678 -> 2001:db8::ff00:42:8329:1234, proto: 17, domain: 0"); // hash diff --git a/src/tuple/tuple.cpp b/src/tuple/tuple.cpp index d7aa012..34bc15e 100644 --- a/src/tuple/tuple.cpp +++ b/src/tuple/tuple.cpp @@ -367,7 +367,7 @@ void tuple6_reverse(const struct tuple6 *in, struct tuple6 *out) } } -void tuple2_tostring(const struct tuple2 *tuple, char *buf, uint32_t size) +void tuple2_to_str(const struct tuple2 *tuple, char *buf, uint32_t size) { char src_addr[INET6_ADDRSTRLEN] = {0}; char dst_addr[INET6_ADDRSTRLEN] = {0}; @@ -386,7 +386,7 @@ void tuple2_tostring(const struct tuple2 *tuple, char *buf, uint32_t size) snprintf(buf, size, "%s -> %s", src_addr, dst_addr); } -void tuple4_tostring(const struct tuple4 *tuple, char *buf, uint32_t size) +void tuple4_to_str(const struct tuple4 *tuple, char *buf, uint32_t size) { char src_addr[INET6_ADDRSTRLEN] = {0}; char dst_addr[INET6_ADDRSTRLEN] = {0}; @@ -407,7 +407,7 @@ void tuple4_tostring(const struct tuple4 *tuple, char *buf, uint32_t size) dst_addr, ntohs(tuple->dst_port)); } -void tuple5_tostring(const struct tuple5 *tuple, char *buf, uint32_t size) +void tuple5_to_str(const struct tuple5 *tuple, char *buf, uint32_t size) { char src_addr[INET6_ADDRSTRLEN] = {0}; char dst_addr[INET6_ADDRSTRLEN] = {0}; @@ -429,7 +429,7 @@ void tuple5_tostring(const struct tuple5 *tuple, char *buf, uint32_t size) tuple->ip_proto); } -void tuple6_tostring(const struct tuple6 *tuple, char *buf, uint32_t size) +void tuple6_to_str(const struct tuple6 *tuple, char *buf, uint32_t size) { char src_addr[INET6_ADDRSTRLEN] = {0}; char dst_addr[INET6_ADDRSTRLEN] = {0}; diff --git a/src/tuple/tuple.h b/src/tuple/tuple.h index 7554c4b..1aba603 100644 --- a/src/tuple/tuple.h +++ b/src/tuple/tuple.h @@ -77,10 +77,10 @@ void tuple4_reverse(const struct tuple4 *in, struct tuple4 *out); void tuple5_reverse(const struct tuple5 *in, struct tuple5 *out); void tuple6_reverse(const struct tuple6 *in, struct tuple6 *out); -void tuple2_tostring(const struct tuple2 *tuple, char *buf, uint32_t size); -void tuple4_tostring(const struct tuple4 *tuple, char *buf, uint32_t size); -void tuple5_tostring(const struct tuple5 *tuple, char *buf, uint32_t size); -void tuple6_tostring(const struct tuple6 *tuple, char *buf, uint32_t size); +void tuple2_to_str(const struct tuple2 *tuple, char *buf, uint32_t size); +void tuple4_to_str(const struct tuple4 *tuple, char *buf, uint32_t size); +void tuple5_to_str(const struct tuple5 *tuple, char *buf, uint32_t size); +void tuple6_to_str(const struct tuple6 *tuple, char *buf, uint32_t size); #ifdef __cpluscplus }