From 315aa6cde48bbe5af08f61778d70f72aa0f9648a Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Sat, 4 Nov 2023 08:15:54 +0000 Subject: [PATCH] *: 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 --- bfdd/bfd_packet.c | 4 ++++ bgpd/bgp_vty.c | 4 ++++ lib/zebra.h | 6 +----- nhrpd/netlink_arp.c | 4 ++++ nhrpd/nhrp_multicast.c | 4 ++++ zebra/dplane_fpm_nl.c | 3 +++ zebra/if_netlink.c | 2 ++ zebra/kernel_netlink.c | 3 +++ zebra/main.c | 4 ++++ zebra/netconf_netlink.c | 2 ++ zebra/rule_netlink.c | 3 +++ zebra/tc_netlink.c | 1 + zebra/zebra_evpn_neigh.c | 4 ++++ zebra/zebra_fpm.c | 4 ++++ zebra/zebra_fpm_dt.c | 4 ++++ zebra/zebra_fpm_netlink.c | 3 +++ zebra/zebra_mpls_netlink.c | 3 +++ zebra/zebra_netns_id.c | 4 ++++ zebra/zebra_ns.h | 2 ++ zebra/zebra_rib.c | 4 ++++ 20 files changed, 63 insertions(+), 5 deletions(-) diff --git a/bfdd/bfd_packet.c b/bfdd/bfd_packet.c index 5d8bf47fcd..f2596dfc3c 100644 --- a/bfdd/bfd_packet.c +++ b/bfdd/bfd_packet.c @@ -13,6 +13,10 @@ #include +#ifdef GNU_LINUX +#include +#endif + #ifdef BFD_LINUX #include #endif /* BFD_LINUX */ diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 36e216cb1e..c9d21b6742 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -5,6 +5,10 @@ #include +#ifdef GNU_LINUX +#include //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 b742e71848..3fe61c801e 100644 --- a/lib/zebra.h +++ b/lib/zebra.h @@ -115,11 +115,7 @@ #include -#ifdef HAVE_NETLINK -#include -#include -#include -#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 2e22f8e247..bcecf9fc09 100644 --- a/nhrpd/netlink_arp.c +++ b/nhrpd/netlink_arp.c @@ -7,6 +7,10 @@ #include "config.h" #endif +#ifdef GNU_LINUX +#include +#endif + #include #include #include diff --git a/nhrpd/nhrp_multicast.c b/nhrpd/nhrp_multicast.c index fdc1a31f25..aead982842 100644 --- a/nhrpd/nhrp_multicast.c +++ b/nhrpd/nhrp_multicast.c @@ -7,6 +7,10 @@ #include "config.h" #endif +#ifdef GNU_LINUX +#include +#endif + #include #include #include diff --git a/zebra/dplane_fpm_nl.c b/zebra/dplane_fpm_nl.c index 70bcfe4498..c98655fdb8 100644 --- a/zebra/dplane_fpm_nl.c +++ b/zebra/dplane_fpm_nl.c @@ -19,6 +19,9 @@ #include #include "lib/zebra.h" + +#include + #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 ed2e0a224e..6dad69396c 100644 --- a/zebra/if_netlink.c +++ b/zebra/if_netlink.c @@ -17,6 +17,8 @@ #define _LINUX_IF_H #define _LINUX_IP_H +#include +#include #include #include #include diff --git a/zebra/kernel_netlink.c b/zebra/kernel_netlink.c index 3f4a031921..8b59ecd87f 100644 --- a/zebra/kernel_netlink.c +++ b/zebra/kernel_netlink.c @@ -6,6 +6,9 @@ #include #ifdef HAVE_NETLINK +#include +#include +#include #include "linklist.h" #include "if.h" diff --git a/zebra/main.c b/zebra/main.c index 158d1b8c4c..aea30daa3b 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -5,6 +5,10 @@ #include +#ifdef GNU_LINUX +#include +#endif + #include #include "getopt.h" #include "command.h" diff --git a/zebra/netconf_netlink.c b/zebra/netconf_netlink.c index 7352dfb2ee..9a0b3c5d0c 100644 --- a/zebra/netconf_netlink.c +++ b/zebra/netconf_netlink.c @@ -11,6 +11,8 @@ #include +#include +#include #include "linux/netconf.h" #include "lib/lib_errors.h" diff --git a/zebra/rule_netlink.c b/zebra/rule_netlink.c index f00aef52c0..05282793d7 100644 --- a/zebra/rule_netlink.c +++ b/zebra/rule_netlink.c @@ -9,6 +9,9 @@ #ifdef HAVE_NETLINK +#include +#include + #include "if.h" #include "prefix.h" #include "vrf.h" diff --git a/zebra/tc_netlink.c b/zebra/tc_netlink.c index d633c07770..19667e66ac 100644 --- a/zebra/tc_netlink.c +++ b/zebra/tc_netlink.c @@ -9,6 +9,7 @@ #ifdef HAVE_NETLINK +#include #include #include #include diff --git a/zebra/zebra_evpn_neigh.c b/zebra/zebra_evpn_neigh.c index a00d8c969a..81705d4e85 100644 --- a/zebra/zebra_evpn_neigh.c +++ b/zebra/zebra_evpn_neigh.c @@ -6,6 +6,10 @@ #include +#ifdef GNU_LINUX +#include +#endif + #include "hash.h" #include "interface.h" #include "jhash.h" diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c index 699f3ed110..92dc591d40 100644 --- a/zebra/zebra_fpm.c +++ b/zebra/zebra_fpm.c @@ -8,6 +8,10 @@ #include +#ifdef GNU_LINUX +#include +#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 94308a961b..ce5eb6fe15 100644 --- a/zebra/zebra_fpm_dt.c +++ b/zebra/zebra_fpm_dt.c @@ -22,6 +22,10 @@ */ #include + +#ifdef GNU_LINUX +#include +#endif #include "log.h" #include "vrf.h" diff --git a/zebra/zebra_fpm_netlink.c b/zebra/zebra_fpm_netlink.c index 1279762232..1dd96347f3 100644 --- a/zebra/zebra_fpm_netlink.c +++ b/zebra/zebra_fpm_netlink.c @@ -11,6 +11,9 @@ #ifdef HAVE_NETLINK +#include +#include + #include "log.h" #include "rib.h" #include "vty.h" diff --git a/zebra/zebra_mpls_netlink.c b/zebra/zebra_mpls_netlink.c index 4bc676f392..b76640743e 100644 --- a/zebra/zebra_mpls_netlink.c +++ b/zebra/zebra_mpls_netlink.c @@ -7,6 +7,9 @@ #ifdef HAVE_NETLINK +#include +#include + #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 0531ab9591..ae8f9d9a8d 100644 --- a/zebra/zebra_netns_id.c +++ b/zebra/zebra_netns_id.c @@ -6,6 +6,10 @@ #include +#ifdef GNU_LINUX +#include +#endif + #include "ns.h" #include "vrf.h" #include "log.h" diff --git a/zebra/zebra_ns.h b/zebra/zebra_ns.h index edf2611971..cda8bada0c 100644 --- a/zebra/zebra_ns.h +++ b/zebra/zebra_ns.h @@ -18,6 +18,8 @@ extern "C" { #endif #ifdef HAVE_NETLINK +#include + /* Socket interface to kernel */ struct nlsock { int sock; diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index 37c042c044..a4af3a43ff 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -5,6 +5,10 @@ #include +#ifdef GNU_LINUX +#include +#endif + #include "command.h" #include "if.h" #include "linklist.h" -- 2.39.5