/*
* Handle XMPP presence exchanges
*
- * Copyright (c) 2007-2010 by Art Cancro
+ * Copyright (c) 2007-2021 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 <errno.h>
#include <sys/types.h>
#include <assert.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-
+#include <time.h>
#include <sys/wait.h>
#include <string.h>
#include <limits.h>
#include "support.h"
#include "config.h"
#include "internet_addressing.h"
-#include "md5.h"
#include "ctdl_module.h"
#include "serv_xmpp.h"
-
/*
* Indicate the presence of another user to the client
* (used in several places)
*/
-void xmpp_indicate_presence(char *presence_jid)
-{
+void xmpp_indicate_presence(char *presence_jid) {
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));
}
-
/*
* Convenience function to determine whether any given session is 'visible' to any other given session,
* and is capable of receiving instant messages from that session.
/*
* Initial dump of the entire wholist
*/
-void xmpp_wholist_presence_dump(void)
-{
+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);
);
}
- // FIXME ... we should implement xmpp_indicate_nonpresence so we can use it elsewhere
+ // note: 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(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, config.c_humannode, 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) ) {
- 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);
}
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;
}
}
- CtdlFreeMessage(msg);
+ CM_Free(msg);
}
-
/*
* 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
);
HashPos = GetNewHashPos(mortuary, 0);
- while (GetNextHashPos(mortuary, HashPos, &len, &Key, &Value) != 0)
- {
+ while (GetNextHashPos(mortuary, HashPos, &len, &Key, &Value) != 0) {
StrBufAppendPrintf(themsg, "%s\n", (char *)Value);
}
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);
/* And save the new one to disk */
- quickie_message("Citadel", NULL, NULL, USERCONFIGROOM, ChrPtr(themsg), 4, "XMPP Mortuary");
+ quickie_message(CC->user.fullname, NULL, NULL, USERCONFIGROOM, ChrPtr(themsg), 4, "XMPP Mortuary");
FreeStrBuf(&themsg);
}
-
/*
* 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.
* Since the client is probably not still alive, also remember the current
* roster for next time so we can delete dead buddies then.
*/
-void xmpp_massacre_roster(void)
-{
+void xmpp_massacre_roster(void) {
struct CitContext *cptr;
int nContexts, i;
HashList *mortuary = xmpp_fetch_mortuary();
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
* when they're connecting from the same client and when they're connecting from a different client,
* so we have no guarantee of what is in the client side roster at connect time.
*/
-void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void)
-{
+void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void) {
long len;
void *Value;
const char *Key;
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);
}
-