Rev 559: merge from ronnie in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 559
revision-id: tridge at samba.org-20070704235911-gugknnnxjrihz80j
parent: tridge at samba.org-20070704074546-njwthegu8tr03nh1
parent: sahlberg at ronnie-20070704225602-1pdwoj344094s5nr
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Thu 2007-07-05 09:59:11 +1000
message:
  merge from ronnie
modified:
  tools/ctdb.c                   ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1
    ------------------------------------------------------------
    revno: 432.1.104
    merged: sahlberg at ronnie-20070704225602-1pdwoj344094s5nr
    parent: sahlberg at ronnie-20070704075316-eaqoj4wjslthmefz
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Thu 2007-07-05 08:56:02 +1000
    message:
      add a command to ctdb to send tickle-ack's
    ------------------------------------------------------------
    revno: 432.1.103
    merged: sahlberg at ronnie-20070704075316-eaqoj4wjslthmefz
    parent: sahlberg at ronnie-20070704073726-6cnz54zcjrbxjml3
    parent: tridge at samba.org-20070704074546-njwthegu8tr03nh1
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Wed 2007-07-04 17:53:16 +1000
    message:
      merge from tridge
    ------------------------------------------------------------
    revno: 432.1.102
    merged: sahlberg at ronnie-20070704073726-6cnz54zcjrbxjml3
    parent: sahlberg at ronnie-20070704073516-rbnjmtlp5cz0dbul
    parent: tridge at samba.org-20070704065238-u4jop7aazj7ptv10
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Wed 2007-07-04 17:37:26 +1000
    message:
      merge from tridge
    ------------------------------------------------------------
    revno: 432.1.101
    merged: sahlberg at ronnie-20070704073516-rbnjmtlp5cz0dbul
    parent: sahlberg at ronnie-20070704041628-k3och7ffjambzc8q
    parent: tridge at samba.org-20070704065113-wrmwku4qyjcgd3vm
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Wed 2007-07-04 17:35:16 +1000
    message:
      merge from tridge
=== modified file 'tools/ctdb.c'
--- a/tools/ctdb.c	2007-07-04 06:51:13 +0000
+++ b/tools/ctdb.c	2007-07-04 22:56:02 +0000
@@ -338,6 +338,37 @@
 }
 
 /*
+  send a tcp tickle ack
+ */
+static int tickle_tcp(struct ctdb_context *ctdb, int argc, const char **argv)
+{
+	int ret;
+	struct sockaddr_in src, dst;
+
+	if (argc < 2) {
+		usage();
+	}
+
+	if (!parse_ip_port(argv[0], &src)) {
+		printf("Bad IP:port '%s'\n", argv[1]);
+		return -1;
+	}
+
+	if (!parse_ip_port(argv[1], &dst)) {
+		printf("Bad IP:port '%s'\n", argv[1]);
+		return -1;
+	}
+
+	ret = ctdb_sys_send_tcp(&src, &dst, 0, 0, 0);
+	if (ret==0) {
+		return 0;
+	}
+	printf("Error while sending tickle ack\n");
+
+	return -1;
+}
+
+/*
   display public ip status
  */
 static int control_ip(struct ctdb_context *ctdb, int argc, const char **argv)
@@ -859,6 +890,7 @@
 	{ "freeze",          control_freeze,            true,  "freeze all databases" },
 	{ "thaw",            control_thaw,              true,  "thaw all databases" },
 	{ "killtcp",         kill_tcp,                  false, "kill a tcp connection", "<srcip:port> <dstip:port>" },
+	{ "tickle",          tickle_tcp,                false, "send a tcp tickle ack", "<srcip:port> <dstip:port>" },
 };
 
 /*