From 3e16f27c7af644ee5fb94f7c48dea38d76a4426d Mon Sep 17 00:00:00 2001 From: marian Date: Fri, 25 Feb 2011 09:58:56 +0000 Subject: [PATCH] Changed stream setup and connect default and maximum timeout values. git-svn-id: http://voip.null.ro/svn/yate@4130 acf43c95-373e-0410-b603-e72c3f656dc1 --- conf.d/jabberclient.conf.sample | 12 ++++++------ conf.d/jabberserver.conf.sample | 12 ++++++------ libs/yjabber/jbengine.cpp | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/conf.d/jabberclient.conf.sample b/conf.d/jabberclient.conf.sample index acde7be1..322d7670 100644 --- a/conf.d/jabberclient.conf.sample +++ b/conf.d/jabberclient.conf.sample @@ -28,16 +28,16 @@ ; stream_setuptimeout: integer: Overall stream setup interval in milliseconds. The timer ; will stop when the stream is authenticated -; Defaults to 60000 if missing or invalid -; Minimum allowed value is 5000, maximum allowed value is 120000 -;stream_setuptimeout=60000 +; Defaults to 120000 if missing or invalid +; Minimum allowed value is 5000, maximum allowed value is 600000 +;stream_setuptimeout=120000 ; stream_connecttimeout: integer: The interval, in milliseconds, allowed for an ; outgoing stream to make a TCP connection to a remote host, including SRV request ; and resolving domain(s) -; Defaults to 5000 if missing or invalid -; Minimum allowed value is 1000, maximum allowed value is 10000 -;stream_connecttimeout=5000 +; Defaults to 60000 if missing or invalid +; Minimum allowed value is 1000, maximum allowed value is 120000 +;stream_connecttimeout=60000 ; entitycaps: boolean: Enable entity capabilities cache. ; If enabled entity capabilities will be requested and cached each time a presence diff --git a/conf.d/jabberserver.conf.sample b/conf.d/jabberserver.conf.sample index e662e69e..804e483f 100644 --- a/conf.d/jabberserver.conf.sample +++ b/conf.d/jabberserver.conf.sample @@ -65,16 +65,16 @@ ; stream_setuptimeout: integer: Overall stream setup interval in milliseconds. The timer ; will stop when the stream is authenticated -; Defaults to 60000 if missing or invalid -; Minimum allowed value is 5000, maximum allowed value is 120000 -;stream_setuptimeout=60000 +; Defaults to 120000 if missing or invalid +; Minimum allowed value is 5000, maximum allowed value is 600000 +;stream_setuptimeout=120000 ; stream_connecttimeout: integer: The interval, in milliseconds, allowed for an ; outgoing stream to make a TCP connection to a remote host, including SRV request ; and resolving domain(s) -; Defaults to 5000 if missing or invalid -; Minimum allowed value is 1000, maximum allowed value is 10000 -;stream_connecttimeout=5000 +; Defaults to 60000 if missing or invalid +; Minimum allowed value is 1000, maximum allowed value is 120000 +;stream_connecttimeout=60000 ; stream_idletimeout: integer: The interval, in milliseconds, allowed for a ; server to server stream to be idle diff --git a/libs/yjabber/jbengine.cpp b/libs/yjabber/jbengine.cpp index 67acff62..a590de95 100644 --- a/libs/yjabber/jbengine.cpp +++ b/libs/yjabber/jbengine.cpp @@ -78,17 +78,17 @@ static const String s_googleMailNode = "http://mail.google.com/xmpp/client/caps" #define JB_RESTART_UPDATE_MIN 5000 #define JB_RESTART_UPDATE_MAX 300000 // Stream setup timer -#define JB_SETUP_INTERVAL 60000 +#define JB_SETUP_INTERVAL 180000 #define JB_SETUP_INTERVAL_MIN 5000 -#define JB_SETUP_INTERVAL_MAX 120000 +#define JB_SETUP_INTERVAL_MAX 600000 // Wait stream start timer #define JB_START_INTERVAL 5000 #define JB_START_INTERVAL_MIN 1000 #define JB_START_INTERVAL_MAX 10000 // Stream connect timer -#define JB_CONNECT_INTERVAL 5000 +#define JB_CONNECT_INTERVAL 60000 #define JB_CONNECT_INTERVAL_MIN 1000 -#define JB_CONNECT_INTERVAL_MAX 10000 +#define JB_CONNECT_INTERVAL_MAX 120000 // Ping #define JB_PING_INTERVAL 120000 #define JB_PING_INTERVAL_MIN 60000