diff options
| author | Igor Ryzhov <iryzhov@nfware.com> | 2022-02-01 19:04:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-01 19:04:33 +0300 |
| commit | 0624c3cfcc3fcc28bbd565dcc885aeed8a0fb1ef (patch) | |
| tree | f9d7c14d52b23177905a6feeb49e319fe37e0ff3 /ospfd/ospf_vty.c | |
| parent | e9a2378119d8e3cdc575965253b93cfa26160595 (diff) | |
| parent | 4b939ad2308b100d09d061116a8fc7383a232272 (diff) | |
Merge pull request #10373 from anlancs/ospf-add-asbr
ospfd: fix missing "aggregation timer" in running configuration
Diffstat (limited to 'ospfd/ospf_vty.c')
| -rw-r--r-- | ospfd/ospf_vty.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index ce91b32afa..c82c8cb42e 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -9993,7 +9993,7 @@ DEFUN (ospf_external_route_aggregation, ospf_external_route_aggregation_cmd, "summary-address A.B.C.D/M [tag (1-4294967295)]", "External summary address\n" - "Summary address prefix (a.b.c.d/m) \n" + "Summary address prefix\n" "Router tag \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_STR "External summary address\n" - "Summary address prefix (a.b.c.d/m)\n" + "Summary address prefix\n" "Router tag\n" "Router tag value\n") { @@ -10324,7 +10324,7 @@ DEFUN (ospf_external_route_aggregation_no_adrvertise, ospf_external_route_aggregation_no_adrvertise_cmd, "summary-address A.B.C.D/M no-advertise", "External summary address\n" - "Summary address prefix (a.b.c.d/m) \n" + "Summary address prefix\n" "Don't advertise summary route \n") { 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_STR "External summary address\n" - "Summary address prefix (a.b.c.d/m)\n" + "Summary address prefix\n" "Advertise summary route to the AS \n") { VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf); @@ -10399,7 +10399,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); @@ -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); 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", @@ -12191,15 +12191,19 @@ static int config_write_ospf_external_aggregator(struct vty *vty, { 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' */ for (rn = route_top(ospf->rt_aggr_tbl); rn; rn = route_next(rn)) if (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); if (aggr->tag) - vty_out(vty, " tag %u ", aggr->tag); + vty_out(vty, " tag %u", aggr->tag); if (CHECK_FLAG(aggr->flags, OSPF_EXTERNAL_AGGRT_NO_ADVERTISE)) |