UniRec output: all elements of IPFIX linked list are now checked in both map and conversion comparator functions

Author: havraji6

extra_plugins/output/unirec/src/map.c

@@ -455,39 +455,32 @@ map_load_line(map_t *map, const char *line, size_t line_id)
 static int
 map_sort_fn(const void *p1, const void *p2)
 {
-    struct map_rec *rec1 = *(struct map_rec **) p1;
-    struct map_rec *rec2 = *(struct map_rec **) p2;
+    const struct map_ipfix_s *ipfix1 = &(*(struct map_rec **) p1)->ipfix;
+    const struct map_ipfix_s *ipfix2 = &(*(struct map_rec **) p2)->ipfix;
 
-    if (rec1->ipfix.source != rec2->ipfix.source) {
-        return (rec1->ipfix.source < rec2->ipfix.source) ? (-1) : 1;
-    }
-
-    // Primary sort by PEN
-    if (rec1->ipfix.en != rec2->ipfix.en) {
-        return (rec1->ipfix.en < rec2->ipfix.en) ? (-1) : 1;
-    }
-
-    // Secondary sort by ID
-    if (rec1->ipfix.id != rec2->ipfix.id) {
-        return (rec1->ipfix.id < rec2->ipfix.id) ? (-1) : 1;
-    }
+    while (ipfix1 && ipfix2) {
+       if (ipfix1->source != ipfix2->source) {
+           return (ipfix1->source < ipfix2->source) ? (-1) : 1;
+       }
 
-    // TODO: better and more readable code
-    // TODO: check all elements in linked list
-    if (rec1->ipfix.next != NULL && rec2->ipfix.next != NULL) {
        // Primary sort by PEN
-       if (rec1->ipfix.next->en != rec2->ipfix.next->en) {
-           return (rec1->ipfix.next->en < rec2->ipfix.next->en) ? (-1) : 1;
+       if (ipfix1->en != ipfix2->en) {
+           return (ipfix1->en < ipfix2->en) ? (-1) : 1;
        }
 
        // Secondary sort by ID
-       if (rec1->ipfix.next->id != rec2->ipfix.next->id) {
-           return (rec1->ipfix.next->id < rec2->ipfix.next->id) ? (-1) : 1;
+       if (ipfix1->id != ipfix2->id) {
+           return (ipfix1->id < ipfix2->id) ? (-1) : 1;
        }
-    } else if (rec1->ipfix.next != NULL) {
-      return -1;
-    } else if (rec2->ipfix.next != NULL) {
-      return 1;
+
+       ipfix1 = ipfix1->next;
+       ipfix2 = ipfix2->next;
+    }
+
+    if (ipfix1->next) {
+       return -1;
+    } else if (ipfix2->next) {
+       return 1;
     }
 
     return 0;

extra_plugins/output/unirec/src/translator.c

@@ -1308,31 +1308,26 @@ translator_cmp(const void *p1, const void *p2)
     const struct tr_ipfix_s *ipfix1 = &((const struct translator_rec *) p1)->ipfix;
     const struct tr_ipfix_s *ipfix2 = &((const struct translator_rec *) p2)->ipfix;
 
-    uint64_t elem1_val = ((uint64_t) ipfix1->pen) << 16 | ipfix1->id;
-    uint64_t elem2_val = ((uint64_t) ipfix2->pen) << 16 | ipfix2->id;
+    while (ipfix1 && ipfix2) {
+       uint64_t elem1_val = ((uint64_t) ipfix1->pen) << 16 | ipfix1->id;
+       uint64_t elem2_val = ((uint64_t) ipfix2->pen) << 16 | ipfix2->id;
 
-    if (elem1_val == elem2_val) {
-      // TODO: check all ipfix elements
+      if (elem1_val < elem2_val) {
+         return -1;
+      } else if (elem1_val > elem2_val) {
+         return 1;
+      }
 
        ipfix1 = ipfix1->next;
        ipfix2 = ipfix2->next;
-       if (ipfix1 && ipfix2) {
-          elem1_val = ((uint64_t) ipfix1->pen) << 16 | ipfix1->id;
-          elem2_val = ((uint64_t) ipfix2->pen) << 16 | ipfix2->id;
-          if (elem1_val == elem2_val) {
-             return 0;
-          } else {
-             return (elem1_val < elem2_val) ? (-1) : 1;
-          }
-       } else if (ipfix1) {
-          return -1;
-       } else if (ipfix2) {
-          return 1;
-       }
-       return 0;
-    } else {
-        return (elem1_val < elem2_val) ? (-1) : 1;
     }
+
+    if (ipfix1) {
+       return -1;
+    } else if (ipfix2) {
+       return 1;
+    }
+    return 0;
 }
 
 /**