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 <vic.lan@pica8.com>

diff --git a/ospfd/ospf_asbr.c b/ospfd/ospf_asbr.c
index 000c62e305fd29dc2a1f7aa4c41cbab77bede628..8cb85b4626555170f82ec04df99eb3b70ba1e4ab 100644 (file)
--- 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 160883144fc4ac2b99f61a6973b1ef15e1598f92..f7dbca75878d1138b56b103d7245d328a62ec1ed 100644 (file)
--- 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 fe6c9b6e558725e11e82caff87e482782c3ad270..7155f5b1cb4bb2fc4320eeb7e7ef5ac86c274d49 100644 (file)
--- 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 3369429ebaff33c47ed1fa750d4d685a40387a72..4f1b1493a6882141812a0e7495db262fefa5dbdc 100644 (file)
--- 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;