*: Remove netlink headers from lib/zebra.h

The headers associated with netlink code
really only belong in those that need it.
Move these headers out of lib/zebra.h and
into more appropriate places.  bgp's usage
of the RT_TABLE_XXX defines are probably not
appropriate and will be cleaned up in future
commits.

Signed-off-by: Donald Sharp <[email protected]>

bfdd/bfd_packet.c

@@ -13,6 +13,10 @@
 
 #include <zebra.h>
 
+#ifdef GNU_LINUX
+#include <linux/filter.h>
+#endif
+
 #ifdef BFD_LINUX
 #include <linux/if_packet.h>
 #endif /* BFD_LINUX */

bgpd/bgp_vty.c

@@ -5,6 +5,10 @@
 
 #include <zebra.h>
 
+#ifdef GNU_LINUX
+#include <linux/rtnetlink.h> //RT_TABLE_XXX
+#endif
+
 #include "command.h"
 #include "lib/json.h"
 #include "lib/sockopt.h"

lib/zebra.h

@@ -115,11 +115,7 @@
 
 #include <net/route.h>
 
-#ifdef HAVE_NETLINK
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
-#include <linux/filter.h>
-#else
+#ifndef HAVE_NETLINK
 #define RT_TABLE_MAIN		0
 #define RT_TABLE_LOCAL		RT_TABLE_MAIN
 #endif /* HAVE_NETLINK */

nhrpd/netlink_arp.c

@@ -7,6 +7,10 @@
 #include "config.h"
 #endif
 
+#ifdef GNU_LINUX
+#include <linux/rtnetlink.h>
+#endif
+
 #include <fcntl.h>
 #include <net/if.h>
 #include <netinet/if_ether.h>

nhrpd/nhrp_multicast.c

@@ -7,6 +7,10 @@
 #include "config.h"
 #endif
 
+#ifdef GNU_LINUX
+#include <linux/rtnetlink.h>
+#endif
+
 #include <fcntl.h>
 #include <net/if.h>
 #include <net/ethernet.h>

zebra/dplane_fpm_nl.c

@@ -19,6 +19,9 @@
 #include <string.h>
 
 #include "lib/zebra.h"
+
+#include <linux/rtnetlink.h>
+
 #include "lib/json.h"
 #include "lib/libfrr.h"
 #include "lib/frratomic.h"

zebra/if_netlink.c

@@ -17,6 +17,8 @@
 #define _LINUX_IF_H
 #define _LINUX_IP_H
 
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
 #include <netinet/if_ether.h>
 #include <linux/if_bridge.h>
 #include <linux/if_link.h>

zebra/kernel_netlink.c

@@ -6,6 +6,9 @@
 #include <zebra.h>
 
 #ifdef HAVE_NETLINK
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+#include <linux/filter.h>
 
 #include "linklist.h"
 #include "if.h"

zebra/main.c

@@ -5,6 +5,10 @@
 
 #include <zebra.h>
 
+#ifdef GNU_LINUX
+#include <linux/rtnetlink.h>
+#endif
+
 #include <lib/version.h>
 #include "getopt.h"
 #include "command.h"

zebra/netconf_netlink.c

@@ -11,6 +11,8 @@
 
 #include <ns.h>
 
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
 #include "linux/netconf.h"
 
 #include "lib/lib_errors.h"

zebra/rule_netlink.c

@@ -9,6 +9,9 @@
 
 #ifdef HAVE_NETLINK
 
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+
 #include "if.h"
 #include "prefix.h"
 #include "vrf.h"

zebra/tc_netlink.c

@@ -9,6 +9,7 @@
 
 #ifdef HAVE_NETLINK
 
+#include <linux/rtnetlink.h>
 #include <linux/pkt_cls.h>
 #include <linux/pkt_sched.h>
 #include <netinet/if_ether.h>

zebra/zebra_evpn_neigh.c

@@ -6,6 +6,10 @@
 
 #include <zebra.h>
 
+#ifdef GNU_LINUX
+#include <linux/neighbour.h>
+#endif
+
 #include "hash.h"
 #include "interface.h"
 #include "jhash.h"

zebra/zebra_fpm.c

@@ -8,6 +8,10 @@
 
 #include <zebra.h>
 
+#ifdef GNU_LINUX
+#include <linux/rtnetlink.h>
+#endif
+
 #include "log.h"
 #include "libfrr.h"
 #include "stream.h"

zebra/zebra_fpm_dt.c

@@ -22,6 +22,10 @@
  */
 
 #include <zebra.h>
+
+#ifdef GNU_LINUX
+#include <linux/rtnetlink.h>
+#endif
 #include "log.h"
 #include "vrf.h"
 

zebra/zebra_fpm_netlink.c

@@ -11,6 +11,9 @@
 
 #ifdef HAVE_NETLINK
 
+#include <linux/rtnetlink.h>
+#include <linux/neighbour.h>
+
 #include "log.h"
 #include "rib.h"
 #include "vty.h"

zebra/zebra_mpls_netlink.c

@@ -7,6 +7,9 @@
 
 #ifdef HAVE_NETLINK
 
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+
 #include "zebra/debug.h"
 #include "zebra/rt.h"
 #include "zebra/rt_netlink.h"

zebra/zebra_netns_id.c

@@ -6,6 +6,10 @@
 
 #include <zebra.h>
 
+#ifdef GNU_LINUX
+#include <linux/if_link.h>
+#endif
+
 #include "ns.h"
 #include "vrf.h"
 #include "log.h"

zebra/zebra_ns.h

@@ -18,6 +18,8 @@ extern "C" {
 #endif
 
 #ifdef HAVE_NETLINK
+#include <linux/netlink.h>
+
 /* Socket interface to kernel */
 struct nlsock {
 	int sock;

zebra/zebra_rib.c

@@ -5,6 +5,10 @@
 
 #include <zebra.h>
 
+#ifdef GNU_LINUX
+#include <linux/rtnetlink.h>
+#endif
+
 #include "command.h"
 #include "if.h"
 #include "linklist.h"