1 files changed, 38 insertions, 10 deletions

diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c
index 158b8dc483..a2ddba65e9 100644
--- a/ospf6d/ospf6_interface.c
+++ b/ospf6d/ospf6_interface.c
@@ -272,11 +272,12 @@ void ospf6_interface_delete(struct ospf6_interface *oi)
 	if (oi->plist_name)
 		XFREE(MTYPE_CFG_PLIST_NAME, oi->plist_name);
 
-	ospf6_bfd_info_free(&(oi->bfd_info));
-
 	/* disable from area list if possible */
 	ospf6_area_interface_delete(oi);
 
+	/* Free BFD allocated data. */
+	XFREE(MTYPE_TMP, oi->bfd_config.profile);
+
 	XFREE(MTYPE_OSPF6_IF, oi);
 }
 
@@ -473,8 +474,8 @@ void ospf6_interface_connected_route_update(struct interface *ifp)
 	OSPF6_INTRA_PREFIX_LSA_SCHEDULE_STUB(oi->area);
 }
 
-static void ospf6_interface_state_change(uint8_t next_state,
-					 struct ospf6_interface *oi)
+static int ospf6_interface_state_change(uint8_t next_state,
+					struct ospf6_interface *oi)
 {
 	uint8_t prev_state;
 	struct ospf6 *ospf6;
@@ -483,7 +484,7 @@ static void ospf6_interface_state_change(uint8_t next_state,
 	oi->state = next_state;
 
 	if (prev_state == next_state)
-		return;
+		return -1;
 
 	/* log */
 	if (IS_OSPF6_DEBUG_INTERFACE) {
@@ -524,6 +525,8 @@ static void ospf6_interface_state_change(uint8_t next_state,
 	}
 
 	hook_call(ospf6_interface_change, oi, next_state, prev_state);
+
+	return 0;
 }
 
 
@@ -1148,7 +1151,29 @@ static int ospf6_interface_show(struct vty *vty, struct interface *ifp,
 		for (ALL_LSDB(oi->lsack_list, lsa, lsanext))
 			vty_out(vty, "      %s\n", lsa->name);
 	}
-	ospf6_bfd_show_info(vty, oi->bfd_info, 1, json_obj, use_json);
+
+	/* BFD specific. */
+	if (oi->bfd_config.enabled) {
+		if (use_json) {
+			struct json_object *json_bfd = json_object_new_object();
+
+			json_object_int_add(
+				json_bfd, "detectMultiplier",
+				oi->bfd_config.detection_multiplier);
+			json_object_int_add(json_bfd, "rxMinInterval",
+					    oi->bfd_config.min_rx);
+			json_object_int_add(json_bfd, "txMinInterval",
+					    oi->bfd_config.min_tx);
+			json_object_object_add(json_obj, "peerBfdInfo",
+					       json_bfd);
+		} else {
+			vty_out(vty,
+				"  BFD: Detect Multiplier: %d, Min Rx interval: %d, Min Tx interval: %d\n",
+				oi->bfd_config.detection_multiplier,
+				oi->bfd_config.min_rx, oi->bfd_config.min_tx);
+		}
+	}
+
 	return 0;
 }
 
@@ -1879,10 +1904,13 @@ DEFUN (ipv6_ospf6_priority,
 			       ? OSPF6_INTERFACE_PRIORITY
 			       : strtoul(argv[idx_number]->arg, NULL, 10);
 
-	if (oi->area && (oi->state == OSPF6_INTERFACE_DROTHER
-			 || oi->state == OSPF6_INTERFACE_BDR
-			 || oi->state == OSPF6_INTERFACE_DR))
-		ospf6_interface_state_change(dr_election(oi), oi);
+	if (oi->area
+	    && (oi->state == OSPF6_INTERFACE_DROTHER
+		|| oi->state == OSPF6_INTERFACE_BDR
+		|| oi->state == OSPF6_INTERFACE_DR)) {
+		if (ospf6_interface_state_change(dr_election(oi), oi) == -1)
+			OSPF6_LINK_LSA_SCHEDULE(oi);
+	}
 
 	return CMD_SUCCESS;
 }