*
* MUCH code modified from service_response_time_table.c.
*
- * $Id: ansi_map_stat.c,v 1.3 2003/12/13 22:23:17 guy Exp $
+ * $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
#endif
#include <gtk/gtk.h>
-#include <stdio.h>
#include <string.h>
#include "epan/packet_info.h"
#include "epan/epan.h"
#include "epan/value_string.h"
-#include "menu.h"
+#include <epan/stat_cmd_args.h>
+#include "../stat_menu.h"
+#include "gui_stat_menu.h"
#include "image/clist_ascend.xpm"
#include "image/clist_descend.xpm"
#include "simple_dialog.h"
#include "dlg_utils.h"
-#include "tap.h"
+#include <epan/tap.h>
#include "../register.h"
#include "../globals.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
#include "compat_macros.h"
+#include <epan/dissectors/packet-ansi_map.h>
+#include "gui_utils.h"
-#include "packet-ansi_map.h"
typedef struct column_arrows {
GtkWidget *table;
GtkWidget *descend_pm;
} column_arrows;
+typedef struct _my_columns_t {
+ guint32 value;
+ const gchar *strptr;
+ GtkJustification just;
+} my_columns_t;
+
+#define ANSI_MAP_INIT_TABLE_NUM_COLUMNS 5
+
+static my_columns_t columns[ANSI_MAP_INIT_TABLE_NUM_COLUMNS] = {
+ { 60, "Op Code", GTK_JUSTIFY_LEFT },
+ { 290, "Operation Name", GTK_JUSTIFY_LEFT },
+ { 50, "Count", GTK_JUSTIFY_RIGHT },
+ { 100, "Total Bytes", GTK_JUSTIFY_RIGHT },
+ { 50, "Average Bytes", GTK_JUSTIFY_RIGHT }
+};
+
typedef struct _ansi_map_stat_dlg_t {
GtkWidget *win;
GtkWidget *scrolled_win;
GtkWidget *table;
- char *entries[3];
+ char *entries[ANSI_MAP_INIT_TABLE_NUM_COLUMNS];
} ansi_map_stat_dlg_t;
typedef struct _ansi_map_stat_t {
- int message_type[0xff];
+ int message_type[ANSI_MAP_MAX_NUM_MESSAGE_TYPES];
+ double size[ANSI_MAP_MAX_NUM_MESSAGE_TYPES];
} ansi_map_stat_t;
-
static ansi_map_stat_dlg_t dlg;
static ansi_map_stat_t stat;
ansi_map_stat_reset(
void *tapdata)
{
- tapdata = tapdata;
+ ansi_map_stat_t *stat_p = tapdata;
- memset((void *) &stat, 0, sizeof(ansi_map_stat_t));
+ memset(stat_p, 0, sizeof(ansi_map_stat_t));
}
static int
ansi_map_stat_packet(
void *tapdata,
- packet_info *pinfo,
+ packet_info *pinfo _U_,
epan_dissect_t *edt _U_,
- void *data)
+ const void *data)
{
- ansi_map_tap_rec_t *data_p = data;
-
+ ansi_map_stat_t *stat_p = tapdata;
+ const ansi_map_tap_rec_t *data_p = data;
- tapdata = tapdata;
- pinfo = pinfo;
-
- if (data_p->message_type > sizeof(stat.message_type))
+#if 0 /* always false because message_type is 8 bit value */
+ if (data_p->message_type >= ANSI_MAP_MAX_NUM_MESSAGE_TYPES)
{
/*
* unknown PDU type !!!
*/
return(0);
}
+#endif
- stat.message_type[data_p->message_type]++;
+ stat_p->message_type[data_p->message_type]++;
+ stat_p->size[data_p->message_type] += data_p->size;
return(1);
}
ansi_map_stat_draw(
void *tapdata)
{
+ ansi_map_stat_t *stat_p = tapdata;
int i, j;
- char str[256], *strp;
+ char *strp;
-
- tapdata = tapdata;
-
- if (dlg.win != NULL)
+ if (dlg.win && tapdata)
{
i = 0;
{
j = gtk_clist_find_row_from_data(GTK_CLIST(dlg.table), (gpointer) i);
- sprintf(str, "%d",
- stat.message_type[ansi_map_opr_code_strings[i].value]);
- strp = g_strdup(str);
+ strp = g_strdup_printf("%d",
+ stat_p->message_type[ansi_map_opr_code_strings[i].value]);
gtk_clist_set_text(GTK_CLIST(dlg.table), j, 2, strp);
g_free(strp);
+ strp = g_strdup_printf("%.0f", stat_p->size[ansi_map_opr_code_strings[i].value]);
+ gtk_clist_set_text(GTK_CLIST(dlg.table), j, 3, strp);
+ g_free(strp);
+
+ strp = g_strdup_printf("%.2f", stat_p->size[ansi_map_opr_code_strings[i].value]/stat_p->message_type[ansi_map_opr_code_strings[i].value]);
+ gtk_clist_set_text(GTK_CLIST(dlg.table), j, 4, strp);
+ g_free(strp);
+
i++;
}
gtk_clist_freeze(clist);
- for (i=0; i < 3; i++)
+ for (i=0; i < ANSI_MAP_INIT_TABLE_NUM_COLUMNS; i++)
{
gtk_widget_hide(col_arrows[i].ascend_pm);
gtk_widget_hide(col_arrows[i].descend_pm);
{
/*
* Columns 0-1 sorted in descending order by default
- * Columns 2 sorted in ascending order by default
*/
if (column <= 1)
{
gconstpointer ptr1,
gconstpointer ptr2)
{
- GtkCListRow *row1 = (GtkCListRow *) ptr1;
- GtkCListRow *row2 = (GtkCListRow *) ptr2;
+ const GtkCListRow *row1 = ptr1;
+ const GtkCListRow *row2 = ptr2;
char *text1 = NULL;
char *text2 = NULL;
int i1, i2;
switch (clist->sort_column)
{
- case 0:
- /* FALLTHRU */
+ case 1:
+ /* text columns */
+ return(strcmp(text1, text2));
- case 2:
+ default:
+ /* number columns */
i1 = strtol(text1, NULL, 0);
i2 = strtol(text2, NULL, 0);
return(i1 - i2);
-
- case 1:
- return(strcmp(text1, text2));
}
g_assert_not_reached();
}
-static void
-ansi_map_stat_gtk_dlg_close_cb(
- GtkButton *button _U_,
- gpointer user_data _U_)
-{
- ansi_map_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
ansi_map_stat_gtk_win_destroy_cb(
GtkWindow *win _U_,
static void
ansi_map_stat_gtk_win_create(
ansi_map_stat_dlg_t *dlg_p,
- char *title)
+ const char *title)
{
-#define INIT_TABLE_NUM_COLUMNS 3
- char *default_titles[] = { "Op Code", "Operation 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;
+ GtkWidget *bbox;
- dlg_p->win = gtk_dialog_new();
+ dlg_p->win = window_new(GTK_WINDOW_TOPLEVEL, title);
gtk_window_set_default_size(GTK_WINDOW(dlg_p->win), 500, 450);
- gtk_window_set_title(GTK_WINDOW(dlg_p->win), title);
- SIGNAL_CONNECT(dlg_p->win, "destroy", ansi_map_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", ansi_map_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);
+ vbox = gtk_vbox_new(FALSE, 3);
+ gtk_container_add(GTK_CONTAINER(dlg_p->win), vbox);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
- 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);
+ dlg_p->scrolled_win = scrolled_window_new(NULL, NULL);
+ gtk_box_pack_start(GTK_BOX(vbox), dlg_p->scrolled_win, TRUE, TRUE, 0);
- gtk_widget_show(dlg_p->win);
+ dlg_p->table = gtk_clist_new(ANSI_MAP_INIT_TABLE_NUM_COLUMNS);
col_arrows =
- (column_arrows *) g_malloc(sizeof(column_arrows) * INIT_TABLE_NUM_COLUMNS);
+ (column_arrows *) g_malloc(sizeof(column_arrows) * ANSI_MAP_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++)
+ for (i = 0; i < ANSI_MAP_INIT_TABLE_NUM_COLUMNS; i++)
{
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]);
+ column_lb = gtk_label_new(columns[i].strptr);
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);
+ col_arrows[i].ascend_pm = xpm_to_widget(clist_ascend_xpm);
+ /* 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);
+ col_arrows[i].descend_pm = xpm_to_widget(clist_descend_xpm);
+ /* 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);
gtk_widget_show(col_arrows[i].ascend_pm);
}
+ gtk_clist_set_column_justification(GTK_CLIST(dlg_p->table), i, columns[i].just);
+
gtk_clist_set_column_widget(GTK_CLIST(dlg_p->table), i, col_arrows[i].table);
gtk_widget_show(col_arrows[i].table);
}
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, 60);
- gtk_clist_set_column_width(GTK_CLIST(dlg_p->table), 1, 290);
- gtk_clist_set_column_width(GTK_CLIST(dlg_p->table), 2, 50);
+ for (i = 0; i < ANSI_MAP_INIT_TABLE_NUM_COLUMNS; i++)
+ {
+ gtk_clist_set_column_width(GTK_CLIST(dlg_p->table), i, columns[i].value);
+ }
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", ansi_map_stat_gtk_click_column_cb, col_arrows);
-}
+ /* Button row. */
+ bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
+ gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
-/*
- * Never gets called ?
- */
-static void
-ansi_map_stat_gtk_init(
- char *optarg)
-{
- /* does not appear to be called */
+ bt_close = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
+
+ window_set_cancel_button(dlg_p->win, bt_close, window_cancel_button_cb);
+
+ SIGNAL_CONNECT(dlg_p->win, "delete_event", window_delete_event_cb, NULL);
+ SIGNAL_CONNECT(dlg_p->win, "destroy", ansi_map_stat_gtk_win_destroy_cb, dlg_p);
- optarg = optarg;
+ gtk_widget_show_all(dlg_p->win);
+ window_present(dlg_p->win);
}
gpointer d _U_)
{
int i;
- char str[100];
/*
i = 0;
while (ansi_map_opr_code_strings[i].strptr)
{
- sprintf(str, "0x%02x", ansi_map_opr_code_strings[i].value);
- dlg.entries[0] = g_strdup(str);
+ dlg.entries[0] = g_strdup_printf("0x%02x",
+ ansi_map_opr_code_strings[i].value);
dlg.entries[1] = g_strdup(ansi_map_opr_code_strings[i].strptr);
dlg.entries[2] = g_strdup("0");
+ dlg.entries[3] = g_strdup("0");
+
+ dlg.entries[4] = g_strdup("0");
+
gtk_clist_insert(GTK_CLIST(dlg.table), i, dlg.entries);
gtk_clist_set_row_data(GTK_CLIST(dlg.table), i, (gpointer) i);
i++;
}
- ansi_map_stat_draw(NULL);
+ ansi_map_stat_draw(&stat);
+}
+
+
+static void
+ansi_map_stat_gtk_init(
+ const char *optarg _U_,
+ void* userdata _U_ )
+{
+ ansi_map_stat_gtk_cb(NULL, NULL);
}
GString *err_p;
- register_ethereal_tap("ansi_map,", ansi_map_stat_gtk_init);
-
memset((void *) &stat, 0, sizeof(ansi_map_stat_t));
err_p =
- register_tap_listener("ansi_map", NULL, NULL,
+ register_tap_listener("ansi_map", &stat, NULL,
ansi_map_stat_reset,
ansi_map_stat_packet,
ansi_map_stat_draw);
if (err_p != NULL)
{
- simple_dialog(ESD_TYPE_WARN, NULL, err_p->str);
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, err_p->str);
g_string_free(err_p, TRUE);
exit(1);
}
-}
-
-void
-register_tap_menu_gtkansi_map_stat(void)
-{
- register_tap_menu_item("Statistics/ANSI MAP Operation", ansi_map_stat_gtk_cb, NULL, NULL);
+ register_stat_menu_item("ANSI/MAP Operation", REGISTER_STAT_GROUP_TELEPHONY,
+ ansi_map_stat_gtk_cb, NULL, NULL, NULL);
+ register_stat_cmd_arg("ansi_map", ansi_map_stat_gtk_init,NULL);
}
git.samba.org / obnox / wireshark / wip.git / blobdiff