#include "internet_addressing.h"
#include "serv_network.h"
#include "clientsocket.h"
-#include "file_ops.h"
#include "citadel_dirs.h"
#include "threads.h"
#include "context.h"
void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc, const char *RoomName);
-void aggregate_recipients(StrBuf **recps, RoomNetCfg Which, OneRoomNetCfg *OneRNCfg)
+void aggregate_recipients(StrBuf **recps, RoomNetCfg Which, OneRoomNetCfg *OneRNCfg, long nSegments)
{
+ int i;
size_t recps_len = 0;
RoomNetCfgLine *nptr;
struct CitContext *CCC = CC;
/* Each recipient */
for (nptr = OneRNCfg->NetConfigs[Which]; nptr != NULL; nptr = nptr->next) {
if (nptr != OneRNCfg->NetConfigs[Which]) {
- StrBufAppendBufPlain(*recps, HKEY(","), 0);
+ for (i = 0; i < nSegments; i++)
+ StrBufAppendBufPlain(*recps, HKEY(","), i);
}
StrBufAppendBuf(*recps, nptr->Value[0], 0);
+ if (Which == ignet_push_share)
+ {
+ StrBufAppendBufPlain(*recps, HKEY(","), 0);
+ StrBufAppendBuf(*recps, nptr->Value[1], 0);
+
+ }
}
}
+static void ListCalculateSubject(struct CtdlMessage *msg)
+{
+ struct CitContext *CCC = CC;
+ StrBuf *Subject, *FlatSubject;
+ int rlen;
+ char *pCh;
+
+ if (CM_IsEmpty(msg, eMsgSubject)) {
+ Subject = NewStrBufPlain(HKEY("(no subject)"));
+ }
+ else {
+ Subject = NewStrBufPlain(CM_KEY(msg, eMsgSubject));
+ }
+ FlatSubject = NewStrBufPlain(NULL, StrLength(Subject));
+ StrBuf_RFC822_to_Utf8(FlatSubject, Subject, NULL, NULL);
+
+ rlen = strlen(CCC->room.QRname);
+ pCh = strstr(ChrPtr(FlatSubject), CCC->room.QRname);
+ if ((pCh == NULL) ||
+ (*(pCh + rlen) != ']') ||
+ (pCh == ChrPtr(FlatSubject)) ||
+ (*(pCh - 1) != '[')
+ )
+ {
+ StrBuf *tmp;
+ StrBufPlain(Subject, HKEY("["));
+ StrBufAppendBufPlain(Subject,
+ CCC->room.QRname,
+ rlen, 0);
+ StrBufAppendBufPlain(Subject, HKEY("] "), 0);
+ StrBufAppendBuf(Subject, FlatSubject, 0);
+ /* so we can free the right one swap them */
+ tmp = Subject;
+ Subject = FlatSubject;
+ FlatSubject = tmp;
+ StrBufRFC2047encode(&Subject, FlatSubject);
+ }
+
+ CM_SetAsFieldSB(msg, eMsgSubject, &Subject);
+
+ FreeStrBuf(&FlatSubject);
+}
+
/*
* Deliver digest messages
*/
void network_deliver_digest(SpoolControl *sc)
{
+ struct CitContext *CCC = CC;
+ long len;
char buf[SIZ];
- int i;
+ char *pbuf;
struct CtdlMessage *msg = NULL;
long msglen;
- StrBuf *recps = NULL;
- struct recptypes *valid;
+ recptypes *valid;
char bounce_to[256];
- if (sc->Users[listrecp] == NULL)
- return;
-
- if (sc->num_msgs_spooled < 1) {
- fclose(sc->digestfp);
- sc->digestfp = NULL;
+ if (sc->Users[digestrecp] == NULL)
return;
- }
msg = malloc(sizeof(struct CtdlMessage));
memset(msg, 0, sizeof(struct CtdlMessage));
msg->cm_format_type = FMT_RFC822;
msg->cm_anon_type = MES_NORMAL;
- sprintf(buf, "%ld", time(NULL));
- msg->cm_fields['T'] = strdup(buf);
- msg->cm_fields['A'] = strdup(CC->room.QRname);
- snprintf(buf, sizeof buf, "[%s]", CC->room.QRname);
- msg->cm_fields['U'] = strdup(buf);
- sprintf(buf, "room_%s@%s", CC->room.QRname, config.c_fqdn);
- for (i=0; buf[i]; ++i) {
- if (isspace(buf[i])) buf[i]='_';
- buf[i] = tolower(buf[i]);
- }
- msg->cm_fields['F'] = strdup(buf);
- msg->cm_fields['R'] = strdup(buf);
+ CM_SetFieldLONG(msg, eTimestamp, time(NULL));
+ CM_SetField(msg, eAuthor, CCC->room.QRname, strlen(CCC->room.QRname));
+ len = snprintf(buf, sizeof buf, "[%s]", CCC->room.QRname);
+ CM_SetField(msg, eMsgSubject, buf, len);
+
+ CM_SetField(msg, erFc822Addr, SKEY(sc->Users[roommailalias]));
+ CM_SetField(msg, eRecipient, SKEY(sc->Users[roommailalias]));
/* Set the 'List-ID' header */
- msg->cm_fields['L'] = malloc(1024);
- snprintf(msg->cm_fields['L'], 1024,
- "%s <%ld.list-id.%s>",
- CC->room.QRname,
- CC->room.QRnumber,
- config.c_fqdn
- );
+ CM_SetField(msg, eListID, SKEY(sc->ListID));
/*
* Go fetch the contents of the digest
fseek(sc->digestfp, 0L, SEEK_END);
msglen = ftell(sc->digestfp);
- msg->cm_fields['M'] = malloc(msglen + 1);
+ pbuf = malloc(msglen + 1);
fseek(sc->digestfp, 0L, SEEK_SET);
- fread(msg->cm_fields['M'], (size_t)msglen, 1, sc->digestfp);
- msg->cm_fields['M'][msglen] = '\0';
-
- fclose(sc->digestfp);
- sc->digestfp = NULL;
+ fread(pbuf, (size_t)msglen, 1, sc->digestfp);
+ pbuf[msglen] = '\0';
+ CM_SetAsField(msg, eMesageText, &pbuf, msglen);
/* Now generate the delivery instructions */
- if (sc->Users[listrecp] == NULL)
- return;
- aggregate_recipients(&recps, digestrecp, sc->RNCfg);
/* Where do we want bounces and other noise to be heard?
- *Surely not the list members! */
+ * Surely not the list members! */
snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", config.c_fqdn);
/* Now submit the message */
- valid = validate_recipients(ChrPtr(sc->Users[listrecp]), NULL, 0);
+ valid = validate_recipients(ChrPtr(sc->Users[digestrecp]), NULL, 0);
if (valid != NULL) {
valid->bounce_to = strdup(bounce_to);
valid->envelope_from = strdup(bounce_to);
CtdlSubmitMsg(msg, valid, NULL, 0);
}
- CtdlFreeMessage(msg);
+ CM_Free(msg);
free_recipients(valid);
}
(sc->digestfp == NULL))
return;
- msg = CtdlDuplicateMessage(omsg);
+ msg = CM_Duplicate(omsg);
if (msg != NULL) {
+ sc->haveDigest = 1;
fprintf(sc->digestfp,
" -----------------------------------"
"------------------------------------"
"-------\n");
fprintf(sc->digestfp, "From: ");
- if (msg->cm_fields['A'] != NULL) {
+ if (!CM_IsEmpty(msg, eAuthor)) {
fprintf(sc->digestfp,
"%s ",
- msg->cm_fields['A']);
+ msg->cm_fields[eAuthor]);
}
- if (msg->cm_fields['F'] != NULL) {
+ if (!CM_IsEmpty(msg, erFc822Addr)) {
fprintf(sc->digestfp,
"<%s> ",
- msg->cm_fields['F']);
+ msg->cm_fields[erFc822Addr]);
}
- else if (msg->cm_fields['N'] != NULL) {
+ else if (!CM_IsEmpty(msg, eNodeName)) {
fprintf(sc->digestfp,
"@%s ",
- msg->cm_fields['N']);
+ msg->cm_fields[eNodeName]);
}
fprintf(sc->digestfp, "\n");
- if (msg->cm_fields['U'] != NULL) {
+ if (!CM_IsEmpty(msg, eMsgSubject)) {
fprintf(sc->digestfp,
"Subject: %s\n",
- msg->cm_fields['U']);
+ msg->cm_fields[eMsgSubject]);
}
CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
FreeStrBuf(&CC->redirect_buffer);
sc->num_msgs_spooled += 1;
- CtdlFreeMessage(msg);
+ CM_Free(msg);
}
}
void network_process_list(SpoolControl *sc, struct CtdlMessage *omsg, long *delete_after_send)
{
- struct CitContext *CCC = CC;
- int rlen;
- char *pCh;
- StrBuf *Subject, *FlatSubject;
struct CtdlMessage *msg = NULL;
- int i;
/*
* Process mailing list recipients
* in order to insert the [list name] in it, etc.
*/
- msg = CtdlDuplicateMessage(omsg);
-
- if (msg->cm_fields['K'] != NULL)
- free(msg->cm_fields['K']);
- if (msg->cm_fields['V'] == NULL){
- /* local message, no enVelope */
- StrBuf *Buf;
- Buf = NewStrBuf();
- StrBufAppendBufPlain(Buf,
- msg->cm_fields['O']
- , -1, 0);
- StrBufAppendBufPlain(Buf, HKEY("@"), 0);
- StrBufAppendBufPlain(Buf, config.c_fqdn, -1, 0);
-
- msg->cm_fields['K'] = SmashStrBuf(&Buf);
- }
- else {
- msg->cm_fields['K'] =
- strdup (msg->cm_fields['V']);
- }
- /* Set the 'List-ID' header */
- if (msg->cm_fields['L'] != NULL) {
- free(msg->cm_fields['L']);
- }
- msg->cm_fields['L'] = malloc(1024);
- snprintf(msg->cm_fields['L'], 1024,
- "%s <%ld.list-id.%s>",
- CCC->room.QRname,
- CCC->room.QRnumber,
- config.c_fqdn
- );
-
- /* Prepend "[List name]" to the subject */
- if (msg->cm_fields['U'] == NULL) {
- Subject = NewStrBufPlain(HKEY("(no subject)"));
- }
- else {
- Subject = NewStrBufPlain(
- msg->cm_fields['U'], -1);
- }
- FlatSubject = NewStrBufPlain(NULL, StrLength(Subject));
- StrBuf_RFC822_to_Utf8(FlatSubject, Subject, NULL, NULL);
-
- rlen = strlen(CCC->room.QRname);
- pCh = strstr(ChrPtr(FlatSubject), CCC->room.QRname);
- if ((pCh == NULL) ||
- (*(pCh + rlen) != ']') ||
- (pCh == ChrPtr(FlatSubject)) ||
- (*(pCh - 1) != '[')
- )
- {
- StrBuf *tmp;
- StrBufPlain(Subject, HKEY("["));
- StrBufAppendBufPlain(Subject,
- CCC->room.QRname,
- rlen, 0);
- StrBufAppendBufPlain(Subject, HKEY("] "), 0);
- StrBufAppendBuf(Subject, FlatSubject, 0);
- /* so we can free the right one swap them */
- tmp = Subject;
- Subject = FlatSubject;
- FlatSubject = tmp;
- StrBufRFC2047encode(&Subject, FlatSubject);
- }
-
- if (msg->cm_fields['U'] != NULL)
- free (msg->cm_fields['U']);
- msg->cm_fields['U'] = SmashStrBuf(&Subject);
+ msg = CM_Duplicate(omsg);
- FreeStrBuf(&FlatSubject);
- /* else we won't modify the buffer, since the
- * roomname is already here.
- */
+ CM_SetField(msg, eReplyTo, SKEY(sc->Users[roommailalias]));
/* if there is no other recipient, Set the recipient
* of the list message to the email address of the
* room itself.
*/
- if ((msg->cm_fields['R'] == NULL) ||
- IsEmptyStr(msg->cm_fields['R']))
+ if (CM_IsEmpty(msg, eRecipient))
{
- if (msg->cm_fields['R'] != NULL)
- free(msg->cm_fields['R']);
-
- msg->cm_fields['R'] = malloc(256);
- snprintf(msg->cm_fields['R'], 256,
- "room_%s@%s", CCC->room.QRname,
- config.c_fqdn);
- for (i=0; msg->cm_fields['R'][i]; ++i) {
- if (isspace(msg->cm_fields['R'][i])) {
- msg->cm_fields['R'][i] = '_';
- }
- }
+ CM_SetField(msg, eRecipient, SKEY(sc->Users[roommailalias]));
}
+ /* Set the 'List-ID' header */
+ CM_SetField(msg, eListID, SKEY(sc->ListID));
+
+
+ /* Prepend "[List name]" to the subject */
+ ListCalculateSubject(msg);
+
/* Handle delivery */
- network_deliver_list(msg, sc, CCC->room.QRname);
- CtdlFreeMessage(msg);
+ network_deliver_list(msg, sc, CC->room.QRname);
+ CM_Free(msg);
}
/*
*/
void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc, const char *RoomName)
{
- struct recptypes *valid;
+ recptypes *valid;
char bounce_to[256];
/* Don't do this if there were no recipients! */
CtdlSubmitMsg(msg, valid, NULL, 0);
free_recipients(valid);
}
- /* Do not call CtdlFreeMessage(msg) here; the caller will free it. */
+ /* Do not call CM_Free(msg) here; the caller will free it. */
}
void network_process_participate(SpoolControl *sc, struct CtdlMessage *omsg, long *delete_after_send)
{
struct CtdlMessage *msg = NULL;
- int i;
int ok_to_participate = 0;
StrBuf *Buf = NULL;
- struct recptypes *valid;
+ recptypes *valid;
/*
* Process client-side list participations for this room
if (sc->Users[participate] == NULL)
return;
- msg = CtdlDuplicateMessage(omsg);
+ msg = CM_Duplicate(omsg);
/* Only send messages which originated on our own
* Citadel network, otherwise we'll end up sending the
* is rude...
*/
ok_to_participate = 0;
- if (msg->cm_fields['N'] != NULL) {
- if (!strcasecmp(msg->cm_fields['N'],
+ if (!CM_IsEmpty(msg, eNodeName)) {
+ if (!strcasecmp(msg->cm_fields[eNodeName],
config.c_nodename)) {
ok_to_participate = 1;
}
- Buf = NewStrBufPlain(msg->cm_fields['N'], -1);
+ Buf = NewStrBufPlain(CM_KEY(msg, eNodeName));
if (CtdlIsValidNode(NULL,
NULL,
Buf,
}
if (ok_to_participate)
{
- if (msg->cm_fields['F'] != NULL) {
- free(msg->cm_fields['F']);
- }
- msg->cm_fields['F'] = malloc(SIZ);
/* Replace the Internet email address of the
* actual author with the email address of the
* room itself, so the remote listserv doesn't
* reject us.
*/
- if (sc->Users[roommailalias] != NULL)
- snprintf(msg->cm_fields['F'], SIZ,
- "%s", ChrPtr(sc->Users[roommailalias]));
- else
- snprintf(msg->cm_fields['F'], SIZ,
- "room_%s@%s", CC->room.QRname,
- config.c_fqdn);
-
- for (i=0; msg->cm_fields['F'][i]; ++i) {
- if (isspace(msg->cm_fields['F'][i])) {
- msg->cm_fields['F'][i] = '_';
- }
- }
+ CM_SetField(msg, erFc822Addr, SKEY(sc->Users[roommailalias]));
valid = validate_recipients(ChrPtr(sc->Users[participate]) , NULL, 0);
- if (msg->cm_fields['R'] != NULL) {
- free(msg->cm_fields['R']);
- }/* TODO: check whether 'R' is set appropriate later. */
-
+ CM_SetField(msg, eRecipient, SKEY(sc->Users[roommailalias]));
CtdlSubmitMsg(msg, valid, "", 0);
free_recipients(valid);
}
FreeStrBuf(&Buf);
- CtdlFreeMessage(msg);
+ CM_Free(msg);
}
void network_process_ignetpush(SpoolControl *sc, struct CtdlMessage *omsg, long *delete_after_send)
{
StrBuf *Recipient;
+ StrBuf *RemoteRoom;
const char *Pos = NULL;
struct CtdlMessage *msg = NULL;
struct CitContext *CCC = CC;
char buf[SIZ];
char filename[PATH_MAX];
FILE *fp;
- size_t newpath_len;
- char *newpath = NULL;
StrBuf *Buf = NULL;
int i;
int bang = 0;
/*
* Process IGnet push shares
*/
- msg = CtdlDuplicateMessage(omsg);
+ msg = CM_Duplicate(omsg);
/* Prepend our node name to the Path field whenever
* sending a message to another IGnet node
*/
- if (msg->cm_fields['P'] == NULL)
- {
- msg->cm_fields['P'] = strdup("username");
- }
- newpath_len = strlen(msg->cm_fields['P']) +
- strlen(config.c_nodename) + 2;
- newpath = malloc(newpath_len);
- snprintf(newpath, newpath_len, "%s!%s",
- config.c_nodename, msg->cm_fields['P']);
- free(msg->cm_fields['P']);
- msg->cm_fields['P'] = newpath;
-
+ Netmap_AddMe(msg, HKEY("username"));
+
/*
* Determine if this message is set to be deleted
* after sending out on the network
*/
- if (msg->cm_fields['S'] != NULL) {
- if (!strcasecmp(msg->cm_fields['S'], "CANCEL")) {
+ if (!CM_IsEmpty(msg, eSpecialField)) {
+ if (!strcasecmp(msg->cm_fields[eSpecialField], "CANCEL")) {
*delete_after_send = 1;
}
}
/* Now send it to every node */
Recipient = NewStrBufPlain(NULL, StrLength(sc->Users[ignet_push_share]));
+ RemoteRoom = NewStrBufPlain(NULL, StrLength(sc->Users[ignet_push_share]));
while ((Pos != StrBufNOTNULL) &&
- StrBufExtract_NextToken(Recipient, sc->Users[ignet_push_share], &Pos, '|'))
+ StrBufExtract_NextToken(Recipient, sc->Users[ignet_push_share], &Pos, ','))
{
+ StrBufExtract_NextToken(RemoteRoom, sc->Users[ignet_push_share], &Pos, ',');
send = 1;
NewStrBufDupAppendFlush(&Buf, Recipient, NULL, 1);
}
/* Check for split horizon */
- QN_syslog(LOG_DEBUG, "Path is %s\n", msg->cm_fields['P']);
- bang = num_tokens(msg->cm_fields['P'], '!');
+ QN_syslog(LOG_DEBUG, "Path is %s\n", msg->cm_fields[eMessagePath]);
+ bang = num_tokens(msg->cm_fields[eMessagePath], '!');
if (bang > 1) {
for (i=0; i<(bang-1); ++i) {
extract_token(buf,
- msg->cm_fields['P'],
+ msg->cm_fields[eMessagePath],
i, '!',
sizeof buf);
}
QN_syslog(LOG_INFO,
- "%sSending to %s\n",
+ " %sSending to %s\n",
(send)?"":"Not ",
ChrPtr(Recipient));
}
* room on the far end by setting the C field
* correctly
*/
- if (msg->cm_fields['C'] != NULL) {
- free(msg->cm_fields['C']);
- }
- if (StrLength(Recipient) > 0) {
- msg->cm_fields['C'] =
- strdup(ChrPtr(Recipient));
+ if (StrLength(RemoteRoom) > 0) {
+ CM_SetField(msg, eRemoteRoom, SKEY(RemoteRoom));
}
else {
- msg->cm_fields['C'] =
- strdup(CC->room.QRname);
+ CM_SetField(msg, eRemoteRoom, CCC->room.QRname, strlen(CCC->room.QRname));
}
/* serialize it for transmission */
- serialize_message(&sermsg, msg);
+ CtdlSerializeMessage(&sermsg, msg);
if (sermsg.len > 0) {
/* write it to a spool file */
}
FreeStrBuf(&Buf);
FreeStrBuf(&Recipient);
- CtdlFreeMessage(msg);
+ FreeStrBuf(&RemoteRoom);
+ CM_Free(msg);
}
void network_spool_msg(long msgnum,
void *userdata)
{
+ struct CitContext *CCC = CC;
struct CtdlMessage *msg = NULL;
long delete_after_send = 0; /* Set to 1 to delete after spooling */
SpoolControl *sc;
msg = CtdlFetchMessage(msgnum, 1);
+ if (msg == NULL)
+ {
+ QN_syslog(LOG_ERR,
+ "failed to load Message <%ld> from disk\n",
+ msgnum);
+ return;
+ }
network_process_list(sc, msg, &delete_after_send);
network_process_digest(sc, msg, &delete_after_send);
network_process_participate(sc, msg, &delete_after_send);
network_process_ignetpush(sc, msg, &delete_after_send);
- CtdlFreeMessage(msg);
+ CM_Free(msg);
/* update lastsent */
sc->lastsent = msgnum;
projects / citadel.git / blobdiff