X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_presence.c;h=053994a3490b956172648cf5933055ec1b437c6b;hb=ebc64e2caae8740dd047e5317de2172eb3f44fc3;hp=2ef90858c0e25fd0c9c5a169959bfdef0624515e;hpb=f1ee61891901850ebbdee1e9440b363dc6df540a;p=citadel.git diff --git a/citadel/modules/xmpp/xmpp_presence.c b/citadel/modules/xmpp/xmpp_presence.c index 2ef90858c..053994a34 100644 --- a/citadel/modules/xmpp/xmpp_presence.c +++ b/citadel/modules/xmpp/xmpp_presence.c @@ -1,9 +1,9 @@ /* * Handle XMPP presence exchanges * - * Copyright (c) 2007-2010 by Art Cancro + * Copyright (c) 2007-2014 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. @@ -58,21 +58,21 @@ #include "serv_xmpp.h" - /* * Indicate the presence of another user to the client * (used in several places) */ void xmpp_indicate_presence(char *presence_jid) { - char xmlbuf[256]; - - cprintf("", xmlesc(xmlbuf, XMPP->client_jid, sizeof xmlbuf)); + 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 any given session is 'visible' to any other given session, * and is capable of receiving instant messages from that session. @@ -95,8 +95,10 @@ int xmpp_is_visible(struct CitContext *cptr, struct CitContext *to_whom) { /* * 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; @@ -119,38 +121,64 @@ 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]; + struct CitContext *CCC = CC; + char Buf[64]; + long blen; if (!presence_jid) return; if (!XMPP) return; if (!XMPP->client_jid) return; /* Transmit non-presence information */ - cprintf("", - 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) - ); + 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("", - xmlesc(xmlbuf1, CC->cs_inet_email, sizeof xmlbuf1), - xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2), - ++unsolicited_id - ); - cprintf(""); - cprintf("", xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1)); - cprintf("%s", xmlesc(xmlbuf1, config.c_humannode, sizeof xmlbuf1)); - 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("" + "" + "" ); } @@ -184,29 +212,41 @@ 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); + 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]; - syslog(LOG_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. */ assert(which_cptr_is_relevant >= 0); - cprintf("", ++unsolicited_id); - cprintf(""); + + 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]); - cprintf(""); + XPUT(""); /* Transmit presence information */ xmpp_indicate_presence(presence_jid); } 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); + 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); @@ -228,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; } @@ -249,7 +289,7 @@ void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) { } } - CtdlFreeMessage(msg); + CM_Free(msg); } @@ -261,7 +301,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"); + XMPPM_syslog(LOG_ALERT, "NewHash() failed!\n"); return(NULL); } @@ -391,7 +431,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 */ } } @@ -400,3 +440,11 @@ void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void) free(cptr); } + +CTDL_MODULE_INIT(xmpp_presence) +{ + if (!threading) { + AddXMPPEndHandler(HKEY("presence"), xmpp_wholist_presence_dump, 0); + } + return "xmpp_presence"; +}