From: Amitay Isaacs Date: Wed, 28 Oct 2015 07:44:19 +0000 (+1100) Subject: ctdb-daemon: Rename struct ctdb_control_tcp_tickle_list to ctdb_tickle_list_old X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=ca481354c0edcb2afb022ee088010334826fd783;p=obnox%2Fsamba%2Fsamba-obnox.git ctdb-daemon: Rename struct ctdb_control_tcp_tickle_list to ctdb_tickle_list_old Also remove unnecessary struct ctdb_tcp_wire_array. Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke --- diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c index 9d465f2a996..c364ebf323a 100644 --- a/ctdb/client/ctdb_client.c +++ b/ctdb/client/ctdb_client.c @@ -3180,7 +3180,7 @@ int ctdb_ctrl_get_tcp_tickles(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode, TALLOC_CTX *mem_ctx, ctdb_sock_addr *addr, - struct ctdb_control_tcp_tickle_list **list) + struct ctdb_tickle_list_old **list) { int ret; TDB_DATA data, outdata; @@ -3197,7 +3197,7 @@ int ctdb_ctrl_get_tcp_tickles(struct ctdb_context *ctdb, return -1; } - *list = (struct ctdb_control_tcp_tickle_list *)outdata.dptr; + *list = (struct ctdb_tickle_list_old *)outdata.dptr; return status; } diff --git a/ctdb/include/ctdb_client.h b/ctdb/include/ctdb_client.h index 6540780f77b..805174672a8 100644 --- a/ctdb/include/ctdb_client.h +++ b/ctdb/include/ctdb_client.h @@ -417,7 +417,7 @@ int ctdb_ctrl_gratious_arp(struct ctdb_context *ctdb, int ctdb_ctrl_get_tcp_tickles(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode, TALLOC_CTX *mem_ctx, ctdb_sock_addr *addr, - struct ctdb_control_tcp_tickle_list **list); + struct ctdb_tickle_list_old **list); int ctdb_ctrl_register_server_id(struct ctdb_context *ctdb, struct timeval timeout, diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h index 3055b812cd9..cf8a82df2f9 100644 --- a/ctdb/include/ctdb_protocol.h +++ b/ctdb/include/ctdb_protocol.h @@ -837,16 +837,11 @@ struct ctdb_disable_message { uint32_t timeout; }; -/* the wire representation for a tcp tickle array */ -struct ctdb_tcp_wire_array { - uint32_t num; - struct ctdb_connection connections[1]; -}; - /* the list of tcp tickles used by get/set tcp tickle list */ -struct ctdb_control_tcp_tickle_list { +struct ctdb_tickle_list_old { ctdb_sock_addr addr; - struct ctdb_tcp_wire_array tickles; + uint32_t num; + struct ctdb_connection connections[1]; }; /* all tunable variables go in here */ diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c index 362bd31f571..9ef7cd119ab 100644 --- a/ctdb/server/ctdb_takeover.c +++ b/ctdb/server/ctdb_takeover.c @@ -3744,25 +3744,22 @@ int32_t ctdb_control_kill_tcp(struct ctdb_context *ctdb, TDB_DATA indata) */ int32_t ctdb_control_set_tcp_tickle_list(struct ctdb_context *ctdb, TDB_DATA indata) { - struct ctdb_control_tcp_tickle_list *list = (struct ctdb_control_tcp_tickle_list *)indata.dptr; + struct ctdb_tickle_list_old *list = (struct ctdb_tickle_list_old *)indata.dptr; struct ctdb_tcp_array *tcparray; struct ctdb_vnn *vnn; /* We must at least have tickles.num or else we cant verify the size of the received data blob */ - if (indata.dsize < offsetof(struct ctdb_control_tcp_tickle_list, - tickles.connections)) { - DEBUG(DEBUG_ERR,("Bad indata in ctdb_control_set_tcp_tickle_list. Not enough data for the tickle.num field\n")); + if (indata.dsize < offsetof(struct ctdb_tickle_list_old, connections)) { + DEBUG(DEBUG_ERR,("Bad indata in ctdb_tickle_list. Not enough data for the tickle.num field\n")); return -1; } /* verify that the size of data matches what we expect */ - if (indata.dsize < offsetof(struct ctdb_control_tcp_tickle_list, - tickles.connections) - + sizeof(struct ctdb_connection) - * list->tickles.num) { - DEBUG(DEBUG_ERR,("Bad indata in ctdb_control_set_tcp_tickle_list\n")); + if (indata.dsize < offsetof(struct ctdb_tickle_list_old, connections) + + sizeof(struct ctdb_connection) * list->num) { + DEBUG(DEBUG_ERR,("Bad indata in ctdb_tickle_list\n")); return -1; } @@ -3784,12 +3781,12 @@ int32_t ctdb_control_set_tcp_tickle_list(struct ctdb_context *ctdb, TDB_DATA ind tcparray = talloc(vnn, struct ctdb_tcp_array); CTDB_NO_MEMORY(ctdb, tcparray); - tcparray->num = list->tickles.num; + tcparray->num = list->num; tcparray->connections = talloc_array(tcparray, struct ctdb_connection, tcparray->num); CTDB_NO_MEMORY(ctdb, tcparray->connections); - memcpy(tcparray->connections, &list->tickles.connections[0], + memcpy(tcparray->connections, &list->connections[0], sizeof(struct ctdb_connection)*tcparray->num); /* We now have a new fresh tickle list array for this vnn */ @@ -3805,7 +3802,7 @@ int32_t ctdb_control_set_tcp_tickle_list(struct ctdb_context *ctdb, TDB_DATA ind int32_t ctdb_control_get_tcp_tickle_list(struct ctdb_context *ctdb, TDB_DATA indata, TDB_DATA *outdata) { ctdb_sock_addr *addr = (ctdb_sock_addr *)indata.dptr; - struct ctdb_control_tcp_tickle_list *list; + struct ctdb_tickle_list_old *list; struct ctdb_tcp_array *tcparray; int num; struct ctdb_vnn *vnn; @@ -3825,18 +3822,17 @@ int32_t ctdb_control_get_tcp_tickle_list(struct ctdb_context *ctdb, TDB_DATA ind num = 0; } - outdata->dsize = offsetof(struct ctdb_control_tcp_tickle_list, - tickles.connections) + outdata->dsize = offsetof(struct ctdb_tickle_list_old, connections) + sizeof(struct ctdb_connection) * num; outdata->dptr = talloc_size(outdata, outdata->dsize); CTDB_NO_MEMORY(ctdb, outdata->dptr); - list = (struct ctdb_control_tcp_tickle_list *)outdata->dptr; + list = (struct ctdb_tickle_list_old *)outdata->dptr; list->addr = *addr; - list->tickles.num = num; + list->num = num; if (num) { - memcpy(&list->tickles.connections[0], tcparray->connections, + memcpy(&list->connections[0], tcparray->connections, sizeof(struct ctdb_connection) * num); } @@ -3853,7 +3849,7 @@ static int ctdb_send_set_tcp_tickles_for_ip(struct ctdb_context *ctdb, { int ret, num; TDB_DATA data; - struct ctdb_control_tcp_tickle_list *list; + struct ctdb_tickle_list_old *list; if (tcparray) { num = tcparray->num; @@ -3861,17 +3857,16 @@ static int ctdb_send_set_tcp_tickles_for_ip(struct ctdb_context *ctdb, num = 0; } - data.dsize = offsetof(struct ctdb_control_tcp_tickle_list, - tickles.connections) + + data.dsize = offsetof(struct ctdb_tickle_list_old, connections) + sizeof(struct ctdb_connection) * num; data.dptr = talloc_size(ctdb, data.dsize); CTDB_NO_MEMORY(ctdb, data.dptr); - list = (struct ctdb_control_tcp_tickle_list *)data.dptr; + list = (struct ctdb_tickle_list_old *)data.dptr; list->addr = *addr; - list->tickles.num = num; + list->num = num; if (tcparray) { - memcpy(&list->tickles.connections[0], tcparray->connections, sizeof(struct ctdb_connection) * num); + memcpy(&list->connections[0], tcparray->connections, sizeof(struct ctdb_connection) * num); } ret = ctdb_daemon_send_control(ctdb, CTDB_BROADCAST_ALL, 0, diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c index 08024d73eea..8d4e30c9545 100644 --- a/ctdb/tools/ctdb.c +++ b/ctdb/tools/ctdb.c @@ -1693,7 +1693,7 @@ static int control_del_tickle(struct ctdb_context *ctdb, int argc, const char ** */ static int control_get_tickles(struct ctdb_context *ctdb, int argc, const char **argv) { - struct ctdb_control_tcp_tickle_list *list; + struct ctdb_tickle_list_old *list; ctdb_sock_addr addr; int i, ret; unsigned port = 0; @@ -1721,22 +1721,22 @@ static int control_get_tickles(struct ctdb_context *ctdb, int argc, const char * if (options.machinereadable){ printm(":source ip:port:destination ip:port:\n"); - for (i=0;itickles.num;i++) { - if (port && port != ntohs(list->tickles.connections[i].dst.ip.sin_port)) { + for (i=0;inum;i++) { + if (port && port != ntohs(list->connections[i].dst.ip.sin_port)) { continue; } - printm(":%s:%u", ctdb_addr_to_str(&list->tickles.connections[i].src), ntohs(list->tickles.connections[i].src.ip.sin_port)); - printm(":%s:%u:\n", ctdb_addr_to_str(&list->tickles.connections[i].dst), ntohs(list->tickles.connections[i].dst.ip.sin_port)); + printm(":%s:%u", ctdb_addr_to_str(&list->connections[i].src), ntohs(list->connections[i].src.ip.sin_port)); + printm(":%s:%u:\n", ctdb_addr_to_str(&list->connections[i].dst), ntohs(list->connections[i].dst.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++) { - if (port && port != ntohs(list->tickles.connections[i].dst.ip.sin_port)) { + printf("Num tickles:%u\n", list->num); + for (i=0;inum;i++) { + if (port && port != ntohs(list->connections[i].dst.ip.sin_port)) { continue; } - printf("SRC: %s:%u ", ctdb_addr_to_str(&list->tickles.connections[i].src), ntohs(list->tickles.connections[i].src.ip.sin_port)); - printf("DST: %s:%u\n", ctdb_addr_to_str(&list->tickles.connections[i].dst), ntohs(list->tickles.connections[i].dst.ip.sin_port)); + printf("SRC: %s:%u ", ctdb_addr_to_str(&list->connections[i].src), ntohs(list->connections[i].src.ip.sin_port)); + printf("DST: %s:%u\n", ctdb_addr_to_str(&list->connections[i].dst), ntohs(list->connections[i].dst.ip.sin_port)); } }