Merge pull request #617 from jaegeral/2025-04_spell

Spelling check

Author: phaag

README.md

@@ -40,8 +40,8 @@ region, country and city.  The geo location and AS information is retrieved from
 optional **geoDB** database, created by the **geolookup** program from the nfdump
 tools.  geolookup uses the **Maxmind** database GeoDB or GeoLite2 to create a
 binary lookup database for nfdump. Please check the <u>geolooup</u>(1) man page
-for more details. IP adresses can be tagged as **TOR** exit nodes, from the optional 
-**torDB** database, created by the **torlookup** program. Please chaeck the <u>torlookup</u>(1)
+for more details. IP addresses can be tagged as **TOR** exit nodes, from the optional 
+**torDB** database, created by the **torlookup** program. Please check the <u>torlookup</u>(1)
 man page for details.
 
 There is also a [go-nfdump](https://github.com/phaag/go-nfdump) module to read nfdump flows files in Golang. 
@@ -91,7 +91,7 @@ improves compatibility with some exporters such as yaf and others.
   to a UNIX socket. The corresponding program may be [nfinflux](https://github.com/phaag/nfinflux) to insert 
   these metrics into an influxDB or [nfexporter](https://github.com/phaag/nfexporter) for Prometheus monitoring.
 
-- nfdump supports a default config file tipically */usr/local/etc/nfdump.conf* to
+- nfdump supports a default config file typically */usr/local/etc/nfdump.conf* to
   store user defined paths for the **geolookup** and **torlookup** database files as well as for 
   user defined named output formats *( -o 'fmt:%ts .. ', -o 'csv:%ts ..')*. See the default
   */usr/local/etc/nfdump.conf.dist* file for an example.
@@ -218,7 +218,7 @@ flows. The output format is user selectable and also includes a simple
 csv format for post processing.
 
 __nfanon__ - anonymize netflow records  
-IP addresses in flow records are anonimized using the CryptoPAn method.
+IP addresses in flow records are anonymized using the CryptoPAn method.
 
 __nfexpire__ - expire old netflow data  
 Manages data expiration. Sets appropriate limits. Used by NfSen.
@@ -280,7 +280,7 @@ More fields may be integrated in future versions of sfcapd.
 Binary data files can optionally be compressed by using either LZO1X-1, LZ4, ZSTD or bzip2 compression 
 LZO is fastest but less efficient, LZ4 and ZSTD are fast and pretty efficient and bzip2 is slow but efficient. 
 
-By default LZO and LZ4 embedded without external dependancies. Bzip2 and ZSTD are optional libraries, which are automatically added, if they are found while configuring and compiling.
+By default LZO and LZ4 embedded without external dependencies. Bzip2 and ZSTD are optional libraries, which are automatically added, if they are found while configuring and compiling.
 
 The standard **configure** process checks for the installed libraries lz4, bz2 and zstd and enables them if they are found.
 **configure** understands the following options:
@@ -451,7 +451,7 @@ This collector collects sflow https://www.sflow.org exports. It is largely ident
 
 This collector is able to listen on a host interface and generates netflow data from the network data stream on that interface. It make use of **PACKET_RX_RING** to read packets on an interface device level (**TPACKETV3**) on Linux hosts or of the **BPF** interface - Berkeley Packet Filter on ***BSD** hosts which provides raw access to data link layers. Nfpcapd builds an internal netflow cache which is periodically written to disk or forwarded to an nfcapd server. As a special feature, nfpcpad may collect the first few bytes of a network connection, if requested to do so ( **-o payload**), which allows filter and evaluate the flows with nfdump later. 
 
-Listen on eth0 and store the flows locally. Set flow cache active timeout to 60s, inactive tiemout to 30s: 
+Listen on eth0 and store the flows locally. Set flow cache active timeout to 60s, inactive timeout to 30s: 
 
 ```
 nfpcapd -D -S 2 -w /var/flows -i eth0 -e 60,30 -u daemon -g daemon

man/nfanon.1

@@ -53,7 +53,7 @@ All files in a directory are processed recursively.
 .Pp
 If the output argument
 .Fl w Ar nffile
-is given, all anonimized records are written into that single file, even if the 
+is given, all anonymized records are written into that single file, even if the 
 source is a directory. If no argument
 .Fl w
 is specified, 

man/nfdump.1

@@ -639,7 +639,7 @@ below for more details on how to compile your own csv format.
 .It Cm json
 Print full record as a separate json object.
 .It Cm ndjson
-Print full record as a one line json object, sepatated by newline. Suitable for log processors such as logstash.
+Print full record as a one line json object, separated by newline. Suitable for log processors such as logstash.
 .It Cm csv
 Print reocrd in csv format - format compatible to fmt
 .Sy line
@@ -960,7 +960,7 @@ or
 .Cm dst
 the source or destination geo location code may match. Please note: country codes, which match 
 .Nm
-filter language reserved words such as IN, LT etc must be explicitly quoted to be recoginzed as string.
+filter language reserved words such as IN, LT etc must be explicitly quoted to be recognized as string.
 .Pp
 .It Cm tun ip Ar ipaddr
 .It Cm src tun ip Ar ipaddr

man/nfexpire.1

@@ -124,13 +124,13 @@ and
 .It Fl s Ar maxsize
 This option sets the max size limit for all data files.
 .Ar maxsize
-accepts values such as 100M, 100MB 1G 1.5G (number + quantity factor) etc. Accpeted size 
+accepts values such as 100M, 100MB 1G 1.5G (number + quantity factor) etc. Accepted size 
 factors are K, KB, M, MB, G, GB and T, TB. If no factor is given, bytes (B) is assumed.
 A value of 0 disables the max size limit.
 .It Fl t Ar maxlife
 This option sets the max lifetime for the data files. 
 .Ar maxlife
-accepts values such as 31d, 240H 1.5d (number + quantity factor) etc. Accpeted time
+accepts values such as 31d, 240H 1.5d (number + quantity factor) etc. Accepted time
 factors are w (weeks) d (days) H (hours). If no factor is given, hours (H) is assumed.
 A value of 0 disables the max lifetime limit.
 .It Fl w Ar watermark

src/collector/bookkeeper.c

@@ -151,7 +151,7 @@ int InitBookkeeper(bookkeeper_t **bookkeeper, char *path, pid_t nfcapd_pid) {
         // the segment already exists. Either a running process is active
         // or an unclean shutdown happened
 
-        // map the segement and check the record
+        // map the segment and check the record
         *bookkeeper = (bookkeeper_t *)shmat(shm_id, NULL, 0);
         if (*bookkeeper == (bookkeeper_t *)-1) {
             LogError("shmat() error in %s line %d: %s", __FILE__, __LINE__, strerror(errno));
@@ -397,7 +397,7 @@ void ReleaseBookkeeper(bookkeeper_t *bookkeeper, int destroy) {
         return;
     }
 
-    // prevent other proceeses to access the share memory, while we are removing it
+    // prevent other processes to access the share memory, while we are removing it
     // try to clean up.
     sem_lock(bookkeeper_list_entry->sem_id);
     if (shmctl(bookkeeper_list_entry->shm_id, IPC_RMID, &buf)) {

src/collector/collector.h

@@ -82,7 +82,7 @@ typedef struct FlowSource_s {
     // all about data storage
     char *datadir;           // where to store data for this source
     char *current;           // current file name - typically nfcad.current.pid
-    int subdir;              // sub dir structur
+    int subdir;              // sub dir structure
     nffile_t *nffile;        // the writing file handle
     dataBlock_t *dataBlock;  // writing buffer
 

src/collector/expire.c

@@ -384,7 +384,7 @@ void ExpireDir(char *dir, dirstat_t *dirstat, uint64_t maxsize, uint64_t maxlife
             s = fgets(s1, 31, stdin);
             s1[31] = '\0';
             if (s && strncasecmp(s1, "yes\n", 31) == 0) {
-                printf("Ok - you've beeen warned!\n");
+                printf("Ok - you've been warned!\n");
             } else {
                 printf("Expire canceled!\n");
                 free(expire_timelimit);

src/collector/nfnet.c

@@ -184,7 +184,7 @@ int Unicast_send_socket(const char *hostname, const char *sendport, int family,
         if (sockfd < 0) {
             LogError("socket() error: could not open the requested socket: %s", strerror(errno));
         } else {
-            // socket call was successsful
+            // socket call was successful
             if (connect(sockfd, res->ai_addr, res->ai_addrlen) < 0) {
                 // unsuccessful connect :(
                 LogError("connect() error: could not open the requested socket: %s", strerror(errno));

src/collector/privsep.c

@@ -97,7 +97,7 @@ void pushMessage(messageQueue_t *messageQueue, message_t *message) {
         // messageQ already contains records, append to last element
         messageQueue->tail->next = listElement;
     } else {
-        // messageQ ist empty
+        // messageQ is empty
         messageQueue->head = listElement;
         // signal reader thread, there is a new record
         pthread_cond_signal(&(messageQueue->cond));
@@ -111,7 +111,7 @@ void pushMessage(messageQueue_t *messageQueue, message_t *message) {
 message_t *getMessage(messageQueue_t *messageQueue) {
     pthread_mutex_lock(&(messageQueue->mutex));
     while (messageQueue->head == NULL && done == 0) {
-        // messageQ ist empty
+        // messageQ is empty
         pthread_cond_wait(&(messageQueue->cond), &(messageQueue->mutex));
     }
 

src/libnfdump/filter/filter.h

@@ -107,7 +107,7 @@ typedef enum {
     FUNC_BPP,          // function code for bpp ( bytes per packet ) filter function
     FUNC_MPLS_LABEL,   // function code for matching an MPLS label
     FUNC_MPLS_EOS,     // function code for matching End of MPLS Stack label
-    FUNC_MPLS_EXP,     // function code for matching experimantal value in label
+    FUNC_MPLS_EXP,     // function code for matching experimental value in label
     FUNC_MPLS_ANY,     // function code for matching any MPLS label
     FUNC_PBLOCK,       // function code for matching ports against pblock start
     FUNC_MMAS_LOOKUP,  // function code for optional maxmind AS lookup