Qt: Refactor ConversationDialog for endpoints.

Create a TrafficTableDialog (for lack of a better name) parent class
from the general parts of ConversationDialog. Use it to create
EndpointsDialog.

Move the contents of conversation_tree_widget.{cpp,h} to
conversation_dialog.{cpp,h} to match endpoint_dialog and
traffic_table_dialog.

Fill in GeoIP columns dynamically instead of using a hard-coded limit.

Use "endp_" and "ENDP_" prefixes for a lot of endpoint variables and
defines.

Try to make geoip_db_lookup_ipv4 and geoip_db_lookup_ipv6 more robust.

Clean up some includes. Fix a shadowed variable.

Change-Id: I23054816ac7f8c6edb3b1f01c8536db37ba4122d
Reviewed-on: https://code.wireshark.org/review/3462
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

1 files changed, 92 insertions, 0 deletions

diff --git a/ui/traffic_table_ui.h b/ui/traffic_table_ui.h
new file mode 100644
index 0000000000..0b7de72752
--- /dev/null
+++ b/ui/traffic_table_ui.h
@@ -0,0 +1,92 @@
+/* traffic_table_ui.h
+ * Copied from gtk/conversations_table.h   2003 Ronnie Sahlberg
+ * Helper routines common to all conversations taps.
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef __CONVERSATION_UI_H__
+#define __CONVERSATION_UI_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/** @file
+ *  Conversation and endpoint lists.
+ */
+
+typedef enum {
+    CONV_COLUMN_SRC_ADDR,
+    CONV_COLUMN_SRC_PORT,
+    CONV_COLUMN_DST_ADDR,
+    CONV_COLUMN_DST_PORT,
+    CONV_COLUMN_PACKETS,
+    CONV_COLUMN_BYTES,
+    CONV_COLUMN_PKT_AB,
+    CONV_COLUMN_BYTES_AB,
+    CONV_COLUMN_PKT_BA,
+    CONV_COLUMN_BYTES_BA,
+    CONV_COLUMN_START,
+    CONV_COLUMN_DURATION,
+    CONV_COLUMN_BPS_AB,
+    CONV_COLUMN_BPS_BA,
+    CONV_NUM_COLUMNS,
+    CONV_INDEX_COLUMN = CONV_NUM_COLUMNS
+} conversation_column_type_e;
+
+extern const char *conv_column_titles[CONV_NUM_COLUMNS];
+extern const char *conv_conn_a_title;
+extern const char *conv_conn_b_title;
+
+typedef enum
+{
+    ENDP_COLUMN_ADDR,
+    ENDP_COLUMN_PORT,
+    ENDP_COLUMN_PACKETS,
+    ENDP_COLUMN_BYTES,
+    ENDP_COLUMN_PKT_AB,
+    ENDP_COLUMN_BYTES_AB,
+    ENDP_COLUMN_PKT_BA,
+    ENDP_COLUMN_BYTES_BA,
+    ENDP_NUM_COLUMNS,
+} endpoint_column_type_e;
+
+extern const char *endp_column_titles[ENDP_NUM_COLUMNS];
+
+extern const char *endp_conn_title;
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __CONVERSATION_UI_H__ */
+
+/*
+ * Editor modelines
+ *
+ * Local Variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */