[SCM] CTDB repository - branch master updated - ctdb-1.0.114-249-gc3eb535

[Ronnie Sahlberg]

The branch, master has been updated
       via  c3eb53509331045074579468d94ed7e31101bba4 (commit)
      from  acded034e2f0dcae4c2c9e54e16a001caf23caec (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c3eb53509331045074579468d94ed7e31101bba4
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Aug 18 14:37:16 2010 +1000

    Add machinereadable output for the "ctgdb gettickles <ip>" command

-----------------------------------------------------------------------

Summary of changes:
 tools/ctdb.c |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/tools/ctdb.c b/tools/ctdb.c
index d509f17..20b09b9 100644
--- a/tools/ctdb.c
+++ b/tools/ctdb.c
@@ -1078,11 +1078,19 @@ static int control_get_tickles(struct ctdb_context *ctdb, int argc, const char *
 		return -1;
 	}
 
-	printf("Tickles for ip:%s\n", ctdb_addr_to_str(&list->addr));
-	printf("Num tickles:%u\n", list->tickles.num);
-	for (i=0;i<list->tickles.num;i++) {
-		printf("SRC: %s:%u   ", ctdb_addr_to_str(&list->tickles.connections[i].src_addr), ntohs(list->tickles.connections[i].src_addr.ip.sin_port));
-		printf("DST: %s:%u\n", ctdb_addr_to_str(&list->tickles.connections[i].dst_addr), ntohs(list->tickles.connections[i].dst_addr.ip.sin_port));
+	if (options.machinereadable){
+		printf(":source ip:port:destination ip:port:\n");
+		for (i=0;i<list->tickles.num;i++) {
+			printf(":%s:%u", ctdb_addr_to_str(&list->tickles.connections[i].src_addr), ntohs(list->tickles.connections[i].src_addr.ip.sin_port));
+			printf(":%s:%u:\n", ctdb_addr_to_str(&list->tickles.connections[i].dst_addr), ntohs(list->tickles.connections[i].dst_addr.ip.sin_port));
+		}
+	} else {
+		printf("Tickles for ip:%s\n", ctdb_addr_to_str(&list->addr));
+		printf("Num tickles:%u\n", list->tickles.num);
+		for (i=0;i<list->tickles.num;i++) {
+			printf("SRC: %s:%u   ", ctdb_addr_to_str(&list->tickles.connections[i].src_addr), ntohs(list->tickles.connections[i].src_addr.ip.sin_port));
+			printf("DST: %s:%u\n", ctdb_addr_to_str(&list->tickles.connections[i].dst_addr), ntohs(list->tickles.connections[i].dst_addr.ip.sin_port));
+		}
 	}
 
 	talloc_free(list);


-- 
CTDB repository