/*
- * \file extnotify_main.c
- * @author Mathew McBride
+ * extnotify_main.c
+ * Mathew McBride
*
* This module implements an external pager hook for when notifcation
* of a new email is wanted.
+ *
* Based on bits of serv_funambol
* Contact: <matt@mcbridematt.dhs.org> / <matt@comalies>
+ *
+ * Copyright (c) 2008-2009
+ *
+ * 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 "sysdep.h"
#include "support.h"
#include "config.h"
#include "control.h"
-#include "room_ops.h"
#include "user_ops.h"
#include "policy.h"
#include "database.h"
#include "ctdl_module.h"
+
+
+void ExtNotify_PutErrorMessage(NotifyContext *Ctx, StrBuf *ErrMsg)
+{
+ int nNext;
+ if (Ctx->NotifyErrors == NULL)
+ Ctx->NotifyErrors = NewHash(1, Flathash);
+
+ nNext = GetCount(Ctx->NotifyErrors) + 1;
+ Put(Ctx->NotifyErrors,
+ (char*)&nNext,
+ sizeof(int),
+ ErrMsg,
+ HFreeStrBuf);
+}
+
+
+
+
StrBuf* GetNHBuf(int i, int allocit, StrBuf **NotifyHostList)
{
if ((NotifyHostList[i] == NULL) && (allocit != 0))
void create_extnotify_queue(void) {
struct ctdlroom qrbuf;
- create_room(FNBL_QUEUE_ROOM, 3, "", 0, 1, 0, VIEW_MAILBOX);
+ CtdlCreateRoom(FNBL_QUEUE_ROOM, 3, "", 0, 1, 0, VIEW_MAILBOX);
/*
* Make sure it's set to be a "system room" so it doesn't show up
* in the <K>nown rooms list for Aides.
*/
- if (lgetroom(&qrbuf, FNBL_QUEUE_ROOM) == 0) {
+ if (CtdlGetRoomLock(&qrbuf, FNBL_QUEUE_ROOM) == 0) {
qrbuf.QRflags2 |= QR2_SYSTEM;
- lputroom(&qrbuf);
+ CtdlPutRoomLock(&qrbuf);
}
}
/*!
* \brief Run through the pager room queue
*/
-void do_extnotify_queue(void) {
+void do_extnotify_queue(void)
+{
+ NotifyContext Ctx;
static int doing_queue = 0;
- StrBuf **NotifyHosts;
int i = 0;
/*
*/
CtdlLogPrintf(CTDL_DEBUG, "serv_extnotify: processing notify queue\n");
- NotifyHosts = GetNotifyHosts();
- if (getroom(&CC->room, FNBL_QUEUE_ROOM) != 0) {
+ memset(&Ctx, 0, sizeof(NotifyContext));
+ Ctx.NotifyHostList = GetNotifyHosts();
+ if (CtdlGetRoom(&CC->room, FNBL_QUEUE_ROOM) != 0) {
CtdlLogPrintf(CTDL_ERR, "Cannot find room <%s>\n", FNBL_QUEUE_ROOM);
return;
}
CtdlForEachMessage(MSGS_ALL, 0L, NULL,
- SPOOLMIME, NULL, process_notify, NotifyHosts);
+ SPOOLMIME, NULL, process_notify, &Ctx);
+
+ while ((Ctx.NotifyHostList != NULL) && (Ctx.NotifyHostList[i] != NULL))
+ FreeStrBuf(&Ctx.NotifyHostList[i]);
- while ((NotifyHosts != NULL) && (NotifyHosts[i] != NULL))
- FreeStrBuf(&NotifyHosts[i]);
+ if (Ctx.NotifyErrors != NULL)
+ {
+ long len;
+ const char *Key;
+ HashPos *It;
+ void *vErr;
+ StrBuf *ErrMsg;
- CtdlLogPrintf(CTDL_DEBUG, "serv_extnotify: queue run completed\n");
- doing_queue = 0;
+ It = GetNewHashPos(Ctx.NotifyErrors, 0);
+ while (GetNextHashPos(Ctx.NotifyErrors, It, &len, &Key, &vErr) &&
+ (vErr != NULL)) {
+ ErrMsg = (StrBuf*) vErr;
+ quickie_message("Citadel", NULL, NULL, AIDEROOM, ChrPtr(ErrMsg), FMT_FIXED,
+ "Failed to notify external service about inbound mail");
+ }
+
+ DeleteHashPos(&It);
+ DeleteHash(&Ctx.NotifyErrors);
+ }
+
+ CtdlLogPrintf(CTDL_DEBUG, "serv_extnotify: queue run completed\n");
+ doing_queue = 0;
}
/*!
* \brief Process messages in the external notification queue
*/
-void process_notify(long msgnum, void *usrdata)
+void process_notify(long NotifyMsgnum, void *usrdata)
{
+ NotifyContext *Ctx;
+ long msgnum = 0;
long todelete[1];
int fnblAllowed;
int extPagerAllowedHttp;
char *pch;
long configMsgNum;
char configMsg[SIZ];
- StrBuf **NotifyHostList;
struct CtdlMessage *msg;
+ Ctx = (NotifyContext*) usrdata;
- NotifyHostList = (StrBuf**) usrdata;
- msg = CtdlFetchMessage(msgnum, 1);
+ msg = CtdlFetchMessage(NotifyMsgnum, 1);
if ( msg->cm_fields['W'] == NULL) {
goto nuke;
}
fnblAllowed = strncasecmp(configMsg, HKEY(FUNAMBOL_CONFIG_TEXT));
extPagerAllowedHttp = strncasecmp(configMsg, HKEY(PAGER_CONFIG_HTTP));
extPagerAllowedSystem = strncasecmp(configMsg, HKEY(PAGER_CONFIG_SYSTEM));
-
+ pch = strstr(msg->cm_fields['M'], "msgid|");
+ if (pch != NULL)
+ msgnum = atol(pch + sizeof("msgid"));
if (fnblAllowed == 0) {
char remoteurl[SIZ];
snprintf(remoteurl, SIZ, "http://%s@%s:%d/%s",
strlen(file_funambol_msg),/*GNA*/
msg->cm_fields['W'],
msg->cm_fields['I'],
- msgnum);
+ msgnum,
+ Ctx);
} else if (extPagerAllowedHttp == 0) {
int i = 0;
StrBuf *URL;
while(1)
{
- URL = GetNHBuf(i*2, 0, NotifyHostList);
+ URL = GetNHBuf(i*2, 0, Ctx->NotifyHostList);
if (URL==NULL) break;
- File = GetNHBuf(i*2 + 1, 0, NotifyHostList);
+ File = GetNHBuf(i*2 + 1, 0, Ctx->NotifyHostList);
if (File==NULL) break;
if (StrLength(File)>0)
StrLength(FileBuf),
msg->cm_fields['W'],
msg->cm_fields['I'],
- msgnum);
+ msgnum,
+ Ctx);
i++;
}
FreeStrBuf(&FileBuf);
nuke:
CtdlFreeMessage(msg);
memset(configMsg, 0, sizeof(configMsg));
- todelete[0] = msgnum;
+ todelete[0] = NotifyMsgnum;
CtdlDeleteMessages(FNBL_QUEUE_ROOM, todelete, 1, "");
}
int a;
// Get the user
- getuser(&user, username);
+ CtdlGetUser(&user, username);
MailboxName(configRoomName, sizeof configRoomName, &user, USERCONFIGROOM);
// Fill qrbuf
- getroom(&qrbuf, configRoomName);
+ CtdlGetRoom(&qrbuf, configRoomName);
/* Do something really, really stoopid here. Raid the room on ourselves,
* loop through the messages manually and find it. I don't want
* to use a CtdlForEachMessage callback here, as we would be
projects / citadel.git / blobdiff