Oops, I checked the wrong tap into CVS somehow.

svn path=/trunk/; revision=9234

1 files changed, 559 insertions, 131 deletions

diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c
index fcf044d8d1..319082c159 100644
--- a/gtk/gsm_a_stat.c
+++ b/gtk/gsm_a_stat.c
@@ -1,9 +1,11 @@
-/* tap-gsm_astat.c
+/* gsm_a_stat.c
  *
  * Copyright 2003, Michael Lum <mlum [AT] telostech.com>
  * In association with Telos Technology Inc.
  *
- * $Id: gsm_a_stat.c,v 1.1 2003/12/09 18:49:32 guy Exp $
+ * MUCH code modified from service_response_time_table.c.
+ *
+ * $Id: gsm_a_stat.c,v 1.2 2003/12/10 21:21:16 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -25,27 +27,45 @@
  */
 
 /*
- * This TAP provides statistics for the GSM A Interface:
+ * This TAP provides statistics for the GSM A-Interface:
  */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
-#include <stdio.h>
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
+#include <gtk/gtk.h>
 #include <string.h>
+
 #include "epan/packet_info.h"
+#include "epan/epan.h"
 #include "epan/value_string.h"
+#include "menu.h"
+#include "image/clist_ascend.xpm"
+#include "image/clist_descend.xpm"
+#include "simple_dialog.h"
+#include "dlg_utils.h"
 #include "tap.h"
+#include "../register.h"
 #include "packet-bssap.h"
 #include "packet-gsm_a.h"
-#include "register.h"
+#include "../globals.h"
+#include "filter_prefs.h"
+#include "compat_macros.h"
+
 
+typedef struct column_arrows {
+    GtkWidget		*table;
+    GtkWidget		*ascend_pm;
+    GtkWidget		*descend_pm;
+} column_arrows;
+
+typedef struct _gsm_a_stat_dlg_t {
+    GtkWidget		*win;
+    GtkWidget		*scrolled_win;
+    GtkWidget		*table;
+    char		*entries[3];
+} gsm_a_stat_dlg_t;
 
 typedef struct _gsm_a_stat_t {
     int		bssmap_message_type[0xff];
@@ -59,48 +79,69 @@ typedef struct _gsm_a_stat_t {
 } gsm_a_stat_t;
 
 
+static gsm_a_stat_dlg_t		dlg_bssmap;
+static gsm_a_stat_dlg_t		dlg_dtap_mm;
+static gsm_a_stat_dlg_t		dlg_dtap_rr;
+static gsm_a_stat_dlg_t		dlg_dtap_cc;
+static gsm_a_stat_dlg_t		dlg_dtap_gmm;
+static gsm_a_stat_dlg_t		dlg_dtap_sms;
+static gsm_a_stat_dlg_t		dlg_dtap_sm;
+static gsm_a_stat_dlg_t		dlg_dtap_ss;
+static gsm_a_stat_t		stat;
+
+
+static void
+gsm_a_stat_reset(
+    void		*tapdata)
+{
+    tapdata = tapdata;
+
+    memset((void *) &stat, 0, sizeof(gsm_a_stat_t));
+}
+
+
 static int
 gsm_a_stat_packet(
-    void			*tapdata,
-    packet_info			*pinfo,
-    epan_dissect_t		*edt _U_,
-    void			*data)
+    void		*tapdata,
+    packet_info		*pinfo,
+    epan_dissect_t	*edt _U_,
+    void		*data)
 {
-    gsm_a_stat_t		*stat_p = tapdata;
-    gsm_a_tap_rec_t		*tap_p = data;
+    gsm_a_tap_rec_t	*data_p = data;
 
 
+    tapdata = tapdata;
     pinfo = pinfo;
 
-    switch (tap_p->pdu_type)
+    switch (data_p->pdu_type)
     {
     case BSSAP_PDU_TYPE_BSSMAP:
-	stat_p->bssmap_message_type[tap_p->message_type]++;
+	stat.bssmap_message_type[data_p->message_type]++;
 	break;
 
     case BSSAP_PDU_TYPE_DTAP:
-	switch (tap_p->protocol_disc)
+	switch (data_p->protocol_disc)
 	{
 	case PD_CC:
-	    stat_p->dtap_cc_message_type[tap_p->message_type]++;
+	    stat.dtap_cc_message_type[data_p->message_type]++;
 	    break;
 	case PD_MM:
-	    stat_p->dtap_mm_message_type[tap_p->message_type]++;
+	    stat.dtap_mm_message_type[data_p->message_type]++;
 	    break;
 	case PD_RR:
-	    stat_p->dtap_rr_message_type[tap_p->message_type]++;
+	    stat.dtap_rr_message_type[data_p->message_type]++;
 	    break;
 	case PD_GMM:
-	    stat_p->dtap_gmm_message_type[tap_p->message_type]++;
+	    stat.dtap_gmm_message_type[data_p->message_type]++;
 	    break;
 	case PD_SMS:
-	    stat_p->dtap_sms_message_type[tap_p->message_type]++;
+	    stat.dtap_sms_message_type[data_p->message_type]++;
 	    break;
 	case PD_SM:
-	    stat_p->dtap_sm_message_type[tap_p->message_type]++;
+	    stat.dtap_sm_message_type[data_p->message_type]++;
 	    break;
 	case PD_SS:
-	    stat_p->dtap_ss_message_type[tap_p->message_type]++;
+	    stat.dtap_ss_message_type[data_p->message_type]++;
 	    break;
 	default:
 	    /*
@@ -122,177 +163,542 @@ gsm_a_stat_packet(
 
 
 static void
-gsm_a_stat_draw(
-    void		*tapdata)
+gsm_a_stat_draw_aux(
+    gsm_a_stat_dlg_t	*dlg_p,
+    int			*message_count,
+    const value_string	*msg_strings)
 {
-    gsm_a_stat_t	*stat_p = tapdata;
-    guint8		i;
+    int			i, j;
+    char		str[256], *strp;
 
 
-    printf("\n");
-    printf("=========== GS=M A-i/f Statistics ============================\n");
-    printf("BSSMAP\n");
-    printf("Message (ID)Type                                        Number\n");
-
-    i = 0;
-    while (gsm_a_bssmap_msg_strings[i].strptr)
+    if (dlg_p->win != NULL)
     {
-	if (stat_p->bssmap_message_type[gsm_a_bssmap_msg_strings[i].value] > 0)
+	i = 0;
+
+	while (msg_strings[i].strptr)
 	{
-	    printf("0x%02x  %-50s%d\n",
-		gsm_a_bssmap_msg_strings[i].value,
-		gsm_a_bssmap_msg_strings[i].strptr,
-		stat_p->bssmap_message_type[gsm_a_bssmap_msg_strings[i].value]);
+	    j = gtk_clist_find_row_from_data(GTK_CLIST(dlg_p->table), (gpointer) i);
+
+	    sprintf(str, "%d", message_count[msg_strings[i].value]);
+	    strp = g_strdup(str);
+	    gtk_clist_set_text(GTK_CLIST(dlg_p->table), j, 2, strp);
+	    g_free(strp);
+
+	    i++;
 	}
 
-	i++;
+	gtk_clist_sort(GTK_CLIST(dlg_p->table));
     }
+}
+
+static void
+gsm_a_stat_draw(
+    void		*tapdata)
+{
 
-    printf("\nDTAP %s\n", gsm_a_pd_str[PD_MM]);
-    printf("Message (ID)Type                                        Number\n");
+    tapdata = tapdata;
 
-    i = 0;
-    while (gsm_a_dtap_msg_mm_strings[i].strptr)
+    if (dlg_bssmap.win != NULL)
     {
-	if (stat_p->dtap_mm_message_type[gsm_a_dtap_msg_mm_strings[i].value] > 0)
-	{
-	    printf("0x%02x  %-50s%d\n",
-		gsm_a_dtap_msg_mm_strings[i].value,
-		gsm_a_dtap_msg_mm_strings[i].strptr,
-		stat_p->dtap_mm_message_type[gsm_a_dtap_msg_mm_strings[i].value]);
-	}
+	gsm_a_stat_draw_aux(&dlg_bssmap,
+	    stat.bssmap_message_type,
+	    gsm_a_bssmap_msg_strings);
+    }
 
-	i++;
+    if (dlg_dtap_mm.win != NULL)
+    {
+	gsm_a_stat_draw_aux(&dlg_dtap_mm,
+	    stat.dtap_mm_message_type,
+	    gsm_a_dtap_msg_mm_strings);
     }
 
-    printf("\nDTAP %s\n", gsm_a_pd_str[PD_RR]);
-    printf("Message (ID)Type                                        Number\n");
+    if (dlg_dtap_rr.win != NULL)
+    {
+	gsm_a_stat_draw_aux(&dlg_dtap_rr,
+	    stat.dtap_rr_message_type,
+	    gsm_a_dtap_msg_rr_strings);
+    }
 
-    i = 0;
-    while (gsm_a_dtap_msg_rr_strings[i].strptr)
+    if (dlg_dtap_cc.win != NULL)
     {
-	if (stat_p->dtap_rr_message_type[gsm_a_dtap_msg_rr_strings[i].value] > 0)
-	{
-	    printf("0x%02x  %-50s%d\n",
-		gsm_a_dtap_msg_rr_strings[i].value,
-		gsm_a_dtap_msg_rr_strings[i].strptr,
-		stat_p->dtap_rr_message_type[gsm_a_dtap_msg_rr_strings[i].value]);
-	}
+	gsm_a_stat_draw_aux(&dlg_dtap_cc,
+	    stat.dtap_cc_message_type,
+	    gsm_a_dtap_msg_cc_strings);
+    }
 
-	i++;
+    if (dlg_dtap_gmm.win != NULL)
+    {
+	gsm_a_stat_draw_aux(&dlg_dtap_gmm,
+	    stat.dtap_gmm_message_type,
+	    gsm_a_dtap_msg_gmm_strings);
     }
 
-    printf("\nDTAP %s\n", gsm_a_pd_str[PD_CC]);
-    printf("Message (ID)Type                                        Number\n");
+    if (dlg_dtap_sms.win != NULL)
+    {
+	gsm_a_stat_draw_aux(&dlg_dtap_sms,
+	    stat.dtap_sms_message_type,
+	    gsm_a_dtap_msg_sms_strings);
+    }
 
-    i = 0;
-    while (gsm_a_dtap_msg_cc_strings[i].strptr)
+    if (dlg_dtap_sm.win != NULL)
     {
-	if (stat_p->dtap_cc_message_type[gsm_a_dtap_msg_cc_strings[i].value] > 0)
-	{
-	    printf("0x%02x  %-50s%d\n",
-		gsm_a_dtap_msg_cc_strings[i].value,
-		gsm_a_dtap_msg_cc_strings[i].strptr,
-		stat_p->dtap_cc_message_type[gsm_a_dtap_msg_cc_strings[i].value]);
-	}
+	gsm_a_stat_draw_aux(&dlg_dtap_sm,
+	    stat.dtap_sm_message_type,
+	    gsm_a_dtap_msg_sm_strings);
+    }
 
-	i++;
+    if (dlg_dtap_ss.win != NULL)
+    {
+	gsm_a_stat_draw_aux(&dlg_dtap_ss,
+	    stat.dtap_ss_message_type,
+	    gsm_a_dtap_msg_ss_strings);
     }
+}
 
-    printf("\nDTAP %s\n", gsm_a_pd_str[PD_GMM]);
-    printf("Message (ID)Type                                        Number\n");
 
-    i = 0;
-    while (gsm_a_dtap_msg_gmm_strings[i].strptr)
+static void
+gsm_a_stat_gtk_click_column_cb(
+    GtkCList		*clist,
+    gint		column,
+    gpointer		data)
+{
+    column_arrows	*col_arrows = (column_arrows *) data;
+    int			i;
+
+
+    gtk_clist_freeze(clist);
+
+    for (i=0; i < 3; i++)
     {
-	if (stat_p->dtap_gmm_message_type[gsm_a_dtap_msg_gmm_strings[i].value] > 0)
+	gtk_widget_hide(col_arrows[i].ascend_pm);
+	gtk_widget_hide(col_arrows[i].descend_pm);
+    }
+
+    if (column == clist->sort_column)
+    {
+	if (clist->sort_type == GTK_SORT_ASCENDING)
+	{
+	    clist->sort_type = GTK_SORT_DESCENDING;
+	    gtk_widget_show(col_arrows[column].descend_pm);
+	}
+	else
+	{
+	    clist->sort_type = GTK_SORT_ASCENDING;
+	    gtk_widget_show(col_arrows[column].ascend_pm);
+	}
+    }
+    else
+    {
+	/*
+	 * Columns 0-1 sorted in descending order by default
+	 * Columns 2 sorted in ascending order by default
+	 */
+	if (column <= 1)
+	{
+	    clist->sort_type = GTK_SORT_ASCENDING;
+	    gtk_widget_show(col_arrows[column].ascend_pm);
+	}
+	else
 	{
-	    printf("0x%02x  %-50s%d\n",
-		gsm_a_dtap_msg_gmm_strings[i].value,
-		gsm_a_dtap_msg_gmm_strings[i].strptr,
-		stat_p->dtap_gmm_message_type[gsm_a_dtap_msg_gmm_strings[i].value]);
+	    clist->sort_type = GTK_SORT_DESCENDING;
+	    gtk_widget_show(col_arrows[column].descend_pm);
 	}
 
-	i++;
+	gtk_clist_set_sort_column(clist, column);
     }
 
-    printf("\nDTAP %s\n", gsm_a_pd_str[PD_SMS]);
-    printf("Message (ID)Type                                        Number\n");
+    gtk_clist_thaw(clist);
+    gtk_clist_sort(clist);
+}
+
 
-    i = 0;
-    while (gsm_a_dtap_msg_sms_strings[i].strptr)
+static gint
+gsm_a_stat_gtk_sort_column(
+    GtkCList		*clist,
+    gconstpointer	ptr1,
+    gconstpointer	ptr2)
+{
+    GtkCListRow		*row1 = (GtkCListRow *) ptr1;
+    GtkCListRow		*row2 = (GtkCListRow *) ptr2;
+    char		*text1 = NULL;
+    char		*text2 = NULL;
+    int			i1, i2;
+
+    text1 = GTK_CELL_TEXT(row1->cell[clist->sort_column])->text;
+    text2 = GTK_CELL_TEXT(row2->cell[clist->sort_column])->text;
+
+    switch (clist->sort_column)
+    {
+    case 0:
+	/* FALLTHRU */
+
+    case 2:
+	i1 = strtol(text1, NULL, 0);
+	i2 = strtol(text2, NULL, 0);
+	return(i1 - i2);
+
+    case 1:
+	return(strcmp(text1, text2));
+    }
+
+    g_assert_not_reached();
+
+    return(0);
+}
+
+
+static void
+gsm_a_stat_gtk_dlg_close_cb(
+    GtkButton		*button _U_,
+    gpointer		user_data _U_)
+{
+    gsm_a_stat_dlg_t	*dlg_p = user_data;
+
+    gtk_grab_remove(GTK_WIDGET(dlg_p->win));
+    gtk_widget_destroy(GTK_WIDGET(dlg_p->win));
+}
+
+
+static void
+gsm_a_stat_gtk_win_destroy_cb(
+    GtkWindow		*win _U_,
+    gpointer		user_data _U_)
+{
+    memset((void *) user_data, 0, sizeof(gsm_a_stat_dlg_t));
+}
+
+
+static void
+gsm_a_stat_gtk_win_create(
+    gsm_a_stat_dlg_t	*dlg_p,
+    char		*title)
+{
+#define	INIT_TABLE_NUM_COLUMNS	3
+    char		*default_titles[] = { "IEI", "Message Name", "Count" };
+    int			i;
+    column_arrows	*col_arrows;
+    GdkBitmap		*ascend_bm, *descend_bm;
+    GdkPixmap		*ascend_pm, *descend_pm;
+    GtkStyle		*win_style;
+    GtkWidget		*column_lb;
+    GtkWidget		*vbox;
+    GtkWidget		*bt_close;
+    GtkWidget		*hbuttonbox;
+    GtkWidget		*dialog_vbox;
+    GtkWidget		*dialog_action_area;
+
+
+    dlg_p->win = gtk_dialog_new();
+    gtk_window_set_default_size(GTK_WINDOW(dlg_p->win), 490, 500);
+    gtk_window_set_title(GTK_WINDOW(dlg_p->win), title);
+    SIGNAL_CONNECT(dlg_p->win, "destroy", gsm_a_stat_gtk_win_destroy_cb, dlg_p);
+
+    dialog_vbox = GTK_DIALOG(dlg_p->win)->vbox;
+    gtk_widget_show(dialog_vbox);
+
+    dialog_action_area = GTK_DIALOG(dlg_p->win)->action_area;
+    gtk_widget_show(dialog_action_area);
+    gtk_container_set_border_width(GTK_CONTAINER(dialog_action_area), 10);
+
+    hbuttonbox = gtk_hbutton_box_new();
+    gtk_widget_ref(hbuttonbox);
+    gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "hbuttonbox", hbuttonbox,
+	(GtkDestroyNotify) gtk_widget_unref);
+    gtk_widget_show(hbuttonbox);
+    gtk_box_pack_start(GTK_BOX(dialog_action_area), hbuttonbox, FALSE, FALSE, 0);
+    gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox), GTK_BUTTONBOX_END);
+    gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbuttonbox), 0);
+
+    bt_close = gtk_button_new_with_label("Close");
+    gtk_widget_ref(bt_close);
+    gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "bt_close", bt_close,
+	(GtkDestroyNotify) gtk_widget_unref);
+    gtk_widget_show(bt_close);
+    gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_close);
+    GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT);
+    SIGNAL_CONNECT(bt_close, "clicked", gsm_a_stat_gtk_dlg_close_cb, dlg_p);
+
+    vbox = gtk_vbox_new(FALSE, 0);
+    gtk_widget_ref(vbox);
+    gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "vbox", vbox,
+	(GtkDestroyNotify) gtk_widget_unref);
+    gtk_widget_show(vbox);
+    gtk_box_pack_start(GTK_BOX(dialog_vbox), vbox, TRUE, TRUE, 0);
+    gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
+
+    dlg_p->scrolled_win = gtk_scrolled_window_new(NULL, NULL);
+    gtk_widget_ref(dlg_p->scrolled_win);
+    gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "scrolled_win", dlg_p->scrolled_win,
+	(GtkDestroyNotify) gtk_widget_unref);
+    gtk_widget_show(dlg_p->scrolled_win);
+    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dlg_p->scrolled_win),
+	GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+    gtk_box_pack_start(GTK_BOX(vbox), dlg_p->scrolled_win, TRUE, TRUE, 0);
+
+    dlg_p->table = gtk_clist_new(INIT_TABLE_NUM_COLUMNS);
+    gtk_widget_ref(dlg_p->table);
+    gtk_object_set_data_full(GTK_OBJECT(dlg_p->win), "table", GTK_CLIST(dlg_p->table),
+	(GtkDestroyNotify) gtk_widget_unref);
+    gtk_widget_show(dlg_p->table);
+
+    gtk_widget_show(dlg_p->win);
+
+    col_arrows =
+	(column_arrows *) g_malloc(sizeof(column_arrows) * INIT_TABLE_NUM_COLUMNS);
+
+    win_style =
+	gtk_widget_get_style(dlg_p->scrolled_win);
+
+    ascend_pm =
+	gdk_pixmap_create_from_xpm_d(dlg_p->scrolled_win->window,
+	    &ascend_bm,
+	    &win_style->bg[GTK_STATE_NORMAL],
+	    (gchar **) clist_ascend_xpm);
+
+    descend_pm =
+	gdk_pixmap_create_from_xpm_d(dlg_p->scrolled_win->window,
+	    &descend_bm,
+	    &win_style->bg[GTK_STATE_NORMAL],
+	    (gchar **)clist_descend_xpm);
+
+    for (i = 0; i < INIT_TABLE_NUM_COLUMNS; i++)
     {
-	if (stat_p->dtap_sms_message_type[gsm_a_dtap_msg_sms_strings[i].value] > 0)
+	col_arrows[i].table = gtk_table_new(2, 2, FALSE);
+
+	gtk_table_set_col_spacings(GTK_TABLE(col_arrows[i].table), 5);
+
+	column_lb = gtk_label_new(default_titles[i]);
+
+	gtk_table_attach(GTK_TABLE(col_arrows[i].table), column_lb,
+	    0, 1, 0, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+	gtk_widget_show(column_lb);
+
+	col_arrows[i].ascend_pm =
+	    gtk_pixmap_new(ascend_pm, ascend_bm);
+
+	gtk_table_attach(GTK_TABLE(col_arrows[i].table), col_arrows[i].ascend_pm,
+	    1, 2, 1, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+	col_arrows[i].descend_pm =
+	    gtk_pixmap_new(descend_pm, descend_bm);
+
+	gtk_table_attach(GTK_TABLE(col_arrows[i].table), col_arrows[i].descend_pm,
+	    1, 2, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+	if (i == 0)
 	{
-	    printf("0x%02x  %-50s%d\n",
-		gsm_a_dtap_msg_sms_strings[i].value,
-		gsm_a_dtap_msg_sms_strings[i].strptr,
-		stat_p->dtap_sms_message_type[gsm_a_dtap_msg_sms_strings[i].value]);
+	    /* default column sorting */
+	    gtk_widget_show(col_arrows[i].ascend_pm);
 	}
 
-	i++;
+	gtk_clist_set_column_widget(GTK_CLIST(dlg_p->table), i, col_arrows[i].table);
+	gtk_widget_show(col_arrows[i].table);
+    }
+    gtk_clist_column_titles_show(GTK_CLIST(dlg_p->table));
+
+    gtk_clist_set_compare_func(GTK_CLIST(dlg_p->table), gsm_a_stat_gtk_sort_column);
+    gtk_clist_set_sort_column(GTK_CLIST(dlg_p->table), 0);
+    gtk_clist_set_sort_type(GTK_CLIST(dlg_p->table), GTK_SORT_ASCENDING);
+
+    gtk_clist_set_column_width(GTK_CLIST(dlg_p->table), 0, 50);
+    gtk_clist_set_column_width(GTK_CLIST(dlg_p->table), 1, 330);
+    gtk_clist_set_column_width(GTK_CLIST(dlg_p->table), 2, 50);
+
+    gtk_clist_set_shadow_type(GTK_CLIST(dlg_p->table), GTK_SHADOW_IN);
+    gtk_clist_column_titles_show(GTK_CLIST(dlg_p->table));
+    gtk_container_add(GTK_CONTAINER(dlg_p->scrolled_win), dlg_p->table);
+
+    SIGNAL_CONNECT(dlg_p->table, "click-column", gsm_a_stat_gtk_click_column_cb, col_arrows);
+}
+
+
+/*
+ * Never gets called ?
+ */
+static void
+gsm_a_stat_gtk_init(
+    char		*optarg)
+{
+    /* does not appear to be called */
+
+    optarg = optarg;
+}
+
+
+static void
+gsm_a_stat_gtk_bssmap_cb(
+    GtkWidget		*w _U_,
+    gpointer		d _U_)
+{
+    int			i;
+    char		str[100];
+
+
+    /*
+     * if the window is already open, bring it to front
+     */
+    if (dlg_bssmap.win)
+    {
+	gdk_window_raise(dlg_bssmap.win->window);
+	return;
     }
 
-    printf("\nDTAP %s\n", gsm_a_pd_str[PD_SM]);
-    printf("Message (ID)Type                                        Number\n");
+    gsm_a_stat_gtk_win_create(&dlg_bssmap, "GSM A-I/F BSSMAP Statistics");
 
     i = 0;
-    while (gsm_a_dtap_msg_sm_strings[i].strptr)
+    while (gsm_a_bssmap_msg_strings[i].strptr)
     {
-	if (stat_p->dtap_sm_message_type[gsm_a_dtap_msg_sm_strings[i].value] > 0)
-	{
-	    printf("0x%02x  %-50s%d\n",
-		gsm_a_dtap_msg_sm_strings[i].value,
-		gsm_a_dtap_msg_sm_strings[i].strptr,
-		stat_p->dtap_sm_message_type[gsm_a_dtap_msg_sm_strings[i].value]);
-	}
+	sprintf(str, "0x%02x", gsm_a_bssmap_msg_strings[i].value);
+	dlg_bssmap.entries[0] = g_strdup(str);
+
+	dlg_bssmap.entries[1] = g_strdup(gsm_a_bssmap_msg_strings[i].strptr);
+
+	dlg_bssmap.entries[2] = g_strdup("0");
+
+	gtk_clist_insert(GTK_CLIST(dlg_bssmap.table), i, dlg_bssmap.entries);
+	gtk_clist_set_row_data(GTK_CLIST(dlg_bssmap.table), i, (gpointer) i);
 
 	i++;
     }
 
-    printf("\nDTAP %s\n", gsm_a_pd_str[PD_SS]);
-    printf("Message (ID)Type                                        Number\n");
+    gsm_a_stat_draw(NULL);
+}
+
+
+static void
+gsm_a_stat_gtk_dtap_cb(
+    GtkWidget		*w _U_,
+    gpointer		d _U_,
+    gsm_a_stat_dlg_t	*dlg_dtap_p,
+    char		*title,
+    const value_string	*dtap_msg_strings)
+{
+    int			i;
+    char		str[100];
+
+
+    /*
+     * if the window is already open, bring it to front
+     */
+    if (dlg_dtap_p->win)
+    {
+	gdk_window_raise(dlg_dtap_p->win->window);
+	return;
+    }
+
+    gsm_a_stat_gtk_win_create(dlg_dtap_p, title);
 
     i = 0;
-    while (gsm_a_dtap_msg_ss_strings[i].strptr)
+    while (dtap_msg_strings[i].strptr)
     {
-	if (stat_p->dtap_ss_message_type[gsm_a_dtap_msg_ss_strings[i].value] > 0)
-	{
-	    printf("0x%02x  %-50s%d\n",
-		gsm_a_dtap_msg_ss_strings[i].value,
-		gsm_a_dtap_msg_ss_strings[i].strptr,
-		stat_p->dtap_ss_message_type[gsm_a_dtap_msg_ss_strings[i].value]);
-	}
+	sprintf(str, "0x%02x", dtap_msg_strings[i].value);
+	dlg_dtap_p->entries[0] = g_strdup(str);
+
+	dlg_dtap_p->entries[1] = g_strdup(dtap_msg_strings[i].strptr);
+
+	dlg_dtap_p->entries[2] = g_strdup("0");
+
+	gtk_clist_insert(GTK_CLIST(dlg_dtap_p->table), i, dlg_dtap_p->entries);
+	gtk_clist_set_row_data(GTK_CLIST(dlg_dtap_p->table), i, (gpointer) i);
 
 	i++;
     }
 
-    printf("==============================================================\n");
+    gsm_a_stat_draw(NULL);
+}
+
+static void
+gsm_a_stat_gtk_dtap_mm_cb(
+    GtkWidget		*w _U_,
+    gpointer		d _U_)
+{
+    gsm_a_stat_gtk_dtap_cb(w, d, &dlg_dtap_mm,
+	"GSM A-I/F DTAP Mobility Management Statistics",
+	gsm_a_dtap_msg_mm_strings);
 }
 
+static void
+gsm_a_stat_gtk_dtap_rr_cb(
+    GtkWidget		*w _U_,
+    gpointer		d _U_)
+{
+    gsm_a_stat_gtk_dtap_cb(w, d, &dlg_dtap_rr,
+	"GSM A-I/F DTAP Radio Resource Management Statistics",
+	gsm_a_dtap_msg_rr_strings);
+}
 
 static void
-gsm_a_stat_init(char *optarg)
+gsm_a_stat_gtk_dtap_cc_cb(
+    GtkWidget		*w _U_,
+    gpointer		d _U_)
 {
-    gsm_a_stat_t	*stat_p;
-    GString		*err_p;
+    gsm_a_stat_gtk_dtap_cb(w, d, &dlg_dtap_cc,
+	"GSM A-I/F DTAP Call Control Statistics",
+	gsm_a_dtap_msg_cc_strings);
+}
 
+static void
+gsm_a_stat_gtk_dtap_gmm_cb(
+    GtkWidget		*w _U_,
+    gpointer		d _U_)
+{
+    gsm_a_stat_gtk_dtap_cb(w, d, &dlg_dtap_gmm,
+	"GSM A-I/F DTAP GPRS Mobility Management Statistics",
+	gsm_a_dtap_msg_gmm_strings);
+}
+
+static void
+gsm_a_stat_gtk_dtap_sms_cb(
+    GtkWidget		*w _U_,
+    gpointer		d _U_)
+{
+    gsm_a_stat_gtk_dtap_cb(w, d, &dlg_dtap_sms,
+	"GSM A-I/F DTAP Short Message Service Statistics",
+	gsm_a_dtap_msg_sms_strings);
+}
+
+static void
+gsm_a_stat_gtk_dtap_sm_cb(
+    GtkWidget		*w _U_,
+    gpointer		d _U_)
+{
+    gsm_a_stat_gtk_dtap_cb(w, d, &dlg_dtap_sm,
+	"GSM A-I/F DTAP GPRS Session Management Statistics",
+	gsm_a_dtap_msg_sm_strings);
+}
+
+static void
+gsm_a_stat_gtk_dtap_ss_cb(
+    GtkWidget		*w _U_,
+    gpointer		d _U_)
+{
+    gsm_a_stat_gtk_dtap_cb(w, d, &dlg_dtap_ss,
+	"GSM A-I/F DTAP Supplementary Services Statistics",
+	gsm_a_dtap_msg_ss_strings);
+}
 
-    optarg = optarg;
 
-    stat_p = g_malloc(sizeof(gsm_a_stat_t));
+void
+register_tap_listener_gtkgsm_a_stat(void)
+{
+    GString		*err_p;
 
-    memset(stat_p, 0, sizeof(gsm_a_stat_t));
+
+    register_ethereal_tap("gsm_a,", gsm_a_stat_gtk_init);
+
+    memset((void *) &stat, 0, sizeof(gsm_a_stat_t));
 
     err_p =
-	register_tap_listener("gsm_a", stat_p, NULL,
-	    NULL,
+	register_tap_listener("gsm_a", NULL, NULL,
+	    gsm_a_stat_reset,
 	    gsm_a_stat_packet,
 	    gsm_a_stat_draw);
 
     if (err_p != NULL)
     {
-	g_free(stat_p);
+	simple_dialog(ESD_TYPE_WARN, NULL, err_p->str);
 	g_string_free(err_p, TRUE);
 
 	exit(1);
@@ -301,7 +707,29 @@ gsm_a_stat_init(char *optarg)
 
 
 void
-register_tap_listener_gsm_astat(void)
+register_tap_menu_gtkgsm_a_stat(void)
 {
-    register_ethereal_tap("gsm_a,", gsm_a_stat_init);
+    register_tap_menu_item("Statistics/GSM A-Interface/BSSMAP",
+	gsm_a_stat_gtk_bssmap_cb, NULL, NULL);
+
+    register_tap_menu_item("Statistics/GSM A-Interface/DTAP/Mobility Management",
+	gsm_a_stat_gtk_dtap_mm_cb, NULL, NULL);
+
+    register_tap_menu_item("Statistics/GSM A-Interface/DTAP/Radio Resource Management",
+	gsm_a_stat_gtk_dtap_rr_cb, NULL, NULL);
+
+    register_tap_menu_item("Statistics/GSM A-Interface/DTAP/Call Control",
+	gsm_a_stat_gtk_dtap_cc_cb, NULL, NULL);
+
+    register_tap_menu_item("Statistics/GSM A-Interface/DTAP/GPRS Mobility Management",
+	gsm_a_stat_gtk_dtap_gmm_cb, NULL, NULL);
+
+    register_tap_menu_item("Statistics/GSM A-Interface/DTAP/Short Message Service",
+	gsm_a_stat_gtk_dtap_sms_cb, NULL, NULL);
+
+    register_tap_menu_item("Statistics/GSM A-Interface/DTAP/GPRS Session Management",
+	gsm_a_stat_gtk_dtap_sm_cb, NULL, NULL);
+
+    register_tap_menu_item("Statistics/GSM A-Interface/DTAP/Supplementary Services",
+	gsm_a_stat_gtk_dtap_ss_cb, NULL, NULL);
 }