matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #10373 from anlancs/ospf-add-asbr

Browse source 
ospfd: fix missing "aggregation timer" in running configuration
This commit is contained in:
Igor Ryzhov 2022-02-01 19:04:33 +03:00 committed by GitHub
parent e9a2378119 4b939ad230
commit 0624c3cfcc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ospf6d/ospf6_asbr.c
View file

@ -3383,8 +3383,8 @@ ospf6_start_asbr_summary_delay_timer(struct ospf6 *ospf6,
} }
if (IS_OSPF6_DEBUG_AGGR) if (IS_OSPF6_DEBUG_AGGR)
zlog_debug("%s: Start Aggregator delay timer %d(in seconds).", zlog_debug("%s: Start Aggregator delay timer %u(in seconds).",
__func__, ospf6->aggr_delay_interval); __func__, ospf6->aggr_delay_interval);
ospf6->aggr_action = operation; ospf6->aggr_action = operation;
thread_add_timer(master, thread_add_timer(master,
@ -3421,8 +3421,7 @@ int ospf6_asbr_external_rt_advertise(struct ospf6 *ospf6,
return OSPF6_SUCCESS; return OSPF6_SUCCESS;
} }
int ospf6_external_aggr_delay_timer_set(struct ospf6 *ospf6, int ospf6_external_aggr_delay_timer_set(struct ospf6 *ospf6, uint16_t interval)
unsigned int interval)
{ {
ospf6->aggr_delay_interval = interval; ospf6->aggr_delay_interval = interval;

3
ospf6d/ospf6_asbr.h
View file

@ -163,8 +163,7 @@ extern void ospf6_asbr_status_update(struct ospf6 *ospf6, int status);
int ospf6_asbr_external_rt_advertise(struct ospf6 *ospf6, int ospf6_asbr_external_rt_advertise(struct ospf6 *ospf6,
struct prefix *p); struct prefix *p);
int ospf6_external_aggr_delay_timer_set(struct ospf6 *ospf6, int ospf6_external_aggr_delay_timer_set(struct ospf6 *ospf6, uint16_t interval);
unsigned int interval);
int ospf6_asbr_external_rt_no_advertise(struct ospf6 *ospf6, int ospf6_asbr_external_rt_no_advertise(struct ospf6 *ospf6,
struct prefix *p); struct prefix *p);

4
ospf6d/ospf6_top.c
View file

@ -2010,8 +2010,8 @@ ospf6_show_summary_address(struct vty *vty, struct ospf6 *ospf6,
if (!uj) { if (!uj) {
ospf6_show_vrf_name(vty, ospf6, json_vrf); ospf6_show_vrf_name(vty, ospf6, json_vrf);
vty_out(vty, "aggregation delay interval :%d(in seconds)\n\n", vty_out(vty, "aggregation delay interval :%u(in seconds)\n\n",
ospf6->aggr_delay_interval); ospf6->aggr_delay_interval);
vty_out(vty, "%s\n", header); vty_out(vty, "%s\n", header);
} else { } else {
json_vrf = json_object_new_object(); json_vrf = json_object_new_object();

2
ospf6d/ospf6_top.h
View file

@ -230,7 +230,7 @@ struct ospf6 {
#define OSPF6_EXTL_AGGR_DEFAULT_DELAY 5 #define OSPF6_EXTL_AGGR_DEFAULT_DELAY 5
/* For ASBR summary delay timer */ /* For ASBR summary delay timer */
int aggr_delay_interval; uint16_t aggr_delay_interval;
/* Table of configured Aggregate addresses */ /* Table of configured Aggregate addresses */
struct route_table *rt_aggr_tbl; struct route_table *rt_aggr_tbl;

4
ospfd/ospf_asbr.c
View file

@ -1108,7 +1108,7 @@ static void ospf_external_aggr_timer(struct ospf *ospf,
} }
if (IS_DEBUG_OSPF(lsa, EXTNL_LSA_AGGR)) if (IS_DEBUG_OSPF(lsa, EXTNL_LSA_AGGR))
zlog_debug("%s: Start Aggregator delay timer %d(in seconds).", zlog_debug("%s: Start Aggregator delay timer %u(in seconds).",
__func__, ospf->aggr_delay_interval); __func__, ospf->aggr_delay_interval);
ospf->aggr_action = operation; ospf->aggr_action = operation;
@ -1232,7 +1232,7 @@ int ospf_asbr_external_rt_advertise(struct ospf *ospf, struct prefix_ipv4 *p)
return OSPF_SUCCESS; return OSPF_SUCCESS;
} }
int ospf_external_aggregator_timer_set(struct ospf *ospf, unsigned int interval) int ospf_external_aggregator_timer_set(struct ospf *ospf, uint16_t interval)
{ {
ospf->aggr_delay_interval = interval; ospf->aggr_delay_interval = interval;
return OSPF_SUCCESS; return OSPF_SUCCESS;

2
ospfd/ospf_asbr.h
View file

@ -148,7 +148,7 @@ ospf_originate_summary_lsa(struct ospf *ospf,
struct ospf_external_aggr_rt *aggr, struct ospf_external_aggr_rt *aggr,
struct external_info *ei); struct external_info *ei);
extern int ospf_external_aggregator_timer_set(struct ospf *ospf, extern int ospf_external_aggregator_timer_set(struct ospf *ospf,
unsigned int interval); uint16_t interval);
extern void ospf_external_aggrigator_free(struct ospf_external_aggr_rt *aggr); extern void ospf_external_aggrigator_free(struct ospf_external_aggr_rt *aggr);
extern struct ospf_external_aggr_rt * extern struct ospf_external_aggr_rt *

20
ospfd/ospf_vty.c
View file

@ -9993,7 +9993,7 @@ DEFUN (ospf_external_route_aggregation,
ospf_external_route_aggregation_cmd, ospf_external_route_aggregation_cmd,
"summary-address A.B.C.D/M [tag (1-4294967295)]", "summary-address A.B.C.D/M [tag (1-4294967295)]",
"External summary address\n" "External summary address\n"
"Summary address prefix (a.b.c.d/m) \n" "Summary address prefix\n"
"Router tag \n" "Router tag \n"
"Router tag value\n") "Router tag value\n")
{ {
@ -10034,7 +10034,7 @@ DEFUN (no_ospf_external_route_aggregation,
"no summary-address A.B.C.D/M [tag (1-4294967295)]", "no summary-address A.B.C.D/M [tag (1-4294967295)]",
NO_STR NO_STR
"External summary address\n" "External summary address\n"
"Summary address prefix (a.b.c.d/m)\n" "Summary address prefix\n"
"Router tag\n" "Router tag\n"
"Router tag value\n") "Router tag value\n")
{ {
@ -10324,7 +10324,7 @@ DEFUN (ospf_external_route_aggregation_no_adrvertise,
ospf_external_route_aggregation_no_adrvertise_cmd, ospf_external_route_aggregation_no_adrvertise_cmd,
"summary-address A.B.C.D/M no-advertise", "summary-address A.B.C.D/M no-advertise",
"External summary address\n" "External summary address\n"
"Summary address prefix (a.b.c.d/m) \n" "Summary address prefix\n"
"Don't advertise summary route \n") "Don't advertise summary route \n")
{ {
VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf); VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf);
@ -10360,7 +10360,7 @@ DEFUN (no_ospf_external_route_aggregation_no_adrvertise,
"no summary-address A.B.C.D/M no-advertise", "no summary-address A.B.C.D/M no-advertise",
NO_STR NO_STR
"External summary address\n" "External summary address\n"
"Summary address prefix (a.b.c.d/m)\n" "Summary address prefix\n"
"Advertise summary route to the AS \n") "Advertise summary route to the AS \n")
{ {
VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf); VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf);
@ -10399,7 +10399,7 @@ DEFUN (ospf_route_aggregation_timer,
"Timer interval(in seconds)\n") "Timer interval(in seconds)\n")
{ {
VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf); VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf);
unsigned int interval = 0; uint16_t interval = 0;
interval = strtoul(argv[2]->arg, NULL, 10); interval = strtoul(argv[2]->arg, NULL, 10);
@ -11429,7 +11429,7 @@ static int ospf_show_summary_address(struct vty *vty, struct ospf *ospf,
ospf_show_vrf_name(ospf, vty, json_vrf, use_vrf); ospf_show_vrf_name(ospf, vty, json_vrf, use_vrf);
if (!uj) if (!uj)
vty_out(vty, "aggregation delay interval :%d(in seconds)\n\n", vty_out(vty, "aggregation delay interval :%u(in seconds)\n\n",
ospf->aggr_delay_interval); ospf->aggr_delay_interval);
else else
json_object_int_add(json_vrf, "aggregation delay interval", json_object_int_add(json_vrf, "aggregation delay interval",
@ -12191,15 +12191,19 @@ static int config_write_ospf_external_aggregator(struct vty *vty,
{ {
struct route_node *rn; struct route_node *rn;
if (ospf->aggr_delay_interval != OSPF_EXTL_AGGR_DEFAULT_DELAY)
vty_out(vty, " aggregation timer %u\n",
ospf->aggr_delay_interval);
/* print 'summary-address A.B.C.D/M' */ /* print 'summary-address A.B.C.D/M' */
for (rn = route_top(ospf->rt_aggr_tbl); rn; rn = route_next(rn)) for (rn = route_top(ospf->rt_aggr_tbl); rn; rn = route_next(rn))
if (rn->info) { if (rn->info) {
struct ospf_external_aggr_rt *aggr = rn->info; struct ospf_external_aggr_rt *aggr = rn->info;
vty_out(vty, " summary-address %pI4/%d ", vty_out(vty, " summary-address %pI4/%d",
&aggr->p.prefix, aggr->p.prefixlen); &aggr->p.prefix, aggr->p.prefixlen);
if (aggr->tag) if (aggr->tag)
vty_out(vty, " tag %u ", aggr->tag); vty_out(vty, " tag %u", aggr->tag);
if (CHECK_FLAG(aggr->flags, if (CHECK_FLAG(aggr->flags,
OSPF_EXTERNAL_AGGRT_NO_ADVERTISE)) OSPF_EXTERNAL_AGGRT_NO_ADVERTISE))

2
ospfd/ospfd.h
View file

@ -377,7 +377,7 @@ struct ospf {
struct thread *t_external_aggr; struct thread *t_external_aggr;
/* delay interval in seconds */ /* delay interval in seconds */
unsigned int aggr_delay_interval; uint16_t aggr_delay_interval;
/* Table of configured Aggregate addresses */ /* Table of configured Aggregate addresses */
struct route_table *rt_aggr_tbl; struct route_table *rt_aggr_tbl;