totemconfig: change udp netmtu value as a constant

[mirror_corosync.git] / exec / totemconfig.c

diff --git a/exec/totemconfig.c b/exec/totemconfig.c
index 5c428c46efe0d91488b7af688999a4f5e4320848..b8856073a82e02ef002e1ca5b50c8e43426e4746 100644 (file)
--- a/exec/totemconfig.c
+++ b/exec/totemconfig.c
@@ -66,7 +66,7 @@
 #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
@@ -81,6 +81,8 @@
 #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
 
 /* Currently all but PONG_COUNT match the defaults in libknet.h */
 #define KNET_PING_INTERVAL                      1000
@@ -1080,7 +1082,6 @@ static int check_for_duplicate_nodeids(
                                          autogenerated?"(autogenerated from ":"",
                                          autogenerated?ring0_addr:"",
                                          autogenerated?")":"");
-                               log_printf (LOGSYS_LEVEL_ERROR, error_string_response);
                                *error_string = error_string_response;
                                break;
                        }
@@ -2100,7 +2101,7 @@ int totem_config_validate (
                        totem_config->net_mtu = KNET_MAX_PACKET_SIZE;
                }
                else {
-                       totem_config->net_mtu = 1500;
+                       totem_config->net_mtu = UDP_NETMTU;
                }
        }