fdsdump: add support for octetArray as an aggregation key

Author: Lukas955

src/tools/fdsdump/src/aggregator/aggregator.cpp

@@ -161,6 +161,7 @@ load_view_value(const ViewField &view_field, fds_drec_field &drec_field, ViewVal
         value.i64 = FieldView(drec_field).as_int();
         break;
     case DataType::String128B:
+    case DataType::Octets128B:
         memset(value.str, 0, 128);
         memcpy(value.str, drec_field.data, std::min<int>(drec_field.size, 128));
         break;

src/tools/fdsdump/src/aggregator/jsonPrinter.cpp

@@ -75,19 +75,14 @@ JSONPrinter::append_field(const ViewField &field, ViewValue *value)
 void
 JSONPrinter::append_value(const ViewField &field, ViewValue *value)
 {
-    char tmp[256];
-    print_value(field, *value, tmp, false);
-
     switch (field.data_type) {
-    case DataType::Unassigned:
     case DataType::IPAddress:
     case DataType::IPv4Address:
     case DataType::IPv6Address:
     case DataType::MacAddress:
     case DataType::DateTime:
-    case DataType::String128B:
         m_buffer.push_back('"');
-        m_buffer.append(tmp);
+        print_value(field, *value, m_buffer);
         m_buffer.push_back('"');
         return;
     case DataType::Unsigned8:
@@ -98,8 +93,93 @@ JSONPrinter::append_value(const ViewField &field, ViewValue *value)
     case DataType::Signed32:
     case DataType::Unsigned64:
     case DataType::Signed64:
-        m_buffer.append(tmp);
+        print_value(field, *value, m_buffer);
         return;
+    case DataType::String128B:
+        m_buffer.push_back('"');
+        append_string_value(value);
+        m_buffer.push_back('"');
+        return;
+    case DataType::Octets128B:
+        m_buffer.push_back('"');
+        append_octet_value(value);
+        m_buffer.push_back('"');
+        return;
+    case DataType::Unassigned:
+        m_buffer.append("null");
+        return;
+    }
+}
+
+void
+JSONPrinter::append_string_value(const ViewValue *value)
+{
+    size_t last_byte;
+
+    for (last_byte = sizeof(value->str); last_byte > 0; --last_byte) {
+        if (value->str[last_byte - 1] != 0) {
+            break;
+        }
+    }
+
+    for (size_t i = 0; i < last_byte; ++i) {
+        const char byte = value->str[i];
+
+        // Escape characters
+        switch (byte) {
+        case '"':
+            m_buffer.append("\\\"");
+            continue;
+        case '\'':
+            m_buffer.append("\\\\");
+            continue;
+        case '/':
+            m_buffer.append("\\/");
+            continue;;
+        case '\b':
+            m_buffer.append("\\b");
+            continue;
+        case '\f':
+            m_buffer.append("\\f");
+            continue;
+        case '\n':
+            m_buffer.append("\\n");
+            continue;
+        case '\r':
+            m_buffer.append("\\r");
+            continue;
+        case '\t':
+            m_buffer.append("\\t");
+            continue;
+        default:
+            break;
+        }
+
+        if (byte >= '\x00' && byte <= '\x1F') {
+            m_buffer.append(char2hex(byte));
+        } else {
+            m_buffer.append(1, byte);
+        }
+    }
+}
+
+void
+JSONPrinter::append_octet_value(const ViewValue *value)
+{
+    size_t last_byte;
+
+    m_buffer.append("0x");
+
+    // Find first non-zero byte from the end (at least one byte must be printed)
+    for (last_byte = sizeof(value->str); last_byte > 1; --last_byte) {
+        if (value->str[last_byte - 1] != 0) {
+            break;
+        }
+    }
+
+    for (size_t i = 0; i < last_byte; ++i) {
+        const char byte = value->str[i];
+        m_buffer.append(char2hex(byte));
     }
 }
 

src/tools/fdsdump/src/aggregator/jsonPrinter.hpp

@@ -26,6 +26,8 @@ class JSONPrinter : public Printer
 private:
     void append_field(const ViewField &field, ViewValue *value);
     void append_value(const ViewField &field, ViewValue *value);
+    void append_string_value(const ViewValue *value);
+    void append_octet_value(const ViewValue *value);
 
     ViewDefinition m_view_def;
     std::string m_buffer;