Add Subdir -S to dynamic FlowSource -M. Replaces pull request #615

Author: phaag

src/libnffile/flist.c

@@ -192,7 +192,8 @@ static const char *subdir_def[] = {"",  // default index 0 - no subdir hierarchy
 #define AcceptedFormatChar "YymdjHMsUWwuF"
 
 static mode_t mode, dir_mode;
-static const char *subdir_format;
+static const char *subdir_format = NULL;
+static int subdir_index = 0;
 
 static struct entry_filter_s {
     char *first_entry;
@@ -1030,6 +1031,7 @@ int InitHierPath(int num) {
     }
 
     subdir_format = subdir_def[i];
+    subdir_index = i;
 
     /*
      * The default file mode is a=rwx (0777) with selected permissions
@@ -1115,6 +1117,8 @@ char *GetSubDir(struct tm *now) {
 
 }  // End of GetSubDir
 
+int GetSubDirIndex(void) { return subdir_index; }
+
 int SetupSubDir(char *dir, char *subdir, char *error, size_t errlen) {
     char *p, path[MAXPATHLEN];
     struct stat stat_buf;

src/libnffile/flist.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2009-2024, Peter Haag
+ *  Copyright (c) 2009-2025, Peter Haag
  *  Copyright (c) 2004-2008, SWITCH - Teleinformatikdienste fuer Lehre und Forschung
  *  All rights reserved.
  *
@@ -48,6 +48,8 @@ int InitHierPath(int num);
 
 char *GetSubDir(struct tm *now);
 
+int GetSubDirIndex(void);
+
 int SetupSubDir(char *dir, char *subdir, char *error, size_t errlen);
 
 queue_t *SetupInputFileSequence(flist_t *flist);

src/nfcapd/nfcapd.c

@@ -412,6 +412,7 @@ static void run(packet_function_t receive_packet, int socket, int pfd, int rfd,
                 // fatal error
                 return;
             }
+            fs->subdir = GetSubDirIndex();
             fs->nffile = OpenNewFile(fs->current, NULL, CREATOR_NFCAPD, compress, NOT_ENCRYPTED);
             if (!fs->nffile) {
                 LogError("Failed to open new collector file");