#define E_MCAST_ENTRY_4 "stream_speed"
#define E_MCAST_ENTRY_5 "total_speed"
-extern guint16 burstint;
-extern guint32 trigger;
-extern guint32 bufferalarm;
-extern gint32 emptyspeed;
-extern gint32 cumulemptyspeed;
-
static const gchar FWD_LABEL_TEXT[] = "Select a stream with left mouse button";
static const gchar PAR_LABEL_TEXT[] = "\nBurst int: ms Burst alarm: pps Buffer alarm: KB Stream empty speed: Mbps Total empty speed: Mbps\n";
enum
{
- MC_COL_SRC_ADDR,
- MC_COL_SRC_PORT,
- MC_COL_DST_ADDR,
- MC_COL_DST_PORT,
- MC_COL_PACKETS,
- MC_COL_PPS,
- MC_COL_AVG_BW,
- MC_COL_MAX_BW,
- MC_COL_MAX_BURST,
- MC_COL_BURST_ALARM,
- MC_COL_MAX_BUFFER,
- MC_COL_BUFFER_ALARM,
- MC_COL_DATA,
- NUM_COLS /* The number of columns */
+ MC_COL_SRC_ADDR,
+ MC_COL_SRC_PORT,
+ MC_COL_DST_ADDR,
+ MC_COL_DST_PORT,
+ MC_COL_PACKETS,
+ MC_COL_PPS,
+ MC_COL_AVG_BW,
+ MC_COL_MAX_BW,
+ MC_COL_MAX_BURST,
+ MC_COL_BURST_ALARM,
+ MC_COL_MAX_BUFFER,
+ MC_COL_BUFFER_ALARM,
+ MC_COL_DATA,
+ NUM_COLS /* The number of columns */
};
/****************************************************************************/
/* CALLBACKS */
/****************************************************************************/
static void
-mcaststream_on_destroy(GtkObject *object _U_, gpointer user_data _U_)
+mcaststream_on_destroy(GObject *object _U_, gpointer user_data _U_)
{
/* Remove the stream tap listener */
remove_tap_listener_mcast_stream();
/****************************************************************************/
/* INTERFACE */
/****************************************************************************/
-static void mcast_params_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_)
+static void
+mcast_params_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_)
{
/* Note that we no longer have a mcast params dialog box. */
mcast_params_dlg = NULL;
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The burst interval should be between 1 and 1000 ms.");
return;
}
- burstint = fnumber;
+ mcast_stream_burstint = fnumber;
fnumber_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_MCAST_ENTRY_2);
fnumber_text = gtk_entry_get_text(GTK_ENTRY(fnumber_te));
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The burst alarm threshold you entered isn't valid.");
return;
}
- trigger = fnumber;
+ mcast_stream_trigger = fnumber;
fnumber_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_MCAST_ENTRY_3);
fnumber_text = gtk_entry_get_text(GTK_ENTRY(fnumber_te));
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The buffer alarm threshold you entered isn't valid.");
return;
}
- bufferalarm = fnumber;
+ mcast_stream_bufferalarm = fnumber;
fnumber_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_MCAST_ENTRY_4);
fnumber_text = gtk_entry_get_text(GTK_ENTRY(fnumber_te));
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The stream empty speed should be between 1 and 10000000");
return;
}
- emptyspeed = fnumber;
+ mcast_stream_emptyspeed = fnumber;
fnumber_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_MCAST_ENTRY_5);
fnumber_text = gtk_entry_get_text(GTK_ENTRY(fnumber_te));
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The total empty speed should be between 1 and 10000000");
return;
}
- cumulemptyspeed = fnumber;
+ mcast_stream_cumulemptyspeed = fnumber;
window_destroy(GTK_WIDGET(parent_w));
label = gtk_label_new(" Burst measurement interval (ms) ");
gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
entry1 = gtk_entry_new();
- g_snprintf(label_text, sizeof(label_text), "%u", burstint);
+ g_snprintf(label_text, sizeof(label_text), "%u", mcast_stream_burstint);
gtk_entry_set_text(GTK_ENTRY(entry1), label_text);
gtk_table_attach_defaults(GTK_TABLE(table), entry1, 1, 2, 0, 1);
label = gtk_label_new(" Burst alarm threshold (packets) ");
gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2);
entry2 = gtk_entry_new();
- g_snprintf(label_text, sizeof(label_text), "%u", trigger);
+ g_snprintf(label_text, sizeof(label_text), "%u", mcast_stream_trigger);
gtk_entry_set_text(GTK_ENTRY(entry2), label_text);
gtk_table_attach_defaults(GTK_TABLE(table), entry2, 1, 2, 1, 2);
label = gtk_label_new(" Buffer alarm threshold (bytes) ");
gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 2, 3);
entry3 = gtk_entry_new();
- g_snprintf(label_text, sizeof(label_text), "%u", bufferalarm);
+ g_snprintf(label_text, sizeof(label_text), "%u", mcast_stream_bufferalarm);
gtk_entry_set_text(GTK_ENTRY(entry3), label_text);
gtk_table_attach_defaults(GTK_TABLE(table), entry3, 1, 2, 2, 3);
label = gtk_label_new(" Stream empty speed (kbit/s) ");
gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 3, 4);
entry4 = gtk_entry_new();
- g_snprintf(label_text, sizeof(label_text), "%u", emptyspeed);
+ g_snprintf(label_text, sizeof(label_text), "%u", mcast_stream_emptyspeed);
gtk_entry_set_text(GTK_ENTRY(entry4), label_text);
gtk_table_attach_defaults(GTK_TABLE(table), entry4, 1, 2, 3, 4);
label = gtk_label_new(" Total empty speed (kbit/s) ");
gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 4, 5);
entry5 = gtk_entry_new();
- g_snprintf(label_text, sizeof(label_text), "%u", cumulemptyspeed);
+ g_snprintf(label_text, sizeof(label_text), "%u", mcast_stream_cumulemptyspeed);
gtk_entry_set_text(GTK_ENTRY(entry5), label_text);
gtk_table_attach_defaults(GTK_TABLE(table), entry5, 1, 2, 4, 5);
gtk_container_add (GTK_CONTAINER(hbuttonbox), ok_bt);
cancel_bt = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
gtk_container_add (GTK_CONTAINER(hbuttonbox), cancel_bt);
+#if GTK_CHECK_VERSION(2,18,0)
+ gtk_widget_set_can_default(cancel_bt, TRUE);
+#else
GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
+#endif
gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox), GTK_BUTTONBOX_END);
gtk_box_set_spacing(GTK_BOX(hbuttonbox), 0);
data[5] = g_strdup_printf("%u /s", strinfo->apackets);
data[6] = g_strdup_printf("%2.1f Mbps", strinfo->average_bw);
data[7] = g_strdup_printf("%2.1f Mbps", strinfo->element.maxbw);
- data[8] = g_strdup_printf("%u / %dms", strinfo->element.topburstsize, burstint);
+ data[8] = g_strdup_printf("%u / %dms", strinfo->element.topburstsize, mcast_stream_burstint);
data[9] = g_strdup_printf("%u", strinfo->element.numbursts);
data[10] = g_strdup_printf("%.1f KB", (float)strinfo->element.topbuffusage/1000);
data[11] = g_strdup_printf("%u", strinfo->element.numbuffalarms);
"Detected %d Multicast streams, Average Bw: %.1f Mbps Max Bw: %.1f Mbps Max burst: %d / %dms Max buffer: %.1f KB",
++streams_nb,
mcaststream_get_info()->allstreams->average_bw, mcaststream_get_info()->allstreams->element.maxbw,
- mcaststream_get_info()->allstreams->element.topburstsize, burstint,
+ mcaststream_get_info()->allstreams->element.topburstsize, mcast_stream_burstint,
(float)(mcaststream_get_info()->allstreams->element.topbuffusage)/1000);
gtk_label_set_text(GTK_LABEL(top_label), label_text);
g_snprintf(label_text, sizeof(label_text), "\nBurst int: %u ms Burst alarm: %u pps Buffer alarm: %u Bytes Stream empty speed: %u Kbps Total empty speed: %u Kbps\n",
- burstint, trigger, bufferalarm, emptyspeed, cumulemptyspeed);
+ mcast_stream_burstint, mcast_stream_trigger, mcast_stream_bufferalarm, mcast_stream_emptyspeed, mcast_stream_cumulemptyspeed);
gtk_label_set_text(GTK_LABEL(label_par), label_text);
}
list_view = GTK_TREE_VIEW(list_w);
sortable = GTK_TREE_SORTABLE(list_store);
-#if GTK_CHECK_VERSION(2,6,0)
/* Speed up the list display */
gtk_tree_view_set_fixed_height_mode(list_view, TRUE);
-#endif
/* Setup the sortable columns */
gtk_tree_sortable_set_sort_column_id(sortable, MC_COL_SRC_ADDR, GTK_SORT_ASCENDING);
static void
mcaststream_dlg_create(void)
{
- GtkWidget *mcaststream_dlg_w;
- GtkWidget *main_vb;
- GtkWidget *scrolledwindow;
- GtkWidget *hbuttonbox;
- /*GtkWidget *bt_unselect;*/
- GtkWidget *bt_params;
- GtkWidget *bt_close;
- GtkTooltips *tooltips = gtk_tooltips_new();
-
- const gchar *title_name_ptr;
- gchar *win_name;
-
- title_name_ptr = cf_get_display_name(&cfile);
- win_name = g_strdup_printf("%s - UDP Multicast Streams", title_name_ptr);
- mcaststream_dlg_w = dlg_window_new(win_name);
-
- gtk_window_set_default_size(GTK_WINDOW(mcaststream_dlg_w), 620, 400);
-
- main_vb = gtk_vbox_new (FALSE, 0);
- gtk_container_add(GTK_CONTAINER(mcaststream_dlg_w), main_vb);
- gtk_container_set_border_width (GTK_CONTAINER (main_vb), 12);
+ GtkWidget *mcaststream_dlg_w;
+ GtkWidget *main_vb;
+ GtkWidget *scrolledwindow;
+ GtkWidget *hbuttonbox;
+ /*GtkWidget *bt_unselect;*/
+ GtkWidget *bt_params;
+ GtkWidget *bt_close;
- top_label = gtk_label_new ("Detected 0 Multicast streams");
- gtk_box_pack_start (GTK_BOX (main_vb), top_label, FALSE, FALSE, 8);
+ const gchar *title_name_ptr;
+ gchar *win_name;
- scrolledwindow = scrolled_window_new (NULL, NULL);
- gtk_box_pack_start (GTK_BOX (main_vb), scrolledwindow, TRUE, TRUE, 0);
+ title_name_ptr = cf_get_display_name(&cfile);
+ win_name = g_strdup_printf("%s - UDP Multicast Streams", title_name_ptr);
+ mcaststream_dlg_w = dlg_window_new(win_name);
- create_list_view();
- gtk_container_add(GTK_CONTAINER(scrolledwindow), list_w);
+ gtk_window_set_default_size(GTK_WINDOW(mcaststream_dlg_w), 620, 400);
- gtk_widget_show(mcaststream_dlg_w);
+ main_vb = gtk_vbox_new (FALSE, 0);
+ gtk_container_add(GTK_CONTAINER(mcaststream_dlg_w), main_vb);
+ gtk_container_set_border_width (GTK_CONTAINER (main_vb), 12);
- label_fwd = gtk_label_new (FWD_LABEL_TEXT);
- gtk_box_pack_start (GTK_BOX (main_vb), label_fwd, FALSE, FALSE, 0);
+ top_label = gtk_label_new ("Detected 0 Multicast streams");
+ gtk_box_pack_start (GTK_BOX (main_vb), top_label, FALSE, FALSE, 8);
- label_par = gtk_label_new (PAR_LABEL_TEXT);
- gtk_box_pack_start (GTK_BOX (main_vb), label_par, FALSE, FALSE, 0);
+ scrolledwindow = scrolled_window_new (NULL, NULL);
+ gtk_box_pack_start (GTK_BOX (main_vb), scrolledwindow, TRUE, TRUE, 0);
- /* button row */
- hbuttonbox = gtk_hbutton_box_new ();
- gtk_box_pack_start (GTK_BOX (main_vb), hbuttonbox, FALSE, FALSE, 0);
- gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_END);
- gtk_box_set_spacing (GTK_BOX (hbuttonbox), 0);
+ create_list_view();
+ gtk_container_add(GTK_CONTAINER(scrolledwindow), list_w);
- /*bt_unselect = gtk_button_new_with_label ("Unselect");
- gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_unselect);
- gtk_tooltips_set_tip (tooltips, bt_unselect, "Undo stream selection", NULL);*/
+ gtk_widget_show(mcaststream_dlg_w);
- bt_params = gtk_button_new_with_label ("Set parameters");
- gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_params);
- gtk_tooltips_set_tip (tooltips, bt_params, "Set buffer, limit and speed parameters", NULL);
+ label_fwd = gtk_label_new (FWD_LABEL_TEXT);
+ gtk_box_pack_start (GTK_BOX (main_vb), label_fwd, FALSE, FALSE, 0);
- bt_filter = gtk_button_new_with_label ("Prepare Filter");
- gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_filter);
- gtk_tooltips_set_tip (tooltips, bt_filter, "Prepare a display filter of the selected stream", NULL);
+ label_par = gtk_label_new (PAR_LABEL_TEXT);
+ gtk_box_pack_start (GTK_BOX (main_vb), label_par, FALSE, FALSE, 0);
- bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
- gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_close);
- gtk_tooltips_set_tip (tooltips, bt_close, "Close this dialog", NULL);
- GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT);
+ /* button row */
+ hbuttonbox = gtk_hbutton_box_new ();
+ gtk_box_pack_start (GTK_BOX (main_vb), hbuttonbox, FALSE, FALSE, 0);
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_END);
+ gtk_box_set_spacing (GTK_BOX (hbuttonbox), 0);
+
+ /*bt_unselect = gtk_button_new_with_label ("Unselect");
+ gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_unselect);
+ gtk_widget_set_tooltip_text (bt_unselect, "Undo stream selection");*/
+
+ bt_params = gtk_button_new_with_label ("Set parameters");
+ gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_params);
+ gtk_widget_set_tooltip_text (bt_params, "Set buffer, limit and speed parameters");
+
+ bt_filter = gtk_button_new_with_label ("Prepare Filter");
+ gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_filter);
+ gtk_widget_set_tooltip_text (bt_filter, "Prepare a display filter of the selected stream");
+
+ bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_close);
+ gtk_widget_set_tooltip_text (bt_close, "Close this dialog");
+#if GTK_CHECK_VERSION(2,18,0)
+ gtk_widget_set_can_default(bt_close, TRUE);
+#else
+ GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT);
+#endif
- /*g_signal_connect(bt_unselect, "clicked", G_CALLBACK(mcaststream_on_unselect), NULL);*/
- g_signal_connect(bt_params, "clicked", G_CALLBACK(mcast_on_params), NULL);
- g_signal_connect(bt_filter, "clicked", G_CALLBACK(mcaststream_on_filter), NULL);
- window_set_cancel_button(mcaststream_dlg_w, bt_close, window_cancel_button_cb);
+ /*g_signal_connect(bt_unselect, "clicked", G_CALLBACK(mcaststream_on_unselect), NULL);*/
+ g_signal_connect(bt_params, "clicked", G_CALLBACK(mcast_on_params), NULL);
+ g_signal_connect(bt_filter, "clicked", G_CALLBACK(mcaststream_on_filter), NULL);
+ window_set_cancel_button(mcaststream_dlg_w, bt_close, window_cancel_button_cb);
- g_signal_connect(mcaststream_dlg_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
- g_signal_connect(mcaststream_dlg_w, "destroy", G_CALLBACK(mcaststream_on_destroy), NULL);
+ g_signal_connect(mcaststream_dlg_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
+ g_signal_connect(mcaststream_dlg_w, "destroy", G_CALLBACK(mcaststream_on_destroy), NULL);
- gtk_widget_show_all(mcaststream_dlg_w);
- window_present(mcaststream_dlg_w);
+ gtk_widget_show_all(mcaststream_dlg_w);
+ window_present(mcaststream_dlg_w);
- mcaststream_on_unselect(NULL, NULL);
+ mcaststream_on_unselect(NULL, NULL);
- mcast_stream_dlg = mcaststream_dlg_w;
+ mcast_stream_dlg = mcaststream_dlg_w;
- g_free(win_name);
+ g_free(win_name);
}
/****************************************************************************/
/* update the contents of the dialog box clist */
/* list: pointer to list of mcast_stream_info_t* */
-void mcaststream_dlg_update(GList *list)
+void
+mcaststream_dlg_update(GList *list)
{
if (mcast_stream_dlg != NULL) {
gtk_list_store_clear(list_store);
/****************************************************************************/
/* update the contents of the dialog box clist */
/* list: pointer to list of mcast_stream_info_t* */
-void mcaststream_dlg_show(GList *list)
+void
+mcaststream_dlg_show(GList *list)
{
if (mcast_stream_dlg != NULL) {
/* There's already a dialog box; reactivate it. */
/****************************************************************************/
/* entry point when called via the GTK menu */
-static void mcaststream_launch(GtkWidget *w _U_, gpointer data _U_)
+#ifdef MAIN_MENU_USE_UIMANAGER
+void
+mcaststream_launch(GtkAction *action _U_, gpointer user_data _U_)
+#else
+static void
+mcaststream_launch(GtkWidget *w _U_, gpointer data _U_)
+#endif
{
/* Register the tap listener */
register_tap_listener_mcast_stream();
void
register_tap_listener_mcast_stream_dlg(void)
{
+#ifdef MAIN_MENU_USE_UIMANAGER
+#else
register_stat_menu_item("UDP Multicast Streams", REGISTER_STAT_GROUP_UNSORTED,
mcaststream_launch, NULL, NULL, NULL);
+#endif
}
git.samba.org / obnox / wireshark / wip.git / blobdiff