/*
* Copyright (c) 2002-2005 MontaVista Software, Inc.
- * Copyright (c) 2006-2013 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 <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 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 BLOCK_UNLISTED_IPS 1
+/* This constant is not used for knet */
+#define UDP_NETMTU 1500
-/* These currently match the defaults in libknet.h */
+/* 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);
-
-/* All the volatile parameters are uint32s, luckily */
-static uint32_t *totem_get_param_by_name(struct totem_config *totem_config, const char *param_name)
+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->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_value (struct totem_config *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(key_name, totem_get_param_by_name(totem_config, key_name)) != CS_OK ||
+ 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 && *totem_get_param_by_name(totem_config, key_name) == 0)) {
- *totem_get_param_by_name(totem_config, key_name) = default_value;
+ (!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);
}
/*
strcpy(runtime_key_name, "runtime.config.");
strcat(runtime_key_name, key_name);
- icmap_set_uint32(runtime_key_name, *totem_get_param_by_name(totem_config, 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;
+
+ 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.
*/
-static void totem_volatile_config_read (struct totem_config *totem_config, const char *deleted_key)
+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_value(totem_config, "totem.token_retransmits_before_loss_const", deleted_key,
+ 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_value(totem_config, "totem.token", deleted_key, TOKEN_TIMEOUT, 0);
+ totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.token", deleted_key, TOKEN_TIMEOUT, 0);
- if (totem_config->interface_count > 0 && totem_config->interfaces[0].member_count > 2) {
+ 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("totem.token_coefficient", &u32);
+ 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("runtime.config.totem.token", totem_config->token_timeout);
+ icmap_set_uint32_r(temp_map, "runtime.config.totem.token", totem_config->token_timeout);
}
- totem_volatile_config_set_value(totem_config, "totem.max_network_delay", deleted_key, MAX_NETWORK_DELAY, 0);
+ totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.max_network_delay", deleted_key, MAX_NETWORK_DELAY, 0);
- totem_volatile_config_set_value(totem_config, "totem.window_size", deleted_key, WINDOW_SIZE, 0);
+ totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.window_size", deleted_key, WINDOW_SIZE, 0);
- totem_volatile_config_set_value(totem_config, "totem.max_messages", deleted_key, MAX_MESSAGES, 0);
+ totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.max_messages", deleted_key, MAX_MESSAGES, 0);
- totem_volatile_config_set_value(totem_config, "totem.miss_count_const", deleted_key, MISS_COUNT_CONST, 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_value(totem_config, "totem.token_retransmit", deleted_key,
+ 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_value(totem_config, "totem.hold", deleted_key,
+ 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_value(totem_config, "totem.join", deleted_key, JOIN_TIMEOUT, 0);
+ totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.join", deleted_key, JOIN_TIMEOUT, 0);
- totem_volatile_config_set_value(totem_config, "totem.consensus", deleted_key,
+ 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_value(totem_config, "totem.merge", deleted_key, MERGE_TIMEOUT, 0);
+ totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.merge", deleted_key, MERGE_TIMEOUT, 0);
- totem_volatile_config_set_value(totem_config, "totem.downcheck", deleted_key, DOWNCHECK_TIMEOUT, 0);
+ totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.downcheck", deleted_key, DOWNCHECK_TIMEOUT, 0);
- totem_volatile_config_set_value(totem_config, "totem.fail_recv_const", deleted_key, FAIL_TO_RECV_CONST, 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_value(totem_config, "totem.seqno_unchanged_const", deleted_key,
+ totem_volatile_config_set_uint32_value(totem_config, temp_map, "totem.seqno_unchanged_const", deleted_key,
SEQNO_UNCHANGED_CONST, 0);
- totem_volatile_config_set_value(totem_config, "totem.send_join", deleted_key, 0, 1);
+ 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_value(totem_config, "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);
}
-static int totem_volatile_config_validate (
+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),
goto parse_error;
}
- if (totem_config->token_retransmit_timeout < MINIMUM_TIMEOUT) {
+ if (totem_config->token_warning > 100 || totem_config->token_warning < 0) {
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);
+ "The token warning parameter (%d%%) must be between 0 (disabled) and 100.",
+ totem_config->token_warning);
goto parse_error;
}
- if (totem_config->token_hold_timeout < MINIMUM_TIMEOUT) {
+ 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);
+ totem_config->token_hold_timeout, MINIMUM_TIMEOUT_HOLD);
goto parse_error;
}
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:
}
-static int totem_get_crypto(struct totem_config *totem_config)
+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_model;
tmp_hash = "none";
tmp_cipher = "none";
+ tmp_model = "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";
}
if (strcmp(str, "aes128") == 0) {
tmp_cipher = "aes128";
}
- if (strcmp(str, "aes256") == 0) {
- tmp_cipher = "aes256";
- }
- 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";
}
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;
}
- free(totem_config->crypto_cipher_type);
- free(totem_config->crypto_hash_type);
+ 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;
+ }
- totem_config->crypto_cipher_type = strdup(tmp_cipher);
- totem_config->crypto_hash_type = strdup(tmp_hash);
+ 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 totem_config_get_ip_version(void)
+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;
+ }
+ }
+
+ 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;
+ }
+ dot = strrchr(nodename2, '.');
+ }
+
+ 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;
+
+ /* 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 = AF_INET;
+ 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 = AF_INET;
+ res = TOTEM_IP_VERSION_4;
}
if (strcmp(str, "ipv6") == 0) {
- res = AF_INET6;
+ 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);
}
static int get_cluster_mcast_addr (
const char *cluster_name,
unsigned int linknumber,
- int ip_version,
+ enum totem_ip_version_enum ip_version,
struct totem_ip_address *res)
{
uint16_t clusterid;
memset (res, 0, sizeof(*res));
switch (ip_version) {
- case AF_INET:
+ 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:
return (err);
}
-static unsigned int generate_nodeid_for_duplicate_test(
+static unsigned int generate_nodeid(
struct totem_config *totem_config,
char *addr)
{
/* AF_INET hard-coded here because auto-generated nodeids
are only for IPv4 */
- if (totemip_parse(&totemip, addr, AF_INET) != 0)
+ if (totemip_parse(&totemip, addr, TOTEM_IP_VERSION_4) != 0)
return -1;
memcpy (&nodeid, &totemip.addr, sizeof (unsigned int));
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;
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);
}
/* Generate nodeid so we can check that auto-generated nodeids don't clash either */
- nodeid = generate_nodeid_for_duplicate_test(totem_config, ring0_addr);
+ nodeid = generate_nodeid(totem_config, ring0_addr);
if (nodeid == -1) {
continue;
}
continue;
}
- if (strcmp(tmp_key, "ring0_addr") != 0) {
+ if (strcmp(tmp_key, "nodeid") != 0) {
continue;
}
if (icmap_get_string(tmp_key, &ring0_addr1) != CS_OK) {
continue;
}
- nodeid1 = generate_nodeid_for_duplicate_test(totem_config, ring0_addr1);
+ nodeid1 = generate_nodeid(totem_config, ring0_addr1);
if (nodeid1 == -1) {
continue;
}
autogenerated?"(autogenerated from ":"",
autogenerated?ring0_addr:"",
autogenerated?")":"");
- log_printf (LOGSYS_LEVEL_ERROR, error_string_response);
*error_string = error_string_response;
break;
}
}
-static int find_local_node_in_nodelist(struct totem_config *totem_config)
+/*
+ * 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)
{
- icmap_iter_t iter;
- const char *iter_key;
- int res = 0;
- unsigned int node_pos;
- int local_node_pos = -1;
- struct totem_ip_address bind_addr;
- int interface_up, interface_num;
- 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);
- }
-
- iter = icmap_iter_init("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) {
- continue;
- }
+ char runtime_key_name[ICMAP_KEYNAME_MAXLEN];
+ int interface;
- snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "nodelist.node.%u.ring0_addr", node_pos);
- if (icmap_get_string(tmp_key, &node_addr_str) != CS_OK) {
- continue;
- }
+ for (interface = 0; interface < INTERFACE_MAX; interface++) {
- res = totemip_parse (&node_addr, node_addr_str, totem_config->ip_version);
- free(node_addr_str);
- if (res == -1) {
- continue ;
- }
+ 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 (totemip_equal(&bind_addr, &node_addr)) {
- local_node_pos = node_pos;
+ 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);
}
}
- icmap_iter_finalize(iter);
-
- return (local_node_pos);
}
/*
- * Compute difference between two set of totem interface arrays. set1 and set2
+ * 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_interfaces_diff(int interface_count,
- struct totem_interface *set1,
+static void compute_and_set_totempg_interfaces(struct totem_interface *set1,
struct totem_interface *set2)
{
int ring_no, set1_pos, set2_pos;
memset(&empty_ip_address, 0, sizeof(empty_ip_address));
- for (ring_no = 0; ring_no < interface_count; ring_no++) {
+ 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 (ring_no = 0; ring_no < interface_count; ring_no++) {
+ 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 remained in set1 doesn't exists in set2 any longer so
- * node has to be removed.
+ * 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,
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 remained in set2 doesn't existed in set1 so this is no node
- * and has to be added.
+ * 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,
}
}
-static void put_nodelist_members_to_config(struct totem_config *totem_config, int reload)
+/*
+ * 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;
+ }
+
+ 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;
+ }
+}
+
+
+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;
+ }
+
+ 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;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ 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 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 member_count;
unsigned int linknumber = 0;
int i, j;
- struct totem_interface *orig_interfaces = NULL;
- struct totem_interface *new_interfaces = NULL;
-
- if (reload) {
- /*
- * We need to compute diff only for reload. Also for initial configuration
- * not all totem structures are initialized so corosync will crash during
- * member_add/remove
- */
- orig_interfaces = malloc (sizeof (struct totem_interface) * INTERFACE_MAX);
- assert(orig_interfaces != NULL);
- new_interfaces = malloc (sizeof (struct totem_interface) * INTERFACE_MAX);
- assert(new_interfaces != NULL);
-
- memcpy(orig_interfaces, totem_config->interfaces, sizeof (struct totem_interface) * INTERFACE_MAX);
- }
+ int last_node_pos = -1;
/* Clear out nodelist so we can put the new one in if needed */
- for (i = 0; i < totem_config->interface_count; i++) {
+ 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) {
unsigned int nodeid;
+ char *str;
snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "nodelist.node.%u.nodeid", node_pos);
- if (icmap_get_uint32(tmp_key, &nodeid) != CS_OK) {
+ 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[linknumber].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 != -1) {
+ 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));
+
+ free(node_addr_str);
+ icmap_iter_finalize(iter2);
+ icmap_iter_finalize(iter);
+ return -1;
}
+
free(node_addr_str);
}
icmap_iter_finalize(iter);
+ configure_link_params(totem_config, map);
if (reload) {
- memcpy(new_interfaces, totem_config->interfaces, sizeof (struct totem_interface) * INTERFACE_MAX);
+ log_printf(LOGSYS_LEVEL_DEBUG, "About to reconfigure links from nodelist.\n");
- compute_interfaces_diff(totem_config->interface_count, orig_interfaces, new_interfaces);
-
- free(new_interfaces);
- free(orig_interfaces);
+ if (check_things_have_not_changed(totem_config, error_string) == -1) {
+ return -1;
+ }
}
+ return 0;
}
-static void nodelist_dynamic_notify(
- int32_t event,
- const char *key_name,
- struct icmap_notify_value new_val,
- struct icmap_notify_value old_val,
- void *user_data)
+static void config_convert_nodelist_to_interface(icmap_map_t map, struct totem_config *totem_config)
{
- int res;
- unsigned int ring_no;
- unsigned int member_no;
- char tmp_str[ICMAP_KEYNAME_MAXLEN];
- uint8_t reloading;
- struct totem_config *totem_config = (struct totem_config *)user_data;
+ int res = 0;
+ int node_pos;
+ char tmp_key[ICMAP_KEYNAME_MAXLEN];
+ char tmp_key2[ICMAP_KEYNAME_MAXLEN];
+ char *node_addr_str;
+ unsigned int linknumber = 0;
+ icmap_iter_t iter;
+ const char *iter_key;
- /*
- * 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.totemconfig_reload_in_progress", &reloading) == CS_OK && reloading) {
- return ;
- }
+ 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 ;
+ }
- res = sscanf(key_name, "nodelist.node.%u.ring%u%s", &member_no, &ring_no, tmp_str);
- if (res != 3)
- return ;
+ if (icmap_get_string_r(map, iter_key, &node_addr_str) != CS_OK) {
+ continue;
+ }
- if (strcmp(tmp_str, "_addr") != 0) {
- return;
+ 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);
}
-
- put_nodelist_members_to_config(totem_config, 1);
}
-
-/*
- * Tries to find node (node_pos) in config nodelist which address matches any
- * local interface. Address can be stored in ring0_addr or if ipaddr_key_prefix is not NULL
- * key with prefix ipaddr_key is used (there can be multiuple of them)
- * This function differs * from find_local_node_in_nodelist because it doesn't need bindnetaddr,
- * but doesn't work when bind addr is network address (so IP must be exact
- * match).
- *
- * Returns 1 on success (address was found, node_pos is then correctly set) or 0 on failure.
- */
-int totem_config_find_local_addr_in_nodelist(const char *ipaddr_key_prefix, unsigned int *node_pos)
+static int get_interface_params(struct totem_config *totem_config, icmap_map_t map,
+ const char **error_string, uint64_t *warnings,
+ int reload)
{
- struct qb_list_head addrs;
- struct totem_ip_if_address *if_addr;
- icmap_iter_t iter, iter2;
- const char *iter_key, *iter_key2;
- struct qb_list_head *list;
- const char *ipaddr_key;
- int ip_version;
- struct totem_ip_address node_addr;
- char *node_addr_str;
- int node_found = 0;
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 (totemip_getifaddrs(&addrs) == -1) {
- return 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;
}
- ip_version = totem_config_get_ip_version();
-
- iter = icmap_iter_init("nodelist.node.");
-
+ 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);
- free(node_addr_str);
+ 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);
- /*
- * ring0_addr found -> let's iterate thru ipaddr_key_prefix
- */
- snprintf(tmp_key, sizeof(tmp_key), "nodelist.node.%u.%s", *node_pos,
- (ipaddr_key_prefix != NULL ? ipaddr_key_prefix : "ring0_addr"));
+ *error_string = error_string_response;
+ ret = -1;
+ goto out;
+ }
- iter2 = icmap_iter_init(tmp_key);
- while ((iter_key2 = icmap_iter_next(iter2, NULL, NULL)) != NULL) {
+ /* These things are only valid for the initial read */
+ if (!reload) {
/*
- * ring0_addr must be exact match, not prefix
+ * Get the bind net address
*/
- ipaddr_key = (ipaddr_key_prefix != NULL ? iter_key2 : tmp_key);
- if (icmap_get_string(ipaddr_key, &node_addr_str) != CS_OK) {
- continue ;
- }
+ snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.bindnetaddr", linknumber);
- if (totemip_parse(&node_addr, node_addr_str, ip_version) == -1) {
- free(node_addr_str);
- continue ;
+ 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);
}
- free(node_addr_str);
/*
- * Try to match ip with if_addrs
+ * Get interface multicast address
*/
- node_found = 0;
- qb_list_for_each(list, &(addrs)) {
- if_addr = qb_list_entry(list, struct totem_ip_if_address, list);
+ 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);
- if (totemip_equal(&node_addr, &if_addr->ip_addr)) {
- node_found = 1;
- break;
+ 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);
}
- if (node_found) {
- break ;
+ 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(iter2);
+ /* These things are only valid for the initial read OR a newly-defined link */
+ if (!reload || (totem_config->interfaces[linknumber].configured == 0)) {
- if (node_found) {
- break ;
- }
- }
+ /*
+ * 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;
+ }
+ }
- icmap_iter_finalize(iter);
- totemip_freeifaddrs(&addrs);
+ /*
+ * Get the TTL
+ */
+ totem_config->interfaces[linknumber].ttl = 1;
- return (node_found);
-}
+ snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.ttl", linknumber);
-static void config_convert_nodelist_to_interface(struct totem_config *totem_config)
-{
- int res = 0;
- unsigned int node_pos;
- char tmp_key[ICMAP_KEYNAME_MAXLEN];
- char tmp_key2[ICMAP_KEYNAME_MAXLEN];
- char *node_addr_str;
- unsigned int linknumber = 0;
- icmap_iter_t iter;
- const char *iter_key;
+ 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 (totem_config_find_local_addr_in_nodelist(NULL, &node_pos)) {
/*
- * 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, &linknumber, 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", linknumber);
- 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,
uint64_t *warnings)
{
int res = 0;
- char *str;
- unsigned int linknumber = 0;
- int member_count = 0;
- icmap_iter_t iter, member_iter;
- const char *iter_key;
- const char *member_iter_key;
- char linknumber_key[ICMAP_KEYNAME_MAXLEN];
+ char *str, *ring0_addr_str;
char tmp_key[ICMAP_KEYNAME_MAXLEN];
- uint8_t u8;
uint16_t u16;
- uint32_t u32;
- char *cluster_name = NULL;
int i;
int local_node_pos;
int nodeid_set;
return -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);
+ }
+
memset (totem_config->interfaces, 0,
sizeof (struct totem_interface) * INTERFACE_MAX);
icmap_get_uint32("totem.version", (uint32_t *)&totem_config->version);
- if (totem_get_crypto(totem_config) != 0) {
- *error_string = "crypto_cipher requires crypto_hash with value other than none";
+ /* 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 (icmap_get_string("totem.link_mode", &str) == CS_OK) {
if (strlen(str) >= TOTEM_LINK_MODE_BYTES) {
icmap_get_uint32("totem.netmtu", &totem_config->net_mtu);
- if (icmap_get_string("totem.cluster_name", &cluster_name) != CS_OK) {
- cluster_name = NULL;
- }
-
- totem_config->ip_version = totem_config_get_ip_version();
+ totem_config->ip_version = totem_config_get_ip_version(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);
+ 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;
+
+ config_convert_nodelist_to_interface(icmap_get_global_map(), totem_config);
+
+ free(ring0_addr_str);
+ }
+
free(str);
}
*/
totem_config->broadcast_use = 0;
- iter = icmap_iter_init("totem.interface.");
- while ((iter_key = icmap_iter_next(iter, NULL, NULL)) != NULL) {
- res = sscanf(iter_key, "totem.interface.%[^.].%s", linknumber_key, tmp_key);
- if (res != 2) {
- continue;
- }
-
- if (strcmp(tmp_key, "bindnetaddr") != 0) {
- continue;
- }
-
- member_count = 0;
-
- linknumber = atoi(linknumber_key);
-
- if (linknumber >= INTERFACE_MAX) {
- free(cluster_name);
-
- 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;
- return -1;
- }
-
- /*
- * Get the bind net address
- */
- if (icmap_get_string(iter_key, &str) == CS_OK) {
- res = totemip_parse (&totem_config->interfaces[linknumber].bindnet, str,
- totem_config->ip_version);
- free(str);
- }
-
- /*
- * Get interface multicast address
- */
- snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.mcastaddr", linknumber);
- if (icmap_get_string(tmp_key, &str) == CS_OK) {
- res = totemip_parse (&totem_config->interfaces[linknumber].mcast_addr, str, totem_config->ip_version);
- free(str);
- } else {
- /*
- * 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.
- */
- (void)get_cluster_mcast_addr (cluster_name,
- linknumber,
- totem_config->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);
- }
-
- /*
- * Get mcast port
- */
- snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.mcastport", linknumber);
- if (icmap_get_uint16(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;
- }
- }
-
- /*
- * Get the TTL
- */
- totem_config->interfaces[linknumber].ttl = 1;
-
- snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.ttl", linknumber);
-
- if (icmap_get_uint8(tmp_key, &u8) == CS_OK) {
- totem_config->interfaces[linknumber].ttl = u8;
- }
-
- /*
- * Get the knet link params
- */
- totem_config->interfaces[linknumber].knet_link_priority = 1;
- snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.knet_link_priority", linknumber);
-
- if (icmap_get_uint8(tmp_key, &u8) == CS_OK) {
- totem_config->interfaces[linknumber].knet_link_priority = u8;
- }
-
- totem_config->interfaces[linknumber].knet_ping_interval = KNET_PING_INTERVAL;
- snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.knet_ping_interval", linknumber);
- if (icmap_get_uint32(tmp_key, &u32) == CS_OK) {
- totem_config->interfaces[linknumber].knet_ping_interval = u32;
- }
- totem_config->interfaces[linknumber].knet_ping_timeout = KNET_PING_TIMEOUT;
- snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.knet_ping_timeout", linknumber);
- if (icmap_get_uint32(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(tmp_key, &u32) == CS_OK) {
- totem_config->interfaces[linknumber].knet_ping_precision = u32;
- }
-
- snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.member.", linknumber);
- 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;
- }
- }
-
- if (icmap_get_string(member_iter_key, &str) == CS_OK) {
- res = totemip_parse (&totem_config->interfaces[linknumber].member_list[member_count++],
- str, totem_config->ip_version);
- }
- }
- icmap_iter_finalize(member_iter);
-
- totem_config->interfaces[linknumber].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);
/*
* 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;
*/
if (totem_config->broadcast_use) {
- for (linknumber = 0; linknumber < totem_config->interface_count; linknumber++) {
- totemip_parse (&totem_config->interfaces[linknumber].mcast_addr,
- "255.255.255.255", 0);
- }
+ totemip_parse (&totem_config->interfaces[0].mcast_addr,
+ "255.255.255.255", TOTEM_IP_VERSION_4);
}
+
/*
- * Store automatically generated items back to icmap
+ * Store automatically generated items back to icmap only for UDP
*/
- 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);
- }
- }
-
- 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;
- }
-
- if (strcmp (str, "udp") == 0) {
- totem_config->transport_number = TOTEM_TRANSPORT_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);
+ }
- if (strcmp (str, "knet") == 0) {
- totem_config->transport_number = TOTEM_TRANSPORT_KNET;
+ 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);
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, 0);
+ 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, NULL);
+ totem_volatile_config_read(totem_config, icmap_get_global_map(), NULL);
- icmap_set_uint8("config.totemconfig_reload_in_progress", 0);
+ 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);
static char local_error_reason[512];
char parse_error[512];
const char *error_reason = local_error_reason;
- int i, j;
+ int i;
+ uint32_t u32;
+ int num_configured = 0;
unsigned int interface_max = INTERFACE_MAX;
- unsigned int port1, port2;
- 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) {
- error_reason = "Invalid link priority (should be 0..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) {
- error_reason = "Can only set link priority on knet transport type";
+ 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 == 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 (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;
}
}
-
- if (totem_config->interfaces[0].bindnet.family != totem_config->interfaces[i].bindnet.family) {
- error_reason = "Not all bind address belong to the same IP family";
- goto parse_error;
- }
-
- /*
- * Ensure mcast address/port differs
- */
- if (totem_config->transport_number == TOTEM_TRANSPORT_UDP) {
- for (j = i + 1; j < totem_config->interface_count; j++) {
- port1 = totem_config->interfaces[i].ip_port;
- port2 = totem_config->interfaces[j].ip_port;
- if (totemip_equal(&totem_config->interfaces[i].mcast_addr,
- &totem_config->interfaces[j].mcast_addr) &&
- (((port1 > port2 ? port1 : port2) - (port1 < port2 ? port1 : port2)) <= 1)) {
- error_reason = "Interfaces multicast address/port pair must differ";
- goto parse_error;
- }
- }
- }
}
if (totem_config->version != 2) {
goto parse_error;
}
- if (totem_volatile_config_validate(totem_config, error_string) == -1) {
+ if (totem_volatile_config_validate(totem_config, icmap_get_global_map(), error_string) == -1) {
return (-1);
}
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 non-Knet transport.",
- totem_config->interface_count);
+ num_configured);
error_reason = parse_error;
goto parse_error;
}
}
if (totem_config->net_mtu == 0) {
- totem_config->net_mtu = 1500;
+ 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;
{
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;
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);
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:
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) {
}
/* 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) {
}
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;
}
}
/* 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);
}
+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)",
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,
break;
}
- totem_volatile_config_read (totem_config, deleted_key);
+ 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, &error_string) == -1) {
+ 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
}
}
-static void totem_reload_notify(
- int32_t event,
- const char *key_name,
- struct icmap_notify_value new_val,
- struct icmap_notify_value old_val,
- void *user_data)
+
+int totemconfig_configure_new_params(
+ struct totem_config *totem_config,
+ icmap_map_t map,
+ const char **error_string)
{
- struct totem_config *totem_config = (struct totem_config *)user_data;
- uint32_t local_node_pos;
- const char *error_string;
+ uint64_t warnings = 0LL;
- /* Reload has completed */
- if (*(uint8_t *)new_val.data == 0) {
- put_nodelist_members_to_config (totem_config, 1);
- totem_volatile_config_read (totem_config, NULL);
- log_printf(LOGSYS_LEVEL_DEBUG, "Configuration reloaded. Dumping actual totem config.");
- debug_dump_totem_config(totem_config);
- if (totem_volatile_config_validate(totem_config, &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
- */
- }
+ get_interface_params(totem_config, map, error_string, &warnings, 1);
+ if (put_nodelist_members_to_config (totem_config, map, 1, error_string)) {
+ return -1;
+ }
- /* Reinstate the local_node_pos */
- local_node_pos = find_local_node_in_nodelist(totem_config);
- if (local_node_pos != -1) {
- icmap_set_uint32("nodelist.local_node_pos", local_node_pos);
- }
+ calc_knet_ping_timers(totem_config);
- icmap_set_uint8("config.totemconfig_reload_in_progress", 0);
- } else {
- icmap_set_uint8("config.totemconfig_reload_in_progress", 1);
- }
+ 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)
totem_change_notify,
totem_config,
&icmap_track);
-
- icmap_track_add("config.reload_in_progress",
- ICMAP_TRACK_ADD | ICMAP_TRACK_MODIFY,
- totem_reload_notify,
- totem_config,
- &icmap_track);
-
- icmap_track_add("nodelist.node.",
- ICMAP_TRACK_ADD | ICMAP_TRACK_DELETE | ICMAP_TRACK_MODIFY | ICMAP_TRACK_PREFIX,
- nodelist_dynamic_notify,
- (void *)totem_config,
- &icmap_track);
}
projects / mirror_corosync.git / blobdiff