/*
* Handle XMPP presence exchanges
*
- * Copyright (c) 2007-2014 by Art Cancro
+ * Copyright (c) 2007-2017 by Art Cancro and citadel.org
*
* 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
#include "support.h"
#include "config.h"
#include "internet_addressing.h"
-#include "md5.h"
#include "ctdl_module.h"
#include "serv_xmpp.h"
*/
void xmpp_indicate_presence(char *presence_jid)
{
- XPrint(HKEY("presence"),
- XCLOSED,
- XPROPERTY("from", presence_jid, strlen(presence_jid)),
- XPROPERTY("to", XMPP->client_jid, strlen(XMPP->client_jid)),
- TYPE_ARGEND
- );
+ char xmlbuf[256];
+
+ syslog(LOG_DEBUG, "xmpp: indicating presence of <%s> to <%s>", presence_jid, XMPP->client_jid);
+ cprintf("<presence from=\"%s\" ", xmlesc(xmlbuf, presence_jid, sizeof xmlbuf));
+ cprintf("to=\"%s\"></presence>", xmlesc(xmlbuf, XMPP->client_jid, sizeof xmlbuf));
}
/*
* 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 *data, const char *supplied_el, const char **attr)
+void xmpp_wholist_presence_dump(void)
{
struct CitContext *cptr = NULL;
int nContexts, i;
for (i=0; i<nContexts; i++) {
if (xmpp_is_visible(&cptr[i], CC)) {
- xmpp_indicate_presence(cptr[i].cs_inet_email);
+ xmpp_indicate_presence(cptr[i].cs_principal_id);
}
}
free(cptr);
*/
void xmpp_destroy_buddy(char *presence_jid, int aggressively) {
static int unsolicited_id = 1;
- struct CitContext *CCC = CC;
- char Buf[64];
- long blen;
+ char xmlbuf1[256];
+ char xmlbuf2[256];
if (!presence_jid) return;
if (!XMPP) return;
if (!XMPP->client_jid) return;
/* Transmit non-presence information */
- XPrint(HKEY("presence"), XCLOSED,
- XCPROPERTY("type", "unavailable"),
- XPROPERTY("from", presence_jid, strlen(presence_jid)),
- XPROPERTY("to", XMPP->client_jid, strlen(XMPP->client_jid)),
- TYPE_ARGEND);
+ cprintf("<presence type=\"unavailable\" from=\"%s\" to=\"%s\"></presence>",
+ xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1),
+ xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2)
+ );
/*
* Setting the "aggressively" flag also sends an "unsubscribed" presence update.
* it as a rejection of a subscription request.
*/
if (aggressively) {
- XPrint(HKEY("presence"), XCLOSED,
- XCPROPERTY("type", "unsubscribed"),
- XPROPERTY("from", presence_jid, strlen(presence_jid)),
- XPROPERTY("to", XMPP->client_jid, strlen(XMPP->client_jid)),
- TYPE_ARGEND);
+ 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
-
- blen = snprintf(Buf, sizeof(Buf), "unbuddy_%x", ++unsolicited_id);
+ // note: we should implement xmpp_indicate_nonpresence so we can use it elsewhere
/* Do an unsolicited roster update that deletes the contact. */
- XPrint(HKEY("iq"), 0,
- XCPROPERTY("type", "result"),
- XPROPERTY("from", CCC->cs_inet_email, strlen(CCC->cs_inet_email)),
- XPROPERTY("to", XMPP->client_jid, strlen(XMPP->client_jid)),
- XPROPERTY("id", Buf, blen),
- TYPE_ARGEND);
-
- XPrint(HKEY("query"), 0,
- XCPROPERTY("xmlns", "jabber:iq:roster"),
- TYPE_ARGEND);
-
- XPrint(HKEY("item"), 0,
- XCPROPERTY("subscription", "remove"),
- XPROPERTY("jid", presence_jid, strlen(presence_jid)),
- TYPE_ARGEND);
-
- XPrint(HKEY("group"), XCLOSED,
- XCFGBODY(c_humannode),
- TYPE_ARGEND);
- XPUT("</item>"
- "</query>"
- "</iq>"
+ cprintf("<iq from=\"%s\" to=\"%s\" id=\"unbuddy_%x\" type=\"result\">",
+ xmlesc(xmlbuf1, CC->cs_principal_id, 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, CtdlGetConfigStr("c_humannode"), sizeof xmlbuf1));
+ cprintf("</item>");
+ cprintf("</query>"
+ "</iq>"
);
}
*/
void xmpp_presence_notify(char *presence_jid, int event_type) {
struct CitContext *cptr;
- static int unsolicited_id;
+ static int unsolicited_id = 12345;
int visible_sessions = 0;
int nContexts, i;
int which_cptr_is_relevant = (-1);
/* Count the visible sessions for this user */
for (i=0; i<nContexts; i++) {
- if ( (!strcasecmp(cptr[i].cs_inet_email, presence_jid))
+ if ( (!strcasecmp(cptr[i].cs_principal_id, presence_jid))
&& (xmpp_is_visible(&cptr[i], CC))
) {
++visible_sessions;
}
}
- XMPP_syslog(LOG_DEBUG, "%d sessions for <%s> are now visible to session %d\n",
- visible_sessions, presence_jid, CC->cs_pid);
+ syslog(LOG_DEBUG, "xmpp: %d sessions for <%s> are now visible to session %d", visible_sessions, presence_jid, CC->cs_pid);
if ( (event_type == XMPP_EVT_LOGIN) && (visible_sessions == 1) ) {
- long blen;
- char Buf[64];
- XMPP_syslog(LOG_DEBUG, "Telling session %d that <%s> logged in\n",
- CC->cs_pid, presence_jid);
+ syslog(LOG_DEBUG, "xmpp: telling session %d that <%s> logged in", CC->cs_pid, presence_jid);
/* Do an unsolicited roster update that adds a new contact. */
assert(which_cptr_is_relevant >= 0);
-
- blen = snprintf(Buf, sizeof(Buf), "unsolicited_%x", ++unsolicited_id);
-
- XPrint(HKEY("iq"), 0,
- XCPROPERTY("type", "result"),
- XPROPERTY("id", Buf, blen),
- TYPE_ARGEND);
-
- XPrint(HKEY("query"), 0,
- XCPROPERTY("xmlns", "jabber:iq:roster"),
- TYPE_ARGEND);
-
+ cprintf("<iq id=\"unsolicited_%x\" type=\"result\">", ++unsolicited_id);
+ cprintf("<query xmlns=\"jabber:iq:roster\">");
xmpp_roster_item(&cptr[which_cptr_is_relevant]);
- XPUT("</query></iq>");
+ cprintf("</query></iq>");
/* Transmit presence information */
xmpp_indicate_presence(presence_jid);
}
if (visible_sessions == 0) {
- XMPP_syslog(LOG_DEBUG, "Telling session %d that <%s> logged out\n",
- CC->cs_pid, presence_jid);
+ syslog(LOG_DEBUG, "xmpp: telling session %d that <%s> logged out", CC->cs_pid, presence_jid);
xmpp_destroy_buddy(presence_jid, 0); /* non aggressive presence update */
}
}
-
void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) {
HashList *mortuary = (HashList *) userdata;
struct CtdlMessage *msg;
char *ptr = NULL;
char *lasts = NULL;
- msg = CtdlFetchMessage(msgnum, 1);
+ msg = CtdlFetchMessage(msgnum, 1, 1);
if (msg == NULL) {
return;
}
}
-
/*
* Fetch the "mortuary" - a list of dead buddies which we keep around forever
* so we can remove them from any client's roster that still has them listed
HashList *xmpp_fetch_mortuary(void) {
HashList *mortuary = NewHash(1, NULL);
if (!mortuary) {
- XMPPM_syslog(LOG_ALERT, "NewHash() failed!\n");
+ syslog(LOG_ALERT, "xmpp: NewHash() failed!");
return(NULL);
}
}
-
/*
* Fetch the "mortuary" - a list of dead buddies which we keep around forever
* so we can remove them from any client's roster that still has them listed
}
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);
}
-
/*
* Upon logout we make an attempt to delete the whole roster, in order to
* try to keep "ghost" buddies from remaining in the client-side roster.
for (i=0; i<nContexts; i++) {
if (xmpp_is_visible(&cptr[i], CC)) {
if (mortuary) {
- char *buddy = strdup(cptr[i].cs_inet_email);
+ char *buddy = strdup(cptr[i].cs_principal_id);
Put(mortuary, buddy, strlen(buddy), buddy, NULL);
}
}
}
-
/*
* Stupidly, XMPP does not specify a way to tell the client to flush its client-side roster
* and prepare to receive a new one. So instead we remember every buddy we've ever told the
online_now = 0;
if (cptr) for (i=0; i<nContexts; i++) {
if (xmpp_is_visible(&cptr[i], CC)) {
- if (!strcasecmp(cptr[i].cs_inet_email, (char *)Value)) {
+ if (!strcasecmp(cptr[i].cs_principal_id, (char *)Value)) {
online_now = 1;
}
}
DeleteHash(&mortuary);
free(cptr);
}
-
-
-CTDL_MODULE_INIT(xmpp_presence)
-{
- if (!threading) {
- AddXMPPEndHandler(HKEY("presence"), xmpp_wholist_presence_dump, 0);
- }
- return "xmpp_presence";
-}
projects / citadel.git / blobdiff