sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

ctdb-protocol: Fix marshalling for ctdb_event_reply_script_list

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-07-27 01:45:44 +10:00 committed by Martin Schwenke
parent 4788016cfd
commit ab88bad3e2
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ctdb/protocol/protocol_event.c
View File

@ -645,17 +645,20 @@ static size_t ctdb_event_reply_script_list_len(
static void ctdb_event_reply_script_list_push(
struct ctdb_event_reply_script_list *in,
uint8_t *buf)
uint8_t *buf, size_t *npush)
{
size_t np;
ctdb_script_list_push(in->script_list, buf, &np);
*npush = np;
}
static int ctdb_event_reply_script_list_pull(
uint8_t *buf, size_t buflen,
TALLOC_CTX *mem_ctx,
struct ctdb_event_reply_script_list **out)
struct ctdb_event_reply_script_list **out,
size_t *npull)
{
struct ctdb_event_reply_script_list *rdata;
size_t np;
@ -674,6 +677,7 @@ static int ctdb_event_reply_script_list_pull(
}
*out = rdata;
*npull = np;
return 0;
}
@ -727,7 +731,7 @@ static void ctdb_event_reply_data_push(struct ctdb_event_reply_data *in,
case CTDB_EVENT_COMMAND_SCRIPT_LIST:
ctdb_event_reply_script_list_push(in->data.script_list,
buf+offset);
buf+offset, &np);
break;
case CTDB_EVENT_COMMAND_SCRIPT_ENABLE:
@ -771,7 +775,7 @@ static int ctdb_event_reply_data_pull(uint8_t *buf, size_t buflen,
case CTDB_EVENT_COMMAND_SCRIPT_LIST:
ret = ctdb_event_reply_script_list_pull(
buf+offset, buflen-offset,
mem_ctx, &out->data.script_list);
mem_ctx, &out->data.script_list, &np);
break;
case CTDB_EVENT_COMMAND_SCRIPT_ENABLE:

3
ctdb/tests/src/protocol_event_test.c
View File

@ -239,7 +239,8 @@ PROTOCOL_TYPE3_TEST(struct ctdb_event_request_script_enable,
PROTOCOL_TYPE3_TEST(struct ctdb_event_request_script_disable,
ctdb_event_request_script_disable);
PROTOCOL_TYPE3_TEST(struct ctdb_event_reply_status, ctdb_event_reply_status);
DEFINE_TEST(struct ctdb_event_reply_script_list, ctdb_event_reply_script_list);
PROTOCOL_TYPE3_TEST(struct ctdb_event_reply_script_list,
ctdb_event_reply_script_list);
PROTOCOL_EVENT1_TEST(struct ctdb_event_request_data, ctdb_event_request_data);