/*
- * $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)
{
- char xmlbuf[256];
-
- cprintf("<presence from=\"%s\" ", xmlesc(xmlbuf, presence_jid, sizeof xmlbuf));
- cprintf("to=\"%s\"></presence>", xmlesc(xmlbuf, XMPP->client_jid, sizeof xmlbuf));
+ XPUT("<presence from=\"");
+ XPutProp(presence_jid, strlen(presence_jid));
+ XPUT("\" to=\"");
+ XPutProp(XMPP->client_jid, strlen(XMPP->client_jid));
+ XPUT("\"></presence>");
}
/*
* Initial dump of the entire wholist
+ * Respond to a <presence> update by firing back with presence information
+ * on the entire wholist. Check this assumption, it's probably wrong.
*/
-void xmpp_wholist_presence_dump(void)
+void xmpp_wholist_presence_dump(void *data, const char *supplied_el, const char **attr)
{
struct CitContext *cptr = NULL;
int nContexts, i;
* 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];
+ struct CitContext *CCC = CC;
if (!presence_jid) return;
if (!XMPP) return;
if (!XMPP->client_jid) return;
/* Transmit non-presence information */
- cprintf("<presence type=\"unavailable\" from=\"%s\" to=\"%s\"></presence>",
- xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1),
- xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2)
- );
- cprintf("<presence type=\"unsubscribed\" from=\"%s\" to=\"%s\"></presence>",
- xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1),
- xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2)
- );
+ XPUT("<presence type=\"unavailable\" from=\"");
+ XPutProp(presence_jid, strlen(presence_jid));
+ XPUT("\" to=\"");
+ XPutProp(XMPP->client_jid, strlen(XMPP->client_jid));
+ XPUT("\"></presence>");
+
+ /*
+ * 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) {
+ XPUT("<presence type=\"unsubscribed\" from=\"");
+ XPutProp(presence_jid, strlen(presence_jid));
+ XPUT("\" to=\"");
+ XPutProp(XMPP->client_jid, strlen(XMPP->client_jid));
+ XPUT("\"></presence>");
+ }
+
// 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\">",
- 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\">", xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1));
- cprintf("<group>%s</group>", xmlesc(xmlbuf1, config.c_humannode, sizeof xmlbuf1));
- cprintf("</item>");
- cprintf("</query>"
- "</iq>"
+ XPUT("<iq type=\"result\" from=\"");
+ XPutProp(CCC->cs_inet_email, strlen(CCC->cs_inet_email));
+ XPUT("\" to=\"");
+ XPutProp(XMPP->client_jid, strlen(XMPP->client_jid));
+ XPUT("\" id=\"unbuddy_");
+ XPrintf("%x", ++unsolicited_id);
+ XPUT("\">");
+
+ XPUT("<query xmlns=\"jabber:iq:roster\">"
+ "<item subscription=\"remove\" jid=\"");
+ XPutProp(presence_jid, strlen(presence_jid));
+ XPUT("\">"
+ "<group>");
+ XPutBody(CFG_KEY(c_humannode));
+ XPUT("</group>"
+ "</item>"
+ "</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);
- cprintf("<iq id=\"unsolicited_%x\" type=\"result\">", ++unsolicited_id);
- cprintf("<query xmlns=\"jabber:iq:roster\">");
+ XPUT("<iq type=\"result\" id=\"unsolicited_");
+ XPrintf("%x", ++unsolicited_id);
+ XPUT("\" >"
+ "<query xmlns=\"jabber:iq:roster\">");
xmpp_roster_item(&cptr[which_cptr_is_relevant]);
- cprintf("</query></iq>");
+ XPUT("</query></iq>");
/* Transmit presence information */
xmpp_indicate_presence(presence_jid);
}
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);
/* now add anyone we find into the hashlist */
/* skip past the headers */
- ptr = strstr(msg->cm_fields['M'], "\n\n");
+ ptr = strstr(msg->cm_fields[eMesageText], "\n\n");
if (ptr != NULL) {
ptr += 2;
}
else {
- ptr = strstr(msg->cm_fields['M'], "\n\r\n");
+ ptr = strstr(msg->cm_fields[eMesageText], "\n\r\n");
if (ptr != NULL) {
ptr += 3;
}
}
}
- CtdlFreeMessage(msg);
+ CM_Free(msg);
}
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);
}
}
if (!online_now) {
- xmpp_destroy_buddy((char *)Value);
+ xmpp_destroy_buddy((char *)Value, 1); /* aggressive presence update */
}
}
free(cptr);
}
+
+CTDL_MODULE_INIT(xmpp_presence)
+{
+ if (!threading) {
+ AddXMPPEndHandler(HKEY("presence"), xmpp_wholist_presence_dump, 0);
+ }
+ return "xmpp_presence";
+}
projects / citadel.git / blobdiff