aniani/profanity
0
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-07-26 12:14:28 -04:00
Code

Tidy connect function

Browse Source
This commit is contained in:
James Booth 2016-05-06 02:08:10 +01:00
parent 3cb60399a1
commit c009144b3d
3 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/xmpp/connection.c
View File

@ -69,9 +69,6 @@ static void _xmpp_file_logger(void *const userdata, const xmpp_log_level_t level
static log_level_t _get_log_level(const xmpp_log_level_t xmpp_level); 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, 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); xmpp_stream_error_t *const stream_error, void *const userdata);
static 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);
#ifdef HAVE_LIBMESODE #ifdef HAVE_LIBMESODE
static int _connection_certfail_cb(xmpp_tlscert_t *xmpptlscert, const char *const errormsg); static int _connection_certfail_cb(xmpp_tlscert_t *xmpptlscert, const char *const errormsg);
@ -87,14 +84,13 @@ void connection_init(void)
} }
jabber_conn_status_t jabber_conn_status_t
connection_connect_main(const char *const fulljid, const char *const passwd, const char *const altdomain, int port, connection_connect(const char *const fulljid, const char *const passwd, const char *const altdomain, int port,
const char *const tls_policy) const char *const tls_policy)
{ {
assert(fulljid != NULL); assert(fulljid != NULL);
assert(passwd != NULL); assert(passwd != NULL);
Jid *jid = jid_create(fulljid); Jid *jid = jid_create(fulljid);
if (jid == NULL) { if (jid == NULL) {
log_error("Malformed JID not able to connect: %s", fulljid); log_error("Malformed JID not able to connect: %s", fulljid);
conn.conn_status = JABBER_DISCONNECTED; conn.conn_status = JABBER_DISCONNECTED;
@ -105,21 +101,10 @@ connection_connect_main(const char *const fulljid, const char *const passwd, con
jid_destroy(jid); jid_destroy(jid);
return conn.conn_status; return conn.conn_status;
} }
jid_destroy(jid); jid_destroy(jid);
log_info("Connecting as %s", fulljid); log_info("Connecting as %s", fulljid);
char *cert_path = prefs_get_string(PREF_TLS_CERTPATH);
jabber_conn_status_t status = _connection_connect(fulljid, passwd, altdomain, port, tls_policy, cert_path);
prefs_free_string(cert_path);
return status;
}
static 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) { if (conn.log) {
free(conn.log); free(conn.log);
} }
@ -151,12 +136,12 @@ _connection_connect(const char *const fulljid, const char *const passwd, const c
} }
#ifdef HAVE_LIBMESODE #ifdef HAVE_LIBMESODE
char *cert_path = prefs_get_string(PREF_TLS_CERTPATH);
if (cert_path) { if (cert_path) {
xmpp_conn_tlscert_path(conn.conn, cert_path); xmpp_conn_tlscert_path(conn.conn, cert_path);
} }
#endif prefs_free_string(cert_path);
#ifdef HAVE_LIBMESODE
int connect_status = xmpp_connect_client( int connect_status = xmpp_connect_client(
conn.conn, conn.conn,
altdomain, altdomain,

2
src/xmpp/connection.h
View File

@ -39,7 +39,7 @@
void connection_init(void); void connection_init(void);
jabber_conn_status_t connection_connect_main(const char *const fulljid, const char *const passwd, const char *const altdomain, int port, 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); const char *const tls_policy);
char *connection_get_domain(void); char *connection_get_domain(void);

6
src/xmpp/session.c
View File

@ -126,7 +126,7 @@ session_connect_with_account(const ProfAccount *const account)
// connect with fulljid // connect with fulljid
Jid *jidp = jid_create_from_bare_and_resource(account->jid, account->resource); Jid *jidp = jid_create_from_bare_and_resource(account->jid, account->resource);
jabber_conn_status_t result = jabber_conn_status_t result =
connection_connect_main(jidp->fulljid, account->password, account->server, account->port, account->tls_policy); connection_connect(jidp->fulljid, account->password, account->server, account->port, account->tls_policy);
jid_destroy(jidp); jid_destroy(jidp);
return result; return result;
@ -172,7 +172,7 @@ session_connect_with_details(const char *const jid, const char *const passwd, co
// connect with fulljid // connect with fulljid
log_info("Connecting without account, JID: %s", saved_details.jid); log_info("Connecting without account, JID: %s", saved_details.jid);
return connection_connect_main( return connection_connect(
saved_details.jid, saved_details.jid,
passwd, passwd,
saved_details.altdomain, saved_details.altdomain,
@ -435,7 +435,7 @@ _session_reconnect(void)
} else { } else {
char *fulljid = create_fulljid(account->jid, account->resource); char *fulljid = create_fulljid(account->jid, account->resource);
log_debug("Attempting reconnect with account %s", account->name); log_debug("Attempting reconnect with account %s", account->name);
connection_connect_main(fulljid, saved_account.passwd, account->server, account->port, account->tls_policy); connection_connect(fulljid, saved_account.passwd, account->server, account->port, account->tls_policy);
free(fulljid); free(fulljid);
g_timer_start(reconnect_timer); g_timer_start(reconnect_timer);
} }