]> git.puffer.fish Git - mirror/frr.git/commitdiff
ospf6d: print administrative distance in show ipv6 ospf 10435/head
authorckishimo <carles.kishimoto@gmail.com>
Wed, 26 Jan 2022 21:46:44 +0000 (22:46 +0100)
committerckishimo <carles.kishimoto@gmail.com>
Fri, 28 Jan 2022 13:20:14 +0000 (14:20 +0100)
Signed-off-by: ckishimo <carles.kishimoto@gmail.com>
ospf6d/ospf6_top.c

index 825ce7a6fccb0fafaf8300357ac2c37c159ad427..10cdb9a84c1034bfe92ed9eb90ff40c4ac465495 100644 (file)
@@ -1337,6 +1337,10 @@ static void ospf6_show(struct vty *vty, struct ospf6 *o, json_object *json,
                                    o->spf_hold_multiplier);
 
                json_object_int_add(json, "maximumPaths", o->max_multipath);
+               json_object_int_add(json, "preference",
+                                   o->distance_all
+                                           ? o->distance_all
+                                           : ZEBRA_OSPF6_DISTANCE_DEFAULT);
 
                if (o->ts_spf.tv_sec || o->ts_spf.tv_usec) {
                        timersub(&now, &o->ts_spf, &result);
@@ -1420,6 +1424,9 @@ static void ospf6_show(struct vty *vty, struct ospf6 *o, json_object *json,
                        o->lsa_minarrival);
 
                vty_out(vty, " Maximum-paths %u\n", o->max_multipath);
+               vty_out(vty, " Administrative distance %u\n",
+                       o->distance_all ? o->distance_all
+                                       : ZEBRA_OSPF6_DISTANCE_DEFAULT);
 
                /* Show SPF parameters */
                vty_out(vty,