#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-h225.h>
+
#include "../timestats.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 "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"
static void gtk_h225rassrt_init(const char *optarg, void *userdata);
-static tap_dfilter_dlg h225_rassrt_dlg = {
+static tap_param h225_rassrt_params[] = {
+ { PARAM_FILTER, "Filter", NULL }
+};
+
+static tap_param_dlg h225_rassrt_dlg = {
"H.225 RAS Service Response Time",
"h225,srt",
gtk_h225rassrt_init,
- -1
+ -1,
+ G_N_ELEMENTS(h225_rassrt_params),
+ h225_rassrt_params
};
/* following values represent the size of their valuestring arrays */
GtkWidget *vbox;
char *filter;
GtkWidget *scrolled_window;
- GtkCList *table;
+ GtkTreeView *table;
h225_rtd_t ras_rtd[NUM_RAS_STATS];
} h225rassrt_t;
default:
return 0;
- break;
}
return 1;
}
{
h225rassrt_t *hs=(h225rassrt_t *)phs;
int i;
- char *str[11];
+ char str[3][256];
+ GtkListStore *store;
+ GtkTreeIter iter;
- for(i=0;i<11;i++) {
- str[i]=g_malloc(sizeof(char[256]));
- }
/* Now print Message and Reason Counter Table */
/* clear list before printing */
- gtk_clist_clear(hs->table);
+ store = GTK_LIST_STORE(gtk_tree_view_get_model(hs->table));
+ gtk_list_store_clear(store);
for(i=0;i<NUM_RAS_STATS;i++) {
/* nothing seen, nothing to do */
if(hs->ras_rtd[i].stats.num==0){
continue;
}
-
- g_snprintf(str[0], sizeof(char[256]),
- "%s", val_to_str(i,ras_message_category,"Other"));
- g_snprintf(str[1], sizeof(char[256]),
- "%7d", hs->ras_rtd[i].stats.num);
- g_snprintf(str[2], sizeof(char[256]),
- "%8.2f msec", nstime_to_msec(&(hs->ras_rtd[i].stats.min)));
- g_snprintf(str[3], sizeof(char[256]),
- "%8.2f msec", nstime_to_msec(&(hs->ras_rtd[i].stats.max)));;
- g_snprintf(str[4], sizeof(char[256]),
- "%8.2f msec", get_average(&(hs->ras_rtd[i].stats.tot), hs->ras_rtd[i].stats.num));
- g_snprintf(str[5], sizeof(char[256]),
- "%6u", hs->ras_rtd[i].stats.min_num);
- g_snprintf(str[6], sizeof(char[256]),
- "%6u", hs->ras_rtd[i].stats.max_num);
- g_snprintf(str[7], sizeof(char[256]),
- "%4u", hs->ras_rtd[i].open_req_num);
- g_snprintf(str[8], sizeof(char[256]),
- "%4u", hs->ras_rtd[i].disc_rsp_num);
- g_snprintf(str[9], sizeof(char[256]),
- "%4u", hs->ras_rtd[i].req_dup_num);
- g_snprintf(str[10], sizeof(char[256]),
- "%4u", hs->ras_rtd[i].rsp_dup_num);
- gtk_clist_append(GTK_CLIST(hs->table), str);
+ g_snprintf(str[0], sizeof(char[256]),
+ "%8.2f msec", nstime_to_msec(&(hs->ras_rtd[i].stats.min)));
+ g_snprintf(str[1], sizeof(char[256]),
+ "%8.2f msec", nstime_to_msec(&(hs->ras_rtd[i].stats.max)));
+ g_snprintf(str[2], sizeof(char[256]),
+ "%8.2f msec", get_average(&(hs->ras_rtd[i].stats.tot), hs->ras_rtd[i].stats.num));
+
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set(store, &iter,
+ 0, val_to_str(i,ras_message_category,"Other"),
+ 1, hs->ras_rtd[i].stats.num,
+ 2, str[0],
+ 3, str[1],
+ 4, str[2],
+ 5, hs->ras_rtd[i].stats.min_num,
+ 6, hs->ras_rtd[i].stats.max_num,
+ 7, hs->ras_rtd[i].open_req_num,
+ 8, hs->ras_rtd[i].disc_rsp_num,
+ 9, hs->ras_rtd[i].req_dup_num,
+ 10, hs->ras_rtd[i].rsp_dup_num,
+ -1);
}
-
- gtk_widget_show(GTK_WIDGET(hs->table));
-
}
-void protect_thread_critical_region(void);
-void unprotect_thread_critical_region(void);
static void
win_destroy_cb(GtkWindow *win _U_, gpointer data)
{
}
-static const gchar *titles[]={
- "RAS-Type",
- "Measurements",
- "Min RTT",
- "Max RTT",
- "Avg RTT",
- "Min in Frame",
- "Max in Frame",
- "Open Requests",
- "Discarded Responses",
- "Repeated Requests",
- "Repeated Responses" };
+static const stat_column titles[]={
+ {G_TYPE_STRING, LEFT, "RAS-Type" },
+ {G_TYPE_UINT, RIGHT, "Measurements" },
+ {G_TYPE_STRING, RIGHT, "Min RTT" },
+ {G_TYPE_STRING, RIGHT, "Max RTT" },
+ {G_TYPE_STRING, RIGHT, "Avg RTT" },
+ {G_TYPE_UINT, RIGHT, "Min in Frame" },
+ {G_TYPE_UINT, RIGHT, "Max in Frame" },
+ {G_TYPE_UINT, RIGHT, "Open Requests" },
+ {G_TYPE_UINT, RIGHT, "Discarded Responses" },
+ {G_TYPE_UINT, RIGHT, "Repeated Requests" },
+ {G_TYPE_UINT, RIGHT, "Repeated Responses"}
+};
static void
gtk_h225rassrt_init(const char *optarg, void *userdata _U_)
{
h225rassrt_t *hs;
- const char *filter=NULL;
GString *error_string;
GtkWidget *bbox;
GtkWidget *close_bt;
+ hs=g_malloc(sizeof(h225rassrt_t));
+
if(strncmp(optarg,"h225,srt,",9) == 0){
- filter=optarg+9;
+ hs->filter=g_strdup(optarg+9);
} else {
- filter="";
+ hs->filter=NULL;
}
- hs=g_malloc(sizeof(h225rassrt_t));
- hs->filter=g_strdup(filter);
-
h225rassrt_reset(hs);
- hs->win=window_new(GTK_WINDOW_TOPLEVEL, "h225-ras-srt");
+ hs->win = dlg_window_new("h225-ras-srt"); /* transient_for top_level */
+ gtk_window_set_destroy_with_parent (GTK_WINDOW(hs->win), TRUE);
gtk_window_set_default_size(GTK_WINDOW(hs->win), 600, 300);
hs->vbox=gtk_vbox_new(FALSE, 3);
gtk_container_set_border_width(GTK_CONTAINER(hs->vbox), 12);
- init_main_stat_window(hs->win, hs->vbox, "H.225 RAS Service Response Time", filter);
+ init_main_stat_window(hs->win, hs->vbox, "H.225 RAS Service Response Time", hs->filter);
/* init a scrolled window*/
hs->scrolled_window = scrolled_window_new(NULL, NULL);
hs->table = create_stat_table(hs->scrolled_window, hs->vbox, 11, titles);
- error_string=register_tap_listener("h225", hs, filter, h225rassrt_reset, h225rassrt_packet, h225rassrt_draw);
+ error_string=register_tap_listener("h225", hs, hs->filter, 0, h225rassrt_reset, h225rassrt_packet, h225rassrt_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(hs->filter);
g_free(hs);
bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
gtk_box_pack_end(GTK_BOX(hs->vbox), bbox, FALSE, FALSE, 0);
- 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(hs->win, close_bt, window_cancel_button_cb);
- SIGNAL_CONNECT(hs->win, "delete_event", window_delete_event_cb, NULL);
- SIGNAL_CONNECT(hs->win, "destroy", win_destroy_cb, hs);
+ g_signal_connect(hs->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
+ g_signal_connect(hs->win, "destroy", G_CALLBACK(win_destroy_cb), hs);
gtk_widget_show_all(hs->win);
window_present(hs->win);
- cf_retap_packets(&cfile, FALSE);
+ cf_retap_packets(&cfile);
+ gdk_window_raise(hs->win->window);
}
void
git.samba.org / obnox / wireshark / wip.git / blobdiff