Add session.c

src/xmpp/connection.c

@@ -0,0 +1,356 @@
+/*
+ * connection.c
+ *
+ * Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
+ *
+ * This file is part of Profanity.
+ *
+ * Profanity is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Profanity is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link the code of portions of this program with the OpenSSL library under
+ * certain conditions as described in each individual source file, and
+ * distribute linked combinations including the two.
+ *
+ * You must obey the GNU General Public License in all respects for all of the
+ * code used other than OpenSSL. If you modify file(s) with this exception, you
+ * may extend this exception to your version of the file(s), but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version. If you delete this exception statement from all
+ * source files in the program, then also delete it here.
+ *
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef HAVE_LIBMESODE
+#include <mesode.h>
+#endif
+#ifdef HAVE_LIBSTROPHE
+#include <strophe.h>
+#endif
+
+#include "log.h"
+#include "event/server_events.h"
+#include "xmpp/connection.h"
+#include "xmpp/session.h"
+
+typedef struct prof_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;
+} ProfConnection;
+
+static ProfConnection conn;
+
+static xmpp_log_t* _xmpp_get_file_logger(void);
+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 log_level_t _get_log_level(const xmpp_log_level_t xmpp_level);
+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);
+#ifdef HAVE_LIBMESODE
+static int _connection_certfail_cb(xmpp_tlscert_t *xmpptlscert, const char *const errormsg);
+#endif
+
+void connection_init(void)
+{
+    conn.conn_status = JABBER_STARTED;
+    conn.presence_message = NULL;
+    conn.conn = NULL;
+    conn.ctx = NULL;
+    conn.domain = NULL;
+}
+
+jabber_conn_status_t
+connection_connect(const char *const fulljid, const char *const passwd, const char *const altdomain, int port,
+    const char *const tls_policy, char *cert_path)
+{
+    if (conn.log) {
+        free(conn.log);
+    }
+    conn.log = _xmpp_get_file_logger();
+
+    if (conn.conn) {
+        xmpp_conn_release(conn.conn);
+    }
+    if (conn.ctx) {
+        xmpp_ctx_free(conn.ctx);
+    }
+    conn.ctx = xmpp_ctx_new(NULL, conn.log);
+    if (conn.ctx == NULL) {
+        log_warning("Failed to get libstrophe ctx during connect");
+        return JABBER_DISCONNECTED;
+    }
+    conn.conn = xmpp_conn_new(conn.ctx);
+    if (conn.conn == NULL) {
+        log_warning("Failed to get libstrophe conn during connect");
+        return JABBER_DISCONNECTED;
+    }
+    xmpp_conn_set_jid(conn.conn, fulljid);
+    xmpp_conn_set_pass(conn.conn, passwd);
+
+    if (!tls_policy || (g_strcmp0(tls_policy, "force") == 0)) {
+        xmpp_conn_set_flags(conn.conn, XMPP_CONN_FLAG_MANDATORY_TLS);
+    } else if (g_strcmp0(tls_policy, "disable") == 0) {
+        xmpp_conn_set_flags(conn.conn, XMPP_CONN_FLAG_DISABLE_TLS);
+    }
+
+#ifdef HAVE_LIBMESODE
+    if (cert_path) {
+        xmpp_conn_tlscert_path(conn.conn, cert_path);
+    }
+#endif
+
+#ifdef HAVE_LIBMESODE
+    int connect_status = xmpp_connect_client(
+        conn.conn,
+        altdomain,
+        port,
+        _connection_certfail_cb,
+        _connection_handler,
+        conn.ctx);
+#else
+    int connect_status = xmpp_connect_client(
+        conn.conn,
+        altdomain,
+        port,
+        _connection_handler,
+        conn.ctx);
+#endif
+
+    if (connect_status == 0) {
+        conn.conn_status = JABBER_CONNECTING;
+    } else {
+        conn.conn_status = JABBER_DISCONNECTED;
+    }
+
+    return conn.conn_status;
+}
+
+jabber_conn_status_t
+connection_get_status(void)
+{
+    return conn.conn_status;
+}
+
+void
+connection_set_status(jabber_conn_status_t status)
+{
+    conn.conn_status = status;
+}
+
+xmpp_conn_t*
+connection_get_conn(void)
+{
+    return conn.conn;
+}
+
+xmpp_ctx_t*
+connection_get_ctx(void)
+{
+    return conn.ctx;
+}
+
+char *
+connection_get_domain(void)
+{
+    return conn.domain;
+}
+
+char *
+connection_get_presence_msg(void)
+{
+    return conn.presence_message;
+}
+
+void
+connection_free_conn(void)
+{
+    if (conn.conn) {
+        xmpp_conn_release(conn.conn);
+        conn.conn = NULL;
+    }
+}
+
+void
+connection_free_ctx(void)
+{
+    if (conn.ctx) {
+        xmpp_ctx_free(conn.ctx);
+        conn.ctx = NULL;
+    }
+}
+
+void
+connection_free_presence_msg(void)
+{
+    FREE_SET_NULL(conn.presence_message);
+}
+
+void
+connection_set_presence_msg(const char *const message)
+{
+    FREE_SET_NULL(conn.presence_message);
+    if (message) {
+        conn.presence_message = strdup(message);
+    }
+}
+
+void
+connection_free_domain(void)
+{
+    FREE_SET_NULL(conn.domain);
+}
+
+void
+connection_free_log(void)
+{
+    free(conn.log);
+    conn.log = NULL;
+}
+
+void
+connection_set_priority(const int priority)
+{
+    conn.priority = priority;
+}
+
+void
+connection_set_domain(char *domain)
+{
+    conn.domain = strdup(domain);
+}
+
+int
+connection_is_secured(void)
+{
+    return xmpp_conn_is_secured(conn.conn);
+}
+
+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)
+{
+    // login success
+    if (status == XMPP_CONN_CONNECT) {
+        log_debug("Connection handler: XMPP_CONN_CONNECT");
+        connection_set_status(JABBER_CONNECTED);
+
+        jabber_login_success(connection_is_secured());
+
+    } else if (status == XMPP_CONN_DISCONNECT) {
+        log_debug("Connection handler: XMPP_CONN_DISCONNECT");
+
+        // lost connection for unknown reason
+        if (connection_get_status() == JABBER_CONNECTED) {
+            log_debug("Connection handler: Lost connection for unknown reason");
+            jabber_lost_connection();
+
+        // login attempt failed
+        } else if (connection_get_status() != JABBER_DISCONNECTING) {
+            log_debug("Connection handler: Login failed");
+            jabber_login_failed();
+        }
+
+        // close stream response from server after disconnect is handled too
+        connection_set_status(JABBER_DISCONNECTED);
+    } else if (status == XMPP_CONN_FAIL) {
+        log_debug("Connection handler: XMPP_CONN_FAIL");
+    } else {
+        log_error("Connection handler: Unknown status");
+    }
+}
+
+#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;
+}
+#endif
+
+static xmpp_log_t*
+_xmpp_get_file_logger(void)
+{
+    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;
+}
+
+static xmpp_log_level_t
+_get_xmpp_log_level(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;
+    }
+}
+
+static void
+_xmpp_file_logger(void *const userdata, const xmpp_log_level_t level, const char *const area, const char *const msg)
+{
+    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);
+    }
+}
+
+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;
+    }
+}

src/xmpp/connection.h

@@ -0,0 +1,60 @@
+/*
+ * connection.h
+ *
+ * Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
+ *
+ * This file is part of Profanity.
+ *
+ * Profanity is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Profanity is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link the code of portions of this program with the OpenSSL library under
+ * certain conditions as described in each individual source file, and
+ * distribute linked combinations including the two.
+ *
+ * You must obey the GNU General Public License in all respects for all of the
+ * code used other than OpenSSL. If you modify file(s) with this exception, you
+ * may extend this exception to your version of the file(s), but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version. If you delete this exception statement from all
+ * source files in the program, then also delete it here.
+ *
+ */
+
+#ifndef XMPP_CONNECTION_H
+#define XMPP_CONNECTION_H
+
+#include "xmpp/xmpp.h"
+
+void connection_init(void);
+
+jabber_conn_status_t connection_connect(const char *const fulljid, const char *const passwd, const char *const altdomain,
+    int port, const char *const tls_policy, char *cert_path);
+
+char *connection_get_domain(void);
+
+void connection_set_status(jabber_conn_status_t status);
+void connection_set_presence_msg(const char *const message);
+void connection_set_priority(const int priority);
+void connection_set_domain(char *domain);
+
+int connection_is_secured(void);
+
+void connection_free_conn(void);
+void connection_free_ctx(void);
+void connection_free_presence_msg(void);
+void connection_free_domain(void);
+void connection_free_log(void);
+
+#endif

src/xmpp/iq.c

@@ -225,7 +225,7 @@ iq_id_handler_add(const char *const id, ProfIdCallback func, void *userdata)
 void
 iq_autoping_check(void)
 {
-    if (jabber_get_connection_status() != JABBER_CONNECTED) {
+    if (connection_get_status() != JABBER_CONNECTED) {
         return;
     }
 
@@ -253,7 +253,7 @@ iq_autoping_check(void)
 void
 iq_set_autoping(const int seconds)
 {
-    if (jabber_get_connection_status() != JABBER_CONNECTED) {
+    if (connection_get_status() != JABBER_CONNECTED) {
         return;
     }
 
@@ -959,7 +959,7 @@ _manual_pong_id_handler(xmpp_stanza_t *const stanza, void *const userdata)
 static int
 _autoping_timed_send(xmpp_conn_t *const conn, void *const userdata)
 {
-    if (jabber_get_connection_status() != JABBER_CONNECTED) {
+    if (connection_get_status() != JABBER_CONNECTED) {
         return 1;
     }
 

src/xmpp/presence.c

@@ -55,6 +55,7 @@
 #include "profanity.h"
 #include "ui/ui.h"
 #include "event/server_events.h"
+#include "xmpp/connection.h"
 #include "xmpp/capabilities.h"
 #include "xmpp/session.h"
 #include "xmpp/stanza.h"
@@ -238,7 +239,7 @@ presence_reset_sub_request_search(void)
 void
 presence_send(const resource_presence_t presence_type, const char *const msg, const int idle, char *signed_status)
 {
-    if (jabber_get_connection_status() != JABBER_CONNECTED) {
+    if (connection_get_status() != JABBER_CONNECTED) {
         log_warning("Error setting presence, not connected.");
         return;
     }
@@ -253,7 +254,7 @@ presence_send(const resource_presence_t presence_type, const char *const msg, co
     const int pri = accounts_get_priority_for_presence_type(jabber_get_account_name(), presence_type);
     const char *show = stanza_get_presence_string_from_type(presence_type);
 
-    connection_set_presence_message(msg);
+    connection_set_presence_msg(msg);
     connection_set_priority(pri);
 
     xmpp_stanza_t *presence = stanza_create_presence(ctx);
@@ -332,7 +333,7 @@ presence_join_room(const char *const room, const char *const nick, const char *c
     resource_presence_t presence_type =
         accounts_get_last_presence(jabber_get_account_name());
     const char *show = stanza_get_presence_string_from_type(presence_type);
-    char *status = jabber_get_presence_message();
+    char *status = connection_get_presence_msg();
     int pri = accounts_get_priority_for_presence_type(jabber_get_account_name(),
         presence_type);
 
@@ -359,7 +360,7 @@ presence_change_room_nick(const char *const room, const char *const nick)
     resource_presence_t presence_type =
         accounts_get_last_presence(jabber_get_account_name());
     const char *show = stanza_get_presence_string_from_type(presence_type);
-    char *status = jabber_get_presence_message();
+    char *status = connection_get_presence_msg();
     int pri = accounts_get_priority_for_presence_type(jabber_get_account_name(),
         presence_type);
 

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,16 +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;
 
@@ -95,21 +86,10 @@ 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 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);
@@ -131,11 +111,7 @@ void
 jabber_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);
@@ -220,67 +196,59 @@ jabber_connect_with_details(const char *const jid, const char *const passwd, con
 void
 connection_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();
         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);
+        connection_set_status(JABBER_DISCONNECTING);
+        xmpp_disconnect(connection_get_conn());
 
-        while (jabber_get_connection_status() == JABBER_DISCONNECTING) {
+        while (connection_get_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;
-        }
+
+        connection_free_conn();
+        connection_free_ctx();
     }
 
-    FREE_SET_NULL(jabber_conn.presence_message);
-    FREE_SET_NULL(jabber_conn.domain);
+    connection_free_presence_msg();
+    connection_free_domain();
 
-    jabber_conn.conn_status = JABBER_DISCONNECTED;
-    _jabber_lost_connection();
+    connection_set_status(JABBER_DISCONNECTED);
+
+    jabber_lost_connection();
 }
 
 void
 jabber_disconnect(void)
 {
     // if connected, send end stream and wait for response
-    if (jabber_conn.conn_status == JABBER_CONNECTED) {
+    if (connection_get_status() == JABBER_CONNECTED) {
         char *account_name = jabber_get_account_name();
         const char *fulljid = jabber_get_fulljid();
         plugins_on_disconnect(account_name, fulljid);
         log_info("Closing connection");
         accounts_set_last_activity(jabber_get_account_name());
-        jabber_conn.conn_status = JABBER_DISCONNECTING;
-        xmpp_disconnect(jabber_conn.conn);
+        connection_set_status(JABBER_DISCONNECTING);
+        xmpp_disconnect(connection_get_conn());
 
-        while (jabber_get_connection_status() == JABBER_DISCONNECTING) {
+        while (connection_get_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;
-        }
+
+        connection_free_conn();
+        connection_free_ctx();
     }
 
-    jabber_conn.conn_status = JABBER_STARTED;
-    FREE_SET_NULL(jabber_conn.presence_message);
-    FREE_SET_NULL(jabber_conn.domain);
+    connection_free_presence_msg();
+    connection_free_domain();
+
+    connection_set_status(JABBER_STARTED);
 }
 
 void
@@ -290,8 +258,7 @@ jabber_shutdown(void)
     _connection_free_saved_details();
     _connection_free_session_data();
     xmpp_shutdown();
-    free(jabber_conn.log);
-    jabber_conn.log = NULL;
+    connection_free_log();
 }
 
 void
@@ -299,12 +266,13 @@ jabber_process_events(int millis)
 {
     int reconnect_sec;
 
-    switch (jabber_conn.conn_status)
+    jabber_conn_status_t conn_status = connection_get_status();
+    switch (conn_status)
     {
         case JABBER_CONNECTED:
         case JABBER_CONNECTING:
         case JABBER_DISCONNECTING:
-            xmpp_run_once(jabber_conn.ctx, millis);
+            xmpp_run_once(connection_get_ctx(), millis);
             break;
         case JABBER_DISCONNECTED:
             reconnect_sec = prefs_get_reconnect();
@@ -326,12 +294,6 @@ jabber_get_available_resources(void)
     return g_hash_table_get_values(available_resources);
 }
 
-jabber_conn_status_t
-jabber_get_connection_status(void)
-{
-    return (jabber_conn.conn_status);
-}
-
 GSList*
 connection_get_disco_items(void)
 {
@@ -359,28 +321,10 @@ connection_set_disco_items(GSList *_disco_items)
     disco_items = _disco_items;
 }
 
-xmpp_conn_t*
-connection_get_conn(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);
-}
-
-char*
-jabber_get_presence_message(void)
-{
-    return jabber_conn.presence_message;
+    return xmpp_conn_get_jid(connection_get_conn());
 }
 
 char*
@@ -392,32 +336,17 @@ jabber_get_account_name(void)
 char*
 jabber_create_uuid(void)
 {
-    return xmpp_uuid_gen(jabber_conn.ctx);
+    return xmpp_uuid_gen(connection_get_ctx());
 }
 
 void
 jabber_free_uuid(char *uuid)
 {
     if (uuid) {
-        xmpp_free(jabber_conn.ctx, uuid);
+        xmpp_free(connection_get_ctx(), uuid);
     }
 }
 
-void
-connection_set_presence_message(const char *const message)
-{
-    FREE_SET_NULL(jabber_conn.presence_message);
-    if (message) {
-        jabber_conn.presence_message = strdup(message);
-    }
-}
-
-void
-connection_set_priority(const int priority)
-{
-    jabber_conn.priority = priority;
-}
-
 void
 connection_add_available_resource(Resource *resource)
 {
@@ -457,32 +386,83 @@ _connection_free_session_data(void)
     presence_clear_sub_requests();
 }
 
-#ifdef HAVE_LIBMESODE
-static int
-_connection_certfail_cb(xmpp_tlscert_t *xmpptlscert, const char *const errormsg)
+void
+jabber_login_success(int secured)
 {
-    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);
+    // 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);
 
-    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);
+    // 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);
 
-    return res;
+        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());
+    connection_set_domain(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(connection_get_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(connection_get_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;
+    }
 }
 
+void
+jabber_login_failed(void)
+{
+    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();
+    }
+}
+
+#ifdef HAVE_LIBMESODE
 TLSCertificate*
 jabber_get_tls_peer_cert(void)
 {
-    xmpp_tlscert_t *xmpptlscert = xmpp_conn_tls_peer_cert(jabber_conn.conn);
+    xmpp_tlscert_t *xmpptlscert = xmpp_conn_tls_peer_cert(connection_get_conn());
     int version = xmpp_conn_tlscert_version(xmpptlscert);
     char *serialnumber = xmpp_conn_tlscert_serialnumber(xmpptlscert);
     char *subjectname = xmpp_conn_tlscert_subjectname(xmpptlscert);
@@ -496,7 +476,7 @@ jabber_get_tls_peer_cert(void)
     TLSCertificate *cert = tlscerts_new(fingerprint, version, serialnumber, subjectname, issuername, notbefore,
         notafter, key_alg, signature_alg);
 
-    xmpp_conn_free_tlscert(jabber_conn.ctx, xmpptlscert);
+    xmpp_conn_free_tlscert(connection_get_ctx(), xmpptlscert);
 
     return cert;
 }
@@ -505,8 +485,8 @@ jabber_get_tls_peer_cert(void)
 gboolean
 jabber_conn_is_secured(void)
 {
-    if (jabber_conn.conn_status == JABBER_CONNECTED) {
-        return xmpp_conn_is_secured(jabber_conn.conn) == 0 ? FALSE : TRUE;
+    if (connection_get_status() == JABBER_CONNECTED) {
+        return xmpp_conn_is_secured(connection_get_conn()) == 0 ? FALSE : TRUE;
     } else {
         return FALSE;
     }
@@ -515,10 +495,10 @@ jabber_conn_is_secured(void)
 gboolean
 jabber_send_stanza(const char *const stanza)
 {
-    if (jabber_conn.conn_status != JABBER_CONNECTED) {
+    if (connection_get_status() != JABBER_CONNECTED) {
         return FALSE;
     } else {
-        xmpp_send_raw_string(jabber_conn.conn, "%s", stanza);
+        xmpp_send_raw_string(connection_get_conn(), "%s", stanza);
         return TRUE;
     }
 }
@@ -534,80 +514,23 @@ _jabber_connect(const char *const fulljid, const char *const passwd, const char
 
     if (jid == NULL) {
         log_error("Malformed JID not able to connect: %s", fulljid);
-        jabber_conn.conn_status = JABBER_DISCONNECTED;
-        return jabber_conn.conn_status;
+        connection_set_status(JABBER_DISCONNECTED);
+        return connection_get_status();
     } else if (jid->fulljid == NULL) {
         log_error("Full JID required to connect, received: %s", fulljid);
-        jabber_conn.conn_status = JABBER_DISCONNECTED;
+        connection_set_status(JABBER_DISCONNECTED);
         jid_destroy(jid);
-        return jabber_conn.conn_status;
+        return connection_get_status();
     }
 
     jid_destroy(jid);
 
     log_info("Connecting as %s", fulljid);
-    if (jabber_conn.log) {
-        free(jabber_conn.log);
-    }
-    jabber_conn.log = _xmpp_get_file_logger();
-
-    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);
-
-    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);
-    }
-
-#ifdef HAVE_LIBMESODE
     char *cert_path = prefs_get_string(PREF_TLS_CERTPATH);
-    if (cert_path) {
-        xmpp_conn_tlscert_path(jabber_conn.conn, cert_path);
-    }
+    jabber_conn_status_t status = connection_connect(fulljid, passwd, altdomain, port, tls_policy, cert_path);
     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;
-    }
-
-    return jabber_conn.conn_status;
+    return status;
 }
 
 static void
@@ -627,8 +550,8 @@ _jabber_reconnect(void)
     }
 }
 
-static void
-_jabber_lost_connection(void)
+void
+jabber_lost_connection(void)
 {
     sv_ev_lost_connection();
     if (prefs_get_reconnect() != 0) {
@@ -640,151 +563,3 @@ _jabber_lost_connection(void)
     }
     _connection_free_session_data();
 }
-
-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)
-{
-    // 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");
-    }
-}
-
-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;
-    }
-}
-
-static xmpp_log_level_t
-_get_xmpp_log_level()
-{
-    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;
-    }
-}
-
-static void
-_xmpp_file_logger(void *const userdata, const xmpp_log_level_t level, const char *const area, const char *const msg)
-{
-    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);
-    }
-}
-
-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;
-}

src/xmpp/session.h

@@ -58,4 +58,9 @@ void connection_autoping_fail(void);
 GSList* connection_get_disco_items(void);
 void connection_set_disco_items(GSList *disco_items);
 
+void jabber_login_success(int secured);
+void jabber_login_failed(void);
+void jabber_lost_connection(void);
+
+
 #endif

src/xmpp/xmpp.h

@@ -118,8 +118,8 @@ void jabber_disconnect(void);
 void jabber_shutdown(void);
 void jabber_process_events(int millis);
 const char* jabber_get_fulljid(void);
-jabber_conn_status_t jabber_get_connection_status(void);
-char* jabber_get_presence_message(void);
+jabber_conn_status_t connection_get_status(void);
+char *connection_get_presence_msg(void);
 char* jabber_get_account_name(void);
 GList* jabber_get_available_resources(void);
 char* jabber_create_uuid(void);