proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 07:37:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10425 from ckishimo/ospf6d_nssa

Browse Source 
ospf6d: show if area is NSSA
This commit is contained in:
Donald Sharp 2022-01-26 09:56:34 -05:00 committed by GitHub
commit 457fb2c846
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ospf6d/ospf6_area.c
View File

@ -446,7 +446,9 @@ void ospf6_area_show(struct vty *vty, struct ospf6_area *oa,
json_area = json_object_new_object(); json_area = json_object_new_object();
json_object_boolean_add(json_area, "areaIsStub", json_object_boolean_add(json_area, "areaIsStub",
IS_AREA_STUB(oa)); 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", json_object_boolean_add(json_area, "areaNoSummary",
oa->no_summary); oa->no_summary);
} }
@ -490,14 +492,16 @@ void ospf6_area_show(struct vty *vty, struct ospf6_area *oa,
} else { } else {
if (!IS_AREA_STUB(oa)) if (!IS_AREA_STUB(oa) && !IS_AREA_NSSA(oa))
vty_out(vty, " Area %s\n", oa->name); vty_out(vty, " Area %s\n", oa->name);
else { else {
if (oa->no_summary) { if (oa->no_summary) {
vty_out(vty, " Area %s[Stub, No Summary]\n", vty_out(vty, " Area %s[%s, No Summary]\n",
oa->name); oa->name,
IS_AREA_STUB(oa) ? "Stub" : "NSSA");
} else { } 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", 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) { if (oa->ts_spf.tv_sec || oa->ts_spf.tv_usec) {
result = monotime_since(&oa->ts_spf, NULL); result = monotime_since(&oa->ts_spf, NULL);
if (result / TIMER_SECOND_MICRO > 0) { 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,
result % TIMER_SECOND_MICRO); result % TIMER_SECOND_MICRO);
} else { } else {
vty_out(vty, "SPF last executed %ldus ago\n", vty_out(vty,
" SPF last executed %ldus ago\n",
result); result);
} }
} else } else