Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 15 insertions, 3 deletions

diff --git a/ui/qt/conversation_hash_tables_dialog.cpp b/ui/qt/conversation_hash_tables_dialog.cpp
index cc699dae..f7f4fc74 100644
--- a/ui/qt/conversation_hash_tables_dialog.cpp
+++ b/ui/qt/conversation_hash_tables_dialog.cpp
@@ -12,8 +12,6 @@
 
 #include "config.h"
 
-#include <glib.h>
-
 #include <epan/conversation.h>
 #include <epan/conversation_debug.h>
 
@@ -21,7 +19,7 @@
 #include "main_application.h"
 
 static void
-fill_named_table(gpointer key, gpointer value _U_, gpointer user_data)
+fill_named_table(void *key, void *value _U_, void *user_data)
 {
     const conversation_element_t *elements = static_cast<const conversation_element_t *>(key);
     QString* html_table = static_cast<QString *>(user_data);
@@ -38,6 +36,8 @@ fill_named_table(gpointer key, gpointer value _U_, gpointer user_data)
         int uint_count = 1;
         int uint64_count = 1;
         int int_count = 1;
+        int int64_count = 1;
+        int blob_count = 1;
         for (const conversation_element_t *cur_el = elements; ; cur_el++) {
             QString title;
             switch (cur_el->type) {
@@ -59,6 +59,12 @@ fill_named_table(gpointer key, gpointer value _U_, gpointer user_data)
             case CE_INT:
                 title = QString("Int %1").arg(int_count++);
                 break;
+            case CE_INT64:
+                title = QString("Int64 %1").arg(int64_count++);
+                break;
+            case CE_BLOB:
+                title = QString("Blob %1").arg(blob_count++);
+                break;
             case CE_CONVERSATION_TYPE:
                 html_table->append(QString("<th>Endpoint</th>"));
                 goto title_done;
@@ -93,6 +99,12 @@ title_done:
         case CE_INT:
             val = QString::number(cur_el->int_val);
             break;
+        case CE_INT64:
+            val = QString::number(cur_el->int64_val);
+            break;
+        case CE_BLOB:
+            val = QString(QByteArray::fromRawData((const char *)cur_el->blob.val, (int)cur_el->blob.len).toHex());
+            break;
         case CE_CONVERSATION_TYPE:
             html_table->append(QString("<td>%1</td>").arg(QString::number(cur_el->conversation_type_val)));
             goto val_done;