/* mgcp_stat.c
- * mgcp-statistics for ethereal
+ * mgcp-statistics for Wireshark
* Copyright 2003 Lars Roland
*
- * $Id: mgcp_stat.c,v 1.24 2004/01/31 03:22:41 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
# 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 "menu.h"
-#include "../tap.h"
-#include "../epan/value_string.h"
-#include "../register.h"
-#include "../plugins/mgcp/packet-mgcp.h"
+
+#include <gtk/gtk.h>
+
+#include <epan/packet_info.h>
+#include <epan/epan.h>
+#include <epan/value_string.h>
+#include <epan/tap.h>
+#include "epan/dissectors/packet-mgcp.h"
+
#include "../timestats.h"
-#include "gtk_stat_util.h"
-#include "compat_macros.h"
#include "../simple_dialog.h"
-#include "dlg_utils.h"
#include "../file.h"
-#include "../globals.h"
-#include "../tap_dfilter_dlg.h"
-#include "tap_dfilter_dlg.h"
+#include "../stat_menu.h"
-extern GtkWidget *main_display_filter_widget;
+#include "gtk/gui_stat_util.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/tap_param_dlg.h"
+#include "gtk/gui_utils.h"
+#include "gtk/main.h"
+
+#include "gtk/old-gtk-compat.h"
#define NUM_TIMESTATS 10
GtkWidget *vbox;
char *filter;
GtkWidget *scrolled_window;
- GtkCList *table;
+ GtkTreeView *table;
timestat_t rtd[NUM_TIMESTATS];
guint32 open_req_num;
guint32 disc_rsp_num;
static int
-mgcpstat_packet(void *pms, packet_info *pinfo, epan_dissect_t *edt _U_, void *pmi)
+mgcpstat_packet(void *pms, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pmi)
{
mgcpstat_t *ms=(mgcpstat_t *)pms;
- mgcp_info_t *mi=pmi;
+ const mgcp_info_t *mi=pmi;
nstime_t delta;
+ int ret = 0;
switch (mi->mgcp_type) {
if(mi->is_duplicate){
/* Duplicate is ignored */
ms->req_dup_num++;
- return 0;
}
else {
ms->open_req_num++;
- return 0;
}
- break;
+ break;
case MGCP_RESPONSE:
if(mi->is_duplicate){
/* Duplicate is ignored */
ms->rsp_dup_num++;
- return 0;
}
else if (!mi->request_available) {
/* no request was seen */
ms->disc_rsp_num++;
- return 0;
}
else {
ms->open_req_num--;
/* calculate time delta between request and response */
- delta.secs=pinfo->fd->abs_secs-mi->req_time.secs;
- delta.nsecs=pinfo->fd->abs_usecs*1000-mi->req_time.nsecs;
- if(delta.nsecs<0){
- delta.nsecs+=1000000000;
- delta.secs--;
- }
+ nstime_delta(&delta, &pinfo->fd->abs_ts, &mi->req_time);
- if (strncasecmp(mi->code, "EPCF", 4) == 0 ) {
+ if (g_ascii_strncasecmp(mi->code, "EPCF", 4) == 0 ) {
time_stat_update(&(ms->rtd[0]),&delta, pinfo);
}
- else if (strncasecmp(mi->code, "CRCX", 4) == 0 ) {
+ else if (g_ascii_strncasecmp(mi->code, "CRCX", 4) == 0 ) {
time_stat_update(&(ms->rtd[1]),&delta, pinfo);
}
- else if (strncasecmp(mi->code, "MDCX", 4) == 0 ) {
+ else if (g_ascii_strncasecmp(mi->code, "MDCX", 4) == 0 ) {
time_stat_update(&(ms->rtd[2]),&delta, pinfo);
}
- else if (strncasecmp(mi->code, "DLCX", 4) == 0 ) {
+ else if (g_ascii_strncasecmp(mi->code, "DLCX", 4) == 0 ) {
time_stat_update(&(ms->rtd[3]),&delta, pinfo);
}
- else if (strncasecmp(mi->code, "RQNT", 4) == 0 ) {
+ else if (g_ascii_strncasecmp(mi->code, "RQNT", 4) == 0 ) {
time_stat_update(&(ms->rtd[4]),&delta, pinfo);
}
- else if (strncasecmp(mi->code, "NTFY", 4) == 0 ) {
+ else if (g_ascii_strncasecmp(mi->code, "NTFY", 4) == 0 ) {
time_stat_update(&(ms->rtd[5]),&delta, pinfo);
}
- else if (strncasecmp(mi->code, "AUEP", 4) == 0 ) {
+ else if (g_ascii_strncasecmp(mi->code, "AUEP", 4) == 0 ) {
time_stat_update(&(ms->rtd[6]),&delta, pinfo);
}
- else if (strncasecmp(mi->code, "AUCX", 4) == 0 ) {
+ else if (g_ascii_strncasecmp(mi->code, "AUCX", 4) == 0 ) {
time_stat_update(&(ms->rtd[7]),&delta, pinfo);
}
- else if (strncasecmp(mi->code, "RSIP", 4) == 0 ) {
+ else if (g_ascii_strncasecmp(mi->code, "RSIP", 4) == 0 ) {
time_stat_update(&(ms->rtd[8]),&delta, pinfo);
}
else {
time_stat_update(&(ms->rtd[9]),&delta, pinfo);
}
- return 1;
+ ret = 1;
}
- break;
+ break;
default:
- return 0;
- break;
+ break;
}
+
+ return ret;
}
static void
{
mgcpstat_t *ms=(mgcpstat_t *)pms;
int i;
- /* gtk1 using a scrollable clist*/
- char *str[7];
-
- for(i=0;i<7;i++) {
- str[i]=g_malloc(sizeof(char[256]));
- }
+ char str[3][256];
+ GtkListStore *store;
+ GtkTreeIter iter;
/* clear list before printing */
- gtk_clist_clear(ms->table);
+ store = GTK_LIST_STORE(gtk_tree_view_get_model(ms->table));
+ gtk_list_store_clear(store);
for(i=0;i<NUM_TIMESTATS;i++) {
/* nothing seen, nothing to do */
continue;
}
- sprintf(str[0], "%s", val_to_str(i,mgcp_mesage_type,"Other"));
- sprintf(str[1], "%d", ms->rtd[i].num);
- sprintf(str[2], "%8.2f msec", nstime_to_msec(&(ms->rtd[i].min)));
- sprintf(str[3], "%8.2f msec", nstime_to_msec(&(ms->rtd[i].max)));
- sprintf(str[4], "%8.2f msec", get_average(&(ms->rtd[i].tot), ms->rtd[i].num));
- sprintf(str[5], "%6u", ms->rtd[i].min_num);
- sprintf(str[6], "%6u", ms->rtd[i].max_num);
- gtk_clist_append(ms->table, str);
- }
-
- gtk_widget_show(GTK_WIDGET(ms->table));
- for(i=0;i<7;i++) {
- g_free(str[i]);
+ g_snprintf(str[0], sizeof(char[256]), "%8.2f msec", nstime_to_msec(&(ms->rtd[i].min)));
+ g_snprintf(str[1], sizeof(char[256]), "%8.2f msec", nstime_to_msec(&(ms->rtd[i].max)));
+ g_snprintf(str[2], sizeof(char[256]), "%8.2f msec", get_average(&(ms->rtd[i].tot), ms->rtd[i].num));
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set(store, &iter,
+ 0, val_to_str(i, mgcp_mesage_type,"Other"),
+ 1, ms->rtd[i].num,
+ 2, str[0],
+ 3, str[1],
+ 4, str[2],
+ 5, ms->rtd[i].min_num,
+ 6, ms->rtd[i].max_num,
+ -1);
}
}
-void protect_thread_critical_region(void);
-void unprotect_thread_critical_region(void);
static void
win_destroy_cb(GtkWindow *win _U_, gpointer data)
{
g_free(ms);
}
-static gchar *titles[]={"Type",
- "Messages",
- "Min SRT",
- "Max SRT",
- "Avg SRT",
- "Min in Frame",
- "Max in Frame" };
+static const stat_column titles[]={
+ {G_TYPE_STRING, LEFT, "Type" },
+ {G_TYPE_UINT, RIGHT, "Messages" },
+ {G_TYPE_STRING, RIGHT, "Min SRT" },
+ {G_TYPE_STRING, RIGHT, "Max SRT" },
+ {G_TYPE_STRING, RIGHT, "Avg SRT" },
+ {G_TYPE_UINT, RIGHT, "Min in Frame" },
+ {G_TYPE_UINT, RIGHT, "Max in Frame" }
+};
-void
-gtk_mgcpstat_init(char *optarg)
+static void
+gtk_mgcpstat_init(const char *optarg, void *userdata _U_)
{
mgcpstat_t *ms;
- char *filter=NULL;
GString *error_string;
+ GtkWidget *bt_close;
+ GtkWidget *bbox;
+
+ ms=g_malloc(sizeof(mgcpstat_t));
if(strncmp(optarg,"mgcp,srt,",9) == 0){
- filter=optarg+9;
+ ms->filter=g_strdup(optarg+9);
} else {
- filter=g_malloc(1);
- *filter='\0';
+ ms->filter=NULL;
}
- ms=g_malloc(sizeof(mgcpstat_t));
- ms->filter=g_malloc(strlen(filter)+1);
- strcpy(ms->filter, filter);
-
mgcpstat_reset(ms);
- ms->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
- SIGNAL_CONNECT(ms->win, "destroy", win_destroy_cb, ms);
+ ms->win = dlg_window_new("MGCP SRT"); /* transient_for top_level */
+ gtk_window_set_destroy_with_parent (GTK_WINDOW(ms->win), TRUE);
+
+ gtk_window_set_default_size(GTK_WINDOW(ms->win), 550, 150);
- ms->vbox=gtk_vbox_new(FALSE, 0);
+ ms->vbox=gtk_vbox_new(FALSE, 3);
- init_main_stat_window(ms->win, ms->vbox, "MGCP Service Response Time (SRT) Statistics", filter);
+ init_main_stat_window(ms->win, ms->vbox, "MGCP Service Response Time (SRT) Statistics", ms->filter);
- /* GTK1 using a scrollable clist*/
- /* init a scrolled window*/
- ms->scrolled_window = gtk_scrolled_window_new(NULL, NULL);
- WIDGET_SET_SIZE(ms->scrolled_window, 550, 150);
+ /* init a scrolled window*/
+ ms->scrolled_window = scrolled_window_new(NULL, NULL);
ms->table = create_stat_table(ms->scrolled_window, ms->vbox, 7, titles);
- error_string=register_tap_listener("mgcp", ms, filter, mgcpstat_reset, mgcpstat_packet, mgcpstat_draw);
+ error_string=register_tap_listener("mgcp", ms, ms->filter, 0, mgcpstat_reset, mgcpstat_packet, mgcpstat_draw);
if(error_string){
- simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str);
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str);
g_string_free(error_string, TRUE);
g_free(ms->filter);
g_free(ms);
return;
}
+ /* Button row. */
+ bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
+ gtk_box_pack_start(GTK_BOX(ms->vbox), bbox, FALSE, FALSE, 0);
+
+ bt_close = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
+ window_set_cancel_button(ms->win, bt_close, window_cancel_button_cb);
+
+ g_signal_connect(ms->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
+ g_signal_connect(ms->win, "destroy", G_CALLBACK(win_destroy_cb), ms);
+
gtk_widget_show_all(ms->win);
- retap_packets(&cfile);
+ window_present(ms->win);
+
+ cf_retap_packets(&cfile);
+ gdk_window_raise(gtk_widget_get_window(ms->win));
}
-tap_dfilter_dlg mgcp_srt_dlg = {"MGCP Service Response Time (SRT) Statistics", "mgcp,srt", gtk_mgcpstat_init, -1};
+static tap_param mgcp_srt_params[] = {
+ { PARAM_FILTER, "Filter", NULL }
+};
+
+static tap_param_dlg mgcp_srt_dlg = {
+ "MGCP Service Response Time (SRT) Statistics",
+ "mgcp,srt",
+ gtk_mgcpstat_init,
+ -1,
+ G_N_ELEMENTS(mgcp_srt_params),
+ mgcp_srt_params
+};
void
register_tap_listener_gtkmgcpstat(void)
{
- register_ethereal_tap("mgcp,srt", gtk_mgcpstat_init);
+ register_dfilter_stat(&mgcp_srt_dlg, "MGCP",
+ REGISTER_STAT_GROUP_RESPONSE_TIME);
}
-
-void
-register_tap_menu_gtkmgcpstat(void)
+#ifdef MAIN_MENU_USE_UIMANAGER
+void mgcp_srt_cb(GtkAction *action, gpointer user_data _U_)
{
- if (find_tap_id("mgcp"))
- register_tap_menu_item("_Statistics/Service Response Time/MGCP...",
- gtk_tap_dfilter_dlg_cb, NULL, NULL, &(mgcp_srt_dlg));
+ tap_param_dlg_cb(action, &mgcp_srt_dlg);
}
+#endif
git.samba.org / obnox / wireshark / wip.git / blobdiff