X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_presence.c;h=8fa6dea7fa6e7cddbf577828ff8db7ed0b47fbbb;hb=1ab27069271df6ed100343866c93c0ef2eb2a888;hp=ebb3576c2312c35104696d3a75dabfec512853ba;hpb=4e472679897e1f11ba8136ec4e31b3b92baf47e9;p=citadel.git diff --git a/citadel/modules/xmpp/xmpp_presence.c b/citadel/modules/xmpp/xmpp_presence.c index ebb3576c2..8fa6dea7f 100644 --- a/citadel/modules/xmpp/xmpp_presence.c +++ b/citadel/modules/xmpp/xmpp_presence.c @@ -1,11 +1,9 @@ /* - * $Id$ - * * Handle XMPP presence exchanges * - * Copyright (c) 2007-2010 by Art Cancro + * Copyright (c) 2007-2017 by Art Cancro and citadel.org * - * 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. @@ -30,6 +28,7 @@ #include #include #include +#include #if TIME_WITH_SYS_TIME # include @@ -54,35 +53,34 @@ #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) { - cprintf("", - presence_jid, - XMPP->client_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 a particular session is visible to this user + * 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. */ -int xmpp_is_visible(struct CitContext *cptr) { - int aide = (CC->user.axlevel >= AxAideU); +int xmpp_is_visible(struct CitContext *cptr, struct CitContext *to_whom) { + int aide = (to_whom->user.axlevel >= AxAideU); if ( (cptr->logged_in) && (((cptr->cs_flags&CS_STEALTH)==0) || (aide)) /* aides see everyone */ - && (cptr->user.usernum != CC->user.usernum) /* don't show myself */ + && (cptr->user.usernum != to_whom->user.usernum) /* don't show myself */ && (cptr->can_receive_im) /* IM-capable session */ ) { return(1); @@ -107,8 +105,8 @@ void xmpp_wholist_presence_dump(void) } for (i=0; i", - presence_jid, XMPP->client_jid - ); - cprintf("", - presence_jid, XMPP->client_jid + 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("", - CC->cs_inet_email, - XMPP->client_jid, + xmlesc(xmlbuf1, CC->cs_principal_id, sizeof xmlbuf1), + xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2), ++unsolicited_id ); cprintf(""); - cprintf("", presence_jid); - cprintf("%s", config.c_humannode); + cprintf("", xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1)); + cprintf("%s", xmlesc(xmlbuf1, CtdlGetConfigStr("c_humannode"), sizeof xmlbuf1)); cprintf(""); cprintf("" "" @@ -153,12 +165,14 @@ void xmpp_destroy_buddy(char *presence_jid) { /* * When a user logs in or out of the local Citadel system, notify all XMPP sessions about it. + * THIS FUNCTION HAS A BUG IN IT THAT ENUMERATES THE SESSIONS WRONG. */ 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); if (IsEmptyStr(presence_jid)) return; if (CC->kill_me) return; @@ -167,56 +181,50 @@ void xmpp_presence_notify(char *presence_jid, int event_type) { if (!cptr) { return; } - + /* Count the visible sessions for this user */ for (i=0; i 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) ) { - CtdlLogPrintf(CTDL_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. */ - for (i=0; i", - ++unsolicited_id); - cprintf(""); - xmpp_roster_item(&cptr[i]); - cprintf("" - ""); - } - } - } + assert(which_cptr_is_relevant >= 0); + cprintf("", ++unsolicited_id); + cprintf(""); + xmpp_roster_item(&cptr[which_cptr_is_relevant]); + cprintf(""); /* 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); + 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; } @@ -224,12 +232,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; } @@ -245,11 +253,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 @@ -257,7 +264,7 @@ void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) { HashList *xmpp_fetch_mortuary(void) { HashList *mortuary = NewHash(1, NULL); if (!mortuary) { - CtdlLogPrintf(CTDL_ALERT, "NewHash() failed!\n"); + syslog(LOG_ALERT, "xmpp: NewHash() failed!"); return(NULL); } @@ -272,7 +279,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 @@ -306,7 +312,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. @@ -323,9 +328,9 @@ void xmpp_massacre_roster(void) cptr = CtdlGetContextArray(&nContexts); if (cptr) { for (i=0; i