/*
* Handle XMPP presence exchanges
*
- * Copyright (c) 2007-2017 by Art Cancro and citadel.org
+ * Copyright (c) 2007-2021 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
#include <errno.h>
#include <sys/types.h>
#include <assert.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-
+#include <time.h>
#include <sys/wait.h>
#include <string.h>
#include <limits.h>
* Indicate the presence of another user to the client
* (used in several places)
*/
-void xmpp_indicate_presence(char *presence_jid)
-{
+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);
/*
* Initial dump of the entire wholist
*/
-void xmpp_wholist_presence_dump(void)
-{
+void xmpp_wholist_presence_dump(void) {
struct CitContext *cptr = NULL;
int nContexts, i;
for (i=0; i<nContexts; i++) {
if (xmpp_is_visible(&cptr[i], CC)) {
- xmpp_indicate_presence(cptr[i].cs_inet_email);
+ xmpp_indicate_presence(cptr[i].cs_principal_id);
}
}
free(cptr);
/* Do an unsolicited roster update that deletes the contact. */
cprintf("<iq from=\"%s\" to=\"%s\" id=\"unbuddy_%x\" type=\"result\">",
- xmlesc(xmlbuf1, CC->cs_inet_email, sizeof xmlbuf1),
+ xmlesc(xmlbuf1, CC->cs_principal_id, sizeof xmlbuf1),
xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2),
++unsolicited_id
);
/* Count the visible sessions for this user */
for (i=0; i<nContexts; i++) {
- if ( (!strcasecmp(cptr[i].cs_inet_email, presence_jid))
+ if ( (!strcasecmp(cptr[i].cs_principal_id, presence_jid))
&& (xmpp_is_visible(&cptr[i], CC))
) {
++visible_sessions;
char *ptr = NULL;
char *lasts = NULL;
- msg = CtdlFetchMessage(msgnum, 1, 1);
+ msg = CtdlFetchMessage(msgnum, 1);
if (msg == NULL) {
return;
}
);
HashPos = GetNewHashPos(mortuary, 0);
- while (GetNextHashPos(mortuary, HashPos, &len, &Key, &Value) != 0)
- {
+ while (GetNextHashPos(mortuary, HashPos, &len, &Key, &Value) != 0) {
StrBufAppendPrintf(themsg, "%s\n", (char *)Value);
}
DeleteHashPos(&HashPos);
CtdlDeleteMessages(USERCONFIGROOM, NULL, 0, XMPPMORTUARY);
/* And save the new one to disk */
- quickie_message("Citadel", NULL, NULL, USERCONFIGROOM, ChrPtr(themsg), 4, "XMPP Mortuary");
+ quickie_message(CC->user.fullname, NULL, NULL, USERCONFIGROOM, ChrPtr(themsg), 4, "XMPP Mortuary");
FreeStrBuf(&themsg);
}
* Since the client is probably not still alive, also remember the current
* roster for next time so we can delete dead buddies then.
*/
-void xmpp_massacre_roster(void)
-{
+void xmpp_massacre_roster(void) {
struct CitContext *cptr;
int nContexts, i;
HashList *mortuary = xmpp_fetch_mortuary();
for (i=0; i<nContexts; i++) {
if (xmpp_is_visible(&cptr[i], CC)) {
if (mortuary) {
- char *buddy = strdup(cptr[i].cs_inet_email);
+ char *buddy = strdup(cptr[i].cs_principal_id);
Put(mortuary, buddy, strlen(buddy), buddy, NULL);
}
}
* when they're connecting from the same client and when they're connecting from a different client,
* so we have no guarantee of what is in the client side roster at connect time.
*/
-void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void)
-{
+void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void) {
long len;
void *Value;
const char *Key;
online_now = 0;
if (cptr) for (i=0; i<nContexts; i++) {
if (xmpp_is_visible(&cptr[i], CC)) {
- if (!strcasecmp(cptr[i].cs_inet_email, (char *)Value)) {
+ if (!strcasecmp(cptr[i].cs_principal_id, (char *)Value)) {
online_now = 1;
}
}