/* mgcp_stat.c
- * mgcp-statistics for ethereal
+ * mgcp-statistics for Wireshark
* Copyright 2003 Lars Roland
*
- * $Id: mgcp_stat.c,v 1.30 2004/02/23 19:19:38 ulfl 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 <epan/epan.h>
#include <epan/value_string.h>
-#include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
#include "../register.h"
-#include "../plugins/mgcp/packet-mgcp.h"
+#include "../epan/dissectors/packet-mgcp.h"
#include "../timestats.h"
-#include "gtk_stat_util.h"
+#include "gui_stat_util.h"
#include "compat_macros.h"
#include "../simple_dialog.h"
#include "dlg_utils.h"
#include "../file.h"
#include "../globals.h"
+#include "../stat_menu.h"
#include "../tap_dfilter_dlg.h"
-#include "tap_dfilter_dlg.h"
-#include "ui_util.h"
+#include "gui_utils.h"
+#ifdef NEED_G_ASCII_STRCASECMP_H
+#include "../epan/g_ascii_strcasecmp.h"
+#endif
-extern GtkWidget *main_display_filter_widget;
#define NUM_TIMESTATS 10
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
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);
+ g_snprintf(str[0], 256, "%s", val_to_str(i,mgcp_mesage_type,"Other"));
+ g_snprintf(str[1], 256, "%d", ms->rtd[i].num);
+ g_snprintf(str[2], 256, "%8.2f msec", nstime_to_msec(&(ms->rtd[i].min)));
+ g_snprintf(str[3], 256, "%8.2f msec", nstime_to_msec(&(ms->rtd[i].max)));
+ g_snprintf(str[4], 256, "%8.2f msec", get_average(&(ms->rtd[i].tot), ms->rtd[i].num));
+ g_snprintf(str[5], 256, "%6u", ms->rtd[i].min_num);
+ g_snprintf(str[6], 256, "%6u", ms->rtd[i].max_num);
gtk_clist_append(ms->table, str);
}
g_free(ms);
}
-static gchar *titles[]={"Type",
+static const gchar *titles[]={
+ "Type",
"Messages",
"Min SRT",
"Max SRT",
"Min in Frame",
"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;
+ const char *filter=NULL;
GString *error_string;
+ GtkWidget *bt_close;
+ GtkWidget *bbox;
if(strncmp(optarg,"mgcp,srt,",9) == 0){
filter=optarg+9;
} else {
- filter=g_malloc(1);
- *filter='\0';
+ filter="";
}
ms=g_malloc(sizeof(mgcpstat_t));
- ms->filter=g_malloc(strlen(filter)+1);
- strcpy(ms->filter, filter);
+ ms->filter=g_strdup(filter);
mgcpstat_reset(ms);
- ms->win=window_new(GTK_WINDOW_TOPLEVEL, NULL);
- SIGNAL_CONNECT(ms->win, "destroy", win_destroy_cb, ms);
+ ms->win=window_new(GTK_WINDOW_TOPLEVEL, "MGCP SRT");
+ 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);
/* GTK1 using a scrollable clist*/
/* init a scrolled window*/
ms->scrolled_window = scrolled_window_new(NULL, NULL);
- WIDGET_SET_SIZE(ms->scrolled_window, 550, 150);
ms->table = create_stat_table(ms->scrolled_window, ms->vbox, 7, titles);
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 = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
+ window_set_cancel_button(ms->win, bt_close, window_cancel_button_cb);
+
+ SIGNAL_CONNECT(ms->win, "delete_event", window_delete_event_cb, NULL);
+ SIGNAL_CONNECT(ms->win, "destroy", win_destroy_cb, ms);
+
gtk_widget_show_all(ms->win);
- retap_packets(&cfile);
+ window_present(ms->win);
+
+ cf_retap_packets(&cfile, FALSE);
}
-tap_dfilter_dlg mgcp_srt_dlg = {"MGCP Service Response Time (SRT) Statistics", "mgcp,srt", gtk_mgcpstat_init, -1};
+static tap_dfilter_dlg mgcp_srt_dlg = {
+ "MGCP Service Response Time (SRT) Statistics",
+ "mgcp,srt",
+ gtk_mgcpstat_init,
+ -1
+};
void
register_tap_listener_gtkmgcpstat(void)
{
- register_ethereal_tap("mgcp,srt", gtk_mgcpstat_init);
-
- if (find_tap_id("mgcp"))
- register_tap_menu_item("MGCP...", REGISTER_TAP_GROUP_NONE,
- gtk_tap_dfilter_dlg_cb, NULL, NULL, &(mgcp_srt_dlg));
+ /* We don't register this tap, if we don't have the mgcp plugin loaded.*/
+ if (find_tap_id("mgcp")) {
+ register_dfilter_stat(&mgcp_srt_dlg, "MGCP",
+ REGISTER_STAT_GROUP_RESPONSE_TIME);
+ }
}
git.samba.org / obnox / wireshark / wip.git / blobdiff