Merge pull request #5549 from donaldsharp/automated

[mirror_frr.git] / ospfd / ospf_vty.c

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 4c97615ed14858c31050082f55210df0b028f428..152a7e83b71b0fd0fefacb726e34d5dad0c2e9a0 100644 (file)
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -53,6 +53,11 @@
 #include "ospfd/ospf_dump.h"
 #include "ospfd/ospf_bfd.h"
 
+FRR_CFG_DEFAULT_BOOL(OSPF_LOG_ADJACENCY_CHANGES,
+       { .val_long = true, .match_profile = "datacenter", },
+       { .val_long = false },
+)
+
 static const char *const ospf_network_type_str[] = {
        "Null", "POINTOPOINT", "BROADCAST", "NBMA", "POINTOMULTIPOINT",
        "VIRTUALLINK", "LOOPBACK"};
@@ -138,6 +143,7 @@ static struct ospf *ospf_cmd_lookup_ospf(struct vty *vty,
        struct ospf *ospf = NULL;
        int idx_vrf = 0, idx_inst = 0;
        const char *vrf_name = NULL;
+       bool created = false;
 
        *instance = 0;
        if (argv_find(argv, argc, "(1-65535)", &idx_inst))
@@ -149,18 +155,23 @@ static struct ospf *ospf_cmd_lookup_ospf(struct vty *vty,
                        vrf_name = NULL;
                if (enable) {
                        /* Allocate VRF aware instance */
-                       ospf = ospf_get(*instance, vrf_name);
+                       ospf = ospf_get(*instance, vrf_name, &created);
                } else {
                        ospf = ospf_lookup_by_inst_name(*instance, vrf_name);
                }
        } else {
                if (enable) {
-                       ospf = ospf_get(*instance, NULL);
+                       ospf = ospf_get(*instance, NULL, &created);
                } else {
                        ospf = ospf_lookup_instance(*instance);
                }
        }
 
+       if (created) {
+               if (DFLT_OSPF_LOG_ADJACENCY_CHANGES)
+                       SET_FLAG(ospf->config, OSPF_LOG_ADJACENCY_CHANGES);
+       }
+
        return ospf;
 }
 
@@ -4154,7 +4165,7 @@ DEFUN (show_ip_ospf_interface_traffic,
 
 static void show_ip_ospf_neighbour_header(struct vty *vty)
 {
-       vty_out(vty, "\n%-15s %3s %-15s %9s %-15s %-20s %5s %5s %5s\n",
+       vty_out(vty, "\n%-15s %3s %-15s %9s %-15s %-32s %5s %5s %5s\n",
                "Neighbor ID", "Pri", "State", "Dead Time", "Address",
                "Interface", "RXmtL", "RqstL", "DBsmL");
 }
@@ -4260,7 +4271,7 @@ static void show_ip_ospf_neighbor_sub(struct vty *vty,
                                                        timebuf,
                                                        sizeof(timebuf)));
                                vty_out(vty, "%-15s ", inet_ntoa(nbr->src));
-                               vty_out(vty, "%-20s %5ld %5ld %5d\n",
+                               vty_out(vty, "%-32s %5ld %5ld %5d\n",
                                        IF_NAME(oi),
                                        ospf_ls_retransmit_count(nbr),
                                        ospf_ls_request_count(nbr),
@@ -4524,7 +4535,7 @@ static int show_ip_ospf_neighbor_all_common(struct vty *vty, struct ospf *ospf,
                                                "-", nbr_nbma->priority, "Down",
                                                "-");
                                        vty_out(vty,
-                                               "%-15s %-20s %5d %5d %5d\n",
+                                               "%-32s %-20s %5d %5d %5d\n",
                                                inet_ntoa(nbr_nbma->addr),
                                                IF_NAME(oi), 0, 0, 0);
                                }
@@ -10358,9 +10369,9 @@ static int ospf_config_write_one(struct vty *vty, struct ospf *ospf)
        if (CHECK_FLAG(ospf->config, OSPF_LOG_ADJACENCY_CHANGES)) {
                if (CHECK_FLAG(ospf->config, OSPF_LOG_ADJACENCY_DETAIL))
                        vty_out(vty, " log-adjacency-changes detail\n");
-               else if (!DFLT_OSPF_LOG_ADJACENCY_CHANGES)
+               else if (!SAVE_OSPF_LOG_ADJACENCY_CHANGES)
                        vty_out(vty, " log-adjacency-changes\n");
-       } else if (DFLT_OSPF_LOG_ADJACENCY_CHANGES) {
+       } else if (SAVE_OSPF_LOG_ADJACENCY_CHANGES) {
                vty_out(vty, " no log-adjacency-changes\n");
        }