瀏覽代碼

totemconfig: Add IPs to family mismatch error

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>
Jan Friesse 7 年之前
父節點
當前提交
e17e3f4b81
共有 1 個文件被更改,包括 9 次插入1 次删除
  1. 9 1
      exec/totemconfig.c

+ 9 - 1
exec/totemconfig.c

@@ -1771,6 +1771,7 @@ int totem_config_validate (
 {
 {
 	static char local_error_reason[512];
 	static char local_error_reason[512];
 	char parse_error[512];
 	char parse_error[512];
+	static char addr_str_buf[INET6_ADDRSTRLEN];
 	const char *error_reason = local_error_reason;
 	const char *error_reason = local_error_reason;
 	int i,j;
 	int i,j;
 	uint32_t u32;
 	uint32_t u32;
@@ -1860,8 +1861,15 @@ int totem_config_validate (
 			if (totem_config->interfaces[i].configured) {
 			if (totem_config->interfaces[i].configured) {
 				if (totem_config->interfaces[i].member_list[j].family !=
 				if (totem_config->interfaces[i].member_list[j].family !=
 				    totem_config->interfaces[i].member_list[0].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),
 					snprintf (local_error_reason, sizeof(local_error_reason),
-						  "Nodes for link %d have different IP families", i);
+						  "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;
 					goto parse_error;
 				}
 				}
 			}
 			}