diff options
| -rw-r--r-- | ospf6d/ospf6_asbr.c | 7 | ||||
| -rw-r--r-- | ospf6d/ospf6_asbr.h | 3 | ||||
| -rw-r--r-- | ospf6d/ospf6_top.c | 4 | ||||
| -rw-r--r-- | ospf6d/ospf6_top.h | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c index 5e7ba81a3..203ae14f2 100644 --- a/ospf6d/ospf6_asbr.c +++ b/ospf6d/ospf6_asbr.c @@ -3383,8 +3383,8 @@ ospf6_start_asbr_summary_delay_timer(struct ospf6 *ospf6, } if (IS_OSPF6_DEBUG_AGGR) - zlog_debug("%s: Start Aggregator delay timer %d(in seconds).", - __func__, ospf6->aggr_delay_interval); + zlog_debug("%s: Start Aggregator delay timer %u(in seconds).", + __func__, ospf6->aggr_delay_interval); ospf6->aggr_action = operation; thread_add_timer(master, @@ -3421,8 +3421,7 @@ int ospf6_asbr_external_rt_advertise(struct ospf6 *ospf6, return OSPF6_SUCCESS; } -int ospf6_external_aggr_delay_timer_set(struct ospf6 *ospf6, - unsigned int interval) +int ospf6_external_aggr_delay_timer_set(struct ospf6 *ospf6, uint16_t interval) { ospf6->aggr_delay_interval = interval; diff --git a/ospf6d/ospf6_asbr.h b/ospf6d/ospf6_asbr.h index 0aa1374a4..0487bb14c 100644 --- a/ospf6d/ospf6_asbr.h +++ b/ospf6d/ospf6_asbr.h @@ -163,8 +163,7 @@ extern void ospf6_asbr_status_update(struct ospf6 *ospf6, int status); int ospf6_asbr_external_rt_advertise(struct ospf6 *ospf6, struct prefix *p); -int ospf6_external_aggr_delay_timer_set(struct ospf6 *ospf6, - unsigned int interval); +int ospf6_external_aggr_delay_timer_set(struct ospf6 *ospf6, uint16_t interval); int ospf6_asbr_external_rt_no_advertise(struct ospf6 *ospf6, struct prefix *p); diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index e2db77d44..5888c6075 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -1997,8 +1997,8 @@ ospf6_show_summary_address(struct vty *vty, struct ospf6 *ospf6, if (!uj) { ospf6_show_vrf_name(vty, ospf6, json_vrf); - vty_out(vty, "aggregation delay interval :%d(in seconds)\n\n", - ospf6->aggr_delay_interval); + vty_out(vty, "aggregation delay interval :%u(in seconds)\n\n", + ospf6->aggr_delay_interval); vty_out(vty, "%s\n", header); } else { json_vrf = json_object_new_object(); diff --git a/ospf6d/ospf6_top.h b/ospf6d/ospf6_top.h index 77156f961..b850fb993 100644 --- a/ospf6d/ospf6_top.h +++ b/ospf6d/ospf6_top.h @@ -230,7 +230,7 @@ struct ospf6 { #define OSPF6_EXTL_AGGR_DEFAULT_DELAY 5 /* For ASBR summary delay timer */ - int aggr_delay_interval; + uint16_t aggr_delay_interval; /* Table of configured Aggregate addresses */ struct route_table *rt_aggr_tbl; |