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_start

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-29 23:48:01 +10:00 committed by Martin Schwenke
parent 676df8770b
commit c882182ecd
5 changed files with 89 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ctdb/protocol/protocol_control.c
View File

@ -483,7 +483,7 @@ static void ctdb_req_control_data_push(struct ctdb_req_control_data *cd,
break; break;
case CTDB_CONTROL_TRAVERSE_START: 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; break;
case CTDB_CONTROL_TRAVERSE_ALL: case CTDB_CONTROL_TRAVERSE_ALL:
@ -579,7 +579,7 @@ static void ctdb_req_control_data_push(struct ctdb_req_control_data *cd,
break; break;
case CTDB_CONTROL_TRAVERSE_KILL: 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; break;
case CTDB_CONTROL_RECD_RECLOCK_LATENCY: case CTDB_CONTROL_RECD_RECLOCK_LATENCY:
@ -770,7 +770,7 @@ static int ctdb_req_control_data_pull(uint8_t *buf, size_t buflen,
case CTDB_CONTROL_TRAVERSE_START: case CTDB_CONTROL_TRAVERSE_START:
ret = ctdb_traverse_start_pull(buf, buflen, mem_ctx, ret = ctdb_traverse_start_pull(buf, buflen, mem_ctx,
&cd->data.traverse_start); &cd->data.traverse_start, &np);
break; break;
case CTDB_CONTROL_TRAVERSE_ALL: case CTDB_CONTROL_TRAVERSE_ALL:
@ -886,7 +886,7 @@ static int ctdb_req_control_data_pull(uint8_t *buf, size_t buflen,
case CTDB_CONTROL_TRAVERSE_KILL: case CTDB_CONTROL_TRAVERSE_KILL:
ret = ctdb_traverse_start_pull(buf, buflen, mem_ctx, ret = ctdb_traverse_start_pull(buf, buflen, mem_ctx,
&cd->data.traverse_start); &cd->data.traverse_start, &np);
break; break;
case CTDB_CONTROL_RECD_RECLOCK_LATENCY: case CTDB_CONTROL_RECD_RECLOCK_LATENCY:

8
ctdb/protocol/protocol_private.h
View File

@ -144,11 +144,11 @@ void ctdb_pulldb_ext_push(struct ctdb_pulldb_ext *in, uint8_t *buf,
int ctdb_pulldb_ext_pull(uint8_t *buf, size_t buflen, TALLOC_CTX *mem_ctx, int ctdb_pulldb_ext_pull(uint8_t *buf, size_t buflen, TALLOC_CTX *mem_ctx,
struct ctdb_pulldb_ext **out, size_t *npull); struct ctdb_pulldb_ext **out, size_t *npull);
size_t ctdb_traverse_start_len(struct ctdb_traverse_start *traverse); size_t ctdb_traverse_start_len(struct ctdb_traverse_start *in);
void ctdb_traverse_start_push(struct ctdb_traverse_start *traverse, void ctdb_traverse_start_push(struct ctdb_traverse_start *in, uint8_t *buf,
uint8_t *buf); size_t *npush);
int ctdb_traverse_start_pull(uint8_t *buf, size_t buflen, TALLOC_CTX *mem_ctx, int ctdb_traverse_start_pull(uint8_t *buf, size_t buflen, TALLOC_CTX *mem_ctx,
struct ctdb_traverse_start **out); struct ctdb_traverse_start **out, size_t *npull);
size_t ctdb_traverse_all_len(struct ctdb_traverse_all *traverse); size_t ctdb_traverse_all_len(struct ctdb_traverse_all *traverse);
void ctdb_traverse_all_push(struct ctdb_traverse_all *traverse, uint8_t *buf); void ctdb_traverse_all_push(struct ctdb_traverse_all *traverse, uint8_t *buf);

63
ctdb/protocol/protocol_types.c
View File

@ -1693,34 +1693,67 @@ int ctdb_rec_buffer_read(int fd, TALLOC_CTX *mem_ctx,
return 0; return 0;
} }
size_t ctdb_traverse_start_len(struct ctdb_traverse_start *traverse) size_t ctdb_traverse_start_len(struct ctdb_traverse_start *in)
{ {
return sizeof(struct ctdb_traverse_start); return ctdb_uint32_len(&in->db_id) +
ctdb_uint32_len(&in->reqid) +
ctdb_uint64_len(&in->srvid);
} }
void ctdb_traverse_start_push(struct ctdb_traverse_start *traverse, void ctdb_traverse_start_push(struct ctdb_traverse_start *in, uint8_t *buf,
uint8_t *buf) size_t *npush)
{ {
memcpy(buf, traverse, sizeof(struct ctdb_traverse_start)); 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_uint64_push(&in->srvid, buf+offset, &np);
offset += np;
*npush = offset;
} }
int ctdb_traverse_start_pull(uint8_t *buf, size_t buflen, TALLOC_CTX *mem_ctx, int ctdb_traverse_start_pull(uint8_t *buf, size_t buflen, TALLOC_CTX *mem_ctx,
struct ctdb_traverse_start **out) struct ctdb_traverse_start **out, size_t *npull)
{ {
struct ctdb_traverse_start *traverse; struct ctdb_traverse_start *val;
size_t offset = 0, np;
int ret;
if (buflen < sizeof(struct ctdb_traverse_start)) { val = talloc(mem_ctx, struct ctdb_traverse_start);
return EMSGSIZE; if (val == NULL) {
}
traverse = talloc_memdup(mem_ctx, buf,
sizeof(struct ctdb_traverse_start));
if (traverse == NULL) {
return ENOMEM; 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_uint64_pull(buf+offset, buflen-offset, &val->srvid, &np);
if (ret != 0) {
goto fail;
}
offset += np;
*out = val;
*npull = offset;
return 0; return 0;
fail:
talloc_free(val);
return ret;
} }
size_t ctdb_traverse_all_len(struct ctdb_traverse_all *traverse) size_t ctdb_traverse_all_len(struct ctdb_traverse_all *traverse)

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

@ -524,6 +524,36 @@ static int ctdb_rec_buffer_pull_old(uint8_t *buf, size_t buflen,
return 0; return 0;
} }
static size_t ctdb_traverse_start_len_old(struct ctdb_traverse_start *in)
{
return sizeof(struct ctdb_traverse_start);
}
static void ctdb_traverse_start_push_old(struct ctdb_traverse_start *in,
uint8_t *buf)
{
memcpy(buf, in, sizeof(struct ctdb_traverse_start));
}
static int ctdb_traverse_start_pull_old(uint8_t *buf, size_t buflen,
TALLOC_CTX *mem_ctx,
struct ctdb_traverse_start **out)
{
struct ctdb_traverse_start *val;
if (buflen < sizeof(struct ctdb_traverse_start)) {
return EMSGSIZE;
}
val = talloc_memdup(mem_ctx, buf, sizeof(struct ctdb_traverse_start));
if (val == NULL) {
return ENOMEM;
}
*out = val;
return 0;
}
COMPAT_TYPE3_TEST(struct ctdb_statistics, ctdb_statistics); COMPAT_TYPE3_TEST(struct ctdb_statistics, ctdb_statistics);
COMPAT_TYPE3_TEST(struct ctdb_vnn_map, ctdb_vnn_map); COMPAT_TYPE3_TEST(struct ctdb_vnn_map, ctdb_vnn_map);
@ -535,6 +565,7 @@ COMPAT_TYPE1_TEST(struct ctdb_ltdb_header, ctdb_ltdb_header);
COMPAT_TYPE3_TEST(struct ctdb_rec_data, ctdb_rec_data); COMPAT_TYPE3_TEST(struct ctdb_rec_data, ctdb_rec_data);
COMPAT_TYPE3_TEST(struct ctdb_rec_buffer, ctdb_rec_buffer); COMPAT_TYPE3_TEST(struct ctdb_rec_buffer, ctdb_rec_buffer);
COMPAT_TYPE3_TEST(struct ctdb_traverse_start, ctdb_traverse_start);
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@ -551,6 +582,7 @@ int main(int argc, char *argv[])
COMPAT_TEST_FUNC(ctdb_ltdb_header)(); COMPAT_TEST_FUNC(ctdb_ltdb_header)();
COMPAT_TEST_FUNC(ctdb_rec_data)(); COMPAT_TEST_FUNC(ctdb_rec_data)();
COMPAT_TEST_FUNC(ctdb_rec_buffer)(); COMPAT_TEST_FUNC(ctdb_rec_buffer)();
COMPAT_TEST_FUNC(ctdb_traverse_start)();
return 0; return 0;
} }

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

@ -56,7 +56,7 @@ PROTOCOL_TYPE3_TEST(struct ctdb_pulldb_ext, ctdb_pulldb_ext);
PROTOCOL_TYPE1_TEST(struct ctdb_ltdb_header, ctdb_ltdb_header); PROTOCOL_TYPE1_TEST(struct ctdb_ltdb_header, ctdb_ltdb_header);
PROTOCOL_TYPE3_TEST(struct ctdb_rec_data, ctdb_rec_data); PROTOCOL_TYPE3_TEST(struct ctdb_rec_data, ctdb_rec_data);
PROTOCOL_TYPE3_TEST(struct ctdb_rec_buffer, ctdb_rec_buffer); PROTOCOL_TYPE3_TEST(struct ctdb_rec_buffer, ctdb_rec_buffer);
DEFINE_TEST(struct ctdb_traverse_start, ctdb_traverse_start); PROTOCOL_TYPE3_TEST(struct ctdb_traverse_start, ctdb_traverse_start);
DEFINE_TEST(struct ctdb_traverse_all, ctdb_traverse_all); DEFINE_TEST(struct ctdb_traverse_all, ctdb_traverse_all);
DEFINE_TEST(struct ctdb_traverse_start_ext, ctdb_traverse_start_ext); DEFINE_TEST(struct ctdb_traverse_start_ext, ctdb_traverse_start_ext);
DEFINE_TEST(struct ctdb_traverse_all_ext, ctdb_traverse_all_ext); DEFINE_TEST(struct ctdb_traverse_all_ext, ctdb_traverse_all_ext);