X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_presence.c;h=fef997639e563503123e7856dbb8a227c58b7557;hb=3144440e07822224c1967203c77ca3ef0f419e43;hp=4175771c48bd5bae1b1eaa3ad52c93228e1475d2;hpb=3061bf4d898bdfb0e0dfe294676b2ac6274d0cb4;p=citadel.git
diff --git a/citadel/modules/xmpp/xmpp_presence.c b/citadel/modules/xmpp/xmpp_presence.c
index 4175771c4..fef997639 100644
--- a/citadel/modules/xmpp/xmpp_presence.c
+++ b/citadel/modules/xmpp/xmpp_presence.c
@@ -1,7 +1,7 @@
/*
* Handle XMPP presence exchanges
*
- * Copyright (c) 2007-2010 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
@@ -58,7 +58,6 @@
#include "serv_xmpp.h"
-
/*
* Indicate the presence of another user to the client
* (used in several places)
@@ -67,12 +66,12 @@ 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("", 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.
@@ -119,7 +118,7 @@ void xmpp_wholist_presence_dump(void)
* 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];
@@ -133,11 +132,21 @@ void xmpp_destroy_buddy(char *presence_jid) {
xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1),
xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2)
);
- cprintf("",
- 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
+
+ /*
+ * 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("",
+ xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1),
+ xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2)
+ );
+ }
+
+ // note: we should implement xmpp_indicate_nonpresence so we can use it elsewhere
/* Do an unsolicited roster update that deletes the contact. */
cprintf("",
@@ -147,7 +156,7 @@ void xmpp_destroy_buddy(char *presence_jid) {
);
cprintf("");
cprintf("- ", xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1));
- cprintf("%s", xmlesc(xmlbuf1, config.c_humannode, sizeof xmlbuf1));
+ cprintf("%s", xmlesc(xmlbuf1, CtdlGetConfigStr("c_humannode"), sizeof xmlbuf1));
cprintf("
");
cprintf(""
""
@@ -161,7 +170,7 @@ void xmpp_destroy_buddy(char *presence_jid) {
*/
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);
@@ -184,13 +193,11 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
}
}
- 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) ) {
- 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);
@@ -204,23 +211,21 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
}
if (visible_sessions == 0) {
- syslog(LOG_DEBUG, "Telling session %d that <%s> logged out\n",
- CC->cs_pid, presence_jid);
- xmpp_destroy_buddy(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 */
}
free(cptr);
}
-
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;
}
@@ -228,12 +233,12 @@ void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) {
/* 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;
}
@@ -249,11 +254,10 @@ void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) {
}
}
- 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
@@ -261,7 +265,7 @@ void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) {
HashList *xmpp_fetch_mortuary(void) {
HashList *mortuary = NewHash(1, NULL);
if (!mortuary) {
- syslog(LOG_ALERT, "NewHash() failed!\n");
+ syslog(LOG_ALERT, "xmpp: NewHash() failed!");
return(NULL);
}
@@ -276,7 +280,6 @@ HashList *xmpp_fetch_mortuary(void) {
}
-
/*
* 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
@@ -301,14 +304,6 @@ void xmpp_store_mortuary(HashList *mortuary) {
}
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);
@@ -318,7 +313,6 @@ void xmpp_store_mortuary(HashList *mortuary) {
}
-
/*
* 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.
@@ -352,7 +346,6 @@ void xmpp_massacre_roster(void)
}
-
/*
* 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
@@ -391,7 +384,7 @@ void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void)
}
if (!online_now) {
- xmpp_destroy_buddy((char *)Value);
+ xmpp_destroy_buddy((char *)Value, 1); /* aggressive presence update */
}
}
@@ -399,4 +392,3 @@ void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void)
DeleteHash(&mortuary);
free(cptr);
}
-