aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
Code

Merge remote-tracking branch 'dmitry/next'

Browse Source
This commit is contained in:
James Booth 2013-01-10 22:27:43 +00:00
commit 3706131e44
2 changed files with 31 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/chat_session.c
View File

@ -63,7 +63,8 @@ chat_sessions_init(void)
void void
chat_sessions_clear(void) chat_sessions_clear(void)
{ {
g_hash_table_remove_all(sessions); if (sessions != NULL)
g_hash_table_remove_all(sessions);
} }
void void

67
src/jabber.c
View File

@ -22,6 +22,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <assert.h>
#include <strophe.h> #include <strophe.h>
@ -82,6 +83,13 @@ static int _presence_handler(xmpp_conn_t * const conn,
xmpp_stanza_t * const stanza, void * const userdata); xmpp_stanza_t * const stanza, void * const userdata);
static int _ping_timed_handler(xmpp_conn_t * const conn, void * const userdata); static int _ping_timed_handler(xmpp_conn_t * const conn, void * const userdata);
#define FREE_SET_NULL(resource) \
{\
if (resource != NULL) \
free(resource); \
resource = NULL; \
}
void void
jabber_init(const int disable_tls) jabber_init(const int disable_tls)
{ {
@ -194,8 +202,8 @@ jabber_disconnect(void)
// if connected, send end stream and wait for response // if connected, send end stream and wait for response
if (jabber_conn.conn_status == JABBER_CONNECTED) { if (jabber_conn.conn_status == JABBER_CONNECTED) {
log_info("Closing connection"); log_info("Closing connection");
xmpp_disconnect(jabber_conn.conn);
jabber_conn.conn_status = JABBER_DISCONNECTING; jabber_conn.conn_status = JABBER_DISCONNECTING;
xmpp_disconnect(jabber_conn.conn);
while (jabber_get_connection_status() == JABBER_DISCONNECTING) { while (jabber_get_connection_status() == JABBER_DISCONNECTING) {
jabber_process_events(); jabber_process_events();
@ -217,7 +225,7 @@ jabber_process_events(void)
} else if (prefs_get_reconnect() != 0) { } else if (prefs_get_reconnect() != 0) {
if ((jabber_conn.conn_status == JABBER_DISCONNECTED) && if ((jabber_conn.conn_status == JABBER_DISCONNECTED) &&
(reconnect_timer != NULL)) { (reconnect_timer != NULL)) {
if (g_timer_elapsed(reconnect_timer, NULL) > (prefs_get_reconnect() * 1.0)) { if (g_timer_elapsed(reconnect_timer, NULL) > prefs_get_reconnect()) {
log_debug("Attempting reconnect as %s", saved_user); log_debug("Attempting reconnect as %s", saved_user);
jabber_connect(saved_user, saved_password, saved_altdomain); jabber_connect(saved_user, saved_password, saved_altdomain);
} }
@ -514,10 +522,13 @@ jabber_get_status(void)
void void
jabber_free_resources(void) jabber_free_resources(void)
{ {
saved_user = NULL; FREE_SET_NULL(saved_user);
saved_password = NULL; FREE_SET_NULL(saved_password);
FREE_SET_NULL(saved_account);
FREE_SET_NULL(saved_altdomain);
chat_sessions_clear(); chat_sessions_clear();
g_hash_table_remove_all(sub_requests); if (sub_requests != NULL)
g_hash_table_remove_all(sub_requests);
xmpp_conn_release(jabber_conn.conn); xmpp_conn_release(jabber_conn.conn);
xmpp_ctx_free(jabber_conn.ctx); xmpp_ctx_free(jabber_conn.ctx);
xmpp_shutdown(); xmpp_shutdown();
@ -772,55 +783,35 @@ _connection_handler(xmpp_conn_t * const conn,
} }
} }
} else { } else if (status == XMPP_CONN_DISCONNECT) {
// received close stream response from server after disconnect
if (jabber_conn.conn_status == JABBER_DISCONNECTING) {
jabber_conn.conn_status = JABBER_DISCONNECTED;
jabber_conn.presence = PRESENCE_OFFLINE;
if (saved_user != NULL) {
free(saved_user);
saved_user = NULL;
}
if (saved_password != NULL) {
free(saved_password);
saved_password = NULL;
}
// lost connection for unkown reason // lost connection for unkown reason
} else if (jabber_conn.conn_status == JABBER_CONNECTED) { if (jabber_conn.conn_status == JABBER_CONNECTED) {
prof_handle_lost_connection(); prof_handle_lost_connection();
if (prefs_get_reconnect() != 0) { if (prefs_get_reconnect() != 0) {
assert(reconnect_timer == NULL);
reconnect_timer = g_timer_new(); reconnect_timer = g_timer_new();
// TODO: free resources but leave saved_* untouched
} else {
jabber_free_resources();
} }
xmpp_stop(ctx);
jabber_conn.conn_status = JABBER_DISCONNECTED;
jabber_conn.presence = PRESENCE_OFFLINE;
// login attempt failed // login attempt failed
} else { } else if (jabber_conn.conn_status != JABBER_DISCONNECTING) {
if (reconnect_timer == NULL) { if (reconnect_timer == NULL) {
prof_handle_failed_login(); prof_handle_failed_login();
if (saved_user != NULL) { jabber_free_resources();
free(saved_user);
saved_user = NULL;
}
if (saved_password != NULL) {
free(saved_password);
saved_password = NULL;
}
xmpp_stop(ctx);
jabber_conn.conn_status = JABBER_DISCONNECTED;
jabber_conn.presence = PRESENCE_OFFLINE;
} else { } else {
xmpp_stop(ctx);
if (prefs_get_reconnect() != 0) { if (prefs_get_reconnect() != 0) {
g_timer_start(reconnect_timer); g_timer_start(reconnect_timer);
} }
jabber_conn.conn_status = JABBER_DISCONNECTED; // TODO: free resources but leave saved_* untouched
jabber_conn.presence = PRESENCE_OFFLINE;
} }
} }
// close stream response from server after disconnect is handled too
jabber_conn.conn_status = JABBER_DISCONNECTED;
jabber_conn.presence = PRESENCE_OFFLINE;
} }
} }