From 4b939ad2308b100d09d061116a8fc7383a232272 Mon Sep 17 00:00:00 2001 From: anlan_cs Date: Fri, 28 Jan 2022 09:01:54 -0500 Subject: [PATCH] ospfd: adjust type of "aggr_delay_interval" Adjust type of "aggr_delay_interval": Just replace `unsigned int` with `uint16_t` for range is (50..1800). Signed-off-by: anlan_cs --- ospfd/ospf_asbr.c | 4 ++-- ospfd/ospf_asbr.h | 2 +- ospfd/ospf_vty.c | 4 ++-- ospfd/ospfd.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ospfd/ospf_asbr.c b/ospfd/ospf_asbr.c index 000c62e305..8cb85b4626 100644 --- a/ospfd/ospf_asbr.c +++ b/ospfd/ospf_asbr.c @@ -1108,7 +1108,7 @@ static void ospf_external_aggr_timer(struct ospf *ospf, } 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); ospf->aggr_action = operation; @@ -1232,7 +1232,7 @@ int ospf_asbr_external_rt_advertise(struct ospf *ospf, struct prefix_ipv4 *p) 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; return OSPF_SUCCESS; diff --git a/ospfd/ospf_asbr.h b/ospfd/ospf_asbr.h index 160883144f..f7dbca7587 100644 --- a/ospfd/ospf_asbr.h +++ b/ospfd/ospf_asbr.h @@ -148,7 +148,7 @@ ospf_originate_summary_lsa(struct ospf *ospf, struct ospf_external_aggr_rt *aggr, struct external_info *ei); 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 struct ospf_external_aggr_rt * diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index fe6c9b6e55..7155f5b1cb 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -10339,7 +10339,7 @@ DEFUN (ospf_route_aggregation_timer, "Timer interval(in seconds)\n") { VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf); - unsigned int interval = 0; + uint16_t interval = 0; 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); 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); else json_object_int_add(json_vrf, "aggregation delay interval", diff --git a/ospfd/ospfd.h b/ospfd/ospfd.h index 3369429eba..4f1b1493a6 100644 --- a/ospfd/ospfd.h +++ b/ospfd/ospfd.h @@ -377,7 +377,7 @@ struct ospf { struct thread *t_external_aggr; /* delay interval in seconds */ - unsigned int aggr_delay_interval; + uint16_t aggr_delay_interval; /* Table of configured Aggregate addresses */ struct route_table *rt_aggr_tbl; -- 2.39.5