Ethereal-dev: [Ethereal-dev] MTP3/ANSI MAP/GSM MAP/ISUP stat changes, GSM MAP/A SS enhancement
Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.
Sorry about the number of changes in one submission. cvs diff -u from latest CVS source: Originally compiled and tested against 0.10.3 source on Linux. Compiled without warnings on SPARC against CVS source (Not tested, still having environment problems) AUTHORS.diff - added MTP3 stats packet-ansi_map.c.diff packet-ansi_map.h.diff - Stats enhancements packet-gsm_a.c.diff - Enhanced parameter dissection related to SS packet-gsm_map.c.diff packet-gsm_map.h.diff - Stats enhancements - Enhanced parameter dissection related to SS packet-gsm_sms.c.diff - minor fix packet-gsm_ss.c.diff packet-gsm_ss.h.diff - Enhancements for parameter dissection packet-isup.h.diff - Moved define for max number of message types packet-mtp3.c.diff packet-mtp3.h.diff - Added tap code for statistics EPAN changes: to_str.c.diff - Added 'value_string.h' because 'packet-mtp3.h' uses it GTK changes: Makefile.common.diff - Added mtp3_stat.c mtp3_summary.c ansi_map_stat.c.diff - minor cleanup gsm_map_stat.c.diff gsm_map_stat.h - added changes to support gsm_map_summary - added stats for message sizes isup_stat.c.diff - minor cleanup mtp3_stat.c mtp3_stat.h - Statistics for number of MSUs per direction per OPC/DPC pair per SI mtp3_summary.c - Summary for MTP3 MSU stats, includes average MSU size per SI, num MSU per second, etc. gsm_map_summary.c - Summary for MAP messages, average size, per second, etc. -- Michael Lum Architect 4600 Jacombs Road (604) 276-0055 Richmond, B.C. Canada V6V 3B1 Telos Technology Winner of the 2003 GSM Association Award for Technology Innovation Best Infrastructure
Attachment:
to_str.c.diff
Description: Binary data
Attachment:
AUTHORS.diff
Description: Binary data
Attachment:
gsm_map_stat.c.diff
Description: Binary data
Attachment:
isup_stat.c.diff
Description: Binary data
Attachment:
Makefile.common.diff
Description: Binary data
Attachment:
packet-ansi_map.c.diff
Description: Binary data
Attachment:
packet-ansi_map.h.diff
Description: Binary data
Attachment:
packet-gsm_a.c.diff
Description: Binary data
Attachment:
packet-gsm_map.c.diff
Description: Binary data
Attachment:
packet-gsm_map.h.diff
Description: Binary data
Attachment:
packet-gsm_sms.c.diff
Description: Binary data
Attachment:
packet-gsm_ss.c.diff
Description: Binary data
Attachment:
packet-gsm_ss.h.diff
Description: Binary data
Attachment:
packet-isup.h.diff
Description: Binary data
Attachment:
packet-mtp3.c.diff
Description: Binary data
Attachment:
packet-mtp3.h.diff
Description: Binary data
Attachment:
ansi_map_stat.c.diff
Description: Binary data
/* mtp3_summary.c * Routines for MTP3 Statictics summary window * * Copyright 2004, Michael Lum <mlum [AT] telostech.com> * In association with Telos Technology Inc. * * Modified from gsm_map_summary.c * * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@xxxxxxxxxxxx> * 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. */ #ifdef HAVE_CONFIG_H # include "config.h" #endif #include <gtk/gtk.h> #include <string.h> #include <wtap.h> #include "epan/packet_info.h" #include "epan/epan.h" #include "epan/value_string.h" #include "tap_menu.h" #include "summary.h" #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" #include "dlg_utils.h" #include "ui_util.h" #include "compat_macros.h" #include "tap.h" #include "packet-mtp3.h" #include "mtp3_stat.h" #define SUM_STR_MAX 1024 typedef struct column_arrows { GtkWidget *table; GtkWidget *ascend_pm; GtkWidget *descend_pm; } column_arrows; #define MTP3_SUM_INIT_TABLE_NUM_COLUMNS 6 typedef struct _my_columns_t { guint32 value; gchar *strptr; GtkJustification just; } my_columns_t; static my_columns_t columns[MTP3_SUM_INIT_TABLE_NUM_COLUMNS] = { { 110, "SI", GTK_JUSTIFY_LEFT }, { 100, "Num MSUs", GTK_JUSTIFY_RIGHT }, { 100, "MSUs/sec", GTK_JUSTIFY_RIGHT }, { 100, "Num Bytes", GTK_JUSTIFY_RIGHT }, { 100, "Bytes/MSU", GTK_JUSTIFY_RIGHT }, { 100, "Bytes/sec", GTK_JUSTIFY_RIGHT } }; static void add_string_to_box(gchar *str, GtkWidget *box) { GtkWidget *lb; lb = gtk_label_new(str); gtk_misc_set_alignment(GTK_MISC(lb), 0.0, 0.5); gtk_box_pack_start(GTK_BOX(box), lb,FALSE,FALSE, 0); gtk_widget_show(lb); } static void mtp3_sum_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 < MTP3_SUM_INIT_TABLE_NUM_COLUMNS; i++) { 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 sorted in descending order by default */ if (column == 0) { clist->sort_type = GTK_SORT_ASCENDING; gtk_widget_show(col_arrows[column].ascend_pm); } else { clist->sort_type = GTK_SORT_DESCENDING; gtk_widget_show(col_arrows[column].descend_pm); } gtk_clist_set_sort_column(clist, column); } gtk_clist_thaw(clist); gtk_clist_sort(clist); } static gint mtp3_sum_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: /* text columns */ return(strcmp(text1, text2)); default: /* number columns */ i1 = strtol(text1, NULL, 0); i2 = strtol(text2, NULL, 0); return(i1 - i2); } g_assert_not_reached(); return(0); } static void mtp3_sum_draw( GtkWidget *table, double seconds, int *tot_num_msus_p, double *tot_num_bytes_p) { char *entries[MTP3_SUM_INIT_TABLE_NUM_COLUMNS]; int i, j; int num_msus; double num_bytes; if (table == NULL) { return; } *tot_num_msus_p = 0; *tot_num_bytes_p = 0; for (i=0; i < MTP3_NUM_SI_CODE; i++) { entries[0] = g_strdup(mtp3_service_indicator_code_short_vals[i].strptr); j = 0; num_msus = 0; num_bytes = 0; while (j < mtp3_num_used) { num_msus += mtp3_stat[j].si_code[i].num_msus; num_bytes += mtp3_stat[j].si_code[i].size; j++; } *tot_num_msus_p += num_msus; *tot_num_bytes_p += num_bytes; entries[1] = g_strdup_printf("%u", num_msus); entries[2] = g_strdup_printf("%.2f", num_msus/seconds); entries[3] = g_strdup_printf("%.0f", num_bytes); entries[4] = g_strdup_printf("%.2f", num_bytes/num_msus); entries[5] = g_strdup_printf("%.2f", num_bytes/seconds); gtk_clist_insert(GTK_CLIST(table), i, entries); } gtk_clist_sort(GTK_CLIST(table)); } void mtp3_sum_gtk_sum_cb(GtkWidget *w _U_, gpointer d _U_) { summary_tally summary; GtkWidget *sum_open_w, *main_vb, *file_fr, *data_fr, *file_box, *data_box, *bbox, *close_bt, *tot_fr, *tot_box, *table, *column_lb, *table_fr; column_arrows *col_arrows; GdkBitmap *ascend_bm, *descend_bm; GdkPixmap *ascend_pm, *descend_pm; GtkStyle *win_style; gchar string_buff[SUM_STR_MAX]; double seconds; int tot_num_msus; double tot_num_bytes; int i; /* initialize the tally */ summary_fill_in(&summary); /* initial compututations */ seconds = summary.stop_time - summary.start_time; sum_open_w = window_new(GTK_WINDOW_TOPLEVEL, "MTP3 Statistics: Summary"); /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 3); gtk_container_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(sum_open_w), main_vb); gtk_widget_show(main_vb); /* File frame */ file_fr = gtk_frame_new("File"); gtk_container_add(GTK_CONTAINER(main_vb), file_fr); gtk_widget_show(file_fr); file_box = gtk_vbox_new(FALSE, 3); gtk_container_add(GTK_CONTAINER(file_fr), file_box); gtk_widget_show(file_box); /* filename */ g_snprintf(string_buff, SUM_STR_MAX, "Name: %s", summary.filename); add_string_to_box(string_buff, file_box); /* length */ g_snprintf(string_buff, SUM_STR_MAX, "Length: %lu", summary.file_length); add_string_to_box(string_buff, file_box); /* format */ g_snprintf(string_buff, SUM_STR_MAX, "Format: %s", wtap_file_type_string(summary.encap_type)); add_string_to_box(string_buff, file_box); if (summary.has_snap) { /* snapshot length */ g_snprintf(string_buff, SUM_STR_MAX, "Snapshot length: %u", summary.snap); add_string_to_box(string_buff, file_box); } /* Data frame */ data_fr = gtk_frame_new("Data"); gtk_container_add(GTK_CONTAINER(main_vb), data_fr); gtk_widget_show(data_fr); data_box = gtk_vbox_new(FALSE, 3); gtk_container_add(GTK_CONTAINER(data_fr), data_box); gtk_widget_show(data_box); /* seconds */ g_snprintf(string_buff, SUM_STR_MAX, "Elapsed time: %.3f seconds", summary.elapsed_time); add_string_to_box(string_buff, data_box); g_snprintf(string_buff, SUM_STR_MAX, "Between first and last packet: %.3f seconds", seconds); add_string_to_box(string_buff, data_box); /* Packet count */ g_snprintf(string_buff, SUM_STR_MAX, "Packet count: %i", summary.packet_count); add_string_to_box(string_buff, data_box); /* MTP3 SPECIFIC */ table_fr = gtk_frame_new("Service Indicator (SI) Totals"); gtk_container_add(GTK_CONTAINER(main_vb), table_fr); gtk_widget_show(table_fr); table = gtk_clist_new(MTP3_SUM_INIT_TABLE_NUM_COLUMNS); gtk_container_add(GTK_CONTAINER(table_fr), table); gtk_widget_show(table); col_arrows = (column_arrows *) g_malloc(sizeof(column_arrows) * MTP3_SUM_INIT_TABLE_NUM_COLUMNS); win_style = gtk_widget_get_style(sum_open_w); /* We must display dialog widget before calling gdk_pixmap_create_from_xpm_d() */ gtk_widget_show_all(sum_open_w); ascend_pm = gdk_pixmap_create_from_xpm_d(sum_open_w->window, &ascend_bm, &win_style->bg[GTK_STATE_NORMAL], (gchar **) clist_ascend_xpm); descend_pm = gdk_pixmap_create_from_xpm_d(sum_open_w->window, &descend_bm, &win_style->bg[GTK_STATE_NORMAL], (gchar **)clist_descend_xpm); for (i = 0; i < MTP3_SUM_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(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); 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) { /* default column sorting */ gtk_widget_show(col_arrows[i].ascend_pm); } gtk_clist_set_column_justification(GTK_CLIST(table), i, columns[i].just); gtk_clist_set_column_widget(GTK_CLIST(table), i, col_arrows[i].table); gtk_widget_show(col_arrows[i].table); } gtk_clist_column_titles_show(GTK_CLIST(table)); gtk_clist_set_compare_func(GTK_CLIST(table), mtp3_sum_gtk_sort_column); gtk_clist_set_sort_column(GTK_CLIST(table), 0); gtk_clist_set_sort_type(GTK_CLIST(table), GTK_SORT_ASCENDING); for (i = 0; i < MTP3_SUM_INIT_TABLE_NUM_COLUMNS; i++) { gtk_clist_set_column_width(GTK_CLIST(table), i, columns[i].value); } gtk_clist_set_shadow_type(GTK_CLIST(table), GTK_SHADOW_IN); gtk_clist_column_titles_show(GTK_CLIST(table)); SIGNAL_CONNECT(table, "click-column", mtp3_sum_gtk_click_column_cb, col_arrows); mtp3_sum_draw(table, seconds, &tot_num_msus, &tot_num_bytes); /* Totals frame */ tot_fr = gtk_frame_new("Totals"); gtk_container_add(GTK_CONTAINER(main_vb), tot_fr); gtk_widget_show(tot_fr); tot_box = gtk_vbox_new(FALSE, 3); gtk_container_add(GTK_CONTAINER(tot_fr), tot_box); gtk_widget_show(tot_box); g_snprintf(string_buff, SUM_STR_MAX, "Total MSUs: %u", tot_num_msus); add_string_to_box(string_buff, tot_box); g_snprintf(string_buff, SUM_STR_MAX, "MSUs/second: %.2f", tot_num_msus/seconds); add_string_to_box(string_buff, tot_box); g_snprintf(string_buff, SUM_STR_MAX, "Total Bytes: %.0f", tot_num_bytes); add_string_to_box(string_buff, tot_box); g_snprintf(string_buff, SUM_STR_MAX, "Average Bytes/MSU: %.2f", tot_num_bytes/tot_num_msus); add_string_to_box(string_buff, tot_box); g_snprintf(string_buff, SUM_STR_MAX, "Bytes/second: %.2f", tot_num_bytes/seconds); add_string_to_box(string_buff, tot_box); /* Button row. */ bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL); gtk_container_add(GTK_CONTAINER(main_vb), bbox); gtk_widget_show(bbox); close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE); SIGNAL_CONNECT_OBJECT(close_bt, "clicked", gtk_widget_destroy, sum_open_w); gtk_widget_grab_default(close_bt); /* Catch the "key_press_event" signal in the window, so that we can catch the ESC key being pressed and act as if the "Close" button had been selected. */ dlg_set_cancel(sum_open_w, close_bt); gtk_window_set_position(GTK_WINDOW(sum_open_w), GTK_WIN_POS_MOUSE); gtk_widget_show_all(sum_open_w); } void register_tap_listener_gtkmtp3_summary(void) { register_tap_menu_item("MTP3/MSU Summary", REGISTER_TAP_GROUP_NONE, mtp3_sum_gtk_sum_cb, NULL, NULL, NULL); }
/* gsm_map_summary.c * Routines for GSM MAP Statictics summary window * * Copyright 2004, Michael Lum <mlum [AT] telostech.com> * In association with Telos Technology Inc. * * Modified from summary_dlg.c * * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@xxxxxxxxxxxx> * 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. */ #ifdef HAVE_CONFIG_H # include "config.h" #endif #include <gtk/gtk.h> #include <wtap.h> #include "epan/packet_info.h" #include "epan/epan.h" #include "epan/value_string.h" #include "tap_menu.h" #include "summary.h" #include "dlg_utils.h" #include "ui_util.h" #include "compat_macros.h" #include "tap.h" #include "packet-gsm_map.h" #include "gsm_map_stat.h" #define SUM_STR_MAX 1024 static void add_string_to_box(gchar *str, GtkWidget *box) { GtkWidget *lb; lb = gtk_label_new(str); gtk_misc_set_alignment(GTK_MISC(lb), 0.0, 0.5); gtk_box_pack_start(GTK_BOX(box), lb,FALSE,FALSE, 0); gtk_widget_show(lb); } void gsm_map_stat_gtk_sum_cb(GtkWidget *w _U_, gpointer d _U_) { summary_tally summary; GtkWidget *sum_open_w, *main_vb, *file_fr, *data_fr, *file_box, *data_box, *bbox, *close_bt, *invoke_fr, *invoke_box, *rr_fr, *rr_box, *tot_fr, *tot_box; gchar string_buff[SUM_STR_MAX]; double seconds; int i; int tot_invokes, tot_rr; double tot_invokes_size, tot_rr_size; /* initialize the tally */ summary_fill_in(&summary); /* initial compututations */ seconds = summary.stop_time - summary.start_time; sum_open_w = window_new(GTK_WINDOW_TOPLEVEL, "GSM MAP Statistics: Summary"); /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 3); gtk_container_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(sum_open_w), main_vb); gtk_widget_show(main_vb); /* File frame */ file_fr = gtk_frame_new("File"); gtk_container_add(GTK_CONTAINER(main_vb), file_fr); gtk_widget_show(file_fr); file_box = gtk_vbox_new(FALSE, 3); gtk_container_add(GTK_CONTAINER(file_fr), file_box); gtk_widget_show(file_box); /* filename */ g_snprintf(string_buff, SUM_STR_MAX, "Name: %s", summary.filename); add_string_to_box(string_buff, file_box); /* length */ g_snprintf(string_buff, SUM_STR_MAX, "Length: %lu", summary.file_length); add_string_to_box(string_buff, file_box); /* format */ g_snprintf(string_buff, SUM_STR_MAX, "Format: %s", wtap_file_type_string(summary.encap_type)); add_string_to_box(string_buff, file_box); if (summary.has_snap) { /* snapshot length */ g_snprintf(string_buff, SUM_STR_MAX, "Snapshot length: %u", summary.snap); add_string_to_box(string_buff, file_box); } /* Data frame */ data_fr = gtk_frame_new("Data"); gtk_container_add(GTK_CONTAINER(main_vb), data_fr); gtk_widget_show(data_fr); data_box = gtk_vbox_new(FALSE, 3); gtk_container_add(GTK_CONTAINER(data_fr), data_box); gtk_widget_show(data_box); /* seconds */ g_snprintf(string_buff, SUM_STR_MAX, "Elapsed time: %.3f seconds", summary.elapsed_time); add_string_to_box(string_buff, data_box); g_snprintf(string_buff, SUM_STR_MAX, "Between first and last packet: %.3f seconds", seconds); add_string_to_box(string_buff, data_box); /* Packet count */ g_snprintf(string_buff, SUM_STR_MAX, "Packet count: %i", summary.packet_count); add_string_to_box(string_buff, data_box); tot_invokes = 0; tot_invokes_size = 0; for (i=0; i < GSM_MAP_MAX_NUM_OPR_CODES; i++) { tot_invokes += gsm_map_stat.opr_code[i]; tot_invokes_size += gsm_map_stat.size[i]; } tot_rr = 0; tot_rr_size = 0; for (i=0; i < GSM_MAP_MAX_NUM_OPR_CODES; i++) { tot_rr += gsm_map_stat.opr_code_rr[i]; tot_rr_size += gsm_map_stat.size_rr[i]; } /* Invoke frame */ invoke_fr = gtk_frame_new("Invokes"); gtk_container_add(GTK_CONTAINER(main_vb), invoke_fr); gtk_widget_show(invoke_fr); invoke_box = gtk_vbox_new(FALSE, 3); gtk_container_add(GTK_CONTAINER(invoke_fr), invoke_box); gtk_widget_show(invoke_box); /* Total number of invokes */ g_snprintf(string_buff, SUM_STR_MAX, "Total number of Invokes: %u", tot_invokes); add_string_to_box(string_buff, invoke_box); /* Total number of invokes per second */ g_snprintf(string_buff, SUM_STR_MAX, "Total number of Invokes per second: %.2f", tot_invokes/seconds); add_string_to_box(string_buff, invoke_box); /* Total size of invokes */ g_snprintf(string_buff, SUM_STR_MAX, "Total number of bytes for Invokes: %.0f", tot_invokes_size); add_string_to_box(string_buff, invoke_box); /* Average size of invokes */ g_snprintf(string_buff, SUM_STR_MAX, "Average number of bytes per Invoke: %.2f", tot_invokes_size/tot_invokes); add_string_to_box(string_buff, invoke_box); /* Average size of invokes per second */ g_snprintf(string_buff, SUM_STR_MAX, "Average number of bytes per second: %.2f", tot_invokes_size/seconds); add_string_to_box(string_buff, invoke_box); /* Return Results frame */ rr_fr = gtk_frame_new("Return Results"); gtk_container_add(GTK_CONTAINER(main_vb), rr_fr); gtk_widget_show(rr_fr); rr_box = gtk_vbox_new(FALSE, 3); gtk_container_add(GTK_CONTAINER(rr_fr), rr_box); gtk_widget_show(rr_box); /* Total number of return results */ g_snprintf(string_buff, SUM_STR_MAX, "Total number of Return Results: %u", tot_rr); add_string_to_box(string_buff, rr_box); /* Total number of return results per second */ g_snprintf(string_buff, SUM_STR_MAX, "Total number of Return Results per second: %.2f", tot_rr/seconds); add_string_to_box(string_buff, rr_box); /* Total size of return results */ g_snprintf(string_buff, SUM_STR_MAX, "Total number of bytes for Return Results: %.0f", tot_rr_size); add_string_to_box(string_buff, rr_box); /* Average size of return results */ g_snprintf(string_buff, SUM_STR_MAX, "Average number of bytes per Return Result: %.2f", tot_rr_size/tot_rr); add_string_to_box(string_buff, rr_box); /* Average size of return results per second */ g_snprintf(string_buff, SUM_STR_MAX, "Average number of bytes per second: %.2f", tot_rr_size/seconds); add_string_to_box(string_buff, rr_box); /* Totals frame */ tot_fr = gtk_frame_new("Totals"); gtk_container_add(GTK_CONTAINER(main_vb), tot_fr); gtk_widget_show(tot_fr); tot_box = gtk_vbox_new(FALSE, 3); gtk_container_add(GTK_CONTAINER(tot_fr), tot_box); gtk_widget_show(tot_box); /* Total number of return results */ g_snprintf(string_buff, SUM_STR_MAX, "Total number of GSM MAP messages: %u", tot_invokes + tot_rr); add_string_to_box(string_buff, tot_box); g_snprintf(string_buff, SUM_STR_MAX, "Total number of GSM MAP messages per second: %.2f", (tot_invokes + tot_rr)/seconds); add_string_to_box(string_buff, tot_box); g_snprintf(string_buff, SUM_STR_MAX, "Total number of bytes for GSM MAP messages: %.0f", tot_invokes_size + tot_rr_size); add_string_to_box(string_buff, tot_box); g_snprintf(string_buff, SUM_STR_MAX, "Average number of bytes per GSM MAP messages: %.2f", (tot_invokes_size + tot_rr_size)/(tot_invokes + tot_rr)); add_string_to_box(string_buff, tot_box); g_snprintf(string_buff, SUM_STR_MAX, "Average number of bytes second: %.2f", (tot_invokes_size + tot_rr_size)/seconds); add_string_to_box(string_buff, tot_box); /* Button row. */ bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL); gtk_container_add(GTK_CONTAINER(main_vb), bbox); gtk_widget_show(bbox); close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE); SIGNAL_CONNECT_OBJECT(close_bt, "clicked", gtk_widget_destroy, sum_open_w); gtk_widget_grab_default(close_bt); /* Catch the "key_press_event" signal in the window, so that we can catch the ESC key being pressed and act as if the "Close" button had been selected. */ dlg_set_cancel(sum_open_w, close_bt); gtk_window_set_position(GTK_WINDOW(sum_open_w), GTK_WIN_POS_MOUSE); gtk_widget_show(sum_open_w); } void register_tap_listener_gtkgsm_map_summary(void) { register_tap_menu_item("GSM/MAP Summary", REGISTER_TAP_GROUP_NONE, gsm_map_stat_gtk_sum_cb, NULL, NULL, NULL); }
/* mtp3_stat.c * * Copyright 2004, Michael Lum <mlum [AT] telostech.com> * In association with Telos Technology Inc. * * Modified from gsm_map_stat.c * * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@xxxxxxxxxxxx> * 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. */ /* * This TAP provides statistics for MTP3: */ #ifdef HAVE_CONFIG_H # include "config.h" #endif #include <gtk/gtk.h> #include <string.h> #include "epan/packet_info.h" #include "epan/epan.h" #include "epan/value_string.h" #include "tap_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 "../globals.h" #include "filter_prefs.h" #include "compat_macros.h" #include "ui_util.h" #include "packet-mtp3.h" #include "mtp3_stat.h" typedef struct column_arrows { GtkWidget *table; GtkWidget *ascend_pm; GtkWidget *descend_pm; } column_arrows; #define MTP3_INIT_TABLE_NUM_COLUMNS 6 typedef struct _my_columns_t { guint32 value; gchar *strptr; GtkJustification just; } my_columns_t; static my_columns_t columns[MTP3_INIT_TABLE_NUM_COLUMNS] = { { 80, "OPC", GTK_JUSTIFY_LEFT }, { 80, "DPC", GTK_JUSTIFY_LEFT }, { 110, "SI", GTK_JUSTIFY_LEFT }, { 80, "Num MSUs", GTK_JUSTIFY_RIGHT }, { 100, "Num Bytes", GTK_JUSTIFY_RIGHT }, { 80, "Avg Bytes", GTK_JUSTIFY_RIGHT } }; typedef struct _mtp3_stat_dlg_t { GtkWidget *win; GtkWidget *scrolled_win; GtkWidget *table; char *entries[MTP3_INIT_TABLE_NUM_COLUMNS]; } mtp3_stat_dlg_t; static mtp3_stat_dlg_t dlg; mtp3_stat_t mtp3_stat[MTP3_MAX_NUM_OPC_DPC]; guint8 mtp3_num_used; static void mtp3_stat_reset( void *tapdata) { tapdata = tapdata; mtp3_num_used = 0; memset((void *) mtp3_stat, 0, MTP3_MAX_NUM_OPC_DPC * sizeof(mtp3_stat_t)); if (dlg.win != NULL) { gtk_clist_clear(GTK_CLIST(dlg.table)); } } static int mtp3_stat_packet( void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, void *data) { mtp3_tap_rec_t *data_p = data; int i; tapdata = tapdata; pinfo = pinfo; if (data_p->si_code >= MTP3_NUM_SI_CODE) { /* * we thought this si_code was not used ? * is MTP3_NUM_SI_CODE out of date ? */ return(0); } /* * look for opc/dpc pair */ i = 0; while (i < mtp3_num_used) { if (memcmp(&data_p->addr_opc, &mtp3_stat[i].addr_opc, sizeof(mtp3_addr_pc_t)) == 0) { if (memcmp(&data_p->addr_dpc, &mtp3_stat[i].addr_dpc, sizeof(mtp3_addr_pc_t)) == 0) { break; } } i++; } if (i == mtp3_num_used) { if (mtp3_num_used == MTP3_MAX_NUM_OPC_DPC) { /* * too many */ return(0); } mtp3_num_used++; } mtp3_stat[i].addr_opc = data_p->addr_opc; mtp3_stat[i].addr_dpc = data_p->addr_dpc; mtp3_stat[i].si_code[data_p->si_code].num_msus++; mtp3_stat[i].si_code[data_p->si_code].size += data_p->size; return(1); } static void mtp3_stat_draw( void *tapdata) { int i, j, row_offset; char str[256]; tapdata = tapdata; if (dlg.win == NULL) { return; } i = 0; while (i < mtp3_num_used) { row_offset = i * MTP3_NUM_SI_CODE; mtp3_addr_to_str_buf((guint8 *) &mtp3_stat[i].addr_opc, str); dlg.entries[0] = g_strdup(str); mtp3_addr_to_str_buf((guint8 *) &mtp3_stat[i].addr_dpc, str); dlg.entries[1] = g_strdup(str); for (j=0; j < MTP3_NUM_SI_CODE; j++) { dlg.entries[2] = g_strdup(mtp3_service_indicator_code_short_vals[j].strptr); dlg.entries[3] = g_strdup_printf("%u", mtp3_stat[i].si_code[j].num_msus); dlg.entries[4] = g_strdup_printf("%.0f", mtp3_stat[i].si_code[j].size); dlg.entries[5] = g_strdup_printf("%.2f", mtp3_stat[i].si_code[j].size/mtp3_stat[i].si_code[j].num_msus); gtk_clist_insert(GTK_CLIST(dlg.table), row_offset + j, dlg.entries); } i++; } gtk_clist_sort(GTK_CLIST(dlg.table)); } static void mtp3_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 < MTP3_INIT_TABLE_NUM_COLUMNS; i++) { 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 */ if (column <= 1) { clist->sort_type = GTK_SORT_ASCENDING; gtk_widget_show(col_arrows[column].ascend_pm); } else { clist->sort_type = GTK_SORT_DESCENDING; gtk_widget_show(col_arrows[column].descend_pm); } gtk_clist_set_sort_column(clist, column); } gtk_clist_thaw(clist); gtk_clist_sort(clist); } static gint mtp3_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: case 1: case 2: /* text columns */ return(strcmp(text1, text2)); default: /* number columns */ i1 = strtol(text1, NULL, 0); i2 = strtol(text2, NULL, 0); return(i1 - i2); } g_assert_not_reached(); return(0); } static void mtp3_stat_gtk_dlg_close_cb( GtkButton *button _U_, gpointer user_data _U_) { mtp3_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 mtp3_stat_gtk_win_destroy_cb( GtkWindow *win _U_, gpointer user_data _U_) { memset((void *) user_data, 0, sizeof(mtp3_stat_dlg_t)); } static void mtp3_stat_gtk_win_create( mtp3_stat_dlg_t *dlg_p, char *title) { 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 *bbox; dlg_p->win = dlg_window_new(title); gtk_window_set_default_size(GTK_WINDOW(dlg_p->win), 640, 390); SIGNAL_CONNECT(dlg_p->win, "destroy", mtp3_stat_gtk_win_destroy_cb, dlg_p); 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->scrolled_win = scrolled_window_new(NULL, NULL); gtk_box_pack_start(GTK_BOX(vbox), dlg_p->scrolled_win, TRUE, TRUE, 0); /* We must display dialog widget before calling gdk_pixmap_create_from_xpm_d() */ gtk_widget_show_all(dlg_p->win); dlg_p->table = gtk_clist_new(MTP3_INIT_TABLE_NUM_COLUMNS); col_arrows = (column_arrows *) g_malloc(sizeof(column_arrows) * MTP3_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 < MTP3_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(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); 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) { /* default column sorting */ 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_column_titles_show(GTK_CLIST(dlg_p->table)); gtk_clist_set_compare_func(GTK_CLIST(dlg_p->table), mtp3_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); for (i = 0; i < MTP3_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", mtp3_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); bt_close = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE); gtk_widget_grab_default(bt_close); SIGNAL_CONNECT(bt_close, "clicked", mtp3_stat_gtk_dlg_close_cb, dlg_p); /* Catch the "key_press_event" signal in the window, so that we can catch the ESC key being pressed and act as if the "Close" button had been selected. */ dlg_set_cancel(dlg_p->win, bt_close); gtk_widget_show_all(dlg_p->win); } /* * Never gets called ? */ static void mtp3_stat_gtk_init( char *optarg) { /* does not appear to be called */ optarg = optarg; } static void mtp3_stat_gtk_cb( GtkWidget *w _U_, gpointer d _U_) { /* * if the window is already open, bring it to front */ if (dlg.win) { gdk_window_raise(dlg.win->window); return; } mtp3_stat_gtk_win_create(&dlg, "MTP3 Statistics"); mtp3_stat_draw(NULL); } void register_tap_listener_gtkmtp3_stat(void) { GString *err_p; register_ethereal_tap("mtp3,", mtp3_stat_gtk_init); memset((void *) &mtp3_stat, 0, sizeof(mtp3_stat_t)); err_p = register_tap_listener("mtp3", NULL, NULL, mtp3_stat_reset, mtp3_stat_packet, mtp3_stat_draw); if (err_p != NULL) { simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK, err_p->str); g_string_free(err_p, TRUE); exit(1); } register_tap_menu_item("MTP3/MSUs", REGISTER_TAP_GROUP_NONE, mtp3_stat_gtk_cb, NULL, NULL, NULL); }
/* mtp3_stat.h * * $Id$ * * Copyright 2004, Michael Lum <mlum [AT] telostech.com>, * In association with Telos Technology Inc. * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@xxxxxxxxxxxx> * 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. */ typedef struct _mtp3_stat_si_code_t { int num_msus; double size; } mtp3_stat_si_code_t; typedef struct _mtp3_stat_t { mtp3_addr_pc_t addr_opc; mtp3_addr_pc_t addr_dpc; mtp3_stat_si_code_t si_code[MTP3_NUM_SI_CODE]; } mtp3_stat_t; /* * I don't like it but I don't have time to create * the code for a dynamic size solution */ #define MTP3_MAX_NUM_OPC_DPC 50 extern mtp3_stat_t mtp3_stat[]; extern guint8 mtp3_num_used;
/* gsm_map_stat.h * * $Id$ * * Copyright 2004, Michael Lum <mlum [AT] telostech.com>, * In association with Telos Technology Inc. * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@xxxxxxxxxxxx> * 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. */ typedef struct _gsm_map_stat_t { int opr_code[GSM_MAP_MAX_NUM_OPR_CODES]; double size[GSM_MAP_MAX_NUM_OPR_CODES]; int opr_code_rr[GSM_MAP_MAX_NUM_OPR_CODES]; double size_rr[GSM_MAP_MAX_NUM_OPR_CODES]; } gsm_map_stat_t; extern gsm_map_stat_t gsm_map_stat;
- Follow-Ups:
- Prev by Date: [Ethereal-dev] Re: [Ethereal-users] Network-layer resolution (Was: Ethereal)
- Next by Date: Re: [Ethereal-dev] 0.10.2 build failure on Mac OS X: this is really weird ...
- Previous by thread: [Ethereal-dev] Re: [Ethereal-users] Network-layer resolution (Was: Ethereal)
- Next by thread: Re: [Ethereal-dev] MTP3/ANSI MAP/GSM MAP/ISUP stat changes, GSM MAP/A SS enhancements, ANSI MAP enhancements
- Index(es):