]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
ctdb-protocol: Remove data structures for obsolete server_id controls
authorAmitay Isaacs <amitay@gmail.com>
Thu, 21 Apr 2016 05:24:24 +0000 (15:24 +1000)
committerMartin Schwenke <martins@samba.org>
Sat, 23 Apr 2016 21:55:15 +0000 (23:55 +0200)
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
ctdb/include/ctdb_protocol.h
ctdb/protocol/protocol.h
ctdb/protocol/protocol_api.h
ctdb/protocol/protocol_client.c
ctdb/protocol/protocol_control.c
ctdb/protocol/protocol_private.h
ctdb/protocol/protocol_types.c
ctdb/tests/src/protocol_client_test.c
ctdb/tests/src/protocol_types_test.c

index feea114a123e575bec7ba9588c6e835aa04d2a16..2b2fd76b69f68d0beec3bc3545a91cc7c3c713f9 100644 (file)
@@ -214,11 +214,6 @@ struct ctdb_dbid_map_old {
        struct ctdb_dbid dbs[1];
 };
 
-struct ctdb_client_id_list_old {
-       uint32_t num;
-       struct ctdb_client_id server_ids[1];
-};
-
 /* the list of tcp tickles used by get/set tcp tickle list */
 struct ctdb_tickle_list_old {
        ctdb_sock_addr addr;
index 3ae2ff23db280c0918ffe9008a35986067658ede..64b1fed1eabff65131d463870278ac96e8758523 100644 (file)
@@ -276,10 +276,10 @@ enum ctdb_controls {CTDB_CONTROL_PROCESS_EXISTS          = 0,
                    CTDB_CONTROL_KILL_TCP                = 54, /* obsolete */
                    CTDB_CONTROL_GET_TCP_TICKLE_LIST     = 55,
                    CTDB_CONTROL_SET_TCP_TICKLE_LIST     = 56,
-                   CTDB_CONTROL_REGISTER_SERVER_ID      = 57,
-                   CTDB_CONTROL_UNREGISTER_SERVER_ID    = 58,
-                   CTDB_CONTROL_CHECK_SERVER_ID         = 59,
-                   CTDB_CONTROL_GET_SERVER_ID_LIST      = 60,
+                   CTDB_CONTROL_REGISTER_SERVER_ID      = 57, /* obsolete */
+                   CTDB_CONTROL_UNREGISTER_SERVER_ID    = 58, /* obsolete */
+                   CTDB_CONTROL_CHECK_SERVER_ID         = 59, /* obsolete */
+                   CTDB_CONTROL_GET_SERVER_ID_LIST      = 60, /* obsolete */
                    CTDB_CONTROL_DB_ATTACH_PERSISTENT    = 61,
                    CTDB_CONTROL_PERSISTENT_STORE        = 62, /* obsolete */
                    CTDB_CONTROL_UPDATE_RECORD           = 63,
@@ -643,29 +643,6 @@ struct ctdb_tickle_list {
        struct ctdb_connection *conn;
 };
 
-enum ctdb_client_type {
-       SERVER_TYPE_CTDB = 0,
-       SERVER_TYPE_SAMBA = 1,
-       SERVER_TYPE_NFSD = 2,
-       SERVER_TYPE_ISCSID = 3
-};
-
-struct ctdb_client_id {
-       enum ctdb_client_type type;
-       uint32_t pnn;
-       uint32_t server_id;
-};
-
-struct ctdb_client_id_list {
-       uint32_t num;
-       struct ctdb_client_id *cid;
-};
-
-struct ctdb_client_id_map {
-       int count;
-       struct ctdb_client_id_list *list;
-};
-
 struct ctdb_addr_info {
        ctdb_sock_addr addr;
        uint32_t mask;
index f23ca4fd258271c1532107035fafe101d9a8ac55..eb1baaffc2b5620e3d315811c19e10d4c9c09a8c 100644 (file)
@@ -333,23 +333,6 @@ void ctdb_req_control_set_tcp_tickle_list(struct ctdb_req_control *request,
                                          struct ctdb_tickle_list *tickles);
 int ctdb_reply_control_set_tcp_tickle_list(struct ctdb_reply_control *reply);
 
-void ctdb_req_control_register_server_id(struct ctdb_req_control *request,
-                                        struct ctdb_client_id *sid);
-int ctdb_reply_control_register_server_id(struct ctdb_reply_control *reply);
-
-void ctdb_req_control_unregister_server_id(struct ctdb_req_control *request,
-                                          struct ctdb_client_id *sid);
-int ctdb_reply_control_unregister_server_id(struct ctdb_reply_control *reply);
-
-void ctdb_req_control_check_server_id(struct ctdb_req_control *request,
-                                     struct ctdb_client_id *sid);
-int ctdb_reply_control_check_server_id(struct ctdb_reply_control *reply);
-
-void ctdb_req_control_get_server_id_list(struct ctdb_req_control *request);
-int ctdb_reply_control_get_server_id_list(struct ctdb_reply_control *reply,
-                                         TALLOC_CTX *mem_ctx,
-                                         struct ctdb_client_id_map **cid_map);
-
 void ctdb_req_control_db_attach_persistent(struct ctdb_req_control *request,
                                           const char *name,
                                           uint32_t tdb_flags);
index 7a44f044ad9aa86445065e56aacb935b4250d856..c1d6a8849806dcf3f964060c129d91f88358ebb0 100644 (file)
@@ -944,90 +944,6 @@ int ctdb_reply_control_set_tcp_tickle_list(struct ctdb_reply_control *reply)
        return ctdb_reply_control_generic(reply);
 }
 
-/* CTDB_CONTROL_REGISTER_SERVER_ID */
-
-void ctdb_req_control_register_server_id(struct ctdb_req_control *request,
-                                        struct ctdb_client_id *cid)
-{
-       request->opcode = CTDB_CONTROL_REGISTER_SERVER_ID;
-       request->pad = 0;
-       request->srvid = 0;
-       request->client_id = 0;
-       request->flags = 0;
-
-       request->rdata.opcode = CTDB_CONTROL_REGISTER_SERVER_ID;
-       request->rdata.data.cid = cid;
-}
-
-int ctdb_reply_control_register_server_id(struct ctdb_reply_control *reply)
-{
-       return ctdb_reply_control_generic(reply);
-}
-
-/* CTDB_CONTROL_UNREGISTER_SERVER_ID */
-
-void ctdb_req_control_unregister_server_id(struct ctdb_req_control *request,
-                                          struct ctdb_client_id *cid)
-{
-       request->opcode = CTDB_CONTROL_UNREGISTER_SERVER_ID;
-       request->pad = 0;
-       request->srvid = 0;
-       request->client_id = 0;
-       request->flags = 0;
-
-       request->rdata.opcode = CTDB_CONTROL_UNREGISTER_SERVER_ID;
-       request->rdata.data.cid = cid;
-}
-
-int ctdb_reply_control_unregister_server_id(struct ctdb_reply_control *reply)
-{
-       return ctdb_reply_control_generic(reply);
-}
-
-/* CTDB_CONTROL_CHECK_SERVER_ID */
-
-void ctdb_req_control_check_server_id(struct ctdb_req_control *request,
-                                     struct ctdb_client_id *cid)
-{
-       request->opcode = CTDB_CONTROL_CHECK_SERVER_ID;
-       request->pad = 0;
-       request->srvid = 0;
-       request->client_id = 0;
-       request->flags = 0;
-
-       request->rdata.opcode = CTDB_CONTROL_CHECK_SERVER_ID;
-       request->rdata.data.cid = cid;
-}
-
-int ctdb_reply_control_check_server_id(struct ctdb_reply_control *reply)
-{
-       return reply->status;
-}
-
-/* CTDB_CONTROL_GET_SERVER_ID_LIST */
-
-void ctdb_req_control_get_server_id_list(struct ctdb_req_control *request)
-{
-       request->opcode = CTDB_CONTROL_GET_SERVER_ID_LIST;
-       request->pad = 0;
-       request->srvid = 0;
-       request->client_id = 0;
-       request->flags = 0;
-
-       request->rdata.opcode = CTDB_CONTROL_GET_SERVER_ID_LIST;
-}
-
-int ctdb_reply_control_get_server_id_list(struct ctdb_reply_control *reply,
-                                         TALLOC_CTX *mem_ctx,
-                                         struct ctdb_client_id_map **cid_map)
-{
-       if (reply->status == 0 &&
-           reply->rdata.opcode == CTDB_CONTROL_GET_SERVER_ID_LIST) {
-               *cid_map = talloc_steal(mem_ctx, reply->rdata.data.cid_map);
-       }
-       return reply->status;
-}
-
 /* CTDB_CONTROL_DB_ATTACH_PERSISTENT */
 
 void ctdb_req_control_db_attach_persistent(struct ctdb_req_control *request,
index c0fa6adaecf846bde52f1fac24e6687a46032385..ecc7eaa7e40917a4229f27dd5624ecfd953cae6a 100644 (file)
@@ -211,21 +211,6 @@ static size_t ctdb_req_control_data_len(struct ctdb_req_control_data *cd)
                len = ctdb_tickle_list_len(cd->data.tickles);
                break;
 
-       case CTDB_CONTROL_REGISTER_SERVER_ID:
-               len = ctdb_client_id_len(cd->data.cid);
-               break;
-
-       case CTDB_CONTROL_UNREGISTER_SERVER_ID:
-               len = ctdb_client_id_len(cd->data.cid);
-               break;
-
-       case CTDB_CONTROL_CHECK_SERVER_ID:
-               len = ctdb_client_id_len(cd->data.cid);
-               break;
-
-       case CTDB_CONTROL_GET_SERVER_ID_LIST:
-               break;
-
        case CTDB_CONTROL_DB_ATTACH_PERSISTENT:
                len = ctdb_string_len(cd->data.db_name);
                break;
@@ -591,18 +576,6 @@ static void ctdb_req_control_data_push(struct ctdb_req_control_data *cd,
                ctdb_tickle_list_push(cd->data.tickles, buf);
                break;
 
-       case CTDB_CONTROL_REGISTER_SERVER_ID:
-               ctdb_client_id_push(cd->data.cid, buf);
-               break;
-
-       case CTDB_CONTROL_UNREGISTER_SERVER_ID:
-               ctdb_client_id_push(cd->data.cid, buf);
-               break;
-
-       case CTDB_CONTROL_CHECK_SERVER_ID:
-               ctdb_client_id_push(cd->data.cid, buf);
-               break;
-
        case CTDB_CONTROL_DB_ATTACH_PERSISTENT:
                ctdb_string_push(cd->data.db_name, buf);
                break;
@@ -931,21 +904,6 @@ static int ctdb_req_control_data_pull(uint8_t *buf, size_t buflen,
                                            &cd->data.tickles);
                break;
 
-       case CTDB_CONTROL_REGISTER_SERVER_ID:
-               ret = ctdb_client_id_pull(buf, buflen, mem_ctx,
-                                         &cd->data.cid);
-               break;
-
-       case CTDB_CONTROL_UNREGISTER_SERVER_ID:
-               ret = ctdb_client_id_pull(buf, buflen, mem_ctx,
-                                         &cd->data.cid);
-               break;
-
-       case CTDB_CONTROL_CHECK_SERVER_ID:
-               ret = ctdb_client_id_pull(buf, buflen, mem_ctx,
-                                         &cd->data.cid);
-               break;
-
        case CTDB_CONTROL_DB_ATTACH_PERSISTENT:
                ret = ctdb_string_pull(buf, buflen, mem_ctx,
                                       &cd->data.db_name);
@@ -1349,19 +1307,6 @@ static size_t ctdb_reply_control_data_len(struct ctdb_reply_control_data *cd)
        case CTDB_CONTROL_SET_TCP_TICKLE_LIST:
                break;
 
-       case CTDB_CONTROL_REGISTER_SERVER_ID:
-               break;
-
-       case CTDB_CONTROL_UNREGISTER_SERVER_ID:
-               break;
-
-       case CTDB_CONTROL_CHECK_SERVER_ID:
-               break;
-
-       case CTDB_CONTROL_GET_SERVER_ID_LIST:
-               len = ctdb_client_id_map_len(cd->data.cid_map);
-               break;
-
        case CTDB_CONTROL_DB_ATTACH_PERSISTENT:
                len = ctdb_uint32_len(cd->data.db_id);
                break;
@@ -1662,10 +1607,6 @@ static void ctdb_reply_control_data_push(struct ctdb_reply_control_data *cd,
                ctdb_tickle_list_push(cd->data.tickles, buf);
                break;
 
-       case CTDB_CONTROL_GET_SERVER_ID_LIST:
-               ctdb_client_id_map_push(cd->data.cid_map, buf);
-               break;
-
        case CTDB_CONTROL_DB_ATTACH_PERSISTENT:
                ctdb_uint32_push(cd->data.db_id, buf);
                break;
@@ -1837,11 +1778,6 @@ static int ctdb_reply_control_data_pull(uint8_t *buf, size_t buflen,
                                            &cd->data.tickles);
                break;
 
-       case CTDB_CONTROL_GET_SERVER_ID_LIST:
-               ret = ctdb_client_id_map_pull(buf, buflen, mem_ctx,
-                                             &cd->data.cid_map);
-               break;
-
        case CTDB_CONTROL_DB_ATTACH_PERSISTENT:
                ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
                                       &cd->data.db_id);
index a67d622cc722609393f6c2142fb099722973e4bb..6edba712d724bf493a8bd59bd629e3e652b8268f 100644 (file)
@@ -157,22 +157,6 @@ void ctdb_tickle_list_push(struct ctdb_tickle_list *tickles, uint8_t *buf);
 int ctdb_tickle_list_pull(uint8_t *buf, size_t buflen, TALLOC_CTX *mem_ctx,
                          struct ctdb_tickle_list **out);
 
-size_t ctdb_client_id_len(struct ctdb_client_id *cid);
-void ctdb_client_id_push(struct ctdb_client_id *cid, uint8_t *buf);
-int ctdb_client_id_pull(uint8_t *buf, size_t buflen, TALLOC_CTX *mem_ctx,
-                       struct ctdb_client_id **out);
-
-size_t ctdb_client_id_list_len(struct ctdb_client_id_list *cid_list);
-void ctdb_client_id_list_push(struct ctdb_client_id_list *cid_list,
-                             uint8_t *buf);
-int ctdb_client_id_list_pull(uint8_t *buf, size_t buflen, TALLOC_CTX *mem_ctx,
-                            struct ctdb_client_id_list **out);
-
-size_t ctdb_client_id_map_len(struct ctdb_client_id_map *cid_map);
-void ctdb_client_id_map_push(struct ctdb_client_id_map *cid_map, uint8_t *buf);
-int ctdb_client_id_map_pull(uint8_t *buf, size_t buflen, TALLOC_CTX *mem_ctx,
-                           struct ctdb_client_id_map **out);
-
 size_t ctdb_addr_info_len(struct ctdb_addr_info *addr_info);
 void ctdb_addr_info_push(struct ctdb_addr_info *addr_info, uint8_t *buf);
 int ctdb_addr_info_pull(uint8_t *buf, size_t buflen, TALLOC_CTX *mem_ctx,
index cd04aca0e6423a3bb2c5202396382cdae6072ba2..9b4ba36cda17bccbdecd8817957ece08a7acab9d 100644 (file)
@@ -1337,215 +1337,6 @@ int ctdb_tickle_list_pull(uint8_t *buf, size_t buflen, TALLOC_CTX *mem_ctx,
        return 0;
 }
 
-size_t ctdb_client_id_len(struct ctdb_client_id *cid)
-{
-       return sizeof(struct ctdb_client_id);
-}
-
-void ctdb_client_id_push(struct ctdb_client_id *cid, uint8_t *buf)
-{
-       memcpy(buf, cid, sizeof(struct ctdb_client_id));
-}
-
-static int ctdb_client_id_pull_elems(uint8_t *buf, size_t buflen,
-                                    TALLOC_CTX *mem_ctx,
-                                    struct ctdb_client_id *out)
-{
-       if (buflen < sizeof(struct ctdb_client_id)) {
-               return EMSGSIZE;
-       }
-
-       memcpy(out, buf, sizeof(struct ctdb_client_id));
-
-       return 0;
-}
-
-int ctdb_client_id_pull(uint8_t *buf, size_t buflen, TALLOC_CTX *mem_ctx,
-                       struct ctdb_client_id **out)
-{
-       struct ctdb_client_id *cid;
-       int ret;
-
-       cid = talloc(mem_ctx, struct ctdb_client_id);
-       if (cid == NULL) {
-               return ENOMEM;
-       }
-
-       ret = ctdb_client_id_pull_elems(buf, buflen, cid, cid);
-       if (ret != 0) {
-               TALLOC_FREE(cid);
-       }
-
-       *out = cid;
-       return ret;
-}
-
-struct ctdb_client_id_list_wire {
-       uint32_t num;
-       struct ctdb_client_id cid[1];
-};
-
-size_t ctdb_client_id_list_len(struct ctdb_client_id_list *cid_list)
-{
-       return sizeof(uint32_t) +
-              cid_list->num * sizeof(struct ctdb_client_id);
-}
-
-void ctdb_client_id_list_push(struct ctdb_client_id_list *cid_list,
-                             uint8_t *buf)
-{
-       struct ctdb_client_id_list_wire *wire =
-               (struct ctdb_client_id_list_wire *)buf;
-       size_t offset;
-       int i;
-
-       wire->num = cid_list->num;
-
-       offset = offsetof(struct ctdb_client_id_list_wire, cid);
-       for (i=0; i<cid_list->num; i++) {
-               ctdb_client_id_push(&cid_list->cid[i], &buf[offset]);
-               offset += ctdb_client_id_len(&cid_list->cid[i]);
-       }
-}
-
-static int ctdb_client_id_list_pull_elems(uint8_t *buf, size_t buflen,
-                                         TALLOC_CTX *mem_ctx,
-                                         struct ctdb_client_id_list *out)
-{
-       struct ctdb_client_id_list_wire *wire =
-               (struct ctdb_client_id_list_wire *)buf;
-       size_t offset;
-       int i;
-
-       if (buflen < sizeof(uint32_t)) {
-               return EMSGSIZE;
-       }
-       if (buflen < sizeof(uint32_t) +
-                    wire->num * sizeof(struct ctdb_client_id)) {
-               return EMSGSIZE;
-       }
-
-       out->num = wire->num;
-       out->cid = talloc_array(mem_ctx, struct ctdb_client_id,
-                               wire->num);
-       if (out->cid == NULL) {
-               return ENOMEM;
-       }
-
-       offset = offsetof(struct ctdb_client_id_list_wire, cid);
-       for (i=0; i<wire->num; i++) {
-               bool ret;
-               ret = ctdb_client_id_pull_elems(&buf[offset], buflen-offset,
-                                               out->cid, &out->cid[i]);
-               if (ret != 0) {
-                       return ret;
-               }
-               offset += ctdb_client_id_len(&out->cid[i]);
-       }
-
-       return 0;
-}
-
-int ctdb_client_id_list_pull(uint8_t *buf, size_t buflen, TALLOC_CTX *mem_ctx,
-                            struct ctdb_client_id_list **out)
-{
-       struct ctdb_client_id_list *cid_list;
-       int ret;
-
-       cid_list = talloc(mem_ctx, struct ctdb_client_id_list);
-       if (cid_list == NULL) {
-               return ENOMEM;
-       }
-
-       ret = ctdb_client_id_list_pull_elems(buf, buflen, cid_list, cid_list);
-       if (ret != 0) {
-               TALLOC_FREE(cid_list);
-       }
-
-       *out = cid_list;
-       return ret;
-}
-
-struct ctdb_client_id_map_wire {
-       int count;
-       struct ctdb_client_id_list list[1];
-};
-
-size_t ctdb_client_id_map_len(struct ctdb_client_id_map *cid_map)
-{
-       int i;
-       size_t len;
-
-       len = sizeof(int);
-       for (i=0; i<cid_map->count; i++) {
-               len += ctdb_client_id_list_len(&cid_map->list[i]);
-       }
-       return len;
-}
-
-void ctdb_client_id_map_push(struct ctdb_client_id_map *cid_map, uint8_t *buf)
-{
-       struct ctdb_client_id_map_wire *wire =
-               (struct ctdb_client_id_map_wire *)buf;
-       size_t offset;
-       int i;
-
-       wire->count = cid_map->count;
-
-       offset = sizeof(int);
-       for (i=0; i<cid_map->count; i++) {
-               ctdb_client_id_list_push(&cid_map->list[i], &buf[offset]);
-               offset += ctdb_client_id_list_len(&cid_map->list[i]);
-       }
-}
-
-int ctdb_client_id_map_pull(uint8_t *buf, size_t buflen, TALLOC_CTX *mem_ctx,
-                           struct ctdb_client_id_map **out)
-{
-       struct ctdb_client_id_map *cid_map;
-       struct ctdb_client_id_map_wire *wire =
-               (struct ctdb_client_id_map_wire *)buf;
-       size_t offset;
-       int i;
-       bool ret;
-
-       if (buflen < sizeof(int)) {
-               return EMSGSIZE;
-       }
-       if (buflen < sizeof(int) +
-                    wire->count * sizeof(struct ctdb_client_id_list)) {
-               return EMSGSIZE;
-       }
-
-       cid_map = talloc(mem_ctx, struct ctdb_client_id_map);
-       if (cid_map == NULL) {
-               return ENOMEM;
-       }
-
-       cid_map->count = wire->count;
-       cid_map->list = talloc_array(cid_map, struct ctdb_client_id_list,
-                                    wire->count);
-       if (cid_map->list == NULL) {
-               return ENOMEM;
-       }
-
-       offset = sizeof(int);
-       for (i=0; i<wire->count; i++) {
-               ret = ctdb_client_id_list_pull_elems(&buf[offset],
-                                                    buflen-offset,
-                                                    cid_map->list,
-                                                    &cid_map->list[i]);
-               if (ret != 0) {
-                       talloc_free(cid_map);
-                       return ret;
-               }
-               offset += ctdb_client_id_list_len(&cid_map->list[i]);
-       }
-
-       *out = cid_map;
-       return 0;
-}
-
 struct ctdb_addr_info_wire {
        ctdb_sock_addr addr;
        uint32_t mask;
index 5a216a311a411b5952a46e6cfb3a392568474b94..c7ac233d7784ef6794317065c82e070fc6057f05 100644 (file)
@@ -320,27 +320,6 @@ static void fill_ctdb_req_control_data(TALLOC_CTX *mem_ctx,
                fill_ctdb_tickle_list(mem_ctx, cd->data.tickles);
                break;
 
-       case CTDB_CONTROL_REGISTER_SERVER_ID:
-               cd->data.cid = talloc(mem_ctx, struct ctdb_client_id);
-               assert(cd->data.cid != NULL);
-               fill_ctdb_client_id(mem_ctx, cd->data.cid);
-               break;
-
-       case CTDB_CONTROL_UNREGISTER_SERVER_ID:
-               cd->data.cid = talloc(mem_ctx, struct ctdb_client_id);
-               assert(cd->data.cid != NULL);
-               fill_ctdb_client_id(mem_ctx, cd->data.cid);
-               break;
-
-       case CTDB_CONTROL_CHECK_SERVER_ID:
-               cd->data.cid = talloc(mem_ctx, struct ctdb_client_id);
-               assert(cd->data.cid != NULL);
-               fill_ctdb_client_id(mem_ctx, cd->data.cid);
-               break;
-
-       case CTDB_CONTROL_GET_SERVER_ID_LIST:
-               break;
-
        case CTDB_CONTROL_DB_ATTACH_PERSISTENT:
                fill_ctdb_string(mem_ctx, &cd->data.db_name);
                assert(cd->data.db_name != NULL);
@@ -830,21 +809,6 @@ static void verify_ctdb_req_control_data(struct ctdb_req_control_data *cd,
                verify_ctdb_tickle_list(cd->data.tickles, cd2->data.tickles);
                break;
 
-       case CTDB_CONTROL_REGISTER_SERVER_ID:
-               verify_ctdb_client_id(cd->data.cid, cd2->data.cid);
-               break;
-
-       case CTDB_CONTROL_UNREGISTER_SERVER_ID:
-               verify_ctdb_client_id(cd->data.cid, cd2->data.cid);
-               break;
-
-       case CTDB_CONTROL_CHECK_SERVER_ID:
-               verify_ctdb_client_id(cd->data.cid, cd2->data.cid);
-               break;
-
-       case CTDB_CONTROL_GET_SERVER_ID_LIST:
-               break;
-
        case CTDB_CONTROL_DB_ATTACH_PERSISTENT:
                verify_ctdb_string(cd->data.db_name, cd2->data.db_name);
                break;
@@ -1314,21 +1278,6 @@ static void fill_ctdb_reply_control_data(TALLOC_CTX *mem_ctx,
        case CTDB_CONTROL_SET_TCP_TICKLE_LIST:
                break;
 
-       case CTDB_CONTROL_REGISTER_SERVER_ID:
-               break;
-
-       case CTDB_CONTROL_UNREGISTER_SERVER_ID:
-               break;
-
-       case CTDB_CONTROL_CHECK_SERVER_ID:
-               break;
-
-       case CTDB_CONTROL_GET_SERVER_ID_LIST:
-               cd->data.cid_map = talloc(mem_ctx, struct ctdb_client_id_map);
-               assert(cd->data.cid_map != NULL);
-               fill_ctdb_client_id_map(mem_ctx, cd->data.cid_map);
-               break;
-
        case CTDB_CONTROL_DB_ATTACH_PERSISTENT:
                break;
 
@@ -1730,19 +1679,6 @@ static void verify_ctdb_reply_control_data(struct ctdb_reply_control_data *cd,
        case CTDB_CONTROL_SET_TCP_TICKLE_LIST:
                break;
 
-       case CTDB_CONTROL_REGISTER_SERVER_ID:
-               break;
-
-       case CTDB_CONTROL_UNREGISTER_SERVER_ID:
-               break;
-
-       case CTDB_CONTROL_CHECK_SERVER_ID:
-               break;
-
-       case CTDB_CONTROL_GET_SERVER_ID_LIST:
-               verify_ctdb_client_id_map(cd->data.cid_map, cd2->data.cid_map);
-               break;
-
        case CTDB_CONTROL_DB_ATTACH_PERSISTENT:
                break;
 
index e39a2c9a4cf56d66821d5289fffd01ffb78a5971..48ae508850114085b9b3c233497aa98d0a8bf106 100644 (file)
@@ -506,70 +506,6 @@ static void verify_ctdb_tickle_list(struct ctdb_tickle_list *p1,
        }
 }
 
-static void fill_ctdb_client_id(TALLOC_CTX *mem_ctx,
-                               struct ctdb_client_id *p)
-{
-       p->type = rand8();
-       p->pnn = rand32();
-       p->server_id = rand32();
-}
-
-static void verify_ctdb_client_id(struct ctdb_client_id *p1,
-                                 struct ctdb_client_id *p2)
-{
-       assert(p1->type == p2->type);
-       assert(p1->pnn == p2->pnn);
-       assert(p1->server_id == p2->server_id);
-}
-
-static void fill_ctdb_client_id_list(TALLOC_CTX *mem_ctx,
-                                    struct ctdb_client_id_list *p)
-{
-       int i;
-
-       p->num = rand_int(1000) + 1;
-       p->cid = talloc_array(mem_ctx, struct ctdb_client_id, p->num);
-       assert(p->cid != NULL);
-       for (i=0; i<p->num; i++) {
-               fill_ctdb_client_id(mem_ctx, &p->cid[i]);
-       }
-}
-
-static void verify_ctdb_client_id_list(struct ctdb_client_id_list *p1,
-                                      struct ctdb_client_id_list *p2)
-{
-       int i;
-
-       assert(p1->num == p2->num);
-       for (i=0; i<p1->num; i++) {
-               verify_ctdb_client_id(&p1->cid[i], &p2->cid[i]);
-       }
-}
-
-static void fill_ctdb_client_id_map(TALLOC_CTX *mem_ctx,
-                                   struct ctdb_client_id_map *p)
-{
-       int i;
-
-       p->count = rand_int(10) + 1;
-       p->list = talloc_array(mem_ctx, struct ctdb_client_id_list, p->count);
-       assert(p->list != NULL);
-       for (i=0; i<p->count; i++) {
-               fill_ctdb_client_id_list(mem_ctx, &p->list[i]);
-       }
-}
-
-static void verify_ctdb_client_id_map(struct ctdb_client_id_map *p1,
-                                     struct ctdb_client_id_map *p2)
-{
-       int i;
-
-       assert(p1->count == p2->count);
-       for (i=0; i<p1->count; i++) {
-               verify_ctdb_client_id_list(&p1->list[i], &p2->list[i]);
-       }
-}
-
 static void fill_ctdb_addr_info(TALLOC_CTX *mem_ctx, struct ctdb_addr_info *p)
 {
        fill_ctdb_sock_addr(mem_ctx, &p->addr);
@@ -1208,9 +1144,6 @@ DEFINE_TEST(struct ctdb_node_flag_change, ctdb_node_flag_change);
 DEFINE_TEST(struct ctdb_var_list, ctdb_var_list);
 DEFINE_TEST(struct ctdb_tunable_list, ctdb_tunable_list);
 DEFINE_TEST(struct ctdb_tickle_list, ctdb_tickle_list);
-DEFINE_TEST(struct ctdb_client_id, ctdb_client_id);
-DEFINE_TEST(struct ctdb_client_id_list, ctdb_client_id_list);
-DEFINE_TEST(struct ctdb_client_id_map, ctdb_client_id_map);
 DEFINE_TEST(struct ctdb_addr_info, ctdb_addr_info);
 DEFINE_TEST(struct ctdb_transdb, ctdb_transdb);
 DEFINE_TEST(struct ctdb_uptime, ctdb_uptime);
@@ -1318,9 +1251,6 @@ int main(int argc, char *argv[])
        TEST_FUNC(ctdb_var_list)();
        TEST_FUNC(ctdb_tunable_list)();
        TEST_FUNC(ctdb_tickle_list)();
-       TEST_FUNC(ctdb_client_id)();
-       TEST_FUNC(ctdb_client_id_list)();
-       TEST_FUNC(ctdb_client_id_map)();
        TEST_FUNC(ctdb_addr_info)();
        TEST_FUNC(ctdb_transdb)();
        TEST_FUNC(ctdb_uptime)();