From f8b6f499121f83eafc13b0f7214825a0f46655aa Mon Sep 17 00:00:00 2001 From: Lou Berger Date: Wed, 28 Sep 2016 18:03:43 -0400 Subject: [PATCH] vnc: use directories in includes (request from Martin W.) --- bgpd/bgp_attr.c | 2 +- bgpd/bgp_encap.c | 2 +- bgpd/bgp_main.c | 2 +- bgpd/bgp_mplsvpn.c | 2 +- bgpd/bgp_route.c | 6 +- bgpd/bgp_routemap.c | 2 +- bgpd/bgp_zebra.c | 4 +- bgpd/bgpd.c | 4 +- bgpd/rfapi/bgp_rfapi_cfg.c | 38 ++++++------ bgpd/rfapi/bgp_rfapi_cfg.h | 4 +- bgpd/rfapi/rfapi.c | 78 ++++++++++++------------- bgpd/rfapi/rfapi.h | 10 ++-- bgpd/rfapi/rfapi_ap.c | 70 +++++++++++----------- bgpd/rfapi/rfapi_ap.h | 30 +++++----- bgpd/rfapi/rfapi_backend.h | 4 +- bgpd/rfapi/rfapi_descriptor_rfp_utils.c | 20 +++---- bgpd/rfapi/rfapi_encap_tlv.c | 30 +++++----- bgpd/rfapi/rfapi_import.c | 64 ++++++++++---------- bgpd/rfapi/rfapi_import.h | 2 +- bgpd/rfapi/rfapi_monitor.c | 44 +++++++------- bgpd/rfapi/rfapi_monitor.h | 6 +- bgpd/rfapi/rfapi_nve_addr.c | 28 ++++----- bgpd/rfapi/rfapi_private.h | 8 +-- bgpd/rfapi/rfapi_rib.c | 48 +++++++-------- bgpd/rfapi/rfapi_vty.c | 64 ++++++++++---------- bgpd/rfapi/rfapi_vty.h | 2 +- bgpd/rfapi/vnc_debug.c | 16 ++--- bgpd/rfapi/vnc_export_bgp.c | 52 ++++++++--------- bgpd/rfapi/vnc_export_bgp.h | 8 +-- bgpd/rfapi/vnc_export_bgp_p.h | 8 +-- bgpd/rfapi/vnc_export_table.c | 24 ++++---- bgpd/rfapi/vnc_export_table.h | 8 +-- bgpd/rfapi/vnc_import_bgp.c | 50 ++++++++-------- bgpd/rfapi/vnc_import_bgp.h | 8 +-- bgpd/rfapi/vnc_import_bgp_p.h | 8 +-- bgpd/rfapi/vnc_zebra.c | 44 +++++++------- bgpd/rfapi/vnc_zebra.h | 2 +- bgpd/rfp-example/librfp/rfp.h | 2 +- bgpd/rfp-example/librfp/rfp_example.c | 4 +- bgpd/rfp-example/librfp/rfp_internal.h | 4 +- 40 files changed, 406 insertions(+), 406 deletions(-) diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c index cd92aec23..f5daf607e 100644 --- a/bgpd/bgp_attr.c +++ b/bgpd/bgp_attr.c @@ -44,7 +44,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #include "bgpd/bgp_updgrp.h" #include "bgpd/bgp_encap_types.h" #if ENABLE_BGP_VNC -# include "bgp_rfapi_cfg.h" +# include "bgpd/rfapi/bgp_rfapi_cfg.h" # include "bgp_encap_types.h" # include "bgp_vnc_types.h" #endif diff --git a/bgpd/bgp_encap.c b/bgpd/bgp_encap.c index 2cfb51029..136bab13b 100644 --- a/bgpd/bgp_encap.c +++ b/bgpd/bgp_encap.c @@ -46,7 +46,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #include "bgpd/bgp_encap.h" #if ENABLE_BGP_VNC -#include "rfapi_backend.h" +#include "bgpd/rfapi/rfapi_backend.h" #endif static void diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c index 9ee8838fd..3aa16b263 100644 --- a/bgpd/bgp_main.c +++ b/bgpd/bgp_main.c @@ -55,7 +55,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #include "bgpd/bgp_zebra.h" #ifdef ENABLE_BGP_VNC -#include "rfapi_backend.h" +#include "bgpd/rfapi/rfapi_backend.h" #endif /* bgpd options, we use GNU getopt library. */ diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c index 991a92b85..e3e28c7a0 100644 --- a/bgpd/bgp_mplsvpn.c +++ b/bgpd/bgp_mplsvpn.c @@ -36,7 +36,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #include "bgpd/bgp_mplsvpn.h" #if ENABLE_BGP_VNC -#include "rfapi_backend.h" +#include "bgpd/rfapi/rfapi_backend.h" #endif u_int16_t diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 6c97dc333..bace5ab31 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -63,9 +63,9 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #include "bgpd/bgp_vty.h" #if ENABLE_BGP_VNC -#include "rfapi_backend.h" -#include "vnc_import_bgp.h" -#include "vnc_export_bgp.h" +#include "bgpd/rfapi/rfapi_backend.h" +#include "bgpd/rfapi/vnc_import_bgp.h" +#include "bgpd/rfapi/vnc_export_bgp.h" #endif /* Extern from bgp_dump.c */ diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c index efed71ebe..beab1969b 100644 --- a/bgpd/bgp_routemap.c +++ b/bgpd/bgp_routemap.c @@ -59,7 +59,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #include "bgpd/bgp_debug.h" #if ENABLE_BGP_VNC -# include "bgp_rfapi_cfg.h" +# include "bgpd/rfapi/bgp_rfapi_cfg.h" #endif /* Memo of route-map commands. diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c index cb2415406..d524c41a2 100644 --- a/bgpd/bgp_zebra.c +++ b/bgpd/bgp_zebra.c @@ -47,8 +47,8 @@ Boston, MA 02111-1307, USA. */ #include "bgpd/bgp_nht.h" #include "bgpd/bgp_bfd.h" #if ENABLE_BGP_VNC -# include "rfapi_backend.h" -# include "vnc_export_bgp.h" +# include "bgpd/rfapi/rfapi_backend.h" +# include "bgpd/rfapi/vnc_export_bgp.h" #endif /* All information about zebra. */ diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 291483a86..c2af6852f 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -64,8 +64,8 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #include "bgpd/bgp_mplsvpn.h" #include "bgpd/bgp_encap.h" #if ENABLE_BGP_VNC -#include "bgp_rfapi_cfg.h" -#include "rfapi_backend.h" +#include "bgpd/rfapi/bgp_rfapi_cfg.h" +#include "bgpd/rfapi/rfapi_backend.h" #endif #include "bgpd/bgp_advertise.h" #include "bgpd/bgp_network.h" diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c index 57fb04d23..2a8ba3dbd 100644 --- a/bgpd/rfapi/bgp_rfapi_cfg.c +++ b/bgpd/rfapi/bgp_rfapi_cfg.c @@ -20,15 +20,15 @@ */ -#include +#include "lib/zebra.h" -#include "command.h" -#include "prefix.h" -#include "memory.h" -#include "linklist.h" -#include "table.h" -#include "plist.h" -#include "routemap.h" +#include "lib/command.h" +#include "lib/prefix.h" +#include "lib/memory.h" +#include "lib/linklist.h" +#include "lib/table.h" +#include "lib/plist.h" +#include "lib/routemap.h" #include "bgpd/bgpd.h" #include "bgpd/bgp_attr.h" @@ -36,17 +36,17 @@ #include "bgpd/bgp_route.h" #include "bgpd/bgp_ecommunity.h" -#include "rfapi.h" -#include "bgp_rfapi_cfg.h" -#include "rfapi_backend.h" -#include "rfapi_import.h" -#include "rfapi_private.h" -#include "rfapi_monitor.h" -#include "vnc_zebra.h" -#include "vnc_export_bgp.h" -#include "vnc_export_bgp_p.h" -#include "rfapi_vty.h" -#include "vnc_import_bgp.h" +#include "bgpd/rfapi/rfapi.h" +#include "bgpd/rfapi/bgp_rfapi_cfg.h" +#include "bgpd/rfapi/rfapi_backend.h" +#include "bgpd/rfapi/rfapi_import.h" +#include "bgpd/rfapi/rfapi_private.h" +#include "bgpd/rfapi/rfapi_monitor.h" +#include "bgpd/rfapi/vnc_zebra.h" +#include "bgpd/rfapi/vnc_export_bgp.h" +#include "bgpd/rfapi/vnc_export_bgp_p.h" +#include "bgpd/rfapi/rfapi_vty.h" +#include "bgpd/rfapi/vnc_import_bgp.h" #if ENABLE_BGP_VNC diff --git a/bgpd/rfapi/bgp_rfapi_cfg.h b/bgpd/rfapi/bgp_rfapi_cfg.h index cd3a28f60..12cedd56f 100644 --- a/bgpd/rfapi/bgp_rfapi_cfg.h +++ b/bgpd/rfapi/bgp_rfapi_cfg.h @@ -22,8 +22,8 @@ #ifndef _QUAGGA_BGP_RFAPI_CFG_H #define _QUAGGA_BGP_RFAPI_CFG_H -#include "table.h" -#include "routemap.h" +#include "lib/table.h" +#include "lib/routemap.h" #if ENABLE_BGP_VNC #include "rfapi.h" diff --git a/bgpd/rfapi/rfapi.c b/bgpd/rfapi/rfapi.c index 3360ad89c..e33c33aa7 100644 --- a/bgpd/rfapi/rfapi.c +++ b/bgpd/rfapi/rfapi.c @@ -22,44 +22,44 @@ #include -#include "zebra.h" -#include "prefix.h" -#include "table.h" -#include "vty.h" -#include "memory.h" -#include "routemap.h" -#include "log.h" -#include "linklist.h" -#include "command.h" -#include "stream.h" - -#include "bgpd.h" -#include "bgp_ecommunity.h" -#include "bgp_attr.h" -#include "bgp_mplsvpn.h" - -#include "bgp_rfapi_cfg.h" -#include "rfapi.h" -#include "rfapi_backend.h" - -#include "bgp_route.h" -#include "bgp_aspath.h" -#include "bgp_advertise.h" -#include "bgp_vnc_types.h" -#include "bgp_zebra.h" - -#include "rfapi_import.h" -#include "rfapi_private.h" -#include "rfapi_monitor.h" -#include "rfapi_vty.h" -#include "vnc_export_bgp.h" -#include "vnc_export_bgp_p.h" -#include "vnc_zebra.h" -#include "vnc_import_bgp.h" -#include "rfapi_rib.h" -#include "rfapi_ap.h" -#include "rfapi_encap_tlv.h" -#include "vnc_debug.h" +#include "lib/zebra.h" +#include "lib/prefix.h" +#include "lib/table.h" +#include "lib/vty.h" +#include "lib/memory.h" +#include "lib/routemap.h" +#include "lib/log.h" +#include "lib/linklist.h" +#include "lib/command.h" +#include "lib/stream.h" + +#include "bgpd/bgpd.h" +#include "bgpd/bgp_ecommunity.h" +#include "bgpd/bgp_attr.h" +#include "bgpd/bgp_mplsvpn.h" + +#include "bgpd/rfapi/bgp_rfapi_cfg.h" +#include "bgpd/rfapi/rfapi.h" +#include "bgpd/rfapi/rfapi_backend.h" + +#include "bgpd/bgp_route.h" +#include "bgpd/bgp_aspath.h" +#include "bgpd/bgp_advertise.h" +#include "bgpd/bgp_vnc_types.h" +#include "bgpd/bgp_zebra.h" + +#include "bgpd/rfapi/rfapi_import.h" +#include "bgpd/rfapi/rfapi_private.h" +#include "bgpd/rfapi/rfapi_monitor.h" +#include "bgpd/rfapi/rfapi_vty.h" +#include "bgpd/rfapi/vnc_export_bgp.h" +#include "bgpd/rfapi/vnc_export_bgp_p.h" +#include "bgpd/rfapi/vnc_zebra.h" +#include "bgpd/rfapi/vnc_import_bgp.h" +#include "bgpd/rfapi/rfapi_rib.h" +#include "bgpd/rfapi/rfapi_ap.h" +#include "bgpd/rfapi/rfapi_encap_tlv.h" +#include "bgpd/rfapi/vnc_debug.h" #ifdef HAVE_GLIBC_BACKTRACE /* for backtrace and friends */ @@ -3884,7 +3884,7 @@ DEFUN (debug_rfapi_response_omit_self, #ifdef RFAPI_DEBUG_SKIPLIST_CLI -#include "skiplist.h" +#include "lib/skiplist.h" DEFUN (skiplist_test_cli, skiplist_test_cli_cmd, "skiplist test", diff --git a/bgpd/rfapi/rfapi.h b/bgpd/rfapi/rfapi.h index 6e1baa60c..7d108432a 100644 --- a/bgpd/rfapi/rfapi.h +++ b/bgpd/rfapi/rfapi.h @@ -26,11 +26,11 @@ #include #include -#include -#include "vty.h" -#include "prefix.h" -#include "../bgpd.h" -#include "../bgp_encap_types.h" +#include "lib/zebra.h" +#include "lib/vty.h" +#include "lib/prefix.h" +#include "bgpd/bgpd.h" +#include "bgpd/bgp_encap_types.h" /* probably ought to have a field-specific define in config.h */ # ifndef s6_addr32 /* for solaris/bsd */ diff --git a/bgpd/rfapi/rfapi_ap.c b/bgpd/rfapi/rfapi_ap.c index 94b6dea8d..b0d5ab35c 100644 --- a/bgpd/rfapi/rfapi_ap.c +++ b/bgpd/rfapi/rfapi_ap.c @@ -21,41 +21,41 @@ #include -#include "zebra.h" -#include "prefix.h" -#include "table.h" -#include "vty.h" -#include "memory.h" -#include "routemap.h" -#include "log.h" -#include "linklist.h" -#include "command.h" -#include "stream.h" - -#include "bgpd.h" -#include "bgp_ecommunity.h" -#include "bgp_attr.h" -#include "bgp_mplsvpn.h" - -#include "bgp_rfapi_cfg.h" -#include "rfapi.h" -#include "rfapi_backend.h" - -#include "bgp_route.h" -#include "bgp_aspath.h" -#include "bgp_advertise.h" - -#include "rfapi_import.h" -#include "rfapi_private.h" -#include "rfapi_monitor.h" -#include "rfapi_vty.h" -#include "vnc_export_bgp.h" -#include "vnc_export_bgp_p.h" -#include "vnc_zebra.h" -#include "vnc_import_bgp.h" -#include "rfapi_rib.h" - -#include "rfapi_ap.h" +#include "lib/zebra.h" +#include "lib/prefix.h" +#include "lib/table.h" +#include "lib/vty.h" +#include "lib/memory.h" +#include "lib/routemap.h" +#include "lib/log.h" +#include "lib/linklist.h" +#include "lib/command.h" +#include "lib/stream.h" + +#include "bgpd/bgpd.h" +#include "bgpd/bgp_ecommunity.h" +#include "bgpd/bgp_attr.h" +#include "bgpd/bgp_mplsvpn.h" + +#include "bgpd/rfapi/bgp_rfapi_cfg.h" +#include "bgpd/rfapi/rfapi.h" +#include "bgpd/rfapi/rfapi_backend.h" + +#include "bgpd/bgp_route.h" +#include "bgpd/bgp_aspath.h" +#include "bgpd/bgp_advertise.h" + +#include "bgpd/rfapi/rfapi_import.h" +#include "bgpd/rfapi/rfapi_private.h" +#include "bgpd/rfapi/rfapi_monitor.h" +#include "bgpd/rfapi/rfapi_vty.h" +#include "bgpd/rfapi/vnc_export_bgp.h" +#include "bgpd/rfapi/vnc_export_bgp_p.h" +#include "bgpd/rfapi/vnc_zebra.h" +#include "bgpd/rfapi/vnc_import_bgp.h" +#include "bgpd/rfapi/rfapi_rib.h" + +#include "bgpd/rfapi/rfapi_ap.h" /* * Per-NVE Advertised prefixes diff --git a/bgpd/rfapi/rfapi_ap.h b/bgpd/rfapi/rfapi_ap.h index 3bb08a4b1..f2805f49c 100644 --- a/bgpd/rfapi/rfapi_ap.h +++ b/bgpd/rfapi/rfapi_ap.h @@ -25,26 +25,26 @@ #include -#include "zebra.h" -#include "prefix.h" -#include "table.h" -#include "vty.h" -#include "memory.h" -#include "routemap.h" -#include "log.h" -#include "linklist.h" -#include "command.h" -#include "stream.h" - -#include "bgpd.h" +#include "lib/zebra.h" +#include "lib/prefix.h" +#include "lib/table.h" +#include "lib/vty.h" +#include "lib/memory.h" +#include "lib/routemap.h" +#include "lib/log.h" +#include "lib/linklist.h" +#include "lib/command.h" +#include "lib/stream.h" + +#include "bgpd/bgpd.h" #include "bgp_rfapi_cfg.h" #include "rfapi.h" #include "rfapi_backend.h" -#include "bgp_route.h" -#include "bgp_aspath.h" -#include "bgp_advertise.h" +#include "bgpd/bgp_route.h" +#include "bgpd/bgp_aspath.h" +#include "bgpd/bgp_advertise.h" #include "rfapi_import.h" #include "rfapi_private.h" diff --git a/bgpd/rfapi/rfapi_backend.h b/bgpd/rfapi/rfapi_backend.h index 451f5c20c..788ec7375 100644 --- a/bgpd/rfapi/rfapi_backend.h +++ b/bgpd/rfapi/rfapi_backend.h @@ -24,8 +24,8 @@ #if ENABLE_BGP_VNC -#include "bgp_route.h" -#include "bgp_nexthop.h" +#include "bgpd/bgp_route.h" +#include "bgpd/bgp_nexthop.h" extern void rfapi_init (void); extern void vnc_zebra_init (struct thread_master *master); diff --git a/bgpd/rfapi/rfapi_descriptor_rfp_utils.c b/bgpd/rfapi/rfapi_descriptor_rfp_utils.c index c2d11820e..b2a868988 100644 --- a/bgpd/rfapi/rfapi_descriptor_rfp_utils.c +++ b/bgpd/rfapi/rfapi_descriptor_rfp_utils.c @@ -22,18 +22,18 @@ #include -#include "zebra.h" -#include "prefix.h" -#include "table.h" -#include "vty.h" -#include "memory.h" -#include "log.h" +#include "lib/zebra.h" +#include "lib/prefix.h" +#include "lib/table.h" +#include "lib/vty.h" +#include "lib/memory.h" +#include "lib/log.h" -#include "bgpd.h" +#include "bgpd/bgpd.h" -#include "rfapi.h" -#include "rfapi_private.h" -#include "rfapi_descriptor_rfp_utils.h" +#include "bgpd/rfapi/rfapi.h" +#include "bgpd/rfapi/rfapi_private.h" +#include "bgpd/rfapi/rfapi_descriptor_rfp_utils.h" void * diff --git a/bgpd/rfapi/rfapi_encap_tlv.c b/bgpd/rfapi/rfapi_encap_tlv.c index 17fee2cc0..0a5962ccb 100644 --- a/bgpd/rfapi/rfapi_encap_tlv.c +++ b/bgpd/rfapi/rfapi_encap_tlv.c @@ -17,25 +17,25 @@ * */ -#include +#include "lib/zebra.h" -#include -#include -#include -#include +#include "lib/memory.h" +#include "lib/prefix.h" +#include "lib/table.h" +#include "lib/vty.h" -#include "bgpd.h" -#include "bgp_attr.h" +#include "bgpd/bgpd.h" +#include "bgpd/bgp_attr.h" -#include "bgp_encap_types.h" -#include "bgp_encap_tlv.h" +#include "bgpd/bgp_encap_types.h" +#include "bgpd/bgp_encap_tlv.h" -#include "rfapi.h" -#include "rfapi_encap_tlv.h" -#include "rfapi_private.h" -#include "rfapi_monitor.h" -#include "rfapi_vty.h" -#include "bgp_rfapi_cfg.h" +#include "bgpd/rfapi/rfapi.h" +#include "bgpd/rfapi/rfapi_encap_tlv.h" +#include "bgpd/rfapi/rfapi_private.h" +#include "bgpd/rfapi/rfapi_monitor.h" +#include "bgpd/rfapi/rfapi_vty.h" +#include "bgpd/rfapi/bgp_rfapi_cfg.h" static void rfapi_add_endpoint_address_to_subtlv ( diff --git a/bgpd/rfapi/rfapi_import.c b/bgpd/rfapi/rfapi_import.c index 63c1079c4..110182a1f 100644 --- a/bgpd/rfapi/rfapi_import.c +++ b/bgpd/rfapi/rfapi_import.c @@ -26,38 +26,38 @@ #include -#include "zebra.h" -#include "prefix.h" -#include "table.h" -#include "vty.h" -#include "memory.h" -#include "log.h" -#include "skiplist.h" -#include "thread.h" - -#include "bgpd.h" -#include "bgp_ecommunity.h" -#include "bgp_attr.h" -#include "bgp_route.h" -#include "bgp_mplsvpn.h" /* prefix_rd2str() */ -#include "bgp_vnc_types.h" - -#include "rfapi.h" -#include "bgp_rfapi_cfg.h" -#include "rfapi_backend.h" -#include "rfapi_import.h" -#include "rfapi_private.h" -#include "rfapi_monitor.h" -#include "rfapi_nve_addr.h" -#include "rfapi_vty.h" -#include "vnc_export_bgp.h" -#include "vnc_export_bgp_p.h" -#include "vnc_zebra.h" -#include "vnc_import_bgp.h" -#include "vnc_import_bgp_p.h" -#include "rfapi_rib.h" -#include "rfapi_encap_tlv.h" -#include "vnc_debug.h" +#include "lib/zebra.h" +#include "lib/prefix.h" +#include "lib/table.h" +#include "lib/vty.h" +#include "lib/memory.h" +#include "lib/log.h" +#include "lib/skiplist.h" +#include "lib/thread.h" + +#include "bgpd/bgpd.h" +#include "bgpd/bgp_ecommunity.h" +#include "bgpd/bgp_attr.h" +#include "bgpd/bgp_route.h" +#include "bgpd/bgp_mplsvpn.h" /* prefix_rd2str() */ +#include "bgpd/bgp_vnc_types.h" + +#include "bgpd/rfapi/rfapi.h" +#include "bgpd/rfapi/bgp_rfapi_cfg.h" +#include "bgpd/rfapi/rfapi_backend.h" +#include "bgpd/rfapi/rfapi_import.h" +#include "bgpd/rfapi/rfapi_private.h" +#include "bgpd/rfapi/rfapi_monitor.h" +#include "bgpd/rfapi/rfapi_nve_addr.h" +#include "bgpd/rfapi/rfapi_vty.h" +#include "bgpd/rfapi/vnc_export_bgp.h" +#include "bgpd/rfapi/vnc_export_bgp_p.h" +#include "bgpd/rfapi/vnc_zebra.h" +#include "bgpd/rfapi/vnc_import_bgp.h" +#include "bgpd/rfapi/vnc_import_bgp_p.h" +#include "bgpd/rfapi/rfapi_rib.h" +#include "bgpd/rfapi/rfapi_encap_tlv.h" +#include "bgpd/rfapi/vnc_debug.h" #ifdef HAVE_GLIBC_BACKTRACE /* for backtrace and friends */ diff --git a/bgpd/rfapi/rfapi_import.h b/bgpd/rfapi/rfapi_import.h index 9e88b52f5..3a1ae3573 100644 --- a/bgpd/rfapi/rfapi_import.h +++ b/bgpd/rfapi/rfapi_import.h @@ -27,7 +27,7 @@ #ifndef QUAGGA_HGP_RFAPI_IMPORT_H #define QUAGGA_HGP_RFAPI_IMPORT_H -#include "thread.h" +#include "lib/thread.h" /* * These are per-rt-import-list diff --git a/bgpd/rfapi/rfapi_monitor.c b/bgpd/rfapi/rfapi_monitor.c index 4677d1fa6..216b45eec 100644 --- a/bgpd/rfapi/rfapi_monitor.c +++ b/bgpd/rfapi/rfapi_monitor.c @@ -27,28 +27,28 @@ #include -#include "zebra.h" -#include "prefix.h" -#include "table.h" -#include "vty.h" -#include "memory.h" -#include "log.h" -#include "table.h" -#include "skiplist.h" - -#include "bgpd.h" - -#include "bgp_rfapi_cfg.h" -#include "rfapi.h" -#include "rfapi_backend.h" - -#include "rfapi.h" -#include "rfapi_import.h" -#include "vnc_import_bgp.h" -#include "rfapi_private.h" -#include "rfapi_monitor.h" -#include "rfapi_vty.h" -#include "rfapi_rib.h" +#include "lib/zebra.h" +#include "lib/prefix.h" +#include "lib/table.h" +#include "lib/vty.h" +#include "lib/memory.h" +#include "lib/log.h" +#include "lib/table.h" +#include "lib/skiplist.h" + +#include "bgpd/bgpd.h" + +#include "bgpd/rfapi/bgp_rfapi_cfg.h" +#include "bgpd/rfapi/rfapi.h" +#include "bgpd/rfapi/rfapi_backend.h" + +#include "bgpd/rfapi/rfapi.h" +#include "bgpd/rfapi/rfapi_import.h" +#include "bgpd/rfapi/vnc_import_bgp.h" +#include "bgpd/rfapi/rfapi_private.h" +#include "bgpd/rfapi/rfapi_monitor.h" +#include "bgpd/rfapi/rfapi_vty.h" +#include "bgpd/rfapi/rfapi_rib.h" #define DEBUG_L2_EXTRA 0 #define DEBUG_DUP_CHECK 0 diff --git a/bgpd/rfapi/rfapi_monitor.h b/bgpd/rfapi/rfapi_monitor.h index b08a6e60c..be04b0f09 100644 --- a/bgpd/rfapi/rfapi_monitor.h +++ b/bgpd/rfapi/rfapi_monitor.h @@ -22,9 +22,9 @@ #ifndef QUAGGA_HGP_RFAPI_MONITOR_H #define QUAGGA_HGP_RFAPI_MONITOR_H -#include "zebra.h" -#include "prefix.h" -#include "table.h" +#include "lib/zebra.h" +#include "lib/prefix.h" +#include "lib/table.h" /* * These get attached to the nodes in an import table (using "aggregate" ptr) diff --git a/bgpd/rfapi/rfapi_nve_addr.c b/bgpd/rfapi/rfapi_nve_addr.c index 835c2d2fa..ad34ff26c 100644 --- a/bgpd/rfapi/rfapi_nve_addr.c +++ b/bgpd/rfapi/rfapi_nve_addr.c @@ -20,24 +20,24 @@ */ -#include "zebra.h" -#include "prefix.h" -#include "table.h" -#include "vty.h" -#include "memory.h" -#include "skiplist.h" +#include "lib/zebra.h" +#include "lib/prefix.h" +#include "lib/table.h" +#include "lib/vty.h" +#include "lib/memory.h" +#include "lib/skiplist.h" -#include "bgpd.h" +#include "bgpd/bgpd.h" -#include "bgp_rfapi_cfg.h" -#include "rfapi.h" -#include "rfapi_backend.h" +#include "bgpd/rfapi/bgp_rfapi_cfg.h" +#include "bgpd/rfapi/rfapi.h" +#include "bgpd/rfapi/rfapi_backend.h" -#include "rfapi_import.h" -#include "rfapi_private.h" -#include "rfapi_nve_addr.h" -#include "rfapi_vty.h" +#include "bgpd/rfapi/rfapi_import.h" +#include "bgpd/rfapi/rfapi_private.h" +#include "bgpd/rfapi/rfapi_nve_addr.h" +#include "bgpd/rfapi/rfapi_vty.h" #define DEBUG_NVE_ADDR 0 diff --git a/bgpd/rfapi/rfapi_private.h b/bgpd/rfapi/rfapi_private.h index aca034b57..33390c4f5 100644 --- a/bgpd/rfapi/rfapi_private.h +++ b/bgpd/rfapi/rfapi_private.h @@ -26,11 +26,11 @@ #ifndef _QUAGGA_BGP_RFAPI_PRIVATE_H #define _QUAGGA_BGP_RFAPI_PRIVATE_H -#include "linklist.h" -#include "skiplist.h" -#include "workqueue.h" +#include "lib/linklist.h" +#include "lib/skiplist.h" +#include "lib/workqueue.h" -#include "bgp_attr.h" +#include "bgpd/bgp_attr.h" #include "rfapi.h" diff --git a/bgpd/rfapi/rfapi_rib.c b/bgpd/rfapi/rfapi_rib.c index 70acc14d3..48c2d422d 100644 --- a/bgpd/rfapi/rfapi_rib.c +++ b/bgpd/rfapi/rfapi_rib.c @@ -26,30 +26,30 @@ #include -#include "zebra.h" -#include "prefix.h" -#include "table.h" -#include "vty.h" -#include "memory.h" -#include "log.h" -#include "skiplist.h" -#include "workqueue.h" - -#include "bgpd.h" -#include "bgp_route.h" -#include "bgp_ecommunity.h" -#include "bgp_mplsvpn.h" -#include "bgp_vnc_types.h" - -#include "rfapi.h" -#include "bgp_rfapi_cfg.h" -#include "rfapi_import.h" -#include "rfapi_private.h" -#include "rfapi_vty.h" -#include "vnc_import_bgp.h" -#include "rfapi_rib.h" -#include "rfapi_monitor.h" -#include "rfapi_encap_tlv.h" +#include "lib/zebra.h" +#include "lib/prefix.h" +#include "lib/table.h" +#include "lib/vty.h" +#include "lib/memory.h" +#include "lib/log.h" +#include "lib/skiplist.h" +#include "lib/workqueue.h" + +#include "bgpd/bgpd.h" +#include "bgpd/bgp_route.h" +#include "bgpd/bgp_ecommunity.h" +#include "bgpd/bgp_mplsvpn.h" +#include "bgpd/bgp_vnc_types.h" + +#include "bgpd/rfapi/rfapi.h" +#include "bgpd/rfapi/bgp_rfapi_cfg.h" +#include "bgpd/rfapi/rfapi_import.h" +#include "bgpd/rfapi/rfapi_private.h" +#include "bgpd/rfapi/rfapi_vty.h" +#include "bgpd/rfapi/vnc_import_bgp.h" +#include "bgpd/rfapi/rfapi_rib.h" +#include "bgpd/rfapi/rfapi_monitor.h" +#include "bgpd/rfapi/rfapi_encap_tlv.h" #define DEBUG_PROCESS_PENDING_NODE 0 #define DEBUG_PENDING_DELETE_ROUTE 0 diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c index 315bac4fe..0cb6f31ac 100644 --- a/bgpd/rfapi/rfapi_vty.c +++ b/bgpd/rfapi/rfapi_vty.c @@ -22,38 +22,38 @@ #include -#include "zebra.h" -#include "prefix.h" -#include "table.h" -#include "vty.h" -#include "memory.h" -#include "routemap.h" -#include "log.h" -#include "linklist.h" -#include "command.h" - -#include "bgpd.h" -#include "bgp_ecommunity.h" -#include "bgp_attr.h" -#include "bgp_mplsvpn.h" - -#include "bgp_rfapi_cfg.h" -#include "rfapi.h" -#include "rfapi_backend.h" - -#include "bgp_route.h" -#include "bgp_aspath.h" -#include "bgp_community.h" -#include "bgp_vnc_types.h" - -#include "rfapi_import.h" -#include "rfapi_private.h" -#include "rfapi_monitor.h" -#include "rfapi_rib.h" -#include "rfapi_vty.h" -#include "rfapi_ap.h" -#include "rfapi_encap_tlv.h" -#include "vnc_debug.h" +#include "lib/zebra.h" +#include "lib/prefix.h" +#include "lib/table.h" +#include "lib/vty.h" +#include "lib/memory.h" +#include "lib/routemap.h" +#include "lib/log.h" +#include "lib/linklist.h" +#include "lib/command.h" + +#include "bgpd/bgpd.h" +#include "bgpd/bgp_ecommunity.h" +#include "bgpd/bgp_attr.h" +#include "bgpd/bgp_mplsvpn.h" + +#include "bgpd/rfapi/bgp_rfapi_cfg.h" +#include "bgpd/rfapi/rfapi.h" +#include "bgpd/rfapi/rfapi_backend.h" + +#include "bgpd/bgp_route.h" +#include "bgpd/bgp_aspath.h" +#include "bgpd/bgp_community.h" +#include "bgpd/bgp_vnc_types.h" + +#include "bgpd/rfapi/rfapi_import.h" +#include "bgpd/rfapi/rfapi_private.h" +#include "bgpd/rfapi/rfapi_monitor.h" +#include "bgpd/rfapi/rfapi_rib.h" +#include "bgpd/rfapi/rfapi_vty.h" +#include "bgpd/rfapi/rfapi_ap.h" +#include "bgpd/rfapi/rfapi_encap_tlv.h" +#include "bgpd/rfapi/vnc_debug.h" #define DEBUG_L2_EXTRA 0 diff --git a/bgpd/rfapi/rfapi_vty.h b/bgpd/rfapi/rfapi_vty.h index 08c8e1cf4..c1aeda953 100644 --- a/bgpd/rfapi/rfapi_vty.h +++ b/bgpd/rfapi/rfapi_vty.h @@ -22,7 +22,7 @@ #ifndef RFAPI_VTY_H #define RFAPI_VTY_H -#include "vty.h" +#include "lib/vty.h" typedef enum { diff --git a/bgpd/rfapi/vnc_debug.c b/bgpd/rfapi/vnc_debug.c index 8f4578159..eaa8c56ee 100644 --- a/bgpd/rfapi/vnc_debug.c +++ b/bgpd/rfapi/vnc_debug.c @@ -18,16 +18,16 @@ * */ -#include +#include "lib/zebra.h" #include -#include "prefix.h" -#include "linklist.h" -#include "stream.h" -#include "command.h" -#include "str.h" -#include "log.h" -#include "vnc_debug.h" +#include "lib/prefix.h" +#include "lib/linklist.h" +#include "lib/stream.h" +#include "lib/command.h" +#include "lib/str.h" +#include "lib/log.h" +#include "bgpd/rfapi/vnc_debug.h" /* * debug state storage diff --git a/bgpd/rfapi/vnc_export_bgp.c b/bgpd/rfapi/vnc_export_bgp.c index f0a628922..6434c3744 100644 --- a/bgpd/rfapi/vnc_export_bgp.c +++ b/bgpd/rfapi/vnc_export_bgp.c @@ -24,32 +24,32 @@ * Purpose: Export routes to BGP directly (not via zebra) */ -#include "zebra.h" -#include "prefix.h" -#include "table.h" -#include "vty.h" -#include "log.h" -#include "stream.h" -#include "memory.h" -#include "linklist.h" -#include "plist.h" -#include "routemap.h" - -#include "bgpd.h" -#include "bgp_ecommunity.h" -#include "bgp_attr.h" -#include "bgp_aspath.h" - -#include "vnc_export_bgp.h" -#include "vnc_export_bgp_p.h" -#include "vnc_export_table.h" -#include "bgp_rfapi_cfg.h" -#include "rfapi.h" -#include "rfapi_import.h" -#include "rfapi_private.h" -#include "rfapi_backend.h" -#include "rfapi_vty.h" -#include "vnc_debug.h" +#include "lib/zebra.h" +#include "lib/prefix.h" +#include "lib/table.h" +#include "lib/vty.h" +#include "lib/log.h" +#include "lib/stream.h" +#include "lib/memory.h" +#include "lib/linklist.h" +#include "lib/plist.h" +#include "lib/routemap.h" + +#include "bgpd/bgpd.h" +#include "bgpd/bgp_ecommunity.h" +#include "bgpd/bgp_attr.h" +#include "bgpd/bgp_aspath.h" + +#include "bgpd/rfapi/vnc_export_bgp.h" +#include "bgpd/rfapi/vnc_export_bgp_p.h" +#include "bgpd/rfapi/vnc_export_table.h" +#include "bgpd/rfapi/bgp_rfapi_cfg.h" +#include "bgpd/rfapi/rfapi.h" +#include "bgpd/rfapi/rfapi_import.h" +#include "bgpd/rfapi/rfapi_private.h" +#include "bgpd/rfapi/rfapi_backend.h" +#include "bgpd/rfapi/rfapi_vty.h" +#include "bgpd/rfapi/vnc_debug.h" /*********************************************************************** * Export methods that set nexthop to CE (from 5226 roo EC) BEGIN diff --git a/bgpd/rfapi/vnc_export_bgp.h b/bgpd/rfapi/vnc_export_bgp.h index ab2197d12..ae113fdcb 100644 --- a/bgpd/rfapi/vnc_export_bgp.h +++ b/bgpd/rfapi/vnc_export_bgp.h @@ -22,11 +22,11 @@ #ifndef _QUAGGA_RFAPI_VNC_EXPORT_BGP_H_ #define _QUAGGA_RFAPI_VNC_EXPORT_BGP_H_ -#include "zebra.h" -#include "prefix.h" +#include "lib/zebra.h" +#include "lib/prefix.h" -#include "bgpd.h" -#include "bgp_route.h" +#include "bgpd/bgpd.h" +#include "bgpd/bgp_route.h" extern void vnc_direct_bgp_rh_reexport (struct bgp *bgp, afi_t afi); diff --git a/bgpd/rfapi/vnc_export_bgp_p.h b/bgpd/rfapi/vnc_export_bgp_p.h index 628778af3..fceab02e0 100644 --- a/bgpd/rfapi/vnc_export_bgp_p.h +++ b/bgpd/rfapi/vnc_export_bgp_p.h @@ -22,11 +22,11 @@ #ifndef _QUAGGA_RFAPI_VNC_EXPORT_BGP_P_H_ #define _QUAGGA_RFAPI_VNC_EXPORT_BGP_P_H_ -#include "zebra.h" -#include "prefix.h" +#include "lib/zebra.h" +#include "lib/prefix.h" -#include "bgpd.h" -#include "bgp_route.h" +#include "bgpd/bgpd.h" +#include "bgpd/bgp_route.h" #include "rfapi_private.h" diff --git a/bgpd/rfapi/vnc_export_table.c b/bgpd/rfapi/vnc_export_table.c index 5a96d8a52..16ffc801e 100644 --- a/bgpd/rfapi/vnc_export_table.c +++ b/bgpd/rfapi/vnc_export_table.c @@ -20,18 +20,18 @@ */ -#include "zebra.h" -#include "prefix.h" -#include "table.h" -#include "memory.h" -#include "vty.h" - -#include "bgpd.h" -#include "bgp_route.h" - -#include "vnc_export_table.h" -#include "rfapi_private.h" -#include "rfapi_import.h" +#include "lib/zebra.h" +#include "lib/prefix.h" +#include "lib/table.h" +#include "lib/memory.h" +#include "lib/vty.h" + +#include "bgpd/bgpd.h" +#include "bgpd/bgp_route.h" + +#include "bgpd/rfapi/vnc_export_table.h" +#include "bgpd/rfapi/rfapi_private.h" +#include "bgpd/rfapi/rfapi_import.h" struct route_node * vnc_etn_get (struct bgp *bgp, vnc_export_type_t type, struct prefix *p) diff --git a/bgpd/rfapi/vnc_export_table.h b/bgpd/rfapi/vnc_export_table.h index 231861af4..77829ca38 100644 --- a/bgpd/rfapi/vnc_export_table.h +++ b/bgpd/rfapi/vnc_export_table.h @@ -22,11 +22,11 @@ #ifndef _QUAGGA_VNC_VNC_EXPORT_TABLE_H_ #define _QUAGGA_VNC_VNC_EXPORT_TABLE_H_ -#include "table.h" -#include "thread.h" -#include "vty.h" +#include "lib/table.h" +#include "lib/thread.h" +#include "lib/vty.h" -#include "bgpd.h" +#include "bgpd/bgpd.h" #define VNC_EXPORT_TYPE_BGP 1 #define VNC_EXPORT_TYPE_ZEBRA 2 diff --git a/bgpd/rfapi/vnc_import_bgp.c b/bgpd/rfapi/vnc_import_bgp.c index 020cf181b..79ef92e1f 100644 --- a/bgpd/rfapi/vnc_import_bgp.c +++ b/bgpd/rfapi/vnc_import_bgp.c @@ -24,31 +24,31 @@ * Purpose: Import routes from BGP unicast directly (not via zebra) */ -#include "zebra.h" -#include "prefix.h" -#include "table.h" -#include "vty.h" -#include "log.h" -#include "memory.h" -#include "linklist.h" -#include "plist.h" -#include "routemap.h" - -#include "bgpd.h" -#include "bgp_ecommunity.h" -#include "bgp_attr.h" -#include "bgp_mplsvpn.h" /* for RD_TYPE_IP */ - -#include "vnc_export_bgp.h" -#include "bgp_rfapi_cfg.h" -#include "rfapi.h" -#include "rfapi_import.h" -#include "rfapi_private.h" -#include "rfapi_monitor.h" -#include "rfapi_vty.h" -#include "vnc_import_bgp.h" -#include "vnc_import_bgp_p.h" -#include "vnc_debug.h" +#include "lib/zebra.h" +#include "lib/prefix.h" +#include "lib/table.h" +#include "lib/vty.h" +#include "lib/log.h" +#include "lib/memory.h" +#include "lib/linklist.h" +#include "lib/plist.h" +#include "lib/routemap.h" + +#include "bgpd/bgpd.h" +#include "bgpd/bgp_ecommunity.h" +#include "bgpd/bgp_attr.h" +#include "bgpd/bgp_mplsvpn.h" /* for RD_TYPE_IP */ + +#include "bgpd/rfapi/vnc_export_bgp.h" +#include "bgpd/rfapi/bgp_rfapi_cfg.h" +#include "bgpd/rfapi/rfapi.h" +#include "bgpd/rfapi/rfapi_import.h" +#include "bgpd/rfapi/rfapi_private.h" +#include "bgpd/rfapi/rfapi_monitor.h" +#include "bgpd/rfapi/rfapi_vty.h" +#include "bgpd/rfapi/vnc_import_bgp.h" +#include "bgpd/rfapi/vnc_import_bgp_p.h" +#include "bgpd/rfapi/vnc_debug.h" #define ENABLE_VNC_RHNCK diff --git a/bgpd/rfapi/vnc_import_bgp.h b/bgpd/rfapi/vnc_import_bgp.h index acab0c62f..db739e332 100644 --- a/bgpd/rfapi/vnc_import_bgp.h +++ b/bgpd/rfapi/vnc_import_bgp.h @@ -22,11 +22,11 @@ #ifndef _QUAGGA_RFAPI_VNC_IMPORT_BGP_H_ #define _QUAGGA_RFAPI_VNC_IMPORT_BGP_H_ -#include "zebra.h" -#include "prefix.h" +#include "lib/zebra.h" +#include "lib/prefix.h" -#include "bgpd.h" -#include "bgp_route.h" +#include "bgpd/bgpd.h" +#include "bgpd/bgp_route.h" #define VALID_INTERIOR_TYPE(type) \ (((type) == ZEBRA_ROUTE_BGP) || ((type) == ZEBRA_ROUTE_BGP_DIRECT)) diff --git a/bgpd/rfapi/vnc_import_bgp_p.h b/bgpd/rfapi/vnc_import_bgp_p.h index 4d37ce9cd..85800c1ca 100644 --- a/bgpd/rfapi/vnc_import_bgp_p.h +++ b/bgpd/rfapi/vnc_import_bgp_p.h @@ -22,11 +22,11 @@ #ifndef _QUAGGA_RFAPI_VNC_IMPORT_BGP_P_H_ #define _QUAGGA_RFAPI_VNC_IMPORT_BGP_P_H_ -#include "zebra.h" -#include "prefix.h" +#include "lib/zebra.h" +#include "lib/prefix.h" -#include "bgpd.h" -#include "bgp_route.h" +#include "bgpd/bgpd.h" +#include "bgpd/bgp_route.h" extern void vnc_import_bgp_exterior_add_route_interior ( diff --git a/bgpd/rfapi/vnc_zebra.c b/bgpd/rfapi/vnc_zebra.c index 54e8a2a3e..0ea0fa9e5 100644 --- a/bgpd/rfapi/vnc_zebra.c +++ b/bgpd/rfapi/vnc_zebra.c @@ -24,28 +24,28 @@ * Purpose: Handle exchange of routes between VNC and Zebra */ -#include "zebra.h" -#include "prefix.h" -#include "table.h" -#include "log.h" -#include "command.h" -#include "zclient.h" -#include "stream.h" -#include "memory.h" - -#include "bgpd.h" -#include "bgp_ecommunity.h" -#include "bgp_route.h" -#include "bgp_debug.h" -#include "bgp_advertise.h" - -#include "bgp_rfapi_cfg.h" -#include "rfapi.h" -#include "rfapi_import.h" -#include "rfapi_private.h" -#include "vnc_zebra.h" -#include "rfapi_vty.h" -#include "rfapi_backend.h" +#include "lib/zebra.h" +#include "lib/prefix.h" +#include "lib/table.h" +#include "lib/log.h" +#include "lib/command.h" +#include "lib/zclient.h" +#include "lib/stream.h" +#include "lib/memory.h" + +#include "bgpd/bgpd.h" +#include "bgpd/bgp_ecommunity.h" +#include "bgpd/bgp_route.h" +#include "bgpd/bgp_debug.h" +#include "bgpd/bgp_advertise.h" + +#include "bgpd/rfapi/bgp_rfapi_cfg.h" +#include "bgpd/rfapi/rfapi.h" +#include "bgpd/rfapi/rfapi_import.h" +#include "bgpd/rfapi/rfapi_private.h" +#include "bgpd/rfapi/vnc_zebra.h" +#include "bgpd/rfapi/rfapi_vty.h" +#include "bgpd/rfapi/rfapi_backend.h" static struct rfapi_descriptor vncHD1VR; /* Single-VR export dummy nve descr */ static struct zclient *zclient_vnc = NULL; diff --git a/bgpd/rfapi/vnc_zebra.h b/bgpd/rfapi/vnc_zebra.h index 226136ea6..ad2484442 100644 --- a/bgpd/rfapi/vnc_zebra.h +++ b/bgpd/rfapi/vnc_zebra.h @@ -26,7 +26,7 @@ #ifndef _QUAGGA_BGP_VNC_ZEBRA_H #define _QUAGGA_BGP_VNC_ZEBRA_H -#include "zebra.h" +#include "lib/zebra.h" extern void vnc_zebra_add_prefix ( diff --git a/bgpd/rfp-example/librfp/rfp.h b/bgpd/rfp-example/librfp/rfp.h index 4aa307821..91dbf5e71 100644 --- a/bgpd/rfp-example/librfp/rfp.h +++ b/bgpd/rfp-example/librfp/rfp.h @@ -23,7 +23,7 @@ #ifndef _RFP_H #define _RFP_H -#include "rfapi.h" +#include "bgpd/rfapi/rfapi.h" extern int bgp_rfp_cfg_write (void *vty, void *bgp); /* TO BE REMOVED */ void rfp_clear_vnc_nve_all (void); diff --git a/bgpd/rfp-example/librfp/rfp_example.c b/bgpd/rfp-example/librfp/rfp_example.c index b53355014..e8b546ddf 100644 --- a/bgpd/rfp-example/librfp/rfp_example.c +++ b/bgpd/rfp-example/librfp/rfp_example.c @@ -21,8 +21,8 @@ /* stub rfp */ #include "rfp_internal.h" -#include "rfapi.h" -#include "command.h" +#include "bgpd/rfapi/rfapi.h" +#include "lib/command.h" struct rfp_instance_t { diff --git a/bgpd/rfp-example/librfp/rfp_internal.h b/bgpd/rfp-example/librfp/rfp_internal.h index 94192534f..64452d239 100644 --- a/bgpd/rfp-example/librfp/rfp_internal.h +++ b/bgpd/rfp-example/librfp/rfp_internal.h @@ -22,8 +22,8 @@ /* Sample header file */ #ifndef _RFP_INTERNAL_H #define _RFP_INTERNAL_H -#include +#include "lib/zebra.h" #include "rfp.h" -#include "rfapi.h" +#include "bgpd/rfapi/rfapi.h" #endif /* _RFP_INTERNAL_H */ -- 2.39.5