merge_all_tap_menus() has been moved to menus.c.

[obnox/wireshark/wip.git] / gtk / hostlist_table.h

diff --git a/gtk/hostlist_table.h b/gtk/hostlist_table.h
index 73ae442e501b2bf8a80c73bce5c2872072dbe8fd..a41119a90ea21f7de7b46afb26a7b2f40c19647b 100644 (file)
--- a/gtk/hostlist_table.h
+++ b/gtk/hostlist_table.h
@@ -4,25 +4,28 @@
  *
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifndef __HOSTLIST_TABLE_H__
+#define __HOSTLIST_TABLE_H__
+
 #include "sat.h"
 
 /** @file
@@ -36,26 +39,44 @@ typedef struct _hostlist_talker_t {
        guint32 port_type;      /**< port_type (e.g. PT_TCP) */
        guint32 port;           /**< port */
 
-       guint32 rx_frames;      /**< number of received packets */
-       guint32 tx_frames;      /**< number of transmitted packets */
-       guint32 rx_bytes;       /**< number of received bytes */
-       guint32 tx_bytes;       /**< number of transmitted bytes */
+       guint64 rx_frames;      /**< number of received packets */
+       guint64 tx_frames;      /**< number of transmitted packets */
+       guint64 rx_bytes;       /**< number of received bytes */
+       guint64 tx_bytes;       /**< number of transmitted bytes */
+
+        gboolean modified;      /**< new to redraw the row */   
+        GtkTreeIter iter; 
+        gboolean iter_valid;    /**< not a new row */
+
 } hostlist_talker_t;
 
+#define NUM_BUILTIN_COLS 8
+#ifdef HAVE_GEOIP
+# define NUM_GEOIP_COLS 13
+#else
+# define NUM_GEOIP_COLS 0
+#endif
+#define NUM_HOSTLIST_COLS (NUM_BUILTIN_COLS + NUM_GEOIP_COLS)
+
 /** Hostlist widget */
 typedef struct _hostlist_table {
-       char                *name;              /**< the name of the table */
+       const char          *name;              /**< the name of the table */
+       const char          *filter;            /**< the filter used */
+       gboolean             use_dfilter;       /**< use display filter */
        GtkWidget           *win;               /**< GTK window */
-       GtkWidget           *page_lb;           /**< label */
+       GtkWidget           *page_lb;           /**< page label */
+       GtkWidget           *name_lb;           /**< name label */
        GtkWidget           *scrolled_window;   /**< the scrolled window */
-       GtkCList            *table;             /**< the GTK table */
-       guint32             num_columns;        /**< number of columns in the above table */
-    char                *default_titles[8]; /**< Column headers */
+       GtkTreeView         *table;             /**< the GTK table */
+       const char          *default_titles[NUM_HOSTLIST_COLS]; /**< Column headers */
        GtkWidget           *menu;              /**< context menu */
        gboolean            has_ports;          /**< table has ports */
        guint32             num_hosts;          /**< number of hosts (0 or 1) */
-       hostlist_talker_t   *hosts;             /**< array of host values */
+       GArray              *hosts;             /**< array of host values */
+       GHashTable          *hashtable;         /**< conversations hash table */
+       gboolean            fixed_col;          /**< if switched to fixed column */
        gboolean            resolve_names;      /**< resolve address names? */
+       gboolean            geoip_visible;      /**< if geoip columns are visible */
 } hostlist_table;
 
 /** Register the hostlist table for the multiple hostlist window.
@@ -66,7 +87,7 @@ typedef struct _hostlist_table {
  * @param filter the optional filter name or NULL
  * @param packet_func the function to be called for each incoming packet
  */
-extern void register_hostlist_table(gboolean hide_ports, char *table_name, char *tap_name, char *filter, tap_packet_cb packet_func);
+extern void register_hostlist_table(gboolean hide_ports, const char *table_name, const char *tap_name, const char *filter, tap_packet_cb packet_func);
 
 /** Init the hostlist table for the single hostlist window.
  *
@@ -76,7 +97,7 @@ extern void register_hostlist_table(gboolean hide_ports, char *table_name, char
  * @param filter the optional filter name or NULL
  * @param packet_func the function to be called for each incoming packet
  */
-extern void init_hostlist_table(gboolean hide_ports, char *table_name, char *tap_name, char *filter, tap_packet_cb packet_func);
+extern void init_hostlist_table(gboolean hide_ports, const char *table_name, const char *tap_name, const char *filter, tap_packet_cb packet_func);
 
 /** Callback for "Endpoints" statistics item.
  *
@@ -98,3 +119,5 @@ extern void init_hostlist_notebook_cb(GtkWidget *w, gpointer d);
  */
 void add_hostlist_table_data(hostlist_table *hl, const address *addr,
                              guint32 port, gboolean sender, int num_frames, int num_bytes, SAT_E sat, int port_type);
+
+#endif /* __HOSTLIST_TABLE_H__ */