ctdb-protocol: Fix marshalling for ctdb_traverse_all_ext

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

3 files changed, 99 insertions, 20 deletions

diff --git a/ctdb/protocol/protocol_control.c b/ctdb/protocol/protocol_control.c
index a8cfe769e0f..618a89ffd43 100644
--- a/ctdb/protocol/protocol_control.c
+++ b/ctdb/protocol/protocol_control.c
@@ -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:
diff --git a/ctdb/protocol/protocol_private.h b/ctdb/protocol/protocol_private.h
index 8c7a223776a..fc3d51ca1b2 100644
--- a/ctdb/protocol/protocol_private.h
+++ b/ctdb/protocol/protocol_private.h
@@ -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);
diff --git a/ctdb/protocol/protocol_types.c b/ctdb/protocol/protocol_types.c
index e73cee450ac..19017cbc19e 100644
--- a/ctdb/protocol/protocol_types.c
+++ b/ctdb/protocol/protocol_types.c
@@ -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;
+	val = talloc(mem_ctx, struct ctdb_traverse_all_ext);
+	if (val == NULL) {
+		return ENOMEM;
 	}
 
-	traverse = talloc_memdup(mem_ctx, buf,
-				 sizeof(struct ctdb_traverse_all_ext));
-	if (traverse == NULL) {
-		return ENOMEM;
+	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;
 
-	*out = traverse;
+	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)