optimizate: rename IP type to address family

This commit is contained in:
luwenpeng
2024-07-25 18:29:57 +08:00
parent b50f0c2c70
commit f43da9002b
10 changed files with 61 additions and 66 deletions

View File

@@ -8,7 +8,7 @@
#define TUPLE6_SET_V4_TCP(t6) \
{ \
memset(&t6, 0, sizeof(struct tuple6)); \
(t6).ip_type = IP_TYPE_V4; \
(t6).addr_family = AF_INET; \
(t6).src_addr.v4.s_addr = inet_addr("192.168.1.2"); \
(t6).dst_addr.v4.s_addr = inet_addr("192.168.1.3"); \
(t6).src_port = htons(1234); \
@@ -20,7 +20,7 @@
#define TUPLE6_SET_V6_UDP(t6) \
{ \
memset(&t6, 0, sizeof(struct tuple6)); \
(t6).ip_type = IP_TYPE_V6; \
(t6).addr_family = AF_INET6; \
inet_pton(AF_INET6, "2001:db8:0:0:0:ff00:42:8329", &(t6).src_addr.v6); \
inet_pton(AF_INET6, "2001:db8:0:0:0:ff00:42:832a", &(t6).dst_addr.v6); \
(t6).src_port = htons(2345); \
@@ -32,7 +32,7 @@
#define TUPLE6_SET_V6_TCP(t6) \
{ \
memset(&t6, 0, sizeof(struct tuple6)); \
(t6).ip_type = IP_TYPE_V6; \
(t6).addr_family = AF_INET6; \
inet_pton(AF_INET6, "2001:db8:0:0:0:ff00:42:8329", &(t6).src_addr.v6); \
inet_pton(AF_INET6, "2001:db8:0:0:0:ff00:42:832a", &(t6).dst_addr.v6); \
(t6).src_port = htons(3456); \
@@ -44,7 +44,7 @@
#define TUPLE6_TO_TUPLE4(t6, t4) \
{ \
memset(&(t4), 0, sizeof(struct tuple4)); \
(t4).ip_type = (t6).ip_type; \
(t4).addr_family = (t6).addr_family; \
(t4).src_addr = (t6).src_addr; \
(t4).dst_addr = (t6).dst_addr; \
(t4).src_port = (t6).src_port; \