X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_presence.c;h=b4b09b1cffc57b8ecbbc82e4f407a47425bcbc20;hb=4b0153bbdd15ddc4bc7b6193ff7ecb531b330a3c;hp=e53b26cc0bb5cc1b3fd42667eb90624cc662f1c4;hpb=885291b9d18f551e88d3b6c7349f99c92985c152;p=citadel.git diff --git a/citadel/modules/xmpp/xmpp_presence.c b/citadel/modules/xmpp/xmpp_presence.c index e53b26cc0..b4b09b1cf 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 * - * 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 @@ -66,23 +65,24 @@ */ void xmpp_indicate_presence(char *presence_jid) { - cprintf("", - presence_jid, - XMPP->client_jid - ); + XPrint(HKEY("presence"), XCLOSED, + XPROPERTY("from", presence_jid, strlen(presence_jid)), + XPROPERTY("to", XMPP->client_jid, strlen(XMPP->client_jid)), + TYPE_ARGEND); } /* - * 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); @@ -95,8 +95,10 @@ int xmpp_is_visible(struct CitContext *cptr) { /* * Initial dump of the entire wholist + * Respond to a update by firing back with presence information + * on the entire wholist. Check this assumption, it's probably wrong. */ -void xmpp_wholist_presence_dump(void) +void xmpp_wholist_presence_dump(void *data, const char *supplied_el, const char **attr) { struct CitContext *cptr = NULL; int nContexts, i; @@ -107,7 +109,7 @@ void xmpp_wholist_presence_dump(void) } for (i=0; iclient_jid) return; - CtdlLogPrintf(CTDL_DEBUG, "\033[31mdestroy_buddy(%s)\033[0m\n", presence_jid); /* Transmit non-presence information */ - cprintf("", - presence_jid, XMPP->client_jid - ); - cprintf("", - presence_jid, XMPP->client_jid - ); + 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); + + /* + * 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) { + 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); + } + // FIXME ... we should implement xmpp_indicate_nonpresence so we can use it elsewhere + blen = snprintf(Buf, sizeof(Buf), "unbuddy_%x", ++unsolicited_id); + /* Do an unsolicited roster update that deletes the contact. */ - cprintf("", - CC->cs_inet_email, - XMPP->client_jid, - ++unsolicited_id - ); - cprintf(""); - cprintf("", presence_jid); - cprintf("%s", config.c_humannode); - cprintf(""); - cprintf("" - "" + 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("" + "" + "" ); } /* * 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; int visible_sessions = 0; int nContexts, i; + int which_cptr_is_relevant = (-1); if (IsEmptyStr(presence_jid)) return; if (CC->kill_me) return; @@ -168,44 +201,54 @@ 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); + XMPP_syslog(LOG_DEBUG, "%d sessions for <%s> are now visible to session %d\n", + visible_sessions, presence_jid, CC->cs_pid); if ( (event_type == XMPP_EVT_LOGIN) && (visible_sessions == 1) ) { + long blen; + char Buf[64]; - CtdlLogPrintf(CTDL_DEBUG, "Telling session %d that <%s> logged in\n", CC->cs_pid, presence_jid); + XMPP_syslog(LOG_DEBUG, "Telling session %d that <%s> logged in\n", + 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); + + 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); + + xmpp_roster_item(&cptr[which_cptr_is_relevant]); + XPUT(""); /* 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); + XMPP_syslog(LOG_DEBUG, "Telling session %d that <%s> logged out\n", + CC->cs_pid, presence_jid); + xmpp_destroy_buddy(presence_jid, 0); /* non aggressive presence update */ } + free(cptr); } @@ -225,12 +268,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; } @@ -246,7 +289,7 @@ void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) { } } - CtdlFreeMessage(msg); + CM_Free(msg); } @@ -258,7 +301,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"); + XMPPM_syslog(LOG_ALERT, "NewHash() failed!\n"); return(NULL); } @@ -298,6 +341,14 @@ 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); @@ -324,7 +375,7 @@ void xmpp_massacre_roster(void) cptr = CtdlGetContextArray(&nContexts); if (cptr) { for (i=0; i