diff options
50 files changed, 1136 insertions, 1058 deletions
diff --git a/Makefile.am b/Makefile.am index 6e8b423b..52ae369f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,6 +7,7 @@ core_sources = \ src/resource.c src/resource.h \ src/roster_list.c src/roster_list.h \ src/xmpp/xmpp.h src/xmpp/capabilities.c src/xmpp/session.c \ + src/xmpp/connection.h src/xmpp/connection.c \ src/xmpp/iq.c src/xmpp/message.c src/xmpp/presence.c src/xmpp/stanza.c \ src/xmpp/stanza.h src/xmpp/message.h src/xmpp/iq.h src/xmpp/presence.h \ src/xmpp/capabilities.h src/xmpp/session.h \ diff --git a/src/command/command.c b/src/command/command.c index 3f9a18cc..b68ce3d2 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -3066,7 +3066,7 @@ cmd_autocomplete(ProfWin *window, const char *const input) void cmd_reset_autocomplete(ProfWin *window) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status == JABBER_CONNECTED) { roster_reset_search_attempts(); @@ -3353,7 +3353,7 @@ _cmd_complete_parameters(ProfWin *window, const char *const input) int i; char *result = NULL; - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); // autocomplete boolean settings gchar *boolean_choices[] = { "/beep", "/intype", "/states", "/outtype", "/flash", "/splash", "/chlog", "/grlog", @@ -3545,7 +3545,7 @@ _who_autocomplete(ProfWin *window, const char *const input) return result; } } else { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status == JABBER_CONNECTED) { int i = 0; gchar *group_commands[] = { "/who any", "/who online", "/who offline", @@ -3626,7 +3626,7 @@ _roster_autocomplete(ProfWin *window, const char *const input) return result; } - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status == JABBER_CONNECTED) { result = autocomplete_param_with_func(input, "/roster nick", roster_barejid_autocomplete); if (result) { @@ -3711,7 +3711,7 @@ _group_autocomplete(ProfWin *window, const char *const input) { char *result = NULL; - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status == JABBER_CONNECTED) { result = autocomplete_param_with_func(input, "/group show", roster_group_autocomplete); @@ -3981,7 +3981,7 @@ _otr_autocomplete(ProfWin *window, const char *const input) { char *found = NULL; - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status == JABBER_CONNECTED) { found = autocomplete_param_with_func(input, "/otr start", roster_contact_autocomplete); @@ -4033,7 +4033,7 @@ _pgp_autocomplete(ProfWin *window, const char *const input) { char *found = NULL; - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status == JABBER_CONNECTED) { found = autocomplete_param_with_func(input, "/pgp start", roster_contact_autocomplete); @@ -4188,7 +4188,7 @@ _resource_autocomplete(ProfWin *window, const char *const input) { char *found = NULL; - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status == JABBER_CONNECTED && window->type == WIN_CHAT) { ProfChatWin *chatwin = (ProfChatWin*)window; assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); diff --git a/src/command/commands.c b/src/command/commands.c index ada01d3f..f64c16e6 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -120,7 +120,7 @@ cmd_execute_default(ProfWin *window, const char *inp) return TRUE; } - jabber_conn_status_t status = jabber_get_connection_status(); + jabber_conn_status_t status = connection_get_status(); if (status != JABBER_CONNECTED) { ui_current_print_line("You are not currently connected."); return TRUE; @@ -150,7 +150,7 @@ cmd_execute_default(ProfWin *window, const char *inp) } case WIN_XML: { - jabber_send_stanza(inp); + connection_send_stanza(inp); break; } default: @@ -227,16 +227,16 @@ gboolean cmd_tls_trust(ProfWin *window, const char *const command, gchar **args) { #ifdef HAVE_LIBMESODE - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); return TRUE; } - if (!jabber_conn_is_secured()) { + if (!connection_is_secured()) { cons_show("No TLS connection established"); return TRUE; } - TLSCertificate *cert = jabber_get_tls_peer_cert(); + TLSCertificate *cert = connection_get_tls_peer_cert(); if (!cert) { cons_show("Error getting TLS certificate."); return TRUE; @@ -325,16 +325,16 @@ cmd_tls_cert(ProfWin *window, const char *const command, gchar **args) } return TRUE; } else { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); return TRUE; } - if (!jabber_conn_is_secured()) { + if (!connection_is_secured()) { cons_show("No TLS connection established"); return TRUE; } - TLSCertificate *cert = jabber_get_tls_peer_cert(); + TLSCertificate *cert = connection_get_tls_peer_cert(); if (!cert) { cons_show("Error getting TLS certificate."); return TRUE; @@ -353,8 +353,8 @@ cmd_tls_cert(ProfWin *window, const char *const command, gchar **args) gboolean cmd_connect(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); - if ((conn_status != JABBER_DISCONNECTED) && (conn_status != JABBER_STARTED)) { + jabber_conn_status_t conn_status = connection_get_status(); + if (conn_status != JABBER_DISCONNECTED) { cons_show("You are either connected already, or a login is in process."); return TRUE; } @@ -685,7 +685,7 @@ gboolean _account_set_resource(char *account_name, char *resource) { accounts_set_resource(account_name, resource); - if (jabber_get_connection_status() == JABBER_CONNECTED) { + if (connection_get_status() == JABBER_CONNECTED) { cons_show("Updated resource for account %s: %s, reconnect to pick up the change.", account_name, resource); } else { cons_show("Updated resource for account %s: %s", account_name, resource); @@ -806,8 +806,8 @@ _account_set_theme(char *account_name, char *theme) } accounts_set_theme(account_name, theme); - if (jabber_get_connection_status() == JABBER_CONNECTED) { - ProfAccount *account = accounts_get_account(jabber_get_account_name()); + if (connection_get_status() == JABBER_CONNECTED) { + ProfAccount *account = accounts_get_account(session_get_account_name()); if (account) { if (g_strcmp0(account->name, account_name) == 0) { theme_load(theme); @@ -878,12 +878,12 @@ _account_set_presence_priority(char *account_name, char *presence, char *priorit break; } - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status == JABBER_CONNECTED) { - char *connected_account = jabber_get_account_name(); + char *connected_account = session_get_account_name(); resource_presence_t last_presence = accounts_get_last_presence(connected_account); if (presence_type == last_presence) { - char *message = jabber_get_presence_message(); + char *message = connection_get_presence_msg(); cl_ev_presence_send(last_presence, message, 0); } } @@ -999,12 +999,12 @@ cmd_account(ProfWin *window, const char *const command, gchar **args) return TRUE; } - if (jabber_get_connection_status() != JABBER_CONNECTED) { + if (connection_get_status() != JABBER_CONNECTED) { cons_bad_cmd_usage(command); return TRUE; } - ProfAccount *account = accounts_get_account(jabber_get_account_name()); + ProfAccount *account = accounts_get_account(session_get_account_name()); cons_show_account(account); account_free(account); @@ -1058,7 +1058,7 @@ _writecsv(int fd, const char *const str) gboolean cmd_export(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -1128,7 +1128,7 @@ write_error: gboolean cmd_sub(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are currently not connected."); @@ -1218,7 +1218,7 @@ cmd_sub(ProfWin *window, const char *const command, gchar **args) gboolean cmd_disconnect(ProfWin *window, const char *const command, gchar **args) { - if (jabber_get_connection_status() != JABBER_CONNECTED) { + if (connection_get_status() != JABBER_CONNECTED) { cons_show("You are not currently connected."); return TRUE; } @@ -1344,7 +1344,7 @@ cmd_wins(ProfWin *window, const char *const command, gchar **args) gboolean cmd_close(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (g_strcmp0(args[0], "all") == 0) { int count = ui_close_all_wins(); @@ -2067,7 +2067,7 @@ _who_roster(ProfWin *window, const char *const command, gchar **args) gboolean cmd_who(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -2090,7 +2090,7 @@ cmd_msg(ProfWin *window, const char *const command, gchar **args) char *usr = args[0]; char *msg = args[1]; - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -2154,7 +2154,7 @@ cmd_msg(ProfWin *window, const char *const command, gchar **args) gboolean cmd_group(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -2261,7 +2261,7 @@ cmd_group(ProfWin *window, const char *const command, gchar **args) gboolean cmd_roster(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); // show roster if (args[0] == NULL) { @@ -2986,12 +2986,12 @@ cmd_roster(ProfWin *window, const char *const command, gchar **args) gboolean cmd_blocked(ProfWin *window, const char *const command, gchar **args) { - if (jabber_get_connection_status() != JABBER_CONNECTED) { + if (connection_get_status() != JABBER_CONNECTED) { cons_show("You are not currently connected."); return TRUE; } - if (!jabber_service_supports(XMPP_FEATURE_BLOCKING)) { + if (!connection_supports(XMPP_FEATURE_BLOCKING)) { cons_show("Blocking not supported by server."); return TRUE; } @@ -3076,7 +3076,7 @@ cmd_resource(ProfWin *window, const char *const command, gchar **args) return TRUE; } - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); return TRUE; @@ -3132,7 +3132,7 @@ cmd_status(ProfWin *window, const char *const command, gchar **args) { char *usr = args[0]; - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -3208,7 +3208,7 @@ cmd_info(ProfWin *window, const char *const command, gchar **args) { char *usr = args[0]; - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -3291,7 +3291,7 @@ cmd_info(ProfWin *window, const char *const command, gchar **args) gboolean cmd_caps(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); Occupant *occupant = NULL; if (conn_status != JABBER_CONNECTED) { @@ -3367,7 +3367,7 @@ cmd_caps(ProfWin *window, const char *const command, gchar **args) gboolean cmd_software(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -3419,7 +3419,7 @@ cmd_software(ProfWin *window, const char *const command, gchar **args) break; case WIN_CONSOLE: if (args[0]) { - Jid *myJid = jid_create(jabber_get_fulljid()); + Jid *myJid = jid_create(connection_get_fulljid()); Jid *jid = jid_create(args[0]); if (jid == NULL || jid->fulljid == NULL) { @@ -3454,20 +3454,20 @@ cmd_software(ProfWin *window, const char *const command, gchar **args) gboolean cmd_join(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); return TRUE; } if (args[0] == NULL) { - char *account_name = jabber_get_account_name(); + char *account_name = session_get_account_name(); ProfAccount *account = accounts_get_account(account_name); GString *room_str = g_string_new(""); - char *uuid = jabber_create_uuid(); + char *uuid = connection_create_uuid(); g_string_append_printf(room_str, "private-chat-%s@%s", uuid, account->muc_service); - jabber_free_uuid(uuid); + connection_free_uuid(uuid); presence_join_room(room_str->str, account->muc_nick, NULL); muc_join(room_str->str, account->muc_nick, NULL, FALSE); @@ -3489,7 +3489,7 @@ cmd_join(ProfWin *window, const char *const command, gchar **args) char *nick = NULL; char *passwd = NULL; GString *room_str = g_string_new(""); - char *account_name = jabber_get_account_name(); + char *account_name = session_get_account_name(); ProfAccount *account = accounts_get_account(account_name); // full room jid supplied (room@server) @@ -3550,7 +3550,7 @@ cmd_invite(ProfWin *window, const char *const command, gchar **args) { char *contact = args[0]; char *reason = args[1]; - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -3824,7 +3824,7 @@ cmd_form_field(ProfWin *window, char *tag, gchar **args) gboolean cmd_form(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -3901,7 +3901,7 @@ cmd_form(ProfWin *window, const char *const command, gchar **args) gboolean cmd_kick(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -3934,7 +3934,7 @@ cmd_kick(ProfWin *window, const char *const command, gchar **args) gboolean cmd_ban(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -3962,7 +3962,7 @@ cmd_ban(ProfWin *window, const char *const command, gchar **args) gboolean cmd_subject(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -4052,7 +4052,7 @@ cmd_subject(ProfWin *window, const char *const command, gchar **args) gboolean cmd_affiliation(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -4122,7 +4122,7 @@ cmd_affiliation(ProfWin *window, const char *const command, gchar **args) gboolean cmd_role(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -4190,7 +4190,7 @@ cmd_role(ProfWin *window, const char *const command, gchar **args) gboolean cmd_room(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -4253,7 +4253,7 @@ cmd_room(ProfWin *window, const char *const command, gchar **args) gboolean cmd_occupants(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -4338,7 +4338,7 @@ cmd_occupants(ProfWin *window, const char *const command, gchar **args) gboolean cmd_rooms(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -4346,7 +4346,7 @@ cmd_rooms(ProfWin *window, const char *const command, gchar **args) } if (args[0] == NULL) { - ProfAccount *account = accounts_get_account(jabber_get_account_name()); + ProfAccount *account = accounts_get_account(session_get_account_name()); iq_room_list_request(account->muc_service); account_free(account); } else { @@ -4359,7 +4359,7 @@ cmd_rooms(ProfWin *window, const char *const command, gchar **args) gboolean cmd_bookmark(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -4470,7 +4470,7 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args) gboolean cmd_disco(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -4481,7 +4481,7 @@ cmd_disco(ProfWin *window, const char *const command, gchar **args) if (args[1]) { jid = g_string_append(jid, args[1]); } else { - Jid *jidp = jid_create(jabber_get_fulljid()); + Jid *jidp = jid_create(connection_get_fulljid()); jid = g_string_append(jid, jidp->domainpart); jid_destroy(jidp); } @@ -4500,7 +4500,7 @@ cmd_disco(ProfWin *window, const char *const command, gchar **args) gboolean cmd_sendfile(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); char *filename = args[0]; // expand ~ to $HOME @@ -4556,7 +4556,7 @@ cmd_lastactivity(ProfWin *window, const char *const command, gchar **args) return TRUE; } - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -4564,7 +4564,7 @@ cmd_lastactivity(ProfWin *window, const char *const command, gchar **args) } if (args[0] == NULL) { - Jid *jidp = jid_create(jabber_get_fulljid()); + Jid *jidp = jid_create(connection_get_fulljid()); GString *jid = g_string_new(jidp->domainpart); iq_last_activity_request(jid->str); @@ -4582,7 +4582,7 @@ cmd_lastactivity(ProfWin *window, const char *const command, gchar **args) gboolean cmd_nick(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -4735,7 +4735,7 @@ cmd_clear(ProfWin *window, const char *const command, gchar **args) gboolean cmd_leave(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); int index = wins_get_current_num(); if (window->type != WIN_MUC) { @@ -5334,7 +5334,7 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args) // current chat room settings } else if (g_strcmp0(args[0], "on") == 0) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -5349,7 +5349,7 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args) } } } else if (g_strcmp0(args[0], "off") == 0) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -5364,7 +5364,7 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args) } } } else if (g_strcmp0(args[0], "mention") == 0) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -5392,7 +5392,7 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args) } } } else if (g_strcmp0(args[0], "trigger") == 0) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -5420,7 +5420,7 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args) } } } else if (g_strcmp0(args[0], "reset") == 0) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -5624,7 +5624,7 @@ cmd_autoping(ProfWin *window, const char *const command, gchar **args) gboolean cmd_ping(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -5748,7 +5748,7 @@ cmd_autoaway(ProfWin *window, const char *const command, gchar **args) gboolean cmd_priority(ProfWin *window, const char *const command, gchar **args) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -5761,9 +5761,9 @@ cmd_priority(ProfWin *window, const char *const command, gchar **args) char *err_msg = NULL; gboolean res = strtoi_range(value, &intval, -128, 127, &err_msg); if (res) { - accounts_set_priority_all(jabber_get_account_name(), intval); - resource_presence_t last_presence = accounts_get_last_presence(jabber_get_account_name()); - cl_ev_presence_send(last_presence, jabber_get_presence_message(), 0); + accounts_set_priority_all(session_get_account_name(), intval); + resource_presence_t last_presence = accounts_get_last_presence(session_get_account_name()); + cl_ev_presence_send(last_presence, connection_get_presence_msg(), 0); cons_show("Priority set to %d.", intval); } else { cons_show(err_msg); @@ -5950,7 +5950,7 @@ cmd_carbons(ProfWin *window, const char *const command, gchar **args) { _cmd_set_boolean_preference(args[0], command, "Message carbons preference", PREF_CARBONS); - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status == JABBER_CONNECTED) { // enable carbons @@ -6122,7 +6122,7 @@ cmd_pgp(ProfWin *window, const char *const command, gchar **args) } if (g_strcmp0(args[0], "setkey") == 0) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); return TRUE; @@ -6151,7 +6151,7 @@ cmd_pgp(ProfWin *window, const char *const command, gchar **args) } if (g_strcmp0(args[0], "contacts") == 0) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); return TRUE; @@ -6195,7 +6195,7 @@ cmd_pgp(ProfWin *window, const char *const command, gchar **args) } if (g_strcmp0(args[0], "start") == 0) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You must be connected to start PGP encrpytion."); return TRUE; @@ -6235,7 +6235,7 @@ cmd_pgp(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfAccount *account = accounts_get_account(jabber_get_account_name()); + ProfAccount *account = accounts_get_account(session_get_account_name()); char *err_str = NULL; if (!p_gpg_valid_key(account->pgp_keyid, &err_str)) { ui_current_print_formatted_line('!', 0, "Invalid PGP key ID %s: %s, cannot start PGP encryption.", account->pgp_keyid, err_str); @@ -6257,7 +6257,7 @@ cmd_pgp(ProfWin *window, const char *const command, gchar **args) } if (g_strcmp0(args[0], "end") == 0) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); return TRUE; @@ -6375,7 +6375,7 @@ cmd_otr_policy(ProfWin *window, const char *const command, gchar **args) return TRUE; } - if (jabber_get_connection_status() != JABBER_CONNECTED) { + if (connection_get_status() != JABBER_CONNECTED) { cons_show("You must be connected to set the OTR policy for a contact."); return TRUE; } @@ -6384,7 +6384,7 @@ cmd_otr_policy(ProfWin *window, const char *const command, gchar **args) if (contact_jid == NULL) { contact_jid = contact; } - accounts_add_otr_policy(jabber_get_account_name(), contact_jid, choice); + accounts_add_otr_policy(session_get_account_name(), contact_jid, choice); cons_show("OTR policy for %s set to: %s", contact_jid, choice); return TRUE; #else @@ -6397,12 +6397,12 @@ gboolean cmd_otr_gen(ProfWin *window, const char *const command, gchar **args) { #ifdef HAVE_LIBOTR - if (jabber_get_connection_status() != JABBER_CONNECTED) { + if (connection_get_status() != JABBER_CONNECTED) { cons_show("You must be connected with an account to load OTR information."); return TRUE; } - ProfAccount *account = accounts_get_account(jabber_get_account_name()); + ProfAccount *account = accounts_get_account(session_get_account_name()); otr_keygen(account); account_free(account); return TRUE; @@ -6416,7 +6416,7 @@ gboolean cmd_otr_myfp(ProfWin *window, const char *const command, gchar **args) { #ifdef HAVE_LIBOTR - if (jabber_get_connection_status() != JABBER_CONNECTED) { + if (connection_get_status() != JABBER_CONNECTED) { cons_show("You must be connected with an account to load OTR information."); return TRUE; } @@ -6440,7 +6440,7 @@ gboolean cmd_otr_theirfp(ProfWin *window, const char *const command, gchar **args) { #ifdef HAVE_LIBOTR - if (jabber_get_connection_status() != JABBER_CONNECTED) { + if (connection_get_status() != JABBER_CONNECTED) { cons_show("You must be connected with an account to load OTR information."); return TRUE; } @@ -6471,7 +6471,7 @@ gboolean cmd_otr_start(ProfWin *window, const char *const command, gchar **args) { #ifdef HAVE_LIBOTR - if (jabber_get_connection_status() != JABBER_CONNECTED) { + if (connection_get_status() != JABBER_CONNECTED) { cons_show("You must be connected with an account to load OTR information."); return TRUE; } @@ -6554,7 +6554,7 @@ gboolean cmd_otr_end(ProfWin *window, const char *const command, gchar **args) { #ifdef HAVE_LIBOTR - if (jabber_get_connection_status() != JABBER_CONNECTED) { + if (connection_get_status() != JABBER_CONNECTED) { cons_show("You must be connected with an account to load OTR information."); return TRUE; } @@ -6584,7 +6584,7 @@ gboolean cmd_otr_trust(ProfWin *window, const char *const command, gchar **args) { #ifdef HAVE_LIBOTR - if (jabber_get_connection_status() != JABBER_CONNECTED) { + if (connection_get_status() != JABBER_CONNECTED) { cons_show("You must be connected with an account to load OTR information."); return TRUE; } @@ -6614,7 +6614,7 @@ gboolean cmd_otr_untrust(ProfWin *window, const char *const command, gchar **args) { #ifdef HAVE_LIBOTR - if (jabber_get_connection_status() != JABBER_CONNECTED) { + if (connection_get_status() != JABBER_CONNECTED) { cons_show("You must be connected with an account to load OTR information."); return TRUE; } @@ -6644,7 +6644,7 @@ gboolean cmd_otr_secret(ProfWin *window, const char *const command, gchar **args) { #ifdef HAVE_LIBOTR - if (jabber_get_connection_status() != JABBER_CONNECTED) { + if (connection_get_status() != JABBER_CONNECTED) { cons_show("You must be connected with an account to load OTR information."); return TRUE; } @@ -6679,7 +6679,7 @@ gboolean cmd_otr_question(ProfWin *window, const char *const command, gchar **args) { #ifdef HAVE_LIBOTR - if (jabber_get_connection_status() != JABBER_CONNECTED) { + if (connection_get_status() != JABBER_CONNECTED) { cons_show("You must be connected with an account to load OTR information."); return TRUE; } @@ -6715,7 +6715,7 @@ gboolean cmd_otr_answer(ProfWin *window, const char *const command, gchar **args) { #ifdef HAVE_LIBOTR - if (jabber_get_connection_status() != JABBER_CONNECTED) { + if (connection_get_status() != JABBER_CONNECTED) { cons_show("You must be connected with an account to load OTR information."); return TRUE; } @@ -6764,7 +6764,7 @@ _update_presence(const resource_presence_t resource_presence, msg = args[0]; } - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); diff --git a/src/config/scripts.c b/src/config/scripts.c index ef203fcb..0f8800d8 100644 --- a/src/config/scripts.c +++ b/src/config/scripts.c @@ -159,7 +159,7 @@ scripts_exec(const char *const script) while ((read = getline(&line, &len, scriptfile)) != -1) { ProfWin *win = wins_get_current(); cmd_process_input(win, line); - jabber_process_events(10); + session_process_events(10); ui_update(); } diff --git a/src/event/client_events.c b/src/event/client_events.c index 1c715f03..a1a7408a 100644 --- a/src/event/client_events.c +++ b/src/event/client_events.c @@ -55,7 +55,7 @@ jabber_conn_status_t cl_ev_connect_jid(const char *const jid, const char *const passwd, const char *const altdomain, const int port, const char *const tls_policy) { cons_show("Connecting as %s", jid); - return jabber_connect_with_details(jid, passwd, altdomain, port, tls_policy); + return session_connect_with_details(jid, passwd, altdomain, port, tls_policy); } jabber_conn_status_t @@ -65,18 +65,18 @@ cl_ev_connect_account(ProfAccount *account) cons_show("Connecting with account %s as %s", account->name, jid); free(jid); - return jabber_connect_with_account(account); + return session_connect_with_account(account); } void cl_ev_disconnect(void) { - const char *jid = jabber_get_fulljid(); + const char *jid = connection_get_fulljid(); cons_show("%s logged out successfully.", jid); ui_disconnected(); ui_close_all_wins(); - jabber_disconnect(); + session_disconnect(); roster_destroy(); muc_invites_clear(); chat_sessions_clear(); @@ -92,7 +92,7 @@ cl_ev_presence_send(const resource_presence_t presence_type, const char *const m char *signed_status = NULL; #ifdef HAVE_LIBGPGME - char *account_name = jabber_get_account_name(); + char *account_name = session_get_account_name(); ProfAccount *account = accounts_get_account(account_name); if (account->pgp_keyid) { signed_status = p_gpg_sign(msg, account->pgp_keyid); diff --git a/src/event/server_events.c b/src/event/server_events.c index d3d57da2..5a04a885 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -61,7 +61,7 @@ #include "ui/ui.h" void -sv_ev_login_account_success(char *account_name, int secured) +sv_ev_login_account_success(char *account_name, gboolean secured) { ProfAccount *account = accounts_get_account(account_name); @@ -105,7 +105,7 @@ sv_ev_roster_received(void) ui_show_roster(); } - char *account_name = jabber_get_account_name(); + char *account_name = session_get_account_name(); #ifdef HAVE_LIBGPGME // check pgp key valid if specified @@ -148,7 +148,7 @@ sv_ev_roster_received(void) cl_ev_presence_send(conn_presence, NULL, 0); } - const char *fulljid = jabber_get_fulljid(); + const char *fulljid = connection_get_fulljid(); plugins_on_connect(account_name, fulljid); } @@ -238,7 +238,7 @@ void sv_ev_room_message(const char *const room_jid, const char *const nick, const char *const message) { if (prefs_get_boolean(PREF_GRLOG)) { - Jid *jid = jid_create(jabber_get_fulljid()); + Jid *jid = jid_create(connection_get_fulljid()); groupchat_log_chat(jid->barejid, room_jid, nick, message); jid_destroy(jid); } diff --git a/src/event/server_events.h b/src/event/server_events.h index 7dc0107f..8c66f6de 100644 --- a/src/event/server_events.h +++ b/src/event/server_events.h @@ -37,7 +37,7 @@ #include "xmpp/xmpp.h" -void sv_ev_login_account_success(char *account_name, int secured); +void sv_ev_login_account_success(char *account_name, gboolean secured); void sv_ev_lost_connection(void); void sv_ev_failed_login(void); void sv_ev_room_invite(jabber_invite_t invite_type, diff --git a/src/log.c b/src/log.c index c89caf6a..56aeec2b 100644 --- a/src/log.c +++ b/src/log.c @@ -265,7 +265,7 @@ void chat_log_msg_out(const char *const barejid, const char *const msg) { if (prefs_get_boolean(PREF_CHLOG)) { - const char *jid = jabber_get_fulljid(); + const char *jid = connection_get_fulljid(); Jid *jidp = jid_create(jid); _chat_log_chat(jidp->barejid, barejid, msg, PROF_OUT_LOG, NULL); jid_destroy(jidp); @@ -276,7 +276,7 @@ void chat_log_otr_msg_out(const char *const barejid, const char *const msg) { if (prefs_get_boolean(PREF_CHLOG)) { - const char *jid = jabber_get_fulljid(); + const char *jid = connection_get_fulljid(); Jid *jidp = jid_create(jid); char *pref_otr_log = prefs_get_string(PREF_OTR_LOG); if (strcmp(pref_otr_log, "on") == 0) { @@ -293,7 +293,7 @@ void chat_log_pgp_msg_out(const char *const barejid, const char *const msg) { if (prefs_get_boolean(PREF_CHLOG)) { - const char *jid = jabber_get_fulljid(); + const char *jid = connection_get_fulljid(); Jid *jidp = jid_create(jid); char *pref_pgp_log = prefs_get_string(PREF_PGP_LOG); if (strcmp(pref_pgp_log, "on") == 0) { @@ -310,7 +310,7 @@ void chat_log_otr_msg_in(const char *const barejid, const char *const msg, gboolean was_decrypted, GDateTime *timestamp) { if (prefs_get_boolean(PREF_CHLOG)) { - const char *jid = jabber_get_fulljid(); + const char *jid = connection_get_fulljid(); Jid *jidp = jid_create(jid); char *pref_otr_log = prefs_get_string(PREF_OTR_LOG); if (!was_decrypted || (strcmp(pref_otr_log, "on") == 0)) { @@ -327,7 +327,7 @@ void chat_log_pgp_msg_in(const char *const barejid, const char *const msg, GDateTime *timestamp) { if (prefs_get_boolean(PREF_CHLOG)) { - const char *jid = jabber_get_fulljid(); + const char *jid = connection_get_fulljid(); Jid *jidp = jid_create(jid); char *pref_pgp_log = prefs_get_string(PREF_PGP_LOG); if (strcmp(pref_pgp_log, "on") == 0) { @@ -344,7 +344,7 @@ void chat_log_msg_in(const char *const barejid, const char *const msg, GDateTime *timestamp) { if (prefs_get_boolean(PREF_CHLOG)) { - const char *jid = jabber_get_fulljid(); + const char *jid = connection_get_fulljid(); Jid *jidp = jid_create(jid); _chat_log_chat(jidp->barejid, barejid, msg, PROF_IN_LOG, timestamp); jid_destroy(jidp); diff --git a/src/otr/otr.c b/src/otr/otr.c index 7b7b8e8e..5fc51038 100644 --- a/src/otr/otr.c +++ b/src/otr/otr.c @@ -87,7 +87,7 @@ cb_policy(void *opdata, ConnContext *context) static int cb_is_logged_in(void *opdata, const char *accountname, const char *protocol, const char *recipient) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { return PRESENCE_OFFLINE; } @@ -673,7 +673,7 @@ otr_get_their_fingerprint(const char *const recipient) prof_otrpolicy_t otr_get_policy(const char *const recipient) { - char *account_name = jabber_get_account_name(); + char *account_name = session_get_account_name(); ProfAccount *account = accounts_get_account(account_name); // check contact specific setting if (g_list_find_custom(account->otr_manual, recipient, (GCompareFunc)g_strcmp0)) { diff --git a/src/plugins/api.c b/src/plugins/api.c index 0de9bab0..0a4b04af 100644 --- a/src/plugins/api.c +++ b/src/plugins/api.c @@ -381,7 +381,7 @@ api_win_show_themed(const char *tag, const char *const group, const char *const int api_send_stanza(const char *const stanza) { - return jabber_send_stanza(stanza); + return connection_send_stanza(stanza); } gboolean @@ -440,9 +440,9 @@ api_disco_add_feature(char *feature) caps_reset_ver(); // resend presence to update server's disco info data for this client - if (jabber_get_connection_status() == JABBER_CONNECTED) { - resource_presence_t last_presence = accounts_get_last_presence(jabber_get_account_name()); - cl_ev_presence_send(last_presence, jabber_get_presence_message(), 0); + if (connection_get_status() == JABBER_CONNECTED) { + resource_presence_t last_presence = accounts_get_last_presence(session_get_account_name()); + cl_ev_presence_send(last_presence, connection_get_presence_msg(), 0); } } diff --git a/src/plugins/plugins.c b/src/plugins/plugins.c index bb8e7563..5757a174 100644 --- a/src/plugins/plugins.c +++ b/src/plugins/plugins.c @@ -157,9 +157,9 @@ plugins_load(const char *const name) #endif if (plugin) { plugins = g_slist_append(plugins, plugin); - if (jabber_get_connection_status() == JABBER_CONNECTED) { - const char *account_name = jabber_get_account_name(); - const char *fulljid = jabber_get_fulljid(); + if (connection_get_status() == JABBER_CONNECTED) { + const char *account_name = session_get_account_name(); + const char *fulljid = connection_get_fulljid(); plugin->init_func(plugin, PACKAGE_VERSION, PACKAGE_STATUS, account_name, fulljid); } else { plugin->init_func(plugin, PACKAGE_VERSION, PACKAGE_STATUS, NULL, NULL); diff --git a/src/profanity.c b/src/profanity.c index 9e27b6e8..56f242ef 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -130,7 +130,7 @@ prof_run(char *log_level, char *account_name) #endif plugins_run_timed(); notify_remind(); - jabber_process_events(10); + session_process_events(10); iq_autoping_check(); ui_update(); #ifdef HAVE_GTK @@ -148,7 +148,7 @@ prof_set_quit(void) void prof_handle_idle(void) { - jabber_conn_status_t status = jabber_get_connection_status(); + jabber_conn_status_t status = connection_get_status(); if (status == JABBER_CONNECTED) { GSList *recipients = wins_get_chat_recipients(); GSList *curr = recipients; @@ -169,7 +169,7 @@ prof_handle_idle(void) void prof_handle_activity(void) { - jabber_conn_status_t status = jabber_get_connection_status(); + jabber_conn_status_t status = connection_get_status(); ProfWin *current = wins_get_current(); if ((status == JABBER_CONNECTED) && (current->type == WIN_CHAT)) { @@ -197,7 +197,7 @@ _connect_default(const char *const account) static void _check_autoaway(void) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { return; } @@ -209,7 +209,7 @@ _check_autoaway(void) int away_time_ms = away_time * 60000; int xa_time_ms = xa_time * 60000; - char *account = jabber_get_account_name(); + char *account = session_get_account_name(); resource_presence_t curr_presence = accounts_get_last_presence(account); char *curr_status = accounts_get_last_status(account); @@ -349,7 +349,7 @@ _init(char *log_level) theme_init(theme); prefs_free_string(theme); ui_init(); - jabber_init(); + session_init(); cmd_init(); log_info("Initialising contact list"); muc_init(); @@ -380,14 +380,14 @@ _shutdown(void) } } - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status == JABBER_CONNECTED) { cl_ev_disconnect(); } #ifdef HAVE_GTK tray_shutdown(); #endif - jabber_shutdown(); + session_shutdown(); plugins_on_shutdown(); muc_close(); caps_close(); diff --git a/src/ui/chatwin.c b/src/ui/chatwin.c index f7e5eebb..d4336c09 100644 --- a/src/ui/chatwin.c +++ b/src/ui/chatwin.c @@ -360,7 +360,7 @@ chatwin_get_string(ProfChatWin *chatwin) GString *res = g_string_new("Chat "); - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status == JABBER_CONNECTED) { PContact contact = roster_get_contact(chatwin->barejid); if (contact == NULL) { @@ -388,7 +388,7 @@ static void _chatwin_history(ProfChatWin *chatwin, const char *const contact) { if (!chatwin->history_shown) { - Jid *jid = jid_create(jabber_get_fulljid()); + Jid *jid = jid_create(connection_get_fulljid()); GSList *history = chat_log_get_previous(jid->barejid, contact); jid_destroy(jid); GSList *curr = history; diff --git a/src/ui/console.c b/src/ui/console.c index 9d21f2d7..7adc0147 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -472,7 +472,7 @@ cons_check_version(gboolean not_available_msg) } void -cons_show_login_success(ProfAccount *account, int secured) +cons_show_login_success(ProfAccount *account, gboolean secured) { ProfWin *console = wins_get_console(); win_vprint(console, '-', 0, NULL, NO_EOL, 0, "", "%s logged in successfully, ", account->jid); @@ -845,8 +845,8 @@ cons_show_account_list(gchar **accounts) cons_show("Accounts:"); int i = 0; for (i = 0; i < size; i++) { - if ((jabber_get_connection_status() == JABBER_CONNECTED) && - (g_strcmp0(jabber_get_account_name(), accounts[i]) == 0)) { + if ((connection_get_status() == JABBER_CONNECTED) && + (g_strcmp0(session_get_account_name(), accounts[i]) == 0)) { resource_presence_t presence = accounts_get_last_presence(accounts[i]); theme_item_t presence_colour = theme_main_presence_attrs(string_from_resource_presence(presence)); win_vprint(console, '-', 0, NULL, 0, presence_colour, "", "%s", accounts[i]); @@ -961,9 +961,9 @@ cons_show_account(ProfAccount *account) account->priority_chat, account->priority_online, account->priority_away, account->priority_xa, account->priority_dnd); - if ((jabber_get_connection_status() == JABBER_CONNECTED) && - (g_strcmp0(jabber_get_account_name(), account->name) == 0)) { - GList *resources = jabber_get_available_resources(); + if ((connection_get_status() == JABBER_CONNECTED) && + (g_strcmp0(session_get_account_name(), account->name) == 0)) { + GList *resources = connection_get_available_resources(); GList *ordered_resources = NULL; GList *curr = resources; diff --git a/src/ui/core.c b/src/ui/core.c index 4d9b4445..0b761274 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -352,7 +352,7 @@ ui_group_removed(const char *const contact, const char *const group) } void -ui_handle_login_account_success(ProfAccount *account, int secured) +ui_handle_login_account_success(ProfAccount *account, gboolean secured) { if (account->theme) { if (theme_load(account->theme)) { @@ -378,7 +378,7 @@ ui_handle_login_account_success(ProfAccount *account, int secured) cons_show_login_success(account, secured); title_bar_set_presence(contact_presence); title_bar_set_connected(TRUE); - title_bar_set_tls(secured ? TRUE : FALSE); + title_bar_set_tls(secured); GString *fulljid = g_string_new(account->jid); g_string_append(fulljid, "/"); @@ -394,7 +394,7 @@ ui_update_presence(const resource_presence_t resource_presence, { contact_presence_t contact_presence = contact_presence_from_resource_presence(resource_presence); title_bar_set_presence(contact_presence); - gint priority = accounts_get_priority_for_presence_type(jabber_get_account_name(), resource_presence); + gint priority = accounts_get_priority_for_presence_type(session_get_account_name(), resource_presence); if (message) { cons_show("Status set to %s (priority %d), \"%s\".", show, priority, message); } else { @@ -512,7 +512,7 @@ int ui_close_all_wins(void) { int count = 0; - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); GList *win_nums = wins_get_nums(); GList *curr = win_nums; @@ -539,7 +539,7 @@ int ui_close_read_wins(void) { int count = 0; - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); GList *win_nums = wins_get_nums(); GList *curr = win_nums; @@ -692,7 +692,7 @@ ui_close_win(int index) void ui_prune_wins(void) { - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); gboolean pruned = FALSE; GSList *wins = wins_get_prune_wins(); @@ -1104,10 +1104,10 @@ static void _ui_draw_term_title(void) { char new_win_title[100]; - jabber_conn_status_t status = jabber_get_connection_status(); + jabber_conn_status_t status = connection_get_status(); if (status == JABBER_CONNECTED) { - const char * const jid = jabber_get_fulljid(); + const char * const jid = connection_get_fulljid(); gint unread = wins_get_total_unread(); if (unread != 0) { diff --git a/src/ui/rosterwin.c b/src/ui/rosterwin.c index fcacb4cd..9c1cfc80 100644 --- a/src/ui/rosterwin.c +++ b/src/ui/rosterwin.c @@ -85,7 +85,7 @@ rosterwin_roster(void) return; } - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { return; } diff --git a/src/ui/titlebar.c b/src/ui/titlebar.c index 2b50dbd7..ea1794d3 100644 --- a/src/ui/titlebar.c +++ b/src/ui/titlebar.c @@ -403,7 +403,7 @@ _show_contact_presence(ProfChatWin *chatwin) theme_item_t presence_colour = THEME_TITLE_OFFLINE; const char *presence = "offline"; - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status == JABBER_CONNECTED) { PContact contact = roster_get_contact(chatwin->barejid); if (contact) { diff --git a/src/ui/ui.h b/src/ui/ui.h index 36a70618..a4b9e8ec 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -118,7 +118,7 @@ void ui_show_software_version(const char *const jid, const char *const presence const char *const version, const char *const os); void ui_prune_wins(void); void ui_auto_away(char *message, gint time, resource_presence_t res_presence); -void ui_handle_login_account_success(ProfAccount *account, int secured); +void ui_handle_login_account_success(ProfAccount *account, gboolean secured); void ui_update_presence(const resource_presence_t resource_presence, const char *const message, const char *const show); void ui_write(char *line, int offset); void ui_invalid_command_usage(const char *const cmd, void (*setting_func)(void)); @@ -260,7 +260,7 @@ void cons_show_themes(GSList *themes); void cons_show_scripts(GSList *scripts); void cons_show_script(const char *const script, GSList *commands); void cons_show_aliases(GList *aliases); -void cons_show_login_success(ProfAccount *account, int secured); +void cons_show_login_success(ProfAccount *account, gboolean secured); void cons_show_software_version(const char *const jid, const char *const presence, const char *const name, const char *const version, const char *const os); void cons_show_account_list(gchar **accounts); diff --git a/src/ui/window.c b/src/ui/window.c index 3a96ca08..b9a8c7fd 100644 --- a/src/ui/window.c +++ b/src/ui/window.c @@ -263,7 +263,7 @@ win_get_title(ProfWin *window) if (window->type == WIN_CHAT) { ProfChatWin *chatwin = (ProfChatWin*) window; assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status == JABBER_CONNECTED) { PContact contact = roster_get_contact(chatwin->barejid); if (contact) { diff --git a/src/window_list.c b/src/window_list.c index 73fb37e8..01d5d412 100644 --- a/src/window_list.c +++ b/src/window_list.c @@ -374,7 +374,7 @@ wins_get_by_string(char *str) return (ProfWin*)chatwin; } - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status == JABBER_CONNECTED) { char *barejid = roster_barejid_from_name(str); if (barejid) { @@ -527,7 +527,7 @@ wins_close_by_num(int i) autocomplete_remove(wins_ac, chatwin->barejid); autocomplete_remove(wins_close_ac, chatwin->barejid); - jabber_conn_status_t conn_status = jabber_get_connection_status(); + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status == JABBER_CONNECTED) { PContact contact = roster_get_contact(chatwin->barejid); if (contact) { diff --git a/src/xmpp/blocking.c b/src/xmpp/blocking.c index 13b20e9a..766313e0 100644 --- a/src/xmpp/blocking.c +++ b/src/xmpp/blocking.c @@ -47,6 +47,7 @@ #include "common.h" #include "ui/ui.h" #include "xmpp/session.h" +#include "xmpp/connection.h" #include "xmpp/stanza.h" #include "xmpp/iq.h" diff --git a/src/xmpp/bookmark.c b/src/xmpp/bookmark.c index 35e018f8..0f88a129 100644 --- a/src/xmpp/bookmark.c +++ b/src/xmpp/bookmark.c @@ -51,7 +51,7 @@ #include "log.h" #include "muc.h" #include "event/server_events.h" -#include "xmpp/session.h" +#include "xmpp/connection.h" #include "xmpp/iq.h" #include "xmpp/stanza.h" #include "xmpp/xmpp.h" @@ -177,7 +177,7 @@ bookmark_join(const char *jid) if (found == NULL) { return FALSE; } else { - char *account_name = jabber_get_account_name(); + char *account_name = session_get_account_name(); ProfAccount *account = accounts_get_account(account_name); Bookmark *item = found->data; if (!muc_active(item->jid)) { @@ -276,7 +276,7 @@ _bookmark_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata) if (bookmark_ac == NULL) { bookmark_ac = autocomplete_new(); } - my_jid = jid_create(jabber_get_fulljid()); + my_jid = jid_create(connection_get_fulljid()); ptr = xmpp_stanza_get_children(ptr); while (ptr) { @@ -333,7 +333,7 @@ _bookmark_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata) if (autojoin_val) { Jid *room_jid; - char *account_name = jabber_get_account_name(); + char *account_name = session_get_account_name(); ProfAccount *account = accounts_get_account(account_name); if (nick == NULL) { nick = account->muc_nick; diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c new file mode 100644 index 00000000..ffabc149 --- /dev/null +++ b/src/xmpp/connection.c @@ -0,0 +1,523 @@ +/* + * 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> +#include <assert.h> + +#ifdef HAVE_LIBMESODE +#include <mesode.h> +#endif +#ifdef HAVE_LIBSTROPHE +#include <strophe.h> +#endif + +#include "log.h" +#include "config/preferences.h" +#include "event/server_events.h" +#include "xmpp/connection.h" +#include "xmpp/session.h" +#include "xmpp/iq.h" + +typedef struct prof_conn_t { + xmpp_log_t *xmpp_log; + xmpp_ctx_t *xmpp_ctx; + xmpp_conn_t *xmpp_conn; + jabber_conn_status_t conn_status; + char *presence_message; + int priority; + char *domain; + GHashTable *available_resources; + GHashTable *features_by_jid; +} ProfConnection; + +static ProfConnection conn; + +static xmpp_log_t* _xmpp_get_file_logger(void); +static void _xmpp_file_logger(void *const userdata, const xmpp_log_level_t level, const char *const area, const char *const msg); + +static void _connection_handler(xmpp_conn_t *const xmpp_conn, const xmpp_conn_event_t status, const int error, + xmpp_stream_error_t *const stream_error, void *const userdata); + +#ifdef HAVE_LIBMESODE +TLSCertificate* _xmppcert_to_profcert(xmpp_tlscert_t *xmpptlscert); +static int _connection_certfail_cb(xmpp_tlscert_t *xmpptlscert, const char *const errormsg); +#endif + +void +connection_init(void) +{ + xmpp_initialize(); + conn.xmpp_conn = NULL; + conn.xmpp_ctx = NULL; + conn.conn_status = JABBER_DISCONNECTED; + conn.presence_message = NULL; + conn.domain = NULL; + conn.features_by_jid = NULL; + conn.available_resources = g_hash_table_new_full(g_str_hash, g_str_equal, free, (GDestroyNotify)resource_destroy); +} + +void +connection_shutdown(void) +{ + connection_clear_data(); + xmpp_shutdown(); + + free(conn.xmpp_log); + conn.xmpp_log = 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) +{ + assert(fulljid != NULL); + assert(passwd != NULL); + + Jid *jid = jid_create(fulljid); + if (jid == NULL) { + log_error("Malformed JID not able to connect: %s", fulljid); + conn.conn_status = JABBER_DISCONNECTED; + return conn.conn_status; + } else if (jid->fulljid == NULL) { + log_error("Full JID required to connect, received: %s", fulljid); + conn.conn_status = JABBER_DISCONNECTED; + jid_destroy(jid); + return conn.conn_status; + } + jid_destroy(jid); + + log_info("Connecting as %s", fulljid); + + if (conn.xmpp_log) { + free(conn.xmpp_log); + } + conn.xmpp_log = _xmpp_get_file_logger(); + + if (conn.xmpp_conn) { + xmpp_conn_release(conn.xmpp_conn); + } + if (conn.xmpp_ctx) { + xmpp_ctx_free(conn.xmpp_ctx); + } + conn.xmpp_ctx = xmpp_ctx_new(NULL, conn.xmpp_log); + if (conn.xmpp_ctx == NULL) { + log_warning("Failed to get libstrophe ctx during connect"); + return JABBER_DISCONNECTED; + } + conn.xmpp_conn = xmpp_conn_new(conn.xmpp_ctx); + if (conn.xmpp_conn == NULL) { + log_warning("Failed to get libstrophe conn during connect"); + return JABBER_DISCONNECTED; + } + xmpp_conn_set_jid(conn.xmpp_conn, fulljid); + xmpp_conn_set_pass(conn.xmpp_conn, passwd); + + if (!tls_policy || (g_strcmp0(tls_policy, "force") == 0)) { + xmpp_conn_set_flags(conn.xmpp_conn, XMPP_CONN_FLAG_MANDATORY_TLS); + } else if (g_strcmp0(tls_policy, "disable") == 0) { + xmpp_conn_set_flags(conn.xmpp_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(conn.xmpp_conn, cert_path); + } + prefs_free_string(cert_path); + + int connect_status = xmpp_connect_client( + conn.xmpp_conn, + altdomain, + port, + _connection_certfail_cb, + _connection_handler, + conn.xmpp_ctx); +#else + int connect_status = xmpp_connect_client( + conn.xmpp_conn, + altdomain, + port, + _connection_handler, + conn.xmpp_ctx); +#endif + + if (connect_status == 0) { + conn.conn_status = JABBER_CONNECTING; + } else { + conn.conn_status = JABBER_DISCONNECTED; + } + + return conn.conn_status; +} + +void +connection_disconnect(void) +{ + conn.conn_status = JABBER_DISCONNECTING; + xmpp_disconnect(conn.xmpp_conn); + + while (conn.conn_status == JABBER_DISCONNECTING) { + session_process_events(10); + } + + if (conn.xmpp_conn) { + xmpp_conn_release(conn.xmpp_conn); + conn.xmpp_conn = NULL; + } + + if (conn.xmpp_ctx) { + xmpp_ctx_free(conn.xmpp_ctx); + conn.xmpp_ctx = NULL; + } +} + +void +connection_set_disconnected(void) +{ + FREE_SET_NULL(conn.presence_message); + FREE_SET_NULL(conn.domain); + conn.conn_status = JABBER_DISCONNECTED; +} + +void +connection_clear_data(void) +{ + g_hash_table_destroy(conn.features_by_jid); + conn.features_by_jid = NULL; + + g_hash_table_remove_all(conn.available_resources); +} + +#ifdef HAVE_LIBMESODE +TLSCertificate* +connection_get_tls_peer_cert(void) +{ + xmpp_tlscert_t *xmpptlscert = xmpp_conn_tls_peer_cert(conn.xmpp_conn); + TLSCertificate *cert = _xmppcert_to_profcert(xmpptlscert); + xmpp_conn_free_tlscert(conn.xmpp_ctx, xmpptlscert); + + return cert; +} +#endif + +gboolean +connection_is_secured(void) +{ + if (conn.conn_status == JABBER_CONNECTED) { + return xmpp_conn_is_secured(conn.xmpp_conn) == 0 ? FALSE : TRUE; + } else { + return FALSE; + } +} + +gboolean +connection_send_stanza(const char *const stanza) +{ + if (conn.conn_status != JABBER_CONNECTED) { + return FALSE; + } else { + xmpp_send_raw_string(conn.xmpp_conn, "%s", stanza); + return TRUE; + } +} + +gboolean +connection_supports(const char *const feature) +{ + GList *jids = g_hash_table_get_keys(conn.features_by_jid); + + GList *curr = jids; + while (curr) { + char *jid = curr->data; + GHashTable *features = g_hash_table_lookup(conn.features_by_jid, jid); + if (features && g_hash_table_lookup(features, feature)) { + return TRUE; + } + + curr = g_list_next(curr); + } + + g_list_free(jids); + + return FALSE; +} + +char* +connection_jid_for_feature(const char *const feature) +{ + GList *jids = g_hash_table_get_keys(conn.features_by_jid); + + GList *curr = jids; + while (curr) { + char *jid = curr->data; + GHashTable *features = g_hash_table_lookup(conn.features_by_jid, jid); + if (features && g_hash_table_lookup(features, feature)) { + return jid; + } + + curr = g_list_next(curr); + } + + g_list_free(jids); + + return NULL; +} + +void +connection_set_disco_items(GSList *items) +{ + GSList *curr = items; + while (curr) { + DiscoItem *item = curr->data; + g_hash_table_insert(conn.features_by_jid, strdup(item->jid), + g_hash_table_new_full(g_str_hash, g_str_equal, free, NULL)); + + iq_disco_info_request_onconnect(item->jid); + + curr = g_slist_next(curr); + } +} + +jabber_conn_status_t +connection_get_status(void) +{ + return conn.conn_status; +} + +xmpp_conn_t* +connection_get_conn(void) +{ + return conn.xmpp_conn; +} + +xmpp_ctx_t* +connection_get_ctx(void) +{ + return conn.xmpp_ctx; +} + +const char* +connection_get_fulljid(void) +{ + return xmpp_conn_get_jid(conn.xmpp_conn); +} + +GHashTable* +connection_get_features(const char *const jid) +{ + return g_hash_table_lookup(conn.features_by_jid, jid); +} + +GList* +connection_get_available_resources(void) +{ + return g_hash_table_get_values(conn.available_resources); +} + +void +connection_add_available_resource(Resource *resource) +{ + g_hash_table_replace(conn.available_resources, strdup(resource->name), resource); +} + +void +connection_remove_available_resource(const char *const resource) +{ + g_hash_table_remove(conn.available_resources, resource); +} + +char* +connection_create_uuid(void) +{ + return xmpp_uuid_gen(conn.xmpp_ctx); +} + +void +connection_free_uuid(char *uuid) +{ + if (uuid) { + xmpp_free(conn.xmpp_ctx, uuid); + } +} + +char* +connection_get_domain(void) +{ + return conn.domain; +} + +char* +connection_get_presence_msg(void) +{ + return 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_set_priority(const int priority) +{ + conn.priority = priority; +} + +static void +_connection_handler(xmpp_conn_t *const xmpp_conn, const xmpp_conn_event_t status, const int error, + xmpp_stream_error_t *const stream_error, void *const userdata) +{ + switch (status) { + + // login success + case XMPP_CONN_CONNECT: + log_debug("Connection handler: XMPP_CONN_CONNECT"); + conn.conn_status = JABBER_CONNECTED; + + Jid *my_jid = jid_create(xmpp_conn_get_jid(conn.xmpp_conn)); + conn.domain = strdup(my_jid->domainpart); + jid_destroy(my_jid); + + conn.features_by_jid = g_hash_table_new_full(g_str_hash, g_str_equal, free, (GDestroyNotify)g_hash_table_destroy); + g_hash_table_insert(conn.features_by_jid, strdup(conn.domain), g_hash_table_new_full(g_str_hash, g_str_equal, free, NULL)); + + session_login_success(connection_is_secured()); + + break; + + // disconnected + case XMPP_CONN_DISCONNECT: + log_debug("Connection handler: XMPP_CONN_DISCONNECT"); + + // lost connection for unknown reason + if (conn.conn_status == JABBER_CONNECTED) { + log_debug("Connection handler: Lost connection for unknown reason"); + session_lost_connection(); + + // login attempt failed + } else if (conn.conn_status != JABBER_DISCONNECTING) { + log_debug("Connection handler: Login failed"); + session_login_failed(); + } + + // close stream response from server after disconnect is handled + conn.conn_status = JABBER_DISCONNECTED; + + break; + + // connection failed + case XMPP_CONN_FAIL: + log_debug("Connection handler: XMPP_CONN_FAIL"); + break; + + // unknown state + default: + log_error("Connection handler: Unknown status"); + break; + } +} + +#ifdef HAVE_LIBMESODE +static int +_connection_certfail_cb(xmpp_tlscert_t *xmpptlscert, const char *const errormsg) +{ + TLSCertificate *cert = _xmppcert_to_profcert(xmpptlscert); + + int res = sv_ev_certfail(errormsg, cert); + tlscerts_free(cert); + + return res; +} + +TLSCertificate* +_xmppcert_to_profcert(xmpp_tlscert_t *xmpptlscert) +{ + return tlscerts_new( + xmpp_conn_tlscert_fingerprint(xmpptlscert), + xmpp_conn_tlscert_version(xmpptlscert), + xmpp_conn_tlscert_serialnumber(xmpptlscert), + xmpp_conn_tlscert_subjectname(xmpptlscert), + xmpp_conn_tlscert_issuername(xmpptlscert), + xmpp_conn_tlscert_notbefore(xmpptlscert), + xmpp_conn_tlscert_notafter(xmpptlscert), + xmpp_conn_tlscert_key_algorithm(xmpptlscert), + xmpp_conn_tlscert_signature_algorithm(xmpptlscert)); +} +#endif + +static xmpp_log_t* +_xmpp_get_file_logger(void) +{ + log_level_t prof_level = log_get_filter(); + xmpp_log_level_t xmpp_level = XMPP_LEVEL_ERROR; + + switch (prof_level) { + case PROF_LEVEL_DEBUG: xmpp_level = XMPP_LEVEL_DEBUG; break; + case PROF_LEVEL_INFO: xmpp_level = XMPP_LEVEL_INFO; break; + case PROF_LEVEL_WARN: xmpp_level = XMPP_LEVEL_WARN; break; + default: xmpp_level = XMPP_LEVEL_ERROR; break; + } + + xmpp_log_t *file_log = malloc(sizeof(xmpp_log_t)); + file_log->handler = _xmpp_file_logger; + file_log->userdata = &xmpp_level; + + return file_log; +} + +static void +_xmpp_file_logger(void *const userdata, const xmpp_log_level_t xmpp_level, const char *const area, const char *const msg) +{ + log_level_t prof_level = PROF_LEVEL_ERROR; + + switch (xmpp_level) { + case XMPP_LEVEL_DEBUG: prof_level = PROF_LEVEL_DEBUG; break; + case XMPP_LEVEL_INFO: prof_level = PROF_LEVEL_INFO; break; + case XMPP_LEVEL_WARN: prof_level = PROF_LEVEL_WARN; break; + default: prof_level = PROF_LEVEL_ERROR; break; + } + + log_msg(prof_level, area, msg); + + if ((g_strcmp0(area, "xmpp") == 0) || (g_strcmp0(area, "conn")) == 0) { + sv_ev_xmpp_stanza(msg); + } +} diff --git a/src/xmpp/connection.h b/src/xmpp/connection.h new file mode 100644 index 00000000..2465afd6 --- /dev/null +++ b/src/xmpp/connection.h @@ -0,0 +1,64 @@ +/* + * 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); +void connection_shutdown(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); +void connection_disconnect(void); +void connection_set_disconnected(void); + +void connection_set_presence_msg(const char *const message); +void connection_set_priority(const int priority); +void connection_set_priority(int priority); +void connection_set_disco_items(GSList *items); + +xmpp_conn_t* connection_get_conn(void); +xmpp_ctx_t* connection_get_ctx(void); +char *connection_get_domain(void); +char* connection_jid_for_feature(const char *const feature); +GHashTable* connection_get_features(const char *const jid); + +void connection_clear_data(void); + +void connection_add_available_resource(Resource *resource); +void connection_remove_available_resource(const char *const resource); + +#endif diff --git a/src/xmpp/form.c b/src/xmpp/form.c index 6ec7c1be..b4005f6a 100644 --- a/src/xmpp/form.c +++ b/src/xmpp/form.c @@ -49,7 +49,7 @@ #include "log.h" #include "xmpp/xmpp.h" #include "xmpp/stanza.h" -#include "xmpp/session.h" +#include "xmpp/connection.h" static gboolean _is_valid_form_element(xmpp_stanza_t *stanza) diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c index be45bcbf..c87b45a4 100644 --- a/src/xmpp/iq.c +++ b/src/xmpp/iq.c @@ -64,6 +64,8 @@ #include "xmpp/form.h" #include "roster_list.h" #include "xmpp/xmpp.h" +#include "xmpp/connection.h" +#include "xmpp/session.h" #include "xmpp/iq.h" #include "xmpp/roster.h" #include "plugins/plugins.h" @@ -225,7 +227,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; } @@ -243,7 +245,7 @@ iq_autoping_check(void) if (timeout > 0 && seconds_elapsed >= timeout) { cons_show("Autoping response timed out afer %u seconds.", timeout); log_debug("Autoping check: timed out afer %u seconds, disconnecting", timeout); - connection_autoping_fail(); + session_autoping_fail(); autoping_wait = FALSE; g_timer_destroy(autoping_time); autoping_time = NULL; @@ -253,7 +255,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; } @@ -307,36 +309,21 @@ iq_disable_carbons(void) void iq_http_upload_request(HTTPUpload *upload) { - GSList *disco_items = connection_get_disco_items(); - DiscoInfo *disco_info; - if (disco_items && (g_slist_length(disco_items) > 0)) { - while (disco_items) { - disco_info = disco_items->data; - if (g_hash_table_lookup_extended(disco_info->features, STANZA_NS_HTTP_UPLOAD, NULL, NULL)) { - break; - } - disco_items = g_slist_next(disco_items); - if (!disco_items) { - cons_show_error("XEP-0363 HTTP File Upload is not supported by the server"); - return; - } - } - } else { - cons_show_error("No disco items"); + char *jid = connection_jid_for_feature(STANZA_NS_HTTP_UPLOAD); + if (jid == NULL) { + cons_show_error("XEP-0363 HTTP File Upload is not supported by the server"); return; } xmpp_ctx_t * const ctx = connection_get_ctx(); char *id = create_unique_id("http_upload_request"); - - xmpp_stanza_t *iq = stanza_create_http_upload_request(ctx, id, disco_info->item, upload); - + xmpp_stanza_t *iq = stanza_create_http_upload_request(ctx, id, jid, upload); iq_id_handler_add(id, _http_upload_response_id_handler, upload); - free(id); iq_send_stanza(iq); xmpp_stanza_release(iq); + return; } @@ -959,7 +946,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; } @@ -1916,32 +1903,19 @@ _disco_info_response_id_handler_onconnect(xmpp_stanza_t *const stanza, void *con xmpp_stanza_t *query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY); if (query) { - xmpp_stanza_t *child = xmpp_stanza_get_children(query); - - GSList *disco_items = connection_get_disco_items(); - DiscoInfo *disco_info; - if (disco_items && (g_slist_length(disco_items) > 0)) { - while (disco_items) { - disco_info = disco_items->data; - if (g_strcmp0(disco_info->item, from) == 0) { - break; - } - disco_items = g_slist_next(disco_items); - if (!disco_items) { - log_error("No matching disco item found for %s", from); - return 1; - } - } - } else { + GHashTable *features = connection_get_features(from); + if (features == NULL) { + log_error("No matching disco item found for %s", from); return 1; } + xmpp_stanza_t *child = xmpp_stanza_get_children(query); while (child) { const char *stanza_name = xmpp_stanza_get_name(child); if (g_strcmp0(stanza_name, STANZA_NAME_FEATURE) == 0) { const char *var = xmpp_stanza_get_attribute(child, STANZA_ATTR_VAR); if (var) { - g_hash_table_add(disco_info->features, strdup(var)); + g_hash_table_add(features, strdup(var)); } } child = xmpp_stanza_get_next(child); @@ -2013,32 +1987,42 @@ _disco_items_result_handler(xmpp_stanza_t *const stanza) const char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM); GSList *items = NULL; - if ((g_strcmp0(id, "confreq") == 0) || (g_strcmp0(id, "discoitemsreq") == 0) || (g_strcmp0(id, "discoitemsreq_onconnect") == 0)) { - log_debug("Response to query: %s", id); - xmpp_stanza_t *query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY); - - if (query) { - xmpp_stanza_t *child = xmpp_stanza_get_children(query); - while (child) { - const char *stanza_name = xmpp_stanza_get_name(child); - if (stanza_name && (g_strcmp0(stanza_name, STANZA_NAME_ITEM) == 0)) { - const char *item_jid = xmpp_stanza_get_attribute(child, STANZA_ATTR_JID); - if (item_jid) { - DiscoItem *item = malloc(sizeof(struct disco_item_t)); - item->jid = strdup(item_jid); - const char *item_name = xmpp_stanza_get_attribute(child, STANZA_ATTR_NAME); - if (item_name) { - item->name = strdup(item_name); - } else { - item->name = NULL; - } - items = g_slist_append(items, item); - } - } + if ((g_strcmp0(id, "confreq") != 0) && + (g_strcmp0(id, "discoitemsreq") != 0) && + (g_strcmp0(id, "discoitemsreq_onconnect") != 0)) { + return; + } + + log_debug("Response to query: %s", id); + + xmpp_stanza_t *query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY); + if (query == NULL) { + return; + } + + xmpp_stanza_t *child = xmpp_stanza_get_children(query); + if (child == NULL) { + return; + } - child = xmpp_stanza_get_next(child); + while (child) { + const char *stanza_name = xmpp_stanza_get_name(child); + if (stanza_name && (g_strcmp0(stanza_name, STANZA_NAME_ITEM) == 0)) { + const char *item_jid = xmpp_stanza_get_attribute(child, STANZA_ATTR_JID); + if (item_jid) { + DiscoItem *item = malloc(sizeof(struct disco_item_t)); + item->jid = strdup(item_jid); + const char *item_name = xmpp_stanza_get_attribute(child, STANZA_ATTR_NAME); + if (item_name) { + item->name = strdup(item_name); + } else { + item->name = NULL; + } + items = g_slist_append(items, item); } } + + child = xmpp_stanza_get_next(child); } if (g_strcmp0(id, "confreq") == 0) { @@ -2046,18 +2030,7 @@ _disco_items_result_handler(xmpp_stanza_t *const stanza) } else if (g_strcmp0(id, "discoitemsreq") == 0) { cons_show_disco_items(items, from); } else if (g_strcmp0(id, "discoitemsreq_onconnect") == 0) { - GSList *res_items = items; - if (res_items && (g_slist_length(res_items) > 0)) { - while (res_items) { - DiscoItem *item = res_items->data; - DiscoInfo *info = malloc(sizeof(struct disco_info_t)); - info->item = strdup(item->jid); - info->features = g_hash_table_new_full(g_str_hash, g_str_equal, free, NULL); - connection_set_disco_items(g_slist_append(connection_get_disco_items(), info)); - iq_disco_info_request_onconnect(info->item); - res_items = g_slist_next(res_items); - } - } + connection_set_disco_items(items); } g_slist_free_full(items, (GDestroyNotify)_item_destroy); diff --git a/src/xmpp/iq.h b/src/xmpp/iq.h index 274afdc6..2b7a6c6d 100644 --- a/src/xmpp/iq.h +++ b/src/xmpp/iq.h @@ -35,6 +35,8 @@ #ifndef XMPP_IQ_H #define XMPP_IQ_H +typedef int(*ProfIdCallback)(xmpp_stanza_t *const stanza, void *const userdata); + void iq_handlers_init(void); void iq_send_stanza(xmpp_stanza_t *const stanza); void iq_id_handler_add(const char *const id, ProfIdCallback func, void *userdata); diff --git a/src/xmpp/message.c b/src/xmpp/message.c index 0b016380..4d49ba98 100644 --- a/src/xmpp/message.c +++ b/src/xmpp/message.c @@ -56,6 +56,7 @@ #include "xmpp/roster.h" #include "roster_list.h" #include "xmpp/stanza.h" +#include "xmpp/connection.h" #include "xmpp/xmpp.h" #include "pgp/gpg.h" #include "plugins/plugins.h" @@ -204,7 +205,7 @@ message_send_chat_pgp(const char *const barejid, const char *const msg) xmpp_stanza_t *message = NULL; #ifdef HAVE_LIBGPGME - char *account_name = jabber_get_account_name(); + char *account_name = session_get_account_name(); ProfAccount *account = accounts_get_account(account_name); if (account->pgp_keyid) { Jid *jidp = jid_create(jid); @@ -739,7 +740,7 @@ _handle_carbons(xmpp_stanza_t *const stanza) Jid *jid_from = jid_create(from); Jid *jid_to = jid_create(to); - Jid *my_jid = jid_create(jabber_get_fulljid()); + Jid *my_jid = jid_create(connection_get_fulljid()); // check for and deal with message xmpp_stanza_t *body = xmpp_stanza_get_child_by_name(message, STANZA_NAME_BODY); diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c index 130a3fe9..6ca5127c 100644 --- a/src/xmpp/presence.c +++ b/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; } @@ -250,10 +251,10 @@ presence_send(const resource_presence_t presence_type, const char *const msg, co } xmpp_ctx_t * const ctx = connection_get_ctx(); - const int pri = accounts_get_priority_for_presence_type(jabber_get_account_name(), presence_type); + const int pri = accounts_get_priority_for_presence_type(session_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); @@ -289,7 +290,7 @@ presence_send(const resource_presence_t presence_type, const char *const msg, co if (last == NULL) { last = STANZA_TEXT_ONLINE; } - char *account = jabber_get_account_name(); + char *account = session_get_account_name(); accounts_set_last_presence(account, last); accounts_set_last_status(account, msg); free(id); @@ -330,10 +331,10 @@ presence_join_room(const char *const room, const char *const nick, const char *c log_debug("Sending room join presence to: %s", jid->fulljid); xmpp_ctx_t *ctx = connection_get_ctx(); resource_presence_t presence_type = - accounts_get_last_presence(jabber_get_account_name()); + accounts_get_last_presence(session_get_account_name()); const char *show = stanza_get_presence_string_from_type(presence_type); - char *status = jabber_get_presence_message(); - int pri = accounts_get_priority_for_presence_type(jabber_get_account_name(), + char *status = connection_get_presence_msg(); + int pri = accounts_get_priority_for_presence_type(session_get_account_name(), presence_type); xmpp_stanza_t *presence = stanza_create_room_join_presence(ctx, jid->fulljid, passwd); @@ -357,10 +358,10 @@ presence_change_room_nick(const char *const room, const char *const nick) log_debug("Sending room nickname change to: %s, nick: %s", room, nick); xmpp_ctx_t *ctx = connection_get_ctx(); resource_presence_t presence_type = - accounts_get_last_presence(jabber_get_account_name()); + accounts_get_last_presence(session_get_account_name()); const char *show = stanza_get_presence_string_from_type(presence_type); - char *status = jabber_get_presence_message(); - int pri = accounts_get_priority_for_presence_type(jabber_get_account_name(), + char *status = connection_get_presence_msg(); + int pri = accounts_get_priority_for_presence_type(session_get_account_name(), presence_type); char *full_room_jid = create_fulljid(room, nick); @@ -720,7 +721,7 @@ _muc_user_handler(xmpp_stanza_t *const stanza) } // handle self presence - if (stanza_is_muc_self_presence(stanza, jabber_get_fulljid())) { + if (stanza_is_muc_self_presence(stanza, connection_get_fulljid())) { log_debug("Room self presence received from %s", from_jid->fulljid); // self unavailable diff --git a/src/xmpp/roster.c b/src/xmpp/roster.c index 48f97838..95d4223e 100644 --- a/src/xmpp/roster.c +++ b/src/xmpp/roster.c @@ -57,6 +57,7 @@ #include "config/preferences.h" #include "xmpp/session.h" #include "xmpp/iq.h" +#include "xmpp/connection.h" #include "xmpp/roster.h" #include "roster_list.h" #include "xmpp/stanza.h" @@ -217,7 +218,7 @@ roster_set_handler(xmpp_stanza_t *const stanza) } // if from attribute exists and it is not current users barejid, ignore push - Jid *my_jid = jid_create(jabber_get_fulljid()); + Jid *my_jid = jid_create(connection_get_fulljid()); const char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM); if (from && (strcmp(from, my_jid->barejid) != 0)) { jid_destroy(my_jid); 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; -} diff --git a/src/xmpp/session.h b/src/xmpp/session.h index 556523a1..62337386 100644 --- a/src/xmpp/session.h +++ b/src/xmpp/session.h @@ -46,16 +46,9 @@ #include "resource.h" -typedef int(*ProfIdCallback)(xmpp_stanza_t *const stanza, void *const userdata); - -xmpp_conn_t* connection_get_conn(void); -xmpp_ctx_t* connection_get_ctx(void); -void connection_set_priority(int priority); -void connection_set_presence_message(const char *const message); -void connection_add_available_resource(Resource *resource); -void connection_remove_available_resource(const char *const resource); -void connection_autoping_fail(void); -GSList* connection_get_disco_items(void); -void connection_set_disco_items(GSList *disco_items); +void session_login_success(gboolean secured); +void session_login_failed(void); +void session_lost_connection(void); +void session_autoping_fail(void); #endif diff --git a/src/xmpp/stanza.c b/src/xmpp/stanza.c index 1b64fd94..db6dd76f 100644 --- a/src/xmpp/stanza.c +++ b/src/xmpp/stanza.c @@ -56,6 +56,7 @@ #include "xmpp/session.h" #include "xmpp/stanza.h" #include "xmpp/capabilities.h" +#include "xmpp/connection.h" #include "xmpp/form.h" #include "muc.h" diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h index d8478642..65d2cbad 100644 --- a/src/xmpp/xmpp.h +++ b/src/xmpp/xmpp.h @@ -57,8 +57,6 @@ #define XMPP_FEATURE_BLOCKING "urn:xmpp:blocking" typedef enum { - JABBER_UNDEFINED, - JABBER_STARTED, JABBER_CONNECTING, JABBER_CONNECTED, JABBER_DISCONNECTING, @@ -105,31 +103,27 @@ typedef struct disco_identity_t { char *category; } DiscoIdentity; -typedef struct disco_info_t { - char *item; - GHashTable *features; -} DiscoInfo; - -void jabber_init(void); -jabber_conn_status_t jabber_connect_with_details(const char *const jid, const char *const passwd, +void session_init(void); +jabber_conn_status_t session_connect_with_details(const char *const jid, const char *const passwd, const char *const altdomain, const int port, const char *const tls_policy); -jabber_conn_status_t jabber_connect_with_account(const ProfAccount *const account); -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); -char* jabber_get_account_name(void); -GList* jabber_get_available_resources(void); -char* jabber_create_uuid(void); -void jabber_free_uuid(char *uuid); +jabber_conn_status_t session_connect_with_account(const ProfAccount *const account); +void session_disconnect(void); +void session_shutdown(void); +void session_process_events(int millis); +char* session_get_account_name(void); + +jabber_conn_status_t connection_get_status(void); +char *connection_get_presence_msg(void); +const char* connection_get_fulljid(void); +char* connection_create_uuid(void); +void connection_free_uuid(char *uuid); #ifdef HAVE_LIBMESODE -TLSCertificate* jabber_get_tls_peer_cert(void); +TLSCertificate* connection_get_tls_peer_cert(void); #endif -gboolean jabber_conn_is_secured(void); -gboolean jabber_send_stanza(const char *const stanza); -gboolean jabber_service_supports(const char *const feature); +gboolean connection_is_secured(void); +gboolean connection_send_stanza(const char *const stanza); +GList* connection_get_available_resources(void); +gboolean connection_supports(const char *const feature); char* message_send_chat(const char *const barejid, const char *const msg, const char *const oob_url); char* message_send_chat_otr(const char *const barejid, const char *const msg); diff --git a/tests/unittests/test_cmd_account.c b/tests/unittests/test_cmd_account.c index 701deb8d..74781177 100644 --- a/tests/unittests/test_cmd_account.c +++ b/tests/unittests/test_cmd_account.c @@ -21,7 +21,7 @@ void cmd_account_shows_usage_when_not_connected_and_no_args(void **state) { gchar *args[] = { NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_ACCOUNT); @@ -36,8 +36,8 @@ void cmd_account_shows_account_when_connected_and_no_args(void **state) TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); gchar *args[] = { NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(jabber_get_account_name, "account_name"); + will_return(connection_get_status, JABBER_CONNECTED); + will_return(session_get_account_name, "account_name"); expect_any(accounts_get_account, name); will_return(accounts_get_account, account); @@ -371,7 +371,7 @@ void cmd_account_set_resource_sets_resource(void **state) { gchar *args[] = { "set", "a_account", "resource", "a_resource", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_any(accounts_account_exists, account_name); will_return(accounts_account_exists, TRUE); @@ -390,7 +390,7 @@ void cmd_account_set_resource_sets_resource_with_online_message(void **state) { gchar *args[] = { "set", "a_account", "resource", "a_resource", NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_any(accounts_account_exists, account_name); will_return(accounts_account_exists, TRUE); @@ -644,7 +644,7 @@ void cmd_account_set_online_priority_sets_preference(void **state) expect_string(accounts_set_priority_online, account_name, "a_account"); expect_value(accounts_set_priority_online, value, 10); - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_cons_show("Updated online priority for account a_account: 10"); expect_cons_show(""); @@ -663,7 +663,7 @@ void cmd_account_set_chat_priority_sets_preference(void **state) expect_string(accounts_set_priority_chat, account_name, "a_account"); expect_value(accounts_set_priority_chat, value, 10); - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_cons_show("Updated chat priority for account a_account: 10"); expect_cons_show(""); @@ -682,7 +682,7 @@ void cmd_account_set_away_priority_sets_preference(void **state) expect_string(accounts_set_priority_away, account_name, "a_account"); expect_value(accounts_set_priority_away, value, 10); - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_cons_show("Updated away priority for account a_account: 10"); expect_cons_show(""); @@ -701,7 +701,7 @@ void cmd_account_set_xa_priority_sets_preference(void **state) expect_string(accounts_set_priority_xa, account_name, "a_account"); expect_value(accounts_set_priority_xa, value, 10); - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_cons_show("Updated xa priority for account a_account: 10"); expect_cons_show(""); @@ -720,7 +720,7 @@ void cmd_account_set_dnd_priority_sets_preference(void **state) expect_string(accounts_set_priority_dnd, account_name, "a_account"); expect_value(accounts_set_priority_dnd, value, 10); - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_cons_show("Updated dnd priority for account a_account: 10"); expect_cons_show(""); @@ -791,23 +791,23 @@ void cmd_account_set_priority_updates_presence_when_account_connected_with_prese expect_any(accounts_set_priority_online, account_name); expect_any(accounts_set_priority_online, value); - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_any(accounts_get_last_presence, account_name); will_return(accounts_get_last_presence, RESOURCE_ONLINE); - will_return(jabber_get_account_name, "a_account"); + will_return(session_get_account_name, "a_account"); #ifdef HAVE_LIBGPGME ProfAccount *account = account_new("a_account", "a_jid", NULL, NULL, TRUE, NULL, 5222, "a_resource", NULL, NULL, 10, 10, 10, 10, 10, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - will_return(jabber_get_account_name, "a_account"); + will_return(session_get_account_name, "a_account"); expect_any(accounts_get_account, name); will_return(accounts_get_account, account); #endif - will_return(jabber_get_presence_message, "Free to chat"); + will_return(connection_get_presence_msg, "Free to chat"); expect_value(presence_send, status, RESOURCE_ONLINE); expect_string(presence_send, msg, "Free to chat"); diff --git a/tests/unittests/test_cmd_bookmark.c b/tests/unittests/test_cmd_bookmark.c index eafae9b6..8b8b4871 100644 --- a/tests/unittests/test_cmd_bookmark.c +++ b/tests/unittests/test_cmd_bookmark.c @@ -24,7 +24,7 @@ static void test_with_connection_status(jabber_conn_status_t status) { - will_return(jabber_get_connection_status, status); + will_return(connection_get_status, status); expect_cons_show("You are not currently connected."); gboolean result = cmd_bookmark(NULL, CMD_BOOKMARK, NULL); @@ -46,23 +46,13 @@ void cmd_bookmark_shows_message_when_connecting(void **state) test_with_connection_status(JABBER_CONNECTING); } -void cmd_bookmark_shows_message_when_started(void **state) -{ - test_with_connection_status(JABBER_STARTED); -} - -void cmd_bookmark_shows_message_when_undefined(void **state) -{ - test_with_connection_status(JABBER_UNDEFINED); -} - void cmd_bookmark_shows_usage_when_no_args(void **state) { gchar *args[] = { NULL }; ProfWin window; window.type = WIN_CONSOLE; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_BOOKMARK); @@ -127,7 +117,7 @@ void cmd_bookmark_list_shows_bookmarks(void **state) bookmarks = g_list_append(bookmarks, bm4); bookmarks = g_list_append(bookmarks, bm5); - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); will_return(bookmark_get_list, bookmarks); // TODO - Custom list compare @@ -147,7 +137,7 @@ void cmd_bookmark_add_shows_message_when_invalid_jid(void **state) ProfWin window; window.type = WIN_CONSOLE; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_cons_show("Can't add bookmark with JID 'room'; should be 'room@domain.tld'"); @@ -162,7 +152,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid(void **state) ProfWin window; window.type = WIN_CONSOLE; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(bookmark_add, jid, jid); expect_any(bookmark_add, nick); @@ -184,7 +174,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid_nick(void **state) ProfWin window; window.type = WIN_CONSOLE; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(bookmark_add, jid, jid); expect_string(bookmark_add, nick, nick); @@ -205,7 +195,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid_autojoin(void **state) ProfWin window; window.type = WIN_CONSOLE; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(bookmark_add, jid, jid); expect_any(bookmark_add, nick); @@ -227,7 +217,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid_nick_autojoin(void **state) ProfWin window; window.type = WIN_CONSOLE; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(bookmark_add, jid, jid); expect_string(bookmark_add, nick, nick); @@ -248,7 +238,7 @@ void cmd_bookmark_remove_removes_bookmark(void **state) ProfWin window; window.type = WIN_CONSOLE; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(bookmark_remove, jid, jid); will_return(bookmark_remove, TRUE); @@ -266,7 +256,7 @@ void cmd_bookmark_remove_shows_message_when_no_bookmark(void **state) ProfWin window; window.type = WIN_CONSOLE; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_any(bookmark_remove, jid); will_return(bookmark_remove, FALSE); diff --git a/tests/unittests/test_cmd_bookmark.h b/tests/unittests/test_cmd_bookmark.h index 9505e105..abbdbe98 100644 --- a/tests/unittests/test_cmd_bookmark.h +++ b/tests/unittests/test_cmd_bookmark.h @@ -1,7 +1,6 @@ void cmd_bookmark_shows_message_when_disconnected(void **state); void cmd_bookmark_shows_message_when_disconnecting(void **state); void cmd_bookmark_shows_message_when_connecting(void **state); -void cmd_bookmark_shows_message_when_started(void **state); void cmd_bookmark_shows_message_when_undefined(void **state); void cmd_bookmark_shows_usage_when_no_args(void **state); void cmd_bookmark_list_shows_bookmarks(void **state); diff --git a/tests/unittests/test_cmd_connect.c b/tests/unittests/test_cmd_connect.c index 53c4c940..e4f01271 100644 --- a/tests/unittests/test_cmd_connect.c +++ b/tests/unittests/test_cmd_connect.c @@ -18,7 +18,7 @@ static void test_with_connection_status(jabber_conn_status_t status) { - will_return(jabber_get_connection_status, status); + will_return(connection_get_status, status); expect_cons_show("You are either connected already, or a login is in process."); @@ -41,16 +41,11 @@ void cmd_connect_shows_message_when_connected(void **state) test_with_connection_status(JABBER_CONNECTED); } -void cmd_connect_shows_message_when_undefined(void **state) -{ - test_with_connection_status(JABBER_UNDEFINED); -} - void cmd_connect_when_no_account(void **state) { gchar *args[] = { "user@server.org", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(accounts_get_account, name, "user@server.org"); will_return(accounts_get_account, NULL); @@ -59,11 +54,11 @@ void cmd_connect_when_no_account(void **state) expect_cons_show("Connecting as user@server.org"); - expect_string(jabber_connect_with_details, jid, "user@server.org"); - expect_string(jabber_connect_with_details, passwd, "password"); - expect_value(jabber_connect_with_details, altdomain, NULL); - expect_value(jabber_connect_with_details, port, 0); - will_return(jabber_connect_with_details, JABBER_CONNECTING); + expect_string(session_connect_with_details, jid, "user@server.org"); + expect_string(session_connect_with_details, passwd, "password"); + expect_value(session_connect_with_details, altdomain, NULL); + expect_value(session_connect_with_details, port, 0); + will_return(session_connect_with_details, JABBER_CONNECTING); gboolean result = cmd_connect(NULL, CMD_CONNECT, args); assert_true(result); @@ -73,7 +68,7 @@ void cmd_connect_fail_message(void **state) { gchar *args[] = { "user@server.org", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_any(accounts_get_account, name); will_return(accounts_get_account, NULL); @@ -82,11 +77,11 @@ void cmd_connect_fail_message(void **state) expect_cons_show("Connecting as user@server.org"); - expect_any(jabber_connect_with_details, jid); - expect_any(jabber_connect_with_details, passwd); - expect_any(jabber_connect_with_details, altdomain); - expect_any(jabber_connect_with_details, port); - will_return(jabber_connect_with_details, JABBER_DISCONNECTED); + expect_any(session_connect_with_details, jid); + expect_any(session_connect_with_details, passwd); + expect_any(session_connect_with_details, altdomain); + expect_any(session_connect_with_details, port); + will_return(session_connect_with_details, JABBER_DISCONNECTED); expect_cons_show_error("Connection attempt for user@server.org failed."); @@ -98,7 +93,7 @@ void cmd_connect_lowercases_argument(void **state) { gchar *args[] = { "USER@server.ORG", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(accounts_get_account, name, "user@server.org"); will_return(accounts_get_account, NULL); @@ -107,11 +102,11 @@ void cmd_connect_lowercases_argument(void **state) expect_cons_show("Connecting as user@server.org"); - expect_any(jabber_connect_with_details, jid); - expect_any(jabber_connect_with_details, passwd); - expect_any(jabber_connect_with_details, altdomain); - expect_any(jabber_connect_with_details, port); - will_return(jabber_connect_with_details, JABBER_CONNECTING); + expect_any(session_connect_with_details, jid); + expect_any(session_connect_with_details, passwd); + expect_any(session_connect_with_details, altdomain); + expect_any(session_connect_with_details, port); + will_return(session_connect_with_details, JABBER_CONNECTING); gboolean result = cmd_connect(NULL, CMD_CONNECT, args); assert_true(result); @@ -123,7 +118,7 @@ void cmd_connect_asks_password_when_not_in_account(void **state) ProfAccount *account = account_new("jabber_org", "me@jabber.org", NULL, NULL, TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_any(accounts_get_account, name); will_return(accounts_get_account, account); @@ -132,8 +127,8 @@ void cmd_connect_asks_password_when_not_in_account(void **state) expect_cons_show("Connecting with account jabber_org as me@jabber.org"); - expect_any(jabber_connect_with_account, account); - will_return(jabber_connect_with_account, JABBER_CONNECTING); + expect_any(session_connect_with_account, account); + will_return(session_connect_with_account, JABBER_CONNECTING); gboolean result = cmd_connect(NULL, CMD_CONNECT, args); assert_true(result); @@ -143,7 +138,7 @@ void cmd_connect_shows_usage_when_no_server_value(void **state) { gchar *args[] = { "user@server.org", "server", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_CONNECT); expect_cons_show(""); @@ -156,7 +151,7 @@ void cmd_connect_shows_usage_when_server_no_port_value(void **state) { gchar *args[] = { "user@server.org", "server", "aserver", "port", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_CONNECT); expect_cons_show(""); @@ -169,7 +164,7 @@ void cmd_connect_shows_usage_when_no_port_value(void **state) { gchar *args[] = { "user@server.org", "port", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_CONNECT); expect_cons_show(""); @@ -182,7 +177,7 @@ void cmd_connect_shows_usage_when_port_no_server_value(void **state) { gchar *args[] = { "user@server.org", "port", "5678", "server", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_CONNECT); expect_cons_show(""); @@ -195,7 +190,7 @@ void cmd_connect_shows_message_when_port_0(void **state) { gchar *args[] = { "user@server.org", "port", "0", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_cons_show("Value 0 out of range. Must be in 1..65535."); expect_cons_show(""); @@ -208,7 +203,7 @@ void cmd_connect_shows_message_when_port_minus1(void **state) { gchar *args[] = { "user@server.org", "port", "-1", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_cons_show("Value -1 out of range. Must be in 1..65535."); expect_cons_show(""); @@ -221,7 +216,7 @@ void cmd_connect_shows_message_when_port_65536(void **state) { gchar *args[] = { "user@server.org", "port", "65536", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_cons_show("Value 65536 out of range. Must be in 1..65535."); expect_cons_show(""); @@ -234,7 +229,7 @@ void cmd_connect_shows_message_when_port_contains_chars(void **state) { gchar *args[] = { "user@server.org", "port", "52f66", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_cons_show("Could not convert \"52f66\" to a number."); expect_cons_show(""); @@ -247,7 +242,7 @@ void cmd_connect_shows_usage_when_server_provided_twice(void **state) { gchar *args[] = { "user@server.org", "server", "server1", "server", "server2", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_CONNECT); expect_cons_show(""); @@ -260,7 +255,7 @@ void cmd_connect_shows_usage_when_port_provided_twice(void **state) { gchar *args[] = { "user@server.org", "port", "1111", "port", "1111", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_CONNECT); expect_cons_show(""); @@ -273,7 +268,7 @@ void cmd_connect_shows_usage_when_invalid_first_property(void **state) { gchar *args[] = { "user@server.org", "wrong", "server", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_CONNECT); expect_cons_show(""); @@ -286,7 +281,7 @@ void cmd_connect_shows_usage_when_invalid_second_property(void **state) { gchar *args[] = { "user@server.org", "server", "aserver", "wrong", "1234", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_CONNECT); expect_cons_show(""); @@ -299,7 +294,7 @@ void cmd_connect_with_server_when_provided(void **state) { gchar *args[] = { "user@server.org", "server", "aserver", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(accounts_get_account, name, "user@server.org"); will_return(accounts_get_account, NULL); @@ -308,11 +303,11 @@ void cmd_connect_with_server_when_provided(void **state) expect_cons_show("Connecting as user@server.org"); - expect_string(jabber_connect_with_details, jid, "user@server.org"); - expect_string(jabber_connect_with_details, passwd, "password"); - expect_string(jabber_connect_with_details, altdomain, "aserver"); - expect_value(jabber_connect_with_details, port, 0); - will_return(jabber_connect_with_details, JABBER_CONNECTING); + expect_string(session_connect_with_details, jid, "user@server.org"); + expect_string(session_connect_with_details, passwd, "password"); + expect_string(session_connect_with_details, altdomain, "aserver"); + expect_value(session_connect_with_details, port, 0); + will_return(session_connect_with_details, JABBER_CONNECTING); gboolean result = cmd_connect(NULL, CMD_CONNECT, args); assert_true(result); @@ -322,7 +317,7 @@ void cmd_connect_with_port_when_provided(void **state) { gchar *args[] = { "user@server.org", "port", "5432", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(accounts_get_account, name, "user@server.org"); will_return(accounts_get_account, NULL); @@ -331,11 +326,11 @@ void cmd_connect_with_port_when_provided(void **state) expect_cons_show("Connecting as user@server.org"); - expect_string(jabber_connect_with_details, jid, "user@server.org"); - expect_string(jabber_connect_with_details, passwd, "password"); - expect_value(jabber_connect_with_details, altdomain, NULL); - expect_value(jabber_connect_with_details, port, 5432); - will_return(jabber_connect_with_details, JABBER_CONNECTING); + expect_string(session_connect_with_details, jid, "user@server.org"); + expect_string(session_connect_with_details, passwd, "password"); + expect_value(session_connect_with_details, altdomain, NULL); + expect_value(session_connect_with_details, port, 5432); + will_return(session_connect_with_details, JABBER_CONNECTING); gboolean result = cmd_connect(NULL, CMD_CONNECT, args); assert_true(result); @@ -345,7 +340,7 @@ void cmd_connect_with_server_and_port_when_provided(void **state) { gchar *args[] = { "user@server.org", "port", "5432", "server", "aserver", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(accounts_get_account, name, "user@server.org"); will_return(accounts_get_account, NULL); @@ -354,11 +349,11 @@ void cmd_connect_with_server_and_port_when_provided(void **state) expect_cons_show("Connecting as user@server.org"); - expect_string(jabber_connect_with_details, jid, "user@server.org"); - expect_string(jabber_connect_with_details, passwd, "password"); - expect_string(jabber_connect_with_details, altdomain, "aserver"); - expect_value(jabber_connect_with_details, port, 5432); - will_return(jabber_connect_with_details, JABBER_CONNECTING); + expect_string(session_connect_with_details, jid, "user@server.org"); + expect_string(session_connect_with_details, passwd, "password"); + expect_string(session_connect_with_details, altdomain, "aserver"); + expect_value(session_connect_with_details, port, 5432); + will_return(session_connect_with_details, JABBER_CONNECTING); gboolean result = cmd_connect(NULL, CMD_CONNECT, args); assert_true(result); @@ -370,15 +365,15 @@ void cmd_connect_shows_message_when_connecting_with_account(void **state) ProfAccount *account = account_new("jabber_org", "user@jabber.org", "password", NULL, TRUE, NULL, 0, "laptop", NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_any(accounts_get_account, name); will_return(accounts_get_account, account); expect_cons_show("Connecting with account jabber_org as user@jabber.org/laptop"); - expect_any(jabber_connect_with_account, account); - will_return(jabber_connect_with_account, JABBER_CONNECTING); + expect_any(session_connect_with_account, account); + will_return(session_connect_with_account, JABBER_CONNECTING); gboolean result = cmd_connect(NULL, CMD_CONNECT, args); assert_true(result); @@ -390,15 +385,15 @@ void cmd_connect_connects_with_account(void **state) ProfAccount *account = account_new("jabber_org", "me@jabber.org", "password", NULL, TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_any(accounts_get_account, name); will_return(accounts_get_account, account); expect_cons_show("Connecting with account jabber_org as me@jabber.org"); - expect_memory(jabber_connect_with_account, account, account, sizeof(account)); - will_return(jabber_connect_with_account, JABBER_CONNECTING); + expect_memory(session_connect_with_account, account, account, sizeof(account)); + will_return(session_connect_with_account, JABBER_CONNECTING); gboolean result = cmd_connect(NULL, CMD_CONNECT, args); assert_true(result); diff --git a/tests/unittests/test_cmd_disconnect.c b/tests/unittests/test_cmd_disconnect.c index 90c99b3c..ba73adf5 100644 --- a/tests/unittests/test_cmd_disconnect.c +++ b/tests/unittests/test_cmd_disconnect.c @@ -21,8 +21,8 @@ void clears_chat_sessions(void **state) chat_session_recipient_active("bob@server.org", "laptop", FALSE); chat_session_recipient_active("mike@server.org", "work", FALSE); - will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(jabber_get_fulljid, "myjid@myserver.com"); + will_return(connection_get_status, JABBER_CONNECTED); + will_return(connection_get_fulljid, "myjid@myserver.com"); expect_any_cons_show(); gboolean result = cmd_disconnect(NULL, CMD_DISCONNECT, NULL); diff --git a/tests/unittests/test_cmd_join.c b/tests/unittests/test_cmd_join.c index 668aec5c..8b71c5e5 100644 --- a/tests/unittests/test_cmd_join.c +++ b/tests/unittests/test_cmd_join.c @@ -20,7 +20,7 @@ static void test_with_connection_status(jabber_conn_status_t status) { - will_return(jabber_get_connection_status, status); + will_return(connection_get_status, status); expect_cons_show("You are not currently connected."); @@ -43,16 +43,11 @@ void cmd_join_shows_message_when_disconnected(void **state) test_with_connection_status(JABBER_DISCONNECTED); } -void cmd_join_shows_message_when_undefined(void **state) -{ - test_with_connection_status(JABBER_UNDEFINED); -} - void cmd_join_shows_error_message_when_invalid_room_jid(void **state) { gchar *args[] = { "//@@/", NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_cons_show_error("Specified room has incorrect format."); expect_cons_show(""); @@ -74,8 +69,8 @@ void cmd_join_uses_account_mucservice_when_no_service_specified(void **state) muc_init(); - will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(jabber_get_account_name, account_name); + will_return(connection_get_status, JABBER_CONNECTED); + will_return(session_get_account_name, account_name); expect_string(accounts_get_account, name, account_name); will_return(accounts_get_account, account); @@ -99,8 +94,8 @@ void cmd_join_uses_supplied_nick(void **state) muc_init(); - will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(jabber_get_account_name, account_name); + will_return(connection_get_status, JABBER_CONNECTED); + will_return(session_get_account_name, account_name); expect_string(accounts_get_account, name, account_name); will_return(accounts_get_account, account); @@ -124,8 +119,8 @@ void cmd_join_uses_account_nick_when_not_supplied(void **state) muc_init(); - will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(jabber_get_account_name, account_name); + will_return(connection_get_status, JABBER_CONNECTED); + will_return(session_get_account_name, account_name); expect_string(accounts_get_account, name, account_name); will_return(accounts_get_account, account); @@ -152,8 +147,8 @@ void cmd_join_uses_password_when_supplied(void **state) muc_init(); - will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(jabber_get_account_name, account_name); + will_return(connection_get_status, JABBER_CONNECTED); + will_return(session_get_account_name, account_name); expect_string(accounts_get_account, name, account_name); will_return(accounts_get_account, account); diff --git a/tests/unittests/test_cmd_otr.c b/tests/unittests/test_cmd_otr.c index 9790c3da..44703943 100644 --- a/tests/unittests/test_cmd_otr.c +++ b/tests/unittests/test_cmd_otr.c @@ -138,7 +138,7 @@ void cmd_otr_gen_shows_message_when_not_connected(void **state) { gchar *args[] = { "gen", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_cons_show("You must be connected with an account to load OTR information."); @@ -150,7 +150,7 @@ static void test_with_command_and_connection_status(char *command, void *cmd_fun { gchar *args[] = { command, NULL }; - will_return(jabber_get_connection_status, status); + will_return(connection_get_status, status); expect_cons_show("You must be connected with an account to load OTR information."); @@ -164,16 +164,6 @@ void cmd_otr_gen_shows_message_when_disconnected(void **state) test_with_command_and_connection_status("gen", cmd_otr_gen, JABBER_DISCONNECTED); } -void cmd_otr_gen_shows_message_when_undefined(void **state) -{ - test_with_command_and_connection_status("gen", cmd_otr_gen, JABBER_UNDEFINED); -} - -void cmd_otr_gen_shows_message_when_started(void **state) -{ - test_with_command_and_connection_status("gen", cmd_otr_gen, JABBER_STARTED); -} - void cmd_otr_gen_shows_message_when_connecting(void **state) { test_with_command_and_connection_status("gen", cmd_otr_gen, JABBER_CONNECTING); @@ -191,8 +181,8 @@ void cmd_otr_gen_generates_key_for_connected_account(void **state) ProfAccount *account = account_new(account_name, "me@jabber.org", NULL, NULL, TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(jabber_get_account_name, account_name); + will_return(connection_get_status, JABBER_CONNECTED); + will_return(session_get_account_name, account_name); expect_string(accounts_get_account, name, account_name); @@ -209,16 +199,6 @@ void cmd_otr_myfp_shows_message_when_disconnected(void **state) test_with_command_and_connection_status("myfp", cmd_otr_myfp, JABBER_DISCONNECTED); } -void cmd_otr_myfp_shows_message_when_undefined(void **state) -{ - test_with_command_and_connection_status("myfp", cmd_otr_myfp, JABBER_UNDEFINED); -} - -void cmd_otr_myfp_shows_message_when_started(void **state) -{ - test_with_command_and_connection_status("myfp", cmd_otr_myfp, JABBER_STARTED); -} - void cmd_otr_myfp_shows_message_when_connecting(void **state) { test_with_command_and_connection_status("myfp", cmd_otr_myfp, JABBER_CONNECTING); @@ -233,7 +213,7 @@ void cmd_otr_myfp_shows_message_when_no_key(void **state) { gchar *args[] = { "myfp", NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); will_return(otr_key_loaded, FALSE); expect_ui_current_print_formatted_line('!', 0, "You have not generated or loaded a private key, use '/otr gen'"); @@ -249,7 +229,7 @@ void cmd_otr_myfp_shows_my_fingerprint(void **state) GString *message = g_string_new("Your OTR fingerprint: "); g_string_append(message, fingerprint); - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); will_return(otr_key_loaded, TRUE); will_return(otr_get_my_fingerprint, strdup(fingerprint)); @@ -268,7 +248,7 @@ test_cmd_otr_theirfp_from_wintype(win_type_t wintype) ProfWin window; window.type = wintype; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_ui_current_print_line("You must be in a regular chat window to view a recipient's fingerprint."); @@ -304,7 +284,7 @@ void cmd_otr_theirfp_shows_message_when_non_otr_chat_window(void **state) chatwin.pgp_send = FALSE; chatwin.is_otr = FALSE; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_ui_current_print_formatted_line('!', 0, "You are not currently in an OTR session."); @@ -331,7 +311,7 @@ void cmd_otr_theirfp_shows_fingerprint(void **state) chatwin.pgp_send = FALSE; chatwin.is_otr = TRUE; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(otr_get_their_fingerprint, recipient, recipient); will_return(otr_get_their_fingerprint, strdup(fingerprint)); @@ -351,7 +331,7 @@ test_cmd_otr_start_from_wintype(win_type_t wintype) ProfWin window; window.type = wintype; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_ui_current_print_line("You must be in a regular chat window to start an OTR session."); @@ -379,7 +359,7 @@ void cmd_otr_start_shows_message_when_already_started(void **state) char *recipient = "someone@server.org"; gchar *args[] = { "start", NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); ProfWin window; window.type = WIN_CHAT; @@ -401,7 +381,7 @@ void cmd_otr_start_shows_message_when_no_key(void **state) char *recipient = "someone@server.org"; gchar *args[] = { "start", NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); will_return(otr_key_loaded, FALSE); ProfWin window; @@ -435,7 +415,7 @@ cmd_otr_start_sends_otr_query_message_to_current_recipeint(void **state) chatwin.pgp_send = FALSE; chatwin.is_otr = FALSE; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); will_return(otr_key_loaded, TRUE); will_return(otr_start_query, query_message); diff --git a/tests/unittests/test_cmd_otr.h b/tests/unittests/test_cmd_otr.h index 4f00b6b1..5343cc57 100644 --- a/tests/unittests/test_cmd_otr.h +++ b/tests/unittests/test_cmd_otr.h @@ -13,12 +13,10 @@ void cmd_otr_gen_shows_message_when_not_connected(void **state); void cmd_otr_gen_generates_key_for_connected_account(void **state); void cmd_otr_gen_shows_message_when_disconnected(void **state); void cmd_otr_gen_shows_message_when_undefined(void **state); -void cmd_otr_gen_shows_message_when_started(void **state); void cmd_otr_gen_shows_message_when_connecting(void **state); void cmd_otr_gen_shows_message_when_disconnecting(void **state); void cmd_otr_myfp_shows_message_when_disconnected(void **state); void cmd_otr_myfp_shows_message_when_undefined(void **state); -void cmd_otr_myfp_shows_message_when_started(void **state); void cmd_otr_myfp_shows_message_when_connecting(void **state); void cmd_otr_myfp_shows_message_when_disconnecting(void **state); void cmd_otr_myfp_shows_message_when_no_key(void **state); diff --git a/tests/unittests/test_cmd_pgp.c b/tests/unittests/test_cmd_pgp.c index 68d48b0c..ec010cce 100644 --- a/tests/unittests/test_cmd_pgp.c +++ b/tests/unittests/test_cmd_pgp.c @@ -32,7 +32,7 @@ void cmd_pgp_start_shows_message_when_connection(jabber_conn_status_t conn_statu ProfWin window; window.type = WIN_CHAT; - will_return(jabber_get_connection_status, conn_status); + will_return(connection_get_status, conn_status); expect_cons_show("You must be connected to start PGP encrpytion."); @@ -55,23 +55,13 @@ void cmd_pgp_start_shows_message_when_connecting(void **state) cmd_pgp_start_shows_message_when_connection(JABBER_CONNECTING); } -void cmd_pgp_start_shows_message_when_undefined(void **state) -{ - cmd_pgp_start_shows_message_when_connection(JABBER_UNDEFINED); -} - -void cmd_pgp_start_shows_message_when_started(void **state) -{ - cmd_pgp_start_shows_message_when_connection(JABBER_STARTED); -} - void cmd_pgp_start_shows_message_when_no_arg_in_wintype(win_type_t wintype) { gchar *args[] = { "start", NULL }; ProfWin window; window.type = wintype; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_cons_show("You must be in a regular chat window to start PGP encrpytion."); diff --git a/tests/unittests/test_cmd_pgp.h b/tests/unittests/test_cmd_pgp.h index fcb24500..0d681a4a 100644 --- a/tests/unittests/test_cmd_pgp.h +++ b/tests/unittests/test_cmd_pgp.h @@ -6,7 +6,6 @@ void cmd_pgp_start_shows_message_when_disconnected(void **state); void cmd_pgp_start_shows_message_when_disconnecting(void **state); void cmd_pgp_start_shows_message_when_connecting(void **state); void cmd_pgp_start_shows_message_when_undefined(void **state); -void cmd_pgp_start_shows_message_when_started(void **state); void cmd_pgp_start_shows_message_when_no_arg_in_console(void **state); void cmd_pgp_start_shows_message_when_no_arg_in_muc(void **state); void cmd_pgp_start_shows_message_when_no_arg_in_mucconf(void **state); diff --git a/tests/unittests/test_cmd_rooms.c b/tests/unittests/test_cmd_rooms.c index 663073f3..85a528b5 100644 --- a/tests/unittests/test_cmd_rooms.c +++ b/tests/unittests/test_cmd_rooms.c @@ -18,7 +18,7 @@ static void test_with_connection_status(jabber_conn_status_t status) { - will_return(jabber_get_connection_status, status); + will_return(connection_get_status, status); expect_cons_show("You are not currently connected."); @@ -41,16 +41,6 @@ void cmd_rooms_shows_message_when_connecting(void **state) test_with_connection_status(JABBER_CONNECTING); } -void cmd_rooms_shows_message_when_started(void **state) -{ - test_with_connection_status(JABBER_STARTED); -} - -void cmd_rooms_shows_message_when_undefined(void **state) -{ - test_with_connection_status(JABBER_UNDEFINED); -} - void cmd_rooms_uses_account_default_when_no_arg(void **state) { gchar *args[] = { NULL }; @@ -58,8 +48,8 @@ void cmd_rooms_uses_account_default_when_no_arg(void **state) ProfAccount *account = account_new("testaccount", NULL, NULL, NULL, TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, strdup("default_conf_server"), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(jabber_get_account_name, "account_name"); + will_return(connection_get_status, JABBER_CONNECTED); + will_return(session_get_account_name, "account_name"); expect_any(accounts_get_account, name); will_return(accounts_get_account, account); @@ -73,7 +63,7 @@ void cmd_rooms_arg_used_when_passed(void **state) { gchar *args[] = { "conf_server_arg" }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(iq_room_list_request, conferencejid, "conf_server_arg"); diff --git a/tests/unittests/test_cmd_rooms.h b/tests/unittests/test_cmd_rooms.h index a9a7af83..1b13cf07 100644 --- a/tests/unittests/test_cmd_rooms.h +++ b/tests/unittests/test_cmd_rooms.h @@ -1,7 +1,6 @@ void cmd_rooms_shows_message_when_disconnected(void **state); void cmd_rooms_shows_message_when_disconnecting(void **state); void cmd_rooms_shows_message_when_connecting(void **state); -void cmd_rooms_shows_message_when_started(void **state); void cmd_rooms_shows_message_when_undefined(void **state); void cmd_rooms_uses_account_default_when_no_arg(void **state); void cmd_rooms_arg_used_when_passed(void **state); diff --git a/tests/unittests/test_cmd_roster.c b/tests/unittests/test_cmd_roster.c index 054328be..8b194de4 100644 --- a/tests/unittests/test_cmd_roster.c +++ b/tests/unittests/test_cmd_roster.c @@ -19,7 +19,7 @@ static void test_with_connection_status(jabber_conn_status_t status) { gchar *args[] = { NULL }; - will_return(jabber_get_connection_status, status); + will_return(connection_get_status, status); expect_cons_show("You are not currently connected."); @@ -42,16 +42,11 @@ void cmd_roster_shows_message_when_disconnected(void **state) test_with_connection_status(JABBER_DISCONNECTED); } -void cmd_roster_shows_message_when_undefined(void **state) -{ - test_with_connection_status(JABBER_UNDEFINED); -} - void cmd_roster_shows_roster_when_no_args(void **state) { gchar *args[] = { NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); roster_create(); roster_add("bob@server.org", "bob", NULL, "both", FALSE); @@ -69,7 +64,7 @@ void cmd_roster_add_shows_message_when_no_jid(void **state) { gchar *args[] = { "add", NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_ROSTER); @@ -83,7 +78,7 @@ void cmd_roster_add_sends_roster_add_request(void **state) char *nick = "bob"; gchar *args[] = { "add", jid, nick, NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(roster_send_add_new, barejid, jid); expect_string(roster_send_add_new, name, nick); @@ -96,7 +91,7 @@ void cmd_roster_remove_shows_message_when_no_jid(void **state) { gchar *args[] = { "remove", NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_ROSTER); @@ -109,7 +104,7 @@ void cmd_roster_remove_sends_roster_remove_request(void **state) char *jid = "bob@server.org"; gchar *args[] = { "remove", jid, NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(roster_send_remove, barejid, jid); @@ -121,7 +116,7 @@ void cmd_roster_nick_shows_message_when_no_jid(void **state) { gchar *args[] = { "nick", NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_ROSTER); @@ -133,7 +128,7 @@ void cmd_roster_nick_shows_message_when_no_nick(void **state) { gchar *args[] = { "nick", "bob@server.org", NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_ROSTER); @@ -147,7 +142,7 @@ void cmd_roster_nick_shows_message_when_no_contact_exists(void **state) roster_create(); - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_cons_show("Contact not found in roster: bob@server.org"); @@ -168,7 +163,7 @@ void cmd_roster_nick_sends_name_change_request(void **state) groups = g_slist_append(groups, strdup("group1")); roster_add(jid, "bob", groups, "both", FALSE); - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(roster_send_name_change, barejid, jid); expect_string(roster_send_name_change, new_name, nick); @@ -188,7 +183,7 @@ void cmd_roster_clearnick_shows_message_when_no_jid(void **state) { gchar *args[] = { "clearnick", NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_ROSTER); @@ -202,7 +197,7 @@ void cmd_roster_clearnick_shows_message_when_no_contact_exists(void **state) roster_create(); - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_cons_show("Contact not found in roster: bob@server.org"); @@ -222,7 +217,7 @@ void cmd_roster_clearnick_sends_name_change_request_with_empty_nick(void **state groups = g_slist_append(groups, strdup("group1")); roster_add(jid, "bob", groups, "both", FALSE); - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(roster_send_name_change, barejid, jid); expect_value(roster_send_name_change, new_name, NULL); diff --git a/tests/unittests/test_cmd_sub.c b/tests/unittests/test_cmd_sub.c index 62871520..a89e82bf 100644 --- a/tests/unittests/test_cmd_sub.c +++ b/tests/unittests/test_cmd_sub.c @@ -19,7 +19,7 @@ void cmd_sub_shows_message_when_not_connected(void **state) { gchar *args[] = { NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_cons_show("You are currently not connected."); @@ -31,7 +31,7 @@ void cmd_sub_shows_usage_when_no_arg(void **state) { gchar *args[] = { NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_SUB); diff --git a/tests/unittests/unittests.c b/tests/unittests/unittests.c index 7baa9615..2c3d6ce5 100644 --- a/tests/unittests/unittests.c +++ b/tests/unittests/unittests.c @@ -238,9 +238,6 @@ int main(int argc, char* argv[]) { unit_test_setup_teardown(cmd_connect_shows_message_when_connected, load_preferences, close_preferences), - unit_test_setup_teardown(cmd_connect_shows_message_when_undefined, - load_preferences, - close_preferences), unit_test_setup_teardown(cmd_connect_when_no_account, load_preferences, close_preferences), @@ -308,8 +305,6 @@ int main(int argc, char* argv[]) { unit_test(cmd_rooms_shows_message_when_disconnected), unit_test(cmd_rooms_shows_message_when_disconnecting), unit_test(cmd_rooms_shows_message_when_connecting), - unit_test(cmd_rooms_shows_message_when_started), - unit_test(cmd_rooms_shows_message_when_undefined), unit_test(cmd_rooms_uses_account_default_when_no_arg), unit_test(cmd_rooms_arg_used_when_passed), @@ -484,8 +479,6 @@ int main(int argc, char* argv[]) { unit_test(cmd_bookmark_shows_message_when_disconnected), unit_test(cmd_bookmark_shows_message_when_disconnecting), unit_test(cmd_bookmark_shows_message_when_connecting), - unit_test(cmd_bookmark_shows_message_when_started), - unit_test(cmd_bookmark_shows_message_when_undefined), unit_test(cmd_bookmark_shows_usage_when_no_args), unit_test(cmd_bookmark_list_shows_bookmarks), unit_test(cmd_bookmark_add_shows_message_when_invalid_jid), @@ -518,13 +511,9 @@ int main(int argc, char* argv[]) { unit_test(cmd_otr_gen_shows_message_when_not_connected), unit_test(cmd_otr_gen_generates_key_for_connected_account), unit_test(cmd_otr_gen_shows_message_when_disconnected), - unit_test(cmd_otr_gen_shows_message_when_undefined), - unit_test(cmd_otr_gen_shows_message_when_started), unit_test(cmd_otr_gen_shows_message_when_connecting), unit_test(cmd_otr_gen_shows_message_when_disconnecting), unit_test(cmd_otr_myfp_shows_message_when_disconnected), - unit_test(cmd_otr_myfp_shows_message_when_undefined), - unit_test(cmd_otr_myfp_shows_message_when_started), unit_test(cmd_otr_myfp_shows_message_when_connecting), unit_test(cmd_otr_myfp_shows_message_when_disconnecting), unit_test(cmd_otr_myfp_shows_message_when_no_key), @@ -551,8 +540,6 @@ int main(int argc, char* argv[]) { unit_test(cmd_pgp_start_shows_message_when_disconnected), unit_test(cmd_pgp_start_shows_message_when_disconnecting), unit_test(cmd_pgp_start_shows_message_when_connecting), - unit_test(cmd_pgp_start_shows_message_when_undefined), - unit_test(cmd_pgp_start_shows_message_when_started), unit_test(cmd_pgp_start_shows_message_when_no_arg_in_console), unit_test(cmd_pgp_start_shows_message_when_no_arg_in_muc), unit_test(cmd_pgp_start_shows_message_when_no_arg_in_mucconf), @@ -565,7 +552,6 @@ int main(int argc, char* argv[]) { unit_test(cmd_join_shows_message_when_disconnecting), unit_test(cmd_join_shows_message_when_connecting), unit_test(cmd_join_shows_message_when_disconnected), - unit_test(cmd_join_shows_message_when_undefined), unit_test(cmd_join_shows_error_message_when_invalid_room_jid), unit_test(cmd_join_uses_account_mucservice_when_no_service_specified), unit_test(cmd_join_uses_supplied_nick), @@ -575,7 +561,6 @@ int main(int argc, char* argv[]) { unit_test(cmd_roster_shows_message_when_disconnecting), unit_test(cmd_roster_shows_message_when_connecting), unit_test(cmd_roster_shows_message_when_disconnected), - unit_test(cmd_roster_shows_message_when_undefined), unit_test(cmd_roster_shows_roster_when_no_args), unit_test(cmd_roster_add_shows_message_when_no_jid), unit_test(cmd_roster_add_sends_roster_add_request), diff --git a/tests/unittests/xmpp/stub_xmpp.c b/tests/unittests/xmpp/stub_xmpp.c index fef17bf6..0fb9d828 100644 --- a/tests/unittests/xmpp/stub_xmpp.c +++ b/tests/unittests/xmpp/stub_xmpp.c @@ -6,9 +6,9 @@ #include "xmpp/xmpp.h" // connection functions -void jabber_init(void) {} +void session_init(void) {} -jabber_conn_status_t jabber_connect_with_details(const char * const jid, +jabber_conn_status_t session_connect_with_details(const char * const jid, const char * const passwd, const char * const altdomain, const int port, const char *const tls_policy) { check_expected(jid); @@ -18,60 +18,72 @@ jabber_conn_status_t jabber_connect_with_details(const char * const jid, return (jabber_conn_status_t)mock(); } -jabber_conn_status_t jabber_connect_with_account(const ProfAccount * const account) +jabber_conn_status_t session_connect_with_account(const ProfAccount * const account) { check_expected(account); return (jabber_conn_status_t)mock(); } -void jabber_disconnect(void) {} -void jabber_shutdown(void) {} -void jabber_process_events(int millis) {} -const char * jabber_get_fulljid(void) +void session_disconnect(void) {} +void session_shutdown(void) {} +void session_process_events(int millis) {} +const char * connection_get_fulljid(void) { return (char *)mock(); } -const char * jabber_get_domain(void) +const char * session_get_domain(void) { return NULL; } -char* jabber_create_uuid(void) +gboolean connection_is_secured(void) +{ + return 1; +} + +TLSCertificate* +connection_get_tls_peer_cert(void) +{ + return NULL; +} + + +char* connection_create_uuid(void) { return NULL; } -void jabber_free_uuid(char * uuid) {} +void connection_free_uuid(char * uuid) {} -jabber_conn_status_t jabber_get_connection_status(void) +jabber_conn_status_t connection_get_status(void) { return (jabber_conn_status_t)mock(); } -char* jabber_get_presence_message(void) +char* connection_get_presence_msg(void) { return (char*)mock(); } -char* jabber_get_account_name(void) +char* session_get_account_name(void) { return (char*)mock(); } -GList * jabber_get_available_resources(void) +GList * session_get_available_resources(void) { return NULL; } gboolean -jabber_send_stanza(const char *const stanza) +connection_send_stanza(const char *const stanza) { return TRUE; } gboolean -jabber_service_supports(const char *const feature) +connection_supports(const char *const feature) { return FALSE; } |