Fix typos

Author: phaag

src/collector/metric.h

@@ -79,5 +79,5 @@ void UpdateMetric(char *ident, uint32_t exporterID, EXgenericFlow_t *genericFlow
 
 void *MetricThread(void *arg);
 
-#define MetricExpporterID(r) (((uint32_t)(r)->exporterID << 16UL) | ((uint32_t)(r)->engineType << 8UL) | (uint32_t)(r)->engineID)
+#define MetricExporterID(r) (((uint32_t)(r)->exporterID << 16UL) | ((uint32_t)(r)->engineType << 8UL) | (uint32_t)(r)->engineID)
 #endif

src/libnffile/nffileV2.h

@@ -50,9 +50,9 @@
  *
  * Principal layout, recognized as LAYOUT_VERSION_2:
  *
- *   +-----------+-------------+-------------+-------------+-----+-------------+
- *   |Fileheader | datablock 0 | datablock 1 | datablock 2 | ... | datablock n |
- *   +-----------+-------------+-------------+-------------+-----+-------------+
+ *   +-----------+-------------+-------------+-----+-------------+-------------+
+ *   |Fileheader | datablock 0 | datablock 1 | ... | datablock n | Appdx block |
+ *   +-----------+-------------+-------------+-----+-------------+-------------+
  */
 
 typedef struct fileHeaderV2_s {
@@ -151,11 +151,6 @@ typedef struct recordHeader_s {
     uint16_t size;  // size of record including this header
 } recordHeader_t;
 
-#define PushRecord(p, h, t)                  \
-    recordHeader_t *h = (recordHeader_t *)p; \
-    h->type = t;                             \
-    h->size = sizeof(recordHeader_t);
-
 #define TYPE_IDENT 0x8001
 #define TYPE_STAT 0x8002
 

src/netflow/ipfix.c

@@ -1502,7 +1502,7 @@ static void Process_ipfix_data(exporter_entry_t *exporter_entry, uint32_t Export
             fs->nffile->stat_record->numpackets += genericFlow->inPackets;
             fs->nffile->stat_record->numbytes += genericFlow->inBytes;
 
-            uint32_t exporterIdent = MetricExpporterID(recordHeaderV3);
+            uint32_t exporterIdent = MetricExporterID(recordHeaderV3);
             UpdateMetric(fs->nffile->ident, exporterIdent, genericFlow);
         }
 

src/netflow/netflow_v1.c

@@ -332,7 +332,7 @@ void Process_v1(void *in_buff, ssize_t in_buff_cnt, FlowSource_t *fs) {
             fs->nffile->stat_record->numpackets += genericFlow->inPackets;
             fs->nffile->stat_record->numbytes += genericFlow->inBytes;
 
-            uint32_t exporterIdent = MetricExpporterID(recordHeader);
+            uint32_t exporterIdent = MetricExporterID(recordHeader);
             UpdateMetric(fs->nffile->ident, exporterIdent, genericFlow);
 
             if (printRecord) {

src/netflow/netflow_v5_v7.c

@@ -494,7 +494,7 @@ void Process_v5_v7(void *in_buff, ssize_t in_buff_cnt, FlowSource_t *fs) {
             fs->nffile->stat_record->numpackets += genericFlow->inPackets;
             fs->nffile->stat_record->numbytes += genericFlow->inBytes;
 
-            uint32_t exporterIdent = MetricExpporterID(recordHeader);
+            uint32_t exporterIdent = MetricExporterID(recordHeader);
             UpdateMetric(fs->nffile->ident, exporterIdent, genericFlow);
 
             if (printRecord) {

src/netflow/netflow_v9.c

@@ -1240,7 +1240,7 @@ static inline void Process_v9_data(exporter_entry_t *exporter_entry, void *data_
             fs->nffile->stat_record->numpackets += genericFlow->inPackets;
             fs->nffile->stat_record->numbytes += genericFlow->inBytes;
 
-            uint32_t exporterIdent = MetricExpporterID(recordHeaderV3);
+            uint32_t exporterIdent = MetricExporterID(recordHeaderV3);
             UpdateMetric(fs->nffile->ident, exporterIdent, genericFlow);
         }
 

src/netflow/nfd_raw.c

@@ -277,7 +277,7 @@ void Process_nfd(void *in_buff, ssize_t in_buff_cnt, FlowSource_t *fs) {
             fs->nffile->stat_record->numpackets += genericFlow->inPackets;
             fs->nffile->stat_record->numbytes += genericFlow->inBytes;
 
-            uint32_t exporterIdent = MetricExpporterID(recordHeaderV3);
+            uint32_t exporterIdent = MetricExporterID(recordHeaderV3);
             UpdateMetric(fs->nffile->ident, exporterIdent, genericFlow);
         }
 

src/nfpcapd/flowdump.c

@@ -269,7 +269,7 @@ static int StorePcapFlow(flowParam_t *flowParam, struct FlowNode *Node) {
         stat_record->numpackets += genericFlow->inPackets;
         stat_record->numbytes += genericFlow->inBytes;
 
-        uint32_t exporterIdent = MetricExpporterID(recordHeader);
+        uint32_t exporterIdent = MetricExporterID(recordHeader);
         UpdateMetric(fs->nffile->ident, exporterIdent, genericFlow);
 
         if (printRecord) {

src/sflow/sflow_nfdump.c

@@ -530,7 +530,7 @@ void StoreSflowRecord(SFSample *sample, FlowSource_t *fs) {
     stat_record->numpackets += genericFlow->inPackets;
     stat_record->numbytes += genericFlow->inBytes;
 
-    uint32_t exporterIdent = MetricExpporterID(recordHeader);
+    uint32_t exporterIdent = MetricExporterID(recordHeader);
     UpdateMetric(fs->nffile->ident, exporterIdent, genericFlow);
 
     if (PrintRecord) {