From b63641f7f7d1e21f56bf8963eb6d458e22b6327b Mon Sep 17 00:00:00 2001 From: James Canete Date: Thu, 19 Jun 2008 22:05:31 +0000 Subject: [PATCH] Forgot a bit of a previous commit. Extend features timeout, bind timeout, and legacy timeouts to 15 seconds. --- src/auth.c | 6 +++--- strophe.h | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/auth.c b/src/auth.c index be2d7d1..190319d 100644 --- a/src/auth.c +++ b/src/auth.c @@ -25,10 +25,10 @@ #endif /* FIXME: these should be configurable */ -#define FEATURES_TIMEOUT 5000 /* 5 seconds */ -#define BIND_TIMEOUT 2000 /* 2 seconds */ +#define FEATURES_TIMEOUT 15000 /* 15 seconds */ +#define BIND_TIMEOUT 15000 /* 15 seconds */ #define SESSION_TIMEOUT 15000 /* 15 seconds */ -#define LEGACY_TIMEOUT 2000 /* 2 seconds */ +#define LEGACY_TIMEOUT 15000 /* 15 seconds */ static void _auth(xmpp_conn_t * const conn); static void _handle_open_tls(xmpp_conn_t * const conn); diff --git a/strophe.h b/strophe.h index 48392c3..e030922 100644 --- a/strophe.h +++ b/strophe.h @@ -152,10 +152,12 @@ void xmpp_conn_set_jid(xmpp_conn_t * const conn, const char * const jid); const char *xmpp_conn_get_pass(const xmpp_conn_t * const conn); void xmpp_conn_set_pass(xmpp_conn_t * const conn, const char * const pass); -int xmpp_connect_client(xmpp_conn_t * const conn, - const char * const domain, - xmpp_conn_handler callback, - void * const userdata); +int xmpp_connect_client(xmpp_conn_t * const conn, + const char * const domain, + const char * const altdomain, + unsigned short altport, + xmpp_conn_handler callback, + void * const userdata); /* int xmpp_connect_component(conn, name)