]> git.proxmox.com Git - mirror_corosync.git/blobdiff - exec/totemconfig.c
totemconfig: change udp netmtu value as a constant
[mirror_corosync.git] / exec / totemconfig.c
index e1badad522c57b1b9f12165c4c3b8cfa7b5fea75..b8856073a82e02ef002e1ca5b50c8e43426e4746 100644 (file)
@@ -1,11 +1,12 @@
 /*
  * Copyright (c) 2002-2005 MontaVista Software, Inc.
- * Copyright (c) 2006-2012 Red Hat, Inc.
+ * Copyright (c) 2006-2019 Red Hat, Inc.
  *
  * All rights reserved.
  *
  * Author: Steven Dake (sdake@redhat.com)
  *         Jan Friesse (jfriesse@redhat.com)
+  *        Chrissie Caulfield (ccaulfie@redhat.com)
  *
  * This software licensed under BSD license, the text of which follows:
  *
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <ifaddrs.h>
+#include <netdb.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/param.h>
+#include <sys/utsname.h>
 
 #include <corosync/swab.h>
-#include <corosync/list.h>
+#include <qb/qblist.h>
 #include <qb/qbdefs.h>
+#include <libknet.h>
 #include <corosync/totem/totem.h>
 #include <corosync/config.h>
 #include <corosync/logsys.h>
 #include "totemconfig.h"
 
 #define TOKEN_RETRANSMITS_BEFORE_LOSS_CONST    4
-#define TOKEN_TIMEOUT                          1000
+#define TOKEN_TIMEOUT                          3000
+#define TOKEN_WARNING                          75
+#define TOKEN_COEFFICIENT                      650
 #define JOIN_TIMEOUT                           50
 #define MERGE_TIMEOUT                          200
 #define DOWNCHECK_TIMEOUT                      1000
 #define FAIL_TO_RECV_CONST                     2500
 #define        SEQNO_UNCHANGED_CONST                   30
 #define MINIMUM_TIMEOUT                                (int)(1000/HZ)*3
+#define MINIMUM_TIMEOUT_HOLD                   (int)(MINIMUM_TIMEOUT * 0.8 - (1000/HZ))
 #define MAX_NETWORK_DELAY                      50
 #define WINDOW_SIZE                            50
 #define MAX_MESSAGES                           17
 #define MISS_COUNT_CONST                       5
-#define RRP_PROBLEM_COUNT_TIMEOUT              2000
-#define RRP_PROBLEM_COUNT_THRESHOLD_DEFAULT    10
-#define RRP_PROBLEM_COUNT_THRESHOLD_MIN                2
-#define RRP_AUTORECOVERY_CHECK_TIMEOUT         1000
+#define BLOCK_UNLISTED_IPS                     1
+/* This constant is not used for knet */
+#define UDP_NETMTU                              1500
+
+/* Currently all but PONG_COUNT match the defaults in libknet.h */
+#define KNET_PING_INTERVAL                      1000
+#define KNET_PING_TIMEOUT                       2000
+#define KNET_PING_PRECISION                     2048
+#define KNET_PONG_COUNT                         2
+#define KNET_PMTUD_INTERVAL                     30
+#define KNET_DEFAULT_TRANSPORT                  KNET_TRANSPORT_UDP
 
 #define DEFAULT_PORT                           5405
 
-static char error_string_response[512];
+static char error_string_response[768];
 
 static void add_totem_config_notification(struct totem_config *totem_config);
 
-static void totem_volatile_config_read (struct totem_config *totem_config)
+static void *totem_get_param_by_name(struct totem_config *totem_config, const char *param_name)
 {
+       if (strcmp(param_name, "totem.token") == 0)
+               return &totem_config->token_timeout;
+       if (strcmp(param_name, "totem.token_warning") == 0)
+               return &totem_config->token_warning;
+       if (strcmp(param_name, "totem.token_retransmit") == 0)
+               return &totem_config->token_retransmit_timeout;
+       if (strcmp(param_name, "totem.hold") == 0)
+               return &totem_config->token_hold_timeout;
+       if (strcmp(param_name, "totem.token_retransmits_before_loss_const") == 0)
+               return &totem_config->token_retransmits_before_loss_const;
+       if (strcmp(param_name, "totem.join") == 0)
+               return &totem_config->join_timeout;
+       if (strcmp(param_name, "totem.send_join") == 0)
+               return &totem_config->send_join_timeout;
+       if (strcmp(param_name, "totem.consensus") == 0)
+               return &totem_config->consensus_timeout;
+       if (strcmp(param_name, "totem.merge") == 0)
+               return &totem_config->merge_timeout;
+       if (strcmp(param_name, "totem.downcheck") == 0)
+               return &totem_config->downcheck_timeout;
+       if (strcmp(param_name, "totem.fail_recv_const") == 0)
+               return &totem_config->fail_to_recv_const;
+       if (strcmp(param_name, "totem.seqno_unchanged_const") == 0)
+               return &totem_config->seqno_unchanged_const;
+       if (strcmp(param_name, "totem.heartbeat_failures_allowed") == 0)
+               return &totem_config->heartbeat_failures_allowed;
+       if (strcmp(param_name, "totem.max_network_delay") == 0)
+               return &totem_config->max_network_delay;
+       if (strcmp(param_name, "totem.window_size") == 0)
+               return &totem_config->window_size;
+       if (strcmp(param_name, "totem.max_messages") == 0)
+               return &totem_config->max_messages;
+       if (strcmp(param_name, "totem.miss_count_const") == 0)
+               return &totem_config->miss_count_const;
+       if (strcmp(param_name, "totem.knet_pmtud_interval") == 0)
+               return &totem_config->knet_pmtud_interval;
+       if (strcmp(param_name, "totem.knet_compression_threshold") == 0)
+               return &totem_config->knet_compression_threshold;
+       if (strcmp(param_name, "totem.knet_compression_level") == 0)
+               return &totem_config->knet_compression_level;
+       if (strcmp(param_name, "totem.knet_compression_model") == 0)
+               return totem_config->knet_compression_model;
+       if (strcmp(param_name, "totem.block_unlisted_ips") == 0)
+               return &totem_config->block_unlisted_ips;
+
+       return NULL;
+}
+
+/*
+ * Read key_name from icmap. If key is not found or key_name == delete_key or if allow_zero is false
+ * and readed value is zero, default value is used and stored into totem_config.
+ */
+static void totem_volatile_config_set_uint32_value (struct totem_config *totem_config, icmap_map_t map,
+       const char *key_name, const char *deleted_key, unsigned int default_value,
+       int allow_zero_value)
+{
+       char runtime_key_name[ICMAP_KEYNAME_MAXLEN];
+
+       if (icmap_get_uint32_r(map, key_name, totem_get_param_by_name(totem_config, key_name)) != CS_OK ||
+           (deleted_key != NULL && strcmp(deleted_key, key_name) == 0) ||
+           (!allow_zero_value && *(uint32_t *)totem_get_param_by_name(totem_config, key_name) == 0)) {
+               *(uint32_t *)totem_get_param_by_name(totem_config, key_name) = default_value;
+       }
+
+       /*
+        * Store totem_config value to cmap runtime section
+        */
+       if (strlen("runtime.config.") + strlen(key_name) >= ICMAP_KEYNAME_MAXLEN) {
+               /*
+                * This shouldn't happen
+                */
+               return ;
+       }
+
+       strcpy(runtime_key_name, "runtime.config.");
+       strcat(runtime_key_name, key_name);
+
+       icmap_set_uint32_r(map, runtime_key_name, *(uint32_t *)totem_get_param_by_name(totem_config, key_name));
+}
+
+static void totem_volatile_config_set_int32_value (struct totem_config *totem_config, icmap_map_t map,
+       const char *key_name, const char *deleted_key, int default_value,
+       int allow_zero_value)
+{
+       char runtime_key_name[ICMAP_KEYNAME_MAXLEN];
+
+       if (icmap_get_int32_r(map, key_name, totem_get_param_by_name(totem_config, key_name)) != CS_OK ||
+           (deleted_key != NULL && strcmp(deleted_key, key_name) == 0) ||
+           (!allow_zero_value && *(int32_t *)totem_get_param_by_name(totem_config, key_name) == 0)) {
+               *(int32_t *)totem_get_param_by_name(totem_config, key_name) = default_value;
+       }
+
+       /*
+        * Store totem_config value to cmap runtime section
+        */
+       if (strlen("runtime.config.") + strlen(key_name) >= ICMAP_KEYNAME_MAXLEN) {
+               /*
+                * This shouldn't happen
+                */
+               return ;
+       }
+
+       strcpy(runtime_key_name, "runtime.config.");
+       strcat(runtime_key_name, key_name);
+
+       icmap_set_int32_r(map, runtime_key_name,  *(int32_t *)totem_get_param_by_name(totem_config, key_name));
+}
+
+static void totem_volatile_config_set_string_value (struct totem_config *totem_config, icmap_map_t map,
+       const char *key_name, const char *deleted_key, const char *default_value)
+{
+       char runtime_key_name[ICMAP_KEYNAME_MAXLEN];
+       int res;
+       char *new_config_value;
+       const void *config_value;
+
+       config_value = totem_get_param_by_name(totem_config, key_name);
+
+       res = icmap_get_string_r(map, key_name, (char **)&new_config_value);
+       if (res != CS_OK ||
+           (deleted_key != NULL && strcmp(deleted_key, key_name) == 0)) {
+
+               /* Slightly pointless use of strncpy but it keeps coverity happy */
+               strncpy((char *)config_value, default_value, CONFIG_STRING_LEN_MAX);
+       } else {
+               strncpy((char *)config_value, new_config_value, CONFIG_STRING_LEN_MAX);
+       }
+       if (res == CS_OK) {
+               free(new_config_value);
+       }
+
+       /*
+        * Store totem_config value to cmap runtime section
+        */
+       if (strlen("runtime.config.") + strlen(key_name) >= ICMAP_KEYNAME_MAXLEN) {
+               /*
+                * This shouldn't happen
+                */
+               return ;
+       }
+
+       strcpy(runtime_key_name, "runtime.config.");
+       strcat(runtime_key_name, key_name);
+
+       (void)icmap_set_string_r(map, runtime_key_name, (char *)config_value);
+}
+
+/*
+ * Read string value stored in key_name from icmap, use it as a boolean (yes/no) type, convert it
+ * to integer value (1/0) and store into totem_config.
+ *
+ * If key is not found or key_name == delete_key default value is used
+ * and stored into totem_config.
+ */
+static void totem_volatile_config_set_boolean_value (struct totem_config *totem_config, icmap_map_t map,
+       const char *key_name, const char *deleted_key, unsigned int default_value)
+{
+       char runtime_key_name[ICMAP_KEYNAME_MAXLEN];
        char *str;
+       int val;
+
+       str = NULL;
+       val = default_value;
 
-       icmap_get_uint32("totem.token", &totem_config->token_timeout);
-       icmap_get_uint32("totem.token_retransmit", &totem_config->token_retransmit_timeout);
-       icmap_get_uint32("totem.hold", &totem_config->token_hold_timeout);
-       icmap_get_uint32("totem.token_retransmits_before_loss_const", &totem_config->token_retransmits_before_loss_const);
-       icmap_get_uint32("totem.join", &totem_config->join_timeout);
-       icmap_get_uint32("totem.send_join", &totem_config->send_join_timeout);
-       icmap_get_uint32("totem.consensus", &totem_config->consensus_timeout);
-       icmap_get_uint32("totem.merge", &totem_config->merge_timeout);
-       icmap_get_uint32("totem.downcheck", &totem_config->downcheck_timeout);
-       icmap_get_uint32("totem.fail_recv_const", &totem_config->fail_to_recv_const);
-       icmap_get_uint32("totem.seqno_unchanged_const", &totem_config->seqno_unchanged_const);
-       icmap_get_uint32("totem.rrp_token_expired_timeout", &totem_config->rrp_token_expired_timeout);
-       icmap_get_uint32("totem.rrp_problem_count_timeout", &totem_config->rrp_problem_count_timeout);
-       icmap_get_uint32("totem.rrp_problem_count_threshold", &totem_config->rrp_problem_count_threshold);
-       icmap_get_uint32("totem.rrp_problem_count_mcast_threshold", &totem_config->rrp_problem_count_mcast_threshold);
-       icmap_get_uint32("totem.rrp_autorecovery_check_timeout", &totem_config->rrp_autorecovery_check_timeout);
-       icmap_get_uint32("totem.heartbeat_failures_allowed", &totem_config->heartbeat_failures_allowed);
-       icmap_get_uint32("totem.max_network_delay", &totem_config->max_network_delay);
-       icmap_get_uint32("totem.window_size", &totem_config->window_size);
-       icmap_get_uint32("totem.max_messages", &totem_config->max_messages);
-       icmap_get_uint32("totem.miss_count_const", &totem_config->miss_count_const);
-       if (icmap_get_string("totem.vsftype", &str) == CS_OK) {
-               totem_config->vsf_type = str;
+       if ((deleted_key != NULL && strcmp(deleted_key, key_name) == 0) ||
+           (icmap_get_string_r(map, key_name, &str) != CS_OK)) {
+               /*
+                * Do nothing. str is NULL (icmap_get_string ether not called or
+                * not changed str).
+                */
+       } else {
+               if (strcmp(str, "yes") == 0) {
+                       val = 1;
+               } else if (strcmp(str, "no") == 0) {
+                       val = 0;
+               }
+               free(str);
+       }
+
+       /*
+        * Store totem_config value to cmap runtime section
+        */
+       if (strlen("runtime.config.") + strlen(key_name) >= ICMAP_KEYNAME_MAXLEN) {
+               /*
+                * This shouldn't happen
+                */
+               return ;
        }
+
+       strcpy(runtime_key_name, "runtime.config.");
+       strcat(runtime_key_name, key_name);
+
+       *(uint32_t *)totem_get_param_by_name(totem_config, key_name) = val;
+
+       icmap_set_uint32_r(map, runtime_key_name, val);
 }
 
+/*
+ * Read and validate config values from cmap and store them into totem_config. If key doesn't exists,
+ * default value is stored. deleted_key is name of key beeing processed by delete operation
+ * from cmap. It is considered as non existing even if it can be read. Can be NULL.
+ */
+void totem_volatile_config_read (struct totem_config *totem_config, icmap_map_t temp_map, const char *deleted_key)
+{
+       uint32_t u32;
+
+       totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.token_retransmits_before_loss_const", deleted_key,
+           TOKEN_RETRANSMITS_BEFORE_LOSS_CONST, 0);
+
+       totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.token", deleted_key, TOKEN_TIMEOUT, 0);
+
+       totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.token_warning", deleted_key, TOKEN_WARNING, 1);
+
+       if (totem_config->interfaces[0].member_count > 2) {
+               u32 = TOKEN_COEFFICIENT;
+               icmap_get_uint32_r(temp_map, "totem.token_coefficient", &u32);
+               totem_config->token_timeout += (totem_config->interfaces[0].member_count - 2) * u32;
+
+               /*
+                * Store totem_config value to cmap runtime section
+                */
+               icmap_set_uint32_r(temp_map, "runtime.config.totem.token", totem_config->token_timeout);
+       }
+
+       totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.max_network_delay", deleted_key, MAX_NETWORK_DELAY, 0);
+
+       totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.window_size", deleted_key, WINDOW_SIZE, 0);
 
-static void totem_get_crypto(struct totem_config *totem_config)
+       totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.max_messages", deleted_key, MAX_MESSAGES, 0);
+
+       totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.miss_count_const", deleted_key, MISS_COUNT_CONST, 0);
+       totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.knet_pmtud_interval", deleted_key, KNET_PMTUD_INTERVAL, 0);
+
+       totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.token_retransmit", deleted_key,
+          (int)(totem_config->token_timeout / (totem_config->token_retransmits_before_loss_const + 0.2)), 0);
+
+       totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.hold", deleted_key,
+           (int)(totem_config->token_retransmit_timeout * 0.8 - (1000/HZ)), 0);
+
+       totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.join", deleted_key, JOIN_TIMEOUT, 0);
+
+       totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.consensus", deleted_key,
+           (int)(float)(1.2 * totem_config->token_timeout), 0);
+
+       totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.merge", deleted_key, MERGE_TIMEOUT, 0);
+
+       totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.downcheck", deleted_key, DOWNCHECK_TIMEOUT, 0);
+
+       totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.fail_recv_const", deleted_key, FAIL_TO_RECV_CONST, 0);
+
+       totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.seqno_unchanged_const", deleted_key,
+           SEQNO_UNCHANGED_CONST, 0);
+
+       totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.send_join", deleted_key, 0, 1);
+
+       totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.heartbeat_failures_allowed", deleted_key, 0, 1);
+
+       totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.knet_compression_threshold", deleted_key, 0, 1);
+
+       totem_volatile_config_set_int32_value(totem_config, temp_map, "totem.knet_compression_level", deleted_key, 0, 1);
+
+       totem_volatile_config_set_string_value(totem_config, temp_map, "totem.knet_compression_model", deleted_key, "none");
+
+       totem_volatile_config_set_boolean_value(totem_config, temp_map, "totem.block_unlisted_ips", deleted_key,
+           BLOCK_UNLISTED_IPS);
+}
+
+int totem_volatile_config_validate (
+       struct totem_config *totem_config,
+       icmap_map_t temp_map,
+       const char **error_string)
+{
+       /* Static just to keep them off the stack */
+       static char local_error_reason[512];
+       static char addr_str_buf[INET6_ADDRSTRLEN];
+       const char *error_reason = local_error_reason;
+       char name_key[ICMAP_KEYNAME_MAXLEN];
+       char *name_str;
+       int i, j, num_configured, members;
+       uint32_t tmp_config_value;
+
+       if (totem_config->max_network_delay < MINIMUM_TIMEOUT) {
+               snprintf (local_error_reason, sizeof(local_error_reason),
+                       "The max_network_delay parameter (%d ms) may not be less than (%d ms).",
+                       totem_config->max_network_delay, MINIMUM_TIMEOUT);
+               goto parse_error;
+       }
+
+       if (totem_config->token_timeout < MINIMUM_TIMEOUT) {
+               snprintf (local_error_reason, sizeof(local_error_reason),
+                       "The token timeout parameter (%d ms) may not be less than (%d ms).",
+                       totem_config->token_timeout, MINIMUM_TIMEOUT);
+               goto parse_error;
+       }
+
+       if (totem_config->token_warning > 100 || totem_config->token_warning < 0) {
+               snprintf (local_error_reason, sizeof(local_error_reason),
+                       "The token warning parameter (%d%%) must be between 0 (disabled) and 100.",
+                       totem_config->token_warning);
+               goto parse_error;
+       }
+
+       if (totem_config->token_retransmit_timeout < MINIMUM_TIMEOUT) {
+               if (icmap_get_uint32_r(temp_map, "totem.token_retransmit", &tmp_config_value) == CS_OK) {
+                       snprintf (local_error_reason, sizeof(local_error_reason),
+                               "The token retransmit timeout parameter (%d ms) may not be less than (%d ms).",
+                               totem_config->token_retransmit_timeout, MINIMUM_TIMEOUT);
+                       goto parse_error;
+               } else {
+                       snprintf (local_error_reason, sizeof(local_error_reason),
+                               "Not appropriate token or token_retransmits_before_loss_const value set");
+                       goto parse_error;
+               }
+       }
+
+       if (totem_config->token_hold_timeout < MINIMUM_TIMEOUT_HOLD) {
+               snprintf (local_error_reason, sizeof(local_error_reason),
+                       "The token hold timeout parameter (%d ms) may not be less than (%d ms).",
+                       totem_config->token_hold_timeout, MINIMUM_TIMEOUT_HOLD);
+               goto parse_error;
+       }
+
+       if (totem_config->join_timeout < MINIMUM_TIMEOUT) {
+               snprintf (local_error_reason, sizeof(local_error_reason),
+                       "The join timeout parameter (%d ms) may not be less than (%d ms).",
+                       totem_config->join_timeout, MINIMUM_TIMEOUT);
+               goto parse_error;
+       }
+
+       if (totem_config->consensus_timeout < MINIMUM_TIMEOUT) {
+               snprintf (local_error_reason, sizeof(local_error_reason),
+                       "The consensus timeout parameter (%d ms) may not be less than (%d ms).",
+                       totem_config->consensus_timeout, MINIMUM_TIMEOUT);
+               goto parse_error;
+       }
+
+       if (totem_config->consensus_timeout < totem_config->join_timeout) {
+               snprintf (local_error_reason, sizeof(local_error_reason),
+                       "The consensus timeout parameter (%d ms) may not be less than join timeout (%d ms).",
+                       totem_config->consensus_timeout, totem_config->join_timeout);
+               goto parse_error;
+       }
+
+       if (totem_config->merge_timeout < MINIMUM_TIMEOUT) {
+               snprintf (local_error_reason, sizeof(local_error_reason),
+                       "The merge timeout parameter (%d ms) may not be less than (%d ms).",
+                       totem_config->merge_timeout, MINIMUM_TIMEOUT);
+               goto parse_error;
+       }
+
+       if (totem_config->downcheck_timeout < MINIMUM_TIMEOUT) {
+               snprintf (local_error_reason, sizeof(local_error_reason),
+                       "The downcheck timeout parameter (%d ms) may not be less than (%d ms).",
+                       totem_config->downcheck_timeout, MINIMUM_TIMEOUT);
+               goto parse_error;
+       }
+
+       /* Check that we have nodelist 'name' if there is more than one link */
+       num_configured = 0;
+       members = -1;
+       for (i = 0; i < INTERFACE_MAX; i++) {
+               if (totem_config->interfaces[i].configured) {
+                       if (num_configured == 0) {
+                               members = totem_config->interfaces[i].member_count;
+                       }
+                       num_configured++;
+               }
+       }
+
+       if (num_configured > 1) {
+               /*
+                * This assert is here just to make compiler happy
+                */
+               assert(members != -1);
+               for (i=0; i < members; i++) {
+                       snprintf(name_key, sizeof(name_key), "nodelist.node.%d.name", i);
+
+                       if (icmap_get_string_r(temp_map, name_key, &name_str) != CS_OK) {
+                               snprintf (local_error_reason, sizeof(local_error_reason),
+                                         "for a multi-link configuration, all nodes must have a 'name' attribute");
+                               goto parse_error;
+                       }
+
+                       free(name_str);
+               }
+
+               for (i=0; i < INTERFACE_MAX; i++) {
+                       if (!totem_config->interfaces[i].configured) {
+                               continue;
+                       }
+                       if (totem_config->interfaces[i].member_count != members) {
+                               snprintf (local_error_reason, sizeof(local_error_reason),
+                                         "Not all nodes have the same number of links");
+                               goto parse_error;
+                       }
+               }
+       }
+
+       /* Verify that all nodes on the same link have the same IP family */
+       for (i=0; i < INTERFACE_MAX; i++) {
+               for (j=1; j<totem_config->interfaces[i].member_count; j++) {
+                       if (totem_config->interfaces[i].configured) {
+                               if (totem_config->interfaces[i].member_list[j].family !=
+                                   totem_config->interfaces[i].member_list[0].family) {
+                                       memcpy(addr_str_buf,
+                                           totemip_print(&(totem_config->interfaces[i].member_list[j])),
+                                           sizeof(addr_str_buf));
+
+                                       snprintf (local_error_reason, sizeof(local_error_reason),
+                                                 "Nodes for link %d have different IP families "
+                                                 "(compared %s with %s)", i,
+                                                 addr_str_buf,
+                                                 totemip_print(&(totem_config->interfaces[i].member_list[0])));
+                                       goto parse_error;
+                               }
+                       }
+               }
+       }
+
+       return 0;
+
+parse_error:
+       snprintf (error_string_response, sizeof(error_string_response),
+                "parse error in config: %s\n", error_reason);
+       *error_string = error_string_response;
+       return (-1);
+
+}
+
+static int totem_get_crypto(struct totem_config *totem_config, icmap_map_t map, const char **error_string)
 {
        char *str;
        const char *tmp_cipher;
        const char *tmp_hash;
-       const char *tmp_compat;
+       const char *tmp_model;
 
-       tmp_hash = "sha1";
-       tmp_cipher = "aes256";
-       tmp_compat = "2.2";
+       tmp_hash = "none";
+       tmp_cipher = "none";
+       tmp_model = "none";
 
-       if (icmap_get_string("totem.secauth", &str) == CS_OK) {
-               if (strcmp (str, "off") == 0) {
-                       tmp_hash = "none";
-                       tmp_cipher = "none";
+       if (icmap_get_string_r(map, "totem.crypto_model", &str) == CS_OK) {
+               if (strcmp(str, "nss") == 0) {
+                       tmp_model = "nss";
+               }
+               if (strcmp(str, "openssl") == 0) {
+                       tmp_model = "openssl";
+               }
+               free(str);
+       } else {
+               tmp_model = "nss";
+       }
+
+       if (icmap_get_string_r(map, "totem.secauth", &str) == CS_OK) {
+               if (strcmp(str, "on") == 0) {
+                       tmp_cipher = "aes256";
+                       tmp_hash = "sha256";
                }
                free(str);
        }
 
-       if (icmap_get_string("totem.crypto_cipher", &str) == CS_OK) {
+       if (icmap_get_string_r(map, "totem.crypto_cipher", &str) == CS_OK) {
                if (strcmp(str, "none") == 0) {
                        tmp_cipher = "none";
                }
@@ -146,13 +573,10 @@ static void totem_get_crypto(struct totem_config *totem_config)
                if (strcmp(str, "aes128") == 0) {
                        tmp_cipher = "aes128";
                }
-               if (strcmp(str, "3des") == 0) {
-                       tmp_cipher = "3des";
-               }
                free(str);
        }
 
-       if (icmap_get_string("totem.crypto_hash", &str) == CS_OK) {
+       if (icmap_get_string_r(map, "totem.crypto_hash", &str) == CS_OK) {
                if (strcmp(str, "none") == 0) {
                        tmp_hash = "none";
                }
@@ -174,23 +598,326 @@ static void totem_get_crypto(struct totem_config *totem_config)
                free(str);
        }
 
-       if (icmap_get_string("totem.crypto_compat", &str) == CS_OK) {
-               if (strcmp(str, "2.0") == 0) {
-                       tmp_compat = "2.0";
+       if ((strcmp(tmp_cipher, "none") != 0) &&
+           (strcmp(tmp_hash, "none") == 0)) {
+               *error_string = "crypto_cipher requires crypto_hash with value other than none";
+               return -1;
+       }
+
+       if (strcmp(tmp_model, "none") == 0) {
+               *error_string = "crypto_model should be 'nss' or 'openssl'";
+               return -1;
+       }
+
+       if (strcmp(tmp_cipher, totem_config->crypto_cipher_type) ||
+           strcmp(tmp_hash, totem_config->crypto_hash_type) ||
+           strcmp(tmp_model, totem_config->crypto_model)) {
+               totem_config->crypto_changed = 1;
+           }
+
+       strncpy(totem_config->crypto_cipher_type, tmp_cipher, CONFIG_STRING_LEN_MAX);
+       strncpy(totem_config->crypto_hash_type, tmp_hash, CONFIG_STRING_LEN_MAX);
+       strncpy(totem_config->crypto_model, tmp_model, CONFIG_STRING_LEN_MAX);
+
+       return 0;
+}
+
+static int nodelist_byname(icmap_map_t map, const char *find_name, int strip_domain)
+{
+       icmap_iter_t iter;
+       const char *iter_key;
+       char name_str[ICMAP_KEYNAME_MAXLEN];
+       int res = 0;
+       unsigned int node_pos;
+       char *name;
+       unsigned int namelen;
+
+       iter = icmap_iter_init_r(map, "nodelist.node.");
+       while ((iter_key = icmap_iter_next(iter, NULL, NULL)) != NULL) {
+               res = sscanf(iter_key, "nodelist.node.%u.%s", &node_pos, name_str);
+               if (res != 2) {
+                       continue;
+               }
+               /* ring0_addr is allowed as a fallback */
+               if (strcmp(name_str, "name") && strcmp(name_str, "ring0_addr")) {
+                       continue;
+               }
+               if (icmap_get_string_r(map, iter_key, &name) != CS_OK) {
+                       continue;
+               }
+               namelen = strlen(name);
+
+               if (strip_domain) {
+                       char *dot;
+                       dot = strchr(name, '.');
+                       if (dot) {
+                               namelen = name - dot - 1;
+                       }
+               }
+               if (strncmp(find_name, name, namelen) == 0 &&
+                   strlen(find_name) == strlen(name)) {
+                       icmap_iter_finalize(iter);
+                       return node_pos;
+               }
+       }
+       icmap_iter_finalize(iter);
+       return -1;
+}
+
+/* Compare two addresses - only address part (sin_addr/sin6_addr) is checked */
+static int ipaddr_equal(const struct sockaddr *addr1, const struct sockaddr *addr2)
+{
+       int addrlen = 0;
+       const void *addr1p, *addr2p;
+
+       if (addr1->sa_family != addr2->sa_family)
+               return 0;
+
+       switch (addr1->sa_family) {
+       case AF_INET:
+               addrlen = sizeof(struct in_addr);
+               addr1p = &((struct sockaddr_in *)addr1)->sin_addr;
+               addr2p = &((struct sockaddr_in *)addr2)->sin_addr;
+               break;
+       case AF_INET6:
+               addrlen = sizeof(struct in6_addr);
+               addr1p = &((struct sockaddr_in6 *)addr1)->sin6_addr;
+               addr2p = &((struct sockaddr_in6 *)addr2)->sin6_addr;
+               break;
+       default:
+               assert(0);
+       }
+
+       return (memcmp(addr1p, addr2p, addrlen) == 0);
+}
+
+
+/* Finds the local node and returns its position in the nodelist.
+ * Uses nodelist.local_node_pos as a cache to save effort
+ */
+static int find_local_node(icmap_map_t map, int use_cache)
+{
+       char nodename2[PATH_MAX];
+       char name_str[ICMAP_KEYNAME_MAXLEN];
+       icmap_iter_t iter;
+       const char *iter_key;
+       unsigned int cached_pos;
+       char *dot = NULL;
+       const char *node;
+       struct ifaddrs *ifa, *ifa_list;
+       struct sockaddr *sa;
+       int found = 0;
+       int node_pos = -1;
+       int res;
+       struct utsname utsname;
+
+       /* Check for cached value first */
+       if (use_cache) {
+               if (icmap_get_uint32("nodelist.local_node_pos", &cached_pos) == CS_OK) {
+                       return cached_pos;
                }
-               if (strcmp(str, "2.2") == 0) {
-                       tmp_compat = "2.2";
+       }
+
+       res = uname(&utsname);
+       if (res) {
+               return -1;
+       }
+       node = utsname.nodename;
+
+       /* 1. Exact match */
+       node_pos = nodelist_byname(map, node, 0);
+       if (node_pos > -1) {
+               found = 1;
+               goto ret_found;
+       }
+
+       /* 2. Try to match with increasingly more
+        * specific versions of it
+        */
+       strcpy(nodename2, node);
+       dot = strrchr(nodename2, '.');
+       while (dot) {
+               *dot = '\0';
+
+               node_pos = nodelist_byname(map, nodename2, 0);
+               if (node_pos > -1) {
+                       found = 1;
+                       goto ret_found;
                }
-               free(str);
+               dot = strrchr(nodename2, '.');
        }
 
-       free(totem_config->crypto_cipher_type);
-       free(totem_config->crypto_hash_type);
-       free(totem_config->crypto_compat_type);
+       node_pos = nodelist_byname(map, nodename2, 1);
+       if (node_pos > -1) {
+               found = 1;
+               goto ret_found;
+       }
+
+       /*
+        * The corosync.conf name may not be related to uname at all,
+        * they may match a hostname on some network interface.
+        */
+       if (getifaddrs(&ifa_list))
+               return -1;
+
+       for (ifa = ifa_list; ifa; ifa = ifa->ifa_next) {
+               socklen_t salen = 0;
 
-       totem_config->crypto_cipher_type = strdup(tmp_cipher);
-       totem_config->crypto_hash_type = strdup(tmp_hash);
-       totem_config->crypto_compat_type = strdup(tmp_compat);
+               /* Restore this */
+               strcpy(nodename2, node);
+               sa = ifa->ifa_addr;
+               if (!sa) {
+                       continue;
+               }
+               if (sa->sa_family != AF_INET && sa->sa_family != AF_INET6) {
+                       continue;
+               }
+
+               if (sa->sa_family == AF_INET) {
+                       salen = sizeof(struct sockaddr_in);
+               }
+               if (sa->sa_family == AF_INET6) {
+                       salen = sizeof(struct sockaddr_in6);
+               }
+
+               if (getnameinfo(sa, salen,
+                               nodename2, sizeof(nodename2),
+                               NULL, 0, 0) == 0) {
+
+                       node_pos = nodelist_byname(map, nodename2, 0);
+                       if (node_pos > -1) {
+                               found = 1;
+                               goto out;
+                       }
+
+                       /* Truncate this name and try again */
+                       dot = strchr(nodename2, '.');
+                       if (dot) {
+                               *dot = '\0';
+
+                               node_pos = nodelist_byname(map, nodename2, 0);
+                               if (node_pos > -1) {
+                                       found = 1;
+                                       goto out;
+                               }
+                       }
+               }
+
+               /* See if it's the IP address that's in corosync.conf */
+               if (getnameinfo(sa, sizeof(*sa),
+                               nodename2, sizeof(nodename2),
+                               NULL, 0, NI_NUMERICHOST))
+                       continue;
+
+               node_pos = nodelist_byname(map, nodename2, 0);
+               if (node_pos > -1) {
+                       found = 1;
+                       goto out;
+               }
+       }
+
+ out:
+       if (found) {
+               freeifaddrs(ifa_list);
+               goto ret_found;
+       }
+
+       /*
+        * This section covers the usecase where the nodename specified in cluster.conf
+        * is an alias specified in /etc/hosts. For example:
+        * <ipaddr> hostname alias1 alias2
+        * and <clusternode name="alias2">
+        * the above calls use uname and getnameinfo does not return aliases.
+        * here we take the name specified in cluster.conf, resolve it to an address
+        * and then compare against all known local ip addresses.
+        * if we have a match, we found our nodename. In theory this chunk of code
+        * could replace all the checks above, but let's avoid any possible regressions
+        * and use it as last.
+        */
+
+       iter = icmap_iter_init_r(map, "nodelist.node.");
+       while ((iter_key = icmap_iter_next(iter, NULL, NULL)) != NULL) {
+               char *dbnodename = NULL;
+               struct addrinfo hints;
+               struct addrinfo *result = NULL, *rp = NULL;
+
+               res = sscanf(iter_key, "nodelist.node.%u.%s", &node_pos, name_str);
+               if (res != 2) {
+                       continue;
+               }
+               /* 'ring0_addr' is allowed as a fallback, but 'name' will be found first
+                * because the names are in alpha order.
+                */
+               if (strcmp(name_str, "name") && strcmp(name_str, "ring0_addr")) {
+                       continue;
+               }
+               if (icmap_get_string_r(map, iter_key, &dbnodename) != CS_OK) {
+                       continue;
+               }
+
+               memset(&hints, 0, sizeof(struct addrinfo));
+               hints.ai_family = AF_UNSPEC;
+               hints.ai_socktype = SOCK_DGRAM;
+               hints.ai_flags = 0;
+               hints.ai_protocol = IPPROTO_UDP;
+
+               if (getaddrinfo(dbnodename, NULL, &hints, &result)) {
+                       continue;
+               }
+
+               for (rp = result; rp != NULL; rp = rp->ai_next) {
+                       for (ifa = ifa_list; ifa; ifa = ifa->ifa_next) {
+                               if (ifa->ifa_addr &&
+                                   ipaddr_equal(rp->ai_addr, ifa->ifa_addr)) {
+                                       freeaddrinfo(result);
+                                       found = 1;
+                                       goto out2;
+                               }
+                       }
+               }
+
+               freeaddrinfo(result);
+       }
+out2:
+       icmap_iter_finalize(iter);
+       freeifaddrs(ifa_list);
+
+ret_found:
+       if (found) {
+               res = icmap_set_uint32_r(map, "nodelist.local_node_pos", node_pos);
+       }
+
+       return node_pos;
+}
+
+static enum totem_ip_version_enum totem_config_get_ip_version(struct totem_config *totem_config)
+{
+       enum totem_ip_version_enum res;
+       char *str;
+
+       res = TOTEM_IP_VERSION_6_4;
+
+       if (totem_config->transport_number == TOTEM_TRANSPORT_UDP) {
+               res = TOTEM_IP_VERSION_4;
+       }
+
+       if (icmap_get_string("totem.ip_version", &str) == CS_OK) {
+               if (strcmp(str, "ipv4") == 0) {
+                       res = TOTEM_IP_VERSION_4;
+               }
+               if (strcmp(str, "ipv6") == 0) {
+                       res = TOTEM_IP_VERSION_6;
+               }
+               if (strcmp(str, "ipv6-4") == 0) {
+                       res = TOTEM_IP_VERSION_6_4;
+               }
+               if (strcmp(str, "ipv4-6") == 0) {
+                       res = TOTEM_IP_VERSION_4_6;
+               }
+               free(str);
+       }
+
+       return (res);
 }
 
 static uint16_t generate_cluster_id (const char *cluster_name)
@@ -208,8 +935,8 @@ static uint16_t generate_cluster_id (const char *cluster_name)
 
 static int get_cluster_mcast_addr (
                const char *cluster_name,
-               const struct totem_ip_address *bindnet,
-               unsigned int ringnumber,
+               unsigned int linknumber,
+               enum totem_ip_version_enum ip_version,
                struct totem_ip_address *res)
 {
        uint16_t clusterid;
@@ -220,14 +947,16 @@ static int get_cluster_mcast_addr (
                return (-1);
        }
 
-       clusterid = generate_cluster_id(cluster_name) + ringnumber;
-       memset (res, 0, sizeof(res));
+       clusterid = generate_cluster_id(cluster_name) + linknumber;
+       memset (res, 0, sizeof(*res));
 
-       switch (bindnet->family) {
-       case AF_INET:
+       switch (ip_version) {
+       case TOTEM_IP_VERSION_4:
+       case TOTEM_IP_VERSION_4_6:
                snprintf(addr, sizeof(addr), "239.192.%d.%d", clusterid >> 8, clusterid % 0xFF);
                break;
-       case AF_INET6:
+       case TOTEM_IP_VERSION_6:
+       case TOTEM_IP_VERSION_6_4:
                snprintf(addr, sizeof(addr), "ff15::%x", clusterid);
                break;
        default:
@@ -237,30 +966,53 @@ static int get_cluster_mcast_addr (
                return (-1);
        }
 
-       err = totemip_parse (res, addr, 0);
+       err = totemip_parse (res, addr, ip_version);
 
        return (err);
 }
 
-static int find_local_node_in_nodelist(struct totem_config *totem_config)
+static unsigned int generate_nodeid(
+       struct totem_config *totem_config,
+       char *addr)
+{
+       unsigned int nodeid;
+       struct totem_ip_address totemip;
+
+       /* AF_INET hard-coded here because auto-generated nodeids
+          are only for IPv4 */
+       if (totemip_parse(&totemip, addr, TOTEM_IP_VERSION_4) != 0)
+               return -1;
+
+       memcpy (&nodeid, &totemip.addr, sizeof (unsigned int));
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+       nodeid = swab32 (nodeid);
+#endif
+
+       if (totem_config->clear_node_high_bit) {
+               nodeid &= 0x7FFFFFFF;
+       }
+       return nodeid;
+}
+
+static int check_for_duplicate_nodeids(
+       struct totem_config *totem_config,
+       const char **error_string)
 {
        icmap_iter_t iter;
+       icmap_iter_t subiter;
        const char *iter_key;
        int res = 0;
-       int node_pos;
-       int local_node_pos = -1;
-       struct totem_ip_address bind_addr;
-       int interface_up, interface_num;
+       int retval = 0;
        char tmp_key[ICMAP_KEYNAME_MAXLEN];
-       char *node_addr_str;
-       struct totem_ip_address node_addr;
-
-       res = totemip_iface_check(&totem_config->interfaces[0].bindnet,
-               &bind_addr, &interface_up, &interface_num,
-               totem_config->clear_node_high_bit);
-       if (res == -1) {
-               return (-1);
-       }
+       char *ring0_addr=NULL;
+       char *ring0_addr1=NULL;
+       unsigned int node_pos;
+       unsigned int node_pos1;
+       unsigned int last_node_pos = -1;
+       unsigned int nodeid;
+       unsigned int nodeid1;
+       int autogenerated;
 
        iter = icmap_iter_init("nodelist.node.");
        while ((iter_key = icmap_iter_next(iter, NULL, NULL)) != NULL) {
@@ -269,72 +1021,413 @@ static int find_local_node_in_nodelist(struct totem_config *totem_config)
                        continue;
                }
 
-               if (strcmp(tmp_key, "ring0_addr") != 0) {
+               /*
+                * This relies on the fact the icmap keys are always returned in order
+                * so all of the keys for a node will be grouped together. We're basically
+                * just running the code below once for each node.
+                */
+               if (last_node_pos == node_pos) {
+                       continue;
+               }
+               last_node_pos = node_pos;
+
+               snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "nodelist.node.%u.nodeid", node_pos);
+               autogenerated = 0;
+
+               /* Generated nodeids are only allowed for UDP/UDPU so ring0_addr is valid here */
+               if (icmap_get_uint32(tmp_key, &nodeid) != CS_OK) {
+
+                       snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "nodelist.node.%u.ring0_addr", node_pos);
+                       if (icmap_get_string(tmp_key, &ring0_addr) != CS_OK) {
+                               continue;
+                       }
+
+                       /* Generate nodeid so we can check that auto-generated nodeids don't clash either */
+                       nodeid = generate_nodeid(totem_config, ring0_addr);
+                       if (nodeid == -1) {
+                               continue;
+                       }
+                       autogenerated = 1;
+               }
+
+               node_pos1 = 0;
+               subiter = icmap_iter_init("nodelist.node.");
+               while (((iter_key = icmap_iter_next(subiter, NULL, NULL)) != NULL) && (node_pos1 < node_pos)) {
+                       res = sscanf(iter_key, "nodelist.node.%u.%s", &node_pos1, tmp_key);
+                       if ((res != 2) || (node_pos1 >= node_pos)) {
+                               continue;
+                       }
+
+                       if (strcmp(tmp_key, "nodeid") != 0) {
+                               continue;
+                       }
+
+                       snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "nodelist.node.%u.nodeid", node_pos1);
+                       if (icmap_get_uint32(tmp_key, &nodeid1) != CS_OK) {
+
+                               snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "nodelist.node.%u.ring0_addr", node_pos1);
+                               if (icmap_get_string(tmp_key, &ring0_addr1) != CS_OK) {
+                                       continue;
+                               }
+                               nodeid1 = generate_nodeid(totem_config, ring0_addr1);
+                               if (nodeid1 == -1) {
+                                       continue;
+                               }
+                       }
+
+                       if (nodeid == nodeid1) {
+                               retval = -1;
+                               snprintf (error_string_response, sizeof(error_string_response),
+                                         "Nodeid %u%s%s%s appears twice in corosync.conf", nodeid,
+                                         autogenerated?"(autogenerated from ":"",
+                                         autogenerated?ring0_addr:"",
+                                         autogenerated?")":"");
+                               *error_string = error_string_response;
+                               break;
+                       }
+               }
+               icmap_iter_finalize(subiter);
+       }
+       icmap_iter_finalize(iter);
+       return retval;
+}
+
+
+/*
+ * This needs to be done last of all. It would be nice to do it when reading the
+ * interface params, but the totem params need to have them to be read first. We
+ * need both, so this is a way round that circular dependancy.
+ */
+static void calc_knet_ping_timers(struct totem_config *totem_config)
+{
+       char runtime_key_name[ICMAP_KEYNAME_MAXLEN];
+       int interface;
+
+       for (interface = 0; interface < INTERFACE_MAX; interface++) {
+
+               if (totem_config->interfaces[interface].configured) {
+                       if (!totem_config->interfaces[interface].knet_pong_count) {
+                               totem_config->interfaces[interface].knet_pong_count = KNET_PONG_COUNT;
+                       }
+                       if (!totem_config->interfaces[interface].knet_ping_timeout) {
+                               totem_config->interfaces[interface].knet_ping_timeout =
+                                       totem_config->token_timeout / totem_config->interfaces[interface].knet_pong_count;
+                       }
+                       snprintf(runtime_key_name, sizeof(runtime_key_name),
+                                "runtime.config.totem.interface.%d.knet_ping_timeout", interface);
+                       icmap_set_uint32(runtime_key_name, totem_config->interfaces[interface].knet_ping_timeout);
+
+                       if (!totem_config->interfaces[interface].knet_ping_interval) {
+                               totem_config->interfaces[interface].knet_ping_interval =
+                                       totem_config->token_timeout / (totem_config->interfaces[interface].knet_pong_count * 2);
+                       }
+                       snprintf(runtime_key_name, sizeof(runtime_key_name),
+                                "runtime.config.totem.interface.%d.knet_ping_interval", interface);
+                       icmap_set_uint32(runtime_key_name, totem_config->interfaces[interface].knet_ping_interval);
+               }
+       }
+}
+
+/*
+ * Compute difference between two set of totem interface arrays and commit it.
+ * set1 and set2
+ * are changed so for same ring, ip existing in both set1 and set2 are cleared
+ * (set to 0), and ips which are only in set1 or set2 remains untouched.
+ * totempg_node_add/remove is called.
+ */
+static void compute_and_set_totempg_interfaces(struct totem_interface *set1,
+       struct totem_interface *set2)
+{
+       int ring_no, set1_pos, set2_pos;
+       struct totem_ip_address empty_ip_address;
+
+       memset(&empty_ip_address, 0, sizeof(empty_ip_address));
+
+       for (ring_no = 0; ring_no < INTERFACE_MAX; ring_no++) {
+               if (!set1[ring_no].configured && !set2[ring_no].configured) {
+                       continue;
+               }
+
+               for (set1_pos = 0; set1_pos < set1[ring_no].member_count; set1_pos++) {
+                       for (set2_pos = 0; set2_pos < set2[ring_no].member_count; set2_pos++) {
+                               /*
+                                * For current ring_no remove all set1 items existing
+                                * in set2
+                                */
+                               if (memcmp(&set1[ring_no].member_list[set1_pos],
+                                   &set2[ring_no].member_list[set2_pos],
+                                   sizeof(struct totem_ip_address)) == 0) {
+                                       memset(&set1[ring_no].member_list[set1_pos], 0,
+                                           sizeof(struct totem_ip_address));
+                                       memset(&set2[ring_no].member_list[set2_pos], 0,
+                                           sizeof(struct totem_ip_address));
+                               }
+                       }
+               }
+       }
+
+       for (ring_no = 0; ring_no < INTERFACE_MAX; ring_no++) {
+               for (set1_pos = 0; set1_pos < set1[ring_no].member_count; set1_pos++) {
+                       /*
+                        * All items which remain in set1 and don't exist in set2 any more
+                        * have to be removed.
+                        */
+                       if (memcmp(&set1[ring_no].member_list[set1_pos], &empty_ip_address, sizeof(empty_ip_address)) != 0) {
+                               log_printf(LOGSYS_LEVEL_DEBUG,
+                                       "removing dynamic member %s for ring %u",
+                                       totemip_print(&set1[ring_no].member_list[set1_pos]),
+                                       ring_no);
+
+                               totempg_member_remove(&set1[ring_no].member_list[set1_pos], ring_no);
+                       }
+               }
+               if (!set2[ring_no].configured) {
+                       continue;
+               }
+               for (set2_pos = 0; set2_pos < set2[ring_no].member_count; set2_pos++) {
+                       /*
+                        * All items which remain in set2 and don't exist in set1 are new nodes
+                        * and have to be added.
+                        */
+                       if (memcmp(&set2[ring_no].member_list[set2_pos], &empty_ip_address, sizeof(empty_ip_address)) != 0) {
+                               log_printf(LOGSYS_LEVEL_DEBUG,
+                                       "adding dynamic member %s for ring %u",
+                                       totemip_print(&set2[ring_no].member_list[set2_pos]),
+                                       ring_no);
+
+                               totempg_member_add(&set2[ring_no].member_list[set2_pos], ring_no);
+                       }
+               }
+       }
+}
+
+/*
+ * Configure parameters for links
+ */
+static void configure_link_params(struct totem_config *totem_config, icmap_map_t map)
+{
+       int i;
+       char tmp_key[ICMAP_KEYNAME_MAXLEN];
+       char *addr_string;
+       int err;
+       int local_node_pos = find_local_node(map, 0);
+
+       for (i = 0; i<INTERFACE_MAX; i++) {
+               if (!totem_config->interfaces[i].configured) {
+                       continue;
+               }
+
+               log_printf(LOGSYS_LEVEL_DEBUG, "Configuring link %d params\n", i);
+
+               snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "nodelist.node.%u.ring%u_addr", local_node_pos, i);
+               if (icmap_get_string_r(map, tmp_key, &addr_string) != CS_OK) {
                        continue;
                }
 
-               snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "nodelist.node.%u.ring0_addr", node_pos);
-               if (icmap_get_string(tmp_key, &node_addr_str) != CS_OK) {
+               err = totemip_parse(&totem_config->interfaces[i].local_ip, addr_string, totem_config->ip_version);
+               if (err != 0) {
                        continue;
                }
+               totem_config->interfaces[i].local_ip.nodeid = totem_config->node_id;
+
+               /* In case this is a new link, fill in the defaults if there was no interface{} section for it */
+               if (!totem_config->interfaces[i].knet_link_priority)
+                       totem_config->interfaces[i].knet_link_priority = 1;
+
+               /* knet_ping_interval & knet_ping_timeout are set later once we know all the other params */
+               if (!totem_config->interfaces[i].knet_ping_precision)
+                       totem_config->interfaces[i].knet_ping_precision = KNET_PING_PRECISION;
+               if (!totem_config->interfaces[i].knet_pong_count)
+                       totem_config->interfaces[i].knet_pong_count = KNET_PONG_COUNT;
+               if (!totem_config->interfaces[i].knet_transport)
+                       totem_config->interfaces[i].knet_transport = KNET_TRANSPORT_UDP;
+               if (!totem_config->interfaces[i].ip_port)
+                       totem_config->interfaces[i].ip_port = DEFAULT_PORT + i;
+       }
+}
+
 
-               res = totemip_parse (&node_addr, node_addr_str, 0);
-               free(node_addr_str);
-               if (res == -1) {
-                       continue ;
+static void configure_totem_links(struct totem_config *totem_config, icmap_map_t map)
+{
+       int i;
+
+       for (i = 0; i<INTERFACE_MAX; i++) {
+               if (!totem_config->interfaces[i].configured) {
+                       continue;
                }
 
-               if (totemip_equal(&bind_addr, &node_addr)) {
-                       local_node_pos = node_pos;
+               log_printf(LOGSYS_LEVEL_INFO, "Configuring link %d\n", i);
+
+               totempg_iface_set(&totem_config->interfaces[i].local_ip, totem_config->interfaces[i].ip_port, i);
+       }
+}
+
+/* Check for differences in config that can't be done on-the-fly and print an error */
+static int check_things_have_not_changed(struct totem_config *totem_config, const char **error_string)
+{
+       int i,j,k;
+       const char *ip_str;
+       char addr_buf[INET6_ADDRSTRLEN];
+       int changed = 0;
+
+       for (i = 0; i<INTERFACE_MAX; i++) {
+               if (totem_config->interfaces[i].configured &&
+                   totem_config->orig_interfaces[i].configured) {
+                       if (totem_config->interfaces[i].knet_transport !=
+                           totem_config->orig_interfaces[i].knet_transport) {
+                               log_printf(LOGSYS_LEVEL_ERROR,
+                                          "New config has different knet transport for link %d. Internal value was NOT changed.\n", i);
+                               changed = 1;
+                       }
+
+                       /* Check each nodeid in the new configuration and make sure its IP address on this link has not changed */
+                       for (j=0; j < totem_config->interfaces[i].member_count; j++) {
+                               for (k=0; k < totem_config->orig_interfaces[i].member_count; k++) {
+
+                                       if (totem_config->interfaces[i].member_list[j].nodeid ==
+                                           totem_config->orig_interfaces[i].member_list[k].nodeid) {
+
+                                               /* Found our nodeid - check the IP address */
+                                               if (memcmp(&totem_config->interfaces[i].member_list[j],
+                                                          &totem_config->orig_interfaces[i].member_list[k],
+                                                          sizeof(struct totem_ip_address))) {
+
+                                                       ip_str = totemip_print(&totem_config->orig_interfaces[i].member_list[k]);
+
+                                                       /* if ip_str is NULL then the old address was invalid and is allowed to change */
+                                                       if (ip_str) {
+                                                               strncpy(addr_buf, ip_str, sizeof(addr_buf));
+                                                               addr_buf[sizeof(addr_buf) - 1] = '\0';
+                                                               log_printf(LOGSYS_LEVEL_ERROR,
+                                                                          "new config has different address for link %d (addr changed from %s to %s). Internal value was NOT changed.\n",
+                                                                          i, addr_buf, totemip_print(&totem_config->interfaces[i].member_list[j]));
+                                                               changed = 1;
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
                }
        }
-       icmap_iter_finalize(iter);
 
-       return (local_node_pos);
+       if (changed) {
+               snprintf (error_string_response, sizeof(error_string_response),
+                         "To reconfigure an interface it must be deleted and recreated. A working interface needs to be available to corosync at all times");
+               *error_string = error_string_response;
+               return -1;
+       }
+       return 0;
 }
 
-static void put_nodelist_members_to_config(struct totem_config *totem_config)
+
+static int put_nodelist_members_to_config(struct totem_config *totem_config, icmap_map_t map,
+                                         int reload, const char **error_string)
 {
        icmap_iter_t iter, iter2;
        const char *iter_key, *iter_key2;
        int res = 0;
-       int node_pos;
+       unsigned int node_pos;
        char tmp_key[ICMAP_KEYNAME_MAXLEN];
        char tmp_key2[ICMAP_KEYNAME_MAXLEN];
        char *node_addr_str;
        int member_count;
-       unsigned int ringnumber = 0;
+       unsigned int linknumber = 0;
+       int i, j;
+       int last_node_pos = -1;
+
+       /* Clear out nodelist so we can put the new one in if needed */
+       for (i = 0; i < INTERFACE_MAX; i++) {
+               for (j = 0; j < PROCESSOR_COUNT_MAX; j++) {
+                       memset(&totem_config->interfaces[i].member_list[j], 0, sizeof(struct totem_ip_address));
+               }
+               totem_config->interfaces[i].member_count = 0;
+       }
 
-       iter = icmap_iter_init("nodelist.node.");
+       iter = icmap_iter_init_r(map, "nodelist.node.");
        while ((iter_key = icmap_iter_next(iter, NULL, NULL)) != NULL) {
                res = sscanf(iter_key, "nodelist.node.%u.%s", &node_pos, tmp_key);
                if (res != 2) {
                        continue;
                }
-
-               if (strcmp(tmp_key, "ring0_addr") != 0) {
+               /* If it's the same as the last node_pos then skip it */
+               if (node_pos == last_node_pos) {
                        continue;
                }
+               last_node_pos = node_pos;
 
                snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "nodelist.node.%u.", node_pos);
-               iter2 = icmap_iter_init(tmp_key);
+               iter2 = icmap_iter_init_r(map, tmp_key);
                while ((iter_key2 = icmap_iter_next(iter2, NULL, NULL)) != NULL) {
-                       res = sscanf(iter_key2, "nodelist.node.%u.ring%u%s", &node_pos, &ringnumber, tmp_key2);
+                       unsigned int nodeid;
+                       char *str;
+
+                       snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "nodelist.node.%u.nodeid", node_pos);
+                       if (icmap_get_uint32_r(map, tmp_key, &nodeid) != CS_OK) {
+                               nodeid = 0;
+                       }
+
+                       res = sscanf(iter_key2, "nodelist.node.%u.ring%u%s", &node_pos, &linknumber, tmp_key2);
                        if (res != 3 || strcmp(tmp_key2, "_addr") != 0) {
                                continue;
                        }
+                       if (linknumber >= INTERFACE_MAX) {
+                               snprintf (error_string_response, sizeof(error_string_response),
+                                               "parse error in config: interface ring number %u is bigger than allowed maximum %u\n",
+                                               linknumber, INTERFACE_MAX - 1);
+                               *error_string = error_string_response;
+
+                               icmap_iter_finalize(iter2);
+                               icmap_iter_finalize(iter);
+                               return (-1);
+                       }
 
-                       if (icmap_get_string(iter_key2, &node_addr_str) != CS_OK) {
+                       if (icmap_get_string_r(map, iter_key2, &node_addr_str) != CS_OK) {
                                continue;
                        }
 
-                       member_count = totem_config->interfaces[ringnumber].member_count;
+                       /* Generate nodeids if they are not provided and transport is UDP/U */
+                       if (!nodeid &&
+                           (totem_config->transport_number == TOTEM_TRANSPORT_UDP ||
+                            totem_config->transport_number == TOTEM_TRANSPORT_UDPU)) {
+                               snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "nodelist.node.%u.ring0_addr", node_pos);
+                               if (icmap_get_string_r(map, tmp_key, &str) == CS_OK) {
+                                       nodeid = generate_nodeid(totem_config, str);
+                                       if (nodeid == -1) {
+                                               sprintf(error_string_response,
+                                                   "An IPV6 network requires that a node ID be specified "
+                                                   "for address '%s'.", node_addr_str);
+                                               *error_string = error_string_response;
+                                               free(str);
+
+                                               return (-1);
+                                       }
+
+                                       log_printf(LOGSYS_LEVEL_DEBUG,
+                                                  "Generated nodeid = " CS_PRI_NODE_ID " for %s", nodeid, str);
+                                       free(str);
+                               }
+                       }
+
+                       member_count = totem_config->interfaces[linknumber].member_count;
+                       res = totemip_parse(&totem_config->interfaces[linknumber].member_list[member_count],
+                                               node_addr_str, totem_config->ip_version);
+                       if (res == 0) {
+                               totem_config->interfaces[linknumber].member_list[member_count].nodeid = nodeid;
+                               totem_config->interfaces[linknumber].member_count++;
+                               totem_config->interfaces[linknumber].configured = 1;
+                       } else {
+                               sprintf(error_string_response, "failed to parse node address '%s'\n", node_addr_str);
+                               *error_string = error_string_response;
+
+                               memset(&totem_config->interfaces[linknumber].member_list[member_count], 0,
+                                      sizeof(struct totem_ip_address));
 
-                       res = totemip_parse(&totem_config->interfaces[ringnumber].member_list[member_count],
-                                               node_addr_str, 0);
-                       if (res != -1) {
-                               totem_config->interfaces[ringnumber].member_count++;
+                               free(node_addr_str);
+                               icmap_iter_finalize(iter2);
+                               icmap_iter_finalize(iter);
+                               return -1;
                        }
+
                        free(node_addr_str);
                }
 
@@ -342,93 +1435,302 @@ static void put_nodelist_members_to_config(struct totem_config *totem_config)
        }
 
        icmap_iter_finalize(iter);
+
+       configure_link_params(totem_config, map);
+       if (reload) {
+               log_printf(LOGSYS_LEVEL_DEBUG, "About to reconfigure links from nodelist.\n");
+
+               if (check_things_have_not_changed(totem_config, error_string) == -1) {
+                       return -1;
+               }
+       }
+       return 0;
 }
 
-static void config_convert_nodelist_to_interface(struct totem_config *totem_config)
+static void config_convert_nodelist_to_interface(icmap_map_t map, struct totem_config *totem_config)
 {
-       icmap_iter_t iter;
-       const char *iter_key;
        int res = 0;
        int node_pos;
        char tmp_key[ICMAP_KEYNAME_MAXLEN];
        char tmp_key2[ICMAP_KEYNAME_MAXLEN];
        char *node_addr_str;
-       unsigned int ringnumber = 0;
-       struct list_head addrs;
-       struct list_head *list;
-       struct totem_ip_if_address *if_addr;
-       struct totem_ip_address node_addr;
-       int node_found;
-
-       if (totemip_getifaddrs(&addrs) == -1) {
-               return ;
+       unsigned int linknumber = 0;
+       icmap_iter_t iter;
+       const char *iter_key;
+
+       node_pos = find_local_node(map, 1);
+       if (node_pos > -1) {
+               /*
+                * We found node, so create interface section
+                */
+               snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "nodelist.node.%u.", node_pos);
+               iter = icmap_iter_init_r(map, tmp_key);
+               while ((iter_key = icmap_iter_next(iter, NULL, NULL)) != NULL) {
+                       res = sscanf(iter_key, "nodelist.node.%u.ring%u%s", &node_pos, &linknumber, tmp_key2);
+                       if (res != 3 || strcmp(tmp_key2, "_addr") != 0) {
+                               continue ;
+                       }
+
+                       if (icmap_get_string_r(map, iter_key, &node_addr_str) != CS_OK) {
+                               continue;
+                       }
+
+                       snprintf(tmp_key2, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.bindnetaddr", linknumber);
+                       icmap_set_string_r(map, tmp_key2, node_addr_str);
+                       free(node_addr_str);
+               }
+               icmap_iter_finalize(iter);
        }
+}
 
-       iter = icmap_iter_init("nodelist.node.");
+static int get_interface_params(struct totem_config *totem_config, icmap_map_t map,
+                               const char **error_string, uint64_t *warnings,
+                               int reload)
+{
+       int res = 0;
+       unsigned int linknumber = 0;
+       int member_count = 0;
+       int i;
+       icmap_iter_t iter, member_iter;
+       const char *iter_key;
+       const char *member_iter_key;
+       char linknumber_key[ICMAP_KEYNAME_MAXLEN];
+       char tmp_key[ICMAP_KEYNAME_MAXLEN];
+       uint8_t u8;
+       uint32_t u32;
+       char *str;
+       char *cluster_name = NULL;
+       enum totem_ip_version_enum tmp_ip_version = TOTEM_IP_VERSION_4;
+       int ret = 0;
+
+       if (reload) {
+               for (i=0; i<INTERFACE_MAX; i++) {
+                       /*
+                        * Set back to defaults things that might have been configured and
+                        * now have been taken out of corosync.conf. These won't be caught by the
+                        * code below which only looks at interface{} sections that actually exist.
+                        */
+                       totem_config->interfaces[i].configured = 0;
+                       totem_config->interfaces[i].knet_ping_timeout = 0;
+                       totem_config->interfaces[i].knet_ping_interval = 0;
+                       totem_config->interfaces[i].knet_ping_precision = KNET_PING_PRECISION;
+                       totem_config->interfaces[i].knet_pong_count = KNET_PONG_COUNT;
+               }
+       }
+       if (icmap_get_string_r(map, "totem.cluster_name", &cluster_name) != CS_OK) {
+               cluster_name = NULL;
+       }
+
+       iter = icmap_iter_init_r(map, "totem.interface.");
        while ((iter_key = icmap_iter_next(iter, NULL, NULL)) != NULL) {
-               res = sscanf(iter_key, "nodelist.node.%u.%s", &node_pos, tmp_key);
+               res = sscanf(iter_key, "totem.interface.%[^.].%s", linknumber_key, tmp_key);
                if (res != 2) {
                        continue;
                }
 
-               if (strcmp(tmp_key, "ring0_addr") != 0) {
+               if (strcmp(tmp_key, "bindnetaddr") != 0 && totem_config->transport_number == TOTEM_TRANSPORT_UDP) {
                        continue;
                }
 
-               if (icmap_get_string(iter_key, &node_addr_str) != CS_OK) {
-                       continue ;
-               }
+               member_count = 0;
+               linknumber = atoi(linknumber_key);
 
-               if (totemip_parse(&node_addr, node_addr_str, 0) == -1) {
-                       free(node_addr_str);
-                       continue ;
+               if (linknumber >= INTERFACE_MAX) {
+                       snprintf (error_string_response, sizeof(error_string_response),
+                           "parse error in config: interface ring number %u is bigger than allowed maximum %u\n",
+                           linknumber, INTERFACE_MAX - 1);
+
+                       *error_string = error_string_response;
+                       ret = -1;
+                       goto out;
                }
-               free(node_addr_str);
 
-               /*
-                * Try to find node in if_addrs
-                */
-               node_found = 0;
-               for (list = addrs.next; list != &addrs; list = list->next) {
-                       if_addr = list_entry(list, struct totem_ip_if_address, list);
+               /* These things are only valid for the initial read */
+               if (!reload) {
+                       /*
+                        * Get the bind net address
+                        */
+                       snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.bindnetaddr", linknumber);
 
-                       if (totemip_equal(&node_addr, &if_addr->ip_addr)) {
-                               node_found = 1;
-                               break;
+                       if (icmap_get_string_r(map, tmp_key, &str) == CS_OK) {
+                               res = totemip_parse (&totem_config->interfaces[linknumber].bindnet, str,
+                                                    totem_config->ip_version);
+
+                               if (res) {
+                                       sprintf(error_string_response, "failed to parse bindnet address '%s'\n", str);
+                                       *error_string = error_string_response;
+                                       free(str);
+
+                                       ret = -1;
+                                       goto out;
+                               }
+
+                               free(str);
                        }
-               }
 
-               if (node_found) {
-                       break ;
+                       /*
+                        * Get interface multicast address
+                        */
+                       snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.mcastaddr", linknumber);
+                       if (icmap_get_string_r(map, tmp_key, &str) == CS_OK) {
+                               res = totemip_parse (&totem_config->interfaces[linknumber].mcast_addr, str,
+                                   totem_config->ip_version);
+
+                               if (res) {
+                                       sprintf(error_string_response, "failed to parse mcast address '%s'\n", str);
+                                       *error_string = error_string_response;
+                                       free(str);
+
+                                       ret = -1;
+                                       goto out;
+                               }
+
+                               free(str);
+                       } else if (totem_config->transport_number == TOTEM_TRANSPORT_UDP) {
+                               /*
+                                * User not specified address -> autogenerate one from cluster_name key
+                                * (if available). Return code is intentionally ignored, because
+                                * udpu doesn't need mcastaddr and validity of mcastaddr for udp is
+                                * checked later anyway.
+                                */
+
+                               if (totem_config->interfaces[0].bindnet.family == AF_INET) {
+                                       tmp_ip_version = TOTEM_IP_VERSION_4;
+                               } else if (totem_config->interfaces[0].bindnet.family == AF_INET6) {
+                                       tmp_ip_version = TOTEM_IP_VERSION_6;
+                               }
+
+                               (void)get_cluster_mcast_addr (cluster_name,
+                                                             linknumber,
+                                                             tmp_ip_version,
+                                                             &totem_config->interfaces[linknumber].mcast_addr);
+                       }
+
+                       snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.broadcast", linknumber);
+                       if (icmap_get_string(tmp_key, &str) == CS_OK) {
+                               if (strcmp (str, "yes") == 0) {
+                                       totem_config->broadcast_use = 1;
+                               }
+                               free(str);
+                       }
                }
-       }
 
-       icmap_iter_finalize(iter);
+               /* These things are only valid for the initial read OR a newly-defined link */
+               if (!reload || (totem_config->interfaces[linknumber].configured == 0)) {
+
+                       /*
+                        * Get mcast port
+                        */
+                       snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.mcastport", linknumber);
+                       if (icmap_get_uint16_r(map, tmp_key, &totem_config->interfaces[linknumber].ip_port) != CS_OK) {
+                               if (totem_config->broadcast_use) {
+                                       totem_config->interfaces[linknumber].ip_port = DEFAULT_PORT + (2 * linknumber);
+                               } else {
+                                       totem_config->interfaces[linknumber].ip_port = DEFAULT_PORT + linknumber;
+                               }
+                       }
+
+                       /*
+                        * Get the TTL
+                        */
+                       totem_config->interfaces[linknumber].ttl = 1;
+
+                       snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.ttl", linknumber);
+
+                       if (icmap_get_uint8_r(map, tmp_key, &u8) == CS_OK) {
+                               totem_config->interfaces[linknumber].ttl = u8;
+                       }
+
+                       totem_config->interfaces[linknumber].knet_transport = KNET_DEFAULT_TRANSPORT;
+                       snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.knet_transport", linknumber);
+                       if (icmap_get_string_r(map, tmp_key, &str) == CS_OK) {
+                               if (strcmp(str, "sctp") == 0) {
+                                       totem_config->interfaces[linknumber].knet_transport = KNET_TRANSPORT_SCTP;
+                               }
+                               else if (strcmp(str, "udp") == 0) {
+                                       totem_config->interfaces[linknumber].knet_transport = KNET_TRANSPORT_UDP;
+                               }
+                               else {
+                                       *error_string = "Unrecognised knet_transport. expected 'udp' or 'sctp'";
+                                       ret = -1;
+                                       goto out;
+                               }
+                       }
+               }
+               totem_config->interfaces[linknumber].configured = 1;
 
-       if (node_found) {
                /*
-                * We found node, so create interface section
+                * Get the knet link params
                 */
-               snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "nodelist.node.%u.", node_pos);
-               iter = icmap_iter_init(tmp_key);
-               while ((iter_key = icmap_iter_next(iter, NULL, NULL)) != NULL) {
-                       res = sscanf(iter_key, "nodelist.node.%u.ring%u%s", &node_pos, &ringnumber, tmp_key2);
-                       if (res != 3 || strcmp(tmp_key2, "_addr") != 0) {
-                               continue ;
-                       }
+               totem_config->interfaces[linknumber].knet_link_priority = 1;
+               snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.knet_link_priority", linknumber);
 
-                       if (icmap_get_string(iter_key, &node_addr_str) != CS_OK) {
-                               continue;
+               if (icmap_get_uint8_r(map, tmp_key, &u8) == CS_OK) {
+                       totem_config->interfaces[linknumber].knet_link_priority = u8;
+               }
+
+               totem_config->interfaces[linknumber].knet_ping_interval = 0; /* real default applied later */
+               snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.knet_ping_interval", linknumber);
+               if (icmap_get_uint32_r(map, tmp_key, &u32) == CS_OK) {
+                       totem_config->interfaces[linknumber].knet_ping_interval = u32;
+               }
+               totem_config->interfaces[linknumber].knet_ping_timeout = 0; /* real default applied later */
+               snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.knet_ping_timeout", linknumber);
+               if (icmap_get_uint32_r(map, tmp_key, &u32) == CS_OK) {
+                       totem_config->interfaces[linknumber].knet_ping_timeout = u32;
+               }
+               totem_config->interfaces[linknumber].knet_ping_precision = KNET_PING_PRECISION;
+               snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.knet_ping_precision", linknumber);
+               if (icmap_get_uint32_r(map, tmp_key, &u32) == CS_OK) {
+                       totem_config->interfaces[linknumber].knet_ping_precision = u32;
+               }
+               totem_config->interfaces[linknumber].knet_pong_count = KNET_PONG_COUNT;
+               snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.knet_pong_count", linknumber);
+               if (icmap_get_uint32_r(map, tmp_key, &u32) == CS_OK) {
+                       totem_config->interfaces[linknumber].knet_pong_count = u32;
+               }
+
+               snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.member.", linknumber);
+               member_iter = icmap_iter_init_r(map, tmp_key);
+               while ((member_iter_key = icmap_iter_next(member_iter, NULL, NULL)) != NULL) {
+                       if (member_count == 0) {
+                               if (icmap_get_string("nodelist.node.0.ring0_addr", &str) == CS_OK) {
+                                       free(str);
+                                       *warnings |= TOTEM_CONFIG_WARNING_MEMBERS_IGNORED;
+                                       break;
+                               } else {
+                                       *warnings |= TOTEM_CONFIG_WARNING_MEMBERS_DEPRECATED;
+                               }
                        }
 
-                       snprintf(tmp_key2, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.bindnetaddr", ringnumber);
-                       icmap_set_string(tmp_key2, node_addr_str);
-                       free(node_addr_str);
+                       if (icmap_get_string_r(map, member_iter_key, &str) == CS_OK) {
+                               res = totemip_parse (&totem_config->interfaces[linknumber].member_list[member_count++],
+                                               str, totem_config->ip_version);
+                               if (res) {
+                                       sprintf(error_string_response, "failed to parse node address '%s'\n", str);
+                                       *error_string = error_string_response;
+
+                                       icmap_iter_finalize(member_iter);
+                                       free(str);
+                                       ret = -1;
+                                       goto out;
+                               }
+
+                               free(str);
+                       }
                }
-               icmap_iter_finalize(iter);
+               icmap_iter_finalize(member_iter);
+
+               totem_config->interfaces[linknumber].member_count = member_count;
+
        }
-}
 
+out:
+       icmap_iter_finalize(iter);
+       free(cluster_name);
+
+       return (ret);
+}
 
 extern int totem_config_read (
        struct totem_config *totem_config,
@@ -436,17 +1738,9 @@ extern int totem_config_read (
        uint64_t *warnings)
 {
        int res = 0;
-       char *str;
-       unsigned int ringnumber = 0;
-       int member_count = 0;
-       icmap_iter_t iter, member_iter;
-       const char *iter_key;
-       const char *member_iter_key;
-       char ringnumber_key[ICMAP_KEYNAME_MAXLEN];
+       char *str, *ring0_addr_str;
        char tmp_key[ICMAP_KEYNAME_MAXLEN];
-       uint8_t u8;
        uint16_t u16;
-       char *cluster_name = NULL;
        int i;
        int local_node_pos;
        int nodeid_set;
@@ -460,204 +1754,143 @@ extern int totem_config_read (
                return -1;
        }
 
-       memset (totem_config->interfaces, 0,
-               sizeof (struct totem_interface) * INTERFACE_MAX);
-
-       strcpy (totem_config->rrp_mode, "none");
-
-       icmap_get_uint32("totem.version", (uint32_t *)&totem_config->version);
-
-       totem_get_crypto(totem_config);
-
-       if (icmap_get_string("totem.rrp_mode", &str) == CS_OK) {
-               strcpy (totem_config->rrp_mode, str);
-               free(str);
-       }
-
-       icmap_get_uint32("totem.nodeid", &totem_config->node_id);
-
-       totem_config->clear_node_high_bit = 0;
-       if (icmap_get_string("totem.clear_node_high_bit", &str) == CS_OK) {
-               if (strcmp (str, "yes") == 0) {
-                       totem_config->clear_node_high_bit = 1;
+       totem_config->transport_number = TOTEM_TRANSPORT_KNET;
+       if (icmap_get_string("totem.transport", &str) == CS_OK) {
+               if (strcmp (str, "udpu") == 0) {
+                       totem_config->transport_number = TOTEM_TRANSPORT_UDPU;
+               } else if (strcmp (str, "udp") == 0) {
+                       totem_config->transport_number = TOTEM_TRANSPORT_UDP;
+               } else if (strcmp (str, "knet") == 0) {
+                       totem_config->transport_number = TOTEM_TRANSPORT_KNET;
+               } else {
+                       *error_string = "Invalid transport type. Should be udpu, udp or knet";
+                       free(str);
+                       return -1;
                }
-               free(str);
-       }
-
-       icmap_get_uint32("totem.threads", &totem_config->threads);
-
-       icmap_get_uint32("totem.netmtu", &totem_config->net_mtu);
 
-       icmap_get_string("totem.cluster_name", &cluster_name);
-
-       /*
-        * Get things that might change in the future
-        */
-       totem_volatile_config_read(totem_config);
-
-       if (icmap_get_string("totem.interface.0.bindnetaddr", &str) != CS_OK) {
-               /*
-                * We were not able to find ring 0 bindnet addr. Try to use nodelist informations
-                */
-               config_convert_nodelist_to_interface(totem_config);
-       } else {
                free(str);
        }
 
-       iter = icmap_iter_init("totem.interface.");
-       while ((iter_key = icmap_iter_next(iter, NULL, NULL)) != NULL) {
-               res = sscanf(iter_key, "totem.interface.%[^.].%s", ringnumber_key, tmp_key);
-               if (res != 2) {
-                       continue;
-               }
+       memset (totem_config->interfaces, 0,
+               sizeof (struct totem_interface) * INTERFACE_MAX);
 
-               if (strcmp(tmp_key, "bindnetaddr") != 0) {
-                       continue;
-               }
+       strcpy (totem_config->link_mode, "passive");
 
-               member_count = 0;
+       icmap_get_uint32("totem.version", (uint32_t *)&totem_config->version);
 
-               ringnumber = atoi(ringnumber_key);
+       /* initial crypto load */
+       if (totem_get_crypto(totem_config, icmap_get_global_map(), error_string) != 0) {
+               return -1;
+       }
+       if (totem_config_keyread(totem_config, icmap_get_global_map(), error_string) != 0) {
+               return -1;
+       }
+       totem_config->crypto_index = 1;
+       totem_config->crypto_changed = 0;
 
-               if (ringnumber >= INTERFACE_MAX) {
-                       snprintf (error_string_response, sizeof(error_string_response),
-                           "parse error in config: interface ring number %u is bigger then allowed maximum %u\n",
-                           ringnumber, INTERFACE_MAX - 1);
+       if (icmap_get_string("totem.link_mode", &str) == CS_OK) {
+               if (strlen(str) >= TOTEM_LINK_MODE_BYTES) {
+                       *error_string = "totem.link_mode is too long";
+                       free(str);
 
-                       *error_string = error_string_response;
                        return -1;
                }
+               strcpy (totem_config->link_mode, str);
+               free(str);
+       }
 
-               /*
-                * Get the bind net address
-                */
-               if (icmap_get_string(iter_key, &str) == CS_OK) {
-                       res = totemip_parse (&totem_config->interfaces[ringnumber].bindnet, str,
-                                                    totem_config->interfaces[ringnumber].mcast_addr.family);
-                       free(str);
-               }
-
-               /*
-                * Get interface multicast address
-                */
-               snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.mcastaddr", ringnumber);
-               if (icmap_get_string(tmp_key, &str) == CS_OK) {
-                       res = totemip_parse (&totem_config->interfaces[ringnumber].mcast_addr, str, 0);
-                       free(str);
-               } else {
-                       /*
-                        * User not specified address -> autogenerate one from cluster_name key
-                        * (if available)
-                        */
-                       res = get_cluster_mcast_addr (cluster_name,
-                                       &totem_config->interfaces[ringnumber].bindnet,
-                                       ringnumber,
-                                       &totem_config->interfaces[ringnumber].mcast_addr);
-               }
-
-               totem_config->broadcast_use = 0;
-               snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.broadcast", ringnumber);
-               if (icmap_get_string(tmp_key, &str) == CS_OK) {
-                       if (strcmp (str, "yes") == 0) {
-                               totem_config->broadcast_use = 1;
-                               totemip_parse (
-                                       &totem_config->interfaces[ringnumber].mcast_addr,
-                                       "255.255.255.255", 0);
-                       }
-                       free(str);
-               }
+       icmap_get_uint32("totem.nodeid", &totem_config->node_id);
 
-               /*
-                * Get mcast port
-                */
-               snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.mcastport", ringnumber);
-               if (icmap_get_uint16(tmp_key, &totem_config->interfaces[ringnumber].ip_port) != CS_OK) {
-                       if (totem_config->broadcast_use) {
-                               totem_config->interfaces[ringnumber].ip_port = DEFAULT_PORT + (2 * ringnumber);
-                       } else {
-                               totem_config->interfaces[ringnumber].ip_port = DEFAULT_PORT;
-                       }
+       totem_config->clear_node_high_bit = 0;
+       if (icmap_get_string("totem.clear_node_high_bit", &str) == CS_OK) {
+               if (strcmp (str, "yes") == 0) {
+                       totem_config->clear_node_high_bit = 1;
                }
+               free(str);
+       }
+
+       icmap_get_uint32("totem.threads", &totem_config->threads);
+
+       icmap_get_uint32("totem.netmtu", &totem_config->net_mtu);
+
+       totem_config->ip_version = totem_config_get_ip_version(totem_config);
 
+       if (icmap_get_string("totem.interface.0.bindnetaddr", &str) != CS_OK) {
                /*
-                * Get the TTL
+                * We were not able to find ring 0 bindnet addr. Try to use nodelist informations
                 */
-               totem_config->interfaces[ringnumber].ttl = 1;
+               config_convert_nodelist_to_interface(icmap_get_global_map(), totem_config);
+       } else {
+               if (icmap_get_string("nodelist.node.0.ring0_addr", &ring0_addr_str) == CS_OK) {
+                       /*
+                        * Both bindnetaddr and ring0_addr are set.
+                        * Log warning information, and use nodelist instead
+                        */
+                       *warnings |= TOTEM_CONFIG_BINDNETADDR_NODELIST_SET;
 
-               snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.ttl", ringnumber);
+                       config_convert_nodelist_to_interface(icmap_get_global_map(), totem_config);
 
-               if (icmap_get_uint8(tmp_key, &u8) == CS_OK) {
-                       totem_config->interfaces[ringnumber].ttl = u8;
+                       free(ring0_addr_str);
                }
 
-               snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.member.", ringnumber);
-               member_iter = icmap_iter_init(tmp_key);
-               while ((member_iter_key = icmap_iter_next(member_iter, NULL, NULL)) != NULL) {
-                       if (member_count == 0) {
-                               if (icmap_get_string("nodelist.node.0.ring0_addr", &str) == CS_OK) {
-                                       free(str);
-                                       *warnings |= TOTEM_CONFIG_WARNING_MEMBERS_IGNORED;
-                                       break;
-                               } else {
-                                       *warnings |= TOTEM_CONFIG_WARNING_MEMBERS_DEPRECATED;
-                               }
-                       }
+               free(str);
+       }
 
-                       if (icmap_get_string(member_iter_key, &str) == CS_OK) {
-                               res = totemip_parse (&totem_config->interfaces[ringnumber].member_list[member_count++],
-                                               str, 0);
-                       }
-               }
-               icmap_iter_finalize(member_iter);
+       /*
+        * Broadcast option is global but set in interface section,
+        * so reset before processing interfaces.
+        */
+       totem_config->broadcast_use = 0;
 
-               totem_config->interfaces[ringnumber].member_count = member_count;
-               totem_config->interface_count++;
+       res = get_interface_params(totem_config, icmap_get_global_map(), error_string, warnings, 0);
+       if (res < 0) {
+               return res;
        }
-       icmap_iter_finalize(iter);
 
        /*
-        * Store automatically generated items back to icmap
+        * Use broadcast is global, so if set, make sure to fill mcast addr correctly
+        * broadcast is only supported for UDP so just do interface 0;
         */
-       for (i = 0; i < totem_config->interface_count; i++) {
-               snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.mcastaddr", i);
-               if (icmap_get_string(tmp_key, &str) == CS_OK) {
-                       free(str);
-               } else {
-                       str = (char *)totemip_print(&totem_config->interfaces[i].mcast_addr);
-                       icmap_set_string(tmp_key, str);
-               }
-
-               snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.mcastport", i);
-               if (icmap_get_uint16(tmp_key, &u16) != CS_OK) {
-                       icmap_set_uint16(tmp_key, totem_config->interfaces[i].ip_port);
-               }
+       if (totem_config->broadcast_use) {
+               totemip_parse (&totem_config->interfaces[0].mcast_addr,
+                              "255.255.255.255", TOTEM_IP_VERSION_4);
        }
 
-       totem_config->transport_number = TOTEM_TRANSPORT_UDP;
-       if (icmap_get_string("totem.transport", &str) == CS_OK) {
-               if (strcmp (str, "udpu") == 0) {
-                       totem_config->transport_number = TOTEM_TRANSPORT_UDPU;
-               }
 
-               if (strcmp (str, "iba") == 0) {
-                       totem_config->transport_number = TOTEM_TRANSPORT_RDMA;
+       /*
+        * Store automatically generated items back to icmap only for UDP
+        */
+       if (totem_config->transport_number == TOTEM_TRANSPORT_UDP) {
+               for (i = 0; i < INTERFACE_MAX; i++) {
+                       if (!totem_config->interfaces[i].configured) {
+                               continue;
+                       }
+                       snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.mcastaddr", i);
+                       if (icmap_get_string(tmp_key, &str) == CS_OK) {
+                               free(str);
+                       } else {
+                               str = (char *)totemip_print(&totem_config->interfaces[i].mcast_addr);
+                               icmap_set_string(tmp_key, str);
+                       }
+
+                       snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.mcastport", i);
+                       if (icmap_get_uint16(tmp_key, &u16) != CS_OK) {
+                               icmap_set_uint16(tmp_key, totem_config->interfaces[i].ip_port);
+                       }
                }
-               free(str);
        }
 
-       free(cluster_name);
-
        /*
         * Check existence of nodelist
         */
-       if (icmap_get_string("nodelist.node.0.ring0_addr", &str) == CS_OK) {
+       if ((icmap_get_string("nodelist.node.0.name", &str) == CS_OK) ||
+           (icmap_get_string("nodelist.node.0.ring0_addr", &str) == CS_OK)) {
                free(str);
                /*
                 * find local node
                 */
-               local_node_pos = find_local_node_in_nodelist(totem_config);
+               local_node_pos = find_local_node(icmap_get_global_map(), 1);
                if (local_node_pos != -1) {
-                       icmap_set_uint32("nodelist.local_node_pos", local_node_pos);
 
                        snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "nodelist.node.%u.nodeid", local_node_pos);
 
@@ -665,25 +1898,55 @@ extern int totem_config_read (
                        if (icmap_get_uint32(tmp_key, &totem_config->node_id) == CS_OK && nodeid_set) {
                                *warnings |= TOTEM_CONFIG_WARNING_TOTEM_NODEID_IGNORED;
                        }
+                       if ((totem_config->transport_number == TOTEM_TRANSPORT_KNET) && (!totem_config->node_id)) {
+                               *error_string = "Knet requires an explicit nodeid for the local node";
+                               return -1;
+                       }
 
-                       /*
-                        * Make localnode ring0_addr read only, so we can be sure that local
-                        * node never changes. If rebinding to other IP would be in future
-                        * supported, this must be changed and handled properly!
-                        */
-                       snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "nodelist.node.%u.ring0_addr", local_node_pos);
-                       icmap_set_ro_access(tmp_key, 0, 1);
+                       if ((totem_config->transport_number == TOTEM_TRANSPORT_UDP ||
+                            totem_config->transport_number == TOTEM_TRANSPORT_UDPU) && (!totem_config->node_id)) {
+
+                               snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "nodelist.node.%u.ring0_addr", local_node_pos);
+                               icmap_get_string(tmp_key, &str);
+
+                               totem_config->node_id = generate_nodeid(totem_config, str);
+                               if (totem_config->node_id == -1) {
+                                       *error_string = "An IPV6 network requires that a node ID be specified";
+
+                                       free(str);
+                                       return (-1);
+                               }
+
+                               totem_config->interfaces[0].member_list[local_node_pos].nodeid = totem_config->node_id;
+
+                               free(str);
+                       }
+
+                       /* Users must not change this */
                        icmap_set_ro_access("nodelist.local_node_pos", 0, 1);
                }
 
-               put_nodelist_members_to_config(totem_config);
+               if (put_nodelist_members_to_config(totem_config, icmap_get_global_map(), 0, error_string)) {
+                       return -1;
+               }
        }
 
+       /*
+        * Get things that might change in the future (and can depend on totem_config->interfaces);
+        */
+       totem_volatile_config_read(totem_config, icmap_get_global_map(), NULL);
+
+       calc_knet_ping_timers(totem_config);
+
+       /* This is now done in the totemknet interface callback */
+       /*      configure_totem_links(totem_config, icmap_get_global_map()); */
+
        add_totem_config_notification(totem_config);
 
        return 0;
 }
 
+
 int totem_config_validate (
        struct totem_config *totem_config,
        const char **error_string)
@@ -692,62 +1955,93 @@ int totem_config_validate (
        char parse_error[512];
        const char *error_reason = local_error_reason;
        int i;
+       uint32_t u32;
+       int num_configured = 0;
        unsigned int interface_max = INTERFACE_MAX;
 
-       if (totem_config->interface_count == 0) {
+       for (i = 0; i < INTERFACE_MAX; i++) {
+               if (totem_config->interfaces[i].configured) {
+                       num_configured++;
+               }
+       }
+       if (num_configured == 0) {
                error_reason = "No interfaces defined";
                goto parse_error;
        }
 
-       for (i = 0; i < totem_config->interface_count; i++) {
+       /* Check we found a local node name */
+       if (icmap_get_uint32("nodelist.local_node_pos", &u32) != CS_OK) {
+               error_reason = "No valid name found for local host";
+               goto parse_error;
+       }
+
+       for (i = 0; i < INTERFACE_MAX; i++) {
                /*
                 * Some error checking of parsed data to make sure its valid
                 */
 
                struct totem_ip_address null_addr;
+
+               if (!totem_config->interfaces[i].configured) {
+                       continue;
+               }
+
                memset (&null_addr, 0, sizeof (struct totem_ip_address));
 
-               if ((totem_config->transport_number == 0) &&
+               if ((totem_config->transport_number == TOTEM_TRANSPORT_UDP) &&
                        memcmp (&totem_config->interfaces[i].mcast_addr, &null_addr,
                                sizeof (struct totem_ip_address)) == 0) {
-                       error_reason = "No multicast address specified";
+                       snprintf (local_error_reason, sizeof(local_error_reason),
+                                       "No multicast address specified for interface %u", i);
                        goto parse_error;
                }
 
                if (totem_config->interfaces[i].ip_port == 0) {
-                       error_reason = "No multicast port specified";
+                       snprintf (local_error_reason, sizeof(local_error_reason),
+                                       "No multicast port specified for interface %u", i);
                        goto parse_error;
                }
 
                if (totem_config->interfaces[i].ttl > 255) {
-                       error_reason = "Invalid TTL (should be 0..255)";
+                       snprintf (local_error_reason, sizeof(local_error_reason),
+                                       "Invalid TTL (should be 0..255) for interface %u", i);
                        goto parse_error;
                }
                if (totem_config->transport_number != TOTEM_TRANSPORT_UDP &&
                    totem_config->interfaces[i].ttl != 1) {
-                       error_reason = "Can only set ttl on multicast transport types";
+                       snprintf (local_error_reason, sizeof(local_error_reason),
+                                       "Can only set ttl on multicast transport types for interface %u", i);
+                       goto parse_error;
+               }
+               if (totem_config->interfaces[i].knet_link_priority > 255) {
+                       snprintf (local_error_reason, sizeof(local_error_reason),
+                                       "Invalid link priority (should be 0..255) for interface %u", i);
+                       goto parse_error;
+               }
+               if (totem_config->transport_number != TOTEM_TRANSPORT_KNET &&
+                   totem_config->interfaces[i].knet_link_priority != 1) {
+                       snprintf (local_error_reason, sizeof(local_error_reason),
+                                       "Can only set link priority on knet transport type for interface %u", i);
                        goto parse_error;
                }
 
                if (totem_config->interfaces[i].mcast_addr.family == AF_INET6 &&
                        totem_config->node_id == 0) {
-
-                       error_reason = "An IPV6 network requires that a node ID be specified.";
+                       snprintf (local_error_reason, sizeof(local_error_reason),
+                                       "An IPV6 network requires that a node ID be specified for interface %u", i);
                        goto parse_error;
                }
 
-               if (totem_config->broadcast_use == 0 && totem_config->transport_number == 0) {
+               if (totem_config->broadcast_use == 0 && totem_config->transport_number == TOTEM_TRANSPORT_UDP) {
                        if (totem_config->interfaces[i].mcast_addr.family != totem_config->interfaces[i].bindnet.family) {
-                               error_reason = "Multicast address family does not match bind address family";
+                               snprintf (local_error_reason, sizeof(local_error_reason),
+                                               "Multicast address family does not match bind address family for interface %u", i);
                                goto parse_error;
                        }
 
-                       if (totem_config->interfaces[i].mcast_addr.family != totem_config->interfaces[i].bindnet.family) {
-                               error_reason =  "Not all bind address belong to the same IP family";
-                               goto parse_error;
-                       }
                        if (totemip_is_mcast (&totem_config->interfaces[i].mcast_addr) != 0) {
-                               error_reason = "mcastaddr is not a correct multicast address.";
+                               snprintf (local_error_reason, sizeof(local_error_reason),
+                                               "mcastaddr is not a correct multicast address for interface %u", i);
                                goto parse_error;
                        }
                }
@@ -758,218 +2052,67 @@ int totem_config_validate (
                goto parse_error;
        }
 
-
-       if (totem_config->token_retransmits_before_loss_const == 0) {
-               totem_config->token_retransmits_before_loss_const =
-                       TOKEN_RETRANSMITS_BEFORE_LOSS_CONST;
-       }
-
-       /*
-        * Setup timeout values that are not setup by user
-        */
-       if (totem_config->token_timeout == 0) {
-               totem_config->token_timeout = TOKEN_TIMEOUT;
-       }
-
-       if (totem_config->max_network_delay == 0) {
-               totem_config->max_network_delay = MAX_NETWORK_DELAY;
-       }
-
-       if (totem_config->max_network_delay < MINIMUM_TIMEOUT) {
-               snprintf (local_error_reason, sizeof(local_error_reason),
-                       "The max_network_delay parameter (%d ms) may not be less then (%d ms).",
-                       totem_config->max_network_delay, MINIMUM_TIMEOUT);
-               goto parse_error;
-       }
-
-       if (totem_config->window_size == 0) {
-               totem_config->window_size = WINDOW_SIZE;
-       }
-
-       if (totem_config->max_messages == 0) {
-               totem_config->max_messages = MAX_MESSAGES;
-       }
-
-       if (totem_config->miss_count_const == 0) {
-               totem_config->miss_count_const = MISS_COUNT_CONST;
-       }
-
-       if (totem_config->token_timeout < MINIMUM_TIMEOUT) {
-               snprintf (local_error_reason, sizeof(local_error_reason),
-                       "The token timeout parameter (%d ms) may not be less then (%d ms).",
-                       totem_config->token_timeout, MINIMUM_TIMEOUT);
-               goto parse_error;
-       }
-
-       if (totem_config->token_retransmit_timeout == 0) {
-               totem_config->token_retransmit_timeout =
-                       (int)(totem_config->token_timeout /
-                       (totem_config->token_retransmits_before_loss_const + 0.2));
-       }
-       if (totem_config->token_hold_timeout == 0) {
-               totem_config->token_hold_timeout =
-                       (int)(totem_config->token_retransmit_timeout * 0.8 -
-                       (1000/HZ));
-       }
-       if (totem_config->token_retransmit_timeout < MINIMUM_TIMEOUT) {
-               snprintf (local_error_reason, sizeof(local_error_reason),
-                       "The token retransmit timeout parameter (%d ms) may not be less then (%d ms).",
-                       totem_config->token_retransmit_timeout, MINIMUM_TIMEOUT);
-               goto parse_error;
-       }
-
-       if (totem_config->token_hold_timeout < MINIMUM_TIMEOUT) {
-               snprintf (local_error_reason, sizeof(local_error_reason),
-                       "The token hold timeout parameter (%d ms) may not be less then (%d ms).",
-                       totem_config->token_hold_timeout, MINIMUM_TIMEOUT);
-               goto parse_error;
-       }
-
-       if (totem_config->join_timeout == 0) {
-               totem_config->join_timeout = JOIN_TIMEOUT;
-       }
-
-       if (totem_config->join_timeout < MINIMUM_TIMEOUT) {
-               snprintf (local_error_reason, sizeof(local_error_reason),
-                       "The join timeout parameter (%d ms) may not be less then (%d ms).",
-                       totem_config->join_timeout, MINIMUM_TIMEOUT);
-               goto parse_error;
-       }
-
-       if (totem_config->consensus_timeout == 0) {
-               totem_config->consensus_timeout = (int)(float)(1.2 * totem_config->token_timeout);
-       }
-
-       if (totem_config->consensus_timeout < MINIMUM_TIMEOUT) {
-               snprintf (local_error_reason, sizeof(local_error_reason),
-                       "The consensus timeout parameter (%d ms) may not be less then (%d ms).",
-                       totem_config->consensus_timeout, MINIMUM_TIMEOUT);
-               goto parse_error;
-       }
-
-       if (totem_config->merge_timeout == 0) {
-               totem_config->merge_timeout = MERGE_TIMEOUT;
-       }
-
-       if (totem_config->merge_timeout < MINIMUM_TIMEOUT) {
-               snprintf (local_error_reason, sizeof(local_error_reason),
-                       "The merge timeout parameter (%d ms) may not be less then (%d ms).",
-                       totem_config->merge_timeout, MINIMUM_TIMEOUT);
-               goto parse_error;
-       }
-
-       if (totem_config->downcheck_timeout == 0) {
-               totem_config->downcheck_timeout = DOWNCHECK_TIMEOUT;
+       if (totem_volatile_config_validate(totem_config, icmap_get_global_map(), error_string) == -1) {
+               return (-1);
        }
 
-       if (totem_config->downcheck_timeout < MINIMUM_TIMEOUT) {
-               snprintf (local_error_reason, sizeof(local_error_reason),
-                       "The downcheck timeout parameter (%d ms) may not be less then (%d ms).",
-                       totem_config->downcheck_timeout, MINIMUM_TIMEOUT);
-               goto parse_error;
+       if (check_for_duplicate_nodeids(totem_config, error_string) == -1) {
+               return (-1);
        }
 
        /*
-        * RRP values validation
+        * KNET Link values validation
         */
-       if (strcmp (totem_config->rrp_mode, "none") &&
-               strcmp (totem_config->rrp_mode, "active") &&
-               strcmp (totem_config->rrp_mode, "passive")) {
-               snprintf (local_error_reason, sizeof(local_error_reason),
-                       "The RRP mode \"%s\" specified is invalid.  It must be none, active, or passive.\n", totem_config->rrp_mode);
-               goto parse_error;
-       }
-       if (totem_config->rrp_problem_count_timeout == 0) {
-               totem_config->rrp_problem_count_timeout = RRP_PROBLEM_COUNT_TIMEOUT;
-       }
-       if (totem_config->rrp_problem_count_timeout < MINIMUM_TIMEOUT) {
-               snprintf (local_error_reason, sizeof(local_error_reason),
-                       "The RRP problem count timeout parameter (%d ms) may not be less then (%d ms).",
-                       totem_config->rrp_problem_count_timeout, MINIMUM_TIMEOUT);
-               goto parse_error;
-       }
-       if (totem_config->rrp_problem_count_threshold == 0) {
-               totem_config->rrp_problem_count_threshold = RRP_PROBLEM_COUNT_THRESHOLD_DEFAULT;
-       }
-       if (totem_config->rrp_problem_count_mcast_threshold == 0) {
-               totem_config->rrp_problem_count_mcast_threshold = totem_config->rrp_problem_count_threshold * 10;
-       }
-       if (totem_config->rrp_problem_count_threshold < RRP_PROBLEM_COUNT_THRESHOLD_MIN) {
-               snprintf (local_error_reason, sizeof(local_error_reason),
-                       "The RRP problem count threshold (%d problem count) may not be less then (%d problem count).",
-                       totem_config->rrp_problem_count_threshold, RRP_PROBLEM_COUNT_THRESHOLD_MIN);
-               goto parse_error;
-       }
-       if (totem_config->rrp_problem_count_mcast_threshold < RRP_PROBLEM_COUNT_THRESHOLD_MIN) {
-               snprintf (local_error_reason, sizeof(local_error_reason),
-                       "The RRP multicast problem count threshold (%d problem count) may not be less then (%d problem count).",
-                       totem_config->rrp_problem_count_mcast_threshold, RRP_PROBLEM_COUNT_THRESHOLD_MIN);
-               goto parse_error;
-       }
-       if (totem_config->rrp_token_expired_timeout == 0) {
-               totem_config->rrp_token_expired_timeout =
-                       totem_config->token_retransmit_timeout;
-       }
-
-       if (totem_config->rrp_token_expired_timeout < MINIMUM_TIMEOUT) {
+       if (strcmp (totem_config->link_mode, "active") &&
+               strcmp (totem_config->link_mode, "rr") &&
+               strcmp (totem_config->link_mode, "passive")) {
                snprintf (local_error_reason, sizeof(local_error_reason),
-                       "The RRP token expired timeout parameter (%d ms) may not be less then (%d ms).",
-                       totem_config->rrp_token_expired_timeout, MINIMUM_TIMEOUT);
+                       "The Knet link mode \"%s\" specified is invalid.  It must be active, passive or rr.\n", totem_config->link_mode);
                goto parse_error;
        }
 
-       if (totem_config->rrp_autorecovery_check_timeout == 0) {
-               totem_config->rrp_autorecovery_check_timeout = RRP_AUTORECOVERY_CHECK_TIMEOUT;
-       }
-
-       if (strcmp (totem_config->rrp_mode, "none") == 0) {
+       /* Only Knet does multiple interfaces */
+       if (totem_config->transport_number != TOTEM_TRANSPORT_KNET) {
                interface_max = 1;
        }
-       if (interface_max < totem_config->interface_count) {
+
+       if (interface_max < num_configured) {
                snprintf (parse_error, sizeof(parse_error),
-                       "%d is too many configured interfaces for the rrp_mode setting %s.",
-                       totem_config->interface_count,
-                       totem_config->rrp_mode);
+                         "%d is too many configured interfaces for non-Knet transport.",
+                         num_configured);
                error_reason = parse_error;
                goto parse_error;
        }
 
+       /* Only knet allows crypto */
+       if (totem_config->transport_number != TOTEM_TRANSPORT_KNET) {
+               if ((strcmp(totem_config->crypto_cipher_type, "none") != 0) ||
+                   (strcmp(totem_config->crypto_hash_type, "none") != 0)) {
 
-       if (totem_config->fail_to_recv_const == 0) {
-               totem_config->fail_to_recv_const = FAIL_TO_RECV_CONST;
-       }
-       if (totem_config->seqno_unchanged_const == 0) {
-               totem_config->seqno_unchanged_const = SEQNO_UNCHANGED_CONST;
-       }
-       if (totem_config->net_mtu == 0) {
-               totem_config->net_mtu = 1500;
-       }
-
-       if ((MESSAGE_QUEUE_MAX) < totem_config->max_messages) {
-               snprintf (local_error_reason, sizeof(local_error_reason),
-                       "The max_messages parameter (%d messages) may not be greater then (%d messages).",
-                       totem_config->max_messages, MESSAGE_QUEUE_MAX);
-               goto parse_error;
+                       snprintf (parse_error, sizeof(parse_error),
+                                 "crypto_cipher & crypto_hash are only valid for the Knet transport.");
+                       error_reason = parse_error;
+                       goto parse_error;
+               }
        }
 
-       if (totem_config->threads > SEND_THREADS_MAX) {
-               totem_config->threads = SEND_THREADS_MAX;
-       }
-       if (totem_config->net_mtu > FRAME_SIZE_MAX) {
-               error_reason = "This net_mtu parameter is greater then the maximum frame size";
-               goto parse_error;
-       }
-       if (totem_config->vsf_type == NULL) {
-               totem_config->vsf_type = "none";
+       if (totem_config->net_mtu == 0) {
+               if (totem_config->transport_number == TOTEM_TRANSPORT_KNET) {
+                       totem_config->net_mtu = KNET_MAX_PACKET_SIZE;
+               }
+               else {
+                       totem_config->net_mtu = UDP_NETMTU;
+               }
        }
 
-       return (0);
+       return 0;
 
 parse_error:
        snprintf (error_string_response, sizeof(error_string_response),
                 "parse error in config: %s\n", error_reason);
        *error_string = error_string_response;
        return (-1);
+
 }
 
 static int read_keyfile (
@@ -979,7 +2122,6 @@ static int read_keyfile (
 {
        int fd;
        int res;
-       ssize_t expected_key_len = sizeof (totem_config->private_key);
        int saved_errno;
        char error_str[100];
        const char *error_ptr;
@@ -993,7 +2135,7 @@ static int read_keyfile (
                goto parse_error;
        }
 
-       res = read (fd, totem_config->private_key, expected_key_len);
+       res = read (fd, totem_config->private_key, TOTEM_PRIVATE_KEY_LEN_MAX);
        saved_errno = errno;
        close (fd);
 
@@ -1005,15 +2147,15 @@ static int read_keyfile (
                goto parse_error;
        }
 
-       totem_config->private_key_len = expected_key_len;
-
-       if (res != expected_key_len) {
+       if (res < TOTEM_PRIVATE_KEY_LEN_MIN) {
                snprintf (error_string_response, sizeof(error_string_response),
-                       "Could only read %d bits of 1024 bits from %s.\n",
-                        res * 8, key_location);
+                       "Could only read %d bits of minimum %u bits from %s.\n",
+                        res * 8, TOTEM_PRIVATE_KEY_LEN_MIN * 8, key_location);
                goto parse_error;
        }
 
+       totem_config->private_key_len = res;
+
        return 0;
 
 parse_error:
@@ -1023,15 +2165,22 @@ parse_error:
 
 int totem_config_keyread (
        struct totem_config *totem_config,
+       icmap_map_t map,
        const char **error_string)
 {
        int got_key = 0;
        char *key_location = NULL;
        int res;
        size_t key_len;
+       char old_key[TOTEM_PRIVATE_KEY_LEN_MAX];
+       size_t old_key_len;
 
-       memset (totem_config->private_key, 0, 128);
-       totem_config->private_key_len = 128;
+       /* Take a copy so we can see if it has changed */
+       memcpy(old_key, totem_config->private_key, sizeof(totem_config->private_key));
+       old_key_len = totem_config->private_key_len;
+
+       memset (totem_config->private_key, 0, sizeof(totem_config->private_key));
+       totem_config->private_key_len = 0;
 
        if (strcmp(totem_config->crypto_cipher_type, "none") == 0 &&
            strcmp(totem_config->crypto_hash_type, "none") == 0) {
@@ -1039,7 +2188,7 @@ int totem_config_keyread (
        }
 
        /* cmap may store the location of the key file */
-       if (icmap_get_string("totem.keyfile", &key_location) == CS_OK) {
+       if (icmap_get_string_r(map, "totem.keyfile", &key_location) == CS_OK) {
                res = read_keyfile(key_location, totem_config, error_string);
                free(key_location);
                if (res)  {
@@ -1047,16 +2196,20 @@ int totem_config_keyread (
                }
                got_key = 1;
        } else { /* Or the key itself may be in the cmap */
-               if (icmap_get("totem.key", NULL, &key_len, NULL) == CS_OK) {
-                       if (key_len > sizeof (totem_config->private_key)) {
+               if (icmap_get_r(map, "totem.key", NULL, &key_len, NULL) == CS_OK) {
+                       if (key_len > sizeof(totem_config->private_key)) {
                                sprintf(error_string_response, "key is too long");
                                goto key_error;
                        }
-                       if (icmap_get("totem.key", totem_config->private_key, &key_len, NULL) == CS_OK) {
+                       if (key_len < TOTEM_PRIVATE_KEY_LEN_MIN) {
+                               sprintf(error_string_response, "key is too short");
+                               goto key_error;
+                       }
+                       if (icmap_get_r(map, "totem.key", totem_config->private_key, &key_len, NULL) == CS_OK) {
                                totem_config->private_key_len = key_len;
                                got_key = 1;
                        } else {
-                               sprintf(error_string_response, "can't store private key");
+                               sprintf(error_string_response, "can't load private key");
                                goto key_error;
                        }
                }
@@ -1064,13 +2217,14 @@ int totem_config_keyread (
 
        /* In desperation we read the default filename */
        if (!got_key) {
-               const char *filename = getenv("COROSYNC_TOTEM_AUTHKEY_FILE");
-               if (!filename)
-                       filename = COROSYSCONFDIR "/authkey";
-               res = read_keyfile(filename, totem_config, error_string);
+               res = read_keyfile(COROSYSCONFDIR "/authkey", totem_config, error_string);
                if (res)
                        goto key_error;
+       }
 
+       if (old_key_len != totem_config->private_key_len ||
+           memcmp(old_key, totem_config->private_key, sizeof(totem_config->private_key))) {
+               totem_config->crypto_changed = 1;
        }
 
        return (0);
@@ -1081,6 +2235,54 @@ key_error:
 
 }
 
+int totem_reread_crypto_config(struct totem_config *totem_config, icmap_map_t map, const char **error_string)
+{
+       if (totem_get_crypto(totem_config, map, error_string) != 0) {
+               return -1;
+       }
+       if (totem_config_keyread(totem_config, map, error_string) != 0) {
+               return -1;
+       }
+       return 0;
+}
+
+static void debug_dump_totem_config(const struct totem_config *totem_config)
+{
+
+       log_printf(LOGSYS_LEVEL_DEBUG, "Token Timeout (%d ms) retransmit timeout (%d ms)",
+           totem_config->token_timeout, totem_config->token_retransmit_timeout);
+       if (totem_config->token_warning) {
+               uint32_t token_warning_ms = totem_config->token_warning * totem_config->token_timeout / 100;
+               log_printf(LOGSYS_LEVEL_DEBUG, "Token warning every %d ms (%d%% of Token Timeout)",
+                   token_warning_ms, totem_config->token_warning);
+               if (token_warning_ms < totem_config->token_retransmit_timeout)
+                       log_printf (LOGSYS_LEVEL_DEBUG,
+                               "The token warning interval (%d ms) is less than the token retransmit timeout (%d ms) "
+                               "which can lead to spurious token warnings. Consider increasing the token_warning parameter.",
+                               token_warning_ms, totem_config->token_retransmit_timeout);
+
+       } else
+               log_printf(LOGSYS_LEVEL_DEBUG, "Token warnings disabled");
+       log_printf(LOGSYS_LEVEL_DEBUG, "token hold (%d ms) retransmits before loss (%d retrans)",
+           totem_config->token_hold_timeout, totem_config->token_retransmits_before_loss_const);
+       log_printf(LOGSYS_LEVEL_DEBUG, "join (%d ms) send_join (%d ms) consensus (%d ms) merge (%d ms)",
+           totem_config->join_timeout, totem_config->send_join_timeout, totem_config->consensus_timeout,
+           totem_config->merge_timeout);
+       log_printf(LOGSYS_LEVEL_DEBUG, "downcheck (%d ms) fail to recv const (%d msgs)",
+           totem_config->downcheck_timeout, totem_config->fail_to_recv_const);
+       log_printf(LOGSYS_LEVEL_DEBUG,
+           "seqno unchanged const (%d rotations) Maximum network MTU %d",
+           totem_config->seqno_unchanged_const, totem_config->net_mtu);
+       log_printf(LOGSYS_LEVEL_DEBUG,
+           "window size per rotation (%d messages) maximum messages per rotation (%d messages)",
+           totem_config->window_size, totem_config->max_messages);
+       log_printf(LOGSYS_LEVEL_DEBUG, "missed count const (%d messages)", totem_config->miss_count_const);
+       log_printf(LOGSYS_LEVEL_DEBUG, "heartbeat_failures_allowed (%d)",
+           totem_config->heartbeat_failures_allowed);
+       log_printf(LOGSYS_LEVEL_DEBUG, "max_network_delay (%d ms)", totem_config->max_network_delay);
+}
+
+
 static void totem_change_notify(
        int32_t event,
        const char *key_name,
@@ -1088,7 +2290,99 @@ static void totem_change_notify(
        struct icmap_notify_value old_val,
        void *user_data)
 {
-       totem_volatile_config_read((struct totem_config *)user_data);
+       struct totem_config *totem_config = (struct totem_config *)user_data;
+       uint32_t *param;
+       uint8_t reloading;
+       const char *deleted_key = NULL;
+       const char *error_string;
+
+       /*
+        * If a full reload is in progress then don't do anything until it's done and
+        * can reconfigure it all atomically
+        */
+       if (icmap_get_uint8("config.reload_in_progress", &reloading) == CS_OK && reloading)
+               return;
+
+       param = totem_get_param_by_name((struct totem_config *)user_data, key_name);
+       /*
+        * Process change only if changed key is found in totem_config (-> param is not NULL)
+        * or for special key token_coefficient. token_coefficient key is not stored in
+        * totem_config, but it is used for computation of token timeout.
+        */
+       if (!param && strcmp(key_name, "totem.token_coefficient") != 0)
+               return;
+
+       /*
+        * Values other than UINT32 are not supported, or needed (yet)
+        */
+       switch (event) {
+       case ICMAP_TRACK_DELETE:
+               deleted_key = key_name;
+               break;
+       case ICMAP_TRACK_ADD:
+       case ICMAP_TRACK_MODIFY:
+               deleted_key = NULL;
+               break;
+       default:
+               break;
+       }
+
+       totem_volatile_config_read (totem_config, icmap_get_global_map(), deleted_key);
+       log_printf(LOGSYS_LEVEL_DEBUG, "Totem related config key changed. Dumping actual totem config.");
+       debug_dump_totem_config(totem_config);
+       if (totem_volatile_config_validate(totem_config, icmap_get_global_map(), &error_string) == -1) {
+               log_printf (LOGSYS_LEVEL_ERROR, "%s", error_string);
+               /*
+                * TODO: Consider corosync exit and/or load defaults for volatile
+                * values. For now, log error seems to be enough
+                */
+       }
+}
+
+
+int totemconfig_configure_new_params(
+       struct totem_config *totem_config,
+       icmap_map_t map,
+       const char **error_string)
+{
+       uint64_t warnings = 0LL;
+
+       get_interface_params(totem_config, map, error_string, &warnings, 1);
+       if (put_nodelist_members_to_config (totem_config, map, 1, error_string)) {
+               return -1;
+       }
+
+       calc_knet_ping_timers(totem_config);
+
+       log_printf(LOGSYS_LEVEL_DEBUG, "Configuration reloaded. Dumping actual totem config.");
+       debug_dump_totem_config(totem_config);
+
+       /* Reinstate the local_node_pos */
+       (void)find_local_node(map, 0);
+
+       return 0;
+}
+
+void totemconfig_commit_new_params(
+       struct totem_config *totem_config,
+       icmap_map_t map)
+{
+       struct totem_interface *new_interfaces = NULL;
+
+       new_interfaces = malloc (sizeof (struct totem_interface) * INTERFACE_MAX);
+       assert(new_interfaces != NULL);
+       memcpy(new_interfaces, totem_config->interfaces, sizeof (struct totem_interface) * INTERFACE_MAX);
+
+       /* Set link parameters including local_ip */
+       configure_totem_links(totem_config, map);
+
+       /* Add & remove nodes */
+       compute_and_set_totempg_interfaces(totem_config->orig_interfaces, new_interfaces);
+
+       /* Does basic global params (like compression) */
+       totempg_reconfigure();
+
+       free(new_interfaces);
 }
 
 static void add_totem_config_notification(struct totem_config *totem_config)