From dfeb884e9b6114b765adae9104e68d60ef5444ab Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 20 Jan 2013 21:01:30 +0000 Subject: Added check for caps in stanza --- src/jabber.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) (limited to 'src/jabber.c') diff --git a/src/jabber.c b/src/jabber.c index bc314b0d..a9dc5709 100644 --- a/src/jabber.c +++ b/src/jabber.c @@ -1175,13 +1175,17 @@ _room_presence_handler(const char * const jid, xmpp_stanza_t * const stanza) } else { char *type = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_TYPE); char *show_str, *status_str; - char *caps_str = stanza_get_caps_str(stanza); + char *caps_str = NULL; - if (caps_str != NULL) { - if (!caps_contains(caps_str)) { - xmpp_stanza_t *iq = stanza_create_disco_iq(jabber_conn.ctx, jid, caps_str); - xmpp_send(jabber_conn.conn, iq); - xmpp_stanza_release(iq); + if (stanza_contains_caps(stanza)) { + caps_str = stanza_get_caps_str(stanza); + + if (caps_str != NULL) { + if (!caps_contains(caps_str)) { + xmpp_stanza_t *iq = stanza_create_disco_iq(jabber_conn.ctx, jid, caps_str); + xmpp_send(jabber_conn.conn, iq); + xmpp_stanza_release(iq); + } } } @@ -1265,13 +1269,16 @@ _presence_handler(xmpp_conn_t * const conn, g_date_time_unref(now); } - char *caps_str = stanza_get_caps_str(stanza); + char *caps_str = NULL; + if (stanza_contains_caps(stanza)) { + caps_str = stanza_get_caps_str(stanza); - if (caps_str != NULL) { - if (!caps_contains(caps_str)) { - xmpp_stanza_t *iq = stanza_create_disco_iq(jabber_conn.ctx, from, caps_str); - xmpp_send(jabber_conn.conn, iq); - xmpp_stanza_release(iq); + if (caps_str != NULL) { + if (!caps_contains(caps_str)) { + xmpp_stanza_t *iq = stanza_create_disco_iq(jabber_conn.ctx, from, caps_str); + xmpp_send(jabber_conn.conn, iq); + xmpp_stanza_release(iq); + } } } -- cgit 1.4.1-2-gfad0