From c3eb53509331045074579468d94ed7e31101bba4 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Wed, 18 Aug 2010 14:37:16 +1000 Subject: [PATCH] Add machinereadable output for the "ctgdb gettickles " command --- tools/ctdb.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/tools/ctdb.c b/tools/ctdb.c index d509f171..20b09b9e 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;itickles.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;itickles.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;itickles.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); -- 2.34.1