Преглед на файлове

Handle knet's removal of SCTP gracefully

Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>
Christine Caulfield преди 4 месеца
родител
ревизия
07c9488e44
променени са 2 файла, в които са добавени 12 реда и са изтрити 4 реда
  1. 8 2
      exec/totemconfig.c
  2. 4 2
      man/corosync.conf.5

+ 8 - 2
exec/totemconfig.c

@@ -1698,15 +1698,21 @@ static int get_interface_params(struct totem_config *totem_config, icmap_map_t m
 			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) {
+#ifdef KNET_TRANSPORT_SCTP
 				if (strcmp(str, "sctp") == 0) {
 					totem_config->interfaces[linknumber].knet_transport = KNET_TRANSPORT_SCTP;
 					log_printf(LOGSYS_LEVEL_WARNING, "WARNING SCTP transport is deprecated and will be removed in a future release.\n");
-				}
-				else if (strcmp(str, "udp") == 0) {
+				} else
+#endif
+				if (strcmp(str, "udp") == 0) {
 					totem_config->interfaces[linknumber].knet_transport = KNET_TRANSPORT_UDP;
 				}
 				else {
+#ifdef KNET_TRANSPORT_SCTP
 					*error_string = "Unrecognised knet_transport. expected 'udp' or 'sctp'";
+#else
+					*error_string = "Unrecognised knet_transport. only 'udp' is supported";
+#endif
 					ret = -1;
 					goto out;
 				}

+ 4 - 2
man/corosync.conf.5

@@ -128,8 +128,10 @@ How many valid ping/pongs before a link is marked UP. (default 2)
 .TP
 
 knet_transport
-Which IP transport KNET should use. valid values are "sctp" or "udp". (default: udp)
-NOTE: sctp is deprecated and will be removed in kronoset v2.0
+Which IP transport KNET should use. valid values are "udp" (or "sctp" if
+supported by the installed version of kronosnet). (default: udp)
+NOTE: even if currently included, sctp is deprecated and will be removed
+in kronoset v2.0
 
 .TP
 bindnetaddr (UDP only)