#include <epan/addr_resolv.h>
#include <epan/dissectors/packet-h248.h>
-#include "../register.h"
#include "../globals.h"
#include "../stat_menu.h"
#include "gtk/rtp_player.h"
#endif /* HAVE_LIBPORTAUDIO */
+#include "gtk/old-gtk-compat.h"
/****************************************************************************/
/* pointer to the one and only dialog window */
static GtkWidget *voip_calls_dlg = NULL;
-static GtkListStore *list_store = NULL;
+static GtkListStore *list_store = NULL;
static GtkTreeIter list_iter;
-static GtkWidget *list = NULL;
+static GtkWidget *list = NULL;
-static GtkWidget *top_label = NULL;
-static GtkWidget *status_label = NULL;
+static GtkWidget *top_label = NULL;
+static GtkWidget *status_label = NULL;
-/*static GtkWidet *bt_unselect = NULL;*/
-static GtkWidget *bt_filter = NULL;
-static GtkWidget *bt_graph = NULL;
+/*static GtkWidet *bt_unselect = NULL;*/
+static GtkWidget *bt_filter = NULL;
+static GtkWidget *bt_graph = NULL;
#ifdef HAVE_LIBPORTAUDIO
-static GtkWidget *bt_player = NULL;
+static GtkWidget *bt_player = NULL;
#endif /* HAVE_LIBPORTAUDIO */
static guint32 calls_nb = 0; /* number of displayed calls */
enum
{
- CALL_COL_START_TIME,
- CALL_COL_STOP_TIME,
- CALL_COL_INITIAL_SPEAKER,
- CALL_COL_FROM,
- CALL_COL_TO,
- CALL_COL_PROTOCOL,
- CALL_COL_PACKETS,
- CALL_COL_STATE,
- CALL_COL_COMMENTS,
- CALL_COL_DATA,
- NUM_COLS /* The number of columns */
+ CALL_COL_START_TIME,
+ CALL_COL_STOP_TIME,
+ CALL_COL_INITIAL_SPEAKER,
+ CALL_COL_FROM,
+ CALL_COL_TO,
+ CALL_COL_PROTOCOL,
+ CALL_COL_PACKETS,
+ CALL_COL_STATE,
+ CALL_COL_COMMENTS,
+ CALL_COL_DATA,
+ NUM_COLS /* The number of columns */
};
remove_tap_listener_actrace_calls();
remove_tap_listener_skinny_calls();
remove_tap_listener_iax2_calls();
+ remove_tap_listener_t38();
}
/****************************************************************************/
/* CALLBACKS */
/****************************************************************************/
static void
-voip_calls_on_destroy(GtkObject *object _U_, gpointer user_data _U_)
+voip_calls_on_destroy(GObject *object _U_, gpointer user_data _U_)
{
/* remove_tap_listeners */
voip_calls_remove_tap_listener();
GString *filter_string_fwd;
const gchar *filter_prepend;
gboolean is_first = TRUE;
- GList* list;
- GList* list2;
+ GList* lista;
+ GList* listb;
voip_calls_info_t *listinfo;
graph_analysis_item_t *gai;
size_t filter_length;
const gcp_ctx_t* ctx;
filter_string = g_strdup(gtk_entry_get_text(GTK_ENTRY(main_display_filter_widget)));
- pos = filter_length = strlen(filter_string);
+ filter_length = strlen(filter_string);
+ pos = (int)filter_length; /* we assume the filter won't be more than 2^31-1 octets long */
g_strstrip(filter_string);
if (strlen(filter_string) > 0)
g_string_append_printf(filter_string_fwd, "(");
/* Build a new filter based on frame numbers */
- list = g_list_first(voip_calls_get_info()->callsinfo_list);
- while (list) {
- listinfo = list->data;
+ lista = g_list_first(voip_calls_get_info()->callsinfo_list);
+ while (lista) {
+ listinfo = lista->data;
if (listinfo->selected) {
- list2 = g_list_first(voip_calls_get_info()->graph_analysis->list);
- while (list2) {
- gai = list2->data;
+ listb = g_list_first(voip_calls_get_info()->graph_analysis->list);
+ while (listb) {
+ gai = listb->data;
if (gai->conv_num == listinfo->call_num) {
g_string_append_printf(filter_string_fwd, "%sframe.number == %u", is_first?"":" or ", gai->frame_num);
is_first = FALSE;
}
- list2 = g_list_next(list2);
+ listb = g_list_next(listb);
}
}
- list = g_list_next(list);
+ lista = g_list_next(lista);
}
g_string_append_printf(filter_string_fwd, ")");
g_string_append_printf(filter_string_fwd, "(");
is_first = TRUE;
/* Build a new filter based on protocol fields */
- list = g_list_first(voip_calls_get_info()->callsinfo_list);
- while (list) {
- listinfo = list->data;
+ lista = g_list_first(voip_calls_get_info()->callsinfo_list);
+ while (lista) {
+ listinfo = lista->data;
if (listinfo->selected) {
if (!is_first)
g_string_append_printf(filter_string_fwd, " or ");
(guint8)((h323info->q931_crv & 0xff00)>>8),
(guint8) (h323info->q931_crv2 & 0x00ff),
(guint8)((h323info->q931_crv2 & 0xff00)>>8));
- list2 = g_list_first(h323info->h245_list);
- while (list2) {
- h245_add = list2->data;
+ listb = g_list_first(h323info->h245_list);
+ while (listb) {
+ h245_add = listb->data;
g_string_append_printf(filter_string_fwd,
" || (ip.addr == %s && tcp.port == %d && h245)",
- ip_to_str((guint8 *)&(h245_add->h245_address)), h245_add->h245_port);
- list2 = g_list_next(list2);
+ ip_to_str((guint8 *)(h245_add->h245_address.data)), h245_add->h245_port);
+ listb = g_list_next(listb);
}
g_string_append_printf(filter_string_fwd, ")");
break;
}
is_first = FALSE;
}
- list = g_list_next(list);
+ lista = g_list_next(lista);
}
g_string_append_printf(filter_string_fwd, ")");
on_graph_bt_clicked(GtkButton *button _U_, gpointer user_data _U_)
{
graph_analysis_item_t *gai;
- GList* list;
- GList* list2;
+ GList* lista;
+ GList* listb;
voip_calls_info_t *listinfo;
/* reset the "display" parameter in graph analysis */
- list2 = g_list_first(voip_calls_get_info()->graph_analysis->list);
- while (list2) {
- gai = list2->data;
+ listb = g_list_first(voip_calls_get_info()->graph_analysis->list);
+ while (listb) {
+ gai = listb->data;
gai->display = FALSE;
- list2 = g_list_next(list2);
+ listb = g_list_next(listb);
}
/* set the display for selected calls */
- list = g_list_first(voip_calls_get_info()->callsinfo_list);
- while (list) {
- listinfo = list->data;
+ lista = g_list_first(voip_calls_get_info()->callsinfo_list);
+ while (lista) {
+ listinfo = lista->data;
if (listinfo->selected) {
- list2 = g_list_first(voip_calls_get_info()->graph_analysis->list);
- while (list2) {
- gai = list2->data;
+ listb = g_list_first(voip_calls_get_info()->graph_analysis->list);
+ while (listb) {
+ gai = listb->data;
if (gai->conv_num == listinfo->call_num) {
gai->display = TRUE;
}
- list2 = g_list_next(list2);
+ listb = g_list_next(listb);
}
}
- list = g_list_next(list);
+ lista = g_list_next(lista);
}
/* create or refresh the graph windows */
static void
add_to_list_store(voip_calls_info_t* strinfo)
{
- gchar label_text[256];
- gchar *data[NUM_COLS];
gchar field[NUM_COLS][50];
- gint c;
isup_calls_info_t *isupinfo;
h323_calls_info_t *h323info;
gboolean flag = FALSE;
- for (c=0; c<NUM_COLS; c++) {
- data[c] = &field[c][0];
- }
-
- g_snprintf(field[CALL_COL_START_TIME], 15, "%3f", nstime_to_sec(&strinfo->start_rel));
- g_snprintf(field[CALL_COL_STOP_TIME], 15, "%3f", nstime_to_sec(&strinfo->stop_rel));
-/* XXX display_signed_time(data[0], sizeof(field[CALL_COL_START_TIME]), strinfo->start_rel.secs, strinfo->start_rel.nsecs, TO_STR_TIME_RES_T_NSECS); */
-/* display_signed_time(data[1], sizeof(field[CALL_COL_STOP_TIME]), strinfo->stop_rel.secs, strinfo->stop_rel.nsecs, TO_STR_TIME_RES_T_NSECS); */
g_snprintf(field[CALL_COL_INITIAL_SPEAKER], 30, "%s", get_addr_name(&(strinfo->initial_speaker)));
- g_snprintf(field[CALL_COL_FROM], 50, "%s", strinfo->from_identity);
- g_snprintf(field[CALL_COL_TO], 50, "%s", strinfo->to_identity);
- g_snprintf(field[CALL_COL_PROTOCOL], 15, "%s", ((strinfo->protocol==VOIP_COMMON)&&strinfo->protocol_name)?strinfo->protocol_name:voip_protocol_name[strinfo->protocol]);
- g_snprintf(field[CALL_COL_PACKETS], 15, "%u", strinfo->npackets);
- g_snprintf(field[CALL_COL_STATE], 15, "%s", voip_call_state_name[strinfo->call_state]);
+ g_snprintf(field[CALL_COL_FROM], 50, "%s", strinfo->from_identity);
+ g_snprintf(field[CALL_COL_TO], 50, "%s", strinfo->to_identity);
+ g_snprintf(field[CALL_COL_PROTOCOL], 15, "%s",
+ ((strinfo->protocol==VOIP_COMMON)&&strinfo->protocol_name)?
+ strinfo->protocol_name:voip_protocol_name[strinfo->protocol]);
+ g_snprintf(field[CALL_COL_STATE], 15, "%s", voip_call_state_name[strinfo->call_state]);
/* Add comments based on the protocol */
switch (strinfo->protocol) {
if (strinfo->call_state == VOIP_CALL_SETUP)
flag = h323info->is_faststart_Setup;
else
- if ((h323info->is_faststart_Setup == TRUE) && (h323info->is_faststart_Proc == TRUE)) flag = TRUE;
- g_snprintf(field[CALL_COL_COMMENTS],35, "Tunneling: %s Fast Start: %s", (h323info->is_h245Tunneling==TRUE?"ON":"OFF"),
- (flag==TRUE?"ON":"OFF"));
+ if ((h323info->is_faststart_Setup == TRUE) && (h323info->is_faststart_Proc == TRUE))
+ flag = TRUE;
+ g_snprintf(field[CALL_COL_COMMENTS],35, "Tunneling: %s Fast Start: %s",
+ (h323info->is_h245Tunneling==TRUE?"ON":"OFF"),
+ (flag==TRUE?"ON":"OFF"));
break;
case VOIP_COMMON:
field[CALL_COL_COMMENTS][0]='\0';
/* Fill the new row */
gtk_list_store_set(list_store, &list_iter,
- CALL_COL_START_TIME, data[0],
- CALL_COL_STOP_TIME, data[1],
- CALL_COL_INITIAL_SPEAKER, data[2],
- CALL_COL_FROM, data[3],
- CALL_COL_TO, data[4],
- CALL_COL_PROTOCOL, data[5],
- CALL_COL_PACKETS, data[6],
- CALL_COL_STATE, data[7],
- CALL_COL_COMMENTS, data[8],
- CALL_COL_DATA, strinfo,
+ CALL_COL_START_TIME, nstime_to_sec(&strinfo->start_rel),
+ CALL_COL_STOP_TIME, nstime_to_sec(&strinfo->stop_rel),
+ CALL_COL_INITIAL_SPEAKER, &field[CALL_COL_INITIAL_SPEAKER][0],
+ CALL_COL_FROM, &field[CALL_COL_FROM][0],
+ CALL_COL_TO, &field[CALL_COL_TO][0],
+ CALL_COL_PROTOCOL, &field[CALL_COL_PROTOCOL][0],
+ CALL_COL_PACKETS, strinfo->npackets,
+ CALL_COL_STATE, &field[CALL_COL_STATE][0],
+ CALL_COL_COMMENTS, &field[CALL_COL_COMMENTS][0],
+ CALL_COL_DATA, strinfo,
-1);
- /* Update the top label with the number of detected calls */
- calls_nb++;
- g_snprintf(label_text, 256,
- "Detected %u VoIP %s. Selected %u %s.",
- calls_nb,
- plurality(calls_nb, "Call", "Calls"),
- calls_ns,
- plurality(calls_ns, "Call", "Calls"));
- gtk_label_set_text(GTK_LABEL(top_label), label_text);
-
- /* Update the status label with the number of total messages */
- g_snprintf(label_text, 256,
- "Total: Calls: %u Start packets: %u Completed calls: %u Rejected calls: %u",
- g_list_length(voip_calls_get_info()->callsinfo_list),
- voip_calls_get_info()->start_packets,
- voip_calls_get_info()->completed_calls,
- voip_calls_get_info()->rejected_calls);
- gtk_label_set_text(GTK_LABEL(status_label), label_text);
+ calls_nb += 1;
}
/****************************************************************************/
/* Create the store */
list_store = gtk_list_store_new(NUM_COLS, /* Total number of columns XXX */
- G_TYPE_STRING, /* Start Time */
- G_TYPE_STRING, /* Stop Time */
+ G_TYPE_DOUBLE, /* Start Time */
+ G_TYPE_DOUBLE, /* Stop Time */
G_TYPE_STRING, /* Initial Speaker */
G_TYPE_STRING, /* From */
G_TYPE_STRING, /* To */
G_TYPE_STRING, /* Protocol */
- G_TYPE_STRING, /* Packets */
+ G_TYPE_UINT, /* Packets */
G_TYPE_STRING, /* State */
G_TYPE_STRING, /* Comments */
G_TYPE_POINTER /* Data */
/* Create a view */
list = gtk_tree_view_new_with_model(GTK_TREE_MODEL(list_store));
+ /* The view now holds a reference. We can get rid of our own reference */
+ g_object_unref(G_OBJECT(list_store));
+
list_view = GTK_TREE_VIEW(list);
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, CALL_COL_START_TIME, GTK_SORT_ASCENDING);
gtk_tree_view_set_headers_clickable(list_view, FALSE);
- /* The view now holds a reference. We can get rid of our own reference */
- g_object_unref(G_OBJECT(list_store));
-
- /*
- * Create the first column packet, associating the "text" attribute of the
- * cell_renderer to the first column of the model
- */
+ /* Start Time */
renderer = gtk_cell_renderer_text_new();
+ g_object_set(G_OBJECT(renderer), "xalign", 1.0, NULL); /* right align */
+ g_object_set(G_OBJECT(renderer), "xpad", 10, NULL);
column = gtk_tree_view_column_new_with_attributes("Start Time", renderer,
- "text", CALL_COL_START_TIME,
+ "text", CALL_COL_START_TIME,
NULL);
gtk_tree_view_column_set_sort_column_id(column, CALL_COL_START_TIME);
gtk_tree_view_column_set_resizable(column, TRUE);
/* Stop Time */
renderer = gtk_cell_renderer_text_new();
+ g_object_set(G_OBJECT(renderer), "xalign", 1.0, NULL); /* right align */
+ g_object_set(G_OBJECT(renderer), "xpad", 10, NULL);
column = gtk_tree_view_column_new_with_attributes("Stop Time", renderer,
"text", CALL_COL_STOP_TIME,
NULL);
/* Packets */
renderer = gtk_cell_renderer_text_new();
+ g_object_set(G_OBJECT(renderer), "xalign", 1.0, NULL); /* right align numbers */
+ g_object_set(G_OBJECT(renderer), "xpad", 10, NULL);
column = gtk_tree_view_column_new_with_attributes("Packets", renderer,
"text", CALL_COL_PACKETS,
NULL);
GtkWidget *hbuttonbox;
GtkWidget *bt_close;
GtkWidget *bt_select_all;
- GtkTooltips *tooltips = gtk_tooltips_new();
const gchar *title_name_ptr;
gchar *win_name;
voip_calls_dlg_w = dlg_window_new(win_name); /* transient_for top_level */
gtk_window_set_destroy_with_parent(GTK_WINDOW(voip_calls_dlg_w), TRUE);
- gtk_window_set_default_size(GTK_WINDOW(voip_calls_dlg_w), 840, 350);
+ gtk_window_set_default_size(GTK_WINDOW(voip_calls_dlg_w), 1000, 350);
main_vb = gtk_vbox_new(FALSE, 0);
gtk_container_add(GTK_CONTAINER(voip_calls_dlg_w), main_vb);
/*bt_unselect = gtk_button_new_with_label ("Unselect");
gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_unselect);
- gtk_tooltips_set_tip (tooltips, bt_unselect, "Unselect this conversation", NULL);*/
+ gtk_widget_set_tooltip_text (bt_unselect, "Unselect this conversation");*/
bt_filter = gtk_button_new_from_stock(WIRESHARK_STOCK_PREPARE_FILTER);
gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_filter);
- gtk_tooltips_set_tip(tooltips, bt_filter, "Prepare a display filter of the selected conversation", NULL);
+ gtk_widget_set_tooltip_text(bt_filter, "Prepare a display filter of the selected conversation");
bt_graph = gtk_button_new_from_stock(WIRESHARK_STOCK_VOIP_FLOW);
gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_graph);
gtk_widget_show(bt_graph);
g_signal_connect(bt_graph, "clicked", G_CALLBACK(on_graph_bt_clicked), NULL);
- gtk_tooltips_set_tip(tooltips, bt_graph, "Show a flow graph of the selected calls.", NULL);
+ gtk_widget_set_tooltip_text(bt_graph, "Show a flow graph of the selected calls.");
#ifdef HAVE_LIBPORTAUDIO
bt_player = gtk_button_new_from_stock(WIRESHARK_STOCK_AUDIO_PLAYER);
gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_player);
gtk_widget_show(bt_player);
g_signal_connect(bt_player, "clicked", G_CALLBACK(on_player_bt_clicked), NULL);
- gtk_tooltips_set_tip(tooltips, bt_player, "Launch the RTP player to listen the selected calls.", NULL);
+ gtk_widget_set_tooltip_text(bt_player, "Launch the RTP player to listen the selected calls.");
#endif /* HAVE_LIBPORTAUDIO */
-#if GTK_CHECK_VERSION(2,10,0)
bt_select_all = gtk_button_new_from_stock(GTK_STOCK_SELECT_ALL);
-#else
- bt_select_all = gtk_button_new_with_label("Select All");
-#endif
gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_select_all);
+#if GTK_CHECK_VERSION(2,18,0)
+ gtk_widget_set_can_default(bt_select_all, TRUE);
+#else
GTK_WIDGET_SET_FLAGS(bt_select_all, GTK_CAN_DEFAULT);
- gtk_tooltips_set_tip(tooltips, bt_select_all, "Select all the calls", NULL);
+#endif
+ gtk_widget_set_tooltip_text(bt_select_all, "Select all the calls");
bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
gtk_container_add(GTK_CONTAINER (hbuttonbox), bt_close);
+#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);
- gtk_tooltips_set_tip(tooltips, bt_close, "Close this dialog", NULL);
+#endif
+ gtk_widget_set_tooltip_text(bt_close, "Close this dialog");
/*g_signal_connect(bt_unselect, "clicked", G_CALLBACK(voip_calls_on_unselect), NULL);*/
g_signal_connect(bt_filter, "clicked", G_CALLBACK(voip_calls_on_filter), NULL);
voip_calls_dlg = voip_calls_dlg_w;
- g_free(win_name);
+ g_free(win_name);
}
/* update the contents of the list view */
/* list: pointer to list of voip_calls_info_t* */
void
-voip_calls_dlg_update(GList *list)
+voip_calls_dlg_update(GList *listx)
{
gchar label_text[256];
if (voip_calls_dlg != NULL) {
calls_nb = 0;
calls_ns = 0;
+ gtk_list_store_clear(list_store);
- g_snprintf(label_text, 256,
+ g_snprintf(label_text, sizeof(label_text),
"Total: Calls: %u Start packets: %u Completed calls: %u Rejected calls: %u",
g_list_length(voip_calls_get_info()->callsinfo_list),
- voip_calls_get_info()->start_packets,
+ voip_calls_get_info()->start_packets,
voip_calls_get_info()->completed_calls,
voip_calls_get_info()->rejected_calls);
gtk_label_set_text(GTK_LABEL(status_label), label_text);
- list = g_list_first(list);
- while (list) {
- add_to_list_store((voip_calls_info_t*)(list->data));
- list = g_list_next(list);
+ listx = g_list_first(listx);
+ while (listx) {
+ add_to_list_store((voip_calls_info_t*)(listx->data));
+ listx = g_list_next(listx);
}
- g_snprintf(label_text, 256,
+ g_snprintf(label_text, sizeof(label_text),
"Detected %u VoIP %s. Selected %u %s.",
- calls_nb,
+ calls_nb,
plurality(calls_nb, "Call", "Calls"),
calls_ns,
plurality(calls_ns, "Call", "Calls"));
actrace_calls_init_tap();
skinny_calls_init_tap();
iax2_calls_init_tap();
+ t38_init_tap();
/* create dialog box if necessary */
if (voip_calls_dlg == NULL) {
/* Scan for VoIP calls calls (redissect all packets) */
cf_retap_packets(&cfile);
- gdk_window_raise(voip_calls_dlg->window);
+ gdk_window_raise(gtk_widget_get_window(voip_calls_dlg));
/* Tap listener will be removed and cleaned up in voip_calls_on_destroy */
}
/****************************************************************************/
/* entry point when called via the GTK menu */
+#ifdef MAIN_MENU_USE_UIMANAGER
+void
+voip_calls_launch(GtkAction *action _U_, gpointer user_data _U_)
+{
+ voip_calls_init_tap("", NULL);
+}
+#else
static void
voip_calls_launch(GtkWidget *w _U_, gpointer data _U_)
{
voip_calls_init_tap("", NULL);
}
+#endif
/****************************************************************************/
void
register_tap_listener_voip_calls_dlg(void)
{
register_stat_cmd_arg("voip,calls", voip_calls_init_tap, NULL);
- register_stat_menu_item_stock("_VoIP Calls...",
+#ifdef MAIN_MENU_USE_UIMANAGER
+#else
+ register_stat_menu_item_stock("_VoIP Calls",
REGISTER_STAT_GROUP_TELEPHONY, WIRESHARK_STOCK_TELEPHONE,
voip_calls_launch, NULL, NULL, NULL);
+#endif
}
git.samba.org / obnox / wireshark / wip.git / blobdiff