Removed spoolin processing
authorArt Cancro <ajc@citadel.org>
Tue, 23 Jan 2018 03:06:40 +0000 (22:06 -0500)
committerArt Cancro <ajc@citadel.org>
Tue, 23 Jan 2018 03:06:40 +0000 (22:06 -0500)
citadel/modules/network/serv_netspool.c
citadel/modules/network/serv_network.c

index a792601b34f29a8539554d5d664902d771f78150..0366181236cf8af8ee19465eb5a9398b0b6f572e 100644 (file)
@@ -527,369 +527,6 @@ int network_usetable(struct CtdlMessage *msg)
 }
 
 
-/*
- * Process a buffer containing a single message from a single file
- * from the inbound queue 
- */
-void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg, HashList *the_netmap, int *netmap_changed)
-{
-       long len;
-       StrBuf *Buf = NULL;
-       struct CtdlMessage *msg = NULL;
-       long pos;
-       int field;
-       recptypes *recp = NULL;
-       char target_room[ROOMNAMELEN];
-       struct ser_ret sermsg;
-       char filename[PATH_MAX];
-       FILE *fp;
-       const StrBuf *nexthop = NULL;
-       unsigned char firstbyte;
-       unsigned char lastbyte;
-
-       syslog(LOG_DEBUG, "netspool: network_process_buffer() processing %ld bytes", size);
-
-       /* Validate just a little bit.  First byte should be FF and * last byte should be 00. */
-       firstbyte = buffer[0];
-       lastbyte = buffer[size-1];
-       if ( (firstbyte != 255) || (lastbyte != 0) ) {
-               syslog(LOG_ERR, "netspool: corrupt message ignored.  Length=%ld, firstbyte = %d, lastbyte = %d", size, firstbyte, lastbyte);
-               return;
-       }
-
-       /* Set default target room to trash */
-       strcpy(target_room, TWITROOM);
-
-       /* Load the message into memory */
-       msg = (struct CtdlMessage *) malloc(sizeof(struct CtdlMessage));
-       memset(msg, 0, sizeof(struct CtdlMessage));
-       msg->cm_magic = CTDLMESSAGE_MAGIC;
-       msg->cm_anon_type = buffer[1];
-       msg->cm_format_type = buffer[2];
-
-       for (pos = 3; pos < size; ++pos) {
-               field = buffer[pos];
-               len = strlen(buffer + pos + 1);
-               CM_SetField(msg, field, buffer + pos + 1, len);
-               pos = pos + len + 1;
-       }
-
-       /* Check for message routing */
-       if (!CM_IsEmpty(msg, eDestination)) {
-               if (strcasecmp(msg->cm_fields[eDestination], CtdlGetConfigStr("c_nodename"))) {
-
-                       /* route the message */
-                       Buf = NewStrBufPlain(CM_KEY(msg,eDestination));
-                       if (CtdlIsValidNode(&nexthop, 
-                                           NULL, 
-                                           Buf, 
-                                           working_ignetcfg, 
-                                           the_netmap) == 0) 
-                       {
-                               Netmap_AddMe(msg, HKEY("unknown_user"));
-
-                               /* serialize the message */
-                               CtdlSerializeMessage(&sermsg, msg);
-
-                               /* now send it */
-                               if (StrLength(nexthop) == 0) {
-                                       nexthop = Buf;
-                               }
-                               snprintf(filename,
-                                        sizeof filename,
-                                        "%s/%s@%lx%x",
-                                        ctdl_netout_dir,
-                                        ChrPtr(nexthop),
-                                        time(NULL),
-                                        rand()
-                               );
-                               syslog(LOG_DEBUG, "netspool: appending to %s", filename);
-                               fp = fopen(filename, "ab");
-                               if (fp != NULL) {
-                                       fwrite(sermsg.ser, sermsg.len, 1, fp);
-                                       fclose(fp);
-                               }
-                               else {
-                                       syslog(LOG_ERR, "%s: %s", filename, strerror(errno));
-                               }
-                               free(sermsg.ser);
-                               CM_Free(msg);
-                               FreeStrBuf(&Buf);
-                               return;
-                       }
-                       
-                       else {  /* invalid destination node name */
-                               FreeStrBuf(&Buf);
-
-                               network_bounce(&msg,
-"A message you sent could not be delivered due to an invalid destination node"
-" name.  Please check the address and try sending the message again.\n");
-                               return;
-
-                       }
-               }
-       }
-
-       /*
-        * Check to see if we already have a copy of this message, and
-        * abort its processing if so.  (We used to post a warning to Aide>
-        * every time this happened, but the network is now so densely
-        * connected that it's inevitable.)
-        */
-       if (network_usetable(msg) != 0) {
-               CM_Free(msg);
-               return;
-       }
-
-       /* Learn network topology from the path */
-       if (!CM_IsEmpty(msg, eNodeName) && !CM_IsEmpty(msg, eMessagePath)) {
-               NetworkLearnTopology(msg->cm_fields[eNodeName], 
-                                    msg->cm_fields[eMessagePath], 
-                                    the_netmap, 
-                                    netmap_changed);
-       }
-
-       /* Is the sending node giving us a very persuasive suggestion about
-        * which room this message should be saved in?  If so, go with that.
-        */
-       if (!CM_IsEmpty(msg, eRemoteRoom)) {
-               safestrncpy(target_room, msg->cm_fields[eRemoteRoom], sizeof target_room);
-       }
-
-       /* Otherwise, does it have a recipient?  If so, validate it... */
-       else if (!CM_IsEmpty(msg, eRecipient)) {
-               recp = validate_recipients(msg->cm_fields[eRecipient], NULL, 0);
-               if (recp != NULL) if (recp->num_error != 0) {
-                       network_bounce(&msg,
-                               "A message you sent could not be delivered due to an invalid address.\n"
-                               "Please check the address and try sending the message again.\n");
-                       free_recipients(recp);
-                       syslog(LOG_DEBUG, "netspool: bouncing message due to invalid recipient address.");
-                       return;
-               }
-               strcpy(target_room, "");        /* no target room if mail */
-       }
-
-       /* Our last shot at finding a home for this message is to see if
-        * it has the eOriginalRoom (O) field (Originating room) set.
-        */
-       else if (!CM_IsEmpty(msg, eOriginalRoom)) {
-               safestrncpy(target_room, msg->cm_fields[eOriginalRoom], sizeof target_room);
-       }
-
-       /* Strip out fields that are only relevant during transit */
-       CM_FlushField(msg, eDestination);
-       CM_FlushField(msg, eRemoteRoom);
-
-       /* save the message into a room */
-       if (PerformNetprocHooks(msg, target_room) == 0) {
-               msg->cm_flags = CM_SKIP_HOOKS;
-               CtdlSubmitMsg(msg, recp, target_room, 0);
-       }
-       CM_Free(msg);
-       free_recipients(recp);
-}
-
-
-/*
- * Process a single message from a single file from the inbound queue 
- */
-void network_process_message(FILE *fp, 
-                            long msgstart, 
-                            long msgend,
-                            HashList *working_ignetcfg,
-                            HashList *the_netmap, 
-                            int *netmap_changed)
-{
-       long hold_pos;
-       long size;
-       char *buffer;
-
-       hold_pos = ftell(fp);
-       size = msgend - msgstart + 1;
-       buffer = malloc(size);
-       if (buffer != NULL) {
-               fseek(fp, msgstart, SEEK_SET);
-               if (fread(buffer, size, 1, fp) > 0) {
-                       network_process_buffer(buffer, 
-                                              size, 
-                                              working_ignetcfg, 
-                                              the_netmap, 
-                                              netmap_changed);
-               }
-               free(buffer);
-       }
-
-       fseek(fp, hold_pos, SEEK_SET);
-}
-
-
-/*
- * Process a single file from the inbound queue 
- */
-void network_process_file(char *filename,
-                         HashList *working_ignetcfg,
-                         HashList *the_netmap, 
-                         int *netmap_changed)
-{
-       FILE *fp;
-       long msgstart = (-1L);
-       long msgend = (-1L);
-       long msgcur = 0L;
-       int ch;
-       int nMessages = 0;
-
-       fp = fopen(filename, "rb");
-       if (fp == NULL) {
-               syslog(LOG_ERR, "%s: %s", filename, strerror(errno));
-               return;
-       }
-
-       fseek(fp, 0L, SEEK_END);
-       syslog(LOG_INFO, "netspool: processing %ld bytes from %s", ftell(fp), filename);
-       rewind(fp);
-
-       /* Look for messages in the data stream and break them out */
-       while (ch = getc(fp), ch >= 0) {
-       
-               if (ch == 255) {
-                       if (msgstart >= 0L) {
-                               msgend = msgcur - 1;
-                               network_process_message(fp,
-                                                       msgstart,
-                                                       msgend,
-                                                       working_ignetcfg,
-                                                       the_netmap,
-                                                       netmap_changed);
-                       }
-                       msgstart = msgcur;
-               }
-
-               ++msgcur;
-               nMessages ++;
-       }
-
-       msgend = msgcur - 1;
-       if (msgstart >= 0L) {
-               network_process_message(fp,
-                                       msgstart,
-                                       msgend,
-                                       working_ignetcfg,
-                                       the_netmap,
-                                       netmap_changed);
-               nMessages ++;
-       }
-
-       if (nMessages > 0)
-               syslog(LOG_INFO, "netspool: processed %d messages in %s", nMessages, filename);
-
-       fclose(fp);
-       unlink(filename);
-}
-
-
-/*
- * Process anything in the inbound queue
- */
-void network_do_spoolin(HashList *working_ignetcfg, HashList *the_netmap, int *netmap_changed)
-{
-       DIR *dp;
-       struct dirent *d;
-       struct dirent *filedir_entry;
-       struct stat statbuf;
-       char filename[PATH_MAX];
-       static time_t last_spoolin_mtime = 0L;
-       int d_type = 0;
-        int d_namelen;
-
-       /*
-        * Check the spoolin directory's modification time.  If it hasn't
-        * been touched, we don't need to scan it.
-        */
-       if (stat(ctdl_netin_dir, &statbuf)) return;
-       if (statbuf.st_mtime == last_spoolin_mtime) {
-               syslog(LOG_DEBUG, "netspool: nothing in inbound queue");
-               return;
-       }
-       last_spoolin_mtime = statbuf.st_mtime;
-       syslog(LOG_DEBUG, "netspool: processing inbound queue");
-
-       /*
-        * Ok, there's something interesting in there, so scan it.
-        */
-       dp = opendir(ctdl_netin_dir);
-       if (dp == NULL) return;
-
-       d = (struct dirent *)malloc(offsetof(struct dirent, d_name) + PATH_MAX + 1);
-       if (d == NULL) {
-               closedir(dp);
-               return;
-       }
-
-       while ( (filedir_entry = readdir(dp)) , (filedir_entry != NULL))
-       {
-#ifdef _DIRENT_HAVE_D_NAMLEN
-               d_namelen = filedir_entry->d_namlen;
-
-#else
-               d_namelen = strlen(filedir_entry->d_name);
-#endif
-
-#ifdef _DIRENT_HAVE_D_TYPE
-               d_type = filedir_entry->d_type;
-#else
-               d_type = DT_UNKNOWN;
-#endif
-               if ((d_namelen > 1) && filedir_entry->d_name[d_namelen - 1] == '~')
-                       continue; /* Ignore backup files... */
-
-               if ((d_namelen == 1) && 
-                   (filedir_entry->d_name[0] == '.'))
-                       continue;
-
-               if ((d_namelen == 2) && 
-                   (filedir_entry->d_name[0] == '.') &&
-                   (filedir_entry->d_name[1] == '.'))
-                       continue;
-
-               if (d_type == DT_UNKNOWN) {
-                       struct stat s;
-                       char path[PATH_MAX];
-
-                       snprintf(path,
-                                PATH_MAX,
-                                "%s/%s", 
-                                ctdl_netin_dir,
-                                filedir_entry->d_name);
-
-                       if (lstat(path, &s) == 0) {
-                               d_type = IFTODT(s.st_mode);
-                       }
-               }
-
-               switch (d_type)
-               {
-               case DT_DIR:
-                       break;
-               case DT_LNK: /* TODO: check whether its a file or a directory */
-               case DT_REG:
-                       snprintf(filename, 
-                               sizeof filename,
-                               "%s/%s",
-                               ctdl_netin_dir,
-                               d->d_name
-                       );
-                       network_process_file(filename,
-                                            working_ignetcfg,
-                                            the_netmap,
-                                            netmap_changed);
-               }
-       }
-
-       closedir(dp);
-       free(d);
-}
-
 /*
  * Step 1: consolidate files in the outbound queue into one file per neighbor node
  * Step 2: delete any files in the outbound queue that were for neighbors who no longer exist.
index 6c6f5e982c6ebce8356d68b813416df58d73eb30..eb7941d0022987b71673abc31099ce325004e28a 100644 (file)
@@ -386,11 +386,6 @@ void network_do_queue(void)
                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, the_netmap, &netmap_changed);
-       }
-
 
        /* Save the network map back to disk */
        if (netmap_changed) {