X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_network.c;h=c6ca869da4b9946342b3dd6fbc14028a4a18e80a;hb=7cfe40f56853007488962e16e65ef939c9365866;hp=1f0a680ca2a6437aad5b1ef35ab5a2e8a2b94d7b;hpb=951fbe7c1ee0b3554af22d6ae0d1d51c1642ae0f;p=citadel.git diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c index 1f0a680ca..c6ca869da 100644 --- a/citadel/modules/network/serv_network.c +++ b/citadel/modules/network/serv_network.c @@ -72,7 +72,6 @@ #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" @@ -97,54 +96,6 @@ typedef struct __roomlists { struct RoomProcList *rplist = NULL; - -/* - * Check the use table. This is a list of messages which have recently - * arrived on the system. It is maintained and queried to prevent the same - * message from being entered into the database multiple times if it happens - * to arrive multiple times by accident. - */ -int network_usetable(struct CtdlMessage *msg) -{ - StrBuf *msgid; - struct CitContext *CCC = CC; - time_t now; - - /* Bail out if we can't generate a message ID */ - if ((msg == NULL) || (msg->cm_fields[emessageId] == NULL) || (IsEmptyStr(msg->cm_fields[emessageId]))) - { - return(0); - } - - /* Generate the message ID */ - msgid = NewStrBufPlain(msg->cm_fields[emessageId], -1); - if (haschar(ChrPtr(msgid), '@') == 0) { - StrBufAppendBufPlain(msgid, HKEY("@"), 0); - if (msg->cm_fields[eNodeName] != NULL) { - StrBufAppendBufPlain(msgid, msg->cm_fields[eNodeName], -1, 0); - } - else { - FreeStrBuf(&msgid); - return(0); - } - } - now = time(NULL); - if (CheckIfAlreadySeen("Networker Import", - msgid, - now, 0, - eCheckUpdate, - CCC->cs_pid, 0) != 0) - { - FreeStrBuf(&msgid); - return(1); - } - FreeStrBuf(&msgid); - - return(0); -} - - - /* * Send the *entire* contents of the current room to one specific network node, * ignoring anything we know about which messages have already undergone @@ -341,116 +292,6 @@ void destroy_network_queue_room_locked (void) } - -/* - * Bounce a message back to the sender - */ -void network_bounce(struct CtdlMessage *msg, char *reason) -{ - struct CitContext *CCC = CC; - char *oldpath = NULL; - char buf[SIZ]; - char bouncesource[SIZ]; - char recipient[SIZ]; - struct recptypes *valid = NULL; - char force_room[ROOMNAMELEN]; - static int serialnum = 0; - size_t size; - - QNM_syslog(LOG_DEBUG, "entering network_bounce()\n"); - - if (msg == NULL) return; - - snprintf(bouncesource, sizeof bouncesource, "%s@%s", BOUNCESOURCE, config.c_nodename); - - /* - * Give it a fresh message ID - */ - if (msg->cm_fields[emessageId] != NULL) { - free(msg->cm_fields[emessageId]); - } - snprintf(buf, sizeof buf, "%ld.%04lx.%04x@%s", - (long)time(NULL), (long)getpid(), ++serialnum, config.c_fqdn); - msg->cm_fields[emessageId] = strdup(buf); - - /* - * FIXME ... right now we're just sending a bounce; we really want to - * include the text of the bounced message. - */ - if (msg->cm_fields[eMesageText] != NULL) { - free(msg->cm_fields[eMesageText]); - } - msg->cm_fields[eMesageText] = strdup(reason); - msg->cm_format_type = 0; - - /* - * Turn the message around - */ - if (msg->cm_fields[eRecipient] == NULL) { - free(msg->cm_fields[eRecipient]); - } - - if (msg->cm_fields[eDestination] == NULL) { - free(msg->cm_fields[eDestination]); - } - - snprintf(recipient, sizeof recipient, "%s@%s", - msg->cm_fields[eAuthor], msg->cm_fields[eNodeName]); - - if (msg->cm_fields[eAuthor] == NULL) { - free(msg->cm_fields[eAuthor]); - } - - if (msg->cm_fields[eNodeName] == NULL) { - free(msg->cm_fields[eNodeName]); - } - - if (msg->cm_fields[eMsgSubject] == NULL) { - free(msg->cm_fields[eMsgSubject]); - } - - msg->cm_fields[eAuthor] = strdup(BOUNCESOURCE); - msg->cm_fields[eNodeName] = strdup(config.c_nodename); - msg->cm_fields[eMsgSubject] = strdup("Delivery Status Notification (Failure)"); - - /* prepend our node to the path */ - if (msg->cm_fields[eMessagePath] != NULL) { - oldpath = msg->cm_fields[eMessagePath]; - msg->cm_fields[eMessagePath] = NULL; - } - else { - oldpath = strdup("unknown_user"); - } - size = strlen(oldpath) + SIZ; - msg->cm_fields[eMessagePath] = malloc(size); - snprintf(msg->cm_fields[eMessagePath], size, "%s!%s", config.c_nodename, oldpath); - free(oldpath); - - /* Now submit the message */ - valid = validate_recipients(recipient, NULL, 0); - if (valid != NULL) if (valid->num_error != 0) { - free_recipients(valid); - valid = NULL; - } - if ( (valid == NULL) || (!strcasecmp(recipient, bouncesource)) ) { - strcpy(force_room, config.c_aideroom); - } - else { - strcpy(force_room, ""); - } - if ( (valid == NULL) && IsEmptyStr(force_room) ) { - strcpy(force_room, config.c_aideroom); - } - CtdlSubmitMsg(msg, valid, force_room, 0); - - /* Clean up */ - if (valid != NULL) free_recipients(valid); - CtdlFreeMessage(msg); - QNM_syslog(LOG_DEBUG, "leaving network_bounce()\n"); -} - - - /* * network_do_queue() * @@ -619,6 +460,80 @@ void network_cleanup_function(void) } +int ignet_aftersave(struct CtdlMessage *msg, + recptypes *recps) /* recipients (if mail) */ +{ + /* For IGnet mail, we have to save a new copy into the spooler for + * each recipient, with the R and D fields set to the recipient and + * destination-node. This has two ugly side effects: all other + * recipients end up being unlisted in this recipient's copy of the + * message, and it has to deliver multiple messages to the same + * node. We'll revisit this again in a year or so when everyone has + * a network spool receiver that can handle the new style messages. + */ + if ((recps != NULL) && (recps->num_ignet > 0)) + { + char *recipient; + int rv = 0; + struct ser_ret smr; + FILE *network_fp = NULL; + char submit_filename[128]; + static int seqnum = 1; + int i; + char *hold_R, *hold_D, *RBuf, *DBuf; + long hrlen, hdlen, rblen, dblen, count, rlen; + CitContext *CCC = MyContext(); + + CM_GetAsField(msg, eRecipient, &hold_R, &hrlen);; + CM_GetAsField(msg, eDestination, &hold_D, &hdlen);; + + count = num_tokens(recps->recp_ignet, '|'); + rlen = strlen(recps->recp_ignet); + recipient = malloc(rlen + 1); + RBuf = malloc(rlen + 1); + DBuf = malloc(rlen + 1); + for (i=0; irecp_ignet, i, + '|', rlen + 1); + + rblen = extract_token(RBuf, recipient, 0, '@', rlen + 1); + dblen = extract_token(DBuf, recipient, 1, '@', rlen + 1); + + CM_SetAsField(msg, eRecipient, &RBuf, rblen);; + CM_SetAsField(msg, eDestination, &DBuf, dblen);; + CtdlSerializeMessage(&smr, msg); + if (smr.len > 0) { + snprintf(submit_filename, sizeof submit_filename, + "%s/netmail.%04lx.%04x.%04x", + ctdl_netin_dir, + (long) getpid(), + CCC->cs_pid, + ++seqnum); + + network_fp = fopen(submit_filename, "wb+"); + if (network_fp != NULL) { + rv = fwrite(smr.ser, smr.len, 1, network_fp); + if (rv == -1) { + MSG_syslog(LOG_EMERG, "CtdlSubmitMsg(): Couldn't write network spool file: %s\n", + strerror(errno)); + } + fclose(network_fp); + } + free(smr.ser); + } + CM_GetAsField(msg, eRecipient, &RBuf, &rblen);; + CM_GetAsField(msg, eDestination, &DBuf, &dblen);; + } + free(RBuf); + free(DBuf); + free(recipient); + CM_SetAsField(msg, eRecipient, &hold_R, hrlen); + CM_SetAsField(msg, eDestination, &hold_D, hdlen); + return 1; + } + return 0; +} + /* * Module entry point */ @@ -632,6 +547,8 @@ CTDL_MODULE_INIT(network) { if (!threading) { + CtdlRegisterMessageHook(ignet_aftersave, EVT_AFTERSAVE); + CtdlFillSystemContext(&networker_spool_CC, "CitNetSpool"); CtdlRegisterDebugFlagHook(HKEY("networkqueue"), SetNetQDebugEnabled, &NetQDebugEnabled); CtdlRegisterSessionHook(network_cleanup_function, EVT_STOP, PRIO_STOP + 30);