Qnetd improvements

- Complete config and membership node list callbacks
- Add client disconnect callback
- Always send msg_seq_num in node list
- Store config and last membership node list

Signed-off-by: Jan Friesse <jfriesse@redhat.com>

diff --git a/qdevices/corosync-qdevice-net.c b/qdevices/corosync-qdevice-net.c
index b6d272dc9bd0328b639aa93d0747eae67395e6bb..f5755dda58ead330d620d90a10ee181f633bbb65 100644 (file)
--- a/qdevices/corosync-qdevice-net.c
+++ b/qdevices/corosync-qdevice-net.c
@@ -760,7 +760,7 @@ qdevice_net_send_config_node_list(struct qdevice_net_instance *instance, int ini
 
        instance->last_msg_seq_num++;
 
-       if (msg_create_node_list(&send_buffer->buffer, 1, instance->last_msg_seq_num,
+       if (msg_create_node_list(&send_buffer->buffer, instance->last_msg_seq_num,
            (initial ? TLV_NODE_LIST_TYPE_INITIAL_CONFIG : TLV_NODE_LIST_TYPE_CHANGED_CONFIG),
            0, NULL, send_config_version, config_version, 0, TLV_QUORATE_INQUORATE, &nlist) == 0) {
                qdevice_net_log(LOG_ERR, "Can't allocate send buffer for config list msg");
@@ -1477,9 +1477,9 @@ qdevice_net_send_membership_node_list(struct qdevice_net_instance *instance,
        send_config_version = qdevice_net_get_cmap_config_version(instance->cmap_handle,
            &config_version);
 
-       if (msg_create_node_list(&send_buffer->buffer, 1, instance->last_msg_seq_num,
+       if (msg_create_node_list(&send_buffer->buffer, instance->last_msg_seq_num,
            TLV_NODE_LIST_TYPE_MEMBERSHIP,
-           1, ring_id, send_config_version, config_version, 0, TLV_QUORATE_INQUORATE, &nlist) == 0) {
+           1, ring_id, send_config_version, config_version, 1, quorate, &nlist) == 0) {
                qdevice_net_log(LOG_ERR, "Can't allocate send buffer for config list msg");
 
                node_list_free(&nlist);

diff --git a/qdevices/corosync-qnetd.c b/qdevices/corosync-qnetd.c
index 838c926f1620a7ca5cef81f0874b75744b8f09be..2274512681c24ba7c17e1b05fd07faa469a0758c 100644 (file)
--- a/qdevices/corosync-qnetd.c
+++ b/qdevices/corosync-qnetd.c
@@ -697,16 +697,55 @@ qnetd_client_msg_received_node_list(struct qnetd_instance *instance, struct qnet
                return (0);
        }
 
+       if (!msg->seq_number_set) {
+               qnetd_log(LOG_ERR, "Received node list message without seq number set. "
+                   "Sending error reply.");
+
+               if (qnetd_client_send_err(client, msg->seq_number_set, msg->seq_number,
+                   TLV_REPLY_ERROR_CODE_DOESNT_CONTAIN_REQUIRED_OPTION) != 0) {
+                       return (-1);
+               }
+
+               return (0);
+       }
+
        switch (msg->node_list_type) {
        case TLV_NODE_LIST_TYPE_INITIAL_CONFIG:
-               reply_error_code = qnetd_algorithm_config_node_list_received(client,
-                   &msg->nodes, 1, &result_vote);
-               break;
        case TLV_NODE_LIST_TYPE_CHANGED_CONFIG:
+               reply_error_code = qnetd_algorithm_config_node_list_received(client,
+                   msg->seq_number, msg->config_version_set, msg->config_version,
+                   &msg->nodes,
+                   (msg->node_list_type == TLV_NODE_LIST_TYPE_INITIAL_CONFIG),
+                   &result_vote);
                break;
        case TLV_NODE_LIST_TYPE_MEMBERSHIP:
+               if (!msg->ring_id_set) {
+                       qnetd_log(LOG_ERR, "Received node list message without ring id number set. "
+                           "Sending error reply.");
+
+                       if (qnetd_client_send_err(client, msg->seq_number_set, msg->seq_number,
+                           TLV_REPLY_ERROR_CODE_DOESNT_CONTAIN_REQUIRED_OPTION) != 0) {
+                               return (-1);
+                       }
+
+                       return (0);
+               }
+
+               if (!msg->quorate_set) {
+                       qnetd_log(LOG_ERR, "Received node list message without quorate set. "
+                           "Sending error reply.");
+
+                       if (qnetd_client_send_err(client, msg->seq_number_set, msg->seq_number,
+                           TLV_REPLY_ERROR_CODE_DOESNT_CONTAIN_REQUIRED_OPTION) != 0) {
+                               return (-1);
+                       }
+
+                       return (0);
+               }
+
                reply_error_code = qnetd_algorithm_membership_node_list_received(client,
-                   &msg->nodes, &result_vote);
+                   msg->seq_number, msg->config_version_set, msg->config_version,
+                   &msg->ring_id, msg->quorate, &msg->nodes, &result_vote);
                break;
        default:
                errx(1, "qnetd_client_msg_received_node_list fatal error. "
@@ -726,6 +765,35 @@ qnetd_client_msg_received_node_list(struct qnetd_instance *instance, struct qnet
                return (0);
        }
 
+       /*
+        * Store node list for future use
+        */
+       switch (msg->node_list_type) {
+       case TLV_NODE_LIST_TYPE_INITIAL_CONFIG:
+       case TLV_NODE_LIST_TYPE_CHANGED_CONFIG:
+               node_list_free(&client->configuration_node_list);
+               if (node_list_clone(&client->configuration_node_list, &msg->nodes) == -1) {
+                       qnetd_log(LOG_ERR, "Can't alloc config node list clone. "
+                           "Disconnecting client connection.");
+
+                       return (-1);
+               }
+               break;
+       case TLV_NODE_LIST_TYPE_MEMBERSHIP:
+               node_list_free(&client->last_membership_node_list);
+               if (node_list_clone(&client->last_membership_node_list, &msg->nodes) == -1) {
+                       qnetd_log(LOG_ERR, "Can't alloc membership node list clone. "
+                           "Disconnecting client connection.");
+
+                       return (-1);
+               }
+               break;
+       default:
+               errx(1, "qnetd_client_msg_received_node_list fatal error. "
+                   "Unhandled node_list_type");
+               break;
+       }
+
        send_buffer = send_buffer_list_get_new(&client->send_buffer_list);
        if (send_buffer == NULL) {
                qnetd_log(LOG_ERR, "Can't alloc node list reply msg from list. "
@@ -734,8 +802,7 @@ qnetd_client_msg_received_node_list(struct qnetd_instance *instance, struct qnet
                return (-1);
        }
 
-       if (msg_create_node_list_reply(&send_buffer->buffer, msg->seq_number_set, msg->seq_number,
-           result_vote) == -1) {
+       if (msg_create_node_list_reply(&send_buffer->buffer, msg->seq_number, result_vote) == -1) {
                qnetd_log(LOG_ERR, "Can't alloc node list reply msg. "
                    "Disconnecting client connection.");
 
@@ -1012,9 +1079,11 @@ qnetd_client_accept(struct qnetd_instance *instance)
 }
 
 static void
-qnetd_client_disconnect(struct qnetd_instance *instance, struct qnetd_client *client)
+qnetd_client_disconnect(struct qnetd_instance *instance, struct qnetd_client *client,
+    int server_going_down)
 {
 
+       qnetd_algorithm_client_disconnect(client, server_going_down);
        PR_Close(client->socket);
        qnetd_client_list_del(&instance->clients, client);
 }
@@ -1114,7 +1183,7 @@ qnetd_poll(struct qnetd_instance *instance)
                         * If client is scheduled for disconnect, disconnect it
                         */
                        if (client_disconnect) {
-                               qnetd_client_disconnect(instance, client);
+                               qnetd_client_disconnect(instance, client, 0);
                        }
                }
        }
@@ -1170,7 +1239,7 @@ qnetd_instance_destroy(struct qnetd_instance *instance)
        while (client != NULL) {
                client_next = TAILQ_NEXT(client, entries);
 
-               qnetd_client_disconnect(instance, client);
+               qnetd_client_disconnect(instance, client, 1);
 
                client = client_next;
        }

diff --git a/qdevices/msg.c b/qdevices/msg.c
index 24b5e8e37d7fd1b4078af619bc81a1368f6f3d31..bd7304c4f1795c168c6280cdb0b46c38a3c6df83 100644 (file)
--- a/qdevices/msg.c
+++ b/qdevices/msg.c
@@ -502,7 +502,7 @@ small_buf_err:
 }
 
 size_t
-msg_create_node_list(struct dynar *msg, int add_msg_seq_number,
+msg_create_node_list(struct dynar *msg,
     uint32_t msg_seq_number, enum tlv_node_list_type node_list_type,
     int add_ring_id, const struct tlv_ring_id *ring_id,
     int add_config_version, uint64_t config_version,
@@ -517,10 +517,8 @@ msg_create_node_list(struct dynar *msg, int add_msg_seq_number,
        msg_add_type(msg, MSG_TYPE_NODE_LIST);
        msg_add_len(msg);
 
-       if (add_msg_seq_number) {
-               if (tlv_add_msg_seq_number(msg, msg_seq_number) == -1) {
-                       goto small_buf_err;
-               }
+       if (tlv_add_msg_seq_number(msg, msg_seq_number) == -1) {
+               goto small_buf_err;
        }
 
        if (tlv_add_node_list_type(msg, node_list_type) == -1) {
@@ -539,6 +537,12 @@ msg_create_node_list(struct dynar *msg, int add_msg_seq_number,
                }
        }
 
+       if (add_quorate) {
+               if (tlv_add_quorate(msg, quorate) == -1) {
+                       goto small_buf_err;
+               }
+       }
+
        TAILQ_FOREACH(node_info, nodes, entries) {
                node_list_entry_to_tlv_node_info(node_info, &tlv_ni);
 
@@ -556,7 +560,7 @@ small_buf_err:
 }
 
 size_t
-msg_create_node_list_reply(struct dynar *msg, int add_msg_seq_number, uint32_t msg_seq_number,
+msg_create_node_list_reply(struct dynar *msg, uint32_t msg_seq_number,
     enum tlv_vote vote)
 {
 
@@ -565,10 +569,8 @@ msg_create_node_list_reply(struct dynar *msg, int add_msg_seq_number, uint32_t m
        msg_add_type(msg, MSG_TYPE_NODE_LIST_REPLY);
        msg_add_len(msg);
 
-       if (add_msg_seq_number) {
-               if (tlv_add_msg_seq_number(msg, msg_seq_number) == -1) {
-                       goto small_buf_err;
-               }
+       if (tlv_add_msg_seq_number(msg, msg_seq_number) == -1) {
+               goto small_buf_err;
        }
 
        if (tlv_add_vote(msg, vote) == -1) {

diff --git a/qdevices/msg.h b/qdevices/msg.h
index 18a4d40a9e6d0a00bd9bc78b7c0427edd28e598d..b6a3ea3702570a079e2d4e2b9a105bf72cbe96d0 100644 (file)
--- a/qdevices/msg.h
+++ b/qdevices/msg.h
@@ -148,14 +148,14 @@ extern size_t             msg_create_echo_reply(struct dynar *msg,
     const struct dynar *echo_request_msg);
 
 extern size_t          msg_create_node_list(struct dynar *msg,
-    int add_msg_seq_number, uint32_t msg_seq_number, enum tlv_node_list_type node_list_type,
+    uint32_t msg_seq_number, enum tlv_node_list_type node_list_type,
     int add_ring_id, const struct tlv_ring_id *ring_id,
     int add_config_version, uint64_t config_version,
     int add_quorate, enum tlv_quorate quorate,
     const struct node_list *nodes);
 
-extern size_t          msg_create_node_list_reply(struct dynar *msg, int add_msg_seq_number,
-    uint32_t msg_seq_number, enum tlv_vote vote);
+extern size_t          msg_create_node_list_reply(struct dynar *msg, uint32_t msg_seq_number,
+    enum tlv_vote vote);
 
 extern size_t          msg_get_header_length(void);
 

diff --git a/qdevices/node-list.c b/qdevices/node-list.c
index 19f80a6cdb65c921a61ddf0f0568fbbaee914dde..a8ae1d2abf91bbd764844cb509e81c5266f2afe9 100644 (file)
--- a/qdevices/node-list.c
+++ b/qdevices/node-list.c
@@ -75,6 +75,25 @@ node_list_add_from_node_info(struct node_list *list, const struct tlv_node_info
            node_info->node_state));
 }
 
+int
+node_list_clone(struct node_list *dst_list, const struct node_list *src_list)
+{
+       struct node_list_entry *node_entry;
+
+       node_list_init(dst_list);
+
+       TAILQ_FOREACH(node_entry, src_list, entries) {
+               if (node_list_add(dst_list, node_entry->node_id, node_entry->data_center_id,
+                   node_entry->node_state) == NULL) {
+                       node_list_free(dst_list);
+
+                       return (-1);
+               }
+       }
+
+       return (0);
+}
+
 void
 node_list_entry_to_tlv_node_info(const struct node_list_entry *node,
     struct tlv_node_info *node_info)

diff --git a/qdevices/node-list.h b/qdevices/node-list.h
index 2803bf6b3326ab4cf37bda4c4fcd325529f156ad..515095da72df3c6c3b8641c36ea0abfab9f39191 100644 (file)
--- a/qdevices/node-list.h
+++ b/qdevices/node-list.h
@@ -63,6 +63,9 @@ extern struct node_list_entry         *node_list_add(struct node_list *list,
 extern struct node_list_entry          *node_list_add_from_node_info(
     struct node_list *list, const struct tlv_node_info *node_info);
 
+extern int                              node_list_clone(struct node_list *dst_list,
+    const struct node_list *src_list);
+
 extern void                             node_list_free(struct node_list *list);
 
 extern void                             node_list_del(struct node_list *list,

diff --git a/qdevices/qnetd-algo-test.c b/qdevices/qnetd-algo-test.c
index 129a4475467c3d0ed96651f396d4d8f5e4fb4162..7d8c1d01ba8fb259cfa1d9a9daa102c6be64ff3b 100644 (file)
--- a/qdevices/qnetd-algo-test.c
+++ b/qdevices/qnetd-algo-test.c
@@ -115,6 +115,8 @@ qnetd_algo_dump_node_list(struct qnetd_client *client, const struct node_list *n
  * Called after client sent configuration node list
  * All client fields are already set. Nodes is actual node list, initial is used
  * for distrinquish between initial node list and changed node list.
+ * msg_seq_num is 32-bit number set by client. If client sent config file version,
+ * config_version_set is set to 1 and config_version contains valid config file version.
  *
  * Function has to return result_vote. This can be one of ack/nack, ask_later (client
  * should ask later for a vote) or wait_for_reply (client should wait for reply).
@@ -124,6 +126,7 @@ qnetd_algo_dump_node_list(struct qnetd_client *client, const struct node_list *n
  */
 enum tlv_reply_error_code
 qnetd_algo_test_config_node_list_received(struct qnetd_client *client,
+    uint32_t msg_seq_num, int config_version_set, uint64_t config_version,
     const struct node_list *nodes, int initial, enum tlv_vote *result_vote)
 {
 
@@ -131,6 +134,12 @@ qnetd_algo_test_config_node_list_received(struct qnetd_client *client,
            "sent %s node list.", client, client->cluster_name, client->node_id,
            (initial ? "initial" : "changed"));
 
+       qnetd_log(LOG_INFO, "algo-test:   msg seq num %"PRIu32, msg_seq_num);
+
+       if (config_version_set) {
+               qnetd_log(LOG_INFO, "algo-test:   config version %"PRIu64, config_version);
+       }
+
        qnetd_algo_dump_node_list(client, nodes);
 
        *result_vote = TLV_VOTE_ACK;
@@ -138,17 +147,55 @@ qnetd_algo_test_config_node_list_received(struct qnetd_client *client,
        return (TLV_REPLY_ERROR_CODE_NO_ERROR);
 }
 
+/*
+ * Called after client sent membership node list.
+ * All client fields are already set. Nodes is actual node list.
+ * msg_seq_num is 32-bit number set by client. If client sent config file version,
+ * config_version_set is set to 1 and config_version contains valid config file version.
+ * ring_id and quorate are copied from client votequorum callback.
+ *
+ * Function has to return result_vote. This can be one of ack/nack, ask_later (client
+ * should ask later for a vote) or wait_for_reply (client should wait for reply).
+ *
+ * Return TLV_REPLY_ERROR_CODE_NO_ERROR on success, different TLV_REPLY_ERROR_CODE_*
+ * on failure (error is send back to client)
+ */
+
 enum tlv_reply_error_code
 qnetd_algo_test_membership_node_list_received(struct qnetd_client *client,
+    uint32_t msg_seq_num, int config_version_set, uint64_t config_version,
+    const struct tlv_ring_id *ring_id, enum tlv_quorate quorate,
     const struct node_list *nodes, enum tlv_vote *result_vote)
 {
 
        qnetd_log(LOG_INFO, "algo-test: Client %p (cluster %s, node_id %"PRIx32") "
            "sent membership node list.", client, client->cluster_name, client->node_id);
 
+       qnetd_log(LOG_INFO, "algo-test:   msg seq num %"PRIu32, msg_seq_num);
+
+       if (config_version_set) {
+               qnetd_log(LOG_INFO, "algo-test:   config version = %"PRIu64, config_version);
+       }
+
+       qnetd_log(LOG_INFO, "algo-test:   ring id = (%"PRIx32".%"PRIx64")",
+           ring_id->node_id, ring_id->seq);
+       qnetd_log(LOG_INFO, "algo-test:   quorate = %u", quorate);
+
        qnetd_algo_dump_node_list(client, nodes);
 
        *result_vote = TLV_VOTE_ACK;
 
        return (TLV_REPLY_ERROR_CODE_NO_ERROR);
 }
+
+void
+qnetd_algo_test_client_disconnect(struct qnetd_client *client, int server_going_down)
+{
+
+       qnetd_log(LOG_INFO, "algo-test: Client %p (cluster %s, node_id %"PRIx32") "
+           "disconnect", client, client->cluster_name, client->node_id);
+
+       qnetd_log(LOG_INFO, "algo-test:   server going down %u", server_going_down);
+
+       free(client->algorithm_data);
+}

diff --git a/qdevices/qnetd-algo-test.h b/qdevices/qnetd-algo-test.h
index ea82b0cbcf82bec4e37c91a6e75717c5501be1a2..bb62604b8e410b2852a4a32228a5873c7fcd0462 100644 (file)
--- a/qdevices/qnetd-algo-test.h
+++ b/qdevices/qnetd-algo-test.h
@@ -44,11 +44,17 @@ extern "C" {
 extern enum tlv_reply_error_code       qnetd_algo_test_client_init(struct qnetd_client *client);
 
 extern enum tlv_reply_error_code       qnetd_algo_test_config_node_list_received(
-    struct qnetd_client *client, const struct node_list *nodes, int initial,
+    struct qnetd_client *client, uint32_t msg_seq_num, int config_version_set,
+    uint64_t config_version, const struct node_list *nodes, int initial,
     enum tlv_vote *result_vote);
 
 extern enum tlv_reply_error_code       qnetd_algo_test_membership_node_list_received(
-    struct qnetd_client *client, const struct node_list *nodes, enum tlv_vote *result_vote);
+    struct qnetd_client *client, uint32_t msg_seq_num, int config_version_set,
+    uint64_t config_version, const struct tlv_ring_id *ring_id, enum tlv_quorate quorate,
+    const struct node_list *nodes, enum tlv_vote *result_vote);
+
+extern void                            qnetd_algo_test_client_disconnect(
+    struct qnetd_client *client, int server_going_down);
 
 #ifdef __cplusplus
 }

diff --git a/qdevices/qnetd-algorithm.c b/qdevices/qnetd-algorithm.c
index 710f4b365df1f25f084a48a3ac29383e93d0aa68..9ad671cf195df2b9db00603061f504c66de37a14 100644 (file)
--- a/qdevices/qnetd-algorithm.c
+++ b/qdevices/qnetd-algorithm.c
@@ -57,13 +57,14 @@ qnetd_algorithm_client_init(struct qnetd_client *client)
 
 enum tlv_reply_error_code
 qnetd_algorithm_config_node_list_received(struct qnetd_client *client,
+    uint32_t msg_seq_num, int config_version_set, uint64_t config_version,
     const struct node_list *nodes, int initial, enum tlv_vote *result_vote)
 {
 
        switch (client->decision_algorithm) {
        case TLV_DECISION_ALGORITHM_TYPE_TEST:
-               return (qnetd_algo_test_config_node_list_received(client, nodes, initial,
-                   result_vote));
+               return (qnetd_algo_test_config_node_list_received(client, msg_seq_num,
+                   config_version_set, config_version, nodes, initial, result_vote));
                break;
        default:
                errx(1, "qnetd_algorithm_config_node_list_received unhandled "
@@ -77,13 +78,15 @@ qnetd_algorithm_config_node_list_received(struct qnetd_client *client,
 
 enum tlv_reply_error_code
 qnetd_algorithm_membership_node_list_received(struct qnetd_client *client,
+    uint32_t msg_seq_num, int config_version_set, uint64_t config_version,
+    const struct tlv_ring_id *ring_id, enum tlv_quorate quorate,
     const struct node_list *nodes, enum tlv_vote *result_vote)
 {
 
        switch (client->decision_algorithm) {
        case TLV_DECISION_ALGORITHM_TYPE_TEST:
-               return (qnetd_algo_test_membership_node_list_received(client, nodes,
-                   result_vote));
+               return (qnetd_algo_test_membership_node_list_received(client, msg_seq_num,
+                   config_version_set, config_version, ring_id, quorate, nodes, result_vote));
                break;
        default:
                errx(1, "qnetd_algorithm_membership_node_list_received unhandled "
@@ -93,3 +96,17 @@ qnetd_algorithm_membership_node_list_received(struct qnetd_client *client,
 
        return (TLV_REPLY_ERROR_CODE_INTERNAL_ERROR);
 }
+
+void
+qnetd_algorithm_client_disconnect(struct qnetd_client *client, int server_going_down)
+{
+
+       switch (client->decision_algorithm) {
+       case TLV_DECISION_ALGORITHM_TYPE_TEST:
+               qnetd_algo_test_client_disconnect(client, server_going_down);
+               break;
+       default:
+               errx(1, "qnetd_algorithm_client_disconnect unhandled decision algorithm");
+               break;
+       }
+}

diff --git a/qdevices/qnetd-algorithm.h b/qdevices/qnetd-algorithm.h
index 6375a0cc5145cc7ae9d86f6e567977e65b8c017d..1162cba7498321832af4c7de53e632139d6296ed 100644 (file)
--- a/qdevices/qnetd-algorithm.h
+++ b/qdevices/qnetd-algorithm.h
@@ -48,11 +48,17 @@ extern "C" {
 extern enum tlv_reply_error_code       qnetd_algorithm_client_init(struct qnetd_client *client);
 
 extern enum tlv_reply_error_code       qnetd_algorithm_config_node_list_received(
-    struct qnetd_client *client, const struct node_list *nodes, int initial,
+    struct qnetd_client *client, uint32_t msg_seq_num, int config_version_set,
+    uint64_t config_version, const struct node_list *nodes, int initial,
     enum tlv_vote *result_vote);
 
 extern enum tlv_reply_error_code       qnetd_algorithm_membership_node_list_received(
-    struct qnetd_client *client, const struct node_list *nodes, enum tlv_vote *result_vote);
+    struct qnetd_client *client, uint32_t msg_seq_num, int config_version_set,
+    uint64_t config_version, const struct tlv_ring_id *ring_id, enum tlv_quorate quorate,
+    const struct node_list *nodes, enum tlv_vote *result_vote);
+
+extern void                            qnetd_algorithm_client_disconnect(
+    struct qnetd_client *client, int server_going_down);
 
 #ifdef __cplusplus
 }

diff --git a/qdevices/qnetd-client.c b/qdevices/qnetd-client.c
index aa2242b9e06694f5a73d08107263fa78bb4702aa..04040fe25ada248a51724b1c64dfdf986db9e2af 100644 (file)
--- a/qdevices/qnetd-client.c
+++ b/qdevices/qnetd-client.c
@@ -48,12 +48,16 @@ qnetd_client_init(struct qnetd_client *client, PRFileDesc *sock, PRNetAddr *addr
        memcpy(&client->addr, addr, sizeof(*addr));
        dynar_init(&client->receive_buffer, max_receive_size);
        send_buffer_list_init(&client->send_buffer_list, max_send_buffers, max_send_size);
+       node_list_init(&client->configuration_node_list);
+       node_list_init(&client->last_membership_node_list);
 }
 
 void
 qnetd_client_destroy(struct qnetd_client *client)
 {
 
-       dynar_destroy(&client->receive_buffer);
+       node_list_free(&client->last_membership_node_list);
+       node_list_free(&client->configuration_node_list);
        send_buffer_list_free(&client->send_buffer_list);
+       dynar_destroy(&client->receive_buffer);
 }

diff --git a/qdevices/qnetd-client.h b/qdevices/qnetd-client.h
index 8bf0b44e899f9d866396371c423347c7ef02456b..0838bd4bce67c271985ae517674e06cd0e12b910 100644 (file)
--- a/qdevices/qnetd-client.h
+++ b/qdevices/qnetd-client.h
@@ -69,8 +69,8 @@ struct qnetd_client {
        uint32_t heartbeat_interval;
        enum tlv_reply_error_code skipping_msg_reason;
        void *algorithm_data;
-       struct node_list configuration_nodes;
-       struct node_list membership_nodes;
+       struct node_list configuration_node_list;
+       struct node_list last_membership_node_list;
        TAILQ_ENTRY(qnetd_client) entries;
 };