proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 05:33:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ospfd: rename the graceful restart header

Browse Source 
Both the GR helper code and the upcoming GR restarting code are going
to share a lot of definitions. As such, rename ospf_gr_helper.h to
ospf_gr.h, which will be the central point of all GR definitions
and prototypes.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2021-05-31 10:27:51 -03:00
parent 3f87e1d8b3
commit cd52c44c00
7 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ospfd/ospf_gr_helper.h → ospfd/ospf_gr.h
View File

@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _ZEBRA_OSPF_GR_HELPER_H #ifndef _ZEBRA_OSPF_GR_H
#define _ZEBRA_OSPF_GR_HELPER_H #define _ZEBRA_OSPF_GR_H
#define OSPF_GR_NOT_HELPER 0 #define OSPF_GR_NOT_HELPER 0
#define OSPF_GR_ACTIVE_HELPER 1 #define OSPF_GR_ACTIVE_HELPER 1
@ -101,7 +101,8 @@ struct ospf_helper_info {
/* Grace timer,This Router acts as /* Grace timer,This Router acts as
* helper until this timer until * helper until this timer until
* this timer expires*/ * this timer expires.
*/
struct thread *t_grace_timer; struct thread *t_grace_timer;
/* Helper status */ /* Helper status */
@ -178,4 +179,4 @@ extern void ospf_gr_helper_supported_gracetime_set(struct ospf *ospf,
uint32_t interval); uint32_t interval);
extern void ospf_gr_helper_set_supported_planned_only_restart(struct ospf *ospf, extern void ospf_gr_helper_set_supported_planned_only_restart(struct ospf *ospf,
bool planned_only); bool planned_only);
#endif /* _ZEBRA_OSPF_HELPER_H */ #endif /* _ZEBRA_OSPF_GR_H */

2
ospfd/ospf_gr_helper.c
View File

@ -48,7 +48,7 @@
#include "ospfd/ospf_errors.h" #include "ospfd/ospf_errors.h"
#include "ospfd/ospf_nsm.h" #include "ospfd/ospf_nsm.h"
#include "ospfd/ospf_ism.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[] = { static const char * const ospf_exit_reason_desc[] = {
"Unknown reason", "Unknown reason",

2
ospfd/ospf_neighbor.c
View File

@ -44,7 +44,7 @@
#include "ospfd/ospf_flood.h" #include "ospfd/ospf_flood.h"
#include "ospfd/ospf_dump.h" #include "ospfd/ospf_dump.h"
#include "ospfd/ospf_bfd.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 /* Fill in the the 'key' as appropriate to retrieve the entry for nbr
* from the ospf_interface's nbrs table. Indexed by interface address * from the ospf_interface's nbrs table. Indexed by interface address

2
ospfd/ospf_neighbor.h
View File

@ -22,7 +22,7 @@
#ifndef _ZEBRA_OSPF_NEIGHBOR_H #ifndef _ZEBRA_OSPF_NEIGHBOR_H
#define _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> #include <ospfd/ospf_packet.h>
/* Neighbor Data Structure */ /* Neighbor Data Structure */

2
ospfd/ospf_packet.c
View File

@ -54,7 +54,7 @@
#include "ospfd/ospf_dump.h" #include "ospfd/ospf_dump.h"
#include "ospfd/ospf_errors.h" #include "ospfd/ospf_errors.h"
#include "ospfd/ospf_zebra.h" #include "ospfd/ospf_zebra.h"
#include "ospfd/ospf_gr_helper.h" #include "ospfd/ospf_gr.h"
/* /*
* OSPF Fragmentation / fragmented writes * OSPF Fragmentation / fragmented writes

2
ospfd/ospfd.c
View File

@ -60,7 +60,7 @@
#include "ospfd/ospf_flood.h" #include "ospfd/ospf_flood.h"
#include "ospfd/ospf_ase.h" #include "ospfd/ospf_ase.h"
#include "ospfd/ospf_ldp_sync.h" #include "ospfd/ospf_ldp_sync.h"
#include "ospfd/ospf_gr_helper.h" #include "ospfd/ospf_gr.h"
DEFINE_QOBJ_TYPE(ospf); DEFINE_QOBJ_TYPE(ospf);

2
ospfd/subdir.am
View File

@ -100,6 +100,7 @@ noinst_HEADERS += \
ospfd/ospf_network.h \ ospfd/ospf_network.h \
ospfd/ospf_packet.h \ ospfd/ospf_packet.h \
ospfd/ospf_ri.h \ ospfd/ospf_ri.h \
ospfd/ospf_gr.h \
ospfd/ospf_route.h \ ospfd/ospf_route.h \
ospfd/ospf_routemap_nb.h \ ospfd/ospf_routemap_nb.h \
ospfd/ospf_spf.h \ ospfd/ospf_spf.h \
@ -108,7 +109,6 @@ noinst_HEADERS += \
ospfd/ospf_te.h \ ospfd/ospf_te.h \
ospfd/ospf_vty.h \ ospfd/ospf_vty.h \
ospfd/ospf_zebra.h \ ospfd/ospf_zebra.h \
ospfd/ospf_gr_helper.h \
# end # end
ospfd_ospfd_LDADD = ospfd/libfrrospf.a lib/libfrr.la $(LIBCAP) $(LIBM) ospfd_ospfd_LDADD = ospfd/libfrrospf.a lib/libfrr.la $(LIBCAP) $(LIBM)