ctdb-protocol: Fix marshalling for ctdb_srvid_message

[vlendec/samba-autobuild/.git] / ctdb / protocol / protocol_message.c

diff --git a/ctdb/protocol/protocol_message.c b/ctdb/protocol/protocol_message.c
index f15c35b7a153997a786066a20eb05d53abfafc70..3760c471b73de23fd5c317a9d018122dca335f40 100644 (file)
--- a/ctdb/protocol/protocol_message.c
+++ b/ctdb/protocol/protocol_message.c
@@ -107,7 +107,7 @@ static size_t ctdb_message_data_len(union ctdb_message_data *mdata,
                break;
 
        default:
-               len = ctdb_tdb_data_len(mdata->data);
+               len = ctdb_tdb_data_len(&mdata->data);
                break;
        }
 
@@ -125,7 +125,7 @@ static void ctdb_message_data_push(union ctdb_message_data *mdata,
                break;
 
        case CTDB_SRVID_ELECTION:
-               ctdb_election_message_push(mdata->election, buf);
+               ctdb_election_message_push(mdata->election, buf, &np);
                break;
 
        case CTDB_SRVID_RECONFIGURE:
@@ -140,15 +140,15 @@ static void ctdb_message_data_push(union ctdb_message_data *mdata,
                break;
 
        case CTDB_SRVID_SET_NODE_FLAGS:
-               ctdb_node_flag_change_push(mdata->flag_change, buf);
+               ctdb_node_flag_change_push(mdata->flag_change, buf, &np);
                break;
 
        case CTDB_SRVID_RECD_UPDATE_IP:
-               ctdb_public_ip_push(mdata->pubip, buf);
+               ctdb_public_ip_push(mdata->pubip, buf, &np);
                break;
 
        case CTDB_SRVID_VACUUM_FETCH:
-               ctdb_rec_buffer_push(mdata->recbuf, buf);
+               ctdb_rec_buffer_push(mdata->recbuf, buf, &np);
                break;
 
        case CTDB_SRVID_DETACH_DATABASE:
@@ -156,18 +156,18 @@ static void ctdb_message_data_push(union ctdb_message_data *mdata,
                break;
 
        case CTDB_SRVID_MEM_DUMP:
-               ctdb_srvid_message_push(mdata->msg, buf);
+               ctdb_srvid_message_push(mdata->msg, buf, &np);
                break;
 
        case CTDB_SRVID_PUSH_NODE_FLAGS:
-               ctdb_node_flag_change_push(mdata->flag_change, buf);
+               ctdb_node_flag_change_push(mdata->flag_change, buf, &np);
                break;
 
        case CTDB_SRVID_RELOAD_NODES:
                break;
 
        case CTDB_SRVID_TAKEOVER_RUN:
-               ctdb_srvid_message_push(mdata->msg, buf);
+               ctdb_srvid_message_push(mdata->msg, buf, &np);
                break;
 
        case CTDB_SRVID_REBALANCE_NODE:
@@ -187,7 +187,7 @@ static void ctdb_message_data_push(union ctdb_message_data *mdata,
                break;
 
        default:
-               ctdb_tdb_data_push(mdata->data, buf);
+               ctdb_tdb_data_push(&mdata->data, buf, &np);
                break;
        }
 }
@@ -206,7 +206,7 @@ static int ctdb_message_data_pull(uint8_t *buf, size_t buflen,
 
        case CTDB_SRVID_ELECTION:
                ret = ctdb_election_message_pull(buf, buflen, mem_ctx,
-                                                &mdata->election);
+                                                &mdata->election, &np);
                break;
 
        case CTDB_SRVID_RECONFIGURE:
@@ -224,17 +224,17 @@ static int ctdb_message_data_pull(uint8_t *buf, size_t buflen,
 
        case CTDB_SRVID_SET_NODE_FLAGS:
                ret = ctdb_node_flag_change_pull(buf, buflen, mem_ctx,
-                                                &mdata->flag_change);
+                                                &mdata->flag_change, &np);
                break;
 
        case CTDB_SRVID_RECD_UPDATE_IP:
                ret = ctdb_public_ip_pull(buf, buflen, mem_ctx,
-                                         &mdata->pubip);
+                                         &mdata->pubip, &np);
                break;
 
        case CTDB_SRVID_VACUUM_FETCH:
                ret = ctdb_rec_buffer_pull(buf, buflen, mem_ctx,
-                                          &mdata->recbuf);
+                                          &mdata->recbuf, &np);
                break;
 
        case CTDB_SRVID_DETACH_DATABASE:
@@ -243,12 +243,12 @@ static int ctdb_message_data_pull(uint8_t *buf, size_t buflen,
 
        case CTDB_SRVID_MEM_DUMP:
                ret = ctdb_srvid_message_pull(buf, buflen, mem_ctx,
-                                             &mdata->msg);
+                                             &mdata->msg, &np);
                break;
 
        case CTDB_SRVID_PUSH_NODE_FLAGS:
                ret = ctdb_node_flag_change_pull(buf, buflen, mem_ctx,
-                                                &mdata->flag_change);
+                                                &mdata->flag_change, &np);
                break;
 
        case CTDB_SRVID_RELOAD_NODES:
@@ -256,7 +256,7 @@ static int ctdb_message_data_pull(uint8_t *buf, size_t buflen,
 
        case CTDB_SRVID_TAKEOVER_RUN:
                ret = ctdb_srvid_message_pull(buf, buflen, mem_ctx,
-                                             &mdata->msg);
+                                             &mdata->msg, &np);
                break;
 
        case CTDB_SRVID_REBALANCE_NODE:
@@ -278,7 +278,8 @@ static int ctdb_message_data_pull(uint8_t *buf, size_t buflen,
                break;
 
        default:
-               ret = ctdb_tdb_data_pull(buf, buflen, mem_ctx, &mdata->data);
+               ret = ctdb_tdb_data_pull(buf, buflen, mem_ctx, &mdata->data,
+                                        &np);
                break;
        }
 
@@ -357,7 +358,7 @@ size_t ctdb_req_message_data_len(struct ctdb_req_header *h,
                                 struct ctdb_req_message_data *c)
 {
        return offsetof(struct ctdb_req_message_wire, data) +
-               ctdb_tdb_data_len(c->data);
+               ctdb_tdb_data_len(&c->data);
 }
 
 int ctdb_req_message_data_push(struct ctdb_req_header *h,
@@ -366,7 +367,7 @@ int ctdb_req_message_data_push(struct ctdb_req_header *h,
 {
        struct ctdb_req_message_wire *wire =
                (struct ctdb_req_message_wire *)buf;
-       size_t length;
+       size_t length, np;
 
        length = ctdb_req_message_data_len(h, message);
        if (*buflen < length) {
@@ -378,8 +379,8 @@ int ctdb_req_message_data_push(struct ctdb_req_header *h,
        ctdb_req_header_push(h, (uint8_t *)&wire->hdr);
 
        wire->srvid = message->srvid;
-       wire->datalen = ctdb_tdb_data_len(message->data);
-       ctdb_tdb_data_push(message->data, wire->data);
+       wire->datalen = ctdb_tdb_data_len(&message->data);
+       ctdb_tdb_data_push(&message->data, wire->data, &np);
 
        return 0;
 }
@@ -391,7 +392,7 @@ int ctdb_req_message_data_pull(uint8_t *buf, size_t buflen,
 {
        struct ctdb_req_message_wire *wire =
                (struct ctdb_req_message_wire *)buf;
-       size_t length;
+       size_t length, np;
        int ret;
 
        length = offsetof(struct ctdb_req_message_wire, data);
@@ -418,7 +419,7 @@ int ctdb_req_message_data_pull(uint8_t *buf, size_t buflen,
        c->srvid = wire->srvid;
 
        ret = ctdb_tdb_data_pull(wire->data, wire->datalen,
-                                mem_ctx, &c->data);
+                                mem_ctx, &c->data, &np);
        if (ret != 0) {
                return ret;
        }