#include <epan/packet_info.h>
#include <epan/epan.h>
#include <epan/value_string.h>
-
#include <epan/tap.h>
-#include "../register.h"
-#include "../epan/dissectors/packet-mgcp.h"
+#include "epan/dissectors/packet-mgcp.h"
+
#include "../timestats.h"
-#include "gui_stat_util.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 "gui_utils.h"
+
+#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;
{
mgcpstat_t *ms=(mgcpstat_t *)pms;
int i;
- 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;
}
- 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);
- }
-
- 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 const 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" }
+};
static void
gtk_mgcpstat_init(const char *optarg, void *userdata _U_)
{
mgcpstat_t *ms;
- const 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="";
+ ms->filter=NULL;
}
- ms=g_malloc(sizeof(mgcpstat_t));
- ms->filter=g_strdup(filter);
-
mgcpstat_reset(ms);
- ms->win=window_new(GTK_WINDOW_TOPLEVEL, "MGCP SRT");
+ 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, 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);
/* 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);
gtk_widget_show_all(ms->win);
window_present(ms->win);
-
- cf_retap_packets(&cfile, FALSE);
+
+ cf_retap_packets(&cfile);
+ gdk_window_raise(gtk_widget_get_window(ms->win));
}
-static tap_dfilter_dlg mgcp_srt_dlg = {
+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
+ -1,
+ G_N_ELEMENTS(mgcp_srt_params),
+ mgcp_srt_params
};
void
register_tap_listener_gtkmgcpstat(void)
{
- /* 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);
- }
+ register_dfilter_stat(&mgcp_srt_dlg, "MGCP",
+ REGISTER_STAT_GROUP_RESPONSE_TIME);
+}
+#ifdef MAIN_MENU_USE_UIMANAGER
+void mgcp_srt_cb(GtkAction *action, gpointer user_data _U_)
+{
+ tap_param_dlg_cb(action, &mgcp_srt_dlg);
}
+#endif
+
git.samba.org / obnox / wireshark / wip.git / blobdiff