devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-25 18:56:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added asserts

Browse Source
This commit is contained in:
James Booth
2013-02-03 23:46:20 +00:00
parent 3c9155be2c
commit 2cea263917
6 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/xmpp/connection.c
View File

@@ -99,13 +99,17 @@ jabber_init(const int disable_tls)
jabber_conn_status_t
jabber_connect_with_account(ProfAccount *account, const char * const passwd)
{
assert(account != NULL);
assert(passwd != NULL);
log_info("Connecting using account: %s", account->name);
// save account name and password for reconnect
saved_account.name = strdup(account->name);
saved_account.passwd = strdup(passwd);
log_info("Connecting using account: %s", account->name);
char *fulljid = create_fulljid(account->jid, account->resource);
jabber_conn_status_t result = _jabber_connect(fulljid, passwd, account->server);
free(fulljid);
return result;
@@ -151,7 +155,7 @@ jabber_disconnect(void)
}
connection_free_resources();
}
jabber_conn.conn_status = JABBER_STARTED;
jabber_conn.presence_type = PRESENCE_OFFLINE;
FREE_SET_NULL(jabber_conn.presence_message);
@@ -314,6 +318,9 @@ static jabber_conn_status_t
_jabber_connect(const char * const fulljid, const char * const passwd,
const char * const altdomain)
{
assert(fulljid != NULL);
assert(passwd != NULL);
Jid *jid = jid_create(fulljid);
if (jid == NULL) {

4
src/xmpp/presence.c
View File

@@ -161,7 +161,7 @@ presence_join_room(Jid *jid)
xmpp_conn_t *conn = connection_get_conn();
jabber_presence_t presence_type = jabber_get_presence_type();
const char *show = stanza_get_presence_string_from_type(presence_type);
char *status = jabber_get_presence_message();
char *status = jabber_get_presence_message();
int pri = accounts_get_priority_for_presence_type(jabber_get_account_name(),
presence_type);
@@ -302,7 +302,7 @@ _handle_presence_caps(xmpp_stanza_t * const stanza)
log_debug("Hash type supported.");
node = stanza_get_caps_str(stanza);
caps_key = node;
if (node != NULL) {
log_debug("Node string: %s.", node);
if (!caps_contains(caps_key)) {