static size_t ctdb_req_control_data_len(struct ctdb_req_control_data *cd)
{
size_t len = 0;
- uint64_t u64;
+ uint32_t u32;
if (cd == NULL) {
return 0;
switch (cd->opcode) {
case CTDB_CONTROL_PROCESS_EXISTS:
- len = ctdb_pid_len(cd->data.pid);
+ len = ctdb_pid_len(&cd->data.pid);
break;
case CTDB_CONTROL_STATISTICS:
break;
case CTDB_CONTROL_GETDBPATH:
- len = ctdb_uint32_len(cd->data.db_id);
+ len = ctdb_uint32_len(&cd->data.db_id);
break;
case CTDB_CONTROL_GETVNNMAP:
break;
case CTDB_CONTROL_SET_DEBUG:
- len = ctdb_uint32_len(cd->data.loglevel);
+ len = ctdb_uint32_len(&cd->data.loglevel);
break;
case CTDB_CONTROL_GET_DBMAP:
break;
case CTDB_CONTROL_SET_RECMODE:
- len = ctdb_uint32_len(cd->data.recmode);
+ len = ctdb_uint32_len(&cd->data.recmode);
break;
case CTDB_CONTROL_STATISTICS_RESET:
break;
case CTDB_CONTROL_DB_ATTACH:
- len = ctdb_string_len(cd->data.db_name);
+ len = ctdb_string_len(&cd->data.db_name);
break;
case CTDB_CONTROL_SET_CALL:
break;
case CTDB_CONTROL_GET_DBNAME:
- len = ctdb_uint32_len(cd->data.db_id);
+ len = ctdb_uint32_len(&cd->data.db_id);
break;
case CTDB_CONTROL_ENABLE_SEQNUM:
- len = ctdb_uint32_len(cd->data.db_id);
+ len = ctdb_uint32_len(&cd->data.db_id);
break;
case CTDB_CONTROL_UPDATE_SEQNUM:
- len = ctdb_uint32_len(cd->data.db_id);
+ len = ctdb_uint32_len(&cd->data.db_id);
break;
case CTDB_CONTROL_DUMP_MEMORY:
break;
case CTDB_CONTROL_SET_RECMASTER:
- len = ctdb_uint32_len(cd->data.recmaster);
+ len = ctdb_uint32_len(&cd->data.recmaster);
break;
case CTDB_CONTROL_FREEZE:
break;
- case CTDB_CONTROL_THAW:
- break;
-
case CTDB_CONTROL_GET_PNN:
break;
break;
case CTDB_CONTROL_GET_TUNABLE:
- len = ctdb_stringn_len(cd->data.tun_var);
+ len = ctdb_stringn_len(&cd->data.tun_var);
break;
case CTDB_CONTROL_LIST_TUNABLES:
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);
+ len = ctdb_string_len(&cd->data.db_name);
break;
case CTDB_CONTROL_UPDATE_RECORD:
len = ctdb_addr_info_len(cd->data.addr_info);
break;
- case CTDB_CONTROL_TRANSACTION_START:
- len = ctdb_uint32_len(cd->data.tid);
- break;
-
- case CTDB_CONTROL_TRANSACTION_COMMIT:
- len = ctdb_uint32_len(cd->data.tid);
- break;
-
case CTDB_CONTROL_WIPE_DATABASE:
len = ctdb_transdb_len(cd->data.transdb);
break;
len = ctdb_addr_info_len(cd->data.addr_info);
break;
- case CTDB_CONTROL_RUN_EVENTSCRIPTS:
- len = ctdb_string_len(cd->data.event_str);
- break;
-
case CTDB_CONTROL_GET_CAPABILITIES:
break;
case CTDB_CONTROL_GET_NODEMAP:
break;
- case CTDB_CONTROL_GET_EVENT_SCRIPT_STATUS:
- len = ctdb_uint32_len(cd->data.event);
- break;
-
case CTDB_CONTROL_TRAVERSE_KILL:
len = ctdb_traverse_start_len(cd->data.traverse_start);
break;
case CTDB_CONTROL_RECD_RECLOCK_LATENCY:
- len = ctdb_double_len(cd->data.reclock_latency);
+ len = ctdb_double_len(&cd->data.reclock_latency);
break;
case CTDB_CONTROL_GET_RECLOCK_FILE:
break;
- case CTDB_CONTROL_SET_RECLOCK_FILE:
- len = ctdb_string_len(cd->data.reclock_file);
- break;
-
case CTDB_CONTROL_STOP_NODE:
break;
break;
case CTDB_CONTROL_SET_LMASTERROLE:
- len = ctdb_uint32_len(cd->data.role);
+ len = ctdb_uint32_len(&cd->data.role);
break;
case CTDB_CONTROL_SET_RECMASTERROLE:
- len = ctdb_uint32_len(cd->data.role);
- break;
-
- case CTDB_CONTROL_ENABLE_SCRIPT:
- len = ctdb_string_len(cd->data.script);
- break;
-
- case CTDB_CONTROL_DISABLE_SCRIPT:
- len = ctdb_string_len(cd->data.script);
+ len = ctdb_uint32_len(&cd->data.role);
break;
case CTDB_CONTROL_SET_BAN_STATE:
case CTDB_CONTROL_GET_BAN_STATE:
break;
- case CTDB_CONTROL_SET_DB_PRIORITY:
- len = ctdb_db_priority_len(cd->data.db_prio);
- break;
-
- case CTDB_CONTROL_GET_DB_PRIORITY:
- len = ctdb_uint32_len(cd->data.db_id);
- break;
-
- case CTDB_CONTROL_TRANSACTION_CANCEL:
- break;
-
case CTDB_CONTROL_REGISTER_NOTIFY:
len = ctdb_notify_data_len(cd->data.notify);
break;
case CTDB_CONTROL_DEREGISTER_NOTIFY:
- len = ctdb_uint64_len(cd->data.srvid);
+ len = ctdb_uint64_len(&cd->data.srvid);
break;
case CTDB_CONTROL_TRANS3_COMMIT:
break;
case CTDB_CONTROL_GET_DB_SEQNUM:
- u64 = cd->data.db_id;
- len = ctdb_uint64_len(u64);
+ u32 = 0;
+ len = ctdb_uint32_len(&cd->data.db_id) + ctdb_uint32_len(&u32);
break;
case CTDB_CONTROL_DB_SET_HEALTHY:
- len = ctdb_uint32_len(cd->data.db_id);
+ len = ctdb_uint32_len(&cd->data.db_id);
break;
case CTDB_CONTROL_DB_GET_HEALTH:
- len = ctdb_uint32_len(cd->data.db_id);
+ len = ctdb_uint32_len(&cd->data.db_id);
break;
case CTDB_CONTROL_GET_PUBLIC_IP_INFO:
break;
case CTDB_CONTROL_SET_DB_READONLY:
- len = ctdb_uint32_len(cd->data.db_id);
+ len = ctdb_uint32_len(&cd->data.db_id);
break;
case CTDB_CONTROL_CHECK_SRVIDS:
- len = ctdb_uint64_array_len(cd->data.u64_array);
break;
case CTDB_CONTROL_TRAVERSE_START_EXT:
break;
case CTDB_CONTROL_GET_DB_STATISTICS:
- len = ctdb_uint32_len(cd->data.db_id);
+ len = ctdb_uint32_len(&cd->data.db_id);
break;
case CTDB_CONTROL_SET_DB_STICKY:
- len = ctdb_uint32_len(cd->data.db_id);
+ len = ctdb_uint32_len(&cd->data.db_id);
break;
case CTDB_CONTROL_RELOAD_PUBLIC_IPS:
break;
case CTDB_CONTROL_DB_DETACH:
- len = ctdb_uint32_len(cd->data.db_id);
+ len = ctdb_uint32_len(&cd->data.db_id);
break;
case CTDB_CONTROL_GET_NODES_FILE:
break;
case CTDB_CONTROL_DB_FREEZE:
- len = ctdb_uint32_len(cd->data.db_id);
+ len = ctdb_uint32_len(&cd->data.db_id);
break;
case CTDB_CONTROL_DB_THAW:
- len = ctdb_uint32_len(cd->data.db_id);
+ len = ctdb_uint32_len(&cd->data.db_id);
break;
case CTDB_CONTROL_DB_TRANSACTION_START:
break;
case CTDB_CONTROL_DB_TRANSACTION_CANCEL:
- len = ctdb_uint32_len(cd->data.db_id);
+ len = ctdb_uint32_len(&cd->data.db_id);
break;
case CTDB_CONTROL_DB_PULL:
break;
case CTDB_CONTROL_DB_PUSH_CONFIRM:
- len = ctdb_uint32_len(cd->data.db_id);
+ len = ctdb_uint32_len(&cd->data.db_id);
+ break;
+
+ case CTDB_CONTROL_DB_OPEN_FLAGS:
+ len = ctdb_uint32_len(&cd->data.db_id);
+ break;
+
+ case CTDB_CONTROL_DB_ATTACH_REPLICATED:
+ len = ctdb_string_len(&cd->data.db_name);
break;
}
static void ctdb_req_control_data_push(struct ctdb_req_control_data *cd,
uint8_t *buf)
{
- uint64_t u64;
+ size_t np, offset;
+ uint32_t u32;
switch (cd->opcode) {
case CTDB_CONTROL_PROCESS_EXISTS:
- ctdb_pid_push(cd->data.pid, buf);
+ ctdb_pid_push(&cd->data.pid, buf, &np);
break;
case CTDB_CONTROL_GETDBPATH:
- ctdb_uint32_push(cd->data.db_id, buf);
+ ctdb_uint32_push(&cd->data.db_id, buf, &np);
break;
case CTDB_CONTROL_SETVNNMAP:
- ctdb_vnn_map_push(cd->data.vnnmap, buf);
+ ctdb_vnn_map_push(cd->data.vnnmap, buf, &np);
break;
case CTDB_CONTROL_SET_DEBUG:
- ctdb_uint32_push(cd->data.loglevel, buf);
+ ctdb_uint32_push(&cd->data.loglevel, buf, &np);
break;
case CTDB_CONTROL_PULL_DB:
- ctdb_pulldb_push(cd->data.pulldb, buf);
+ ctdb_pulldb_push(cd->data.pulldb, buf, &np);
break;
case CTDB_CONTROL_PUSH_DB:
- ctdb_rec_buffer_push(cd->data.recbuf, buf);
+ ctdb_rec_buffer_push(cd->data.recbuf, buf, &np);
break;
case CTDB_CONTROL_SET_RECMODE:
- ctdb_uint32_push(cd->data.recmode, buf);
+ ctdb_uint32_push(&cd->data.recmode, buf, &np);
break;
case CTDB_CONTROL_DB_ATTACH:
- ctdb_string_push(cd->data.db_name, buf);
+ ctdb_string_push(&cd->data.db_name, buf, &np);
break;
case CTDB_CONTROL_SET_CALL:
break;
case CTDB_CONTROL_TRAVERSE_START:
- ctdb_traverse_start_push(cd->data.traverse_start, buf);
+ ctdb_traverse_start_push(cd->data.traverse_start, buf, &np);
break;
case CTDB_CONTROL_TRAVERSE_ALL:
- ctdb_traverse_all_push(cd->data.traverse_all, buf);
+ ctdb_traverse_all_push(cd->data.traverse_all, buf, &np);
break;
case CTDB_CONTROL_TRAVERSE_DATA:
- ctdb_rec_data_push(cd->data.rec_data, buf);
+ ctdb_rec_data_push(cd->data.rec_data, buf, &np);
break;
case CTDB_CONTROL_GET_DBNAME:
- ctdb_uint32_push(cd->data.db_id, buf);
+ ctdb_uint32_push(&cd->data.db_id, buf, &np);
break;
case CTDB_CONTROL_ENABLE_SEQNUM:
- ctdb_uint32_push(cd->data.db_id, buf);
+ ctdb_uint32_push(&cd->data.db_id, buf, &np);
break;
case CTDB_CONTROL_UPDATE_SEQNUM:
- ctdb_uint32_push(cd->data.db_id, buf);
+ ctdb_uint32_push(&cd->data.db_id, buf, &np);
break;
case CTDB_CONTROL_SET_RECMASTER:
- ctdb_uint32_push(cd->data.recmaster, buf);
+ ctdb_uint32_push(&cd->data.recmaster, buf, &np);
break;
case CTDB_CONTROL_TCP_CLIENT:
- ctdb_connection_push(cd->data.conn, buf);
+ ctdb_connection_push(cd->data.conn, buf, &np);
break;
case CTDB_CONTROL_TCP_ADD:
- ctdb_connection_push(cd->data.conn, buf);
+ ctdb_connection_push(cd->data.conn, buf, &np);
break;
case CTDB_CONTROL_TCP_REMOVE:
- ctdb_connection_push(cd->data.conn, buf);
+ ctdb_connection_push(cd->data.conn, buf, &np);
break;
case CTDB_CONTROL_SET_TUNABLE:
- ctdb_tunable_push(cd->data.tunable, buf);
+ ctdb_tunable_push(cd->data.tunable, buf, &np);
break;
case CTDB_CONTROL_GET_TUNABLE:
- ctdb_stringn_push(cd->data.tun_var, buf);
+ ctdb_stringn_push(&cd->data.tun_var, buf, &np);
break;
case CTDB_CONTROL_MODIFY_FLAGS:
- ctdb_node_flag_change_push(cd->data.flag_change, buf);
+ ctdb_node_flag_change_push(cd->data.flag_change, buf, &np);
break;
case CTDB_CONTROL_GET_TCP_TICKLE_LIST:
- ctdb_sock_addr_push(cd->data.addr, buf);
+ ctdb_sock_addr_push(cd->data.addr, buf, &np);
break;
case CTDB_CONTROL_SET_TCP_TICKLE_LIST:
- 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);
+ ctdb_tickle_list_push(cd->data.tickles, buf, &np);
break;
case CTDB_CONTROL_DB_ATTACH_PERSISTENT:
- ctdb_string_push(cd->data.db_name, buf);
+ ctdb_string_push(&cd->data.db_name, buf, &np);
break;
case CTDB_CONTROL_UPDATE_RECORD:
- ctdb_rec_buffer_push(cd->data.recbuf, buf);
+ ctdb_rec_buffer_push(cd->data.recbuf, buf, &np);
break;
case CTDB_CONTROL_SEND_GRATUITOUS_ARP:
- ctdb_addr_info_push(cd->data.addr_info, buf);
- break;
-
- case CTDB_CONTROL_TRANSACTION_START:
- ctdb_uint32_push(cd->data.tid, buf);
- break;
-
- case CTDB_CONTROL_TRANSACTION_COMMIT:
- ctdb_uint32_push(cd->data.tid, buf);
+ ctdb_addr_info_push(cd->data.addr_info, buf, &np);
break;
case CTDB_CONTROL_WIPE_DATABASE:
- ctdb_transdb_push(cd->data.transdb, buf);
+ ctdb_transdb_push(cd->data.transdb, buf, &np);
break;
case CTDB_CONTROL_TRY_DELETE_RECORDS:
- ctdb_rec_buffer_push(cd->data.recbuf, buf);
+ ctdb_rec_buffer_push(cd->data.recbuf, buf, &np);
break;
case CTDB_CONTROL_ADD_PUBLIC_IP:
- ctdb_addr_info_push(cd->data.addr_info, buf);
+ ctdb_addr_info_push(cd->data.addr_info, buf, &np);
break;
case CTDB_CONTROL_DEL_PUBLIC_IP:
- ctdb_addr_info_push(cd->data.addr_info, buf);
- break;
-
- case CTDB_CONTROL_RUN_EVENTSCRIPTS:
- ctdb_string_push(cd->data.event_str, buf);
+ ctdb_addr_info_push(cd->data.addr_info, buf, &np);
break;
case CTDB_CONTROL_RELEASE_IP:
ctdb_public_ip_push(cd->data.pubip, buf);
break;
- case CTDB_CONTROL_GET_EVENT_SCRIPT_STATUS:
- ctdb_uint32_push(cd->data.event, buf);
- break;
-
case CTDB_CONTROL_TRAVERSE_KILL:
- ctdb_traverse_start_push(cd->data.traverse_start, buf);
+ ctdb_traverse_start_push(cd->data.traverse_start, buf, &np);
break;
case CTDB_CONTROL_RECD_RECLOCK_LATENCY:
- ctdb_double_push(cd->data.reclock_latency, buf);
- break;
-
- case CTDB_CONTROL_SET_RECLOCK_FILE:
- ctdb_string_push(cd->data.reclock_file, buf);
+ ctdb_double_push(&cd->data.reclock_latency, buf, &np);
break;
case CTDB_CONTROL_SET_LMASTERROLE:
- ctdb_uint32_push(cd->data.role, buf);
+ ctdb_uint32_push(&cd->data.role, buf, &np);
break;
case CTDB_CONTROL_SET_RECMASTERROLE:
- ctdb_uint32_push(cd->data.role, buf);
- break;
-
- case CTDB_CONTROL_ENABLE_SCRIPT:
- ctdb_string_push(cd->data.script, buf);
- break;
-
- case CTDB_CONTROL_DISABLE_SCRIPT:
- ctdb_string_push(cd->data.script, buf);
+ ctdb_uint32_push(&cd->data.role, buf, &np);
break;
case CTDB_CONTROL_SET_BAN_STATE:
ctdb_ban_state_push(cd->data.ban_state, buf);
break;
- case CTDB_CONTROL_SET_DB_PRIORITY:
- ctdb_db_priority_push(cd->data.db_prio, buf);
- break;
-
- case CTDB_CONTROL_GET_DB_PRIORITY:
- ctdb_uint32_push(cd->data.db_id, buf);
- break;
-
case CTDB_CONTROL_REGISTER_NOTIFY:
ctdb_notify_data_push(cd->data.notify, buf);
break;
case CTDB_CONTROL_DEREGISTER_NOTIFY:
- ctdb_uint64_push(cd->data.srvid, buf);
+ ctdb_uint64_push(&cd->data.srvid, buf, &np);
break;
case CTDB_CONTROL_TRANS3_COMMIT:
- ctdb_rec_buffer_push(cd->data.recbuf, buf);
+ ctdb_rec_buffer_push(cd->data.recbuf, buf, &np);
break;
case CTDB_CONTROL_GET_DB_SEQNUM:
- u64 = cd->data.db_id;
- ctdb_uint64_push(u64, buf);
+ u32 = 0;
+ offset = 0;
+ ctdb_uint32_push(&cd->data.db_id, buf, &np);
+ offset += np;
+ ctdb_uint32_push(&u32, buf+offset, &np);
+ offset += np;
+ np = offset;
break;
case CTDB_CONTROL_DB_SET_HEALTHY:
- ctdb_uint32_push(cd->data.db_id, buf);
+ ctdb_uint32_push(&cd->data.db_id, buf, &np);
break;
case CTDB_CONTROL_DB_GET_HEALTH:
- ctdb_uint32_push(cd->data.db_id, buf);
+ ctdb_uint32_push(&cd->data.db_id, buf, &np);
break;
case CTDB_CONTROL_GET_PUBLIC_IP_INFO:
- ctdb_sock_addr_push(cd->data.addr, buf);
+ ctdb_sock_addr_push(cd->data.addr, buf, &np);
break;
case CTDB_CONTROL_SET_IFACE_LINK_STATE:
break;
case CTDB_CONTROL_TCP_ADD_DELAYED_UPDATE:
- ctdb_connection_push(cd->data.conn, buf);
+ ctdb_connection_push(cd->data.conn, buf, &np);
break;
case CTDB_CONTROL_SCHEDULE_FOR_DELETION:
break;
case CTDB_CONTROL_SET_DB_READONLY:
- ctdb_uint32_push(cd->data.db_id, buf);
+ ctdb_uint32_push(&cd->data.db_id, buf, &np);
break;
case CTDB_CONTROL_CHECK_SRVIDS:
- ctdb_uint64_array_push(cd->data.u64_array, buf);
break;
case CTDB_CONTROL_TRAVERSE_START_EXT:
- ctdb_traverse_start_ext_push(cd->data.traverse_start_ext, buf);
+ ctdb_traverse_start_ext_push(cd->data.traverse_start_ext, buf,
+ &np);
break;
case CTDB_CONTROL_GET_DB_STATISTICS:
- ctdb_uint32_push(cd->data.db_id, buf);
+ ctdb_uint32_push(&cd->data.db_id, buf, &np);
break;
case CTDB_CONTROL_SET_DB_STICKY:
- ctdb_uint32_push(cd->data.db_id, buf);
+ ctdb_uint32_push(&cd->data.db_id, buf, &np);
break;
case CTDB_CONTROL_TRAVERSE_ALL_EXT:
- ctdb_traverse_all_ext_push(cd->data.traverse_all_ext, buf);
+ ctdb_traverse_all_ext_push(cd->data.traverse_all_ext, buf,
+ &np);
break;
case CTDB_CONTROL_RECEIVE_RECORDS:
- ctdb_rec_buffer_push(cd->data.recbuf, buf);
+ ctdb_rec_buffer_push(cd->data.recbuf, buf, &np);
break;
case CTDB_CONTROL_DB_DETACH:
- ctdb_uint32_push(cd->data.db_id, buf);
+ ctdb_uint32_push(&cd->data.db_id, buf, &np);
break;
case CTDB_CONTROL_DB_FREEZE:
- ctdb_uint32_push(cd->data.db_id, buf);
+ ctdb_uint32_push(&cd->data.db_id, buf, &np);
break;
case CTDB_CONTROL_DB_THAW:
- ctdb_uint32_push(cd->data.db_id, buf);
+ ctdb_uint32_push(&cd->data.db_id, buf, &np);
break;
case CTDB_CONTROL_DB_TRANSACTION_START:
- ctdb_transdb_push(cd->data.transdb, buf);
+ ctdb_transdb_push(cd->data.transdb, buf, &np);
break;
case CTDB_CONTROL_DB_TRANSACTION_COMMIT:
- ctdb_transdb_push(cd->data.transdb, buf);
+ ctdb_transdb_push(cd->data.transdb, buf, &np);
break;
case CTDB_CONTROL_DB_TRANSACTION_CANCEL:
- ctdb_uint32_push(cd->data.db_id, buf);
+ ctdb_uint32_push(&cd->data.db_id, buf, &np);
break;
case CTDB_CONTROL_DB_PULL:
- ctdb_pulldb_ext_push(cd->data.pulldb_ext, buf);
+ ctdb_pulldb_ext_push(cd->data.pulldb_ext, buf, &np);
break;
case CTDB_CONTROL_DB_PUSH_START:
- ctdb_pulldb_ext_push(cd->data.pulldb_ext, buf);
+ ctdb_pulldb_ext_push(cd->data.pulldb_ext, buf, &np);
break;
case CTDB_CONTROL_DB_PUSH_CONFIRM:
- ctdb_uint32_push(cd->data.db_id, buf);
+ ctdb_uint32_push(&cd->data.db_id, buf, &np);
+ break;
+
+ case CTDB_CONTROL_DB_OPEN_FLAGS:
+ ctdb_uint32_push(&cd->data.db_id, buf, &np);
+ break;
+
+ case CTDB_CONTROL_DB_ATTACH_REPLICATED:
+ ctdb_string_push(&cd->data.db_name, buf, &np);
break;
}
}
TALLOC_CTX *mem_ctx,
struct ctdb_req_control_data *cd)
{
+ size_t np, offset;
+ uint32_t u32;
int ret = 0;
- uint64_t u64 = 0;
cd->opcode = opcode;
switch (opcode) {
case CTDB_CONTROL_PROCESS_EXISTS:
- ret = ctdb_pid_pull(buf, buflen, mem_ctx,
- &cd->data.pid);
+ ret = ctdb_pid_pull(buf, buflen, &cd->data.pid, &np);
break;
case CTDB_CONTROL_GETDBPATH:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.db_id);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.db_id, &np);
break;
case CTDB_CONTROL_SETVNNMAP:
ret = ctdb_vnn_map_pull(buf, buflen, mem_ctx,
- &cd->data.vnnmap);
+ &cd->data.vnnmap, &np);
break;
case CTDB_CONTROL_SET_DEBUG:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.loglevel);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.loglevel, &np);
break;
case CTDB_CONTROL_PULL_DB:
ret = ctdb_pulldb_pull(buf, buflen, mem_ctx,
- &cd->data.pulldb);
+ &cd->data.pulldb, &np);
break;
case CTDB_CONTROL_PUSH_DB:
ret = ctdb_rec_buffer_pull(buf, buflen, mem_ctx,
- &cd->data.recbuf);
+ &cd->data.recbuf, &np);
break;
case CTDB_CONTROL_SET_RECMODE:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.recmode);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.recmode, &np);
break;
case CTDB_CONTROL_DB_ATTACH:
ret = ctdb_string_pull(buf, buflen, mem_ctx,
- &cd->data.db_name);
+ &cd->data.db_name, &np);
break;
case CTDB_CONTROL_SET_CALL:
case CTDB_CONTROL_TRAVERSE_START:
ret = ctdb_traverse_start_pull(buf, buflen, mem_ctx,
- &cd->data.traverse_start);
+ &cd->data.traverse_start, &np);
break;
case CTDB_CONTROL_TRAVERSE_ALL:
ret = ctdb_traverse_all_pull(buf, buflen, mem_ctx,
- &cd->data.traverse_all);
+ &cd->data.traverse_all, &np);
break;
case CTDB_CONTROL_TRAVERSE_DATA:
ret = ctdb_rec_data_pull(buf, buflen, mem_ctx,
- &cd->data.rec_data);
+ &cd->data.rec_data, &np);
break;
case CTDB_CONTROL_GET_DBNAME:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.db_id);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.db_id, &np);
break;
case CTDB_CONTROL_ENABLE_SEQNUM:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.db_id);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.db_id, &np);
break;
case CTDB_CONTROL_UPDATE_SEQNUM:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.db_id);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.db_id, &np);
break;
case CTDB_CONTROL_SET_RECMASTER:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.recmaster);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.recmaster, &np);
break;
case CTDB_CONTROL_TCP_CLIENT:
ret = ctdb_connection_pull(buf, buflen, mem_ctx,
- &cd->data.conn);
+ &cd->data.conn, &np);
break;
case CTDB_CONTROL_TCP_ADD:
ret = ctdb_connection_pull(buf, buflen, mem_ctx,
- &cd->data.conn);
+ &cd->data.conn, &np);
break;
case CTDB_CONTROL_TCP_REMOVE:
ret = ctdb_connection_pull(buf, buflen, mem_ctx,
- &cd->data.conn);
+ &cd->data.conn, &np);
break;
case CTDB_CONTROL_SET_TUNABLE:
ret = ctdb_tunable_pull(buf, buflen, mem_ctx,
- &cd->data.tunable);
+ &cd->data.tunable, &np);
break;
case CTDB_CONTROL_GET_TUNABLE:
ret = ctdb_stringn_pull(buf, buflen, mem_ctx,
- &cd->data.tun_var);
+ &cd->data.tun_var, &np);
break;
case CTDB_CONTROL_MODIFY_FLAGS:
ret = ctdb_node_flag_change_pull(buf, buflen, mem_ctx,
- &cd->data.flag_change);
+ &cd->data.flag_change, &np);
break;
case CTDB_CONTROL_GET_TCP_TICKLE_LIST:
ret = ctdb_sock_addr_pull(buf, buflen, mem_ctx,
- &cd->data.addr);
+ &cd->data.addr, &np);
break;
case CTDB_CONTROL_SET_TCP_TICKLE_LIST:
ret = ctdb_tickle_list_pull(buf, buflen, mem_ctx,
- &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);
+ &cd->data.tickles, &np);
break;
case CTDB_CONTROL_DB_ATTACH_PERSISTENT:
ret = ctdb_string_pull(buf, buflen, mem_ctx,
- &cd->data.db_name);
+ &cd->data.db_name, &np);
break;
case CTDB_CONTROL_UPDATE_RECORD:
ret = ctdb_rec_buffer_pull(buf, buflen, mem_ctx,
- &cd->data.recbuf);
+ &cd->data.recbuf, &np);
break;
case CTDB_CONTROL_SEND_GRATUITOUS_ARP:
ret = ctdb_addr_info_pull(buf, buflen, mem_ctx,
- &cd->data.addr_info);
- break;
-
- case CTDB_CONTROL_TRANSACTION_START:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.tid);
- break;
-
- case CTDB_CONTROL_TRANSACTION_COMMIT:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.tid);
+ &cd->data.addr_info, &np);
break;
case CTDB_CONTROL_WIPE_DATABASE:
ret = ctdb_transdb_pull(buf, buflen, mem_ctx,
- &cd->data.transdb);
+ &cd->data.transdb, &np);
break;
case CTDB_CONTROL_TRY_DELETE_RECORDS:
ret = ctdb_rec_buffer_pull(buf, buflen, mem_ctx,
- &cd->data.recbuf);
+ &cd->data.recbuf, &np);
break;
case CTDB_CONTROL_ADD_PUBLIC_IP:
ret = ctdb_addr_info_pull(buf, buflen, mem_ctx,
- &cd->data.addr_info);
+ &cd->data.addr_info, &np);
break;
case CTDB_CONTROL_DEL_PUBLIC_IP:
ret = ctdb_addr_info_pull(buf, buflen, mem_ctx,
- &cd->data.addr_info);
- break;
-
- case CTDB_CONTROL_RUN_EVENTSCRIPTS:
- ret = ctdb_string_pull(buf, buflen, mem_ctx,
- &cd->data.event_str);
+ &cd->data.addr_info, &np);
break;
case CTDB_CONTROL_RELEASE_IP:
&cd->data.pubip);
break;
- case CTDB_CONTROL_GET_EVENT_SCRIPT_STATUS:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.event);
- break;
-
case CTDB_CONTROL_TRAVERSE_KILL:
ret = ctdb_traverse_start_pull(buf, buflen, mem_ctx,
- &cd->data.traverse_start);
+ &cd->data.traverse_start, &np);
break;
case CTDB_CONTROL_RECD_RECLOCK_LATENCY:
- ret = ctdb_double_pull(buf, buflen, mem_ctx,
- &cd->data.reclock_latency);
- break;
-
- case CTDB_CONTROL_SET_RECLOCK_FILE:
- ret = ctdb_string_pull(buf, buflen, mem_ctx,
- &cd->data.reclock_file);
+ ret = ctdb_double_pull(buf, buflen, &cd->data.reclock_latency,
+ &np);
break;
case CTDB_CONTROL_SET_LMASTERROLE:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.role);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.role, &np);
break;
case CTDB_CONTROL_SET_RECMASTERROLE:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.role);
- break;
-
- case CTDB_CONTROL_ENABLE_SCRIPT:
- ret = ctdb_string_pull(buf, buflen, mem_ctx,
- &cd->data.script);
- break;
-
- case CTDB_CONTROL_DISABLE_SCRIPT:
- ret = ctdb_string_pull(buf, buflen, mem_ctx,
- &cd->data.script);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.role, &np);
break;
case CTDB_CONTROL_SET_BAN_STATE:
&cd->data.ban_state);
break;
- case CTDB_CONTROL_SET_DB_PRIORITY:
- ret = ctdb_db_priority_pull(buf, buflen, mem_ctx,
- &cd->data.db_prio);
- break;
-
- case CTDB_CONTROL_GET_DB_PRIORITY:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.db_id);
- break;
-
case CTDB_CONTROL_REGISTER_NOTIFY:
ret = ctdb_notify_data_pull(buf, buflen, mem_ctx,
&cd->data.notify);
break;
case CTDB_CONTROL_DEREGISTER_NOTIFY:
- ctdb_uint64_pull(buf, buflen, mem_ctx,
- &cd->data.srvid);
+ ctdb_uint64_pull(buf, buflen, &cd->data.srvid, &np);
break;
case CTDB_CONTROL_TRANS3_COMMIT:
ret = ctdb_rec_buffer_pull(buf, buflen, mem_ctx,
- &cd->data.recbuf);
+ &cd->data.recbuf, &np);
break;
case CTDB_CONTROL_GET_DB_SEQNUM:
- ret = ctdb_uint64_pull(buf, buflen, mem_ctx, &u64);
- cd->data.db_id = (uint32_t)u64;
+ offset = 0;
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.db_id, &np);
+ if (ret != 0) {
+ break;
+ }
+ offset += np;
+ ret = ctdb_uint32_pull(buf+offset, buflen-offset, &u32, &np);
+ offset += np;
+ np = offset;
break;
case CTDB_CONTROL_DB_SET_HEALTHY:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.db_id);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.db_id, &np);
break;
case CTDB_CONTROL_DB_GET_HEALTH:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.db_id);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.db_id, &np);
break;
case CTDB_CONTROL_GET_PUBLIC_IP_INFO:
ret = ctdb_sock_addr_pull(buf, buflen, mem_ctx,
- &cd->data.addr);
+ &cd->data.addr, &np);
break;
case CTDB_CONTROL_SET_IFACE_LINK_STATE:
case CTDB_CONTROL_TCP_ADD_DELAYED_UPDATE:
ret = ctdb_connection_pull(buf, buflen, mem_ctx,
- &cd->data.conn);
+ &cd->data.conn, &np);
break;
case CTDB_CONTROL_SCHEDULE_FOR_DELETION:
break;
case CTDB_CONTROL_SET_DB_READONLY:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.db_id);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.db_id, &np);
break;
case CTDB_CONTROL_CHECK_SRVIDS:
- ret = ctdb_uint64_array_pull(buf, buflen, mem_ctx,
- &cd->data.u64_array);
break;
case CTDB_CONTROL_TRAVERSE_START_EXT:
ret = ctdb_traverse_start_ext_pull(buf, buflen, mem_ctx,
- &cd->data.traverse_start_ext);
+ &cd->data.traverse_start_ext,
+ &np);
break;
case CTDB_CONTROL_GET_DB_STATISTICS:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.db_id);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.db_id, &np);
break;
case CTDB_CONTROL_SET_DB_STICKY:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.db_id);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.db_id, &np);
break;
case CTDB_CONTROL_TRAVERSE_ALL_EXT:
ret = ctdb_traverse_all_ext_pull(buf, buflen, mem_ctx,
- &cd->data.traverse_all_ext);
+ &cd->data.traverse_all_ext,
+ &np);
break;
case CTDB_CONTROL_RECEIVE_RECORDS:
ret = ctdb_rec_buffer_pull(buf, buflen, mem_ctx,
- &cd->data.recbuf);
+ &cd->data.recbuf, &np);
break;
case CTDB_CONTROL_DB_DETACH:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.db_id);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.db_id, &np);
break;
case CTDB_CONTROL_DB_FREEZE:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.db_id);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.db_id, &np);
break;
case CTDB_CONTROL_DB_THAW:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.db_id);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.db_id, &np);
break;
case CTDB_CONTROL_DB_TRANSACTION_START:
ret = ctdb_transdb_pull(buf, buflen, mem_ctx,
- &cd->data.transdb);
+ &cd->data.transdb, &np);
break;
case CTDB_CONTROL_DB_TRANSACTION_COMMIT:
ret = ctdb_transdb_pull(buf, buflen, mem_ctx,
- &cd->data.transdb);
+ &cd->data.transdb, &np);
break;
case CTDB_CONTROL_DB_TRANSACTION_CANCEL:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.db_id);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.db_id, &np);
break;
case CTDB_CONTROL_DB_PULL:
ret = ctdb_pulldb_ext_pull(buf, buflen, mem_ctx,
- &cd->data.pulldb_ext);
+ &cd->data.pulldb_ext, &np);
break;
case CTDB_CONTROL_DB_PUSH_START:
ret = ctdb_pulldb_ext_pull(buf, buflen, mem_ctx,
- &cd->data.pulldb_ext);
+ &cd->data.pulldb_ext, &np);
break;
case CTDB_CONTROL_DB_PUSH_CONFIRM:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.db_id);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.db_id, &np);
+ break;
+
+ case CTDB_CONTROL_DB_OPEN_FLAGS:
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.db_id, &np);
+ break;
+
+ case CTDB_CONTROL_DB_ATTACH_REPLICATED:
+ ret = ctdb_string_pull(buf, buflen, mem_ctx,
+ &cd->data.db_name, &np);
break;
}
break;
case CTDB_CONTROL_GETDBPATH:
- len = ctdb_string_len(cd->data.db_path);
+ len = ctdb_string_len(&cd->data.db_path);
break;
case CTDB_CONTROL_GETVNNMAP:
break;
case CTDB_CONTROL_GET_DEBUG:
- len = ctdb_uint32_len(cd->data.loglevel);
+ len = ctdb_uint32_len(&cd->data.loglevel);
break;
case CTDB_CONTROL_SET_DEBUG:
break;
case CTDB_CONTROL_DB_ATTACH:
- len = ctdb_uint32_len(cd->data.db_id);
+ len = ctdb_uint32_len(&cd->data.db_id);
break;
case CTDB_CONTROL_SET_CALL:
break;
case CTDB_CONTROL_GET_DBNAME:
- len = ctdb_string_len(cd->data.db_name);
+ len = ctdb_string_len(&cd->data.db_name);
break;
case CTDB_CONTROL_ENABLE_SEQNUM:
break;
case CTDB_CONTROL_DUMP_MEMORY:
- len = ctdb_string_len(cd->data.mem_str);
+ len = ctdb_string_len(&cd->data.mem_str);
break;
case CTDB_CONTROL_GET_PID:
case CTDB_CONTROL_FREEZE:
break;
- case CTDB_CONTROL_THAW:
- break;
-
case CTDB_CONTROL_GET_PNN:
break;
break;
case CTDB_CONTROL_GET_TUNABLE:
- len = ctdb_uint32_len(cd->data.tun_value);
+ len = ctdb_uint32_len(&cd->data.tun_value);
break;
case CTDB_CONTROL_LIST_TUNABLES:
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);
+ len = ctdb_uint32_len(&cd->data.db_id);
break;
case CTDB_CONTROL_UPDATE_RECORD:
case CTDB_CONTROL_SEND_GRATUITOUS_ARP:
break;
- case CTDB_CONTROL_TRANSACTION_START:
- break;
-
- case CTDB_CONTROL_TRANSACTION_COMMIT:
- break;
-
case CTDB_CONTROL_WIPE_DATABASE:
break;
case CTDB_CONTROL_DEL_PUBLIC_IP:
break;
- case CTDB_CONTROL_RUN_EVENTSCRIPTS:
- break;
-
case CTDB_CONTROL_GET_CAPABILITIES:
- len = ctdb_uint32_len(cd->data.caps);
+ len = ctdb_uint32_len(&cd->data.caps);
break;
case CTDB_CONTROL_RECD_PING:
len = ctdb_node_map_len(cd->data.nodemap);
break;
- case CTDB_CONTROL_GET_EVENT_SCRIPT_STATUS:
- len = ctdb_script_list_len(cd->data.script_list);
- break;
-
case CTDB_CONTROL_TRAVERSE_KILL:
break;
break;
case CTDB_CONTROL_GET_RECLOCK_FILE:
- len = ctdb_string_len(cd->data.reclock_file);
- break;
-
- case CTDB_CONTROL_SET_RECLOCK_FILE:
+ len = ctdb_string_len(&cd->data.reclock_file);
break;
case CTDB_CONTROL_STOP_NODE:
case CTDB_CONTROL_SET_RECMASTERROLE:
break;
- case CTDB_CONTROL_ENABLE_SCRIPT:
- break;
-
- case CTDB_CONTROL_DISABLE_SCRIPT:
- break;
-
case CTDB_CONTROL_SET_BAN_STATE:
break;
case CTDB_CONTROL_GET_DB_PRIORITY:
break;
- case CTDB_CONTROL_TRANSACTION_CANCEL:
- break;
-
case CTDB_CONTROL_REGISTER_NOTIFY:
break;
break;
case CTDB_CONTROL_GET_DB_SEQNUM:
- len = ctdb_uint64_len(cd->data.seqnum);
+ len = ctdb_uint64_len(&cd->data.seqnum);
break;
case CTDB_CONTROL_DB_SET_HEALTHY:
break;
case CTDB_CONTROL_DB_GET_HEALTH:
- len = ctdb_string_len(cd->data.reason);
+ len = ctdb_string_len(&cd->data.reason);
break;
case CTDB_CONTROL_GET_PUBLIC_IP_INFO:
break;
case CTDB_CONTROL_CHECK_SRVIDS:
- len = ctdb_uint8_array_len(cd->data.u8_array);
break;
case CTDB_CONTROL_TRAVERSE_START_EXT:
break;
case CTDB_CONTROL_GET_RUNSTATE:
- len = ctdb_uint32_len(cd->data.runstate);
+ len = ctdb_uint32_len(&cd->data.runstate);
break;
case CTDB_CONTROL_DB_DETACH:
break;
case CTDB_CONTROL_DB_PULL:
- len = ctdb_uint32_len(cd->data.num_records);
+ len = ctdb_uint32_len(&cd->data.num_records);
break;
case CTDB_CONTROL_DB_PUSH_START:
break;
case CTDB_CONTROL_DB_PUSH_CONFIRM:
- len = ctdb_uint32_len(cd->data.num_records);
+ len = ctdb_uint32_len(&cd->data.num_records);
+ break;
+
+ case CTDB_CONTROL_DB_OPEN_FLAGS:
+ len = ctdb_int32_len(&cd->data.tdb_flags);
+ break;
+
+ case CTDB_CONTROL_DB_ATTACH_REPLICATED:
+ len = ctdb_uint32_len(&cd->data.db_id);
break;
}
static void ctdb_reply_control_data_push(struct ctdb_reply_control_data *cd,
uint8_t *buf)
{
+ size_t np;
+
switch (cd->opcode) {
case CTDB_CONTROL_STATISTICS:
- ctdb_statistics_push(cd->data.stats, buf);
+ ctdb_statistics_push(cd->data.stats, buf, &np);
break;
case CTDB_CONTROL_GETDBPATH:
- ctdb_string_push(cd->data.db_path, buf);
+ ctdb_string_push(&cd->data.db_path, buf, &np);
break;
case CTDB_CONTROL_GETVNNMAP:
- ctdb_vnn_map_push(cd->data.vnnmap, buf);
+ ctdb_vnn_map_push(cd->data.vnnmap, buf, &np);
break;
case CTDB_CONTROL_GET_DEBUG:
- ctdb_uint32_push(cd->data.loglevel, buf);
+ ctdb_uint32_push(&cd->data.loglevel, buf, &np);
break;
case CTDB_CONTROL_GET_DBMAP:
- ctdb_dbid_map_push(cd->data.dbmap, buf);
+ ctdb_dbid_map_push(cd->data.dbmap, buf, &np);
break;
case CTDB_CONTROL_PULL_DB:
- ctdb_rec_buffer_push(cd->data.recbuf, buf);
+ ctdb_rec_buffer_push(cd->data.recbuf, buf, &np);
break;
case CTDB_CONTROL_PUSH_DB:
break;
case CTDB_CONTROL_DB_ATTACH:
- ctdb_uint32_push(cd->data.db_id, buf);
+ ctdb_uint32_push(&cd->data.db_id, buf, &np);
break;
case CTDB_CONTROL_GET_DBNAME:
- ctdb_string_push(cd->data.db_name, buf);
+ ctdb_string_push(&cd->data.db_name, buf, &np);
break;
case CTDB_CONTROL_DUMP_MEMORY:
- ctdb_string_push(cd->data.mem_str, buf);
+ ctdb_string_push(&cd->data.mem_str, buf, &np);
break;
case CTDB_CONTROL_GET_PID:
break;
case CTDB_CONTROL_GET_TUNABLE:
- ctdb_uint32_push(cd->data.tun_value, buf);
+ ctdb_uint32_push(&cd->data.tun_value, buf, &np);
break;
case CTDB_CONTROL_LIST_TUNABLES:
- ctdb_var_list_push(cd->data.tun_var_list, buf);
+ ctdb_var_list_push(cd->data.tun_var_list, buf, &np);
break;
case CTDB_CONTROL_GET_ALL_TUNABLES:
- ctdb_tunable_list_push(cd->data.tun_list, buf);
+ ctdb_tunable_list_push(cd->data.tun_list, buf, &np);
break;
case CTDB_CONTROL_GET_TCP_TICKLE_LIST:
- 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);
+ ctdb_tickle_list_push(cd->data.tickles, buf, &np);
break;
case CTDB_CONTROL_DB_ATTACH_PERSISTENT:
- ctdb_uint32_push(cd->data.db_id, buf);
+ ctdb_uint32_push(&cd->data.db_id, buf, &np);
break;
case CTDB_CONTROL_UPTIME:
- ctdb_uptime_push(cd->data.uptime, buf);
+ ctdb_uptime_push(cd->data.uptime, buf, &np);
break;
case CTDB_CONTROL_TRY_DELETE_RECORDS:
- ctdb_rec_buffer_push(cd->data.recbuf, buf);
+ ctdb_rec_buffer_push(cd->data.recbuf, buf, &np);
break;
case CTDB_CONTROL_GET_CAPABILITIES:
- ctdb_uint32_push(cd->data.caps, buf);
+ ctdb_uint32_push(&cd->data.caps, buf, &np);
break;
case CTDB_CONTROL_GET_PUBLIC_IPS:
ctdb_node_map_push(cd->data.nodemap, buf);
break;
- case CTDB_CONTROL_GET_EVENT_SCRIPT_STATUS:
- ctdb_script_list_push(cd->data.script_list, buf);
- break;
-
case CTDB_CONTROL_GET_RECLOCK_FILE:
- ctdb_string_push(cd->data.reclock_file, buf);
+ ctdb_string_push(&cd->data.reclock_file, buf, &np);
break;
case CTDB_CONTROL_GET_BAN_STATE:
break;
case CTDB_CONTROL_GET_DB_SEQNUM:
- ctdb_uint64_push(cd->data.seqnum, buf);
+ ctdb_uint64_push(&cd->data.seqnum, buf, &np);
break;
case CTDB_CONTROL_DB_GET_HEALTH:
- ctdb_string_push(cd->data.reason, buf);
+ ctdb_string_push(&cd->data.reason, buf, &np);
break;
case CTDB_CONTROL_GET_PUBLIC_IP_INFO:
break;
case CTDB_CONTROL_CHECK_SRVIDS:
- ctdb_uint8_array_push(cd->data.u8_array, buf);
break;
case CTDB_CONTROL_GET_DB_STATISTICS:
break;
case CTDB_CONTROL_RECEIVE_RECORDS:
- ctdb_rec_buffer_push(cd->data.recbuf, buf);
+ ctdb_rec_buffer_push(cd->data.recbuf, buf, &np);
break;
case CTDB_CONTROL_GET_RUNSTATE:
- ctdb_uint32_push(cd->data.runstate, buf);
+ ctdb_uint32_push(&cd->data.runstate, buf, &np);
break;
case CTDB_CONTROL_GET_NODES_FILE:
break;
case CTDB_CONTROL_DB_PULL:
- ctdb_uint32_push(cd->data.num_records, buf);
+ ctdb_uint32_push(&cd->data.num_records, buf, &np);
break;
case CTDB_CONTROL_DB_PUSH_CONFIRM:
- ctdb_uint32_push(cd->data.num_records, buf);
+ ctdb_uint32_push(&cd->data.num_records, buf, &np);
+ break;
+
+ case CTDB_CONTROL_DB_OPEN_FLAGS:
+ ctdb_int32_push(&cd->data.tdb_flags, buf, &np);
+ break;
+
+ case CTDB_CONTROL_DB_ATTACH_REPLICATED:
+ ctdb_uint32_push(&cd->data.db_id, buf, &np);
break;
}
}
uint32_t opcode, TALLOC_CTX *mem_ctx,
struct ctdb_reply_control_data *cd)
{
+ size_t np;
int ret = 0;
+
cd->opcode = opcode;
switch (opcode) {
case CTDB_CONTROL_STATISTICS:
ret = ctdb_statistics_pull(buf, buflen, mem_ctx,
- &cd->data.stats);
+ &cd->data.stats, &np);
break;
case CTDB_CONTROL_GETDBPATH:
ret = ctdb_string_pull(buf, buflen, mem_ctx,
- &cd->data.db_path);
+ &cd->data.db_path, &np);
break;
case CTDB_CONTROL_GETVNNMAP:
ret = ctdb_vnn_map_pull(buf, buflen, mem_ctx,
- &cd->data.vnnmap);
+ &cd->data.vnnmap, &np);
break;
case CTDB_CONTROL_GET_DEBUG:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.loglevel);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.loglevel, &np);
break;
case CTDB_CONTROL_GET_DBMAP:
ret = ctdb_dbid_map_pull(buf, buflen, mem_ctx,
- &cd->data.dbmap);
+ &cd->data.dbmap, &np);
break;
case CTDB_CONTROL_PULL_DB:
ret = ctdb_rec_buffer_pull(buf, buflen, mem_ctx,
- &cd->data.recbuf);
+ &cd->data.recbuf, &np);
break;
case CTDB_CONTROL_PUSH_DB:
break;
case CTDB_CONTROL_DB_ATTACH:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.db_id);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.db_id, &np);
break;
case CTDB_CONTROL_GET_DBNAME:
ret = ctdb_string_pull(buf, buflen, mem_ctx,
- &cd->data.db_name);
+ &cd->data.db_name, &np);
break;
case CTDB_CONTROL_DUMP_MEMORY:
ret = ctdb_string_pull(buf, buflen, mem_ctx,
- &cd->data.mem_str);
+ &cd->data.mem_str, &np);
break;
case CTDB_CONTROL_GET_PID:
break;
case CTDB_CONTROL_GET_TUNABLE:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.tun_value);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.tun_value,
+ &np);
break;
case CTDB_CONTROL_LIST_TUNABLES:
ret = ctdb_var_list_pull(buf, buflen, mem_ctx,
- &cd->data.tun_var_list);
+ &cd->data.tun_var_list, &np);
break;
case CTDB_CONTROL_GET_ALL_TUNABLES:
ret = ctdb_tunable_list_pull(buf, buflen, mem_ctx,
- &cd->data.tun_list);
+ &cd->data.tun_list, &np);
break;
case CTDB_CONTROL_GET_TCP_TICKLE_LIST:
ret = ctdb_tickle_list_pull(buf, buflen, mem_ctx,
- &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);
+ &cd->data.tickles, &np);
break;
case CTDB_CONTROL_DB_ATTACH_PERSISTENT:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.db_id);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.db_id, &np);
break;
case CTDB_CONTROL_UPTIME:
ret = ctdb_uptime_pull(buf, buflen, mem_ctx,
- &cd->data.uptime);
+ &cd->data.uptime, &np);
break;
case CTDB_CONTROL_TRY_DELETE_RECORDS:
ctdb_rec_buffer_pull(buf, buflen, mem_ctx,
- &cd->data.recbuf);
+ &cd->data.recbuf, &np);
break;
case CTDB_CONTROL_GET_CAPABILITIES:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.caps);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.caps, &np);
break;
case CTDB_CONTROL_GET_PUBLIC_IPS:
&cd->data.nodemap);
break;
- case CTDB_CONTROL_GET_EVENT_SCRIPT_STATUS:
- ret = ctdb_script_list_pull(buf, buflen, mem_ctx,
- &cd->data.script_list);
- break;
-
case CTDB_CONTROL_GET_RECLOCK_FILE:
ret = ctdb_string_pull(buf, buflen, mem_ctx,
- &cd->data.reclock_file);
+ &cd->data.reclock_file, &np);
break;
case CTDB_CONTROL_GET_BAN_STATE:
break;
case CTDB_CONTROL_GET_DB_SEQNUM:
- ret = ctdb_uint64_pull(buf, buflen, mem_ctx,
- &cd->data.seqnum);
+ ret = ctdb_uint64_pull(buf, buflen, &cd->data.seqnum, &np);
break;
case CTDB_CONTROL_DB_GET_HEALTH:
ret = ctdb_string_pull(buf, buflen, mem_ctx,
- &cd->data.reason);
+ &cd->data.reason, &np);
break;
case CTDB_CONTROL_GET_PUBLIC_IP_INFO:
break;
case CTDB_CONTROL_CHECK_SRVIDS:
- ret = ctdb_uint8_array_pull(buf, buflen, mem_ctx,
- &cd->data.u8_array);
break;
case CTDB_CONTROL_GET_DB_STATISTICS:
case CTDB_CONTROL_RECEIVE_RECORDS:
ret = ctdb_rec_buffer_pull(buf, buflen, mem_ctx,
- &cd->data.recbuf);
+ &cd->data.recbuf, &np);
break;
case CTDB_CONTROL_GET_RUNSTATE:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.runstate);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.runstate, &np);
break;
case CTDB_CONTROL_GET_NODES_FILE:
break;
case CTDB_CONTROL_DB_PULL:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.num_records);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.num_records,
+ &np);
break;
case CTDB_CONTROL_DB_PUSH_CONFIRM:
- ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
- &cd->data.num_records);
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.num_records,
+ &np);
+ break;
+
+ case CTDB_CONTROL_DB_OPEN_FLAGS:
+ ret = ctdb_int32_pull(buf, buflen, &cd->data.tdb_flags, &np);
+ break;
+
+ case CTDB_CONTROL_DB_ATTACH_REPLICATED:
+ ret = ctdb_uint32_pull(buf, buflen, &cd->data.db_id, &np);
break;
}
return ret;
}
+size_t ctdb_req_control_len(struct ctdb_req_header *h,
+ struct ctdb_req_control *c)
+{
+ return offsetof(struct ctdb_req_control_wire, data) +
+ ctdb_req_control_data_len(&c->rdata);
+}
+
int ctdb_req_control_push(struct ctdb_req_header *h,
struct ctdb_req_control *request,
- TALLOC_CTX *mem_ctx,
- uint8_t **pkt, size_t *pkt_len)
+ uint8_t *buf, size_t *buflen)
{
- struct ctdb_req_control_wire *wire;
- uint8_t *buf;
- size_t length, buflen, datalen;
- int ret;
-
- datalen = ctdb_req_control_data_len(&request->rdata);
- length = offsetof(struct ctdb_req_control_wire, data) + datalen;
+ struct ctdb_req_control_wire *wire =
+ (struct ctdb_req_control_wire *)buf;
+ size_t length;
- ret = allocate_pkt(mem_ctx, length, &buf, &buflen);
- if (ret != 0) {
- return ret;
+ length = ctdb_req_control_len(h, request);
+ if (*buflen < length) {
+ *buflen = length;
+ return EMSGSIZE;
}
- wire = (struct ctdb_req_control_wire *)buf;
-
- h->length = buflen;
- memcpy(&wire->hdr, h, sizeof(struct ctdb_req_header));
+ h->length = *buflen;
+ ctdb_req_header_push(h, (uint8_t *)&wire->hdr);
wire->opcode = request->opcode;
wire->pad = request->pad;
wire->client_id = request->client_id;
wire->flags = request->flags;
- wire->datalen = datalen;
+ wire->datalen = ctdb_req_control_data_len(&request->rdata);
ctdb_req_control_data_push(&request->rdata, wire->data);
- *pkt = buf;
- *pkt_len = buflen;
return 0;
}
-int ctdb_req_control_pull(uint8_t *pkt, size_t pkt_len,
+int ctdb_req_control_pull(uint8_t *buf, size_t buflen,
struct ctdb_req_header *h,
TALLOC_CTX *mem_ctx,
- struct ctdb_req_control *request)
+ struct ctdb_req_control *c)
{
struct ctdb_req_control_wire *wire =
- (struct ctdb_req_control_wire *)pkt;
+ (struct ctdb_req_control_wire *)buf;
size_t length;
int ret;
length = offsetof(struct ctdb_req_control_wire, data);
- if (pkt_len < length) {
+ if (buflen < length) {
+ return EMSGSIZE;
+ }
+ if (wire->datalen > buflen) {
+ return EMSGSIZE;
+ }
+ if (length + wire->datalen < length) {
return EMSGSIZE;
}
- if (pkt_len < length + wire->datalen) {
+ if (buflen < length + wire->datalen) {
return EMSGSIZE;
}
if (h != NULL) {
- memcpy(h, &wire->hdr, sizeof(struct ctdb_req_header));
+ ret = ctdb_req_header_pull((uint8_t *)&wire->hdr, buflen, h);
+ if (ret != 0) {
+ return ret;
+ }
}
- request->opcode = wire->opcode;
- request->pad = wire->pad;
- request->srvid = wire->srvid;
- request->client_id = wire->client_id;
- request->flags = wire->flags;
+ c->opcode = wire->opcode;
+ c->pad = wire->pad;
+ c->srvid = wire->srvid;
+ c->client_id = wire->client_id;
+ c->flags = wire->flags;
ret = ctdb_req_control_data_pull(wire->data, wire->datalen,
- request->opcode, mem_ctx,
- &request->rdata);
+ c->opcode, mem_ctx, &c->rdata);
if (ret != 0) {
return ret;
}
return 0;
}
+size_t ctdb_reply_control_len(struct ctdb_req_header *h,
+ struct ctdb_reply_control *c)
+{
+ return offsetof(struct ctdb_reply_control_wire, data) +
+ (c->status == 0 ?
+ ctdb_reply_control_data_len(&c->rdata) :
+ ctdb_string_len(&c->errmsg));
+}
+
int ctdb_reply_control_push(struct ctdb_req_header *h,
struct ctdb_reply_control *reply,
- TALLOC_CTX *mem_ctx,
- uint8_t **pkt, size_t *pkt_len)
+ uint8_t *buf, size_t *buflen)
{
- struct ctdb_reply_control_wire *wire;
- uint8_t *buf;
- size_t length, buflen, datalen, errlen;
- int ret;
-
- if (reply->status == 0) {
- datalen = ctdb_reply_control_data_len(&reply->rdata);
- } else {
- datalen = 0;
- }
-
- if (reply->errmsg == NULL) {
- errlen = 0;
- } else {
- errlen = strlen(reply->errmsg) + 1;
- }
-
- length = offsetof(struct ctdb_reply_control_wire, data) +
- datalen + errlen;
+ struct ctdb_reply_control_wire *wire =
+ (struct ctdb_reply_control_wire *)buf;
+ size_t length, np;
- ret = allocate_pkt(mem_ctx, length, &buf, &buflen);
- if (ret != 0) {
- return ret;
+ length = ctdb_reply_control_len(h, reply);
+ if (*buflen < length) {
+ *buflen = length;
+ return EMSGSIZE;
}
- wire = (struct ctdb_reply_control_wire *)buf;
-
- h->length = buflen;
- memcpy(&wire->hdr, h, sizeof(struct ctdb_req_header));
+ h->length = *buflen;
+ ctdb_req_header_push(h, (uint8_t *)&wire->hdr);
wire->status = reply->status;
- wire->datalen = datalen;
if (reply->status == 0) {
+ wire->datalen = ctdb_reply_control_data_len(&reply->rdata);
+ wire->errorlen = 0;
ctdb_reply_control_data_push(&reply->rdata, wire->data);
+ } else {
+ wire->datalen = 0;
+ wire->errorlen = ctdb_string_len(&reply->errmsg);
+ ctdb_string_push(&reply->errmsg, wire->data + wire->datalen,
+ &np);
}
- wire->errorlen = errlen;
- if (errlen > 0) {
- memcpy(wire->data + datalen, reply->errmsg, wire->errorlen);
- }
-
- *pkt = buf;
- *pkt_len = buflen;
return 0;
}
-int ctdb_reply_control_pull(uint8_t *pkt, size_t pkt_len, uint32_t opcode,
+int ctdb_reply_control_pull(uint8_t *buf, size_t buflen, uint32_t opcode,
struct ctdb_req_header *h,
TALLOC_CTX *mem_ctx,
- struct ctdb_reply_control *reply)
+ struct ctdb_reply_control *c)
{
struct ctdb_reply_control_wire *wire =
- (struct ctdb_reply_control_wire *)pkt;
- size_t length;
+ (struct ctdb_reply_control_wire *)buf;
+ size_t length, np;
int ret;
length = offsetof(struct ctdb_reply_control_wire, data);
-
- if (pkt_len < length) {
+ if (buflen < length) {
return EMSGSIZE;
}
- if (pkt_len < length + wire->datalen + wire->errorlen) {
+ if (wire->datalen > buflen || wire->errorlen > buflen) {
+ return EMSGSIZE;
+ }
+ if (length + wire->datalen < length) {
+ return EMSGSIZE;
+ }
+ if (length + wire->datalen + wire->errorlen < length) {
+ return EMSGSIZE;
+ }
+ if (buflen < length + wire->datalen + wire->errorlen) {
return EMSGSIZE;
}
if (h != NULL) {
- memcpy(h, &wire->hdr, sizeof(struct ctdb_req_header));
+ ret = ctdb_req_header_pull((uint8_t *)&wire->hdr, buflen, h);
+ if (ret != 0) {
+ return ret;
+ }
}
- reply->status = wire->status;
+ c->status = wire->status;
- if (reply->status != -1) {
+ if (c->status != -1) {
ret = ctdb_reply_control_data_pull(wire->data, wire->datalen,
opcode, mem_ctx,
- &reply->rdata);
+ &c->rdata);
if (ret != 0) {
return ret;
}
}
- if (wire->errorlen > 0) {
- reply->errmsg = talloc_memdup(mem_ctx,
- wire->data + wire->datalen,
- wire->errorlen);
- } else {
- reply->errmsg = NULL;
+ ret = ctdb_string_pull(wire->data + wire->datalen, wire->errorlen,
+ mem_ctx, &c->errmsg, &np);
+ if (ret != 0) {
+ return ret;
}
return 0;
git.samba.org / vlendec / samba-autobuild / .git / blobdiff