diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2017-07-27 01:33:45 +1000 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2017-08-30 14:59:26 +0200 |
| commit | 98715abef3cf2b4b6e074b00c03874f863b502e5 (patch) | |
| tree | 607ca7daed3d8b6881485ac1502d87887a786a28 /ctdb/protocol/protocol_event.c | |
| parent | 67174ebfd9f2016c0a126608192e920b9c74e6f4 (diff) | |
| download | samba-98715abef3cf2b4b6e074b00c03874f863b502e5.tar.gz | |
ctdb-protocol: Fix marshalling for ctdb_event_request_status
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb/protocol/protocol_event.c')
| -rw-r--r-- | ctdb/protocol/protocol_event.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/ctdb/protocol/protocol_event.c b/ctdb/protocol/protocol_event.c index 8e27660275b..d1cca15d352 100644 --- a/ctdb/protocol/protocol_event.c +++ b/ctdb/protocol/protocol_event.c @@ -317,7 +317,7 @@ static size_t ctdb_event_request_status_len( static void ctdb_event_request_status_push( struct ctdb_event_request_status *in, - uint8_t *buf) + uint8_t *buf, size_t *npush) { size_t offset = 0, np; @@ -325,12 +325,16 @@ static void ctdb_event_request_status_push( offset += np; ctdb_event_status_state_push(in->state, buf+offset, &np); + offset += np; + + *npush = offset; } static int ctdb_event_request_status_pull( uint8_t *buf, size_t buflen, TALLOC_CTX *mem_ctx, - struct ctdb_event_request_status **out) + struct ctdb_event_request_status **out, + size_t *npull) { struct ctdb_event_request_status *rdata; size_t offset = 0, np; @@ -354,8 +358,10 @@ static int ctdb_event_request_status_pull( talloc_free(rdata); return ret; } + offset += np; *out = rdata; + *npull = offset; return 0; } @@ -483,7 +489,8 @@ static void ctdb_event_request_data_push(struct ctdb_event_request_data *in, break; case CTDB_EVENT_COMMAND_STATUS: - ctdb_event_request_status_push(in->data.status, buf+offset); + ctdb_event_request_status_push(in->data.status, buf+offset, + &np); break; case CTDB_EVENT_COMMAND_SCRIPT_LIST: @@ -527,7 +534,8 @@ static int ctdb_event_request_data_pull(uint8_t *buf, size_t buflen, case CTDB_EVENT_COMMAND_STATUS: ret = ctdb_event_request_status_pull( buf+offset, buflen-offset, - mem_ctx, &out->data.status); + mem_ctx, &out->data.status, + &np); break; case CTDB_EVENT_COMMAND_SCRIPT_LIST: |