sparse: Add guards to prevent FreeBSD-incompatible #include order.

FreeBSD insists that <sys/types.h> be included before <netinet/in.h> and
that <netinet/in.h> be included before <arpa/inet.h>.  This adds guards to
the "sparse" headers to yield a warning if this order is violated.  This
commit also adjusts the order of many #includes to suit this requirement.

Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Justin Pettit <jpettit@ovn.org>

diff --git a/configure.ac b/configure.ac
index 6a8113a5c58ca5673b5b26b5e85e8ab8998985bc..8f7f4a770e24953a1f8c1143eeb424fe2e774149 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -105,6 +105,7 @@ AC_CHECK_MEMBERS([struct ifreq.ifr_flagshigh], [], [], [[#include <net/if.h>]])
 AC_CHECK_MEMBERS([struct mmsghdr.msg_len], [], [], [[#include <sys/socket.h>]])
 AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id], [], [],
   [[#include <sys/socket.h>
+#include <sys/types.h>
 #include <netinet/in.h>]])
 AC_CHECK_FUNCS([mlockall strnlen getloadavg statvfs getmntent_r sendmmsg clock_gettime])
 AC_CHECK_HEADERS([mntent.h sys/statvfs.h linux/types.h linux/if_ether.h stdatomic.h])

diff --git a/include/openvswitch/packets.h b/include/openvswitch/packets.h
index c74ce286dde6aeb8baed5b32c63681d50986c820..43b93b374a630537d18e870ba080d5c3abd2bded 100644 (file)
--- a/include/openvswitch/packets.h
+++ b/include/openvswitch/packets.h
@@ -17,6 +17,7 @@
 #ifndef OPENVSWITCH_PACKETS_H
 #define OPENVSWITCH_PACKETS_H 1
 
+#include <sys/types.h>
 #include <netinet/in.h>
 #include "openvswitch/tun-metadata.h"
 

diff --git a/include/sparse/arpa/inet.h b/include/sparse/arpa/inet.h
index dd64e61764e8aa34de1bb8c2386e6d85dd45d23e..3634b230c8bb7ee27d9bd749ecf929b2c062fc5c 100644 (file)
--- a/include/sparse/arpa/inet.h
+++ b/include/sparse/arpa/inet.h
@@ -18,4 +18,8 @@
 #error "Use this header only with sparse.  It is not a correct implementation."
 #endif
 
+#ifndef NETINET_IN_H_INCLUDED
+#error "Must include <netinet/in.h> before <arpa/inet.h> for FreeBSD support"
+#endif
+
 #include <netinet/in.h>

diff --git a/include/sparse/automake.mk b/include/sparse/automake.mk
index f3282c2604149df7f65ef0520bf37c1c26063d1f..e9b42f52ccb75af4d5ec7c3e764f5fb346649179 100644 (file)
--- a/include/sparse/automake.mk
+++ b/include/sparse/automake.mk
@@ -13,4 +13,5 @@ noinst_HEADERS += \
         include/sparse/rte_memcpy.h \
         include/sparse/rte_vect.h \
         include/sparse/sys/socket.h \
+        include/sparse/sys/types.h \
         include/sparse/sys/wait.h

diff --git a/include/sparse/netinet/in.h b/include/sparse/netinet/in.h
index c28158ca02f583dc866f37e071348fe31e8bd3be..6abdb2331e230edc04690e42cbdaceaef4bf4cd7 100644 (file)
--- a/include/sparse/netinet/in.h
+++ b/include/sparse/netinet/in.h
@@ -18,6 +18,12 @@
 #error "Use this header only with sparse.  It is not a correct implementation."
 #endif
 
+#define NETINET_IN_H_INCLUDED 1
+
+#ifndef SYS_TYPES_H_INCLUDED
+#error "Must include <sys/types.h> before <netinet/in.h> for FreeBSD support"
+#endif
+
 #ifndef _NETINET_IN_H
 #define _NETINET_IN_H 1
 

diff --git a/include/sparse/sys/types.h b/include/sparse/sys/types.h
new file mode 100644 (file)
index 0000000..9bae5ae
--- /dev/null
+++ b/include/sparse/sys/types.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2011, 2013, 2014, 2015, 2017 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __CHECKER__
+#error "Use this header only with sparse.  It is not a correct implementation."
+#endif
+
+#define SYS_TYPES_H_INCLUDED 1
+#include_next <sys/types.h>

diff --git a/lib/bfd.c b/lib/bfd.c
index 40cd0beb9f12e3cc44699137af9cbc24f259bd77..482e779ea69722c2ad286bd276dc7489bd3efe69 100644 (file)
--- a/lib/bfd.c
+++ b/lib/bfd.c
@@ -16,6 +16,7 @@
 #include "bfd.h"
 
 #include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>

diff --git a/lib/bundle.c b/lib/bundle.c
index e6705a085999cbc1b67351c638a8bed43a69c465..a58d8d2472702ec42513ff3d4065ba95b53412fb 100644 (file)
--- a/lib/bundle.c
+++ b/lib/bundle.c
@@ -17,6 +17,8 @@
 
 #include "bundle.h"
 
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <inttypes.h>
 

diff --git a/lib/bundle.h b/lib/bundle.h
index 21f353f67f095b24427cc202c6df9547a7dc65ff..85a2e861d3674096bc1126b76bd70317c1d03fa2 100644 (file)
--- a/lib/bundle.h
+++ b/lib/bundle.h
@@ -16,6 +16,8 @@
 #ifndef BUNDLE_H
 #define BUNDLE_H 1
 
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdbool.h>
 #include <stddef.h>

diff --git a/lib/byte-order.h b/lib/byte-order.h
index b2a9082bbada8a3bca50e611246802c7352a245f..66d29a2b37da6e074b3abccf463be5f1f8540e63 100644 (file)
--- a/lib/byte-order.h
+++ b/lib/byte-order.h
@@ -16,8 +16,9 @@
 #ifndef BYTE_ORDER_H
 #define BYTE_ORDER_H 1
 
-#include <arpa/inet.h>
 #include <sys/types.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 #include <inttypes.h>
 #include "openvswitch/types.h"
 

diff --git a/lib/classifier.c b/lib/classifier.c
index ca0650afb42374947aca78772bd70dd6b9bb310d..16c451da1b306024bf921d2fa19325c9f430b359 100644 (file)
--- a/lib/classifier.c
+++ b/lib/classifier.c
@@ -18,6 +18,7 @@
 #include "classifier.h"
 #include "classifier-private.h"
 #include <errno.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 #include "byte-order.h"
 #include "openvswitch/dynamic-string.h"

diff --git a/lib/csum.c b/lib/csum.c
index 6419043aa5190b13edece3b30aadc2a7fa106591..eaa05ad98c038ab501bd3c2e6591df1dd4dc5eb4 100644 (file)
--- a/lib/csum.c
+++ b/lib/csum.c
@@ -17,6 +17,7 @@
 #include <config.h>
 #include "csum.h"
 #include "unaligned.h"
+#include <sys/types.h>
 #include <netinet/in.h>
 
 #ifndef __CHECKER__

diff --git a/lib/dpctl.c b/lib/dpctl.c
index a28ded98f79fae731dfae5ea3d0de844c7e06441..b76954406b3c44cb5a3cdad106a47a8d7bac84cf 100644 (file)
--- a/lib/dpctl.c
+++ b/lib/dpctl.c
@@ -15,12 +15,13 @@
  */
 
 #include <config.h>
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <sys/socket.h>
 #include <net/if.h>
-#include <netinet/in.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
index 55be632366bf2a0371e989d1e830a7ec4a84548c..6ba025b6697e8a2e1ab64ad65d9a3573b572ba88 100644 (file)
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@ -22,6 +22,7 @@
 #include <fcntl.h>
 #include <inttypes.h>
 #include <net/if.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <stdint.h>
 #include <stdlib.h>

diff --git a/lib/learning-switch.c b/lib/learning-switch.c
index 6b02e93892a949070ba0e834b90ba3d1a705a806..5b014e5f3757b247eb69507ec6fd5d8c5cbd481f 100644 (file)
--- a/lib/learning-switch.c
+++ b/lib/learning-switch.c
@@ -19,6 +19,7 @@
 
 #include <errno.h>
 #include <inttypes.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <stdlib.h>
 #include <time.h>

diff --git a/lib/lldp/lldpd-structs.h b/lib/lldp/lldpd-structs.h
index 15e5ce8fa75d6fb2a76faa90957795d6bcd0cc89..6a3ffb8d33f00760491322c7c5a6b56e6080d51d 100644 (file)
--- a/lib/lldp/lldpd-structs.h
+++ b/lib/lldp/lldpd-structs.h
@@ -20,11 +20,9 @@
 #define _LLDPD_STRUCTS_H
 
 #include <net/if.h>
-#ifndef _WIN32
+#include <sys/types.h>
 #include <netinet/in.h>
-#endif
 #include <sys/socket.h>
-#include <sys/types.h>
 #include "aa-structs.h"
 #include "lldp-const.h"
 #include "packets.h"

diff --git a/lib/lldp/lldpd.c b/lib/lldp/lldpd.c
index e9d1cf18e0364ef059cbb8e68a57038fb679da90..ff5e62846275de3641fc5f73055f44f121571bff 100644 (file)
--- a/lib/lldp/lldpd.c
+++ b/lib/lldp/lldpd.c
@@ -18,6 +18,8 @@
 
 #include <config.h>
 #include "lldpd.h"
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -28,7 +30,6 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #ifndef _WIN32

diff --git a/lib/lldp/lldpd.h b/lib/lldp/lldpd.h
index f77c6d52312e094cae17852923031209a245fa38..5267c112af5efc5a2b5410d111fab1b7ccf73fbf 100644 (file)
--- a/lib/lldp/lldpd.h
+++ b/lib/lldp/lldpd.h
@@ -19,13 +19,11 @@
 #ifndef _LLDPD_H
 #define _LLDPD_H
 
-#ifndef _WIN32
+#include <sys/types.h>
 #include <netinet/in.h>
-#endif
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
-#include <sys/types.h>
 #include "dp-packet.h"
 #include "openvswitch/list.h"
 #include "lldpd-structs.h"

diff --git a/lib/multipath.c b/lib/multipath.c
index 19e3d33e790d0c4710616b5a2fcf1ee5174ae6ec..fdbf94ea6947b24a0134bdc4cda12fb2a2a829ea 100644 (file)
--- a/lib/multipath.c
+++ b/lib/multipath.c
@@ -17,10 +17,10 @@
 #include <config.h>
 
 #include "multipath.h"
-#include <arpa/inet.h>
-#include <inttypes.h>
 #include <sys/types.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
+#include <inttypes.h>
 #include "colors.h"
 #include "nx-match.h"
 #include "openflow/nicira-ext.h"

diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c
index e809b8877a83d5b093c81ec4ef71fb06952b433b..40b089094e4c4fc19050b34f1a97a23f04e5a94f 100644 (file)
--- a/lib/netdev-linux.c
+++ b/lib/netdev-linux.c
@@ -20,6 +20,8 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <inttypes.h>
 #include <linux/filter.h>
@@ -31,7 +33,6 @@
 #include <linux/mii.h>
 #include <linux/rtnetlink.h>
 #include <linux/sockios.h>
-#include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/utsname.h>
@@ -40,7 +41,6 @@
 #include <net/if_arp.h>
 #include <net/if_packet.h>
 #include <net/route.h>
-#include <netinet/in.h>
 #include <poll.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c
index 3264810f39c99627e80a42ef051610755e12fddf..9ce856798414e10d71c4125e316778ff4e0acb01 100644 (file)
--- a/lib/netdev-native-tnl.c
+++ b/lib/netdev-native-tnl.c
@@ -23,6 +23,7 @@
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <net/if.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/ip6.h>

diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index 518058a1f1145399488ccca90a490c3d20fa9bc5..f72025e5b1a8563da8bf965d9f5e47bc5bf3bdb7 100644 (file)
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -23,6 +23,7 @@
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <net/if.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <netinet/ip6.h>
 #include <sys/ioctl.h>

diff --git a/lib/netdev.c b/lib/netdev.c
index 2d69fe5dac68ebf9d95c305d8f06fcafb0d53a4f..cd11281a596851a32c2672ac51d338382938cac6 100644 (file)
--- a/lib/netdev.c
+++ b/lib/netdev.c
@@ -19,6 +19,7 @@
 
 #include <errno.h>
 #include <inttypes.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <stdlib.h>
 #include <string.h>
@@ -28,7 +29,6 @@
 #include <ifaddrs.h>
 #include <net/if.h>
 #include <sys/ioctl.h>
-#include <sys/types.h>
 #endif
 
 #include "cmap.h"

diff --git a/lib/netlink.h b/lib/netlink.h
index e4cb2f7b895cca7d543f5e8ce405e5de8f653acf..44b8e4d1a9eb5ba030b0baf2471ee929ba93fc52 100644 (file)
--- a/lib/netlink.h
+++ b/lib/netlink.h
@@ -31,6 +31,7 @@
  * Linux-specific definitions for Netlink sockets, see netlink-socket.h.
  */
 
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <stdbool.h>
 #include <stddef.h>

diff --git a/lib/odp-execute.c b/lib/odp-execute.c
index 44e6691387f354618dac97f7a190cbeecd6c3a7d..56e316e1ea3c882784c581e65f76068b163556a0 100644 (file)
--- a/lib/odp-execute.c
+++ b/lib/odp-execute.c
@@ -17,8 +17,9 @@
 
 #include <config.h>
 #include "odp-execute.h"
-#include <arpa/inet.h>
+#include <sys/types.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <netinet/icmp6.h>
 #include <netinet/ip6.h>
 #include <stdlib.h>

diff --git a/lib/odp-util.c b/lib/odp-util.c
index ec0432c8a94a5ffc03e8dce4a10bf000cc3f2e17..94edd78004d623221ef2c7d09654e38850bd2ed8 100644 (file)
--- a/lib/odp-util.c
+++ b/lib/odp-util.c
@@ -15,12 +15,13 @@
  */
 
 #include <config.h>
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include "odp-util.h"
 #include <errno.h>
 #include <inttypes.h>
 #include <math.h>
-#include <netinet/in.h>
 #include <netinet/icmp6.h>
 #include <netinet/ip6.h>
 #include <stdlib.h>

diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c
index e5d03e155543c7d05030b401e268ed4f03707b87..a59962fc3153b6a2311520c602be50ab2be0b028 100644 (file)
--- a/lib/ofp-actions.c
+++ b/lib/ofp-actions.c
@@ -15,6 +15,8 @@
  */
 
 #include <config.h>
+
+#include <sys/types.h>
 #include <netinet/in.h>
 
 #include "bundle.h"

diff --git a/lib/ofp-ed-props.c b/lib/ofp-ed-props.c
index eb168fee390342ab9af17d09e027192907d129bb..d7bb72f35dbd09f78df33a53b4808983967816a9 100644 (file)
--- a/lib/ofp-ed-props.c
+++ b/lib/ofp-ed-props.c
@@ -15,6 +15,8 @@
  */
 
 #include <config.h>
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include "openvswitch/ofp-ed-props.h"
 #include "openvswitch/ofp-util.h"

diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c
index 0c68495bfd3e63737d96f5223deecf0148e482c4..bacbaa63886eb75f6344d5fd48086d0530f2cf3b 100644 (file)
--- a/lib/ofp-parse.c
+++ b/lib/ofp-parse.c
@@ -19,6 +19,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 
 #include "byte-order.h"

diff --git a/lib/ovs-lldp.c b/lib/ovs-lldp.c
index a056ace93ff15dcb3d75e2e600ea6b6e80d1adee..d7062f3252cb0a870ca67e3ca37ce5d76cd74869 100644 (file)
--- a/lib/ovs-lldp.c
+++ b/lib/ovs-lldp.c
@@ -28,12 +28,12 @@
 
 #include <config.h>
 #include "ovs-lldp.h"
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <inttypes.h>
-#include <netinet/in.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <sys/types.h>
 #include "openvswitch/dynamic-string.h"
 #include "flow.h"
 #include "openvswitch/list.h"

diff --git a/lib/ovs-router.c b/lib/ovs-router.c
index ce2f80b387a7331c676d6b7304469611232defe5..cd2ab15fb003e64d49952d34bdf671dc45b00ca7 100644 (file)
--- a/lib/ovs-router.c
+++ b/lib/ovs-router.c
@@ -18,12 +18,13 @@
 
 #include "ovs-router.h"
 
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <sys/socket.h>
 #include <net/if.h>
-#include <netinet/in.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/lib/ovs-router.h b/lib/ovs-router.h
index 29c7c5fe18d543314e815cec5bac47ae7469e57d..b55b1a50b1466ca08c1beaf2834aee0921e66252 100644 (file)
--- a/lib/ovs-router.h
+++ b/lib/ovs-router.h
@@ -17,6 +17,7 @@
 #ifndef OVS_TNL_ROUTER_H
 #define OVS_TNL_ROUTER_H 1
 
+#include <sys/types.h>
 #include <netinet/in.h>
 
 #include "util.h"

diff --git a/lib/packets.c b/lib/packets.c
index 7341f5f1f46171fdc888b04993a21261a005c57b..c9eef2dde7df1b581ea14fedaf98fb4379ddd2b9 100644 (file)
--- a/lib/packets.c
+++ b/lib/packets.c
@@ -16,13 +16,13 @@
 
 #include <config.h>
 #include "packets.h"
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
 #include <netinet/ip6.h>
 #include <netinet/icmp6.h>
 #include <stdlib.h>
-#include <sys/types.h>
 #include <netdb.h>
 #include "byte-order.h"
 #include "csum.h"

diff --git a/lib/route-table.c b/lib/route-table.c
index 4e40c37b424fa700a036c0d438ba1798f8f5a972..97a0be5c573a8ce02239bf663b320c0b2accc6b8 100644 (file)
--- a/lib/route-table.c
+++ b/lib/route-table.c
@@ -19,6 +19,8 @@
 #include "route-table.h"
 
 #include <errno.h>
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <linux/rtnetlink.h>

diff --git a/lib/rstp-state-machines.c b/lib/rstp-state-machines.c
index 8fdaec95391692a0b620beeabe31b53d004671c2..7d677d7a2401be0252a7bd3aa8728611c2e23a9e 100644 (file)
--- a/lib/rstp-state-machines.c
+++ b/lib/rstp-state-machines.c
@@ -31,11 +31,11 @@
 #include <config.h>
 #include "rstp.h"
 #include "rstp-state-machines.h"
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <inttypes.h>
-#include <netinet/in.h>
 #include <stdlib.h>
-#include <sys/types.h>
 #include "byte-order.h"
 #include "connectivity.h"
 #include "openvswitch/ofpbuf.h"

diff --git a/lib/rstp.c b/lib/rstp.c
index 5d71a437412e3a4d30ffb750f72e7088cb799341..7a61b24d7b368f631d4d235f89d8d7170dc221c0 100644 (file)
--- a/lib/rstp.c
+++ b/lib/rstp.c
@@ -32,11 +32,11 @@
 #include "rstp.h"
 #include "rstp-common.h"
 #include "rstp-state-machines.h"
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <inttypes.h>
-#include <netinet/in.h>
 #include <stdlib.h>
-#include <sys/types.h>
 #include "byte-order.h"
 #include "connectivity.h"
 #include "openvswitch/ofpbuf.h"

diff --git a/lib/sflow_api.h b/lib/sflow_api.h
index 2730a4cf4a27f235369ddc89c0b91de40f3c3bfc..7264fc1c588d410c9683815ca8bf202f7d0f3751 100644 (file)
--- a/lib/sflow_api.h
+++ b/lib/sflow_api.h
@@ -13,18 +13,18 @@
    callback in sfl_agent_init.*/
 /* #define SFLOW_DO_SOCKET */
 
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <sys/types.h>
-#include <arpa/inet.h> /* for htonl */
 
 #ifdef SFLOW_DO_SOCKET
 #include <sys/socket.h>
 #include <netinet/in_systm.h>
-#include <netinet/in.h>
 #include <netinet/ip.h>
 #endif
 

diff --git a/lib/smap.h b/lib/smap.h
index 838e2e4bb20e3604d214b48734367573cb8289c2..f1b5b4dfcd88a34098e292c09cca11fc2a253a74 100644 (file)
--- a/lib/smap.h
+++ b/lib/smap.h
@@ -15,6 +15,7 @@
 #ifndef SMAP_H
 #define SMAP_H 1
 
+#include <sys/types.h>
 #include <netinet/in.h>
 #include "hash.h"
 #include "openvswitch/hmap.h"

diff --git a/lib/socket-util.c b/lib/socket-util.c
index 055593d3572e745f81fae70090e80788ce2b1b58..7fbcdf19feac28f6b42f67d5f7c2fc0fd64b4725 100644 (file)
--- a/lib/socket-util.c
+++ b/lib/socket-util.c
@@ -16,6 +16,8 @@
 
 #include <config.h>
 #include "socket-util.h"
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <errno.h>

diff --git a/lib/stream.c b/lib/stream.c
index 9cef18e843c7e886354e9881971485722e533f6e..083e2fb93f775fa4fdb43d2b52fab37d3d94a0fe 100644 (file)
--- a/lib/stream.c
+++ b/lib/stream.c
@@ -18,6 +18,7 @@
 #include "stream-provider.h"
 #include <errno.h>
 #include <inttypes.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <poll.h>
 #include <stdlib.h>

diff --git a/lib/tc.h b/lib/tc.h
index 5f65a88ce5c73bb70e9d59800e34b132d29a7692..6af51c69b241ed693c4bd120485fdd3e174f059e 100644 (file)
--- a/lib/tc.h
+++ b/lib/tc.h
@@ -18,6 +18,7 @@
 #ifndef TC_H
 #define TC_H 1
 
+#include <sys/types.h>
 #include <netinet/in.h> /* Must happen before linux/pkt_cls.h - Glibc #20215 */
 #include <linux/pkt_cls.h>
 #include <linux/pkt_sched.h>

diff --git a/lib/util.h b/lib/util.h
index b01f421303fa5cd717570429b6e4ddc26abb89ba..1792356e5b64c8103e49553891d53416fe001309 100644 (file)
--- a/lib/util.h
+++ b/lib/util.h
@@ -17,6 +17,8 @@
 #ifndef UTIL_H
 #define UTIL_H 1
 
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <inttypes.h>
 #include <limits.h>

diff --git a/lib/vconn.c b/lib/vconn.c
index 13623d87a7d934575d10337eabd64a303f94c450..bb56be2d2901311f9d1c35472ab7b73c04781281 100644 (file)
--- a/lib/vconn.c
+++ b/lib/vconn.c
@@ -18,6 +18,7 @@
 #include "vconn-provider.h"
 #include <errno.h>
 #include <inttypes.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <poll.h>
 #include <stdlib.h>

diff --git a/ofproto/in-band.c b/ofproto/in-band.c
index 343dcfa1714e43731903b8f2c15670837522eba5..849b1cedaff0ce591cd287fb44740ed713785a52 100644 (file)
--- a/ofproto/in-band.c
+++ b/ofproto/in-band.c
@@ -15,6 +15,8 @@
  */
 
 #include <config.h>
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <errno.h>
 #include <inttypes.h>

diff --git a/ofproto/in-band.h b/ofproto/in-band.h
index 6e0585ad3c4eeea6e9be0fbf11422e47b662d5e3..3debd01284dd62beb6af0c452f7724ed7120f158 100644 (file)
--- a/ofproto/in-band.h
+++ b/ofproto/in-band.h
@@ -20,6 +20,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <sys/socket.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 #include "flow.h"
 

diff --git a/ofproto/netflow.c b/ofproto/netflow.c
index 783b9c94552b0c5b5bb18c6fedb1c38c840cd4fa..b6baeb8268abac773b2e7d091457526cefb6e605 100644 (file)
--- a/ofproto/netflow.c
+++ b/ofproto/netflow.c
@@ -16,6 +16,8 @@
 
 #include <config.h>
 #include "netflow.h"
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <errno.h>
 #include <stdlib.h>

diff --git a/ofproto/ofproto-dpif-xlate-cache.c b/ofproto/ofproto-dpif-xlate-cache.c
index 24fc769a7a0dfc85ba859605854df45bcc0b2df4..5f53a525a6aea9e0828f78efb8a3d92fc8119831 100644 (file)
--- a/ofproto/ofproto-dpif-xlate-cache.c
+++ b/ofproto/ofproto-dpif-xlate-cache.c
@@ -16,10 +16,11 @@
 
 #include "ofproto/ofproto-dpif-xlate-cache.h"
 
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <errno.h>
 #include <net/if.h>
-#include <netinet/in.h>
 #include <sys/socket.h>
 
 #include "bfd.h"

diff --git a/ofproto/ofproto-dpif-xlate-cache.h b/ofproto/ofproto-dpif-xlate-cache.h
index e62719740cb204d1bc3dbe7359a39a647ea192a3..19c1ef7b95ad7678d45224ccddd38c26b04506ec 100644 (file)
--- a/ofproto/ofproto-dpif-xlate-cache.h
+++ b/ofproto/ofproto-dpif-xlate-cache.h
@@ -17,6 +17,7 @@
 
 #include <net/if.h>
 #include <sys/socket.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 
 #include "openvswitch/types.h"

diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
index a2b4fdb3b6bedc9b3967c1ba159788e7936c6654..d94e9dc28cbb4e6c33dfe56d605ba75721b2022d 100644 (file)
--- a/ofproto/ofproto-dpif-xlate.c
+++ b/ofproto/ofproto-dpif-xlate.c
@@ -17,10 +17,11 @@
 #include "ofproto/ofproto-dpif-xlate.h"
 
 #include <errno.h>
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <net/if.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
 
 #include "bfd.h"
 #include "bitmap.h"

diff --git a/ovn/lib/ovn-l7.h b/ovn/lib/ovn-l7.h
index 41cdacdfc30f6b3e326c4c6333bb967ebe90b365..b8d6683bcdf49fd7bdbd0afad4472d827a5173d0 100644 (file)
--- a/ovn/lib/ovn-l7.h
+++ b/ovn/lib/ovn-l7.h
@@ -17,6 +17,7 @@
 #ifndef OVN_DHCP_H
 #define OVN_DHCP_H 1
 
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <netinet/icmp6.h>
 #include "openvswitch/hmap.h"

diff --git a/tests/test-csum.c b/tests/test-csum.c
index 97638b91605df216a6f49bf9eb0c0dad0fae4891..b94bd6481cdf3ef6729b3136e64b49df3610345a 100644 (file)
--- a/tests/test-csum.c
+++ b/tests/test-csum.c
@@ -19,6 +19,7 @@
 #include "csum.h"
 #include <assert.h>
 #include <inttypes.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <stdio.h>

diff --git a/tests/test-sflow.c b/tests/test-sflow.c
index b70336b457bd89644af9cefad6248972cfc09c72..82e950273c4b7319fbc96f8994f927e2fb4c80bb 100644 (file)
--- a/tests/test-sflow.c
+++ b/tests/test-sflow.c
@@ -18,6 +18,8 @@
 #include <config.h>
 #undef NDEBUG
 #include "netflow.h"
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <errno.h>
 #include <getopt.h>

diff --git a/utilities/ovs-dpctl.c b/utilities/ovs-dpctl.c
index ef2daf6fb1922f6124d1da79807e220d3b7f3fa1..7e6101632c38e74554151411d1f28e0b6a5e9c5c 100644 (file)
--- a/utilities/ovs-dpctl.c
+++ b/utilities/ovs-dpctl.c
@@ -15,13 +15,14 @@
  */
 
 #include <config.h>
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <errno.h>
 #include <getopt.h>
 #include <inttypes.h>
 #include <sys/socket.h>
 #include <net/if.h>
-#include <netinet/in.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdlib.h>