X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_presence.c;h=4f71c7eea9ed4dfcaffcc9d4ac6b7b6fd82aba06;hb=cfa09472a585c534fd05c8a35811cff9ef18965f;hp=9191f8f65561b413cc28c4b7e2938e360be6f105;hpb=bb47b9c23a29dee2a8d801655a237ec50078b348;p=citadel.git diff --git a/citadel/modules/xmpp/xmpp_presence.c b/citadel/modules/xmpp/xmpp_presence.c index 9191f8f65..4f71c7eea 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 @@ -53,24 +53,22 @@ #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) { - XPrint(HKEY("presence"), - XPROPERTY("from", presence_jid, strlen(presence_jid)), - XPROPERTY("to", XMPP->client_jid, strlen(XMPP->client_jid)), - TYPE_ARGEND); -} + 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)); +} /* @@ -95,10 +93,8 @@ 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 *data, const char *supplied_el, const char **attr) +void xmpp_wholist_presence_dump(void) { struct CitContext *cptr = NULL; int nContexts, i; @@ -123,20 +119,18 @@ void xmpp_wholist_presence_dump(void *data, const char *supplied_el, const char */ void xmpp_destroy_buddy(char *presence_jid, int aggressively) { static int unsolicited_id = 1; - struct CitContext *CCC = CC; - char Buf[64]; - long blen; + char xmlbuf1[256]; + char xmlbuf2[256]; if (!presence_jid) return; if (!XMPP) return; if (!XMPP->client_jid) return; /* Transmit non-presence information */ - 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); + cprintf("", + xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1), + xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2) + ); /* * Setting the "aggressively" flag also sends an "unsubscribed" presence update. @@ -145,40 +139,26 @@ void xmpp_destroy_buddy(char *presence_jid, int aggressively) { * 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); + 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 - - blen = snprintf(Buf, sizeof(Buf), "unbuddy_%x", ++unsolicited_id); + // note: we should implement xmpp_indicate_nonpresence so we can use it elsewhere /* Do an unsolicited roster update that deletes the contact. */ - 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("" - "" - "" + 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, CtdlGetConfigStr("c_humannode"), sizeof xmlbuf1)); + cprintf(""); + cprintf("" + "" ); } @@ -189,7 +169,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); @@ -212,40 +192,25 @@ 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) ) { - long blen; - char Buf[64]; - 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); - - 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); - + cprintf("", ++unsolicited_id); + cprintf(""); xmpp_roster_item(&cptr[which_cptr_is_relevant]); - XPUT(""); + cprintf(""); /* Transmit presence information */ xmpp_indicate_presence(presence_jid); } 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 */ } @@ -253,14 +218,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; } @@ -293,7 +257,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 @@ -301,7 +264,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); } @@ -316,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 @@ -341,14 +303,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); @@ -358,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. @@ -392,7 +345,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 @@ -439,12 +391,3 @@ void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void) DeleteHash(&mortuary); free(cptr); } - - -CTDL_MODULE_INIT(xmpp_presence) -{ - if (!threading) { - AddXMPPEndHandler(HKEY("presence"), xmpp_wholist_presence_dump, 0); - } - return "xmpp_presence"; -}