From 692c79543296b7223f43f194b3042957cbc7080f Mon Sep 17 00:00:00 2001
From: Daniel Walton <dwalton@cumulusnetworks.com>
Date: Tue, 3 Nov 2015 10:48:30 -0800
Subject: [PATCH] Enable OSPF "log-adjacency-changes" by default

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>

Ticket: CM-7941
---
 ospf6d/ospf6_top.c | 21 ++++++++++++++-------
 ospfd/ospf_vty.c   | 10 +++++++---
 ospfd/ospfd.c      |  2 ++
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index c90c0a07d6..350e8ac9fd 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -155,6 +155,9 @@ ospf6_create (void)
 
   o->ref_bandwidth = OSPF6_REFERENCE_BANDWIDTH;
 
+  /* Enable "log-adjacency-changes" */
+  SET_FLAG(o->config_flags, OSPF6_LOG_ADJACENCY_CHANGES);
+
   return o;
 }
 
@@ -349,13 +352,14 @@ DEFUN (ospf6_log_adjacency_changes,
   struct ospf6 *ospf6 = vty->index;
 
   SET_FLAG(ospf6->config_flags, OSPF6_LOG_ADJACENCY_CHANGES);
+  UNSET_FLAG(ospf6->config_flags, OSPF6_LOG_ADJACENCY_DETAIL);
   return CMD_SUCCESS;
 }
 
 DEFUN (ospf6_log_adjacency_changes_detail,
        ospf6_log_adjacency_changes_detail_cmd,
        "log-adjacency-changes detail",
-              "Log changes in adjacency state\n"
+       "Log changes in adjacency state\n"
        "Log all state changes\n")
 {
   struct ospf6 *ospf6 = vty->index;
@@ -368,7 +372,7 @@ DEFUN (ospf6_log_adjacency_changes_detail,
 DEFUN (no_ospf6_log_adjacency_changes,
        no_ospf6_log_adjacency_changes_cmd,
        "no log-adjacency-changes",
-              NO_STR
+       NO_STR
        "Log changes in adjacency state\n")
 {
   struct ospf6 *ospf6 = vty->index;
@@ -381,13 +385,14 @@ DEFUN (no_ospf6_log_adjacency_changes,
 DEFUN (no_ospf6_log_adjacency_changes_detail,
        no_ospf6_log_adjacency_changes_detail_cmd,
        "no log-adjacency-changes detail",
-              NO_STR
-              "Log changes in adjacency state\n"
+       NO_STR
+       "Log changes in adjacency state\n"
        "Log all state changes\n")
 {
   struct ospf6 *ospf6 = vty->index;
 
   UNSET_FLAG(ospf6->config_flags, OSPF6_LOG_ADJACENCY_DETAIL);
+  UNSET_FLAG(ospf6->config_flags, OSPF6_LOG_ADJACENCY_CHANGES);
   return CMD_SUCCESS;
 }
 
@@ -949,10 +954,12 @@ config_write_ospf6 (struct vty *vty)
   /* log-adjacency-changes flag print. */
   if (CHECK_FLAG(ospf6->config_flags, OSPF6_LOG_ADJACENCY_CHANGES))
     {
-      vty_out(vty, " log-adjacency-changes");
       if (CHECK_FLAG(ospf6->config_flags, OSPF6_LOG_ADJACENCY_DETAIL))
-	vty_out(vty, " detail");
-      vty_out(vty, "%s", VTY_NEWLINE);
+        vty_out(vty, " log-adjacency-changes detail%s", VTY_NEWLINE);
+    }
+  else
+    {
+      vty_out(vty, " no log-adjacency-changes%s", VTY_NEWLINE);
     }
 
   if (ospf6->ref_bandwidth != OSPF6_REFERENCE_BANDWIDTH)
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 12187f3136..3aee037445 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -2310,6 +2310,7 @@ DEFUN (ospf_log_adjacency_changes,
     return CMD_SUCCESS;
 
   SET_FLAG(ospf->config, OSPF_LOG_ADJACENCY_CHANGES);
+  UNSET_FLAG(ospf->config, OSPF_LOG_ADJACENCY_DETAIL);
   return CMD_SUCCESS;
 }
 
@@ -2357,6 +2358,7 @@ DEFUN (no_ospf_log_adjacency_changes_detail,
   if (!ospf)
     return CMD_SUCCESS;
 
+  UNSET_FLAG(ospf->config, OSPF_LOG_ADJACENCY_CHANGES);
   UNSET_FLAG(ospf->config, OSPF_LOG_ADJACENCY_DETAIL);
   return CMD_SUCCESS;
 }
@@ -9515,11 +9517,13 @@ ospf_config_write (struct vty *vty)
       /* log-adjacency-changes flag print. */
       if (CHECK_FLAG(ospf->config, OSPF_LOG_ADJACENCY_CHANGES))
 	{
-	  vty_out(vty, " log-adjacency-changes");
 	  if (CHECK_FLAG(ospf->config, OSPF_LOG_ADJACENCY_DETAIL))
-	    vty_out(vty, " detail");
-	  vty_out(vty, "%s", VTY_NEWLINE);
+	    vty_out(vty, " log-adjacency-changes detail%s", VTY_NEWLINE);
 	}
+      else
+        {
+	  vty_out(vty, " no log-adjacency-changes%s", VTY_NEWLINE);
+        }
 
       /* RFC1583 compatibility flag print -- Compatible with CISCO 12.1. */
       if (CHECK_FLAG (ospf->config, OSPF_RFC1583_COMPATIBLE))
diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index 75d823c91a..5957918c9c 100644
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -287,6 +287,8 @@ ospf_new (u_short instance)
   new->oi_write_q = list_new ();
   new->write_oi_count = OSPF_WRITE_INTERFACE_COUNT_DEFAULT;
   
+  /* Enable "log-adjacency-changes" */
+  SET_FLAG(new->config, OSPF_LOG_ADJACENCY_CHANGES);
   return new;
 }
 
-- 
2.39.5