From ecfaef503191ab45317cc6a851201ec992d7fb11 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Wed, 28 Oct 2015 19:39:51 +1100 Subject: [PATCH] ctdb-daemon: Rename struct ctdb_control_public_ip_info to ctdb_public_ip_info_old Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke --- ctdb/client/ctdb_client.c | 10 +++++----- ctdb/include/ctdb_client.h | 2 +- ctdb/include/ctdb_protocol.h | 2 +- ctdb/server/ctdb_takeover.c | 6 +++--- ctdb/tools/ctdb.c | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c index 056fba6dd68..30f290a0080 100644 --- a/ctdb/client/ctdb_client.c +++ b/ctdb/client/ctdb_client.c @@ -2810,13 +2810,13 @@ int ctdb_ctrl_get_public_ip_info(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode, TALLOC_CTX *mem_ctx, const ctdb_sock_addr *addr, - struct ctdb_control_public_ip_info **_info) + struct ctdb_public_ip_info_old **_info) { int ret; TDB_DATA indata; TDB_DATA outdata; int32_t res; - struct ctdb_control_public_ip_info *info; + struct ctdb_public_ip_info_old *info; uint32_t len; uint32_t i; @@ -2833,7 +2833,7 @@ int ctdb_ctrl_get_public_ip_info(struct ctdb_context *ctdb, return -1; } - len = offsetof(struct ctdb_control_public_ip_info, ifaces); + len = offsetof(struct ctdb_public_ip_info_old, ifaces); if (len > outdata.dsize) { DEBUG(DEBUG_ERR,(__location__ " ctdb_control for get public ip info " "returned invalid data with size %u > %u\n", @@ -2843,7 +2843,7 @@ int ctdb_ctrl_get_public_ip_info(struct ctdb_context *ctdb, return -1; } - info = (struct ctdb_control_public_ip_info *)outdata.dptr; + info = (struct ctdb_public_ip_info_old *)outdata.dptr; len += info->num*sizeof(struct ctdb_iface); if (len > outdata.dsize) { @@ -2860,7 +2860,7 @@ int ctdb_ctrl_get_public_ip_info(struct ctdb_context *ctdb, info->ifaces[i].name[CTDB_IFACE_SIZE] = '\0'; } - *_info = (struct ctdb_control_public_ip_info *)talloc_memdup(mem_ctx, + *_info = (struct ctdb_public_ip_info_old *)talloc_memdup(mem_ctx, outdata.dptr, outdata.dsize); talloc_free(outdata.dptr); diff --git a/ctdb/include/ctdb_client.h b/ctdb/include/ctdb_client.h index 5401f82c58e..1d0af7ee138 100644 --- a/ctdb/include/ctdb_client.h +++ b/ctdb/include/ctdb_client.h @@ -379,7 +379,7 @@ int ctdb_ctrl_get_public_ip_info(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode, TALLOC_CTX *mem_ctx, const ctdb_sock_addr *addr, - struct ctdb_control_public_ip_info **info); + struct ctdb_public_ip_info_old **info); int ctdb_ctrl_get_ifaces(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode, diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h index 90a9fed98fd..cccacea7f3b 100644 --- a/ctdb/include/ctdb_protocol.h +++ b/ctdb/include/ctdb_protocol.h @@ -994,7 +994,7 @@ struct ctdb_iface { uint32_t references; }; -struct ctdb_control_public_ip_info { +struct ctdb_public_ip_info_old { struct ctdb_public_ip ip; uint32_t active_idx; uint32_t num; diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c index 79bd8740a74..a9b74c357c9 100644 --- a/ctdb/server/ctdb_takeover.c +++ b/ctdb/server/ctdb_takeover.c @@ -3245,7 +3245,7 @@ int32_t ctdb_control_get_public_ip_info(struct ctdb_context *ctdb, { int i, num, len; ctdb_sock_addr *addr; - struct ctdb_control_public_ip_info *info; + struct ctdb_public_ip_info_old *info; struct ctdb_vnn *vnn; addr = (ctdb_sock_addr *)indata.dptr; @@ -3272,7 +3272,7 @@ int32_t ctdb_control_get_public_ip_info(struct ctdb_context *ctdb, num++; } - len = offsetof(struct ctdb_control_public_ip_info, ifaces) + + len = offsetof(struct ctdb_public_ip_info_old, ifaces) + num*sizeof(struct ctdb_iface); info = talloc_zero_size(outdata, len); CTDB_NO_MEMORY(ctdb, info); @@ -3298,7 +3298,7 @@ int32_t ctdb_control_get_public_ip_info(struct ctdb_context *ctdb, info->ifaces[i].references = cur->references; } info->num = i; - len = offsetof(struct ctdb_control_public_ip_info, ifaces) + + len = offsetof(struct ctdb_public_ip_info_old, ifaces) + i*sizeof(struct ctdb_iface); outdata->dsize = len; diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c index 9e9c2a81c2a..2d6a022e2ed 100644 --- a/ctdb/tools/ctdb.c +++ b/ctdb/tools/ctdb.c @@ -2998,7 +2998,7 @@ static int control_ip(struct ctdb_context *ctdb, int argc, const char **argv) } for (i=1;i<=ips->num;i++) { - struct ctdb_control_public_ip_info *info = NULL; + struct ctdb_public_ip_info_old *info = NULL; int32_t pnn; char *aciface = NULL; char *avifaces = NULL; @@ -3087,7 +3087,7 @@ static int control_ipinfo(struct ctdb_context *ctdb, int argc, const char **argv int i, ret; ctdb_sock_addr addr; TALLOC_CTX *tmp_ctx = talloc_new(ctdb); - struct ctdb_control_public_ip_info *info; + struct ctdb_public_ip_info_old *info; if (argc != 1) { talloc_free(tmp_ctx); -- 2.34.1