proxmox-mirrors/mirror_corosync
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_corosync synced 2025-11-03 13:58:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

config: Process broadcast option consistently

Browse Source 
Broadcast option is global but in config set in interface section. When
more interfaces are defined, only broadcast from last section was used.

Solution is to use broadcast whenever at least one interface use
broadcast.

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>
This commit is contained in:
Jan Friesse 2014-11-24 10:32:03 +01:00
parent 6c028d4d9c
commit 70bd35fc06
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
exec/totemconfig.c
View File

@ -812,6 +812,12 @@ extern int totem_config_read (
free(str);
}
/*
* Broadcast option is global but set in interface section,
* so reset before processing interfaces.
*/
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", ringnumber_key, tmp_key);
@ -866,14 +872,10 @@ extern int totem_config_read (
&totem_config->interfaces[ringnumber].mcast_addr);
}
totem_config->broadcast_use = 0;
snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.broadcast", ringnumber);
if (icmap_get_string(tmp_key, &str) == CS_OK) {
if (strcmp (str, "yes") == 0) {
totem_config->broadcast_use = 1;
totemip_parse (
&totem_config->interfaces[ringnumber].mcast_addr,
"255.255.255.255", totem_config->ip_version);
}
free(str);
}
@ -926,6 +928,16 @@ extern int totem_config_read (
}
icmap_iter_finalize(iter);
/*
* Use broadcast is global, so if set, make sure to fill mcast addr correctly
*/
if (totem_config->broadcast_use) {
for (ringnumber = 0; ringnumber < totem_config->interface_count; ringnumber++) {
totemip_parse (&totem_config->interfaces[ringnumber].mcast_addr,
"255.255.255.255", 0);
}
}
/*
* Store automatically generated items back to icmap
*/