*
* XMPP event queue
*
- * Copyright (c) 2007 by Art Cancro
- * This code is released under the terms of the GNU General Public License.
+ * Copyright (c) 2007-2009 by Art Cancro
+ *
+ * This program is free 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#include <string.h>
#include <limits.h>
#include <ctype.h>
+#include <expat.h>
#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
#include "internet_addressing.h"
#include "md5.h"
#include "ctdl_module.h"
-
-#ifdef HAVE_EXPAT
-#include <expat.h>
#include "serv_xmpp.h"
-
+int queue_event_seq = 0;
void xmpp_queue_event(int event_type, char *email_addr) {
- static int seq = 0;
struct xmpp_event *xptr = NULL;
struct xmpp_event *new_event = NULL;
struct xmpp_event *last = NULL;
int purged_something = 0;
struct CitContext *cptr;
- lprintf(CTDL_DEBUG, "xmpp_queue_event(%d, %s)\n", event_type, email_addr);
+ CtdlLogPrintf(CTDL_DEBUG, "xmpp_queue_event(%d, %s)\n", event_type, email_addr);
/* Purge events more than a minute old */
begin_critical_section(S_XMPP_QUEUE);
new_event = (struct xmpp_event *) malloc(sizeof(struct xmpp_event));
new_event->next = NULL;
new_event->event_time = time(NULL);
- new_event->event_seq = ++seq;
+ new_event->event_seq = ++queue_event_seq;
new_event->event_type = event_type;
+ new_event->session_which_generated_this_event = CC->cs_pid;
safestrncpy(new_event->event_jid, email_addr, sizeof new_event->event_jid);
/* Add it to the list */
end_critical_section(S_XMPP_QUEUE);
/* Tell the sessions that something is happening */
+ begin_critical_section(S_SESSION_TABLE);
for (cptr = ContextList; cptr != NULL; cptr = cptr->next) {
- if (cptr->h_async_function == xmpp_async_loop) {
+ if ((cptr->logged_in) && (cptr->h_async_function == xmpp_async_loop)) {
cptr->async_waiting = 1;
}
}
+ end_critical_section(S_SESSION_TABLE);
}
for (xptr=xmpp_queue; xptr!=NULL; xptr=xptr->next) {
if (xptr->event_seq > XMPP->last_event_processed) {
- /* FIXME do something */
+ switch(xptr->event_type) {
+
+ case XMPP_EVT_LOGIN:
+ case XMPP_EVT_LOGOUT:
+ if (xptr->session_which_generated_this_event != CC->cs_pid) {
+ xmpp_presence_notify(xptr->event_jid, xptr->event_type);
+ }
+ break;
+ }
if (xptr->event_seq > highest_event) {
highest_event = xptr->event_seq;
XMPP->last_event_processed = highest_event;
}
-
-
-#endif /* HAVE_EXPAT */