From 16f0d03098cb1ae71a375581e692c929557686cd Mon Sep 17 00:00:00 2001 From: Fady Bader Date: Thu, 23 Jul 2020 10:08:25 +0300 Subject: [PATCH] net: build on Windows librte_net was not compiling under Windows. To solve this, needed header files are added. Signed-off-by: Fady Bader Acked-by: Ranjit Menon Tested-by: Pallavi Kadam Signed-off-by: Thomas Monjalon --- lib/librte_eal/windows/include/netinet/in.h | 25 +++++++++++++++++++++ lib/librte_eal/windows/include/netinet/ip.h | 10 +++++++++ lib/librte_net/rte_ether.c | 4 ++++ lib/meson.build | 2 +- 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 lib/librte_eal/windows/include/netinet/in.h create mode 100644 lib/librte_eal/windows/include/netinet/ip.h diff --git a/lib/librte_eal/windows/include/netinet/in.h b/lib/librte_eal/windows/include/netinet/in.h new file mode 100644 index 0000000000..534a2d99a5 --- /dev/null +++ b/lib/librte_eal/windows/include/netinet/in.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2020 Mellanox Technologies, Ltd + */ + +#ifndef _IN_H_ +#define _IN_H_ + +#define IPPROTO_IP 0 +#define IPPROTO_HOPOPTS 0 +#define IPPROTO_ICMP 1 +#define IPPROTO_IPIP 4 +#define IPPROTO_TCP 6 +#define IPPROTO_UDP 17 +#define IPPROTO_IPV6 41 +#define IPPROTO_ROUTING 43 +#define IPPROTO_FRAGMENT 44 +#define IPPROTO_GRE 47 +#define IPPROTO_ESP 50 +#define IPPROTO_AH 51 +#define IPPROTO_ICMPV6 58 +#define IPPROTO_NONE 59 +#define IPPROTO_DSTOPTS 60 +#define IPPROTO_SCTP 132 + +#endif diff --git a/lib/librte_eal/windows/include/netinet/ip.h b/lib/librte_eal/windows/include/netinet/ip.h new file mode 100644 index 0000000000..2126498797 --- /dev/null +++ b/lib/librte_eal/windows/include/netinet/ip.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2020 Mellanox Technologies, Ltd + */ + +#ifndef _IP_H_ +#define _IP_H_ + +#define IPVERSION 4 + +#endif diff --git a/lib/librte_net/rte_ether.c b/lib/librte_net/rte_ether.c index ced65ed9f3..34605838b5 100644 --- a/lib/librte_net/rte_ether.c +++ b/lib/librte_net/rte_ether.c @@ -10,12 +10,16 @@ void rte_eth_random_addr(uint8_t *addr) { +#ifdef RTE_EXEC_ENV_WINDOWS /* FIXME: random is not supported */ + RTE_SET_USED(addr); +#else uint64_t rand = rte_rand(); uint8_t *p = (uint8_t *)&rand; rte_memcpy(addr, p, RTE_ETHER_ADDR_LEN); addr[0] &= (uint8_t)~RTE_ETHER_GROUP_ADDR; /* clear multicast bit */ addr[0] |= RTE_ETHER_LOCAL_ADMIN_ADDR; /* set local assignment bit */ +#endif } void diff --git a/lib/meson.build b/lib/meson.build index 3852c01564..283ee6c505 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -40,7 +40,7 @@ if is_windows 'kvargs', 'eal', 'ring', - 'mempool', 'mbuf', 'pci', + 'mempool', 'mbuf', 'net', 'pci', ] # only supported libraries for windows endif -- 2.20.1