devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Removed --disable-tls command line option

Browse Source
This commit is contained in:
James Booth
2015-10-18 00:17:45 +01:00
parent 31ecd41c8f
commit 9d2745e462
7 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/xmpp/connection.c
View File

@@ -70,7 +70,6 @@ static struct _jabber_conn_t {
jabber_conn_status_t conn_status;
char *presence_message;
int priority;
int tls_disabled;
char *domain;
} jabber_conn;
@@ -115,14 +114,13 @@ void _connection_free_saved_details(void);
void _connection_free_session_data(void);
void
jabber_init(const int disable_tls)
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.tls_disabled = disable_tls;
jabber_conn.domain = NULL;
presence_sub_requests_init();
caps_init();
@@ -430,9 +428,6 @@ _jabber_connect(const char * const fulljid, const char * const passwd,
}
xmpp_conn_set_jid(jabber_conn.conn, fulljid);
xmpp_conn_set_pass(jabber_conn.conn, passwd);
if (jabber_conn.tls_disabled) {
xmpp_conn_disable_tls(jabber_conn.conn);
}
#ifdef HAVE_LIBMESODE
char *cert_path = prefs_get_string(PREF_TLS_CERTPATH);

2
src/xmpp/xmpp.h
View File

@@ -137,7 +137,7 @@ typedef struct data_form_t {
} DataForm;
// connection functions
void jabber_init(const int disable_tls);
void jabber_init(void);
jabber_conn_status_t jabber_connect_with_details(const char * const jid,
const char * const passwd, const char * const altdomain, const int port);
jabber_conn_status_t jabber_connect_with_account(const ProfAccount * const account);