[dpdk-dev] [PATCH v6 4/5] net: provide IP-related API on any OS
From: Dmitry Kozlyuk <hidden>
Date: 2021-03-20 13:06:33
Subsystem:
library code, networking drivers, the rest · Maintainers:
Andrew Morton, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Users of <rte_ip.h> relied on it to provide IP-related defines, like IPPROTO_* constatns, but still had to include POSIX headers for inet_pton() and other standard IP-related facilities. Extend <rte_ip.h> so that it is a single header to gain access to IP-related facilities on any OS. Use it to replace POSIX include in components enabled on Windows. Signed-off-by: Dmitry Kozlyuk <redacted> --- drivers/net/mlx5/mlx5.h | 2 +- drivers/net/mlx5/mlx5_flow.c | 4 ++-- drivers/net/mlx5/mlx5_flow.h | 4 ++-- drivers/net/mlx5/mlx5_mac.c | 1 - examples/cmdline/commands.c | 5 ----- examples/cmdline/parse_obj_list.c | 2 -- lib/librte_cmdline/cmdline.c | 1 - lib/librte_cmdline/cmdline_parse.c | 2 -- lib/librte_cmdline/cmdline_parse_etheraddr.c | 6 ------ lib/librte_cmdline/cmdline_parse_ipaddr.c | 6 ------ lib/librte_cmdline/cmdline_parse_ipaddr.h | 2 +- lib/librte_ethdev/rte_ethdev.c | 13 +++++-------- lib/librte_ethdev/rte_ethdev_core.h | 1 - lib/librte_net/rte_ip.h | 3 +++ 14 files changed, 14 insertions(+), 38 deletions(-)
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index a281fd20ea..f04da06abd 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h@@ -10,7 +10,7 @@ #include <stdbool.h> #include <stdint.h> #include <limits.h> -#include <netinet/in.h> + #include <sys/queue.h> #include <rte_pci.h>
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index ab5be3dacc..73253bd39e 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c@@ -3,13 +3,13 @@ * Copyright 2016 Mellanox Technologies, Ltd */ -#include <netinet/in.h> -#include <sys/queue.h> #include <stdalign.h> #include <stdint.h> #include <string.h> #include <stdbool.h> +#include <sys/queue.h> + #include <rte_common.h> #include <rte_ether.h> #include <ethdev_driver.h>
diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index 8324e188e1..c4e5f19faa 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h@@ -5,12 +5,12 @@ #ifndef RTE_PMD_MLX5_FLOW_H_ #define RTE_PMD_MLX5_FLOW_H_ -#include <netinet/in.h> -#include <sys/queue.h> #include <stdalign.h> #include <stdint.h> #include <string.h> +#include <sys/queue.h> + #include <rte_alarm.h> #include <rte_mtr.h>
diff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c
index 6ffcfcd97a..f0450735e2 100644
--- a/drivers/net/mlx5/mlx5_mac.c
+++ b/drivers/net/mlx5/mlx5_mac.c@@ -8,7 +8,6 @@ #include <string.h> #include <inttypes.h> #include <errno.h> -#include <netinet/in.h> #include <rte_ether.h> #include <ethdev_driver.h>
diff --git a/examples/cmdline/commands.c b/examples/cmdline/commands.c
index f43eacfbad..9ce8ef389f 100644
--- a/examples/cmdline/commands.c
+++ b/examples/cmdline/commands.c@@ -8,12 +8,7 @@ #include <stdint.h> #include <string.h> #include <stdlib.h> -#include <stdarg.h> #include <errno.h> -#include <netinet/in.h> -#ifdef RTE_EXEC_ENV_FREEBSD -#include <sys/socket.h> -#endif #include <cmdline_rdline.h> #include <cmdline_parse.h>
diff --git a/examples/cmdline/parse_obj_list.c b/examples/cmdline/parse_obj_list.c
index b04adbea58..959bcd1452 100644
--- a/examples/cmdline/parse_obj_list.c
+++ b/examples/cmdline/parse_obj_list.c@@ -6,11 +6,9 @@ #include <stdio.h> #include <inttypes.h> -#include <stdarg.h> #include <errno.h> #include <ctype.h> #include <string.h> -#include <netinet/in.h> #include <cmdline_parse.h> #include <cmdline_parse_ipaddr.h>
diff --git a/lib/librte_cmdline/cmdline.c b/lib/librte_cmdline/cmdline.c
index 49770869bb..a176d15130 100644
--- a/lib/librte_cmdline/cmdline.c
+++ b/lib/librte_cmdline/cmdline.c@@ -12,7 +12,6 @@ #include <inttypes.h> #include <fcntl.h> #include <errno.h> -#include <netinet/in.h> #include <rte_string_fns.h>
diff --git a/lib/librte_cmdline/cmdline_parse.c b/lib/librte_cmdline/cmdline_parse.c
index fe366841cd..f5cc934782 100644
--- a/lib/librte_cmdline/cmdline_parse.c
+++ b/lib/librte_cmdline/cmdline_parse.c@@ -11,8 +11,6 @@ #include <inttypes.h> #include <ctype.h> -#include <netinet/in.h> - #include <rte_string_fns.h> #include "cmdline_private.h"
diff --git a/lib/librte_cmdline/cmdline_parse_etheraddr.c b/lib/librte_cmdline/cmdline_parse_etheraddr.c
index 5cb10de321..433b828a72 100644
--- a/lib/librte_cmdline/cmdline_parse_etheraddr.c
+++ b/lib/librte_cmdline/cmdline_parse_etheraddr.c@@ -5,13 +5,7 @@ */ #include <stdio.h> -#include <stdlib.h> -#include <stdarg.h> -#include <errno.h> -#include <inttypes.h> -#include <ctype.h> #include <string.h> -#include <sys/types.h> #include <rte_string_fns.h> #include <rte_ether.h>
diff --git a/lib/librte_cmdline/cmdline_parse_ipaddr.c b/lib/librte_cmdline/cmdline_parse_ipaddr.c
index f8dbdf204c..5e278c963f 100644
--- a/lib/librte_cmdline/cmdline_parse_ipaddr.c
+++ b/lib/librte_cmdline/cmdline_parse_ipaddr.c@@ -6,14 +6,8 @@ #include <stdio.h> #include <stdlib.h> -#include <stdarg.h> -#include <inttypes.h> -#include <ctype.h> #include <string.h> #include <errno.h> -#include <arpa/inet.h> -#include <netinet/in.h> -#include <sys/socket.h> #include <rte_string_fns.h>
diff --git a/lib/librte_cmdline/cmdline_parse_ipaddr.h b/lib/librte_cmdline/cmdline_parse_ipaddr.h
index 0ba81647bc..0118c31d44 100644
--- a/lib/librte_cmdline/cmdline_parse_ipaddr.h
+++ b/lib/librte_cmdline/cmdline_parse_ipaddr.h@@ -8,7 +8,7 @@ #define _PARSE_IPADDR_H_ #include <cmdline_parse.h> -#include <netinet/in.h> +#include <rte_ip.h> #ifdef __cplusplus extern "C" {
diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index 6f514c388b..f363794369 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c@@ -2,18 +2,15 @@ * Copyright(c) 2010-2017 Intel Corporation */ -#include <sys/types.h> -#include <sys/queue.h> #include <ctype.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <stdarg.h> #include <errno.h> +#include <inttypes.h> #include <stdbool.h> #include <stdint.h> -#include <inttypes.h> -#include <netinet/in.h> +#include <stdlib.h> +#include <string.h> + +#include <sys/queue.h> #include <rte_byteorder.h> #include <rte_log.h>
diff --git a/lib/librte_ethdev/rte_ethdev_core.h b/lib/librte_ethdev/rte_ethdev_core.h
index 918a34ed1f..4679d948fa 100644
--- a/lib/librte_ethdev/rte_ethdev_core.h
+++ b/lib/librte_ethdev/rte_ethdev_core.h@@ -6,7 +6,6 @@ #define _RTE_ETHDEV_CORE_H_ #include <pthread.h> -#include <sys/types.h> /** * @file
diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h
index 212ff2c4fd..2cf7b0bd28 100644
--- a/lib/librte_net/rte_ip.h
+++ b/lib/librte_net/rte_ip.h@@ -16,7 +16,10 @@ */ #include <stdint.h> + +#include <sys/socket.h> #include <sys/types.h> +#include <arpa/inet.h> #include <netinet/in.h> #include <netinet/ip.h>
--
2.29.3