sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

ctdb-protocol: Fix marshalling for ctdb_traverse_all_ext

Browse Source 
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
This commit is contained in:
Amitay Isaacs 2017-06-30 00:24:40 +10:00 committed by Martin Schwenke
parent 5caafc2857
commit 6f4867664c
5 changed files with 134 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ctdb/protocol/protocol_control.c
View File

@ -665,7 +665,8 @@ static void ctdb_req_control_data_push(struct ctdb_req_control_data *cd,
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:
@ -985,7 +986,8 @@ static int ctdb_req_control_data_pull(uint8_t *buf, size_t buflen,
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:

9
ctdb/protocol/protocol_private.h
View File

@ -164,12 +164,13 @@ int ctdb_traverse_start_ext_pull(uint8_t *buf, size_t buflen,
struct ctdb_traverse_start_ext **out,
size_t *npull);
size_t ctdb_traverse_all_ext_len(struct ctdb_traverse_all_ext *traverse);
void ctdb_traverse_all_ext_push(struct ctdb_traverse_all_ext *traverse,
uint8_t *buf);
size_t ctdb_traverse_all_ext_len(struct ctdb_traverse_all_ext *in);
void ctdb_traverse_all_ext_push(struct ctdb_traverse_all_ext *in,
uint8_t *buf, size_t *npush);
int ctdb_traverse_all_ext_pull(uint8_t *buf, size_t buflen,
TALLOC_CTX *mem_ctx,
struct ctdb_traverse_all_ext **out);
struct ctdb_traverse_all_ext **out,
size_t *npull);
size_t ctdb_sock_addr_len(ctdb_sock_addr *addr);
void ctdb_sock_addr_push(ctdb_sock_addr *addr, uint8_t *buf);

106
ctdb/protocol/protocol_types.c
View File

@ -1926,35 +1926,111 @@ fail:
return ret;
}
size_t ctdb_traverse_all_ext_len(struct ctdb_traverse_all_ext *traverse)
size_t ctdb_traverse_all_ext_len(struct ctdb_traverse_all_ext *in)
{
return sizeof(struct ctdb_traverse_all_ext);
return ctdb_uint32_len(&in->db_id) +
ctdb_uint32_len(&in->reqid) +
ctdb_uint32_len(&in->pnn) +
ctdb_uint32_len(&in->client_reqid) +
ctdb_uint64_len(&in->srvid) +
ctdb_bool_len(&in->withemptyrecords) +
ctdb_padding_len(7);
}
void ctdb_traverse_all_ext_push(struct ctdb_traverse_all_ext *traverse,
uint8_t *buf)
void ctdb_traverse_all_ext_push(struct ctdb_traverse_all_ext *in,
uint8_t *buf, size_t *npush)
{
memcpy(buf, traverse, sizeof(struct ctdb_traverse_all_ext));
size_t offset = 0, np;
ctdb_uint32_push(&in->db_id, buf+offset, &np);
offset += np;
ctdb_uint32_push(&in->reqid, buf+offset, &np);
offset += np;
ctdb_uint32_push(&in->pnn, buf+offset, &np);
offset += np;
ctdb_uint32_push(&in->client_reqid, buf+offset, &np);
offset += np;
ctdb_uint64_push(&in->srvid, buf+offset, &np);
offset += np;
ctdb_bool_push(&in->withemptyrecords, buf+offset, &np);
offset += np;
ctdb_padding_push(7, buf+offset, &np);
offset += np;
*npush = offset;
}
int ctdb_traverse_all_ext_pull(uint8_t *buf, size_t buflen,
TALLOC_CTX *mem_ctx,
struct ctdb_traverse_all_ext **out)
struct ctdb_traverse_all_ext **out,
size_t *npull)
{
struct ctdb_traverse_all_ext *traverse;
struct ctdb_traverse_all_ext *val;
size_t offset = 0, np;
int ret;
if (buflen < sizeof(struct ctdb_traverse_all_ext)) {
return EMSGSIZE;
}
traverse = talloc_memdup(mem_ctx, buf,
sizeof(struct ctdb_traverse_all_ext));
if (traverse == NULL) {
val = talloc(mem_ctx, struct ctdb_traverse_all_ext);
if (val == NULL) {
return ENOMEM;
}
*out = traverse;
ret = ctdb_uint32_pull(buf+offset, buflen-offset, &val->db_id, &np);
if (ret != 0) {
goto fail;
}
offset += np;
ret = ctdb_uint32_pull(buf+offset, buflen-offset, &val->reqid, &np);
if (ret != 0) {
goto fail;
}
offset += np;
ret = ctdb_uint32_pull(buf+offset, buflen-offset, &val->pnn, &np);
if (ret != 0) {
goto fail;
}
offset += np;
ret = ctdb_uint32_pull(buf+offset, buflen-offset, &val->client_reqid,
&np);
if (ret != 0) {
goto fail;
}
offset += np;
ret = ctdb_uint64_pull(buf+offset, buflen-offset, &val->srvid, &np);
if (ret != 0) {
goto fail;
}
offset += np;
ret = ctdb_bool_pull(buf+offset, buflen-offset,
&val->withemptyrecords, &np);
if (ret != 0) {
goto fail;
}
offset += np;
ret = ctdb_padding_pull(buf+offset, buflen-offset, 7, &np);
if (ret != 0) {
goto fail;
}
offset += np;
*out = val;
*npull = offset;
return 0;
fail:
talloc_free(val);
return ret;
}
size_t ctdb_sock_addr_len(ctdb_sock_addr *addr)

33
ctdb/tests/src/protocol_types_compat_test.c
View File

@ -616,6 +616,37 @@ static int ctdb_traverse_start_ext_pull_old(uint8_t *buf, size_t buflen,
return 0;
}
static size_t ctdb_traverse_all_ext_len_old(struct ctdb_traverse_all_ext *in)
{
return sizeof(struct ctdb_traverse_all_ext);
}
static void ctdb_traverse_all_ext_push_old(struct ctdb_traverse_all_ext *in,
uint8_t *buf)
{
memcpy(buf, in, sizeof(struct ctdb_traverse_all_ext));
}
static int ctdb_traverse_all_ext_pull_old(uint8_t *buf, size_t buflen,
TALLOC_CTX *mem_ctx,
struct ctdb_traverse_all_ext **out)
{
struct ctdb_traverse_all_ext *val;
if (buflen < sizeof(struct ctdb_traverse_all_ext)) {
return EMSGSIZE;
}
val = talloc_memdup(mem_ctx, buf,
sizeof(struct ctdb_traverse_all_ext));
if (val == NULL) {
return ENOMEM;
}
*out = val;
return 0;
}
COMPAT_TYPE3_TEST(struct ctdb_statistics, ctdb_statistics);
COMPAT_TYPE3_TEST(struct ctdb_vnn_map, ctdb_vnn_map);
@ -630,6 +661,7 @@ COMPAT_TYPE3_TEST(struct ctdb_rec_buffer, ctdb_rec_buffer);
COMPAT_TYPE3_TEST(struct ctdb_traverse_start, ctdb_traverse_start);
COMPAT_TYPE3_TEST(struct ctdb_traverse_all, ctdb_traverse_all);
COMPAT_TYPE3_TEST(struct ctdb_traverse_start_ext, ctdb_traverse_start_ext);
COMPAT_TYPE3_TEST(struct ctdb_traverse_all_ext, ctdb_traverse_all_ext);
int main(int argc, char *argv[])
{
@ -649,6 +681,7 @@ int main(int argc, char *argv[])
COMPAT_TEST_FUNC(ctdb_traverse_start)();
COMPAT_TEST_FUNC(ctdb_traverse_all)();
COMPAT_TEST_FUNC(ctdb_traverse_start_ext)();
COMPAT_TEST_FUNC(ctdb_traverse_all_ext)();
return 0;
}

2
ctdb/tests/src/protocol_types_test.c
View File

@ -59,7 +59,7 @@ PROTOCOL_TYPE3_TEST(struct ctdb_rec_buffer, ctdb_rec_buffer);
PROTOCOL_TYPE3_TEST(struct ctdb_traverse_start, ctdb_traverse_start);
PROTOCOL_TYPE3_TEST(struct ctdb_traverse_all, ctdb_traverse_all);
PROTOCOL_TYPE3_TEST(struct ctdb_traverse_start_ext, ctdb_traverse_start_ext);
DEFINE_TEST(struct ctdb_traverse_all_ext, ctdb_traverse_all_ext);
PROTOCOL_TYPE3_TEST(struct ctdb_traverse_all_ext, ctdb_traverse_all_ext);
DEFINE_TEST(ctdb_sock_addr, ctdb_sock_addr);
DEFINE_TEST(struct ctdb_connection, ctdb_connection);
DEFINE_TEST(struct ctdb_tunable, ctdb_tunable);