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

ospfd: adjust type of "aggr_delay_interval"

Browse Source 
Adjust type of "aggr_delay_interval":
Just replace `unsigned int` with `uint16_t` for range is (50..1800).

Signed-off-by: anlan_cs <vic.lan@pica8.com>
This commit is contained in:
anlan_cs 2022-01-28 09:01:54 -05:00
parent 74e8311eb3
commit 4b939ad230
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 *

4
ospfd/ospf_vty.c
View File

@ -10339,7 +10339,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);
@ -11369,7 +11369,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",

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;