/*
- * $Id$
- *
* Handle XMPP presence exchanges
*
* Copyright (c) 2007-2010 by Art Cancro
*
- * This program is free software; you can redistribute it and/or modify
+ * This program is open source 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.
*/
void xmpp_indicate_presence(char *presence_jid)
{
- cprintf("<presence from=\"%s\" to=\"%s\"></presence>",
- presence_jid,
- XMPP->client_jid
- );
+ char xmlbuf[256];
+
+ cprintf("<presence from=\"%s\" ", xmlesc(xmlbuf, presence_jid, sizeof xmlbuf));
+ cprintf("to=\"%s\"></presence>", xmlesc(xmlbuf, XMPP->client_jid, sizeof xmlbuf));
}
* Function to remove a buddy subscription and delete from the roster
* (used in several places)
*/
-void xmpp_destroy_buddy(char *presence_jid) {
+void xmpp_destroy_buddy(char *presence_jid, int aggressively) {
static int unsolicited_id = 1;
+ char xmlbuf1[256];
+ char xmlbuf2[256];
if (!presence_jid) return;
if (!XMPP) return;
/* Transmit non-presence information */
cprintf("<presence type=\"unavailable\" from=\"%s\" to=\"%s\"></presence>",
- presence_jid, XMPP->client_jid
- );
- cprintf("<presence type=\"unsubscribed\" from=\"%s\" to=\"%s\"></presence>",
- presence_jid, XMPP->client_jid
+ xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1),
+ xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2)
);
+
+ /*
+ * Setting the "aggressively" flag also sends an "unsubscribed" presence update.
+ * We only ask for this when flushing the client side roster, because if we do it
+ * in the middle of a session when another user logs off, some clients (Jitsi) interpret
+ * it as a rejection of a subscription request.
+ */
+ if (aggressively) {
+ cprintf("<presence type=\"unsubscribed\" from=\"%s\" to=\"%s\"></presence>",
+ xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1),
+ xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2)
+ );
+ }
+
// FIXME ... we should implement xmpp_indicate_nonpresence so we can use it elsewhere
/* Do an unsolicited roster update that deletes the contact. */
cprintf("<iq from=\"%s\" to=\"%s\" id=\"unbuddy_%x\" type=\"result\">",
- CC->cs_inet_email,
- XMPP->client_jid,
+ xmlesc(xmlbuf1, CC->cs_inet_email, sizeof xmlbuf1),
+ xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2),
++unsolicited_id
);
cprintf("<query xmlns=\"jabber:iq:roster\">");
- cprintf("<item jid=\"%s\" subscription=\"remove\">", presence_jid);
- cprintf("<group>%s</group>", config.c_humannode);
+ cprintf("<item jid=\"%s\" subscription=\"remove\">", xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1));
+ cprintf("<group>%s</group>", xmlesc(xmlbuf1, config.c_humannode, sizeof xmlbuf1));
cprintf("</item>");
cprintf("</query>"
"</iq>"
}
}
- CtdlLogPrintf(CTDL_DEBUG, "%d sessions for <%s> are now visible to session %d\n",
- visible_sessions, presence_jid, CC->cs_pid);
+ XMPP_syslog(LOG_DEBUG, "%d sessions for <%s> are now visible to session %d\n",
+ visible_sessions, presence_jid, CC->cs_pid);
if ( (event_type == XMPP_EVT_LOGIN) && (visible_sessions == 1) ) {
- CtdlLogPrintf(CTDL_DEBUG, "Telling session %d that <%s> logged in\n",
- CC->cs_pid, presence_jid);
+ XMPP_syslog(LOG_DEBUG, "Telling session %d that <%s> logged in\n",
+ CC->cs_pid, presence_jid);
/* Do an unsolicited roster update that adds a new contact. */
assert(which_cptr_is_relevant >= 0);
}
if (visible_sessions == 0) {
- CtdlLogPrintf(CTDL_DEBUG, "Telling session %d that <%s> logged out\n",
- CC->cs_pid, presence_jid);
- xmpp_destroy_buddy(presence_jid);
+ XMPP_syslog(LOG_DEBUG, "Telling session %d that <%s> logged out\n",
+ CC->cs_pid, presence_jid);
+ xmpp_destroy_buddy(presence_jid, 0); /* non aggressive presence update */
}
free(cptr);
HashList *xmpp_fetch_mortuary(void) {
HashList *mortuary = NewHash(1, NULL);
if (!mortuary) {
- CtdlLogPrintf(CTDL_ALERT, "NewHash() failed!\n");
+ XMPPM_syslog(LOG_ALERT, "NewHash() failed!\n");
return(NULL);
}
}
DeleteHashPos(&HashPos);
+ /* FIXME temp crap
+ StrBufAppendPrintf(themsg, "foo@bar.com\n");
+ StrBufAppendPrintf(themsg, "baz@quux.com\n");
+ StrBufAppendPrintf(themsg, "haha%c\n", 1);
+ StrBufAppendPrintf(themsg, "baaaz@quux.com\n");
+ StrBufAppendPrintf(themsg, "baaaz@quuuuuux.com\n");
+ */
+
/* Delete the old mortuary */
CtdlDeleteMessages(USERCONFIGROOM, NULL, 0, XMPPMORTUARY);
}
if (!online_now) {
- xmpp_destroy_buddy((char *)Value);
+ xmpp_destroy_buddy((char *)Value, 1); /* aggressive presence update */
}
}