diff options
Diffstat (limited to 'ospf6d/ospf6_area.c')
| -rw-r--r-- | ospf6d/ospf6_area.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/ospf6d/ospf6_area.c b/ospf6d/ospf6_area.c index 417fc69694..a612f7d1b8 100644 --- a/ospf6d/ospf6_area.c +++ b/ospf6d/ospf6_area.c @@ -446,7 +446,9 @@ void ospf6_area_show(struct vty *vty, struct ospf6_area *oa, json_area = json_object_new_object(); json_object_boolean_add(json_area, "areaIsStub", IS_AREA_STUB(oa)); - if (IS_AREA_STUB(oa)) { + json_object_boolean_add(json_area, "areaIsNSSA", + IS_AREA_NSSA(oa)); + if (IS_AREA_STUB(oa) || IS_AREA_NSSA(oa)) { json_object_boolean_add(json_area, "areaNoSummary", oa->no_summary); } @@ -490,14 +492,16 @@ void ospf6_area_show(struct vty *vty, struct ospf6_area *oa, } else { - if (!IS_AREA_STUB(oa)) + if (!IS_AREA_STUB(oa) && !IS_AREA_NSSA(oa)) vty_out(vty, " Area %s\n", oa->name); else { if (oa->no_summary) { - vty_out(vty, " Area %s[Stub, No Summary]\n", - oa->name); + vty_out(vty, " Area %s[%s, No Summary]\n", + oa->name, + IS_AREA_STUB(oa) ? "Stub" : "NSSA"); } else { - vty_out(vty, " Area %s[Stub]\n", oa->name); + vty_out(vty, " Area %s[%s]\n", oa->name, + IS_AREA_STUB(oa) ? "Stub" : "NSSA"); } } vty_out(vty, " Number of Area scoped LSAs is %u\n", @@ -511,11 +515,13 @@ void ospf6_area_show(struct vty *vty, struct ospf6_area *oa, if (oa->ts_spf.tv_sec || oa->ts_spf.tv_usec) { result = monotime_since(&oa->ts_spf, NULL); if (result / TIMER_SECOND_MICRO > 0) { - vty_out(vty, "SPF last executed %ld.%lds ago\n", + vty_out(vty, + " SPF last executed %ld.%lds ago\n", result / TIMER_SECOND_MICRO, result % TIMER_SECOND_MICRO); } else { - vty_out(vty, "SPF last executed %ldus ago\n", + vty_out(vty, + " SPF last executed %ldus ago\n", result); } } else |