diff options
Diffstat (limited to 'ospfd')
-rw-r--r-- | ospfd/ospf_gr.h (renamed from ospfd/ospf_gr_helper.h) | 9 | ||||
-rw-r--r-- | ospfd/ospf_gr_helper.c | 2 | ||||
-rw-r--r-- | ospfd/ospf_neighbor.c | 2 | ||||
-rw-r--r-- | ospfd/ospf_neighbor.h | 2 | ||||
-rw-r--r-- | ospfd/ospf_packet.c | 2 | ||||
-rw-r--r-- | ospfd/ospfd.c | 2 | ||||
-rw-r--r-- | ospfd/subdir.am | 2 |
7 files changed, 11 insertions, 10 deletions
diff --git a/ospfd/ospf_gr_helper.h b/ospfd/ospf_gr.h index bd6d1d746..2106e0f5c 100644 --- a/ospfd/ospf_gr_helper.h +++ b/ospfd/ospf_gr.h @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _ZEBRA_OSPF_GR_HELPER_H -#define _ZEBRA_OSPF_GR_HELPER_H +#ifndef _ZEBRA_OSPF_GR_H +#define _ZEBRA_OSPF_GR_H #define OSPF_GR_NOT_HELPER 0 #define OSPF_GR_ACTIVE_HELPER 1 @@ -101,7 +101,8 @@ struct ospf_helper_info { /* Grace timer,This Router acts as * helper until this timer until - * this timer expires*/ + * this timer expires. + */ struct thread *t_grace_timer; /* Helper status */ @@ -178,4 +179,4 @@ extern void ospf_gr_helper_supported_gracetime_set(struct ospf *ospf, uint32_t interval); extern void ospf_gr_helper_set_supported_planned_only_restart(struct ospf *ospf, bool planned_only); -#endif /* _ZEBRA_OSPF_HELPER_H */ +#endif /* _ZEBRA_OSPF_GR_H */ diff --git a/ospfd/ospf_gr_helper.c b/ospfd/ospf_gr_helper.c index 1465ed139..7d0c229af 100644 --- a/ospfd/ospf_gr_helper.c +++ b/ospfd/ospf_gr_helper.c @@ -48,7 +48,7 @@ #include "ospfd/ospf_errors.h" #include "ospfd/ospf_nsm.h" #include "ospfd/ospf_ism.h" -#include "ospfd/ospf_gr_helper.h" +#include "ospfd/ospf_gr.h" static const char * const ospf_exit_reason_desc[] = { "Unknown reason", diff --git a/ospfd/ospf_neighbor.c b/ospfd/ospf_neighbor.c index 8725497f2..98fb54d82 100644 --- a/ospfd/ospf_neighbor.c +++ b/ospfd/ospf_neighbor.c @@ -44,7 +44,7 @@ #include "ospfd/ospf_flood.h" #include "ospfd/ospf_dump.h" #include "ospfd/ospf_bfd.h" -#include "ospfd/ospf_gr_helper.h" +#include "ospfd/ospf_gr.h" /* Fill in the the 'key' as appropriate to retrieve the entry for nbr * from the ospf_interface's nbrs table. Indexed by interface address diff --git a/ospfd/ospf_neighbor.h b/ospfd/ospf_neighbor.h index 2ce6d6755..433b13615 100644 --- a/ospfd/ospf_neighbor.h +++ b/ospfd/ospf_neighbor.h @@ -22,7 +22,7 @@ #ifndef _ZEBRA_OSPF_NEIGHBOR_H #define _ZEBRA_OSPF_NEIGHBOR_H -#include <ospfd/ospf_gr_helper.h> +#include <ospfd/ospf_gr.h> #include <ospfd/ospf_packet.h> /* Neighbor Data Structure */ diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c index e3a8eabda..743db7002 100644 --- a/ospfd/ospf_packet.c +++ b/ospfd/ospf_packet.c @@ -54,7 +54,7 @@ #include "ospfd/ospf_dump.h" #include "ospfd/ospf_errors.h" #include "ospfd/ospf_zebra.h" -#include "ospfd/ospf_gr_helper.h" +#include "ospfd/ospf_gr.h" /* * OSPF Fragmentation / fragmented writes diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c index e95ee55e6..a4b50e0c3 100644 --- a/ospfd/ospfd.c +++ b/ospfd/ospfd.c @@ -60,7 +60,7 @@ #include "ospfd/ospf_flood.h" #include "ospfd/ospf_ase.h" #include "ospfd/ospf_ldp_sync.h" -#include "ospfd/ospf_gr_helper.h" +#include "ospfd/ospf_gr.h" DEFINE_QOBJ_TYPE(ospf); diff --git a/ospfd/subdir.am b/ospfd/subdir.am index 574e0e3bd..51254391f 100644 --- a/ospfd/subdir.am +++ b/ospfd/subdir.am @@ -100,6 +100,7 @@ noinst_HEADERS += \ ospfd/ospf_network.h \ ospfd/ospf_packet.h \ ospfd/ospf_ri.h \ + ospfd/ospf_gr.h \ ospfd/ospf_route.h \ ospfd/ospf_routemap_nb.h \ ospfd/ospf_spf.h \ @@ -108,7 +109,6 @@ noinst_HEADERS += \ ospfd/ospf_te.h \ ospfd/ospf_vty.h \ ospfd/ospf_zebra.h \ - ospfd/ospf_gr_helper.h \ # end ospfd_ospfd_LDADD = ospfd/libfrrospf.a lib/libfrr.la $(LIBCAP) $(LIBM) |