rename killtcp->fd to killtcp->capture_fd

we might want to have two sockets attached to the killtcp structure
one for capturing and a second one for sending  so we dont have to 
create a new socket for each tickle we want to send

(This used to be ctdb commit b3e82ec38047bbec1edfd88ade264077d4cbd2ee)

3 files changed, 12 insertions, 12 deletions

diff --git a/ctdb/common/system.c b/ctdb/common/system.c
index 493b07803a..207faa36cb 100644
--- a/ctdb/common/system.c
+++ b/ctdb/common/system.c
@@ -412,7 +412,7 @@ int ctdb_sys_read_tcp_packet(struct ctdb_kill_tcp *killtcp)
 	struct tcphdr *tcp;
 	struct ctdb_killtcp_connection *conn;
 
-	ret = recv(killtcp->fd, pkt, RCVPKTSIZE, MSG_TRUNC);
+	ret = recv(killtcp->capture_fd, pkt, RCVPKTSIZE, MSG_TRUNC);
 	if (ret < sizeof(*eth)+sizeof(*ip)) {
 		return -1;
 	}
diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index a95f8aa910..ce457b655b 100644
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -1060,7 +1060,7 @@ struct ctdb_killtcp_connection {
 */
 struct ctdb_kill_tcp {
 	struct ctdb_context *ctdb;
-	int fd;
+	int capture_fd;
 	struct fd_event *fde;
 	struct ctdb_killtcp_connection *connections;
 };
diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index 0aad2851a5..312f26afe9 100644
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -891,8 +891,8 @@ static void ctdb_tickle_sentenced_connections(struct event_context *ev, struct t
  */
 static int ctdb_killtcp_destructor(struct ctdb_kill_tcp *killtcp)
 {
-	close(killtcp->fd);
-	killtcp->fd = -1;
+	close(killtcp->capture_fd);
+	killtcp->capture_fd    = -1;
 	killtcp->ctdb->killtcp = NULL;
 
 	return 0;
@@ -920,7 +920,7 @@ int ctdb_killtcp_add_connection(struct ctdb_context *ctdb, struct sockaddr_in *s
 		CTDB_NO_MEMORY(ctdb, killtcp);
 
 		killtcp->ctdb        = ctdb;
-		killtcp->fd          = -1;
+		killtcp->capture_fd  = -1;
 		killtcp->connections = NULL;
 		ctdb->killtcp        = killtcp;
 		talloc_set_destructor(killtcp, ctdb_killtcp_destructor);
@@ -928,15 +928,15 @@ int ctdb_killtcp_add_connection(struct ctdb_context *ctdb, struct sockaddr_in *s
 
 	/* If we dont have a socket to listen on yet we must create it
 	 */
-	if (killtcp->fd == -1) {
-		killtcp->fd = ctdb_sys_open_capture_socket();
-		if (killtcp->fd == -1) {
-			DEBUG(0,(__location__ " Failed to open listening socket for killtcp\n"));
+	if (killtcp->capture_fd == -1) {
+		killtcp->capture_fd = ctdb_sys_open_capture_socket();
+		if (killtcp->capture_fd == -1) {
+			DEBUG(0,(__location__ " Failed to open capturing socket for killtcp\n"));
 			goto failed;
 		}
 
-		set_nonblocking(killtcp->fd);
-		set_close_on_exec(killtcp->fd);
+		set_nonblocking(killtcp->capture_fd);
+		set_close_on_exec(killtcp->capture_fd);
 	}
 
 
@@ -950,7 +950,7 @@ int ctdb_killtcp_add_connection(struct ctdb_context *ctdb, struct sockaddr_in *s
 	DLIST_ADD(killtcp->connections, conn);
 
 
-	killtcp->fde = event_add_fd(ctdb->ev, killtcp, killtcp->fd, 
+	killtcp->fde = event_add_fd(ctdb->ev, killtcp, killtcp->capture_fd, 
 				EVENT_FD_READ|EVENT_FD_AUTOCLOSE, 
 				capture_tcp_handler, killtcp);