1 files changed, 10 insertions, 10 deletions

diff --git a/ctdb/tcp/tcp_init.c b/ctdb/tcp/tcp_init.c
index dc92abd4e6c..fae1fa99195 100644
--- a/ctdb/tcp/tcp_init.c
+++ b/ctdb/tcp/tcp_init.c
@@ -58,7 +58,7 @@ static int ctdb_tcp_add_node(struct ctdb_node *node)
 	tnode->out_fd = -1;
 	tnode->ctdb = node->ctdb;
 
-	node->private_data = tnode;
+	node->transport_data = tnode;
 	talloc_set_destructor(tnode, tnode_destructor);
 
 	return 0;
@@ -97,7 +97,7 @@ static int ctdb_tcp_connect_node(struct ctdb_node *node)
 {
 	struct ctdb_context *ctdb = node->ctdb;
 	struct ctdb_tcp_node *tnode = talloc_get_type(
-		node->private_data, struct ctdb_tcp_node);
+		node->transport_data, struct ctdb_tcp_node);
 
 	/* startup connection to the other server - will happen on
 	   next event loop */
@@ -118,11 +118,11 @@ static int ctdb_tcp_connect_node(struct ctdb_node *node)
 static void ctdb_tcp_restart(struct ctdb_node *node)
 {
 	struct ctdb_tcp_node *tnode = talloc_get_type(
-		node->private_data, struct ctdb_tcp_node);
+		node->transport_data, struct ctdb_tcp_node);
 
 	DEBUG(DEBUG_NOTICE,("Tearing down connection to dead node :%d\n", node->pnn));
-
-	ctdb_tcp_stop_connection(node);
+	ctdb_tcp_stop_incoming(node);
+	ctdb_tcp_stop_outgoing(node);
 
 	tnode->connect_te = tevent_add_timer(node->ctdb->ev, tnode,
 					     timeval_zero(),
@@ -135,15 +135,15 @@ static void ctdb_tcp_restart(struct ctdb_node *node)
 */
 static void ctdb_tcp_shutdown(struct ctdb_context *ctdb)
 {
-	struct ctdb_tcp *ctcp = talloc_get_type(ctdb->private_data,
+	struct ctdb_tcp *ctcp = talloc_get_type(ctdb->transport_data,
 						struct ctdb_tcp);
 	uint32_t i;
 
 	talloc_free(ctcp);
-	ctdb->private_data = NULL;
+	ctdb->transport_data = NULL;
 
 	for (i=0; i<ctdb->num_nodes; i++) {
-		TALLOC_FREE(ctdb->nodes[i]->private_data);
+		TALLOC_FREE(ctdb->nodes[i]->transport_data);
 	}
 }
 
@@ -191,7 +191,7 @@ static const struct ctdb_methods ctdb_tcp_methods = {
 
 static int tcp_ctcp_destructor(struct ctdb_tcp *ctcp)
 {
-	ctcp->ctdb->private_data = NULL;
+	ctcp->ctdb->transport_data = NULL;
 	ctcp->ctdb->methods = NULL;
 	
 	return 0;
@@ -209,7 +209,7 @@ int ctdb_tcp_init(struct ctdb_context *ctdb)
 
 	ctcp->listen_fd = -1;
 	ctcp->ctdb      = ctdb;
-	ctdb->private_data = ctcp;
+	ctdb->transport_data = ctcp;
 	ctdb->methods = &ctdb_tcp_methods;
 
 	talloc_set_destructor(ctcp, tcp_ctcp_destructor);