*
* $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
# include "config.h"
#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.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 "globals.h"
-#include "file.h"
-#include "summary.h"
-#include "dlg_utils.h"
-#include "ui_util.h"
-#include "compat_macros.h"
-#include <epan/tap.h>
+#include <wiretap/wtap.h>
+#include <epan/epan.h>
+#include <epan/packet.h>
+#include <epan/packet_info.h>
+#include <epan/value_string.h>
+#include <epan/tap.h>
+#include <epan/asn1.h>
#include <epan/dissectors/packet-gsm_map.h>
-#include "gsm_map_stat.h"
+
+#include "../stat_menu.h"
+#include "../globals.h"
+#include "../file.h"
+#include "../summary.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/gui_utils.h"
+#include "gtk/gsm_map_stat.h"
+
#define SUM_STR_MAX 1024
{
GtkWidget *lb;
lb = gtk_label_new(str);
- gtk_misc_set_alignment(GTK_MISC(lb), 0.0, 0.5);
+ gtk_misc_set_alignment(GTK_MISC(lb), 0.0f, 0.5f);
gtk_box_pack_start(GTK_BOX(box), lb,FALSE,FALSE, 0);
gtk_widget_show(lb);
}
-
-void
+#ifdef MAIN_MENU_USE_UIMANAGER
+void gsm_map_stat_gtk_sum_cb(GtkAction *action _U_, gpointer user_data _U_)
+#else
+static void
gsm_map_stat_gtk_sum_cb(GtkWidget *w _U_, gpointer d _U_)
+#endif
{
summary_tally summary;
GtkWidget *sum_open_w,
/* initial compututations */
seconds = summary.stop_time - summary.start_time;
- sum_open_w = window_new(GTK_WINDOW_TOPLEVEL, "GSM MAP Statistics: Summary");
+ sum_open_w = dlg_window_new("GSM MAP Statistics: Summary"); /* transient_for top_level */
+ gtk_window_set_destroy_with_parent (GTK_WINDOW(sum_open_w), TRUE);
/* Container for each row of widgets */
main_vb = gtk_vbox_new(FALSE, 3);
- gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
+ gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5);
gtk_container_add(GTK_CONTAINER(sum_open_w), main_vb);
gtk_widget_show(main_vb);
gtk_widget_show(file_box);
/* filename */
- g_snprintf(string_buff, SUM_STR_MAX, "Name: %s", summary.filename);
+ g_snprintf(string_buff, SUM_STR_MAX, "Name: %s", ((summary.filename) ? summary.filename : "None"));
add_string_to_box(string_buff, file_box);
/* length */
- g_snprintf(string_buff, SUM_STR_MAX, "Length: %lu", summary.file_length);
+ g_snprintf(string_buff, SUM_STR_MAX, "Length: %" G_GINT64_MODIFIER "d", 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));
+ g_snprintf(string_buff, SUM_STR_MAX, "Format: %s", wtap_file_type_string(summary.file_type));
add_string_to_box(string_buff, file_box);
if (summary.has_snap) {
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);
+ if (seconds)
+ g_snprintf(string_buff, SUM_STR_MAX, "Total number of Invokes per second: %.2f", tot_invokes/seconds);
+ else
+ g_snprintf(string_buff, SUM_STR_MAX, "Total number of Invokes per second: N/A");
add_string_to_box(string_buff, invoke_box);
/* Total size of invokes */
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);
+ if (tot_invokes)
+ g_snprintf(string_buff, SUM_STR_MAX, "Average number of bytes per Invoke: %.2f", tot_invokes_size/tot_invokes);
+ else
+ g_snprintf(string_buff, SUM_STR_MAX, "Average number of bytes per Invoke: N/A");
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);
+ if (seconds)
+ g_snprintf(string_buff, SUM_STR_MAX, "Average number of bytes per second: %.2f", tot_invokes_size/seconds);
+ else
+ g_snprintf(string_buff, SUM_STR_MAX, "Average number of bytes per second: N/A");
add_string_to_box(string_buff, invoke_box);
/* Return Results frame */
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);
+ if (seconds)
+ g_snprintf(string_buff, SUM_STR_MAX, "Total number of Return Results per second: %.2f", tot_rr/seconds);
+ else
+ g_snprintf(string_buff, SUM_STR_MAX, "Total number of Return Results per second: N/A");
add_string_to_box(string_buff, rr_box);
/* Total size of return results */
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);
+ if (tot_rr)
+ g_snprintf(string_buff, SUM_STR_MAX, "Average number of bytes per Return Result: %.2f", tot_rr_size/tot_rr);
+ else
+ g_snprintf(string_buff, SUM_STR_MAX, "Average number of bytes per Return Result: N/A");
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);
+ if (seconds)
+ g_snprintf(string_buff, SUM_STR_MAX, "Average number of bytes per second: %.2f", tot_rr_size/seconds);
+ else
+ g_snprintf(string_buff, SUM_STR_MAX, "Average number of bytes per second: N/A");
add_string_to_box(string_buff, rr_box);
/* Totals frame */
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);
+ if (seconds)
+ g_snprintf(string_buff, SUM_STR_MAX, "Total number of GSM MAP messages per second: %.2f",
+ (tot_invokes + tot_rr)/seconds);
+ else
+ g_snprintf(string_buff, SUM_STR_MAX, "Total number of GSM MAP messages per second: N/A");
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));
+ if (tot_invokes + tot_rr)
+ 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));
+ else
+ g_snprintf(string_buff, SUM_STR_MAX, "Average number of bytes per GSM MAP messages: N/A");
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);
+ if (seconds)
+ g_snprintf(string_buff, SUM_STR_MAX, "Average number of bytes second: %.2f",
+ (tot_invokes_size + tot_rr_size)/seconds);
+ else
+ g_snprintf(string_buff, SUM_STR_MAX, "Average number of bytes second: N/A");
add_string_to_box(string_buff, tot_box);
gtk_container_add(GTK_CONTAINER(main_vb), bbox);
gtk_widget_show(bbox);
- close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
+ close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
window_set_cancel_button(sum_open_w, close_bt, window_cancel_button_cb);
- SIGNAL_CONNECT(sum_open_w, "delete_event", window_delete_event_cb, NULL);
+ g_signal_connect(sum_open_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
gtk_widget_show(sum_open_w);
window_present(sum_open_w);
void
register_tap_listener_gtkgsm_map_summary(void)
{
- register_tap_menu_item("GSM/MAP Summary", REGISTER_TAP_GROUP_NONE,
+#ifdef MAIN_MENU_USE_UIMANAGER
+#else
+ register_stat_menu_item("_GSM/MAP Summary", REGISTER_STAT_GROUP_TELEPHONY,
gsm_map_stat_gtk_sum_cb, NULL, NULL, NULL);
+#endif
}