1 files changed, 14 insertions, 18 deletions

diff --git a/eigrpd/eigrp_interface.c b/eigrpd/eigrp_interface.c
index e450c7d999..c52a98ee25 100644
--- a/eigrpd/eigrp_interface.c
+++ b/eigrpd/eigrp_interface.c
@@ -68,7 +68,7 @@ struct eigrp_interface *eigrp_if_new(struct eigrp *eigrp, struct interface *ifp,
 
 	/* Set zebra interface pointer. */
 	ei->ifp = ifp;
-	ei->address = p;
+	prefix_copy(&ei->address, p);
 
 	ifp->info = ei;
 	listnode_add(eigrp->eiflist, ei);
@@ -114,6 +114,8 @@ int eigrp_if_delete_hook(struct interface *ifp)
 	eigrp = ei->eigrp;
 	listnode_delete(eigrp->eiflist, ei);
 
+	eigrp_fifo_free(ei->obuf);
+
 	XFREE(MTYPE_EIGRP_IF_INFO, ifp->info);
 	ifp->info = NULL;
 
@@ -122,7 +124,7 @@ int eigrp_if_delete_hook(struct interface *ifp)
 
 struct list *eigrp_iflist;
 
-void eigrp_if_init()
+void eigrp_if_init(void)
 {
 	/* Initialize Zebra interface data structure. */
 	// hook_register_prio(if_add, 0, eigrp_if_new);
@@ -183,7 +185,7 @@ int eigrp_if_up(struct eigrp_interface *ei)
 
 	struct prefix dest_addr;
 
-	dest_addr = *ei->address;
+	dest_addr = ei->address;
 	apply_mask(&dest_addr);
 	pe = eigrp_topology_table_lookup_ipv4(eigrp->topology_table,
 					      &dest_addr);
@@ -265,16 +267,11 @@ void eigrp_if_stream_unset(struct eigrp_interface *ei)
 {
 	struct eigrp *eigrp = ei->eigrp;
 
-	if (ei->obuf) {
-		eigrp_fifo_free(ei->obuf);
-		ei->obuf = NULL;
-
-		if (ei->on_write_q) {
-			listnode_delete(eigrp->oi_write_q, ei);
-			if (list_isempty(eigrp->oi_write_q))
-				thread_cancel(eigrp->t_write);
-			ei->on_write_q = 0;
-		}
+	if (ei->on_write_q) {
+		listnode_delete(eigrp->oi_write_q, ei);
+		if (list_isempty(eigrp->oi_write_q))
+			thread_cancel(eigrp->t_write);
+		ei->on_write_q = 0;
 	}
 }
 
@@ -295,7 +292,7 @@ void eigrp_if_set_multicast(struct eigrp_interface *ei)
 		/* The interface should belong to the EIGRP-all-routers group.
 		 */
 		if (!ei->member_allrouters
-		    && (eigrp_if_add_allspfrouters(ei->eigrp, ei->address,
+		    && (eigrp_if_add_allspfrouters(ei->eigrp, &ei->address,
 						   ei->ifp->ifindex)
 			>= 0))
 			/* Set the flag only if the system call to join
@@ -306,7 +303,7 @@ void eigrp_if_set_multicast(struct eigrp_interface *ei)
 		 * group. */
 		if (ei->member_allrouters) {
 			/* Only actually drop if this is the last reference */
-			eigrp_if_drop_allspfrouters(ei->eigrp, ei->address,
+			eigrp_if_drop_allspfrouters(ei->eigrp, &ei->address,
 						    ei->ifp->ifindex);
 			/* Unset the flag regardless of whether the system call
 			   to leave
@@ -342,7 +339,7 @@ void eigrp_if_free(struct eigrp_interface *ei, int source)
 		eigrp_hello_send(ei, EIGRP_HELLO_GRACEFUL_SHUTDOWN, NULL);
 	}
 
-	dest_addr = *ei->address;
+	dest_addr = ei->address;
 	apply_mask(&dest_addr);
 	pe = eigrp_topology_table_lookup_ipv4(eigrp->topology_table,
 					      &dest_addr);
@@ -351,7 +348,6 @@ void eigrp_if_free(struct eigrp_interface *ei, int source)
 
 	eigrp_if_down(ei);
 
-	list_delete(&ei->nbrs);
 	listnode_delete(ei->eigrp->eiflist, ei);
 }
 
@@ -379,7 +375,7 @@ struct eigrp_interface *eigrp_if_lookup_by_local_addr(struct eigrp *eigrp,
 		if (ifp && ei->ifp != ifp)
 			continue;
 
-		if (IPV4_ADDR_SAME(&address, &ei->address->u.prefix4))
+		if (IPV4_ADDR_SAME(&address, &ei->address.u.prefix4))
 			return ei;
 	}