*: 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 <sharpd@nvidia.com>

diff --git a/bfdd/bfd_packet.c b/bfdd/bfd_packet.c
index 5d8bf47fcd433b444ebf3bd74f7019e472e9f58e..f2596dfc3c50caf369bae8574281a6d0793cc750 100644 (file)
--- a/bfdd/bfd_packet.c
+++ b/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 */

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 36e216cb1e602a6bcc0af12be0b50650a39cff48..c9d21b67421a92074056c4ac1bde7c3588b557f7 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/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"

diff --git a/lib/zebra.h b/lib/zebra.h
index b742e71848f521df24857f2c65c6385ebbd9fe28..3fe61c801ee1b8d3a25e70e7ad1f73e49b2b8244 100644 (file)
--- a/lib/zebra.h
+++ b/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 */

diff --git a/nhrpd/netlink_arp.c b/nhrpd/netlink_arp.c
index 2e22f8e247a7f3b28d90cc4cffc6007366bb0dcd..bcecf9fc09b0b9ce8080b144399c6f8c8a831cc1 100644 (file)
--- a/nhrpd/netlink_arp.c
+++ b/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>

diff --git a/nhrpd/nhrp_multicast.c b/nhrpd/nhrp_multicast.c
index fdc1a31f25197e1c0d3c1a7d798986337d9153a7..aead982842a177451cc493db81b77802c47730f4 100644 (file)
--- a/nhrpd/nhrp_multicast.c
+++ b/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>

diff --git a/zebra/dplane_fpm_nl.c b/zebra/dplane_fpm_nl.c
index 70bcfe4498f39018201d0452a77aebc577490c23..c98655fdb87740ec21976254a51fb27004e622b7 100644 (file)
--- a/zebra/dplane_fpm_nl.c
+++ b/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"

diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c
index ed2e0a224e05ca8e1fde2aceacbdcbc15f728e0e..6dad69396c476cd5741d5a00a3ee8f95b70635d1 100644 (file)
--- a/zebra/if_netlink.c
+++ b/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>

diff --git a/zebra/kernel_netlink.c b/zebra/kernel_netlink.c
index 3f4a031921f4a52313e13b6cff21e0577e938480..8b59ecd87fe36ea140c9cfa65490666c35d68ca7 100644 (file)
--- a/zebra/kernel_netlink.c
+++ b/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"

diff --git a/zebra/main.c b/zebra/main.c
index 158d1b8c4c715a4be57f9632d0749ee2fced9e0e..aea30daa3b00158a73c28a432b8ab69dd5171155 100644 (file)
--- a/zebra/main.c
+++ b/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"

diff --git a/zebra/netconf_netlink.c b/zebra/netconf_netlink.c
index 7352dfb2eec5f456f3bd2b3afcc7332a436d075d..9a0b3c5d0cd47f2e8c3012a393d8df4708d9b7e1 100644 (file)
--- a/zebra/netconf_netlink.c
+++ b/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"

diff --git a/zebra/rule_netlink.c b/zebra/rule_netlink.c
index f00aef52c07a8360dfda196f5b132ec2fafb4bce..05282793d72d5d4d752d219981b71c67e624dd75 100644 (file)
--- a/zebra/rule_netlink.c
+++ b/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"

diff --git a/zebra/tc_netlink.c b/zebra/tc_netlink.c
index d633c07770cfa4c886941b1633b2a3b843ecd712..19667e66acc08500cc58de9446b1e92f1dfceb94 100644 (file)
--- a/zebra/tc_netlink.c
+++ b/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>

diff --git a/zebra/zebra_evpn_neigh.c b/zebra/zebra_evpn_neigh.c
index a00d8c969af0ffbae5d7b7c8e6b1b8790aee3e55..81705d4e8512430db7271478651b9ae6bd00abd2 100644 (file)
--- a/zebra/zebra_evpn_neigh.c
+++ b/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"

diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c
index 699f3ed1106419b382ae2ede18a28edc420b1f3b..92dc591d40e1dc8852c580ec04cffec85c153de8 100644 (file)
--- a/zebra/zebra_fpm.c
+++ b/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"

diff --git a/zebra/zebra_fpm_dt.c b/zebra/zebra_fpm_dt.c
index 94308a961b071242875e2bac4d1ea54deefbebc2..ce5eb6fe1573eb6a13837c8c6f7824047d7c3ebc 100644 (file)
--- a/zebra/zebra_fpm_dt.c
+++ b/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"
 

diff --git a/zebra/zebra_fpm_netlink.c b/zebra/zebra_fpm_netlink.c
index 127976223221c66c59422732274557fb741c5e7a..1dd96347f30282e6d9f3d8424d4a6596408a1448 100644 (file)
--- a/zebra/zebra_fpm_netlink.c
+++ b/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"

diff --git a/zebra/zebra_mpls_netlink.c b/zebra/zebra_mpls_netlink.c
index 4bc676f3926e255883c290130e2b043bf2fabfa5..b76640743e7a6035dcaf3cd37f128684099b289d 100644 (file)
--- a/zebra/zebra_mpls_netlink.c
+++ b/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"

diff --git a/zebra/zebra_netns_id.c b/zebra/zebra_netns_id.c
index 0531ab959100b11c02a23045866514c0e1944067..ae8f9d9a8d2c8b0953e5930e32d888c887a86227 100644 (file)
--- a/zebra/zebra_netns_id.c
+++ b/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"

diff --git a/zebra/zebra_ns.h b/zebra/zebra_ns.h
index edf26119719069a2a30b92dea67b5f9f1e3938d0..cda8bada0c3486022be15d7e079382dce6a0db54 100644 (file)
--- a/zebra/zebra_ns.h
+++ b/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;

diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 37c042c04482c804f914f8993f97789d39220093..a4af3a43ffcc20efdb4ad4abb730c583281ef15b 100644 (file)
--- a/zebra/zebra_rib.c
+++ b/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"