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

Added conn_send_queue_purge() function.

Browse Source 
Function frees all data and clean send queue in
    xmpp_conn_release()
    xmpp_connect_client()
    xmpp_connect_component()
This commit is contained in:
Andrey (Stanson) Kozin
2016-02-08 08:56:09 +03:00
committed by Dmitry Podgorny
parent 838ed493a3
commit f5c2c81142
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/conn.c
View File

@@ -59,6 +59,7 @@ static void _handle_stream_stanza(xmpp_stanza_t *stanza,
void * const userdata); void * const userdata);
static unsigned short _conn_default_port(xmpp_conn_t * const conn, static unsigned short _conn_default_port(xmpp_conn_t * const conn,
xmpp_conn_type_t type); xmpp_conn_type_t type);
static void _conn_send_queue_purge(xmpp_conn_t * const conn);
static int _conn_connect(xmpp_conn_t * const conn, static int _conn_connect(xmpp_conn_t * const conn,
const char * const domain, const char * const domain,
const char * const host, const char * const host,
@@ -221,7 +222,6 @@ void xmpp_conn_set_keepalive(xmpp_conn_t * const conn, int timeout, int interval
int xmpp_conn_release(xmpp_conn_t * const conn) int xmpp_conn_release(xmpp_conn_t * const conn)
{ {
xmpp_ctx_t *ctx; xmpp_ctx_t *ctx;
xmpp_send_queue_t *sq, *tsq;
xmpp_connlist_t *item, *prev; xmpp_connlist_t *item, *prev;
xmpp_handlist_t *hlitem, *thli; xmpp_handlist_t *hlitem, *thli;
hash_iterator_t *iter; hash_iterator_t *iter;
@@ -303,14 +303,7 @@ int xmpp_conn_release(xmpp_conn_t * const conn)
parser_free(conn->parser); parser_free(conn->parser);
/* free queued */ _conn_send_queue_purge(conn);
sq = conn->send_queue_head;
while (sq) {
tsq = sq;
sq = sq->next;
xmpp_free(ctx, tsq->data);
xmpp_free(ctx, tsq);
}
if (conn->domain) xmpp_free(ctx, conn->domain); if (conn->domain) xmpp_free(ctx, conn->domain);
if (conn->jid) xmpp_free(ctx, conn->jid); if (conn->jid) xmpp_free(ctx, conn->jid);
@@ -971,6 +964,21 @@ static unsigned short _conn_default_port(xmpp_conn_t * const conn,
}; };
} }
static void _conn_send_queue_purge(xmpp_conn_t * const conn)
{
xmpp_ctx_t *ctx = conn->ctx;
xmpp_send_queue_t *sq, *tsq;
/* free queued */
sq = conn->send_queue_head;
while (sq) {
tsq = sq;
sq = sq->next;
xmpp_free(ctx, tsq->data);
xmpp_free(ctx, tsq);
}
}
static int _conn_connect(xmpp_conn_t * const conn, static int _conn_connect(xmpp_conn_t * const conn,
const char * const domain, const char * const domain,
const char * const host, const char * const host,
@@ -987,6 +995,8 @@ static int _conn_connect(xmpp_conn_t * const conn,
if (conn->domain != NULL) if (conn->domain != NULL)
xmpp_free(conn->ctx, conn->domain); xmpp_free(conn->ctx, conn->domain);
_conn_send_queue_purge(conn);
conn->type = type; conn->type = type;
conn->secured = 0; conn->secured = 0;
conn->tls_failed = 0; conn->tls_failed = 0;