diff options
Diffstat (limited to 'src/xmpp/session.c')
| -rw-r--r-- | src/xmpp/session.c | 686 |
1 files changed, 141 insertions, 545 deletions
diff --git a/src/xmpp/session.c b/src/xmpp/session.c index 4d0d4a46..93548d89 100644 --- a/src/xmpp/session.c +++ b/src/xmpp/session.c @@ -56,6 +56,7 @@ #include "event/server_events.h" #include "xmpp/bookmark.h" #include "xmpp/blocking.h" +#include "xmpp/connection.h" #include "xmpp/capabilities.h" #include "xmpp/session.h" #include "xmpp/iq.h" @@ -65,19 +66,6 @@ #include "xmpp/stanza.h" #include "xmpp/xmpp.h" -static struct _jabber_conn_t { - xmpp_log_t *log; - xmpp_ctx_t *ctx; - xmpp_conn_t *conn; - jabber_conn_status_t conn_status; - char *presence_message; - int priority; - char *domain; -} jabber_conn; - -static GHashTable *available_resources; -static GSList *disco_items; - // for auto reconnect static struct { char *name; @@ -95,56 +83,22 @@ static struct { static GTimer *reconnect_timer; -static log_level_t _get_log_level(xmpp_log_level_t xmpp_level); -static xmpp_log_level_t _get_xmpp_log_level(void); - -static void _xmpp_file_logger(void *const userdata, const xmpp_log_level_t level, const char *const area, - const char *const msg); - -static xmpp_log_t* _xmpp_get_file_logger(void); +static void _session_reconnect(void); -static jabber_conn_status_t _jabber_connect(const char *const fulljid, const char *const passwd, - const char *const altdomain, int port, const char *const tls_policy); - -static void _jabber_reconnect(void); -static void _jabber_lost_connection(void); -static void _connection_handler(xmpp_conn_t *const conn, const xmpp_conn_event_t status, const int error, - xmpp_stream_error_t *const stream_error, void *const userdata); - -void _connection_free_saved_account(void); -void _connection_free_saved_details(void); -void _connection_free_session_data(void); - -static void -_info_destroy(DiscoInfo *info) -{ - if (info) { - free(info->item); - if (info->features) { - g_hash_table_destroy(info->features); - } - free(info); - } -} +static void _session_free_saved_account(void); +static void _session_free_saved_details(void); void -jabber_init(void) +session_init(void) { log_info("Initialising XMPP"); - jabber_conn.conn_status = JABBER_STARTED; - jabber_conn.presence_message = NULL; - jabber_conn.conn = NULL; - jabber_conn.ctx = NULL; - jabber_conn.domain = NULL; + connection_init(); presence_sub_requests_init(); caps_init(); - available_resources = g_hash_table_new_full(g_str_hash, g_str_equal, free, (GDestroyNotify)resource_destroy); - disco_items = NULL; - xmpp_initialize(); } jabber_conn_status_t -jabber_connect_with_account(const ProfAccount *const account) +session_connect_with_account(const ProfAccount *const account) { assert(account != NULL); @@ -162,15 +116,19 @@ jabber_connect_with_account(const ProfAccount *const account) // connect with fulljid Jid *jidp = jid_create_from_bare_and_resource(account->jid, account->resource); - jabber_conn_status_t result = - _jabber_connect(jidp->fulljid, account->password, account->server, account->port, account->tls_policy); + jabber_conn_status_t result = connection_connect( + jidp->fulljid, + account->password, + account->server, + account->port, + account->tls_policy); jid_destroy(jidp); return result; } jabber_conn_status_t -jabber_connect_with_details(const char *const jid, const char *const passwd, const char *const altdomain, +session_connect_with_details(const char *const jid, const char *const passwd, const char *const altdomain, const int port, const char *const tls_policy) { assert(jid != NULL); @@ -209,7 +167,7 @@ jabber_connect_with_details(const char *const jid, const char *const passwd, con // connect with fulljid log_info("Connecting without account, JID: %s", saved_details.jid); - return _jabber_connect( + return connection_connect( saved_details.jid, passwd, saved_details.altdomain, @@ -218,573 +176,211 @@ jabber_connect_with_details(const char *const jid, const char *const passwd, con } void -connection_autoping_fail(void) +session_autoping_fail(void) { - if (jabber_conn.conn_status == JABBER_CONNECTED) { + if (connection_get_status() == JABBER_CONNECTED) { log_info("Closing connection"); - char *account_name = jabber_get_account_name(); - const char *fulljid = jabber_get_fulljid(); + + char *account_name = session_get_account_name(); + const char *fulljid = connection_get_fulljid(); plugins_on_disconnect(account_name, fulljid); - accounts_set_last_activity(jabber_get_account_name()); - jabber_conn.conn_status = JABBER_DISCONNECTING; - xmpp_disconnect(jabber_conn.conn); - while (jabber_get_connection_status() == JABBER_DISCONNECTING) { - jabber_process_events(10); - } - if (jabber_conn.conn) { - xmpp_conn_release(jabber_conn.conn); - jabber_conn.conn = NULL; - } - if (jabber_conn.ctx) { - xmpp_ctx_free(jabber_conn.ctx); - jabber_conn.ctx = NULL; - } + accounts_set_last_activity(session_get_account_name()); + + connection_disconnect(); } - FREE_SET_NULL(jabber_conn.presence_message); - FREE_SET_NULL(jabber_conn.domain); + connection_set_disconnected(); - jabber_conn.conn_status = JABBER_DISCONNECTED; - _jabber_lost_connection(); + session_lost_connection(); } void -jabber_disconnect(void) +session_disconnect(void) { // if connected, send end stream and wait for response - if (jabber_conn.conn_status == JABBER_CONNECTED) { - char *account_name = jabber_get_account_name(); - const char *fulljid = jabber_get_fulljid(); - plugins_on_disconnect(account_name, fulljid); + if (connection_get_status() == JABBER_CONNECTED) { log_info("Closing connection"); - accounts_set_last_activity(jabber_get_account_name()); - jabber_conn.conn_status = JABBER_DISCONNECTING; - xmpp_disconnect(jabber_conn.conn); - - while (jabber_get_connection_status() == JABBER_DISCONNECTING) { - jabber_process_events(10); - } - _connection_free_saved_account(); - _connection_free_saved_details(); - _connection_free_session_data(); - if (jabber_conn.conn) { - xmpp_conn_release(jabber_conn.conn); - jabber_conn.conn = NULL; - } - if (jabber_conn.ctx) { - xmpp_ctx_free(jabber_conn.ctx); - jabber_conn.ctx = NULL; - } - } - - jabber_conn.conn_status = JABBER_STARTED; - FREE_SET_NULL(jabber_conn.presence_message); - FREE_SET_NULL(jabber_conn.domain); -} -void -jabber_shutdown(void) -{ - _connection_free_saved_account(); - _connection_free_saved_details(); - _connection_free_session_data(); - xmpp_shutdown(); - free(jabber_conn.log); - jabber_conn.log = NULL; -} - -void -jabber_process_events(int millis) -{ - int reconnect_sec; + char *account_name = session_get_account_name(); + const char *fulljid = connection_get_fulljid(); + plugins_on_disconnect(account_name, fulljid); - switch (jabber_conn.conn_status) - { - case JABBER_CONNECTED: - case JABBER_CONNECTING: - case JABBER_DISCONNECTING: - xmpp_run_once(jabber_conn.ctx, millis); - break; - case JABBER_DISCONNECTED: - reconnect_sec = prefs_get_reconnect(); - if ((reconnect_sec != 0) && reconnect_timer) { - int elapsed_sec = g_timer_elapsed(reconnect_timer, NULL); - if (elapsed_sec > reconnect_sec) { - _jabber_reconnect(); - } - } - break; - default: - break; - } -} + accounts_set_last_activity(session_get_account_name()); -GList* -jabber_get_available_resources(void) -{ - return g_hash_table_get_values(available_resources); -} + connection_disconnect(); -jabber_conn_status_t -jabber_get_connection_status(void) -{ - return (jabber_conn.conn_status); -} + _session_free_saved_account(); + _session_free_saved_details(); -GSList* -connection_get_disco_items(void) -{ - return (disco_items); -} + connection_clear_data(); -gboolean -jabber_service_supports(const char *const feature) -{ - DiscoInfo *disco_info; - while (disco_items) { - disco_info = disco_items->data; - if (g_hash_table_lookup_extended(disco_info->features, feature, NULL, NULL)) { - return TRUE; - } - disco_items = g_slist_next(disco_items); + chat_sessions_clear(); + presence_clear_sub_requests(); } - return FALSE; + connection_set_disconnected(); } void -connection_set_disco_items(GSList *_disco_items) -{ - disco_items = _disco_items; -} - -xmpp_conn_t* -connection_get_conn(void) +session_shutdown(void) { - return jabber_conn.conn; -} - -xmpp_ctx_t* -connection_get_ctx(void) -{ - return jabber_conn.ctx; -} - -const char* -jabber_get_fulljid(void) -{ - return xmpp_conn_get_jid(jabber_conn.conn); -} + _session_free_saved_account(); + _session_free_saved_details(); -char* -jabber_get_presence_message(void) -{ - return jabber_conn.presence_message; -} - -char* -jabber_get_account_name(void) -{ - return saved_account.name; -} + chat_sessions_clear(); + presence_clear_sub_requests(); -char* -jabber_create_uuid(void) -{ - return xmpp_uuid_gen(jabber_conn.ctx); + connection_shutdown(); } void -jabber_free_uuid(char *uuid) +session_process_events(int millis) { - if (uuid) { - xmpp_free(jabber_conn.ctx, uuid); - } -} + int reconnect_sec; -void -connection_set_presence_message(const char *const message) -{ - FREE_SET_NULL(jabber_conn.presence_message); - if (message) { - jabber_conn.presence_message = strdup(message); + jabber_conn_status_t conn_status = connection_get_status(); + switch (conn_status) + { + case JABBER_CONNECTED: + case JABBER_CONNECTING: + case JABBER_DISCONNECTING: + xmpp_run_once(connection_get_ctx(), millis); + break; + case JABBER_DISCONNECTED: + reconnect_sec = prefs_get_reconnect(); + if ((reconnect_sec != 0) && reconnect_timer) { + int elapsed_sec = g_timer_elapsed(reconnect_timer, NULL); + if (elapsed_sec > reconnect_sec) { + _session_reconnect(); + } + } + break; + default: + break; } } -void -connection_set_priority(const int priority) -{ - jabber_conn.priority = priority; -} - -void -connection_add_available_resource(Resource *resource) -{ - g_hash_table_replace(available_resources, strdup(resource->name), resource); -} - -void -connection_remove_available_resource(const char *const resource) -{ - g_hash_table_remove(available_resources, resource); -} - -void -_connection_free_saved_account(void) -{ - FREE_SET_NULL(saved_account.name); - FREE_SET_NULL(saved_account.passwd); -} - -void -_connection_free_saved_details(void) +char* +session_get_account_name(void) { - FREE_SET_NULL(saved_details.name); - FREE_SET_NULL(saved_details.jid); - FREE_SET_NULL(saved_details.passwd); - FREE_SET_NULL(saved_details.altdomain); - FREE_SET_NULL(saved_details.tls_policy); + return saved_account.name; } void -_connection_free_session_data(void) -{ - g_slist_free_full(disco_items, (GDestroyNotify)_info_destroy); - disco_items = NULL; - g_hash_table_remove_all(available_resources); - chat_sessions_clear(); - presence_clear_sub_requests(); -} - -#ifdef HAVE_LIBMESODE -static int -_connection_certfail_cb(xmpp_tlscert_t *xmpptlscert, const char *const errormsg) -{ - int version = xmpp_conn_tlscert_version(xmpptlscert); - char *serialnumber = xmpp_conn_tlscert_serialnumber(xmpptlscert); - char *subjectname = xmpp_conn_tlscert_subjectname(xmpptlscert); - char *issuername = xmpp_conn_tlscert_issuername(xmpptlscert); - char *fingerprint = xmpp_conn_tlscert_fingerprint(xmpptlscert); - char *notbefore = xmpp_conn_tlscert_notbefore(xmpptlscert); - char *notafter = xmpp_conn_tlscert_notafter(xmpptlscert); - char *key_alg = xmpp_conn_tlscert_key_algorithm(xmpptlscert); - char *signature_alg = xmpp_conn_tlscert_signature_algorithm(xmpptlscert); - - TLSCertificate *cert = tlscerts_new(fingerprint, version, serialnumber, subjectname, issuername, notbefore, - notafter, key_alg, signature_alg); - int res = sv_ev_certfail(errormsg, cert); - tlscerts_free(cert); - - return res; -} - -TLSCertificate* -jabber_get_tls_peer_cert(void) +session_login_success(gboolean secured) { - xmpp_tlscert_t *xmpptlscert = xmpp_conn_tls_peer_cert(jabber_conn.conn); - int version = xmpp_conn_tlscert_version(xmpptlscert); - char *serialnumber = xmpp_conn_tlscert_serialnumber(xmpptlscert); - char *subjectname = xmpp_conn_tlscert_subjectname(xmpptlscert); - char *issuername = xmpp_conn_tlscert_issuername(xmpptlscert); - char *fingerprint = xmpp_conn_tlscert_fingerprint(xmpptlscert); - char *notbefore = xmpp_conn_tlscert_notbefore(xmpptlscert); - char *notafter = xmpp_conn_tlscert_notafter(xmpptlscert); - char *key_alg = xmpp_conn_tlscert_key_algorithm(xmpptlscert); - char *signature_alg = xmpp_conn_tlscert_signature_algorithm(xmpptlscert); - - TLSCertificate *cert = tlscerts_new(fingerprint, version, serialnumber, subjectname, issuername, notbefore, - notafter, key_alg, signature_alg); - - xmpp_conn_free_tlscert(jabber_conn.ctx, xmpptlscert); - - return cert; -} -#endif + // logged in with account + if (saved_account.name) { + log_debug("Connection handler: logged in with account name: %s", saved_account.name); + sv_ev_login_account_success(saved_account.name, secured); -gboolean -jabber_conn_is_secured(void) -{ - if (jabber_conn.conn_status == JABBER_CONNECTED) { - return xmpp_conn_is_secured(jabber_conn.conn) == 0 ? FALSE : TRUE; + // logged in without account, use details to create new account } else { - return FALSE; - } -} + log_debug("Connection handler: logged in with jid: %s", saved_details.name); + accounts_add(saved_details.name, saved_details.altdomain, saved_details.port, saved_details.tls_policy); + accounts_set_jid(saved_details.name, saved_details.jid); -gboolean -jabber_send_stanza(const char *const stanza) -{ - if (jabber_conn.conn_status != JABBER_CONNECTED) { - return FALSE; - } else { - xmpp_send_raw_string(jabber_conn.conn, "%s", stanza); - return TRUE; - } -} + sv_ev_login_account_success(saved_details.name, secured); + saved_account.name = strdup(saved_details.name); + saved_account.passwd = strdup(saved_details.passwd); -static jabber_conn_status_t -_jabber_connect(const char *const fulljid, const char *const passwd, const char *const altdomain, int port, - const char *const tls_policy) -{ - assert(fulljid != NULL); - assert(passwd != NULL); - - Jid *jid = jid_create(fulljid); - - if (jid == NULL) { - log_error("Malformed JID not able to connect: %s", fulljid); - jabber_conn.conn_status = JABBER_DISCONNECTED; - return jabber_conn.conn_status; - } else if (jid->fulljid == NULL) { - log_error("Full JID required to connect, received: %s", fulljid); - jabber_conn.conn_status = JABBER_DISCONNECTED; - jid_destroy(jid); - return jabber_conn.conn_status; + _session_free_saved_details(); } - jid_destroy(jid); + chat_sessions_init(); - log_info("Connecting as %s", fulljid); - if (jabber_conn.log) { - free(jabber_conn.log); - } - jabber_conn.log = _xmpp_get_file_logger(); + message_handlers_init(); + presence_handlers_init(); + iq_handlers_init(); - if (jabber_conn.conn) { - xmpp_conn_release(jabber_conn.conn); - } - if (jabber_conn.ctx) { - xmpp_ctx_free(jabber_conn.ctx); - } - jabber_conn.ctx = xmpp_ctx_new(NULL, jabber_conn.log); - if (jabber_conn.ctx == NULL) { - log_warning("Failed to get libstrophe ctx during connect"); - return JABBER_DISCONNECTED; - } - jabber_conn.conn = xmpp_conn_new(jabber_conn.ctx); - if (jabber_conn.conn == NULL) { - log_warning("Failed to get libstrophe conn during connect"); - return JABBER_DISCONNECTED; - } - xmpp_conn_set_jid(jabber_conn.conn, fulljid); - xmpp_conn_set_pass(jabber_conn.conn, passwd); + roster_request(); + bookmark_request(); + blocking_request(); - if (!tls_policy || (g_strcmp0(tls_policy, "force") == 0)) { - xmpp_conn_set_flags(jabber_conn.conn, XMPP_CONN_FLAG_MANDATORY_TLS); - } else if (g_strcmp0(tls_policy, "disable") == 0) { - xmpp_conn_set_flags(jabber_conn.conn, XMPP_CONN_FLAG_DISABLE_TLS); - } + // items discovery + char *domain = connection_get_domain(); + iq_disco_info_request_onconnect(domain); + iq_disco_items_request_onconnect(domain); -#ifdef HAVE_LIBMESODE - char *cert_path = prefs_get_string(PREF_TLS_CERTPATH); - if (cert_path) { - xmpp_conn_tlscert_path(jabber_conn.conn, cert_path); + if (prefs_get_boolean(PREF_CARBONS)){ + iq_enable_carbons(); } - prefs_free_string(cert_path); -#endif - -#ifdef HAVE_LIBMESODE - int connect_status = xmpp_connect_client( - jabber_conn.conn, - altdomain, - port, - _connection_certfail_cb, - _connection_handler, - jabber_conn.ctx); -#else - int connect_status = xmpp_connect_client( - jabber_conn.conn, - altdomain, - port, - _connection_handler, - jabber_conn.ctx); -#endif - if (connect_status == 0) { - jabber_conn.conn_status = JABBER_CONNECTING; - } else { - jabber_conn.conn_status = JABBER_DISCONNECTED; + if ((prefs_get_reconnect() != 0) && reconnect_timer) { + g_timer_destroy(reconnect_timer); + reconnect_timer = NULL; } - - return jabber_conn.conn_status; } -static void -_jabber_reconnect(void) +void +session_login_failed(void) { - // reconnect with account. - ProfAccount *account = accounts_get_account(saved_account.name); - - if (account == NULL) { - log_error("Unable to reconnect, account no longer exists: %s", saved_account.name); + if (reconnect_timer == NULL) { + log_debug("Connection handler: No reconnect timer"); + sv_ev_failed_login(); + _session_free_saved_account(); + _session_free_saved_details(); } else { - char *fulljid = create_fulljid(account->jid, account->resource); - log_debug("Attempting reconnect with account %s", account->name); - _jabber_connect(fulljid, saved_account.passwd, account->server, account->port, account->tls_policy); - free(fulljid); - g_timer_start(reconnect_timer); + log_debug("Connection handler: Restarting reconnect timer"); + if (prefs_get_reconnect() != 0) { + g_timer_start(reconnect_timer); + } } + + connection_clear_data(); + chat_sessions_clear(); + presence_clear_sub_requests(); } -static void -_jabber_lost_connection(void) +void +session_lost_connection(void) { sv_ev_lost_connection(); if (prefs_get_reconnect() != 0) { assert(reconnect_timer == NULL); reconnect_timer = g_timer_new(); } else { - _connection_free_saved_account(); - _connection_free_saved_details(); + _session_free_saved_account(); + _session_free_saved_details(); } - _connection_free_session_data(); + + connection_clear_data(); + chat_sessions_clear(); + presence_clear_sub_requests(); } static void -_connection_handler(xmpp_conn_t *const conn, const xmpp_conn_event_t status, const int error, - xmpp_stream_error_t *const stream_error, void *const userdata) +_session_reconnect(void) { - // login success - if (status == XMPP_CONN_CONNECT) { - log_debug("Connection handler: XMPP_CONN_CONNECT"); - jabber_conn.conn_status = JABBER_CONNECTED; - - int secured = xmpp_conn_is_secured(jabber_conn.conn); - - // logged in with account - if (saved_account.name) { - log_debug("Connection handler: logged in with account name: %s", saved_account.name); - sv_ev_login_account_success(saved_account.name, secured); - - // logged in without account, use details to create new account - } else { - log_debug("Connection handler: logged in with jid: %s", saved_details.name); - accounts_add(saved_details.name, saved_details.altdomain, saved_details.port, saved_details.tls_policy); - accounts_set_jid(saved_details.name, saved_details.jid); - - sv_ev_login_account_success(saved_details.name, secured); - saved_account.name = strdup(saved_details.name); - saved_account.passwd = strdup(saved_details.passwd); - - _connection_free_saved_details(); - } - - Jid *my_jid = jid_create(jabber_get_fulljid()); - jabber_conn.domain = strdup(my_jid->domainpart); - jid_destroy(my_jid); - - chat_sessions_init(); - - message_handlers_init(); - presence_handlers_init(); - iq_handlers_init(); - - roster_request(); - bookmark_request(); - blocking_request(); - - // items discovery - DiscoInfo *info = malloc(sizeof(struct disco_info_t)); - info->item = strdup(jabber_conn.domain); - info->features = g_hash_table_new_full(g_str_hash, g_str_equal, free, NULL); - disco_items = g_slist_append(disco_items, info); - iq_disco_info_request_onconnect(info->item); - iq_disco_items_request_onconnect(jabber_conn.domain); - - if (prefs_get_boolean(PREF_CARBONS)){ - iq_enable_carbons(); - } - - if ((prefs_get_reconnect() != 0) && reconnect_timer) { - g_timer_destroy(reconnect_timer); - reconnect_timer = NULL; - } - - } else if (status == XMPP_CONN_DISCONNECT) { - log_debug("Connection handler: XMPP_CONN_DISCONNECT"); - - // lost connection for unknown reason - if (jabber_conn.conn_status == JABBER_CONNECTED) { - log_debug("Connection handler: Lost connection for unknown reason"); - _jabber_lost_connection(); - - // login attempt failed - } else if (jabber_conn.conn_status != JABBER_DISCONNECTING) { - log_debug("Connection handler: Login failed"); - if (reconnect_timer == NULL) { - log_debug("Connection handler: No reconnect timer"); - sv_ev_failed_login(); - _connection_free_saved_account(); - _connection_free_saved_details(); - _connection_free_session_data(); - } else { - log_debug("Connection handler: Restarting reconnect timer"); - if (prefs_get_reconnect() != 0) { - g_timer_start(reconnect_timer); - } - // free resources but leave saved_user untouched - _connection_free_session_data(); - } - } - - // close stream response from server after disconnect is handled too - jabber_conn.conn_status = JABBER_DISCONNECTED; - } else if (status == XMPP_CONN_FAIL) { - log_debug("Connection handler: XMPP_CONN_FAIL"); - } else { - log_error("Connection handler: Unknown status"); + // reconnect with account. + ProfAccount *account = accounts_get_account(saved_account.name); + if (account == NULL) { + log_error("Unable to reconnect, account no longer exists: %s", saved_account.name); + return; } -} -static log_level_t -_get_log_level(const xmpp_log_level_t xmpp_level) -{ - if (xmpp_level == XMPP_LEVEL_DEBUG) { - return PROF_LEVEL_DEBUG; - } else if (xmpp_level == XMPP_LEVEL_INFO) { - return PROF_LEVEL_INFO; - } else if (xmpp_level == XMPP_LEVEL_WARN) { - return PROF_LEVEL_WARN; - } else { - return PROF_LEVEL_ERROR; - } + char *fulljid = create_fulljid(account->jid, account->resource); + log_debug("Attempting reconnect with account %s", account->name); + connection_connect(fulljid, saved_account.passwd, account->server, account->port, account->tls_policy); + free(fulljid); + g_timer_start(reconnect_timer); } -static xmpp_log_level_t -_get_xmpp_log_level() +static void +_session_free_saved_account(void) { - log_level_t prof_level = log_get_filter(); - - if (prof_level == PROF_LEVEL_DEBUG) { - return XMPP_LEVEL_DEBUG; - } else if (prof_level == PROF_LEVEL_INFO) { - return XMPP_LEVEL_INFO; - } else if (prof_level == PROF_LEVEL_WARN) { - return XMPP_LEVEL_WARN; - } else { - return XMPP_LEVEL_ERROR; - } + FREE_SET_NULL(saved_account.name); + FREE_SET_NULL(saved_account.passwd); } static void -_xmpp_file_logger(void *const userdata, const xmpp_log_level_t level, const char *const area, const char *const msg) +_session_free_saved_details(void) { - log_level_t prof_level = _get_log_level(level); - log_msg(prof_level, area, msg); - if ((g_strcmp0(area, "xmpp") == 0) || (g_strcmp0(area, "conn")) == 0) { - sv_ev_xmpp_stanza(msg); - } + FREE_SET_NULL(saved_details.name); + FREE_SET_NULL(saved_details.jid); + FREE_SET_NULL(saved_details.passwd); + FREE_SET_NULL(saved_details.altdomain); + FREE_SET_NULL(saved_details.tls_policy); } -static xmpp_log_t* -_xmpp_get_file_logger() -{ - xmpp_log_level_t level = _get_xmpp_log_level(); - xmpp_log_t *file_log = malloc(sizeof(xmpp_log_t)); - - file_log->handler = _xmpp_file_logger; - file_log->userdata = &level; - - return file_log; -} |