Kaynağa Gözat

config: get_cluster_mcast_addr error is not fatal

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Jan Friesse 9 yıl önce
ebeveyn
işleme
44df76a7ee
1 değiştirilmiş dosya ile 4 ekleme ve 6 silme
  1. 4 6
      exec/totemconfig.c

+ 4 - 6
exec/totemconfig.c

@@ -1101,16 +1101,14 @@ extern int totem_config_read (
 		} else {
 		} else {
 			/*
 			/*
 			 * User not specified address -> autogenerate one from cluster_name key
 			 * User not specified address -> autogenerate one from cluster_name key
-			 * (if available)
+			 * (if available). Return code is intentionally ignored, because
+			 * udpu doesn't need mcastaddr and validity of mcastaddr for udp is
+			 * checked later anyway.
 			 */
 			 */
-			res = get_cluster_mcast_addr (cluster_name,
+			(void)get_cluster_mcast_addr (cluster_name,
 					ringnumber,
 					ringnumber,
 					totem_config->ip_version,
 					totem_config->ip_version,
 					&totem_config->interfaces[ringnumber].mcast_addr);
 					&totem_config->interfaces[ringnumber].mcast_addr);
-			if (res != 0) {
-				*error_string = "Can't autogenerate multicast address";
-				return -1;
-			}
 		}
 		}
 
 
 		snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.broadcast", ringnumber);
 		snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.broadcast", ringnumber);