aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into osx-functional

Browse Source
This commit is contained in:
James Booth 2016-05-11 22:24:22 +01:00
commit 4efd5d021a
49 changed files with 1205 additions and 1126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -6,10 +6,11 @@ core_sources = \
src/chat_state.h src/chat_state.c \ src/chat_state.h src/chat_state.c \
src/resource.c src/resource.h \ src/resource.c src/resource.h \
src/roster_list.c src/roster_list.h \ src/roster_list.c src/roster_list.h \
src/xmpp/xmpp.h src/xmpp/capabilities.c src/xmpp/connection.c \ 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/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/stanza.h src/xmpp/message.h src/xmpp/iq.h src/xmpp/presence.h \
src/xmpp/capabilities.h src/xmpp/connection.h \ src/xmpp/capabilities.h src/xmpp/session.h \
src/xmpp/roster.c src/xmpp/roster.h \ src/xmpp/roster.c src/xmpp/roster.h \
src/xmpp/bookmark.c src/xmpp/bookmark.h \ src/xmpp/bookmark.c src/xmpp/bookmark.h \
src/xmpp/blocking.c src/xmpp/blocking.h \ src/xmpp/blocking.c src/xmpp/blocking.h \

16
src/command/command.c
View File

@ -3066,7 +3066,7 @@ cmd_autocomplete(ProfWin *window, const char *const input)
void void
cmd_reset_autocomplete(ProfWin *window) 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) { if (conn_status == JABBER_CONNECTED) {
roster_reset_search_attempts(); roster_reset_search_attempts();
@ -3353,7 +3353,7 @@ _cmd_complete_parameters(ProfWin *window, const char *const input)
int i; int i;
char *result = NULL; 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 // autocomplete boolean settings
gchar *boolean_choices[] = { "/beep", "/intype", "/states", "/outtype", "/flash", "/splash", "/chlog", "/grlog", 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; return result;
} }
} else { } 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) { if (conn_status == JABBER_CONNECTED) {
int i = 0; int i = 0;
gchar *group_commands[] = { "/who any", "/who online", "/who offline", gchar *group_commands[] = { "/who any", "/who online", "/who offline",
@ -3626,7 +3626,7 @@ _roster_autocomplete(ProfWin *window, const char *const input)
return result; 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) { if (conn_status == JABBER_CONNECTED) {
result = autocomplete_param_with_func(input, "/roster nick", roster_barejid_autocomplete); result = autocomplete_param_with_func(input, "/roster nick", roster_barejid_autocomplete);
if (result) { if (result) {
@ -3711,7 +3711,7 @@ _group_autocomplete(ProfWin *window, const char *const input)
{ {
char *result = NULL; 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) { if (conn_status == JABBER_CONNECTED) {
result = autocomplete_param_with_func(input, "/group show", roster_group_autocomplete); 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; 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) { if (conn_status == JABBER_CONNECTED) {
found = autocomplete_param_with_func(input, "/otr start", roster_contact_autocomplete); 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; 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) { if (conn_status == JABBER_CONNECTED) {
found = autocomplete_param_with_func(input, "/pgp start", roster_contact_autocomplete); 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; 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) { if (conn_status == JABBER_CONNECTED && window->type == WIN_CHAT) {
ProfChatWin *chatwin = (ProfChatWin*)window; ProfChatWin *chatwin = (ProfChatWin*)window;
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);

176
src/command/commands.c
View File

@ -120,7 +120,7 @@ cmd_execute_default(ProfWin *window, const char *inp)
return TRUE; return TRUE;
} }
jabber_conn_status_t status = jabber_get_connection_status(); jabber_conn_status_t status = connection_get_status();
if (status != JABBER_CONNECTED) { if (status != JABBER_CONNECTED) {
ui_current_print_line("You are not currently connected."); ui_current_print_line("You are not currently connected.");
return TRUE; return TRUE;
@ -150,7 +150,7 @@ cmd_execute_default(ProfWin *window, const char *inp)
} }
case WIN_XML: case WIN_XML:
{ {
jabber_send_stanza(inp); connection_send_stanza(inp);
break; break;
} }
default: default:
@ -227,16 +227,16 @@ gboolean
cmd_tls_trust(ProfWin *window, const char *const command, gchar **args) cmd_tls_trust(ProfWin *window, const char *const command, gchar **args)
{ {
#ifdef HAVE_LIBMESODE #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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
return TRUE; return TRUE;
} }
if (!jabber_conn_is_secured()) { if (!connection_is_secured()) {
cons_show("No TLS connection established"); cons_show("No TLS connection established");
return TRUE; return TRUE;
} }
TLSCertificate *cert = jabber_get_tls_peer_cert(); TLSCertificate *cert = connection_get_tls_peer_cert();
if (!cert) { if (!cert) {
cons_show("Error getting TLS certificate."); cons_show("Error getting TLS certificate.");
return TRUE; return TRUE;
@ -325,16 +325,16 @@ cmd_tls_cert(ProfWin *window, const char *const command, gchar **args)
} }
return TRUE; return TRUE;
} else { } 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
return TRUE; return TRUE;
} }
if (!jabber_conn_is_secured()) { if (!connection_is_secured()) {
cons_show("No TLS connection established"); cons_show("No TLS connection established");
return TRUE; return TRUE;
} }
TLSCertificate *cert = jabber_get_tls_peer_cert(); TLSCertificate *cert = connection_get_tls_peer_cert();
if (!cert) { if (!cert) {
cons_show("Error getting TLS certificate."); cons_show("Error getting TLS certificate.");
return TRUE; return TRUE;
@ -353,8 +353,8 @@ cmd_tls_cert(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_connect(ProfWin *window, const char *const command, gchar **args) cmd_connect(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_DISCONNECTED) && (conn_status != JABBER_STARTED)) { if (conn_status != JABBER_DISCONNECTED) {
cons_show("You are either connected already, or a login is in process."); cons_show("You are either connected already, or a login is in process.");
return TRUE; return TRUE;
} }
@ -685,7 +685,7 @@ gboolean
_account_set_resource(char *account_name, char *resource) _account_set_resource(char *account_name, char *resource)
{ {
accounts_set_resource(account_name, 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); cons_show("Updated resource for account %s: %s, reconnect to pick up the change.", account_name, resource);
} else { } else {
cons_show("Updated resource for account %s: %s", account_name, resource); 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); accounts_set_theme(account_name, theme);
if (jabber_get_connection_status() == JABBER_CONNECTED) { if (connection_get_status() == JABBER_CONNECTED) {
ProfAccount *account = accounts_get_account(jabber_get_account_name()); ProfAccount *account = accounts_get_account(session_get_account_name());
if (account) { if (account) {
if (g_strcmp0(account->name, account_name) == 0) { if (g_strcmp0(account->name, account_name) == 0) {
theme_load(theme); theme_load(theme);
@ -878,12 +878,12 @@ _account_set_presence_priority(char *account_name, char *presence, char *priorit
break; 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) { 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); resource_presence_t last_presence = accounts_get_last_presence(connected_account);
if (presence_type == last_presence) { 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); cl_ev_presence_send(last_presence, message, 0);
} }
} }
@ -999,12 +999,12 @@ cmd_account(ProfWin *window, const char *const command, gchar **args)
return TRUE; return TRUE;
} }
if (jabber_get_connection_status() != JABBER_CONNECTED) { if (connection_get_status() != JABBER_CONNECTED) {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
return TRUE; return TRUE;
} }
ProfAccount *account = accounts_get_account(jabber_get_account_name()); ProfAccount *account = accounts_get_account(session_get_account_name());
cons_show_account(account); cons_show_account(account);
account_free(account); account_free(account);
@ -1058,7 +1058,7 @@ _writecsv(int fd, const char *const str)
gboolean gboolean
cmd_export(ProfWin *window, const char *const command, gchar **args) 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
@ -1128,7 +1128,7 @@ write_error:
gboolean gboolean
cmd_sub(ProfWin *window, const char *const command, gchar **args) 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are currently not connected."); cons_show("You are currently not connected.");
@ -1218,7 +1218,7 @@ cmd_sub(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_disconnect(ProfWin *window, const char *const command, gchar **args) 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."); cons_show("You are not currently connected.");
return TRUE; return TRUE;
} }
@ -1344,7 +1344,7 @@ cmd_wins(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_close(ProfWin *window, const char *const command, gchar **args) 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) { if (g_strcmp0(args[0], "all") == 0) {
int count = ui_close_all_wins(); int count = ui_close_all_wins();
@ -2067,7 +2067,7 @@ _who_roster(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_who(ProfWin *window, const char *const command, gchar **args) 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently 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 *usr = args[0];
char *msg = args[1]; 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
@ -2154,7 +2154,7 @@ cmd_msg(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_group(ProfWin *window, const char *const command, gchar **args) 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
@ -2261,7 +2261,7 @@ cmd_group(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_roster(ProfWin *window, const char *const command, gchar **args) 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 // show roster
if (args[0] == NULL) { if (args[0] == NULL) {
@ -2986,12 +2986,12 @@ cmd_roster(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_blocked(ProfWin *window, const char *const command, gchar **args) 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."); cons_show("You are not currently connected.");
return TRUE; return TRUE;
} }
if (!jabber_service_supports(XMPP_FEATURE_BLOCKING)) { if (!connection_supports(XMPP_FEATURE_BLOCKING)) {
cons_show("Blocking not supported by server."); cons_show("Blocking not supported by server.");
return TRUE; return TRUE;
} }
@ -3076,7 +3076,7 @@ cmd_resource(ProfWin *window, const char *const command, gchar **args)
return TRUE; 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
return TRUE; return TRUE;
@ -3132,7 +3132,7 @@ cmd_status(ProfWin *window, const char *const command, gchar **args)
{ {
char *usr = args[0]; 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently 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]; 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
@ -3291,7 +3291,7 @@ cmd_info(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_caps(ProfWin *window, const char *const command, gchar **args) 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; Occupant *occupant = NULL;
if (conn_status != JABBER_CONNECTED) { if (conn_status != JABBER_CONNECTED) {
@ -3367,7 +3367,7 @@ cmd_caps(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_software(ProfWin *window, const char *const command, gchar **args) 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
@ -3419,7 +3419,7 @@ cmd_software(ProfWin *window, const char *const command, gchar **args)
break; break;
case WIN_CONSOLE: case WIN_CONSOLE:
if (args[0]) { if (args[0]) {
Jid *myJid = jid_create(jabber_get_fulljid()); Jid *myJid = jid_create(connection_get_fulljid());
Jid *jid = jid_create(args[0]); Jid *jid = jid_create(args[0]);
if (jid == NULL || jid->fulljid == NULL) { if (jid == NULL || jid->fulljid == NULL) {
@ -3454,20 +3454,20 @@ cmd_software(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_join(ProfWin *window, const char *const command, gchar **args) 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
return TRUE; return TRUE;
} }
if (args[0] == NULL) { 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); ProfAccount *account = accounts_get_account(account_name);
GString *room_str = g_string_new(""); 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); 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); presence_join_room(room_str->str, account->muc_nick, NULL);
muc_join(room_str->str, account->muc_nick, NULL, FALSE); 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 *nick = NULL;
char *passwd = NULL; char *passwd = NULL;
GString *room_str = g_string_new(""); 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); ProfAccount *account = accounts_get_account(account_name);
// full room jid supplied (room@server) // 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 *contact = args[0];
char *reason = args[1]; 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
@ -3824,7 +3824,7 @@ cmd_form_field(ProfWin *window, char *tag, gchar **args)
gboolean gboolean
cmd_form(ProfWin *window, const char *const command, gchar **args) 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
@ -3901,7 +3901,7 @@ cmd_form(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_kick(ProfWin *window, const char *const command, gchar **args) 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
@ -3934,7 +3934,7 @@ cmd_kick(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_ban(ProfWin *window, const char *const command, gchar **args) 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
@ -3962,7 +3962,7 @@ cmd_ban(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_subject(ProfWin *window, const char *const command, gchar **args) 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
@ -4052,7 +4052,7 @@ cmd_subject(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_affiliation(ProfWin *window, const char *const command, gchar **args) 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
@ -4122,7 +4122,7 @@ cmd_affiliation(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_role(ProfWin *window, const char *const command, gchar **args) 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
@ -4190,7 +4190,7 @@ cmd_role(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_room(ProfWin *window, const char *const command, gchar **args) 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
@ -4253,7 +4253,7 @@ cmd_room(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_occupants(ProfWin *window, const char *const command, gchar **args) 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
@ -4338,7 +4338,7 @@ cmd_occupants(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_rooms(ProfWin *window, const char *const command, gchar **args) 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently 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) { 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); iq_room_list_request(account->muc_service);
account_free(account); account_free(account);
} else { } else {
@ -4359,7 +4359,7 @@ cmd_rooms(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_bookmark(ProfWin *window, const char *const command, gchar **args) 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
@ -4470,7 +4470,7 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_disco(ProfWin *window, const char *const command, gchar **args) 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently 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]) { if (args[1]) {
jid = g_string_append(jid, args[1]); jid = g_string_append(jid, args[1]);
} else { } else {
Jid *jidp = jid_create(jabber_get_fulljid()); Jid *jidp = jid_create(connection_get_fulljid());
jid = g_string_append(jid, jidp->domainpart); jid = g_string_append(jid, jidp->domainpart);
jid_destroy(jidp); jid_destroy(jidp);
} }
@ -4500,7 +4500,7 @@ cmd_disco(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_sendfile(ProfWin *window, const char *const command, gchar **args) 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]; char *filename = args[0];
// expand ~ to $HOME // expand ~ to $HOME
@ -4556,7 +4556,7 @@ cmd_lastactivity(ProfWin *window, const char *const command, gchar **args)
return TRUE; 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently 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) { 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); GString *jid = g_string_new(jidp->domainpart);
iq_last_activity_request(jid->str); iq_last_activity_request(jid->str);
@ -4582,7 +4582,7 @@ cmd_lastactivity(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_nick(ProfWin *window, const char *const command, gchar **args) 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
@ -4735,7 +4735,7 @@ cmd_clear(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_leave(ProfWin *window, const char *const command, gchar **args) 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(); int index = wins_get_current_num();
if (window->type != WIN_MUC) { if (window->type != WIN_MUC) {
@ -5334,7 +5334,7 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args)
// current chat room settings // current chat room settings
} else if (g_strcmp0(args[0], "on") == 0) { } 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently 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) { } 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently 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) { } 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently 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) { } 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently 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) { } 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
@ -5624,7 +5624,7 @@ cmd_autoping(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_ping(ProfWin *window, const char *const command, gchar **args) 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
@ -5748,7 +5748,7 @@ cmd_autoaway(ProfWin *window, const char *const command, gchar **args)
gboolean gboolean
cmd_priority(ProfWin *window, const char *const command, gchar **args) 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently 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; char *err_msg = NULL;
gboolean res = strtoi_range(value, &intval, -128, 127, &err_msg); gboolean res = strtoi_range(value, &intval, -128, 127, &err_msg);
if (res) { if (res) {
accounts_set_priority_all(jabber_get_account_name(), intval); accounts_set_priority_all(session_get_account_name(), intval);
resource_presence_t last_presence = accounts_get_last_presence(jabber_get_account_name()); resource_presence_t last_presence = accounts_get_last_presence(session_get_account_name());
cl_ev_presence_send(last_presence, jabber_get_presence_message(), 0); cl_ev_presence_send(last_presence, connection_get_presence_msg(), 0);
cons_show("Priority set to %d.", intval); cons_show("Priority set to %d.", intval);
} else { } else {
cons_show(err_msg); 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); _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) { if (conn_status == JABBER_CONNECTED) {
// enable carbons // enable carbons
@ -6122,7 +6122,7 @@ cmd_pgp(ProfWin *window, const char *const command, gchar **args)
} }
if (g_strcmp0(args[0], "setkey") == 0) { 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
return TRUE; return TRUE;
@ -6151,7 +6151,7 @@ cmd_pgp(ProfWin *window, const char *const command, gchar **args)
} }
if (g_strcmp0(args[0], "contacts") == 0) { 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
return TRUE; return TRUE;
@ -6195,7 +6195,7 @@ cmd_pgp(ProfWin *window, const char *const command, gchar **args)
} }
if (g_strcmp0(args[0], "start") == 0) { 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You must be connected to start PGP encrpytion."); cons_show("You must be connected to start PGP encrpytion.");
return TRUE; return TRUE;
@ -6235,7 +6235,7 @@ cmd_pgp(ProfWin *window, const char *const command, gchar **args)
return TRUE; return TRUE;
} }
ProfAccount *account = accounts_get_account(jabber_get_account_name()); ProfAccount *account = accounts_get_account(session_get_account_name());
char *err_str = NULL; char *err_str = NULL;
if (!p_gpg_valid_key(account->pgp_keyid, &err_str)) { 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); 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) { 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
return TRUE; return TRUE;
@ -6375,7 +6375,7 @@ cmd_otr_policy(ProfWin *window, const char *const command, gchar **args)
return TRUE; 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."); cons_show("You must be connected to set the OTR policy for a contact.");
return TRUE; return TRUE;
} }
@ -6384,7 +6384,7 @@ cmd_otr_policy(ProfWin *window, const char *const command, gchar **args)
if (contact_jid == NULL) { if (contact_jid == NULL) {
contact_jid = contact; 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); cons_show("OTR policy for %s set to: %s", contact_jid, choice);
return TRUE; return TRUE;
#else #else
@ -6397,12 +6397,12 @@ gboolean
cmd_otr_gen(ProfWin *window, const char *const command, gchar **args) cmd_otr_gen(ProfWin *window, const char *const command, gchar **args)
{ {
#ifdef HAVE_LIBOTR #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."); cons_show("You must be connected with an account to load OTR information.");
return TRUE; return TRUE;
} }
ProfAccount *account = accounts_get_account(jabber_get_account_name()); ProfAccount *account = accounts_get_account(session_get_account_name());
otr_keygen(account); otr_keygen(account);
account_free(account); account_free(account);
return TRUE; return TRUE;
@ -6416,7 +6416,7 @@ gboolean
cmd_otr_myfp(ProfWin *window, const char *const command, gchar **args) cmd_otr_myfp(ProfWin *window, const char *const command, gchar **args)
{ {
#ifdef HAVE_LIBOTR #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."); cons_show("You must be connected with an account to load OTR information.");
return TRUE; return TRUE;
} }
@ -6440,7 +6440,7 @@ gboolean
cmd_otr_theirfp(ProfWin *window, const char *const command, gchar **args) cmd_otr_theirfp(ProfWin *window, const char *const command, gchar **args)
{ {
#ifdef HAVE_LIBOTR #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."); cons_show("You must be connected with an account to load OTR information.");
return TRUE; return TRUE;
} }
@ -6471,7 +6471,7 @@ gboolean
cmd_otr_start(ProfWin *window, const char *const command, gchar **args) cmd_otr_start(ProfWin *window, const char *const command, gchar **args)
{ {
#ifdef HAVE_LIBOTR #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."); cons_show("You must be connected with an account to load OTR information.");
return TRUE; return TRUE;
} }
@ -6554,7 +6554,7 @@ gboolean
cmd_otr_end(ProfWin *window, const char *const command, gchar **args) cmd_otr_end(ProfWin *window, const char *const command, gchar **args)
{ {
#ifdef HAVE_LIBOTR #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."); cons_show("You must be connected with an account to load OTR information.");
return TRUE; return TRUE;
} }
@ -6584,7 +6584,7 @@ gboolean
cmd_otr_trust(ProfWin *window, const char *const command, gchar **args) cmd_otr_trust(ProfWin *window, const char *const command, gchar **args)
{ {
#ifdef HAVE_LIBOTR #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."); cons_show("You must be connected with an account to load OTR information.");
return TRUE; return TRUE;
} }
@ -6614,7 +6614,7 @@ gboolean
cmd_otr_untrust(ProfWin *window, const char *const command, gchar **args) cmd_otr_untrust(ProfWin *window, const char *const command, gchar **args)
{ {
#ifdef HAVE_LIBOTR #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."); cons_show("You must be connected with an account to load OTR information.");
return TRUE; return TRUE;
} }
@ -6644,7 +6644,7 @@ gboolean
cmd_otr_secret(ProfWin *window, const char *const command, gchar **args) cmd_otr_secret(ProfWin *window, const char *const command, gchar **args)
{ {
#ifdef HAVE_LIBOTR #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."); cons_show("You must be connected with an account to load OTR information.");
return TRUE; return TRUE;
} }
@ -6679,7 +6679,7 @@ gboolean
cmd_otr_question(ProfWin *window, const char *const command, gchar **args) cmd_otr_question(ProfWin *window, const char *const command, gchar **args)
{ {
#ifdef HAVE_LIBOTR #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."); cons_show("You must be connected with an account to load OTR information.");
return TRUE; return TRUE;
} }
@ -6715,7 +6715,7 @@ gboolean
cmd_otr_answer(ProfWin *window, const char *const command, gchar **args) cmd_otr_answer(ProfWin *window, const char *const command, gchar **args)
{ {
#ifdef HAVE_LIBOTR #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."); cons_show("You must be connected with an account to load OTR information.");
return TRUE; return TRUE;
} }
@ -6764,7 +6764,7 @@ _update_presence(const resource_presence_t resource_presence,
msg = args[0]; 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) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");

2
src/config/scripts.c
View File

@ -159,7 +159,7 @@ scripts_exec(const char *const script)
while ((read = getline(&line, &len, scriptfile)) != -1) { while ((read = getline(&line, &len, scriptfile)) != -1) {
ProfWin *win = wins_get_current(); ProfWin *win = wins_get_current();
cmd_process_input(win, line); cmd_process_input(win, line);
jabber_process_events(10); session_process_events(10);
ui_update(); ui_update();
} }

10
src/event/client_events.c
View File

@ -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) 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); 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 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); cons_show("Connecting with account %s as %s", account->name, jid);
free(jid); free(jid);
return jabber_connect_with_account(account); return session_connect_with_account(account);
} }
void void
cl_ev_disconnect(void) cl_ev_disconnect(void)
{ {
const char *jid = jabber_get_fulljid(); const char *jid = connection_get_fulljid();
cons_show("%s logged out successfully.", jid); cons_show("%s logged out successfully.", jid);
ui_disconnected(); ui_disconnected();
ui_close_all_wins(); ui_close_all_wins();
jabber_disconnect(); session_disconnect();
roster_destroy(); roster_destroy();
muc_invites_clear(); muc_invites_clear();
chat_sessions_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; char *signed_status = NULL;
#ifdef HAVE_LIBGPGME #ifdef HAVE_LIBGPGME
char *account_name = jabber_get_account_name(); char *account_name = session_get_account_name();
ProfAccount *account = accounts_get_account(account_name); ProfAccount *account = accounts_get_account(account_name);
if (account->pgp_keyid) { if (account->pgp_keyid) {
signed_status = p_gpg_sign(msg, account->pgp_keyid); signed_status = p_gpg_sign(msg, account->pgp_keyid);

8
src/event/server_events.c
View File

@ -61,7 +61,7 @@
#include "ui/ui.h" #include "ui/ui.h"
void 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); ProfAccount *account = accounts_get_account(account_name);
@ -105,7 +105,7 @@ sv_ev_roster_received(void)
ui_show_roster(); ui_show_roster();
} }
char *account_name = jabber_get_account_name(); char *account_name = session_get_account_name();
#ifdef HAVE_LIBGPGME #ifdef HAVE_LIBGPGME
// check pgp key valid if specified // check pgp key valid if specified
@ -148,7 +148,7 @@ sv_ev_roster_received(void)
cl_ev_presence_send(conn_presence, NULL, 0); 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); 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) sv_ev_room_message(const char *const room_jid, const char *const nick, const char *const message)
{ {
if (prefs_get_boolean(PREF_GRLOG)) { 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); groupchat_log_chat(jid->barejid, room_jid, nick, message);
jid_destroy(jid); jid_destroy(jid);
} }

2
src/event/server_events.h
View File

@ -37,7 +37,7 @@
#include "xmpp/xmpp.h" #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_lost_connection(void);
void sv_ev_failed_login(void); void sv_ev_failed_login(void);
void sv_ev_room_invite(jabber_invite_t invite_type, void sv_ev_room_invite(jabber_invite_t invite_type,

12
src/log.c
View File

@ -265,7 +265,7 @@ void
chat_log_msg_out(const char *const barejid, const char *const msg) chat_log_msg_out(const char *const barejid, const char *const msg)
{ {
if (prefs_get_boolean(PREF_CHLOG)) { if (prefs_get_boolean(PREF_CHLOG)) {
const char *jid = jabber_get_fulljid(); const char *jid = connection_get_fulljid();
Jid *jidp = jid_create(jid); Jid *jidp = jid_create(jid);
_chat_log_chat(jidp->barejid, barejid, msg, PROF_OUT_LOG, NULL); _chat_log_chat(jidp->barejid, barejid, msg, PROF_OUT_LOG, NULL);
jid_destroy(jidp); jid_destroy(jidp);
@ -276,7 +276,7 @@ void
chat_log_otr_msg_out(const char *const barejid, const char *const msg) chat_log_otr_msg_out(const char *const barejid, const char *const msg)
{ {
if (prefs_get_boolean(PREF_CHLOG)) { if (prefs_get_boolean(PREF_CHLOG)) {
const char *jid = jabber_get_fulljid(); const char *jid = connection_get_fulljid();
Jid *jidp = jid_create(jid); Jid *jidp = jid_create(jid);
char *pref_otr_log = prefs_get_string(PREF_OTR_LOG); char *pref_otr_log = prefs_get_string(PREF_OTR_LOG);
if (strcmp(pref_otr_log, "on") == 0) { 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) chat_log_pgp_msg_out(const char *const barejid, const char *const msg)
{ {
if (prefs_get_boolean(PREF_CHLOG)) { if (prefs_get_boolean(PREF_CHLOG)) {
const char *jid = jabber_get_fulljid(); const char *jid = connection_get_fulljid();
Jid *jidp = jid_create(jid); Jid *jidp = jid_create(jid);
char *pref_pgp_log = prefs_get_string(PREF_PGP_LOG); char *pref_pgp_log = prefs_get_string(PREF_PGP_LOG);
if (strcmp(pref_pgp_log, "on") == 0) { 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) chat_log_otr_msg_in(const char *const barejid, const char *const msg, gboolean was_decrypted, GDateTime *timestamp)
{ {
if (prefs_get_boolean(PREF_CHLOG)) { if (prefs_get_boolean(PREF_CHLOG)) {
const char *jid = jabber_get_fulljid(); const char *jid = connection_get_fulljid();
Jid *jidp = jid_create(jid); Jid *jidp = jid_create(jid);
char *pref_otr_log = prefs_get_string(PREF_OTR_LOG); char *pref_otr_log = prefs_get_string(PREF_OTR_LOG);
if (!was_decrypted || (strcmp(pref_otr_log, "on") == 0)) { 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) chat_log_pgp_msg_in(const char *const barejid, const char *const msg, GDateTime *timestamp)
{ {
if (prefs_get_boolean(PREF_CHLOG)) { if (prefs_get_boolean(PREF_CHLOG)) {
const char *jid = jabber_get_fulljid(); const char *jid = connection_get_fulljid();
Jid *jidp = jid_create(jid); Jid *jidp = jid_create(jid);
char *pref_pgp_log = prefs_get_string(PREF_PGP_LOG); char *pref_pgp_log = prefs_get_string(PREF_PGP_LOG);
if (strcmp(pref_pgp_log, "on") == 0) { 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) chat_log_msg_in(const char *const barejid, const char *const msg, GDateTime *timestamp)
{ {
if (prefs_get_boolean(PREF_CHLOG)) { if (prefs_get_boolean(PREF_CHLOG)) {
const char *jid = jabber_get_fulljid(); const char *jid = connection_get_fulljid();
Jid *jidp = jid_create(jid); Jid *jidp = jid_create(jid);
_chat_log_chat(jidp->barejid, barejid, msg, PROF_IN_LOG, timestamp); _chat_log_chat(jidp->barejid, barejid, msg, PROF_IN_LOG, timestamp);
jid_destroy(jidp); jid_destroy(jidp);

4
src/otr/otr.c
View File

@ -87,7 +87,7 @@ cb_policy(void *opdata, ConnContext *context)
static int static int
cb_is_logged_in(void *opdata, const char *accountname, const char *protocol, const char *recipient) 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) { if (conn_status != JABBER_CONNECTED) {
return PRESENCE_OFFLINE; return PRESENCE_OFFLINE;
} }
@ -673,7 +673,7 @@ otr_get_their_fingerprint(const char *const recipient)
prof_otrpolicy_t prof_otrpolicy_t
otr_get_policy(const char *const recipient) 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); ProfAccount *account = accounts_get_account(account_name);
// check contact specific setting // check contact specific setting
if (g_list_find_custom(account->otr_manual, recipient, (GCompareFunc)g_strcmp0)) { if (g_list_find_custom(account->otr_manual, recipient, (GCompareFunc)g_strcmp0)) {

8
src/plugins/api.c
View File

@ -381,7 +381,7 @@ api_win_show_themed(const char *tag, const char *const group, const char *const
int int
api_send_stanza(const char *const stanza) api_send_stanza(const char *const stanza)
{ {
return jabber_send_stanza(stanza); return connection_send_stanza(stanza);
} }
gboolean gboolean
@ -440,9 +440,9 @@ api_disco_add_feature(char *feature)
caps_reset_ver(); caps_reset_ver();
// resend presence to update server's disco info data for this client // resend presence to update server's disco info data for this client
if (jabber_get_connection_status() == JABBER_CONNECTED) { if (connection_get_status() == JABBER_CONNECTED) {
resource_presence_t last_presence = accounts_get_last_presence(jabber_get_account_name()); resource_presence_t last_presence = accounts_get_last_presence(session_get_account_name());
cl_ev_presence_send(last_presence, jabber_get_presence_message(), 0); cl_ev_presence_send(last_presence, connection_get_presence_msg(), 0);
} }
} }

6
src/plugins/plugins.c
View File

@ -157,9 +157,9 @@ plugins_load(const char *const name)
#endif #endif
if (plugin) { if (plugin) {
plugins = g_slist_append(plugins, plugin); plugins = g_slist_append(plugins, plugin);
if (jabber_get_connection_status() == JABBER_CONNECTED) { if (connection_get_status() == JABBER_CONNECTED) {
const char *account_name = jabber_get_account_name(); const char *account_name = session_get_account_name();
const char *fulljid = jabber_get_fulljid(); const char *fulljid = connection_get_fulljid();
plugin->init_func(plugin, PACKAGE_VERSION, PACKAGE_STATUS, account_name, fulljid); plugin->init_func(plugin, PACKAGE_VERSION, PACKAGE_STATUS, account_name, fulljid);
} else { } else {
plugin->init_func(plugin, PACKAGE_VERSION, PACKAGE_STATUS, NULL, NULL); plugin->init_func(plugin, PACKAGE_VERSION, PACKAGE_STATUS, NULL, NULL);

16
src/profanity.c
View File

@ -130,7 +130,7 @@ prof_run(char *log_level, char *account_name)
#endif #endif
plugins_run_timed(); plugins_run_timed();
notify_remind(); notify_remind();
jabber_process_events(10); session_process_events(10);
iq_autoping_check(); iq_autoping_check();
ui_update(); ui_update();
#ifdef HAVE_GTK #ifdef HAVE_GTK
@ -148,7 +148,7 @@ prof_set_quit(void)
void void
prof_handle_idle(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) { if (status == JABBER_CONNECTED) {
GSList *recipients = wins_get_chat_recipients(); GSList *recipients = wins_get_chat_recipients();
GSList *curr = recipients; GSList *curr = recipients;
@ -169,7 +169,7 @@ prof_handle_idle(void)
void void
prof_handle_activity(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(); ProfWin *current = wins_get_current();
if ((status == JABBER_CONNECTED) && (current->type == WIN_CHAT)) { if ((status == JABBER_CONNECTED) && (current->type == WIN_CHAT)) {
@ -197,7 +197,7 @@ _connect_default(const char *const account)
static void static void
_check_autoaway(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) { if (conn_status != JABBER_CONNECTED) {
return; return;
} }
@ -209,7 +209,7 @@ _check_autoaway(void)
int away_time_ms = away_time * 60000; int away_time_ms = away_time * 60000;
int xa_time_ms = xa_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); resource_presence_t curr_presence = accounts_get_last_presence(account);
char *curr_status = accounts_get_last_status(account); char *curr_status = accounts_get_last_status(account);
@ -349,7 +349,7 @@ _init(char *log_level)
theme_init(theme); theme_init(theme);
prefs_free_string(theme); prefs_free_string(theme);
ui_init(); ui_init();
jabber_init(); session_init();
cmd_init(); cmd_init();
log_info("Initialising contact list"); log_info("Initialising contact list");
muc_init(); 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) { if (conn_status == JABBER_CONNECTED) {
cl_ev_disconnect(); cl_ev_disconnect();
} }
#ifdef HAVE_GTK #ifdef HAVE_GTK
tray_shutdown(); tray_shutdown();
#endif #endif
jabber_shutdown(); session_shutdown();
plugins_on_shutdown(); plugins_on_shutdown();
muc_close(); muc_close();
caps_close(); caps_close();

4
src/ui/chatwin.c
View File

@ -360,7 +360,7 @@ chatwin_get_string(ProfChatWin *chatwin)
GString *res = g_string_new("Chat "); 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) { if (conn_status == JABBER_CONNECTED) {
PContact contact = roster_get_contact(chatwin->barejid); PContact contact = roster_get_contact(chatwin->barejid);
if (contact == NULL) { if (contact == NULL) {
@ -388,7 +388,7 @@ static void
_chatwin_history(ProfChatWin *chatwin, const char *const contact) _chatwin_history(ProfChatWin *chatwin, const char *const contact)
{ {
if (!chatwin->history_shown) { 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); GSList *history = chat_log_get_previous(jid->barejid, contact);
jid_destroy(jid); jid_destroy(jid);
GSList *curr = history; GSList *curr = history;

12
src/ui/console.c
View File

@ -472,7 +472,7 @@ cons_check_version(gboolean not_available_msg)
} }
void void
cons_show_login_success(ProfAccount *account, int secured) cons_show_login_success(ProfAccount *account, gboolean secured)
{ {
ProfWin *console = wins_get_console(); ProfWin *console = wins_get_console();
win_vprint(console, '-', 0, NULL, NO_EOL, 0, "", "%s logged in successfully, ", account->jid); 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:"); cons_show("Accounts:");
int i = 0; int i = 0;
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
if ((jabber_get_connection_status() == JABBER_CONNECTED) && if ((connection_get_status() == JABBER_CONNECTED) &&
(g_strcmp0(jabber_get_account_name(), accounts[i]) == 0)) { (g_strcmp0(session_get_account_name(), accounts[i]) == 0)) {
resource_presence_t presence = accounts_get_last_presence(accounts[i]); resource_presence_t presence = accounts_get_last_presence(accounts[i]);
theme_item_t presence_colour = theme_main_presence_attrs(string_from_resource_presence(presence)); 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]); 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_chat, account->priority_online, account->priority_away,
account->priority_xa, account->priority_dnd); account->priority_xa, account->priority_dnd);
if ((jabber_get_connection_status() == JABBER_CONNECTED) && if ((connection_get_status() == JABBER_CONNECTED) &&
(g_strcmp0(jabber_get_account_name(), account->name) == 0)) { (g_strcmp0(session_get_account_name(), account->name) == 0)) {
GList *resources = jabber_get_available_resources(); GList *resources = connection_get_available_resources();
GList *ordered_resources = NULL; GList *ordered_resources = NULL;
GList *curr = resources; GList *curr = resources;

16
src/ui/core.c
View File

@ -352,7 +352,7 @@ ui_group_removed(const char *const contact, const char *const group)
} }
void void
ui_handle_login_account_success(ProfAccount *account, int secured) ui_handle_login_account_success(ProfAccount *account, gboolean secured)
{ {
if (account->theme) { if (account->theme) {
if (theme_load(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); cons_show_login_success(account, secured);
title_bar_set_presence(contact_presence); title_bar_set_presence(contact_presence);
title_bar_set_connected(TRUE); title_bar_set_connected(TRUE);
title_bar_set_tls(secured ? TRUE : FALSE); title_bar_set_tls(secured);
GString *fulljid = g_string_new(account->jid); GString *fulljid = g_string_new(account->jid);
g_string_append(fulljid, "/"); 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); contact_presence_t contact_presence = contact_presence_from_resource_presence(resource_presence);
title_bar_set_presence(contact_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) { if (message) {
cons_show("Status set to %s (priority %d), \"%s\".", show, priority, message); cons_show("Status set to %s (priority %d), \"%s\".", show, priority, message);
} else { } else {
@ -512,7 +512,7 @@ int
ui_close_all_wins(void) ui_close_all_wins(void)
{ {
int count = 0; 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 *win_nums = wins_get_nums();
GList *curr = win_nums; GList *curr = win_nums;
@ -539,7 +539,7 @@ int
ui_close_read_wins(void) ui_close_read_wins(void)
{ {
int count = 0; 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 *win_nums = wins_get_nums();
GList *curr = win_nums; GList *curr = win_nums;
@ -692,7 +692,7 @@ ui_close_win(int index)
void void
ui_prune_wins(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; gboolean pruned = FALSE;
GSList *wins = wins_get_prune_wins(); GSList *wins = wins_get_prune_wins();
@ -1104,10 +1104,10 @@ static void
_ui_draw_term_title(void) _ui_draw_term_title(void)
{ {
char new_win_title[100]; 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) { if (status == JABBER_CONNECTED) {
const char * const jid = jabber_get_fulljid(); const char * const jid = connection_get_fulljid();
gint unread = wins_get_total_unread(); gint unread = wins_get_total_unread();
if (unread != 0) { if (unread != 0) {

2
src/ui/rosterwin.c
View File

@ -85,7 +85,7 @@ rosterwin_roster(void)
return; 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) { if (conn_status != JABBER_CONNECTED) {
return; return;
} }

2
src/ui/titlebar.c
View File

@ -403,7 +403,7 @@ _show_contact_presence(ProfChatWin *chatwin)
theme_item_t presence_colour = THEME_TITLE_OFFLINE; theme_item_t presence_colour = THEME_TITLE_OFFLINE;
const char *presence = "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) { if (conn_status == JABBER_CONNECTED) {
PContact contact = roster_get_contact(chatwin->barejid); PContact contact = roster_get_contact(chatwin->barejid);
if (contact) { if (contact) {

5
src/ui/ui.h
View File

@ -41,6 +41,7 @@
#include "ui/win_types.h" #include "ui/win_types.h"
#include "muc.h" #include "muc.h"
#include "config/tlscerts.h" #include "config/tlscerts.h"
#include "config/account.h"
#ifdef HAVE_LIBOTR #ifdef HAVE_LIBOTR
#include "otr/otr.h" #include "otr/otr.h"
#endif #endif
@ -118,7 +119,7 @@ void ui_show_software_version(const char *const jid, const char *const presence
const char *const version, const char *const os); const char *const version, const char *const os);
void ui_prune_wins(void); void ui_prune_wins(void);
void ui_auto_away(char *message, gint time, resource_presence_t res_presence); 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_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_write(char *line, int offset);
void ui_invalid_command_usage(const char *const cmd, void (*setting_func)(void)); void ui_invalid_command_usage(const char *const cmd, void (*setting_func)(void));
@ -260,7 +261,7 @@ void cons_show_themes(GSList *themes);
void cons_show_scripts(GSList *scripts); void cons_show_scripts(GSList *scripts);
void cons_show_script(const char *const script, GSList *commands); void cons_show_script(const char *const script, GSList *commands);
void cons_show_aliases(GList *aliases); 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, 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); const char *const version, const char *const os);
void cons_show_account_list(gchar **accounts); void cons_show_account_list(gchar **accounts);

2
src/ui/window.c
View File

@ -263,7 +263,7 @@ win_get_title(ProfWin *window)
if (window->type == WIN_CHAT) { if (window->type == WIN_CHAT) {
ProfChatWin *chatwin = (ProfChatWin*) window; ProfChatWin *chatwin = (ProfChatWin*) window;
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); 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) { if (conn_status == JABBER_CONNECTED) {
PContact contact = roster_get_contact(chatwin->barejid); PContact contact = roster_get_contact(chatwin->barejid);
if (contact) { if (contact) {

4
src/window_list.c
View File

@ -374,7 +374,7 @@ wins_get_by_string(char *str)
return (ProfWin*)chatwin; 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) { if (conn_status == JABBER_CONNECTED) {
char *barejid = roster_barejid_from_name(str); char *barejid = roster_barejid_from_name(str);
if (barejid) { if (barejid) {
@ -527,7 +527,7 @@ wins_close_by_num(int i)
autocomplete_remove(wins_ac, chatwin->barejid); autocomplete_remove(wins_ac, chatwin->barejid);
autocomplete_remove(wins_close_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) { if (conn_status == JABBER_CONNECTED) {
PContact contact = roster_get_contact(chatwin->barejid); PContact contact = roster_get_contact(chatwin->barejid);
if (contact) { if (contact) {

1
src/xmpp/blocking.c
View File

@ -46,6 +46,7 @@
#include "log.h" #include "log.h"
#include "common.h" #include "common.h"
#include "ui/ui.h" #include "ui/ui.h"
#include "xmpp/session.h"
#include "xmpp/connection.h" #include "xmpp/connection.h"
#include "xmpp/stanza.h" #include "xmpp/stanza.h"
#include "xmpp/iq.h" #include "xmpp/iq.h"

6
src/xmpp/bookmark.c
View File

@ -177,7 +177,7 @@ bookmark_join(const char *jid)
if (found == NULL) { if (found == NULL) {
return FALSE; return FALSE;
} else { } else {
char *account_name = jabber_get_account_name(); char *account_name = session_get_account_name();
ProfAccount *account = accounts_get_account(account_name); ProfAccount *account = accounts_get_account(account_name);
Bookmark *item = found->data; Bookmark *item = found->data;
if (!muc_active(item->jid)) { 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) { if (bookmark_ac == NULL) {
bookmark_ac = autocomplete_new(); bookmark_ac = autocomplete_new();
} }
my_jid = jid_create(jabber_get_fulljid()); my_jid = jid_create(connection_get_fulljid());
ptr = xmpp_stanza_get_children(ptr); ptr = xmpp_stanza_get_children(ptr);
while (ptr) { while (ptr) {
@ -333,7 +333,7 @@ _bookmark_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata)
if (autojoin_val) { if (autojoin_val) {
Jid *room_jid; Jid *room_jid;
char *account_name = jabber_get_account_name(); char *account_name = session_get_account_name();
ProfAccount *account = accounts_get_account(account_name); ProfAccount *account = accounts_get_account(account_name);
if (nick == NULL) { if (nick == NULL) {
nick = account->muc_nick; nick = account->muc_nick;

945
src/xmpp/connection.c
View File

File diff suppressed because it is too large Load Diff

31
src/xmpp/connection.h
View File

@ -35,27 +35,30 @@
#ifndef XMPP_CONNECTION_H #ifndef XMPP_CONNECTION_H
#define XMPP_CONNECTION_H #define XMPP_CONNECTION_H
#include "config.h" #include "xmpp/xmpp.h"
#ifdef HAVE_LIBMESODE void connection_init(void);
#include <mesode.h> void connection_shutdown(void);
#endif
#ifdef HAVE_LIBSTROPHE
#include <strophe.h>
#endif
#include "resource.h" 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);
typedef int(*ProfIdCallback)(xmpp_stanza_t *const stanza, void *const userdata); 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_conn_t* connection_get_conn(void);
xmpp_ctx_t* connection_get_ctx(void); xmpp_ctx_t* connection_get_ctx(void);
void connection_set_priority(int priority); char *connection_get_domain(void);
void connection_set_presence_message(const char *const message); 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_add_available_resource(Resource *resource);
void connection_remove_available_resource(const char *const 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);
#endif #endif

127
src/xmpp/iq.c
View File

@ -59,11 +59,13 @@
#include "event/server_events.h" #include "event/server_events.h"
#include "xmpp/capabilities.h" #include "xmpp/capabilities.h"
#include "xmpp/blocking.h" #include "xmpp/blocking.h"
#include "xmpp/connection.h" #include "xmpp/session.h"
#include "xmpp/stanza.h" #include "xmpp/stanza.h"
#include "xmpp/form.h" #include "xmpp/form.h"
#include "roster_list.h" #include "roster_list.h"
#include "xmpp/xmpp.h" #include "xmpp/xmpp.h"
#include "xmpp/connection.h"
#include "xmpp/session.h"
#include "xmpp/iq.h" #include "xmpp/iq.h"
#include "xmpp/roster.h" #include "xmpp/roster.h"
#include "plugins/plugins.h" #include "plugins/plugins.h"
@ -225,7 +227,7 @@ iq_id_handler_add(const char *const id, ProfIdCallback func, void *userdata)
void void
iq_autoping_check(void) iq_autoping_check(void)
{ {
if (jabber_get_connection_status() != JABBER_CONNECTED) { if (connection_get_status() != JABBER_CONNECTED) {
return; return;
} }
@ -243,7 +245,7 @@ iq_autoping_check(void)
if (timeout > 0 && seconds_elapsed >= timeout) { if (timeout > 0 && seconds_elapsed >= timeout) {
cons_show("Autoping response timed out afer %u seconds.", timeout); cons_show("Autoping response timed out afer %u seconds.", timeout);
log_debug("Autoping check: timed out afer %u seconds, disconnecting", timeout); log_debug("Autoping check: timed out afer %u seconds, disconnecting", timeout);
connection_autoping_fail(); session_autoping_fail();
autoping_wait = FALSE; autoping_wait = FALSE;
g_timer_destroy(autoping_time); g_timer_destroy(autoping_time);
autoping_time = NULL; autoping_time = NULL;
@ -253,7 +255,7 @@ iq_autoping_check(void)
void void
iq_set_autoping(const int seconds) iq_set_autoping(const int seconds)
{ {
if (jabber_get_connection_status() != JABBER_CONNECTED) { if (connection_get_status() != JABBER_CONNECTED) {
return; return;
} }
@ -307,36 +309,21 @@ iq_disable_carbons(void)
void void
iq_http_upload_request(HTTPUpload *upload) iq_http_upload_request(HTTPUpload *upload)
{ {
GSList *disco_items = connection_get_disco_items(); char *jid = connection_jid_for_feature(STANZA_NS_HTTP_UPLOAD);
DiscoInfo *disco_info; if (jid == NULL) {
if (disco_items && (g_slist_length(disco_items) > 0)) { cons_show_error("XEP-0363 HTTP File Upload is not supported by the server");
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");
return; return;
} }
xmpp_ctx_t * const ctx = connection_get_ctx(); xmpp_ctx_t * const ctx = connection_get_ctx();
char *id = create_unique_id("http_upload_request"); char *id = create_unique_id("http_upload_request");
xmpp_stanza_t *iq = stanza_create_http_upload_request(ctx, id, jid, upload);
xmpp_stanza_t *iq = stanza_create_http_upload_request(ctx, id, disco_info->item, upload);
iq_id_handler_add(id, _http_upload_response_id_handler, upload); iq_id_handler_add(id, _http_upload_response_id_handler, upload);
free(id); free(id);
iq_send_stanza(iq); iq_send_stanza(iq);
xmpp_stanza_release(iq); xmpp_stanza_release(iq);
return; return;
} }
@ -959,7 +946,7 @@ _manual_pong_id_handler(xmpp_stanza_t *const stanza, void *const userdata)
static int static int
_autoping_timed_send(xmpp_conn_t *const conn, void *const userdata) _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; 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); xmpp_stanza_t *query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY);
if (query) { if (query) {
xmpp_stanza_t *child = xmpp_stanza_get_children(query); GHashTable *features = connection_get_features(from);
if (features == NULL) {
GSList *disco_items = connection_get_disco_items(); log_error("No matching disco item found for %s", from);
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 {
return 1; return 1;
} }
xmpp_stanza_t *child = xmpp_stanza_get_children(query);
while (child) { while (child) {
const char *stanza_name = xmpp_stanza_get_name(child); const char *stanza_name = xmpp_stanza_get_name(child);
if (g_strcmp0(stanza_name, STANZA_NAME_FEATURE) == 0) { if (g_strcmp0(stanza_name, STANZA_NAME_FEATURE) == 0) {
const char *var = xmpp_stanza_get_attribute(child, STANZA_ATTR_VAR); const char *var = xmpp_stanza_get_attribute(child, STANZA_ATTR_VAR);
if (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); 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); const char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM);
GSList *items = NULL; GSList *items = NULL;
if ((g_strcmp0(id, "confreq") == 0) || (g_strcmp0(id, "discoitemsreq") == 0) || (g_strcmp0(id, "discoitemsreq_onconnect") == 0)) { if ((g_strcmp0(id, "confreq") != 0) &&
log_debug("Response to query: %s", id); (g_strcmp0(id, "discoitemsreq") != 0) &&
xmpp_stanza_t *query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY); (g_strcmp0(id, "discoitemsreq_onconnect") != 0)) {
return;
}
if (query) { log_debug("Response to query: %s", id);
xmpp_stanza_t *child = xmpp_stanza_get_children(query);
while (child) { xmpp_stanza_t *query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY);
const char *stanza_name = xmpp_stanza_get_name(child); if (query == NULL) {
if (stanza_name && (g_strcmp0(stanza_name, STANZA_NAME_ITEM) == 0)) { return;
const char *item_jid = xmpp_stanza_get_attribute(child, STANZA_ATTR_JID); }
if (item_jid) {
DiscoItem *item = malloc(sizeof(struct disco_item_t)); xmpp_stanza_t *child = xmpp_stanza_get_children(query);
item->jid = strdup(item_jid); if (child == NULL) {
const char *item_name = xmpp_stanza_get_attribute(child, STANZA_ATTR_NAME); return;
if (item_name) { }
item->name = strdup(item_name);
} else { while (child) {
item->name = NULL; const char *stanza_name = xmpp_stanza_get_name(child);
} if (stanza_name && (g_strcmp0(stanza_name, STANZA_NAME_ITEM) == 0)) {
items = g_slist_append(items, item); 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);
} }
} }
child = xmpp_stanza_get_next(child);
} }
if (g_strcmp0(id, "confreq") == 0) { 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) { } else if (g_strcmp0(id, "discoitemsreq") == 0) {
cons_show_disco_items(items, from); cons_show_disco_items(items, from);
} else if (g_strcmp0(id, "discoitemsreq_onconnect") == 0) { } else if (g_strcmp0(id, "discoitemsreq_onconnect") == 0) {
GSList *res_items = items; connection_set_disco_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);
}
}
} }
g_slist_free_full(items, (GDestroyNotify)_item_destroy); g_slist_free_full(items, (GDestroyNotify)_item_destroy);

2
src/xmpp/iq.h
View File

@ -35,6 +35,8 @@
#ifndef XMPP_IQ_H #ifndef XMPP_IQ_H
#define 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_handlers_init(void);
void iq_send_stanza(xmpp_stanza_t *const stanza); void iq_send_stanza(xmpp_stanza_t *const stanza);
void iq_id_handler_add(const char *const id, ProfIdCallback func, void *userdata); void iq_id_handler_add(const char *const id, ProfIdCallback func, void *userdata);

7
src/xmpp/message.c
View File

@ -51,11 +51,12 @@
#include "profanity.h" #include "profanity.h"
#include "ui/ui.h" #include "ui/ui.h"
#include "event/server_events.h" #include "event/server_events.h"
#include "xmpp/connection.h" #include "xmpp/session.h"
#include "xmpp/message.h" #include "xmpp/message.h"
#include "xmpp/roster.h" #include "xmpp/roster.h"
#include "roster_list.h" #include "roster_list.h"
#include "xmpp/stanza.h" #include "xmpp/stanza.h"
#include "xmpp/connection.h"
#include "xmpp/xmpp.h" #include "xmpp/xmpp.h"
#include "pgp/gpg.h" #include "pgp/gpg.h"
#include "plugins/plugins.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; xmpp_stanza_t *message = NULL;
#ifdef HAVE_LIBGPGME #ifdef HAVE_LIBGPGME
char *account_name = jabber_get_account_name(); char *account_name = session_get_account_name();
ProfAccount *account = accounts_get_account(account_name); ProfAccount *account = accounts_get_account(account_name);
if (account->pgp_keyid) { if (account->pgp_keyid) {
Jid *jidp = jid_create(jid); Jid *jidp = jid_create(jid);
@ -739,7 +740,7 @@ _handle_carbons(xmpp_stanza_t *const stanza)
Jid *jid_from = jid_create(from); Jid *jid_from = jid_create(from);
Jid *jid_to = jid_create(to); 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 // check for and deal with message
xmpp_stanza_t *body = xmpp_stanza_get_child_by_name(message, STANZA_NAME_BODY); xmpp_stanza_t *body = xmpp_stanza_get_child_by_name(message, STANZA_NAME_BODY);

25
src/xmpp/presence.c
View File

@ -55,8 +55,9 @@
#include "profanity.h" #include "profanity.h"
#include "ui/ui.h" #include "ui/ui.h"
#include "event/server_events.h" #include "event/server_events.h"
#include "xmpp/capabilities.h"
#include "xmpp/connection.h" #include "xmpp/connection.h"
#include "xmpp/capabilities.h"
#include "xmpp/session.h"
#include "xmpp/stanza.h" #include "xmpp/stanza.h"
#include "xmpp/iq.h" #include "xmpp/iq.h"
#include "xmpp/xmpp.h" #include "xmpp/xmpp.h"
@ -238,7 +239,7 @@ presence_reset_sub_request_search(void)
void void
presence_send(const resource_presence_t presence_type, const char *const msg, const int idle, char *signed_status) 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."); log_warning("Error setting presence, not connected.");
return; 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(); 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); 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); connection_set_priority(pri);
xmpp_stanza_t *presence = stanza_create_presence(ctx); 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) { if (last == NULL) {
last = STANZA_TEXT_ONLINE; 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_presence(account, last);
accounts_set_last_status(account, msg); accounts_set_last_status(account, msg);
free(id); 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); log_debug("Sending room join presence to: %s", jid->fulljid);
xmpp_ctx_t *ctx = connection_get_ctx(); xmpp_ctx_t *ctx = connection_get_ctx();
resource_presence_t presence_type = 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); const char *show = stanza_get_presence_string_from_type(presence_type);
char *status = jabber_get_presence_message(); char *status = connection_get_presence_msg();
int pri = accounts_get_priority_for_presence_type(jabber_get_account_name(), int pri = accounts_get_priority_for_presence_type(session_get_account_name(),
presence_type); presence_type);
xmpp_stanza_t *presence = stanza_create_room_join_presence(ctx, jid->fulljid, passwd); 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); log_debug("Sending room nickname change to: %s, nick: %s", room, nick);
xmpp_ctx_t *ctx = connection_get_ctx(); xmpp_ctx_t *ctx = connection_get_ctx();
resource_presence_t presence_type = 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); const char *show = stanza_get_presence_string_from_type(presence_type);
char *status = jabber_get_presence_message(); char *status = connection_get_presence_msg();
int pri = accounts_get_priority_for_presence_type(jabber_get_account_name(), int pri = accounts_get_priority_for_presence_type(session_get_account_name(),
presence_type); presence_type);
char *full_room_jid = create_fulljid(room, nick); char *full_room_jid = create_fulljid(room, nick);
@ -720,7 +721,7 @@ _muc_user_handler(xmpp_stanza_t *const stanza)
} }
// handle self presence // 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); log_debug("Room self presence received from %s", from_jid->fulljid);
// self unavailable // self unavailable

5
src/xmpp/roster.c
View File

@ -55,8 +55,9 @@
#include "event/client_events.h" #include "event/client_events.h"
#include "tools/autocomplete.h" #include "tools/autocomplete.h"
#include "config/preferences.h" #include "config/preferences.h"
#include "xmpp/connection.h" #include "xmpp/session.h"
#include "xmpp/iq.h" #include "xmpp/iq.h"
#include "xmpp/connection.h"
#include "xmpp/roster.h" #include "xmpp/roster.h"
#include "roster_list.h" #include "roster_list.h"
#include "xmpp/stanza.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 // 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); const char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM);
if (from && (strcmp(from, my_jid->barejid) != 0)) { if (from && (strcmp(from, my_jid->barejid) != 0)) {
jid_destroy(my_jid); jid_destroy(my_jid);

386
src/xmpp/session.c Normal file
View File

@ -0,0 +1,386 @@
/*
* session.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 <assert.h>
#include <string.h>
#include <stdlib.h>
#ifdef HAVE_LIBMESODE
#include <mesode.h>
#endif
#ifdef HAVE_LIBSTROPHE
#include <strophe.h>
#endif
#include "chat_session.h"
#include "common.h"
#include "config/preferences.h"
#include "jid.h"
#include "log.h"
#include "muc.h"
#include "plugins/plugins.h"
#include "profanity.h"
#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"
#include "xmpp/message.h"
#include "xmpp/presence.h"
#include "xmpp/roster.h"
#include "xmpp/stanza.h"
#include "xmpp/xmpp.h"
// for auto reconnect
static struct {
char *name;
char *passwd;
} saved_account;
static struct {
char *name;
char *jid;
char *passwd;
char *altdomain;
int port;
char *tls_policy;
} saved_details;
static GTimer *reconnect_timer;
static void _session_reconnect(void);
static void _session_free_saved_account(void);
static void _session_free_saved_details(void);
void
session_init(void)
{
log_info("Initialising XMPP");
connection_init();
presence_sub_requests_init();
caps_init();
}
jabber_conn_status_t
session_connect_with_account(const ProfAccount *const account)
{
assert(account != NULL);
log_info("Connecting using account: %s", account->name);
// save account name and password for reconnect
if (saved_account.name) {
free(saved_account.name);
}
saved_account.name = strdup(account->name);
if (saved_account.passwd) {
free(saved_account.passwd);
}
saved_account.passwd = strdup(account->password);
// connect with fulljid
Jid *jidp = jid_create_from_bare_and_resource(account->jid, account->resource);
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
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);
assert(passwd != NULL);
// save details for reconnect, remember name for account creating on success
saved_details.name = strdup(jid);
saved_details.passwd = strdup(passwd);
if (altdomain) {
saved_details.altdomain = strdup(altdomain);
} else {
saved_details.altdomain = NULL;
}
if (port != 0) {
saved_details.port = port;
} else {
saved_details.port = 0;
}
if (tls_policy) {
saved_details.tls_policy = strdup(tls_policy);
} else {
saved_details.tls_policy = NULL;
}
// use 'profanity' when no resourcepart in provided jid
Jid *jidp = jid_create(jid);
if (jidp->resourcepart == NULL) {
jid_destroy(jidp);
jidp = jid_create_from_bare_and_resource(jid, "profanity");
saved_details.jid = strdup(jidp->fulljid);
} else {
saved_details.jid = strdup(jid);
}
jid_destroy(jidp);
// connect with fulljid
log_info("Connecting without account, JID: %s", saved_details.jid);
return connection_connect(
saved_details.jid,
passwd,
saved_details.altdomain,
saved_details.port,
saved_details.tls_policy);
}
void
session_autoping_fail(void)
{
if (connection_get_status() == JABBER_CONNECTED) {
log_info("Closing connection");
char *account_name = session_get_account_name();
const char *fulljid = connection_get_fulljid();
plugins_on_disconnect(account_name, fulljid);
accounts_set_last_activity(session_get_account_name());
connection_disconnect();
}
connection_set_disconnected();
session_lost_connection();
}
void
session_disconnect(void)
{
// if connected, send end stream and wait for response
if (connection_get_status() == JABBER_CONNECTED) {
log_info("Closing connection");
char *account_name = session_get_account_name();
const char *fulljid = connection_get_fulljid();
plugins_on_disconnect(account_name, fulljid);
accounts_set_last_activity(session_get_account_name());
connection_disconnect();
_session_free_saved_account();
_session_free_saved_details();
connection_clear_data();
chat_sessions_clear();
presence_clear_sub_requests();
}
connection_set_disconnected();
}
void
session_shutdown(void)
{
_session_free_saved_account();
_session_free_saved_details();
chat_sessions_clear();
presence_clear_sub_requests();
connection_shutdown();
}
void
session_process_events(int millis)
{
int reconnect_sec;
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;
}
}
char*
session_get_account_name(void)
{
return saved_account.name;
}
void
session_login_success(gboolean secured)
{
// 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);
_session_free_saved_details();
}
chat_sessions_init();
message_handlers_init();
presence_handlers_init();
iq_handlers_init();
roster_request();
bookmark_request();
blocking_request();
// items discovery
char *domain = connection_get_domain();
iq_disco_info_request_onconnect(domain);
iq_disco_items_request_onconnect(domain);
if (prefs_get_boolean(PREF_CARBONS)){
iq_enable_carbons();
}
if ((prefs_get_reconnect() != 0) && reconnect_timer) {
g_timer_destroy(reconnect_timer);
reconnect_timer = NULL;
}
}
void
session_login_failed(void)
{
if (reconnect_timer == NULL) {
log_debug("Connection handler: No reconnect timer");
sv_ev_failed_login();
_session_free_saved_account();
_session_free_saved_details();
} else {
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();
}
void
session_lost_connection(void)
{
sv_ev_lost_connection();
if (prefs_get_reconnect() != 0) {
assert(reconnect_timer == NULL);
reconnect_timer = g_timer_new();
} else {
_session_free_saved_account();
_session_free_saved_details();
}
connection_clear_data();
chat_sessions_clear();
presence_clear_sub_requests();
}
static void
_session_reconnect(void)
{
// reconnect with account.
ProfAccount *account = accounts_get_account(saved_account.name);
if (account == NULL) {
log_error("Unable to reconnect, account no longer exists: %s", saved_account.name);
return;
}
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 void
_session_free_saved_account(void)
{
FREE_SET_NULL(saved_account.name);
FREE_SET_NULL(saved_account.passwd);
}
static void
_session_free_saved_details(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);
}

54
src/xmpp/session.h Normal file
View File

@ -0,0 +1,54 @@
/*
* session.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_SESSION_H
#define XMPP_SESSION_H
#include "config.h"
#ifdef HAVE_LIBMESODE
#include <mesode.h>
#endif
#ifdef HAVE_LIBSTROPHE
#include <strophe.h>
#endif
#include "resource.h"
void session_login_success(gboolean secured);
void session_login_failed(void);
void session_lost_connection(void);
void session_autoping_fail(void);
#endif

3
src/xmpp/stanza.c
View File

@ -53,9 +53,10 @@
#include "common.h" #include "common.h"
#include "log.h" #include "log.h"
#include "xmpp/connection.h" #include "xmpp/session.h"
#include "xmpp/stanza.h" #include "xmpp/stanza.h"
#include "xmpp/capabilities.h" #include "xmpp/capabilities.h"
#include "xmpp/connection.h"
#include "xmpp/form.h" #include "xmpp/form.h"
#include "muc.h" #include "muc.h"

42
src/xmpp/xmpp.h
View File

@ -57,8 +57,6 @@
#define XMPP_FEATURE_BLOCKING "urn:xmpp:blocking" #define XMPP_FEATURE_BLOCKING "urn:xmpp:blocking"
typedef enum { typedef enum {
JABBER_UNDEFINED,
JABBER_STARTED,
JABBER_CONNECTING, JABBER_CONNECTING,
JABBER_CONNECTED, JABBER_CONNECTED,
JABBER_DISCONNECTING, JABBER_DISCONNECTING,
@ -105,31 +103,27 @@ typedef struct disco_identity_t {
char *category; char *category;
} DiscoIdentity; } DiscoIdentity;
typedef struct disco_info_t { void session_init(void);
char *item; jabber_conn_status_t session_connect_with_details(const char *const jid, const char *const passwd,
GHashTable *features;
} DiscoInfo;
void jabber_init(void);
jabber_conn_status_t jabber_connect_with_details(const char *const jid, const char *const passwd,
const char *const altdomain, const int port, const char *const tls_policy); const char *const altdomain, const int port, const char *const tls_policy);
jabber_conn_status_t jabber_connect_with_account(const ProfAccount *const account); jabber_conn_status_t session_connect_with_account(const ProfAccount *const account);
void jabber_disconnect(void); void session_disconnect(void);
void jabber_shutdown(void); void session_shutdown(void);
void jabber_process_events(int millis); void session_process_events(int millis);
const char* jabber_get_fulljid(void); char* session_get_account_name(void);
jabber_conn_status_t jabber_get_connection_status(void);
char* jabber_get_presence_message(void); jabber_conn_status_t connection_get_status(void);
char* jabber_get_account_name(void); char *connection_get_presence_msg(void);
GList* jabber_get_available_resources(void); const char* connection_get_fulljid(void);
char* jabber_create_uuid(void); char* connection_create_uuid(void);
void jabber_free_uuid(char *uuid); void connection_free_uuid(char *uuid);
#ifdef HAVE_LIBMESODE #ifdef HAVE_LIBMESODE
TLSCertificate* jabber_get_tls_peer_cert(void); TLSCertificate* connection_get_tls_peer_cert(void);
#endif #endif
gboolean jabber_conn_is_secured(void); gboolean connection_is_secured(void);
gboolean jabber_send_stanza(const char *const stanza); gboolean connection_send_stanza(const char *const stanza);
gboolean jabber_service_supports(const char *const feature); 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(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); char* message_send_chat_otr(const char *const barejid, const char *const msg);

28
tests/unittests/test_cmd_account.c
View File

@ -21,7 +21,7 @@ void cmd_account_shows_usage_when_not_connected_and_no_args(void **state)
{ {
gchar *args[] = { NULL }; 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); 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); TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
gchar *args[] = { NULL }; gchar *args[] = { NULL };
will_return(jabber_get_connection_status, JABBER_CONNECTED); will_return(connection_get_status, JABBER_CONNECTED);
will_return(jabber_get_account_name, "account_name"); will_return(session_get_account_name, "account_name");
expect_any(accounts_get_account, name); expect_any(accounts_get_account, name);
will_return(accounts_get_account, account); 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 }; 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); expect_any(accounts_account_exists, account_name);
will_return(accounts_account_exists, TRUE); 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 }; 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); expect_any(accounts_account_exists, account_name);
will_return(accounts_account_exists, TRUE); 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_string(accounts_set_priority_online, account_name, "a_account");
expect_value(accounts_set_priority_online, value, 10); 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("Updated online priority for account a_account: 10");
expect_cons_show(""); 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_string(accounts_set_priority_chat, account_name, "a_account");
expect_value(accounts_set_priority_chat, value, 10); 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("Updated chat priority for account a_account: 10");
expect_cons_show(""); 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_string(accounts_set_priority_away, account_name, "a_account");
expect_value(accounts_set_priority_away, value, 10); 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("Updated away priority for account a_account: 10");
expect_cons_show(""); 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_string(accounts_set_priority_xa, account_name, "a_account");
expect_value(accounts_set_priority_xa, value, 10); 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("Updated xa priority for account a_account: 10");
expect_cons_show(""); 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_string(accounts_set_priority_dnd, account_name, "a_account");
expect_value(accounts_set_priority_dnd, value, 10); 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("Updated dnd priority for account a_account: 10");
expect_cons_show(""); 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, account_name);
expect_any(accounts_set_priority_online, value); 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); expect_any(accounts_get_last_presence, account_name);
will_return(accounts_get_last_presence, RESOURCE_ONLINE); 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 #ifdef HAVE_LIBGPGME
ProfAccount *account = account_new("a_account", "a_jid", NULL, NULL, TRUE, NULL, 5222, "a_resource", 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); 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); expect_any(accounts_get_account, name);
will_return(accounts_get_account, account); will_return(accounts_get_account, account);
#endif #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_value(presence_send, status, RESOURCE_ONLINE);
expect_string(presence_send, msg, "Free to chat"); expect_string(presence_send, msg, "Free to chat");

30
tests/unittests/test_cmd_bookmark.c
View File

@ -24,7 +24,7 @@
static void test_with_connection_status(jabber_conn_status_t status) 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."); expect_cons_show("You are not currently connected.");
gboolean result = cmd_bookmark(NULL, CMD_BOOKMARK, NULL); 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); 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) void cmd_bookmark_shows_usage_when_no_args(void **state)
{ {
gchar *args[] = { NULL }; gchar *args[] = { NULL };
ProfWin window; ProfWin window;
window.type = WIN_CONSOLE; 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); 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, bm4);
bookmarks = g_list_append(bookmarks, bm5); 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); will_return(bookmark_get_list, bookmarks);
// TODO - Custom list compare // TODO - Custom list compare
@ -147,7 +137,7 @@ void cmd_bookmark_add_shows_message_when_invalid_jid(void **state)
ProfWin window; ProfWin window;
window.type = WIN_CONSOLE; 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'"); 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; ProfWin window;
window.type = WIN_CONSOLE; 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, jid, jid);
expect_any(bookmark_add, nick); expect_any(bookmark_add, nick);
@ -184,7 +174,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid_nick(void **state)
ProfWin window; ProfWin window;
window.type = WIN_CONSOLE; 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, jid, jid);
expect_string(bookmark_add, nick, nick); expect_string(bookmark_add, nick, nick);
@ -205,7 +195,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid_autojoin(void **state)
ProfWin window; ProfWin window;
window.type = WIN_CONSOLE; 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, jid, jid);
expect_any(bookmark_add, nick); expect_any(bookmark_add, nick);
@ -227,7 +217,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid_nick_autojoin(void **state)
ProfWin window; ProfWin window;
window.type = WIN_CONSOLE; 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, jid, jid);
expect_string(bookmark_add, nick, nick); expect_string(bookmark_add, nick, nick);
@ -248,7 +238,7 @@ void cmd_bookmark_remove_removes_bookmark(void **state)
ProfWin window; ProfWin window;
window.type = WIN_CONSOLE; 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); expect_string(bookmark_remove, jid, jid);
will_return(bookmark_remove, TRUE); will_return(bookmark_remove, TRUE);
@ -266,7 +256,7 @@ void cmd_bookmark_remove_shows_message_when_no_bookmark(void **state)
ProfWin window; ProfWin window;
window.type = WIN_CONSOLE; window.type = WIN_CONSOLE;
will_return(jabber_get_connection_status, JABBER_CONNECTED); will_return(connection_get_status, JABBER_CONNECTED);
expect_any(bookmark_remove, jid); expect_any(bookmark_remove, jid);
will_return(bookmark_remove, FALSE); will_return(bookmark_remove, FALSE);

1
tests/unittests/test_cmd_bookmark.h
View File

@ -1,7 +1,6 @@
void cmd_bookmark_shows_message_when_disconnected(void **state); void cmd_bookmark_shows_message_when_disconnected(void **state);
void cmd_bookmark_shows_message_when_disconnecting(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_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_message_when_undefined(void **state);
void cmd_bookmark_shows_usage_when_no_args(void **state); void cmd_bookmark_shows_usage_when_no_args(void **state);
void cmd_bookmark_list_shows_bookmarks(void **state); void cmd_bookmark_list_shows_bookmarks(void **state);

121
tests/unittests/test_cmd_connect.c
View File

@ -18,7 +18,7 @@
static void test_with_connection_status(jabber_conn_status_t status) 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."); 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); 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) void cmd_connect_when_no_account(void **state)
{ {
gchar *args[] = { "user@server.org", NULL }; 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"); expect_string(accounts_get_account, name, "user@server.org");
will_return(accounts_get_account, NULL); 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_cons_show("Connecting as user@server.org");
expect_string(jabber_connect_with_details, jid, "user@server.org"); expect_string(session_connect_with_details, jid, "user@server.org");
expect_string(jabber_connect_with_details, passwd, "password"); expect_string(session_connect_with_details, passwd, "password");
expect_value(jabber_connect_with_details, altdomain, NULL); expect_value(session_connect_with_details, altdomain, NULL);
expect_value(jabber_connect_with_details, port, 0); expect_value(session_connect_with_details, port, 0);
will_return(jabber_connect_with_details, JABBER_CONNECTING); will_return(session_connect_with_details, JABBER_CONNECTING);
gboolean result = cmd_connect(NULL, CMD_CONNECT, args); gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
assert_true(result); assert_true(result);
@ -73,7 +68,7 @@ void cmd_connect_fail_message(void **state)
{ {
gchar *args[] = { "user@server.org", NULL }; 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); expect_any(accounts_get_account, name);
will_return(accounts_get_account, NULL); 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_cons_show("Connecting as user@server.org");
expect_any(jabber_connect_with_details, jid); expect_any(session_connect_with_details, jid);
expect_any(jabber_connect_with_details, passwd); expect_any(session_connect_with_details, passwd);
expect_any(jabber_connect_with_details, altdomain); expect_any(session_connect_with_details, altdomain);
expect_any(jabber_connect_with_details, port); expect_any(session_connect_with_details, port);
will_return(jabber_connect_with_details, JABBER_DISCONNECTED); will_return(session_connect_with_details, JABBER_DISCONNECTED);
expect_cons_show_error("Connection attempt for user@server.org failed."); 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 }; 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"); expect_string(accounts_get_account, name, "user@server.org");
will_return(accounts_get_account, NULL); 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_cons_show("Connecting as user@server.org");
expect_any(jabber_connect_with_details, jid); expect_any(session_connect_with_details, jid);
expect_any(jabber_connect_with_details, passwd); expect_any(session_connect_with_details, passwd);
expect_any(jabber_connect_with_details, altdomain); expect_any(session_connect_with_details, altdomain);
expect_any(jabber_connect_with_details, port); expect_any(session_connect_with_details, port);
will_return(jabber_connect_with_details, JABBER_CONNECTING); will_return(session_connect_with_details, JABBER_CONNECTING);
gboolean result = cmd_connect(NULL, CMD_CONNECT, args); gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
assert_true(result); 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, 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); 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); expect_any(accounts_get_account, name);
will_return(accounts_get_account, account); 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_cons_show("Connecting with account jabber_org as me@jabber.org");
expect_any(jabber_connect_with_account, account); expect_any(session_connect_with_account, account);
will_return(jabber_connect_with_account, JABBER_CONNECTING); will_return(session_connect_with_account, JABBER_CONNECTING);
gboolean result = cmd_connect(NULL, CMD_CONNECT, args); gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
assert_true(result); 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 }; 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_string(cons_bad_cmd_usage, cmd, CMD_CONNECT);
expect_cons_show(""); 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 }; 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_string(cons_bad_cmd_usage, cmd, CMD_CONNECT);
expect_cons_show(""); 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 }; 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_string(cons_bad_cmd_usage, cmd, CMD_CONNECT);
expect_cons_show(""); 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 }; 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_string(cons_bad_cmd_usage, cmd, CMD_CONNECT);
expect_cons_show(""); 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 }; 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("Value 0 out of range. Must be in 1..65535.");
expect_cons_show(""); 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 }; 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("Value -1 out of range. Must be in 1..65535.");
expect_cons_show(""); 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 }; 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("Value 65536 out of range. Must be in 1..65535.");
expect_cons_show(""); 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 }; 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("Could not convert \"52f66\" to a number.");
expect_cons_show(""); 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 }; 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_string(cons_bad_cmd_usage, cmd, CMD_CONNECT);
expect_cons_show(""); 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 }; 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_string(cons_bad_cmd_usage, cmd, CMD_CONNECT);
expect_cons_show(""); 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 }; 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_string(cons_bad_cmd_usage, cmd, CMD_CONNECT);
expect_cons_show(""); 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 }; 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_string(cons_bad_cmd_usage, cmd, CMD_CONNECT);
expect_cons_show(""); expect_cons_show("");
@ -299,7 +294,7 @@ void cmd_connect_with_server_when_provided(void **state)
{ {
gchar *args[] = { "user@server.org", "server", "aserver", NULL }; 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"); expect_string(accounts_get_account, name, "user@server.org");
will_return(accounts_get_account, NULL); 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_cons_show("Connecting as user@server.org");
expect_string(jabber_connect_with_details, jid, "user@server.org"); expect_string(session_connect_with_details, jid, "user@server.org");
expect_string(jabber_connect_with_details, passwd, "password"); expect_string(session_connect_with_details, passwd, "password");
expect_string(jabber_connect_with_details, altdomain, "aserver"); expect_string(session_connect_with_details, altdomain, "aserver");
expect_value(jabber_connect_with_details, port, 0); expect_value(session_connect_with_details, port, 0);
will_return(jabber_connect_with_details, JABBER_CONNECTING); will_return(session_connect_with_details, JABBER_CONNECTING);
gboolean result = cmd_connect(NULL, CMD_CONNECT, args); gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
assert_true(result); assert_true(result);
@ -322,7 +317,7 @@ void cmd_connect_with_port_when_provided(void **state)
{ {
gchar *args[] = { "user@server.org", "port", "5432", NULL }; 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"); expect_string(accounts_get_account, name, "user@server.org");
will_return(accounts_get_account, NULL); 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_cons_show("Connecting as user@server.org");
expect_string(jabber_connect_with_details, jid, "user@server.org"); expect_string(session_connect_with_details, jid, "user@server.org");
expect_string(jabber_connect_with_details, passwd, "password"); expect_string(session_connect_with_details, passwd, "password");
expect_value(jabber_connect_with_details, altdomain, NULL); expect_value(session_connect_with_details, altdomain, NULL);
expect_value(jabber_connect_with_details, port, 5432); expect_value(session_connect_with_details, port, 5432);
will_return(jabber_connect_with_details, JABBER_CONNECTING); will_return(session_connect_with_details, JABBER_CONNECTING);
gboolean result = cmd_connect(NULL, CMD_CONNECT, args); gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
assert_true(result); 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 }; 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"); expect_string(accounts_get_account, name, "user@server.org");
will_return(accounts_get_account, NULL); 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_cons_show("Connecting as user@server.org");
expect_string(jabber_connect_with_details, jid, "user@server.org"); expect_string(session_connect_with_details, jid, "user@server.org");
expect_string(jabber_connect_with_details, passwd, "password"); expect_string(session_connect_with_details, passwd, "password");
expect_string(jabber_connect_with_details, altdomain, "aserver"); expect_string(session_connect_with_details, altdomain, "aserver");
expect_value(jabber_connect_with_details, port, 5432); expect_value(session_connect_with_details, port, 5432);
will_return(jabber_connect_with_details, JABBER_CONNECTING); will_return(session_connect_with_details, JABBER_CONNECTING);
gboolean result = cmd_connect(NULL, CMD_CONNECT, args); gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
assert_true(result); 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, 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); 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); expect_any(accounts_get_account, name);
will_return(accounts_get_account, account); will_return(accounts_get_account, account);
expect_cons_show("Connecting with account jabber_org as user@jabber.org/laptop"); expect_cons_show("Connecting with account jabber_org as user@jabber.org/laptop");
expect_any(jabber_connect_with_account, account); expect_any(session_connect_with_account, account);
will_return(jabber_connect_with_account, JABBER_CONNECTING); will_return(session_connect_with_account, JABBER_CONNECTING);
gboolean result = cmd_connect(NULL, CMD_CONNECT, args); gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
assert_true(result); 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, 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); 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); expect_any(accounts_get_account, name);
will_return(accounts_get_account, account); will_return(accounts_get_account, account);
expect_cons_show("Connecting with account jabber_org as me@jabber.org"); expect_cons_show("Connecting with account jabber_org as me@jabber.org");
expect_memory(jabber_connect_with_account, account, account, sizeof(account)); expect_memory(session_connect_with_account, account, account, sizeof(account));
will_return(jabber_connect_with_account, JABBER_CONNECTING); will_return(session_connect_with_account, JABBER_CONNECTING);
gboolean result = cmd_connect(NULL, CMD_CONNECT, args); gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
assert_true(result); assert_true(result);

4
tests/unittests/test_cmd_disconnect.c
View File

@ -21,8 +21,8 @@ void clears_chat_sessions(void **state)
chat_session_recipient_active("bob@server.org", "laptop", FALSE); chat_session_recipient_active("bob@server.org", "laptop", FALSE);
chat_session_recipient_active("mike@server.org", "work", FALSE); chat_session_recipient_active("mike@server.org", "work", FALSE);
will_return(jabber_get_connection_status, JABBER_CONNECTED); will_return(connection_get_status, JABBER_CONNECTED);
will_return(jabber_get_fulljid, "myjid@myserver.com"); will_return(connection_get_fulljid, "myjid@myserver.com");
expect_any_cons_show(); expect_any_cons_show();
gboolean result = cmd_disconnect(NULL, CMD_DISCONNECT, NULL); gboolean result = cmd_disconnect(NULL, CMD_DISCONNECT, NULL);

25
tests/unittests/test_cmd_join.c
View File

@ -20,7 +20,7 @@
static void test_with_connection_status(jabber_conn_status_t status) 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."); 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); 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) void cmd_join_shows_error_message_when_invalid_room_jid(void **state)
{ {
gchar *args[] = { "//@@/", NULL }; 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_error("Specified room has incorrect format.");
expect_cons_show(""); expect_cons_show("");
@ -74,8 +69,8 @@ void cmd_join_uses_account_mucservice_when_no_service_specified(void **state)
muc_init(); muc_init();
will_return(jabber_get_connection_status, JABBER_CONNECTED); will_return(connection_get_status, JABBER_CONNECTED);
will_return(jabber_get_account_name, account_name); will_return(session_get_account_name, account_name);
expect_string(accounts_get_account, name, account_name); expect_string(accounts_get_account, name, account_name);
will_return(accounts_get_account, account); will_return(accounts_get_account, account);
@ -99,8 +94,8 @@ void cmd_join_uses_supplied_nick(void **state)
muc_init(); muc_init();
will_return(jabber_get_connection_status, JABBER_CONNECTED); will_return(connection_get_status, JABBER_CONNECTED);
will_return(jabber_get_account_name, account_name); will_return(session_get_account_name, account_name);
expect_string(accounts_get_account, name, account_name); expect_string(accounts_get_account, name, account_name);
will_return(accounts_get_account, account); will_return(accounts_get_account, account);
@ -124,8 +119,8 @@ void cmd_join_uses_account_nick_when_not_supplied(void **state)
muc_init(); muc_init();
will_return(jabber_get_connection_status, JABBER_CONNECTED); will_return(connection_get_status, JABBER_CONNECTED);
will_return(jabber_get_account_name, account_name); will_return(session_get_account_name, account_name);
expect_string(accounts_get_account, name, account_name); expect_string(accounts_get_account, name, account_name);
will_return(accounts_get_account, account); will_return(accounts_get_account, account);
@ -152,8 +147,8 @@ void cmd_join_uses_password_when_supplied(void **state)
muc_init(); muc_init();
will_return(jabber_get_connection_status, JABBER_CONNECTED); will_return(connection_get_status, JABBER_CONNECTED);
will_return(jabber_get_account_name, account_name); will_return(session_get_account_name, account_name);
expect_string(accounts_get_account, name, account_name); expect_string(accounts_get_account, name, account_name);
will_return(accounts_get_account, account); will_return(accounts_get_account, account);

46
tests/unittests/test_cmd_otr.c
View File

@ -138,7 +138,7 @@ void cmd_otr_gen_shows_message_when_not_connected(void **state)
{ {
gchar *args[] = { "gen", NULL }; 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."); 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 }; 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."); 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); 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) void cmd_otr_gen_shows_message_when_connecting(void **state)
{ {
test_with_command_and_connection_status("gen", cmd_otr_gen, JABBER_CONNECTING); 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, 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); 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(connection_get_status, JABBER_CONNECTED);
will_return(jabber_get_account_name, account_name); will_return(session_get_account_name, account_name);
expect_string(accounts_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); 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) void cmd_otr_myfp_shows_message_when_connecting(void **state)
{ {
test_with_command_and_connection_status("myfp", cmd_otr_myfp, JABBER_CONNECTING); 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 }; 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); 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'"); 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: "); GString *message = g_string_new("Your OTR fingerprint: ");
g_string_append(message, 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_key_loaded, TRUE);
will_return(otr_get_my_fingerprint, strdup(fingerprint)); will_return(otr_get_my_fingerprint, strdup(fingerprint));
@ -268,7 +248,7 @@ test_cmd_otr_theirfp_from_wintype(win_type_t wintype)
ProfWin window; ProfWin window;
window.type = wintype; 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."); 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.pgp_send = FALSE;
chatwin.is_otr = 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."); 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.pgp_send = FALSE;
chatwin.is_otr = TRUE; 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); expect_string(otr_get_their_fingerprint, recipient, recipient);
will_return(otr_get_their_fingerprint, strdup(fingerprint)); will_return(otr_get_their_fingerprint, strdup(fingerprint));
@ -351,7 +331,7 @@ test_cmd_otr_start_from_wintype(win_type_t wintype)
ProfWin window; ProfWin window;
window.type = wintype; 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."); 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"; char *recipient = "someone@server.org";
gchar *args[] = { "start", NULL }; gchar *args[] = { "start", NULL };
will_return(jabber_get_connection_status, JABBER_CONNECTED); will_return(connection_get_status, JABBER_CONNECTED);
ProfWin window; ProfWin window;
window.type = WIN_CHAT; window.type = WIN_CHAT;
@ -401,7 +381,7 @@ void cmd_otr_start_shows_message_when_no_key(void **state)
char *recipient = "someone@server.org"; char *recipient = "someone@server.org";
gchar *args[] = { "start", NULL }; 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); will_return(otr_key_loaded, FALSE);
ProfWin window; ProfWin window;
@ -435,7 +415,7 @@ cmd_otr_start_sends_otr_query_message_to_current_recipeint(void **state)
chatwin.pgp_send = FALSE; chatwin.pgp_send = FALSE;
chatwin.is_otr = 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_key_loaded, TRUE);
will_return(otr_start_query, query_message); will_return(otr_start_query, query_message);

2
tests/unittests/test_cmd_otr.h
View File

@ -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_generates_key_for_connected_account(void **state);
void cmd_otr_gen_shows_message_when_disconnected(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_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_connecting(void **state);
void cmd_otr_gen_shows_message_when_disconnecting(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_disconnected(void **state);
void cmd_otr_myfp_shows_message_when_undefined(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_connecting(void **state);
void cmd_otr_myfp_shows_message_when_disconnecting(void **state); void cmd_otr_myfp_shows_message_when_disconnecting(void **state);
void cmd_otr_myfp_shows_message_when_no_key(void **state); void cmd_otr_myfp_shows_message_when_no_key(void **state);

14
tests/unittests/test_cmd_pgp.c
View File

@ -32,7 +32,7 @@ void cmd_pgp_start_shows_message_when_connection(jabber_conn_status_t conn_statu
ProfWin window; ProfWin window;
window.type = WIN_CHAT; 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."); 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); 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) void cmd_pgp_start_shows_message_when_no_arg_in_wintype(win_type_t wintype)
{ {
gchar *args[] = { "start", NULL }; gchar *args[] = { "start", NULL };
ProfWin window; ProfWin window;
window.type = wintype; 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."); expect_cons_show("You must be in a regular chat window to start PGP encrpytion.");

1
tests/unittests/test_cmd_pgp.h
View File

@ -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_disconnecting(void **state);
void cmd_pgp_start_shows_message_when_connecting(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_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_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_muc(void **state);
void cmd_pgp_start_shows_message_when_no_arg_in_mucconf(void **state); void cmd_pgp_start_shows_message_when_no_arg_in_mucconf(void **state);

18
tests/unittests/test_cmd_rooms.c
View File

@ -18,7 +18,7 @@
static void test_with_connection_status(jabber_conn_status_t status) 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."); 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); 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) void cmd_rooms_uses_account_default_when_no_arg(void **state)
{ {
gchar *args[] = { NULL }; 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, 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); 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(connection_get_status, JABBER_CONNECTED);
will_return(jabber_get_account_name, "account_name"); will_return(session_get_account_name, "account_name");
expect_any(accounts_get_account, name); expect_any(accounts_get_account, name);
will_return(accounts_get_account, account); will_return(accounts_get_account, account);
@ -73,7 +63,7 @@ void cmd_rooms_arg_used_when_passed(void **state)
{ {
gchar *args[] = { "conf_server_arg" }; 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"); expect_string(iq_room_list_request, conferencejid, "conf_server_arg");

1
tests/unittests/test_cmd_rooms.h
View File

@ -1,7 +1,6 @@
void cmd_rooms_shows_message_when_disconnected(void **state); void cmd_rooms_shows_message_when_disconnected(void **state);
void cmd_rooms_shows_message_when_disconnecting(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_connecting(void **state);
void cmd_rooms_shows_message_when_started(void **state);
void cmd_rooms_shows_message_when_undefined(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_uses_account_default_when_no_arg(void **state);
void cmd_rooms_arg_used_when_passed(void **state); void cmd_rooms_arg_used_when_passed(void **state);

31
tests/unittests/test_cmd_roster.c
View File

@ -19,7 +19,7 @@ static void test_with_connection_status(jabber_conn_status_t status)
{ {
gchar *args[] = { NULL }; gchar *args[] = { NULL };
will_return(jabber_get_connection_status, status); will_return(connection_get_status, status);
expect_cons_show("You are not currently connected."); 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); 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) void cmd_roster_shows_roster_when_no_args(void **state)
{ {
gchar *args[] = { NULL }; gchar *args[] = { NULL };
will_return(jabber_get_connection_status, JABBER_CONNECTED); will_return(connection_get_status, JABBER_CONNECTED);
roster_create(); roster_create();
roster_add("bob@server.org", "bob", NULL, "both", FALSE); 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 }; 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); 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"; char *nick = "bob";
gchar *args[] = { "add", jid, nick, NULL }; 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, barejid, jid);
expect_string(roster_send_add_new, name, nick); 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 }; 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); 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"; char *jid = "bob@server.org";
gchar *args[] = { "remove", jid, NULL }; 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); 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 }; 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); 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 }; 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); 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(); 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"); 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")); groups = g_slist_append(groups, strdup("group1"));
roster_add(jid, "bob", groups, "both", FALSE); 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, barejid, jid);
expect_string(roster_send_name_change, new_name, nick); 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 }; 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); 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(); 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"); 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")); groups = g_slist_append(groups, strdup("group1"));
roster_add(jid, "bob", groups, "both", FALSE); 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, barejid, jid);
expect_value(roster_send_name_change, new_name, NULL); expect_value(roster_send_name_change, new_name, NULL);

4
tests/unittests/test_cmd_sub.c
View File

@ -19,7 +19,7 @@ void cmd_sub_shows_message_when_not_connected(void **state)
{ {
gchar *args[] = { NULL }; 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."); 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 }; 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); expect_string(cons_bad_cmd_usage, cmd, CMD_SUB);

15
tests/unittests/unittests.c
View File

@ -238,9 +238,6 @@ int main(int argc, char* argv[]) {
unit_test_setup_teardown(cmd_connect_shows_message_when_connected, unit_test_setup_teardown(cmd_connect_shows_message_when_connected,
load_preferences, load_preferences,
close_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, unit_test_setup_teardown(cmd_connect_when_no_account,
load_preferences, load_preferences,
close_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_disconnected),
unit_test(cmd_rooms_shows_message_when_disconnecting), unit_test(cmd_rooms_shows_message_when_disconnecting),
unit_test(cmd_rooms_shows_message_when_connecting), 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_uses_account_default_when_no_arg),
unit_test(cmd_rooms_arg_used_when_passed), 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_disconnected),
unit_test(cmd_bookmark_shows_message_when_disconnecting), unit_test(cmd_bookmark_shows_message_when_disconnecting),
unit_test(cmd_bookmark_shows_message_when_connecting), 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_shows_usage_when_no_args),
unit_test(cmd_bookmark_list_shows_bookmarks), unit_test(cmd_bookmark_list_shows_bookmarks),
unit_test(cmd_bookmark_add_shows_message_when_invalid_jid), 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_shows_message_when_not_connected),
unit_test(cmd_otr_gen_generates_key_for_connected_account), 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_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_connecting),
unit_test(cmd_otr_gen_shows_message_when_disconnecting), 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_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_connecting),
unit_test(cmd_otr_myfp_shows_message_when_disconnecting), unit_test(cmd_otr_myfp_shows_message_when_disconnecting),
unit_test(cmd_otr_myfp_shows_message_when_no_key), 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_disconnected),
unit_test(cmd_pgp_start_shows_message_when_disconnecting), 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_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_console),
unit_test(cmd_pgp_start_shows_message_when_no_arg_in_muc), unit_test(cmd_pgp_start_shows_message_when_no_arg_in_muc),
unit_test(cmd_pgp_start_shows_message_when_no_arg_in_mucconf), 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_disconnecting),
unit_test(cmd_join_shows_message_when_connecting), unit_test(cmd_join_shows_message_when_connecting),
unit_test(cmd_join_shows_message_when_disconnected), 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_shows_error_message_when_invalid_room_jid),
unit_test(cmd_join_uses_account_mucservice_when_no_service_specified), unit_test(cmd_join_uses_account_mucservice_when_no_service_specified),
unit_test(cmd_join_uses_supplied_nick), 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_disconnecting),
unit_test(cmd_roster_shows_message_when_connecting), unit_test(cmd_roster_shows_message_when_connecting),
unit_test(cmd_roster_shows_message_when_disconnected), 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_shows_roster_when_no_args),
unit_test(cmd_roster_add_shows_message_when_no_jid), unit_test(cmd_roster_add_shows_message_when_no_jid),
unit_test(cmd_roster_add_sends_roster_add_request), unit_test(cmd_roster_add_sends_roster_add_request),

44
tests/unittests/xmpp/stub_xmpp.c
View File

@ -6,9 +6,9 @@
#include "xmpp/xmpp.h" #include "xmpp/xmpp.h"
// connection functions // 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) const char * const passwd, const char * const altdomain, const int port, const char *const tls_policy)
{ {
check_expected(jid); 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(); 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); check_expected(account);
return (jabber_conn_status_t)mock(); return (jabber_conn_status_t)mock();
} }
void jabber_disconnect(void) {} void session_disconnect(void) {}
void jabber_shutdown(void) {} void session_shutdown(void) {}
void jabber_process_events(int millis) {} void session_process_events(int millis) {}
const char * jabber_get_fulljid(void) const char * connection_get_fulljid(void)
{ {
return (char *)mock(); return (char *)mock();
} }
const char * jabber_get_domain(void) const char * session_get_domain(void)
{ {
return NULL; return NULL;
} }
char* jabber_create_uuid(void) gboolean connection_is_secured(void)
{
return 1;
}
TLSCertificate*
connection_get_tls_peer_cert(void)
{ {
return NULL; return NULL;
} }
void jabber_free_uuid(char * uuid) {}
jabber_conn_status_t jabber_get_connection_status(void) char* connection_create_uuid(void)
{
return NULL;
}
void connection_free_uuid(char * uuid) {}
jabber_conn_status_t connection_get_status(void)
{ {
return (jabber_conn_status_t)mock(); return (jabber_conn_status_t)mock();
} }
char* jabber_get_presence_message(void) char* connection_get_presence_msg(void)
{ {
return (char*)mock(); return (char*)mock();
} }
char* jabber_get_account_name(void) char* session_get_account_name(void)
{ {
return (char*)mock(); return (char*)mock();
} }
GList * jabber_get_available_resources(void) GList * session_get_available_resources(void)
{ {
return NULL; return NULL;
} }
gboolean gboolean
jabber_send_stanza(const char *const stanza) connection_send_stanza(const char *const stanza)
{ {
return TRUE; return TRUE;
} }
gboolean gboolean
jabber_service_supports(const char *const feature) connection_supports(const char *const feature)
{ {
return FALSE; return FALSE;
} }