/*
* Copyright (c) 2002-2005 MontaVista Software, Inc.
- * Copyright (c) 2006-2018 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 "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 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
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;
+ 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,
+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;
strcpy(runtime_key_name, "runtime.config.");
strcat(runtime_key_name, key_name);
- icmap_set_uint32(runtime_key_name, *(uint32_t *)totem_get_param_by_name(totem_config, 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,
+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(key_name, totem_get_param_by_name(totem_config, key_name)) != CS_OK ||
+ 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;
strcpy(runtime_key_name, "runtime.config.");
strcat(runtime_key_name, key_name);
- icmap_set_int32(runtime_key_name, *(int32_t *)totem_get_param_by_name(totem_config, 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,
+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];
- void **config_value;
- void *old_config_ptr;
+ int res;
+ char *new_config_value;
+ const void *config_value;
config_value = totem_get_param_by_name(totem_config, key_name);
- old_config_ptr = *config_value;
- if (icmap_get_string(key_name, totem_get_param_by_name(totem_config, key_name)) != CS_OK ||
+
+ 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)) {
- /* Need to strdup() here so that the free() below works for a default and a configured value */
- *config_value = strdup(default_value);
+ /* 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);
}
- free(old_config_ptr);
/*
* Store totem_config value to cmap runtime section
strcpy(runtime_key_name, "runtime.config.");
strcat(runtime_key_name, key_name);
- icmap_set_string(runtime_key_name, (char *)*config_value);
+ (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_uint32_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_uint32_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);
- totem_volatile_config_set_uint32_value(totem_config, "totem.token_warning", deleted_key, TOKEN_WARNING, 1);
+ 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_uint32_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_uint32_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_uint32_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_uint32_value(totem_config, "totem.miss_count_const", deleted_key, MISS_COUNT_CONST, 0);
- totem_volatile_config_set_uint32_value(totem_config, "totem.knet_pmtud_interval", deleted_key, KNET_PMTUD_INTERVAL, 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, "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_uint32_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_uint32_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_uint32_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_uint32_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_uint32_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_uint32_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_uint32_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_uint32_value(totem_config, "totem.send_join", deleted_key, 0, 1);
-
- totem_volatile_config_set_uint32_value(totem_config, "totem.heartbeat_failures_allowed", 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, "totem.knet_compression_threshold", 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_int32_value(totem_config, "totem.knet_compression_level", 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_string_value(totem_config, "totem.knet_compression_model", deleted_key, "none");
+ 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, num_configured, members;
+ 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),
}
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 than (%d ms).",
- totem_config->token_retransmit_timeout, MINIMUM_TIMEOUT);
- goto parse_error;
+ 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) {
+ 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;
}
/* 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) {
- members = totem_config->interfaces[0].member_count;
-
- for (i=0; i<totem_config->interfaces[0].member_count; i++) {
+ /*
+ * 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(name_key, &name_str) != CS_OK) {
+ 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<num_configured; i++) {
+ 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;
}
-static int totem_get_crypto(struct totem_config *totem_config, const char **error_string)
+static int totem_get_crypto(struct totem_config *totem_config, icmap_map_t map, const char **error_string)
{
char *str;
const char *tmp_cipher;
tmp_cipher = "none";
tmp_model = "none";
- if (icmap_get_string("totem.crypto_model", &str) == CS_OK) {
+ if (icmap_get_string_r(map, "totem.crypto_model", &str) == CS_OK) {
if (strcmp(str, "nss") == 0) {
tmp_model = "nss";
}
tmp_model = "nss";
}
- if (icmap_get_string("totem.crypto_cipher", &str) == CS_OK) {
+ 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_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, "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";
}
return -1;
}
- free(totem_config->crypto_cipher_type);
- free(totem_config->crypto_hash_type);
- free(totem_config->crypto_model);
+ 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);
- totem_config->crypto_model = strdup(tmp_model);
+ 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(const char *find_name, int strip_domain)
+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;
unsigned int namelen;
- 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, name_str);
if (res != 2) {
if (strcmp(name_str, "name") && strcmp(name_str, "ring0_addr")) {
continue;
}
- if (icmap_get_string(iter_key, &name) != CS_OK) {
+ if (icmap_get_string_r(map, iter_key, &name) != CS_OK) {
continue;
}
namelen = strlen(name);
return -1;
}
-/* Compare two addresses */
-static int ipaddr_equal(struct sockaddr_storage *addr1, struct sockaddr_storage *addr2)
+/* 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->ss_family != addr2->ss_family)
+ if (addr1->sa_family != addr2->sa_family)
return 0;
- if (addr1->ss_family == AF_INET) {
- addrlen = sizeof(struct sockaddr_in);
- }
- if (addr1->ss_family == AF_INET6) {
- addrlen = sizeof(struct sockaddr_in6);
+ 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);
}
- assert(addrlen);
-
- if (memcmp(addr1, addr2, addrlen) == 0)
- return 1;
- else
- return 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(int use_cache)
+static int find_local_node(icmap_map_t map, int use_cache)
{
char nodename2[PATH_MAX];
char name_str[ICMAP_KEYNAME_MAXLEN];
node = utsname.nodename;
/* 1. Exact match */
- node_pos = nodelist_byname(node, 0);
+ node_pos = nodelist_byname(map, node, 0);
if (node_pos > -1) {
found = 1;
goto ret_found;
while (dot) {
*dot = '\0';
- node_pos = nodelist_byname(nodename2, 0);
+ node_pos = nodelist_byname(map, nodename2, 0);
if (node_pos > -1) {
found = 1;
goto ret_found;
dot = strrchr(nodename2, '.');
}
- node_pos = nodelist_byname(nodename2, 1);
+ node_pos = nodelist_byname(map, nodename2, 1);
if (node_pos > -1) {
found = 1;
goto ret_found;
nodename2, sizeof(nodename2),
NULL, 0, 0) == 0) {
- node_pos = nodelist_byname(nodename2, 0);
+ node_pos = nodelist_byname(map, nodename2, 0);
if (node_pos > -1) {
found = 1;
goto out;
if (dot) {
*dot = '\0';
- node_pos = nodelist_byname(nodename2, 0);
+ node_pos = nodelist_byname(map, nodename2, 0);
if (node_pos > -1) {
found = 1;
goto out;
NULL, 0, NI_NUMERICHOST))
continue;
- node_pos = nodelist_byname(nodename2, 0);
+ node_pos = nodelist_byname(map, nodename2, 0);
if (node_pos > -1) {
found = 1;
goto out;
* and use it as last.
*/
- iter = icmap_iter_init("nodelist.node.");
+ iter = icmap_iter_init_r(map, "nodelist.node.");
while ((iter_key = icmap_iter_next(iter, NULL, NULL)) != NULL) {
char *dbnodename = NULL;
struct addrinfo hints;
if (strcmp(name_str, "name") && strcmp(name_str, "ring0_addr")) {
continue;
}
- if (icmap_get_string(iter_key, &dbnodename) != CS_OK) {
+ if (icmap_get_string_r(map, iter_key, &dbnodename) != CS_OK) {
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((struct sockaddr_storage *)rp->ai_addr,
- (struct sockaddr_storage *)ifa->ifa_addr)) {
+ ipaddr_equal(rp->ai_addr, ifa->ifa_addr)) {
freeaddrinfo(result);
found = 1;
goto out2;
ret_found:
if (found) {
- res = icmap_set_uint32("nodelist.local_node_pos", node_pos);
+ res = icmap_set_uint32_r(map, "nodelist.local_node_pos", node_pos);
}
return node_pos;
}
-static int totem_config_get_ip_version(struct totem_config *totem_config)
+static enum totem_ip_version_enum totem_config_get_ip_version(struct totem_config *totem_config)
{
- int res;
+ enum totem_ip_version_enum res;
char *str;
- res = AF_INET;
- if (totem_config->transport_number == TOTEM_TRANSPORT_KNET) {
- res = AF_UNSPEC;
- } else {
- if (icmap_get_string("totem.ip_version", &str) == CS_OK) {
- if (strcmp(str, "ipv4") == 0) {
- res = AF_INET;
- }
- if (strcmp(str, "ipv6") == 0) {
- res = AF_INET6;
- }
- free(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 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:
/* 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));
autogenerated?"(autogenerated from ":"",
autogenerated?ring0_addr:"",
autogenerated?")":"");
- log_printf (LOGSYS_LEVEL_ERROR, error_string_response);
*error_string = error_string_response;
break;
}
}
/*
- * 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(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;
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,
}
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,
}
/*
- * Reconfigure links in totempg. Sets new local IP address and adds params for new links.
+ * Configure parameters for links
*/
-static void reconfigure_links(struct totem_config *totem_config)
+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;
- struct totem_ip_address local_ip;
int err;
- int local_node_pos = find_local_node(0);
+ 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_INFO, "Configuring link %d\n", i);
+ 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(tmp_key, &addr_string) != CS_OK) {
+ if (icmap_get_string_r(map, tmp_key, &addr_string) != CS_OK) {
continue;
}
- err = totemip_parse(&local_ip, addr_string, AF_UNSPEC);
+ err = totemip_parse(&totem_config->interfaces[i].local_ip, addr_string, totem_config->ip_version);
if (err != 0) {
continue;
}
- local_ip.nodeid = totem_config->node_id;
+ 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_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;
+ }
- totempg_iface_set(&local_ip, totem_config->interfaces[i].ip_port, i);
+ 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 void check_things_have_not_changed(struct totem_config *totem_config)
+static int check_things_have_not_changed(struct totem_config *totem_config, const char **error_string)
{
- int i,j;
+ 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) {
+ 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;
}
- for (j=0; j < min(totem_config->interfaces[i].member_count, totem_config->orig_interfaces[i].member_count); j++) {
- if (memcmp(&totem_config->interfaces[i].member_list[j],
- &totem_config->orig_interfaces[i].member_list[j],
- sizeof(struct totem_ip_address))) {
-
- ip_str = totemip_print(&totem_config->orig_interfaces[i].member_list[j]);
-
- /* 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;
+
+ /* 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) {
- log_printf(LOGSYS_LEVEL_ERROR, "To reconfigure an interface it must be deleted and recreated. A working interface needs to be available to corosync at all times");
+ 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, int reload, const char **error_string)
+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;
unsigned int linknumber = 0;
int i, j;
int last_node_pos = -1;
- 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
- */
- new_interfaces = malloc (sizeof (struct totem_interface) * INTERFACE_MAX);
- assert(new_interfaces != NULL);
- }
/* Clear out nodelist so we can put the new one in if needed */
for (i = 0; i < INTERFACE_MAX; i++) {
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) {
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;
}
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;
- if (icmap_get_string(iter_key2, &node_addr_str) != CS_OK) {
+ icmap_iter_finalize(iter2);
+ icmap_iter_finalize(iter);
+ return (-1);
+ }
+
+ if (icmap_get_string_r(map, iter_key2, &node_addr_str) != CS_OK) {
continue;
}
(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(tmp_key, &str) == CS_OK) {
+ 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 = 0x%x for %s", nodeid, str);
+ "Generated nodeid = " CS_PRI_NODE_ID " for %s", nodeid, str);
free(str);
}
}
icmap_iter_finalize(iter);
+ configure_link_params(totem_config, map);
if (reload) {
log_printf(LOGSYS_LEVEL_DEBUG, "About to reconfigure links from nodelist.\n");
- reconfigure_links(totem_config);
-
- memcpy(new_interfaces, totem_config->interfaces, sizeof (struct totem_interface) * INTERFACE_MAX);
-
- check_things_have_not_changed(totem_config);
-
- compute_interfaces_diff(totem_config->orig_interfaces, new_interfaces);
- free(new_interfaces);
+ 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)
{
int res = 0;
int node_pos;
icmap_iter_t iter;
const char *iter_key;
- node_pos = find_local_node(1);
+ 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(tmp_key);
+ 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(iter_key, &node_addr_str) != CS_OK) {
+ 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(tmp_key2, node_addr_str);
+ icmap_set_string_r(map, tmp_key2, node_addr_str);
free(node_addr_str);
}
icmap_iter_finalize(iter);
}
}
-static int get_interface_params(struct totem_config *totem_config,
+static int get_interface_params(struct totem_config *totem_config, icmap_map_t map,
const char **error_string, uint64_t *warnings,
int reload)
{
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++) {
totem_config->interfaces[i].knet_pong_count = KNET_PONG_COUNT;
}
}
- if (icmap_get_string("totem.cluster_name", &cluster_name) != CS_OK) {
+ if (icmap_get_string_r(map, "totem.cluster_name", &cluster_name) != CS_OK) {
cluster_name = NULL;
}
- iter = icmap_iter_init("totem.interface.");
+ iter = icmap_iter_init_r(map, "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) {
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;
+ ret = -1;
+ goto out;
}
/* These things are only valid for the initial read */
*/
snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.bindnetaddr", linknumber);
- if (icmap_get_string(tmp_key, &str) == CS_OK) {
+ if (icmap_get_string_r(map, tmp_key, &str) == CS_OK) {
res = totemip_parse (&totem_config->interfaces[linknumber].bindnet, str,
totem_config->ip_version);
*error_string = error_string_response;
free(str);
- return -1;
+ ret = -1;
+ goto out;
}
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) {
+ 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);
*error_string = error_string_response;
free(str);
- return -1;
+ ret = -1;
+ goto out;
}
free(str);
- } else {
+ } 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,
- totem_config->ip_version,
+ tmp_ip_version,
&totem_config->interfaces[linknumber].mcast_addr);
}
* 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 (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 {
snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.ttl", linknumber);
- if (icmap_get_uint8(tmp_key, &u8) == CS_OK) {
+ 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(tmp_key, &str) == CS_OK) {
+ 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 {
*error_string = "Unrecognised knet_transport. expected 'udp' or 'sctp'";
- return -1;
+ ret = -1;
+ goto out;
}
}
}
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) {
+ 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(tmp_key, &u32) == CS_OK) {
+ 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(tmp_key, &u32) == CS_OK) {
+ 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(tmp_key, &u32) == CS_OK) {
+ 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(tmp_key, &u32) == CS_OK) {
+ 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(tmp_key);
+ 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) {
}
}
- if (icmap_get_string(member_iter_key, &str) == CS_OK) {
+ 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) {
*error_string = error_string_response;
icmap_iter_finalize(member_iter);
- icmap_iter_finalize(iter);
free(str);
- return -1;
+ ret = -1;
+ goto out;
}
free(str);
totem_config->interfaces[linknumber].member_count = member_count;
}
+
+out:
icmap_iter_finalize(iter);
+ free(cluster_name);
- return 0;
+ return (ret);
}
extern int totem_config_read (
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) {
+ } else if (strcmp (str, "udp") == 0) {
totem_config->transport_number = TOTEM_TRANSPORT_UDP;
- }
-
- if (strcmp (str, "knet") == 0) {
+ } 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.version", (uint32_t *)&totem_config->version);
- if (totem_get_crypto(totem_config, error_string) != 0) {
+ /* 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) {
/*
* 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) {
/*
*/
*warnings |= TOTEM_CONFIG_BINDNETADDR_NODELIST_SET;
- config_convert_nodelist_to_interface(totem_config);
+ config_convert_nodelist_to_interface(icmap_get_global_map(), totem_config);
free(ring0_addr_str);
}
*/
totem_config->broadcast_use = 0;
- res = get_interface_params(totem_config, error_string, warnings, 0);
+ res = get_interface_params(totem_config, icmap_get_global_map(), error_string, warnings, 0);
if (res < 0) {
return res;
}
*/
if (totem_config->broadcast_use) {
totemip_parse (&totem_config->interfaces[0].mcast_addr,
- "255.255.255.255", 0);
+ "255.255.255.255", TOTEM_IP_VERSION_4);
}
/*
* find local node
*/
- local_node_pos = find_local_node(1);
+ local_node_pos = find_local_node(icmap_get_global_map(), 1);
if (local_node_pos != -1) {
snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "nodelist.node.%u.nodeid", local_node_pos);
*warnings |= TOTEM_CONFIG_WARNING_TOTEM_NODEID_IGNORED;
}
if ((totem_config->transport_number == TOTEM_TRANSPORT_KNET) && (!totem_config->node_id)) {
- *error_string = "With knet, you must specify nodeid for current node";
+ *error_string = "Knet requires an explicit nodeid for the local node";
return -1;
}
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);
icmap_set_ro_access("nodelist.local_node_pos", 0, 1);
}
- if (put_nodelist_members_to_config(totem_config, 0, error_string)) {
+ 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);
calc_knet_ping_timers(totem_config);
- icmap_set_uint8("config.totemconfig_reload_in_progress", 0);
+ /* 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];
- static char addr_str_buf[INET6_ADDRSTRLEN];
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;
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;
}
}
- /* Verify that all nodes on the same knet link have the same IP family */
- 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;
- }
- }
- }
}
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);
}
totem_config->net_mtu = KNET_MAX_PACKET_SIZE;
}
else {
- totem_config->net_mtu = 1500;
+ totem_config->net_mtu = UDP_NETMTU;
}
}
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;
+
+ /* 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;
}
/* 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 (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;
sprintf(error_string_response, "key is too short");
goto key_error;
}
- if (icmap_get("totem.key", totem_config->private_key, &key_len, NULL) == CS_OK) {
+ 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 {
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);
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, "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;
- const char *error_string;
- uint64_t warnings;
+ uint64_t warnings = 0LL;
- /* Reload has completed */
- if (*(uint8_t *)new_val.data == 0) {
+ get_interface_params(totem_config, map, error_string, &warnings, 1);
+ if (put_nodelist_members_to_config (totem_config, map, 1, error_string)) {
+ return -1;
+ }
- totem_config->orig_interfaces = malloc (sizeof (struct totem_interface) * INTERFACE_MAX);
- assert(totem_config->orig_interfaces != NULL);
- memcpy(totem_config->orig_interfaces, totem_config->interfaces, sizeof (struct totem_interface) * INTERFACE_MAX);
+ calc_knet_ping_timers(totem_config);
- get_interface_params(totem_config, &error_string, &warnings, 1);
- if (put_nodelist_members_to_config (totem_config, 1, &error_string)) {
- log_printf (LOGSYS_LEVEL_ERROR, "%s", error_string);
- }
- totem_volatile_config_read (totem_config, NULL);
+ log_printf(LOGSYS_LEVEL_DEBUG, "Configuration reloaded. Dumping actual totem config.");
+ debug_dump_totem_config(totem_config);
- calc_knet_ping_timers(totem_config);
+ /* Reinstate the local_node_pos */
+ (void)find_local_node(map, 0);
- 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
- */
- }
+ return 0;
+}
+
+void totemconfig_commit_new_params(
+ struct totem_config *totem_config,
+ icmap_map_t map)
+{
+ struct totem_interface *new_interfaces = NULL;
- /* Reinstate the local_node_pos */
- (void)find_local_node(0);
+ 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);
- /* Reconfigure network params as appropriate */
- totempg_reconfigure();
+ /* Set link parameters including local_ip */
+ configure_totem_links(totem_config, map);
- free(totem_config->orig_interfaces);
+ /* Add & remove nodes */
+ compute_and_set_totempg_interfaces(totem_config->orig_interfaces, new_interfaces);
- icmap_set_uint8("config.totemconfig_reload_in_progress", 0);
- } else {
- icmap_set_uint8("config.totemconfig_reload_in_progress", 1);
- }
+ /* 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);
}
projects / mirror_corosync.git / blobdiff