diff options
| -rw-r--r-- | src/accounts.c | 12 | ||||
| -rw-r--r-- | src/command.c | 4 | ||||
| -rw-r--r-- | src/connection.c | 167 | ||||
| -rw-r--r-- | src/jabber.h | 2 | ||||
| -rw-r--r-- | src/profanity.c | 14 |
5 files changed, 119 insertions, 80 deletions
diff --git a/src/accounts.c b/src/accounts.c index 7454dfaa..286f135b 100644 --- a/src/accounts.c +++ b/src/accounts.c @@ -270,9 +270,15 @@ accounts_account_exists(const char * const account_name) void accounts_set_jid(const char * const account_name, const char * const value) { - if (accounts_account_exists(account_name)) { - g_key_file_set_string(accounts, account_name, "jid", value); - _save_accounts(); + Jid *jid = jid_create(value); + if (jid != NULL) { + if (accounts_account_exists(account_name)) { + g_key_file_set_string(accounts, account_name, "jid", jid->barejid); + if (jid->resourcepart != NULL) { + g_key_file_set_string(accounts, account_name, "resource", jid->resourcepart); + } + _save_accounts(); + } } } diff --git a/src/command.c b/src/command.c index 0ad2ad15..00260c93 100644 --- a/src/command.c +++ b/src/command.c @@ -1017,13 +1017,11 @@ _cmd_connect(gchar **args, struct cmd_help_t help) jid = strdup(account->jid); } cons_show("Connecting with account %s as %s", account->name, jid); - log_debug("Connecting with account %s as %s", account->name, jid); conn_status = jabber_connect_with_account(account, passwd); } else { jid = strdup(lower); cons_show("Connecting as %s", jid); - log_debug("Connecting as %s", jid); - conn_status = jabber_connect(jid, passwd, altdomain); + conn_status = jabber_connect_with_details(jid, passwd, altdomain); } if (conn_status == JABBER_DISCONNECTED) { diff --git a/src/connection.c b/src/connection.c index b359f85b..5db6649c 100644 --- a/src/connection.c +++ b/src/connection.c @@ -53,11 +53,16 @@ static GHashTable *sub_requests; // for auto reconnect static struct { - char *account; + char *name; + char *passwd; +} saved_account; + +static struct { + char *name; char *jid; char *passwd; char *altdomain; -} saved_user; +} saved_details; static GTimer *reconnect_timer; @@ -68,6 +73,10 @@ static void _xmpp_file_logger(void * const userdata, const char * const msg); static xmpp_log_t * _xmpp_get_file_logger(); +static jabber_conn_status_t _jabber_connect(const char * const fulljid, + const char * const passwd, const char * const altdomain); +static void _jabber_reconnect(void); + static void _jabber_roster_request(void); // XMPP event handlers @@ -105,61 +114,30 @@ jabber_restart(void) FREE_SET_NULL(jabber_conn.status); } -jabber_conn_status_t -jabber_connect_with_account(ProfAccount *account, const char * const passwd) +static jabber_conn_status_t +_jabber_connect(const char * const fulljid, const char * const passwd, + const char * const altdomain) { - saved_user.account = strdup(account->name); - - if (saved_user.jid == NULL) { - saved_user.jid = create_fulljid(account->jid, account->resource); - } - if (saved_user.passwd == NULL) { - saved_user.passwd = strdup(passwd); - } - if (saved_user.altdomain == NULL) { - if (account->server != NULL) { - saved_user.altdomain = strdup(account->server); - } - } - - log_info("Connecting with account: %s", account->name); - return jabber_connect(account->jid, passwd, account->server); -} + Jid *jid = jid_create(fulljid); -jabber_conn_status_t -jabber_connect(const char * const jid, - const char * const passwd, const char * const altdomain) -{ - Jid *jidp = jid_create(jid); - - if (saved_user.jid == NULL) { - if (jidp->resourcepart == NULL) { - jid_destroy(jidp); - jidp = jid_create_from_bare_and_resource(jid, "profanity"); - saved_user.jid = strdup(jidp->fulljid); - } else { - saved_user.jid = strdup(jid); - } + 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; + return jabber_conn.conn_status; } - jid_destroy(jidp); - if (saved_user.passwd == NULL) { - saved_user.passwd = strdup(passwd); - } - if (saved_user.altdomain == NULL) { - if (altdomain != NULL) { - saved_user.altdomain = strdup(altdomain); - } - } + jid_destroy(jid); - log_info("Connecting as %s", saved_user.jid); + log_info("Connecting as %s", fulljid); xmpp_initialize(); - jabber_conn.log = _xmpp_get_file_logger(); jabber_conn.ctx = xmpp_ctx_new(NULL, jabber_conn.log); jabber_conn.conn = xmpp_conn_new(jabber_conn.ctx); - - xmpp_conn_set_jid(jabber_conn.conn, saved_user.jid); + xmpp_conn_set_jid(jabber_conn.conn, fulljid); xmpp_conn_set_pass(jabber_conn.conn, passwd); if (jabber_conn.tls_disabled) @@ -176,6 +154,64 @@ jabber_connect(const char * const jid, return jabber_conn.conn_status; } +jabber_conn_status_t +jabber_connect_with_account(ProfAccount *account, const char * const passwd) +{ + saved_account.name = strdup(account->name); + saved_account.passwd = strdup(passwd); + + log_info("Connecting using account: %s", account->name); + char *fulljid = create_fulljid(account->jid, account->resource); + jabber_conn_status_t result = _jabber_connect(fulljid, passwd, account->server); + + free(fulljid); + + return result; +} + +jabber_conn_status_t +jabber_connect_with_details(const char * const jid, + const char * const passwd, const char * const altdomain) +{ + saved_details.name = strdup(jid); + saved_details.passwd = strdup(passwd); + if (altdomain != NULL) { + saved_details.altdomain = strdup(altdomain); + } else { + saved_details.altdomain = NULL; + } + + Jid *jidp = jid_create(jid); + if (jidp->resourcepart == NULL) { + jid_destroy(jidp); + jidp = jid_create_from_bare_and_resource(jid, "profanity"); + saved_details.jid = strdup(jidp->fulljid); + } else { + saved_details.jid = strdup(jid); + } + jid_destroy(jidp); + + log_info("Connecting without account, JID: %s", saved_details.jid); + return _jabber_connect(saved_details.jid, passwd, saved_details.altdomain); +} + +static void +_jabber_reconnect(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); + } 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); + free(fulljid); + g_timer_start(reconnect_timer); + } +} + void jabber_disconnect(void) { @@ -206,9 +242,7 @@ jabber_process_events(void) if ((jabber_conn.conn_status == JABBER_DISCONNECTED) && (reconnect_timer != NULL)) { if (g_timer_elapsed(reconnect_timer, NULL) > prefs_get_reconnect()) { - log_debug("Attempting reconnect as %s", saved_user.jid); - jabber_connect(saved_user.jid, saved_user.passwd, saved_user.altdomain); - g_timer_start(reconnect_timer); + _jabber_reconnect(); } } } @@ -514,10 +548,12 @@ jabber_get_status(void) void jabber_free_resources(void) { - FREE_SET_NULL(saved_user.jid); - FREE_SET_NULL(saved_user.passwd); - FREE_SET_NULL(saved_user.account); - FREE_SET_NULL(saved_user.altdomain); + 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_account.name); + FREE_SET_NULL(saved_account.passwd); chat_sessions_clear(); if (sub_requests != NULL) g_hash_table_remove_all(sub_requests); @@ -748,11 +784,24 @@ _connection_handler(xmpp_conn_t * const conn, // login success if (status == XMPP_CONN_CONNECT) { - if (saved_user.account != NULL) { - prof_handle_login_account_success(saved_user.account); + + // logged in with account + if (saved_account.name != NULL) { + prof_handle_login_account_success(saved_account.name); + + // logged in without account, use details to create new account } else { - const char *jid = xmpp_conn_get_jid(conn); - prof_handle_login_success(jid, saved_user.altdomain); + accounts_add(saved_details.name, saved_details.altdomain); + accounts_set_jid(saved_details.name, saved_details.jid); + + prof_handle_login_account_success(saved_details.name); + saved_account.name = strdup(saved_details.name); + saved_account.passwd = strdup(saved_details.passwd); + + FREE_SET_NULL(saved_details.name); + FREE_SET_NULL(saved_details.jid); + FREE_SET_NULL(saved_details.passwd); + FREE_SET_NULL(saved_details.altdomain); } chat_sessions_init(); diff --git a/src/jabber.h b/src/jabber.h index 22538fd1..df75d503 100644 --- a/src/jabber.h +++ b/src/jabber.h @@ -56,7 +56,7 @@ typedef enum { #define JABBER_PRIORITY_MAX 127 void jabber_init(const int disable_tls); -jabber_conn_status_t jabber_connect(const char * const jid, +jabber_conn_status_t jabber_connect_with_details(const char * const jid, const char * const passwd, const char * const altdomain); jabber_conn_status_t jabber_connect_with_account(ProfAccount *account, const char * const passwd); diff --git a/src/profanity.c b/src/profanity.c index 839d6e53..193f486e 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -214,20 +214,6 @@ prof_handle_login_account_success(char *account_name) } void -prof_handle_login_success(const char *jid, const char *altdomain) -{ - const char *msg = "logged in successfully."; - cons_show("%s %s", jid, msg); - title_bar_set_status(PRESENCE_ONLINE); - log_info("%s %s", jid, msg); - win_current_page_off(); - status_bar_print_message(jid); - status_bar_refresh(); - - accounts_add(jid, altdomain); -} - -void prof_handle_gone(const char * const from) { win_show_gone(from); |