X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_network.c;h=c61d225931a36b6327205295d10d90c1eb548f86;hb=2e810d36a66a6cc42c345bd924b4e2b7669af8cd;hp=65645d9abe89b8b2e3ca50ad6ec0788de74276b4;hpb=ec7725347e80a9635cb3ce7a19426dc415b7eb37;p=citadel.git diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c index 65645d9ab..c61d22593 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,59 +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) -{ - struct CitContext *CCC = CC; - char msgid[SIZ]; - struct cdbdata *cdbut; - struct UseTable ut; - - /* Bail out if we can't generate a message ID */ - if (msg == NULL) { - return(0); - } - if (msg->cm_fields['I'] == NULL) { - return(0); - } - if (IsEmptyStr(msg->cm_fields['I'])) { - return(0); - } - - /* Generate the message ID */ - strcpy(msgid, msg->cm_fields['I']); - if (haschar(msgid, '@') == 0) { - strcat(msgid, "@"); - if (msg->cm_fields['N'] != NULL) { - strcat(msgid, msg->cm_fields['N']); - } - else { - return(0); - } - } - - cdbut = cdb_fetch(CDB_USETABLE, msgid, strlen(msgid)); - if (cdbut != NULL) { - cdb_free(cdbut); - QN_syslog(LOG_DEBUG, "network_usetable() : we already have %s\n", msgid); - return(1); - } - - /* If we got to this point, it's unique: add it. */ - strcpy(ut.ut_msgid, msgid); - ut.ut_timestamp = time(NULL); - cdb_store(CDB_USETABLE, msgid, strlen(msgid), &ut, sizeof(struct UseTable) ); - 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 @@ -176,7 +122,7 @@ int network_sync_to(char *target_node, long len) pCfgLine = pRNCFG->NetConfigs[ignet_push_share]; while (pCfgLine != NULL) { - if (strcmp(ChrPtr(pCfgLine->Value[0]), target_node)) + if (!strcmp(ChrPtr(pCfgLine->Value[0]), target_node)) break; pCfgLine = pCfgLine->next; } @@ -184,10 +130,25 @@ int network_sync_to(char *target_node, long len) { return -1; } + memset(&sc, 0, sizeof(SpoolControl)); memset(&OneRNCFG, 0, sizeof(OneRoomNetCfg)); sc.RNCfg = &OneRNCFG; sc.RNCfg->NetConfigs[ignet_push_share] = DuplicateOneGenericCfgLine(pCfgLine); + sc.Users[ignet_push_share] = NewStrBufPlain(NULL, + StrLength(pCfgLine->Value[0]) + + StrLength(pCfgLine->Value[1]) + 10); + StrBufAppendBuf(sc.Users[ignet_push_share], + pCfgLine->Value[0], + 0); + StrBufAppendBufPlain(sc.Users[ignet_push_share], + HKEY(","), + 0); + + StrBufAppendBuf(sc.Users[ignet_push_share], + pCfgLine->Value[1], + 0); + CalcListID(&sc); end_critical_section(S_NETCONFIGS); @@ -203,6 +164,7 @@ int network_sync_to(char *target_node, long len) DeleteHash(&sc.working_ignetcfg); DeleteHash(&sc.the_netmap); + free_spoolcontrol_struct_members(&sc); QN_syslog(LOG_NOTICE, "Synchronized %d messages to <%s>\n", num_spooled, target_node); @@ -231,7 +193,7 @@ void cmd_nsyn(char *argbuf) { } } -RoomProcList *CreateRoomProcListEntry(struct ctdlroom *qrbuf, const OneRoomNetCfg *OneRNCFG) +RoomProcList *CreateRoomProcListEntry(struct ctdlroom *qrbuf, OneRoomNetCfg *OneRNCFG) { int i; struct RoomProcList *ptr; @@ -254,6 +216,7 @@ RoomProcList *CreateRoomProcListEntry(struct ctdlroom *qrbuf, const OneRoomNetCf ptr->lcname[ptr->namelen] = '\0'; ptr->key = hashlittle(ptr->lcname, ptr->namelen, 9872345); + ptr->lastsent = OneRNCFG->lastsent; ptr->OneRNCfg = OneRNCFG; return ptr; } @@ -261,15 +224,21 @@ RoomProcList *CreateRoomProcListEntry(struct ctdlroom *qrbuf, const OneRoomNetCf /* * Batch up and send all outbound traffic from the current room */ -void network_queue_interesting_rooms(struct ctdlroom *qrbuf, void *data, const OneRoomNetCfg *OneRNCfg) +void network_queue_interesting_rooms(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *OneRNCfg) { struct RoomProcList *ptr; roomlists *RP = (roomlists*) data; + if (!HaveSpoolConfig(OneRNCfg)) + return; + ptr = CreateRoomProcListEntry(qrbuf, OneRNCfg); - ptr->next = RP->rplist; - RP->rplist = ptr; + if (ptr != NULL) + { + ptr->next = RP->rplist; + RP->rplist = ptr; + } } /* @@ -278,7 +247,7 @@ void network_queue_interesting_rooms(struct ctdlroom *qrbuf, void *data, const O int network_room_handler (struct ctdlroom *qrbuf) { struct RoomProcList *ptr; - const OneRoomNetCfg* RNCfg; + OneRoomNetCfg* RNCfg; if (qrbuf->QRdefaultview == VIEW_QUEUE) return 1; @@ -287,10 +256,14 @@ int network_room_handler (struct ctdlroom *qrbuf) if (RNCfg == NULL) return 1; + if (!HaveSpoolConfig(RNCfg)) + return 1; + ptr = CreateRoomProcListEntry(qrbuf, RNCfg); if (ptr == NULL) return 1; + ptr->OneRNCfg = NULL; begin_critical_section(S_RPLIST); ptr->next = rplist; rplist = ptr; @@ -326,14 +299,13 @@ void destroy_network_queue_room_locked (void) 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; + recptypes *valid = NULL; char force_room[ROOMNAMELEN]; static int serialnum = 0; - size_t size; + long len; QNM_syslog(LOG_DEBUG, "entering network_bounce()\n"); @@ -344,65 +316,37 @@ void network_bounce(struct CtdlMessage *msg, char *reason) /* * Give it a fresh message ID */ - if (msg->cm_fields['I'] != NULL) { - free(msg->cm_fields['I']); - } - snprintf(buf, sizeof buf, "%ld.%04lx.%04x@%s", - (long)time(NULL), (long)getpid(), ++serialnum, config.c_fqdn); - msg->cm_fields['I'] = strdup(buf); + len = snprintf(buf, sizeof(buf), + "%ld.%04lx.%04x@%s", + (long)time(NULL), + (long)getpid(), + ++serialnum, + config.c_fqdn); + + CM_SetField(msg, emessageId, buf, len); /* * FIXME ... right now we're just sending a bounce; we really want to * include the text of the bounced message. */ - if (msg->cm_fields['M'] != NULL) { - free(msg->cm_fields['M']); - } - msg->cm_fields['M'] = strdup(reason); + CM_SetField(msg, eMesageText, reason, strlen(reason)); msg->cm_format_type = 0; /* * Turn the message around */ - if (msg->cm_fields['R'] == NULL) { - free(msg->cm_fields['R']); - } - - if (msg->cm_fields['D'] == NULL) { - free(msg->cm_fields['D']); - } - - snprintf(recipient, sizeof recipient, "%s@%s", - msg->cm_fields['A'], msg->cm_fields['N']); - - if (msg->cm_fields['A'] == NULL) { - free(msg->cm_fields['A']); - } + CM_FlushField(msg, eRecipient); + CM_FlushField(msg, eDestination); - if (msg->cm_fields['N'] == NULL) { - free(msg->cm_fields['N']); - } - - if (msg->cm_fields['U'] == NULL) { - free(msg->cm_fields['U']); - } + len = snprintf(recipient, sizeof(recipient), "%s@%s", + msg->cm_fields[eAuthor], + msg->cm_fields[eNodeName]); - msg->cm_fields['A'] = strdup(BOUNCESOURCE); - msg->cm_fields['N'] = strdup(config.c_nodename); - msg->cm_fields['U'] = strdup("Delivery Status Notification (Failure)"); + CM_SetField(msg, eAuthor, HKEY(BOUNCESOURCE)); + CM_SetField(msg, eNodeName, CFG_KEY(c_nodename)); + CM_SetField(msg, eMsgSubject, HKEY("Delivery Status Notification (Failure)")); - /* prepend our node to the path */ - if (msg->cm_fields['P'] != NULL) { - oldpath = msg->cm_fields['P']; - msg->cm_fields['P'] = NULL; - } - else { - oldpath = strdup("unknown_user"); - } - size = strlen(oldpath) + SIZ; - msg->cm_fields['P'] = malloc(size); - snprintf(msg->cm_fields['P'], size, "%s!%s", config.c_nodename, oldpath); - free(oldpath); + Netmap_AddMe(msg, HKEY("unknown_user")); /* Now submit the message */ valid = validate_recipients(recipient, NULL, 0); @@ -423,16 +367,12 @@ void network_bounce(struct CtdlMessage *msg, char *reason) /* Clean up */ if (valid != NULL) free_recipients(valid); - CtdlFreeMessage(msg); + CM_Free(msg); QNM_syslog(LOG_DEBUG, "leaving network_bounce()\n"); } - - - - /* * network_do_queue() * @@ -447,6 +387,8 @@ void network_do_queue(void) HashList *the_netmap = NULL; int netmap_changed = 0; roomlists RL; + SpoolControl *sc = NULL; + SpoolControl *pSC; /* * Run the full set of processing tasks no more frequently @@ -508,14 +450,30 @@ void network_do_queue(void) } if (ptr->namelen > 0) { - network_spoolout_room(ptr, - working_ignetcfg, - the_netmap); + InspectQueuedRoom(&sc, + ptr, + working_ignetcfg, + the_netmap); } ptr = ptr->next; } } + + pSC = sc; + while (pSC != NULL) + { + network_spoolout_room(pSC); + pSC = pSC->next; + } + + pSC = sc; + while (pSC != NULL) + { + sc = pSC->next; + free_spoolcontrol_struct(&pSC); + pSC = sc; + } /* If there is anything in the inbound queue, process it */ if (!server_shutting_down) { network_do_spoolin(working_ignetcfg, @@ -529,7 +487,9 @@ void network_do_queue(void) /* Save the network map back to disk */ if (netmap_changed) { StrBuf *MapStr = CtdlSerializeNetworkMap(the_netmap); - CtdlPutSysConfig(IGNETMAP, SmashStrBuf(&MapStr)); + char *pMapStr = SmashStrBuf(&MapStr); + CtdlPutSysConfig(IGNETMAP, pMapStr); + free(pMapStr); } /* combine singe message files into one spool entry per remote node. */ @@ -547,6 +507,8 @@ void network_do_queue(void) last_run = time(NULL); } destroy_network_queue_room(RL.rplist); + SaveChangedConfigs(); + } @@ -579,6 +541,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 */ @@ -592,6 +628,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);