X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_presence.c;h=fef997639e563503123e7856dbb8a227c58b7557;hb=3144440e07822224c1967203c77ca3ef0f419e43;hp=ca8a95949d8d95b10dc7e8d679787ab072a600ac;hpb=5e3befebe2ed0ce85324da3be83b21880dc7d069;p=citadel.git
diff --git a/citadel/modules/xmpp/xmpp_presence.c b/citadel/modules/xmpp/xmpp_presence.c
index ca8a95949..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.
@@ -147,7 +146,7 @@ void xmpp_destroy_buddy(char *presence_jid, int aggressively) {
);
}
- // 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("",
@@ -157,7 +156,7 @@ void xmpp_destroy_buddy(char *presence_jid, int aggressively) {
);
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(""
""
@@ -171,7 +170,7 @@ void xmpp_destroy_buddy(char *presence_jid, int aggressively) {
*/
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);
@@ -194,13 +193,11 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
}
}
- 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);
@@ -214,8 +211,7 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
}
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 */
}
@@ -223,14 +219,13 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
}
-
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;
}
@@ -263,7 +258,6 @@ void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) {
}
-
/*
* 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
@@ -271,7 +265,7 @@ void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) {
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);
}
@@ -286,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
@@ -311,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);
@@ -328,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.
@@ -362,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
@@ -409,4 +392,3 @@ void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void)
DeleteHash(&mortuary);
free(cptr);
}
-