devs/libstrophe-gh
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Partial fix for #11. Correctly calls connection handler on timeout now,

Browse Source 
but doesn't yet set the error.
This commit is contained in:
Jack Moffitt
2005-12-01 23:09:20 +00:00
parent 003b0528cd
commit 68c9a71774
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/conn.c
View File

@@ -18,6 +18,7 @@
#include "strophe.h"
#include "common.h"
#include "util.h"
#ifdef _WIN32
#define vsnprintf _vsnprintf
@@ -25,6 +26,7 @@
#define DEFAULT_SEND_QUEUE_MAX 64
#define DISCONNECT_TIMEOUT 2000 /* 2 seconds */
#define CONNECT_TIMEOUT 5000 /* 5 seconds */
static int _disconnect_cleanup(xmpp_conn_t * const conn,
void * const userdata);
@@ -43,6 +45,7 @@ xmpp_conn_t *xmpp_conn_new(xmpp_ctx_t * const ctx)
conn->type = XMPP_UNKNOWN;
conn->sock = -1;
conn->timeout_stamp = 0;
conn->error = 0;
conn->stream_error = NULL;
@@ -53,6 +56,9 @@ xmpp_conn_t *xmpp_conn_new(xmpp_ctx_t * const ctx)
conn->send_queue_head = NULL;
conn->send_queue_tail = NULL;
/* default timeouts */
conn->connect_timeout = CONNECT_TIMEOUT;
conn->lang = xmpp_strdup(conn->ctx, "en");
if (!conn->lang) {
xmpp_free(conn->ctx, conn);
@@ -260,6 +266,7 @@ int xmpp_connect_client(xmpp_conn_t * const conn,
* from within the event loop */
conn->state = XMPP_STATE_CONNECTING;
conn->timeout_stamp = time_stamp();
xmpp_debug(conn->ctx, "xmpp", "attempting to connect to %s", conn->domain);
return 0;
@@ -278,7 +285,7 @@ void conn_disconnect_clean(xmpp_conn_t * const conn)
void conn_disconnect(xmpp_conn_t * const conn)
{
xmpp_info(conn->ctx, "xmpp", "Disconnected from server");
xmpp_debug(conn->ctx, "xmpp", "Closing socket.");
conn->state = XMPP_STATE_DISCONNECTED;
sock_close(conn->sock);