diff options
Diffstat (limited to 'ui/gtk/rtp_stream_dlg.c')
| -rw-r--r-- | ui/gtk/rtp_stream_dlg.c | 1530 |
1 files changed, 765 insertions, 765 deletions
diff --git a/ui/gtk/rtp_stream_dlg.c b/ui/gtk/rtp_stream_dlg.c index ae89d5f10c..41c43cc841 100644 --- a/ui/gtk/rtp_stream_dlg.c +++ b/ui/gtk/rtp_stream_dlg.c @@ -100,53 +100,53 @@ enum /****************************************************************************/ static void save_stream_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_) { - /* Note that we no longer have a Save voice info dialog box. */ - rtpstream_save_dlg = NULL; + /* Note that we no longer have a Save voice info dialog box. */ + rtpstream_save_dlg = NULL; } /****************************************************************************/ /* save in a file */ static gboolean save_stream_ok_cb(GtkWidget *ok_bt _U_, gpointer fs) { - gchar *g_dest; - - if (!selected_stream_fwd) { - return TRUE; - } - - g_dest = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs)); - - /* Perhaps the user specified a directory instead of a file. - Check whether they did. */ - if (test_for_directory(g_dest) == EISDIR) { - /* It's a directory - set the file selection box to display it. */ - set_last_open_dir(g_dest); - g_free(g_dest); - file_selection_set_current_folder((GtkWidget *)fs, get_last_open_dir()); - gtk_file_chooser_set_current_name((GtkFileChooser *)fs, ""); - return FALSE; - } - -#if 0 /* GtkFileChooser/gtk_dialog_run currently being used. */ - /* So: Leaving the dialog box displayed after popping-up an */ - /* alert box won't work. */ - /* - * Don't dismiss the dialog box if the save operation fails. - */ - if (!rtpstream_save(selected_stream_fwd, g_dest)) { - g_free(g_dest); - return; - } - g_free(g_dest); - window_destroy(GTK_WIDGET(rtpstream_save_dlg)); - return; + gchar *g_dest; + + if (!selected_stream_fwd) { + return TRUE; + } + + g_dest = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs)); + + /* Perhaps the user specified a directory instead of a file. + Check whether they did. */ + if (test_for_directory(g_dest) == EISDIR) { + /* It's a directory - set the file selection box to display it. */ + set_last_open_dir(g_dest); + g_free(g_dest); + file_selection_set_current_folder((GtkWidget *)fs, get_last_open_dir()); + gtk_file_chooser_set_current_name((GtkFileChooser *)fs, ""); + return FALSE; + } + +#if 0 /* GtkFileChooser/gtk_dialog_run currently being used. */ + /* So: Leaving the dialog box displayed after popping-up an */ + /* alert box won't work. */ + /* + * Don't dismiss the dialog box if the save operation fails. + */ + if (!rtpstream_save(selected_stream_fwd, g_dest)) { + g_free(g_dest); + return; + } + g_free(g_dest); + window_destroy(GTK_WIDGET(rtpstream_save_dlg)); + return; #else - /* Dialog box needs to be always destroyed. Return TRUE */ - /* so that caller will destroy the dialog box. */ - /* See comment under rtpstream_on_save. */ - rtpstream_save(selected_stream_fwd, g_dest); - g_free(g_dest); - return TRUE; + /* Dialog box needs to be always destroyed. Return TRUE */ + /* so that caller will destroy the dialog box. */ + /* See comment under rtpstream_on_save. */ + rtpstream_save(selected_stream_fwd, g_dest); + g_free(g_dest); + return TRUE; #endif } @@ -157,18 +157,18 @@ static gboolean save_stream_ok_cb(GtkWidget *ok_bt _U_, gpointer fs) static void rtpstream_on_destroy(GObject *object _U_, gpointer user_data _U_) { - /* Remove the stream tap listener */ - remove_tap_listener_rtp_stream(); + /* Remove the stream tap listener */ + remove_tap_listener_rtp_stream(); - /* Is there a save voice window open? */ - if (rtpstream_save_dlg != NULL) - window_destroy(rtpstream_save_dlg); + /* Is there a save voice window open? */ + if (rtpstream_save_dlg != NULL) + window_destroy(rtpstream_save_dlg); - /* Clean up memory used by stream tap */ - rtpstream_reset((rtpstream_tapinfo_t *)rtpstream_get_info()); + /* Clean up memory used by stream tap */ + rtpstream_reset((rtpstream_tapinfo_t *)rtpstream_get_info()); - /* Note that we no longer have a "RTP Streams" dialog box. */ - rtp_stream_dlg = NULL; + /* Note that we no longer have a "RTP Streams" dialog box. */ + rtp_stream_dlg = NULL; } @@ -176,117 +176,117 @@ rtpstream_on_destroy(GObject *object _U_, gpointer user_data _U_) static void rtpstream_on_unselect(GtkButton *button _U_, gpointer user_data _U_) { - GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(list)); - gtk_tree_selection_unselect_all(selection); + GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(list)); + gtk_tree_selection_unselect_all(selection); - selected_stream_fwd = NULL; - selected_stream_rev = NULL; - gtk_label_set_text(GTK_LABEL(label_fwd), FWD_LABEL_TEXT); - gtk_label_set_text(GTK_LABEL(label_rev), REV_LABEL_TEXT); + selected_stream_fwd = NULL; + selected_stream_rev = NULL; + gtk_label_set_text(GTK_LABEL(label_fwd), FWD_LABEL_TEXT); + gtk_label_set_text(GTK_LABEL(label_rev), REV_LABEL_TEXT); } /****************************************************************************/ static gint rtp_stream_info_cmp_reverse(gconstpointer aa, gconstpointer bb) { - const struct _rtp_stream_info* a = (const struct _rtp_stream_info *)aa; - const struct _rtp_stream_info* b = (const struct _rtp_stream_info *)bb; - - if (a==NULL || b==NULL) - return 1; - if ((ADDRESSES_EQUAL(&(a->src_addr), &(b->dest_addr))) - && (a->src_port == b->dest_port) - && (ADDRESSES_EQUAL(&(a->dest_addr), &(b->src_addr))) - && (a->dest_port == b->src_port)) - return 0; - else - return 1; + const struct _rtp_stream_info* a = (const struct _rtp_stream_info *)aa; + const struct _rtp_stream_info* b = (const struct _rtp_stream_info *)bb; + + if (a==NULL || b==NULL) + return 1; + if ((ADDRESSES_EQUAL(&(a->src_addr), &(b->dest_addr))) + && (a->src_port == b->dest_port) + && (ADDRESSES_EQUAL(&(a->dest_addr), &(b->src_addr))) + && (a->dest_port == b->src_port)) + return 0; + else + return 1; } /****************************************************************************/ static void -rtpstream_on_findrev(GtkButton *button _U_, gpointer user_data _U_) +rtpstream_on_findrev(GtkButton *button _U_, gpointer user_data _U_) { - GtkTreeSelection *selection; - GList *path_list; - GList *path_list_item = NULL; - GtkTreePath *path = NULL; - GtkTreePath *path_fwd = NULL; - GtkTreePath *path_rev = NULL; - GtkTreeIter iter; - rtp_stream_info_t *stream = NULL; - gboolean found_it = FALSE; - - if (selected_stream_fwd==NULL) - return; - - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(list)); - path_list = gtk_tree_selection_get_selected_rows(selection, NULL); - - if (path_list) { - path_list_item = g_list_first(path_list); - path = (GtkTreePath *)(path_list_item->data); - } - - if (path && gtk_tree_model_get_iter(GTK_TREE_MODEL(list_store), &iter, path)) { - gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, RTP_COL_DATA, &stream, -1); - if (stream == selected_stream_fwd) { - path_fwd = path; - } - if (stream == selected_stream_rev) { - path_rev = path; - } - } - - path = NULL; - if (path_list_item) { - path_list_item = g_list_next(path_list_item); - if (path_list_item) - path = (GtkTreePath *)(path_list_item->data); - } - - if (path && gtk_tree_model_get_iter(GTK_TREE_MODEL(list_store), &iter, path)) { - gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, RTP_COL_DATA, &stream, -1); - if (stream == selected_stream_fwd) { - path_fwd = path; - } - if (stream == selected_stream_rev) { - path_rev = path; - } - } - - /* Find it from the forward stream on */ - gtk_tree_model_get_iter(GTK_TREE_MODEL(list_store), &iter, path_fwd); - while (gtk_tree_model_iter_next(GTK_TREE_MODEL(list_store), &iter)) { - gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, RTP_COL_DATA, &stream, -1); - if (rtp_stream_info_cmp_reverse(selected_stream_fwd, stream) == 0) { - found_it = TRUE; - break; - } - }; - - if (!found_it) { - /* If we're not done yet, restart at the beginning */ - gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list_store), &iter); - do { - gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, RTP_COL_DATA, &stream, -1); - if (rtp_stream_info_cmp_reverse(selected_stream_fwd, stream) == 0) { - found_it = TRUE; - break; - } - if (stream == selected_stream_fwd) - break; - } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(list_store), &iter)); - } - - if (found_it) { - if (path_rev) - gtk_tree_selection_unselect_path(selection, path_rev); - gtk_tree_selection_select_iter(selection, &iter); - } - - g_list_foreach(path_list, (GFunc)gtk_tree_path_free, NULL); - g_list_free(path_list); + GtkTreeSelection *selection; + GList *path_list; + GList *path_list_item = NULL; + GtkTreePath *path = NULL; + GtkTreePath *path_fwd = NULL; + GtkTreePath *path_rev = NULL; + GtkTreeIter iter; + rtp_stream_info_t *stream = NULL; + gboolean found_it = FALSE; + + if (selected_stream_fwd==NULL) + return; + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(list)); + path_list = gtk_tree_selection_get_selected_rows(selection, NULL); + + if (path_list) { + path_list_item = g_list_first(path_list); + path = (GtkTreePath *)(path_list_item->data); + } + + if (path && gtk_tree_model_get_iter(GTK_TREE_MODEL(list_store), &iter, path)) { + gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, RTP_COL_DATA, &stream, -1); + if (stream == selected_stream_fwd) { + path_fwd = path; + } + if (stream == selected_stream_rev) { + path_rev = path; + } + } + + path = NULL; + if (path_list_item) { + path_list_item = g_list_next(path_list_item); + if (path_list_item) + path = (GtkTreePath *)(path_list_item->data); + } + + if (path && gtk_tree_model_get_iter(GTK_TREE_MODEL(list_store), &iter, path)) { + gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, RTP_COL_DATA, &stream, -1); + if (stream == selected_stream_fwd) { + path_fwd = path; + } + if (stream == selected_stream_rev) { + path_rev = path; + } + } + + /* Find it from the forward stream on */ + gtk_tree_model_get_iter(GTK_TREE_MODEL(list_store), &iter, path_fwd); + while (gtk_tree_model_iter_next(GTK_TREE_MODEL(list_store), &iter)) { + gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, RTP_COL_DATA, &stream, -1); + if (rtp_stream_info_cmp_reverse(selected_stream_fwd, stream) == 0) { + found_it = TRUE; + break; + } + }; + + if (!found_it) { + /* If we're not done yet, restart at the beginning */ + gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list_store), &iter); + do { + gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, RTP_COL_DATA, &stream, -1); + if (rtp_stream_info_cmp_reverse(selected_stream_fwd, stream) == 0) { + found_it = TRUE; + break; + } + if (stream == selected_stream_fwd) + break; + } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(list_store), &iter)); + } + + if (found_it) { + if (path_rev) + gtk_tree_selection_unselect_path(selection, path_rev); + gtk_tree_selection_select_iter(selection, &iter); + } + + g_list_foreach(path_list, (GFunc)gtk_tree_path_free, NULL); + g_list_free(path_list); } @@ -296,10 +296,10 @@ static void rtpstream_on_goto (GtkButton *button _U_, gpointer user_data _U_) { - if (selected_stream_fwd) - { - cf_goto_frame(&cfile, selected_stream_fwd->first_frame_num); - } + if (selected_stream_fwd) + { + cf_goto_frame(&cfile, selected_stream_fwd->first_frame_num); + } } */ @@ -309,62 +309,62 @@ static void rtpstream_on_save(GtkButton *button _U_, gpointer data _U_) { /* XX - not needed? - rtpstream_tapinfo_t* tapinfo = data; + rtpstream_tapinfo_t* tapinfo = data; */ - if (!selected_stream_fwd) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - "Please select a forward stream"); - return; - } + if (!selected_stream_fwd) { + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, + "Please select a forward stream"); + return; + } #if 0 /* XXX: GtkFileChooserDialog/gtk_dialog_run currently being used is effectively modal so this is not req'd */ - if (rtpstream_save_dlg != NULL) { - /* There's already a Save dialog box; reactivate it. */ - reactivate_window(rtpstream_save_dlg); - return; - } + if (rtpstream_save_dlg != NULL) { + /* There's already a Save dialog box; reactivate it. */ + reactivate_window(rtpstream_save_dlg); + return; + } #endif - rtpstream_save_dlg = gtk_file_chooser_dialog_new( - "Wireshark: Save selected stream in rtpdump ('-F dump') format", - GTK_WINDOW(rtp_stream_dlg), GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - NULL); - gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(rtpstream_save_dlg), TRUE); + rtpstream_save_dlg = gtk_file_chooser_dialog_new( + "Wireshark: Save selected stream in rtpdump ('-F dump') format", + GTK_WINDOW(rtp_stream_dlg), GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + NULL); + gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(rtpstream_save_dlg), TRUE); - g_signal_connect(rtpstream_save_dlg, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); - g_signal_connect(rtpstream_save_dlg, "destroy", G_CALLBACK(save_stream_destroy_cb), NULL); + g_signal_connect(rtpstream_save_dlg, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(rtpstream_save_dlg, "destroy", G_CALLBACK(save_stream_destroy_cb), NULL); - gtk_widget_show(rtpstream_save_dlg); - window_present(rtpstream_save_dlg); + gtk_widget_show(rtpstream_save_dlg); + window_present(rtpstream_save_dlg); #if 0 - if (gtk_dialog_run(GTK_DIALOG(rtpstream_save_dlg)) == GTK_RESPONSE_ACCEPT){ - save_stream_ok_cb(rtpstream_save_dlg, rtpstream_save_dlg); - }else{ - window_destroy(rtpstream_save_dlg); - } + if (gtk_dialog_run(GTK_DIALOG(rtpstream_save_dlg)) == GTK_RESPONSE_ACCEPT){ + save_stream_ok_cb(rtpstream_save_dlg, rtpstream_save_dlg); + }else{ + window_destroy(rtpstream_save_dlg); + } #endif - /* "Run" the GtkFileChooserDialog. */ - /* Upon exit: If "Accept" run the OK callback. */ - /* If the OK callback returns with a FALSE status, re-run the dialog.*/ - /* If not accept (ie: cancel) destroy the window. */ - /* XXX: If the OK callback pops up an alert box (eg: for an error) it *must* */ - /* return with a TRUE status so that the dialog window will be destroyed. */ - /* Trying to re-run the dialog after popping up an alert box will not work */ - /* since the user will not be able to dismiss the alert box. */ - /* The (somewhat unfriendly) effect: the user must re-invoke the */ - /* GtkFileChooserDialog whenever the OK callback pops up an alert box. */ - /* */ - /* ToDo: use GtkFileChooserWidget in a dialog window instead of */ - /* GtkFileChooserDialog. */ - while (gtk_dialog_run(GTK_DIALOG(rtpstream_save_dlg)) == GTK_RESPONSE_ACCEPT) { - if (save_stream_ok_cb(NULL, rtpstream_save_dlg)) { - break; /* we're done */ - } - } - window_destroy(rtpstream_save_dlg); + /* "Run" the GtkFileChooserDialog. */ + /* Upon exit: If "Accept" run the OK callback. */ + /* If the OK callback returns with a FALSE status, re-run the dialog.*/ + /* If not accept (ie: cancel) destroy the window. */ + /* XXX: If the OK callback pops up an alert box (eg: for an error) it *must* */ + /* return with a TRUE status so that the dialog window will be destroyed. */ + /* Trying to re-run the dialog after popping up an alert box will not work */ + /* since the user will not be able to dismiss the alert box. */ + /* The (somewhat unfriendly) effect: the user must re-invoke the */ + /* GtkFileChooserDialog whenever the OK callback pops up an alert box. */ + /* */ + /* ToDo: use GtkFileChooserWidget in a dialog window instead of */ + /* GtkFileChooserDialog. */ + while (gtk_dialog_run(GTK_DIALOG(rtpstream_save_dlg)) == GTK_RESPONSE_ACCEPT) { + if (save_stream_ok_cb(NULL, rtpstream_save_dlg)) { + break; /* we're done */ + } + } + window_destroy(rtpstream_save_dlg); } @@ -372,9 +372,9 @@ rtpstream_on_save(GtkButton *button _U_, gpointer data _U_) static void rtpstream_on_mark(GtkButton *button _U_, gpointer user_data _U_) { - if (selected_stream_fwd==NULL && selected_stream_rev==NULL) - return; - rtpstream_mark(selected_stream_fwd, selected_stream_rev); + if (selected_stream_fwd==NULL && selected_stream_rev==NULL) + return; + rtpstream_mark(selected_stream_fwd, selected_stream_rev); } @@ -382,67 +382,67 @@ rtpstream_on_mark(GtkButton *button _U_, gpointer user_data _U_) static void rtpstream_on_filter(GtkButton *button _U_, gpointer user_data _U_) { - gchar *filter_string = NULL; - gchar *filter_string_fwd = NULL; - gchar *filter_string_rev = NULL; - gchar ip_version[3]; - - if (selected_stream_fwd==NULL && selected_stream_rev==NULL) - return; - - if (selected_stream_fwd) - { - if (selected_stream_fwd->src_addr.type==AT_IPv6) { - g_strlcpy(ip_version,"v6",sizeof(ip_version)); - } else { - ip_version[0] = '\0'; - } - filter_string_fwd = g_strdup_printf( - "(ip%s.src==%s && udp.srcport==%u && ip%s.dst==%s && udp.dstport==%u && rtp.ssrc==0x%X)", - ip_version, - ep_address_to_str(&(selected_stream_fwd->src_addr)), - selected_stream_fwd->src_port, - ip_version, - ep_address_to_str(&(selected_stream_fwd->dest_addr)), - selected_stream_fwd->dest_port, - selected_stream_fwd->ssrc); - - filter_string = filter_string_fwd; - } - - if (selected_stream_rev) - { - if (selected_stream_rev->src_addr.type==AT_IPv6) { - g_strlcpy(ip_version,"v6",sizeof(ip_version)); - } else { - ip_version[0] = '\0'; - } - filter_string_rev = g_strdup_printf( - "(ip%s.src==%s && udp.srcport==%u && ip%s.dst==%s && udp.dstport==%u && rtp.ssrc==0x%X)", - ip_version, - ep_address_to_str(&(selected_stream_rev->src_addr)), - selected_stream_rev->src_port, - ip_version, - ep_address_to_str(&(selected_stream_rev->dest_addr)), - selected_stream_rev->dest_port, - selected_stream_rev->ssrc); - - filter_string = filter_string_rev; - } - - if ((selected_stream_fwd) && (selected_stream_rev)) - { - filter_string = g_strdup_printf("%s || %s", filter_string_fwd, filter_string_rev); - g_free(filter_string_fwd); - g_free(filter_string_rev); - } - - gtk_entry_set_text(GTK_ENTRY(main_display_filter_widget), filter_string); - g_free(filter_string); + gchar *filter_string = NULL; + gchar *filter_string_fwd = NULL; + gchar *filter_string_rev = NULL; + gchar ip_version[3]; + + if (selected_stream_fwd==NULL && selected_stream_rev==NULL) + return; + + if (selected_stream_fwd) + { + if (selected_stream_fwd->src_addr.type==AT_IPv6) { + g_strlcpy(ip_version,"v6",sizeof(ip_version)); + } else { + ip_version[0] = '\0'; + } + filter_string_fwd = g_strdup_printf( + "(ip%s.src==%s && udp.srcport==%u && ip%s.dst==%s && udp.dstport==%u && rtp.ssrc==0x%X)", + ip_version, + ep_address_to_str(&(selected_stream_fwd->src_addr)), + selected_stream_fwd->src_port, + ip_version, + ep_address_to_str(&(selected_stream_fwd->dest_addr)), + selected_stream_fwd->dest_port, + selected_stream_fwd->ssrc); + + filter_string = filter_string_fwd; + } + + if (selected_stream_rev) + { + if (selected_stream_rev->src_addr.type==AT_IPv6) { + g_strlcpy(ip_version,"v6",sizeof(ip_version)); + } else { + ip_version[0] = '\0'; + } + filter_string_rev = g_strdup_printf( + "(ip%s.src==%s && udp.srcport==%u && ip%s.dst==%s && udp.dstport==%u && rtp.ssrc==0x%X)", + ip_version, + ep_address_to_str(&(selected_stream_rev->src_addr)), + selected_stream_rev->src_port, + ip_version, + ep_address_to_str(&(selected_stream_rev->dest_addr)), + selected_stream_rev->dest_port, + selected_stream_rev->ssrc); + + filter_string = filter_string_rev; + } + + if ((selected_stream_fwd) && (selected_stream_rev)) + { + filter_string = g_strdup_printf("%s || %s", filter_string_fwd, filter_string_rev); + g_free(filter_string_fwd); + g_free(filter_string_rev); + } + + gtk_entry_set_text(GTK_ENTRY(main_display_filter_widget), filter_string); + g_free(filter_string); /* - main_filter_packets(&cfile, filter_string, FALSE); - rtpstream_dlg_update(rtpstream_get_info()->strinfo_list); + main_filter_packets(&cfile, filter_string, FALSE); + rtpstream_dlg_update(rtpstream_get_info()->strinfo_list); */ } @@ -451,104 +451,104 @@ rtpstream_on_filter(GtkButton *button _U_, gpointer user_data _U_) static void rtpstream_on_copy_as_csv(GtkWindow *win _U_, gpointer data _U_) { - GtkTreeViewColumn *column; - const gchar *title; - GtkTreeIter iter; - guint i,j; - gchar *table_entry; - guint table_entry_uint; - - GString *CSV_str; - GtkClipboard *cb; - - CSV_str = g_string_sized_new(240*(1+streams_nb)); - /* Add the column headers to the CSV data */ - for (j=0; j<NUM_COLS-1; j++) { - column = gtk_tree_view_get_column(GTK_TREE_VIEW(list), j); - title = gtk_tree_view_column_get_title(column); - g_string_append_printf(CSV_str, "\"%s\"", title); - if (j<NUM_COLS-2) g_string_append(CSV_str, ","); - } - g_string_append(CSV_str,"\n"); - - /* Add the column values to the CSV data */ - if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list_store), &iter)) { - for (i=0; i<streams_nb; i++) { - for (j=0; j<NUM_COLS-1; j++) { - if (j == RTP_COL_SRC_PORT || j == RTP_COL_DST_PORT || j == RTP_COL_PACKETS) { - gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, j, &table_entry_uint, -1); - g_string_append_printf(CSV_str, "\"%u\"", table_entry_uint); - } else { - gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, j, &table_entry, -1); - g_string_append_printf(CSV_str, "\"%s\"", table_entry); - g_free(table_entry); - } - if (j<NUM_COLS-2) g_string_append(CSV_str,","); - } - g_string_append(CSV_str,"\n"); - gtk_tree_model_iter_next (GTK_TREE_MODEL(list_store),&iter); - } - } - - /* Now that we have the CSV data, copy it into the default clipboard */ - cb = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD); - gtk_clipboard_set_text(cb, CSV_str->str, (gint)CSV_str->len); - g_string_free(CSV_str, TRUE); + GtkTreeViewColumn *column; + const gchar *title; + GtkTreeIter iter; + guint i,j; + gchar *table_entry; + guint table_entry_uint; + + GString *CSV_str; + GtkClipboard *cb; + + CSV_str = g_string_sized_new(240*(1+streams_nb)); + /* Add the column headers to the CSV data */ + for (j=0; j<NUM_COLS-1; j++) { + column = gtk_tree_view_get_column(GTK_TREE_VIEW(list), j); + title = gtk_tree_view_column_get_title(column); + g_string_append_printf(CSV_str, "\"%s\"", title); + if (j<NUM_COLS-2) g_string_append(CSV_str, ","); + } + g_string_append(CSV_str,"\n"); + + /* Add the column values to the CSV data */ + if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list_store), &iter)) { + for (i=0; i<streams_nb; i++) { + for (j=0; j<NUM_COLS-1; j++) { + if (j == RTP_COL_SRC_PORT || j == RTP_COL_DST_PORT || j == RTP_COL_PACKETS) { + gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, j, &table_entry_uint, -1); + g_string_append_printf(CSV_str, "\"%u\"", table_entry_uint); + } else { + gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, j, &table_entry, -1); + g_string_append_printf(CSV_str, "\"%s\"", table_entry); + g_free(table_entry); + } + if (j<NUM_COLS-2) g_string_append(CSV_str,","); + } + g_string_append(CSV_str,"\n"); + gtk_tree_model_iter_next (GTK_TREE_MODEL(list_store),&iter); + } + } + + /* Now that we have the CSV data, copy it into the default clipboard */ + cb = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD); + gtk_clipboard_set_text(cb, CSV_str->str, (gint)CSV_str->len); + g_string_free(CSV_str, TRUE); } /****************************************************************************/ static void rtpstream_on_analyse(GtkButton *button _U_, gpointer user_data _U_) { - address src_fwd; - guint32 port_src_fwd = 0; - address dst_fwd; - guint32 port_dst_fwd = 0; - guint32 ssrc_fwd = 0; - address src_rev; - guint32 port_src_rev = 0; - address dst_rev; - guint32 port_dst_rev = 0; - guint32 ssrc_rev = 0; - - if (!(selected_stream_fwd || selected_stream_rev)) - { - return; - } - - SET_ADDRESS(&src_fwd,AT_NONE,0,NULL); - SET_ADDRESS(&dst_fwd,AT_NONE,0,NULL); - SET_ADDRESS(&src_rev,AT_NONE,0,NULL); - SET_ADDRESS(&dst_rev,AT_NONE,0,NULL); - - if (selected_stream_fwd) { - COPY_ADDRESS(&(src_fwd), &(selected_stream_fwd->src_addr)); - port_src_fwd = selected_stream_fwd->src_port; - COPY_ADDRESS(&(dst_fwd), &(selected_stream_fwd->dest_addr)); - port_dst_fwd = selected_stream_fwd->dest_port; - ssrc_fwd = selected_stream_fwd->ssrc; - } - - if (selected_stream_rev) { - COPY_ADDRESS(&(src_rev), &(selected_stream_rev->src_addr)); - port_src_rev = selected_stream_rev->src_port; - COPY_ADDRESS(&(dst_rev), &(selected_stream_rev->dest_addr)); - port_dst_rev = selected_stream_rev->dest_port; - ssrc_rev = selected_stream_rev->ssrc; - } - - rtp_analysis( - &src_fwd, - port_src_fwd, - &dst_fwd, - port_dst_fwd, - ssrc_fwd, - &src_rev, - port_src_rev, - &dst_rev, - port_dst_rev, - ssrc_rev - ); + address src_fwd; + guint32 port_src_fwd = 0; + address dst_fwd; + guint32 port_dst_fwd = 0; + guint32 ssrc_fwd = 0; + address src_rev; + guint32 port_src_rev = 0; + address dst_rev; + guint32 port_dst_rev = 0; + guint32 ssrc_rev = 0; + + if (!(selected_stream_fwd || selected_stream_rev)) + { + return; + } + + SET_ADDRESS(&src_fwd,AT_NONE,0,NULL); + SET_ADDRESS(&dst_fwd,AT_NONE,0,NULL); + SET_ADDRESS(&src_rev,AT_NONE,0,NULL); + SET_ADDRESS(&dst_rev,AT_NONE,0,NULL); + + if (selected_stream_fwd) { + COPY_ADDRESS(&(src_fwd), &(selected_stream_fwd->src_addr)); + port_src_fwd = selected_stream_fwd->src_port; + COPY_ADDRESS(&(dst_fwd), &(selected_stream_fwd->dest_addr)); + port_dst_fwd = selected_stream_fwd->dest_port; + ssrc_fwd = selected_stream_fwd->ssrc; + } + + if (selected_stream_rev) { + COPY_ADDRESS(&(src_rev), &(selected_stream_rev->src_addr)); + port_src_rev = selected_stream_rev->src_port; + COPY_ADDRESS(&(dst_rev), &(selected_stream_rev->dest_addr)); + port_dst_rev = selected_stream_rev->dest_port; + ssrc_rev = selected_stream_rev->ssrc; + } + + rtp_analysis( + &src_fwd, + port_src_fwd, + &dst_fwd, + port_dst_fwd, + ssrc_fwd, + &src_rev, + port_src_rev, + &dst_rev, + port_dst_rev, + ssrc_rev + ); } @@ -558,111 +558,111 @@ rtpstream_on_analyse(GtkButton *button _U_, gpointer user_data _U_) static gboolean rtpstream_view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model, GtkTreePath *path, gboolean path_currently_selected, gpointer userdata _U_) { - GtkTreeIter iter; - gint nb_selected; - rtp_stream_info_t* selected_stream; - gboolean result = TRUE; - gchar label_text[80]; - - /* Logic - * nb_selected path_currently_selected forward reverse action result - * 0 must be false any any assign forward true - * 1 true match any delete forward true - * 1 true other any delete reverse true - * 1 false match any invalid true - * 1 false other none assign reverse true - * 1 false other any assign forward true - * 2 true match any delete forward path_currently_selected - * 2 true other match delete reverse path_currently_selected - * 2 true other other invalid path_currently_selected - * 2 false match any invalid path_currently_selected - * 2 false any match invalid path_currently_selected - * 2 false other other assign reverse path_currently_selected - * >2 any any any invalid path_currently_selected - */ - - nb_selected = gtk_tree_selection_count_selected_rows(selection); - if (gtk_tree_model_get_iter(model, &iter, path)) { - gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, RTP_COL_DATA, &selected_stream, -1); - - switch (nb_selected) - { - case 0: - { - if (path_currently_selected) - g_print("Select: He, we've got a selected path while none is selected?\n"); - else - selected_stream_fwd = selected_stream; - break; - } - case 1: - { - if (path_currently_selected) - if (selected_stream == selected_stream_fwd) - selected_stream_fwd = NULL; - else - selected_stream_rev = NULL; - else - if (selected_stream == selected_stream_fwd) - g_print("Select: He, this can't be. 1 not selected but equal to fwd\n"); - else - if (selected_stream_rev) - selected_stream_fwd = selected_stream; - else - selected_stream_rev = selected_stream; - break; - } - case 2: - { - if (path_currently_selected) { - if (selected_stream == selected_stream_fwd) - selected_stream_fwd = NULL; - else if (selected_stream == selected_stream_rev) - selected_stream_rev = NULL; - else - g_print("Select: He, this can't be. 2 selected but not equal to fwd or rev\n"); - } - result = path_currently_selected; - break; - } - default: - { - g_print("Select: He, we're getting a too high selection count\n"); - result = path_currently_selected; - } - } - } - - if (selected_stream_fwd) { - g_snprintf(label_text, sizeof(label_text), "Forward: %s:%u -> %s:%u, SSRC=0x%X", - ep_address_to_display(&(selected_stream_fwd->src_addr)), - selected_stream_fwd->src_port, - ep_address_to_display(&(selected_stream_fwd->dest_addr)), - selected_stream_fwd->dest_port, - selected_stream_fwd->ssrc - ); - gtk_label_set_text(GTK_LABEL(label_fwd), label_text); - } else { - if (selected_stream_rev) - gtk_label_set_text(GTK_LABEL(label_fwd), FWD_ONLY_LABEL_TEXT); - else - gtk_label_set_text(GTK_LABEL(label_fwd), FWD_LABEL_TEXT); - } - - if (selected_stream_rev) { - g_snprintf(label_text, sizeof(label_text), "Reverse: %s:%u -> %s:%u, SSRC=0x%X", - ep_address_to_display(&(selected_stream_rev->src_addr)), - selected_stream_rev->src_port, - ep_address_to_display(&(selected_stream_rev->dest_addr)), - selected_stream_rev->dest_port, - selected_stream_rev->ssrc - ); - gtk_label_set_text(GTK_LABEL(label_rev), label_text); - } else { - gtk_label_set_text(GTK_LABEL(label_rev), REV_LABEL_TEXT); - } - - return result; + GtkTreeIter iter; + gint nb_selected; + rtp_stream_info_t* selected_stream; + gboolean result = TRUE; + gchar label_text[80]; + + /* Logic + * nb_selected path_currently_selected forward reverse action result + * 0 must be false any any assign forward true + * 1 true match any delete forward true + * 1 true other any delete reverse true + * 1 false match any invalid true + * 1 false other none assign reverse true + * 1 false other any assign forward true + * 2 true match any delete forward path_currently_selected + * 2 true other match delete reverse path_currently_selected + * 2 true other other invalid path_currently_selected + * 2 false match any invalid path_currently_selected + * 2 false any match invalid path_currently_selected + * 2 false other other assign reverse path_currently_selected + * >2 any any any invalid path_currently_selected + */ + + nb_selected = gtk_tree_selection_count_selected_rows(selection); + if (gtk_tree_model_get_iter(model, &iter, path)) { + gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, RTP_COL_DATA, &selected_stream, -1); + + switch (nb_selected) + { + case 0: + { + if (path_currently_selected) + g_print("Select: He, we've got a selected path while none is selected?\n"); + else + selected_stream_fwd = selected_stream; + break; + } + case 1: + { + if (path_currently_selected) + if (selected_stream == selected_stream_fwd) + selected_stream_fwd = NULL; + else + selected_stream_rev = NULL; + else + if (selected_stream == selected_stream_fwd) + g_print("Select: He, this can't be. 1 not selected but equal to fwd\n"); + else + if (selected_stream_rev) + selected_stream_fwd = selected_stream; + else + selected_stream_rev = selected_stream; + break; + } + case 2: + { + if (path_currently_selected) { + if (selected_stream == selected_stream_fwd) + selected_stream_fwd = NULL; + else if (selected_stream == selected_stream_rev) + selected_stream_rev = NULL; + else + g_print("Select: He, this can't be. 2 selected but not equal to fwd or rev\n"); + } + result = path_currently_selected; + break; + } + default: + { + g_print("Select: He, we're getting a too high selection count\n"); + result = path_currently_selected; + } + } + } + + if (selected_stream_fwd) { + g_snprintf(label_text, sizeof(label_text), "Forward: %s:%u -> %s:%u, SSRC=0x%X", + ep_address_to_display(&(selected_stream_fwd->src_addr)), + selected_stream_fwd->src_port, + ep_address_to_display(&(selected_stream_fwd->dest_addr)), + selected_stream_fwd->dest_port, + selected_stream_fwd->ssrc + ); + gtk_label_set_text(GTK_LABEL(label_fwd), label_text); + } else { + if (selected_stream_rev) + gtk_label_set_text(GTK_LABEL(label_fwd), FWD_ONLY_LABEL_TEXT); + else + gtk_label_set_text(GTK_LABEL(label_fwd), FWD_LABEL_TEXT); + } + + if (selected_stream_rev) { + g_snprintf(label_text, sizeof(label_text), "Reverse: %s:%u -> %s:%u, SSRC=0x%X", + ep_address_to_display(&(selected_stream_rev->src_addr)), + selected_stream_rev->src_port, + ep_address_to_display(&(selected_stream_rev->dest_addr)), + selected_stream_rev->dest_port, + selected_stream_rev->ssrc + ); + gtk_label_set_text(GTK_LABEL(label_rev), label_text); + } else { + gtk_label_set_text(GTK_LABEL(label_rev), REV_LABEL_TEXT); + } + + return result; } /****************************************************************************/ @@ -672,82 +672,82 @@ rtpstream_view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model, static void add_to_list_store(rtp_stream_info_t* strinfo) { - gchar label_text[256]; - gchar *data[NUM_COLS]; - guint32 expected; - gint32 lost; - double perc; - int i; - char *savelocale; - - /* save the current locale */ - savelocale = g_strdup(setlocale(LC_NUMERIC, NULL)); - /* switch to "C" locale to avoid problems with localized decimal separators - in g_snprintf("%f") functions */ - setlocale(LC_NUMERIC, "C"); - - data[0] = g_strdup(ep_address_to_display(&(strinfo->src_addr))); - data[1] = NULL; - data[2] = g_strdup(ep_address_to_display(&(strinfo->dest_addr))); - data[3] = NULL; - data[4] = g_strdup_printf("0x%X", strinfo->ssrc); - if (strinfo->info_payload_type_str != NULL) { - data[5] = g_strdup(strinfo->info_payload_type_str); - } else { - data[5] = g_strdup(val_to_str_ext(strinfo->pt, &rtp_payload_type_short_vals_ext, - "Unknown (%u)")); - } - data[6] = NULL; - - expected = (strinfo->rtp_stats.stop_seq_nr + strinfo->rtp_stats.cycles*65536) - - strinfo->rtp_stats.start_seq_nr + 1; - lost = expected - strinfo->rtp_stats.total_nr; - if (expected) { - perc = (double)(lost*100)/(double)expected; - } else { - perc = 0; - } - data[7] = g_strdup_printf("%d (%.1f%%)", lost, perc); - data[8] = NULL; - data[9] = NULL; - data[10] = NULL; - if (strinfo->problem) - data[11] = g_strdup("X"); - else - data[11] = g_strdup(""); - - /* restore previous locale setting */ - setlocale(LC_NUMERIC, savelocale); - g_free(savelocale); - - /* Acquire an iterator */ - gtk_list_store_append(list_store, &list_iter); - - /* Fill the new row */ - gtk_list_store_set(list_store, &list_iter, - RTP_COL_SRC_ADDR, data[0], - RTP_COL_SRC_PORT, strinfo->src_port, - RTP_COL_DST_ADDR, data[2], - RTP_COL_DST_PORT, strinfo->dest_port, - RTP_COL_SSRC, data[4], - RTP_COL_PAYLOAD, data[5], - RTP_COL_PACKETS, strinfo->npackets, - RTP_COL_LOST, data[7], - RTP_COL_MAX_DELTA, strinfo->rtp_stats.max_delta, - RTP_COL_MAX_JITTER, strinfo->rtp_stats.max_jitter, - RTP_COL_MEAN_JITTER, strinfo->rtp_stats.mean_jitter, - RTP_COL_PROBLEM, data[11], - RTP_COL_DATA, strinfo, - -1); - - for (i = 0; i < NUM_COLS-1; i++) - g_free(data[i]); - - /* Update the top label with the number of detected streams */ - g_snprintf(label_text, sizeof(label_text), - "Detected %d RTP streams. Choose one for forward and reverse direction for analysis", - ++streams_nb); - gtk_label_set_text(GTK_LABEL(top_label), label_text); + gchar label_text[256]; + gchar *data[NUM_COLS]; + guint32 expected; + gint32 lost; + double perc; + int i; + char *savelocale; + + /* save the current locale */ + savelocale = g_strdup(setlocale(LC_NUMERIC, NULL)); + /* switch to "C" locale to avoid problems with localized decimal separators + in g_snprintf("%f") functions */ + setlocale(LC_NUMERIC, "C"); + + data[0] = g_strdup(ep_address_to_display(&(strinfo->src_addr))); + data[1] = NULL; + data[2] = g_strdup(ep_address_to_display(&(strinfo->dest_addr))); + data[3] = NULL; + data[4] = g_strdup_printf("0x%X", strinfo->ssrc); + if (strinfo->info_payload_type_str != NULL) { + data[5] = g_strdup(strinfo->info_payload_type_str); + } else { + data[5] = g_strdup(val_to_str_ext(strinfo->pt, &rtp_payload_type_short_vals_ext, + "Unknown (%u)")); + } + data[6] = NULL; + + expected = (strinfo->rtp_stats.stop_seq_nr + strinfo->rtp_stats.cycles*65536) + - strinfo->rtp_stats.start_seq_nr + 1; + lost = expected - strinfo->rtp_stats.total_nr; + if (expected) { + perc = (double)(lost*100)/(double)expected; + } else { + perc = 0; + } + data[7] = g_strdup_printf("%d (%.1f%%)", lost, perc); + data[8] = NULL; + data[9] = NULL; + data[10] = NULL; + if (strinfo->problem) + data[11] = g_strdup("X"); + else + data[11] = g_strdup(""); + + /* restore previous locale setting */ + setlocale(LC_NUMERIC, savelocale); + g_free(savelocale); + + /* Acquire an iterator */ + gtk_list_store_append(list_store, &list_iter); + + /* Fill the new row */ + gtk_list_store_set(list_store, &list_iter, + RTP_COL_SRC_ADDR, data[0], + RTP_COL_SRC_PORT, strinfo->src_port, + RTP_COL_DST_ADDR, data[2], + RTP_COL_DST_PORT, strinfo->dest_port, + RTP_COL_SSRC, data[4], + RTP_COL_PAYLOAD, data[5], + RTP_COL_PACKETS, strinfo->npackets, + RTP_COL_LOST, data[7], + RTP_COL_MAX_DELTA, strinfo->rtp_stats.max_delta, + RTP_COL_MAX_JITTER, strinfo->rtp_stats.max_jitter, + RTP_COL_MEAN_JITTER, strinfo->rtp_stats.mean_jitter, + RTP_COL_PROBLEM, data[11], + RTP_COL_DATA, strinfo, + -1); + + for (i = 0; i < NUM_COLS-1; i++) + g_free(data[i]); + + /* Update the top label with the number of detected streams */ + g_snprintf(label_text, sizeof(label_text), + "Detected %d RTP streams. Choose one for forward and reverse direction for analysis", + ++streams_nb); + gtk_label_set_text(GTK_LABEL(top_label), label_text); } /****************************************************************************/ @@ -755,202 +755,202 @@ add_to_list_store(rtp_stream_info_t* strinfo) static void create_list_view(void) { - GtkTreeViewColumn *column; - GtkCellRenderer *renderer; - GtkTreeSortable *sortable; - GtkTreeView *list_view; - GtkTreeSelection *selection; - - /* Create the store */ - list_store = gtk_list_store_new(NUM_COLS, /* Total number of columns */ - G_TYPE_STRING, /* Source address */ - G_TYPE_UINT, /* Source port */ - G_TYPE_STRING, /* Destination address */ - G_TYPE_UINT, /* Destination port */ - G_TYPE_STRING, /* SSRC */ - G_TYPE_STRING, /* Payload */ - G_TYPE_UINT, /* Packets */ - G_TYPE_STRING, /* Lost */ - G_TYPE_DOUBLE, /* Max. delta */ - G_TYPE_DOUBLE, /* Max. jitter */ - G_TYPE_DOUBLE, /* Mean jitter */ - G_TYPE_STRING, /* Problem */ - G_TYPE_POINTER /* Data */ - ); - - /* Create a view */ - list = gtk_tree_view_new_with_model(GTK_TREE_MODEL(list_store)); - - list_view = GTK_TREE_VIEW(list); - sortable = GTK_TREE_SORTABLE(list_store); - - /* Speed up the list display */ - gtk_tree_view_set_fixed_height_mode(list_view, TRUE); - - /* Setup the sortable columns */ - gtk_tree_sortable_set_sort_column_id(sortable, RTP_COL_SRC_ADDR, 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 - */ - renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes("Src addr", renderer, - "text", RTP_COL_SRC_ADDR, - NULL); - gtk_tree_view_column_set_sort_column_id(column, RTP_COL_SRC_ADDR); - gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(column, 60); - gtk_tree_view_column_set_fixed_width(column, 100); - /* Add the column to the view. */ - gtk_tree_view_append_column(list_view, column); - - /* Source port */ - renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes("Src port", renderer, - "text", RTP_COL_SRC_PORT, - NULL); - gtk_tree_view_column_set_sort_column_id(column, RTP_COL_SRC_PORT); - gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(column, 60); - gtk_tree_view_column_set_fixed_width(column, 80); - gtk_tree_view_append_column(list_view, column); - - /* Destination address */ - renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes("Dst addr", renderer, - "text", RTP_COL_DST_ADDR, - NULL); - gtk_tree_view_column_set_sort_column_id(column, RTP_COL_DST_ADDR); - gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(column, 60); - gtk_tree_view_column_set_fixed_width(column, 100); - gtk_tree_view_append_column(list_view, column); - - /* Destination port */ - renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes("Dst port", renderer, - "text", RTP_COL_DST_PORT, - NULL); - gtk_tree_view_column_set_sort_column_id(column, RTP_COL_DST_PORT); - gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(column, 60); - gtk_tree_view_column_set_fixed_width(column, 80); - gtk_tree_view_append_column(list_view, column); - - /* SSRC */ - renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes("SSRC", renderer, - "text", RTP_COL_SSRC, - NULL); - gtk_tree_view_column_set_sort_column_id(column, RTP_COL_SSRC); - gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(column, 70); - gtk_tree_view_column_set_fixed_width(column, 90); - gtk_tree_view_append_column(list_view, column); - - /* Payload */ - renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes("Payload", renderer, - "text", RTP_COL_PAYLOAD, - NULL); - gtk_tree_view_column_set_sort_column_id(column, RTP_COL_PAYLOAD); - gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(column, 80); - gtk_tree_view_column_set_fixed_width(column, 100); - gtk_tree_view_append_column(list_view, column); - - /* Packets */ - renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes("Packets", renderer, - "text", RTP_COL_PACKETS, - NULL); - gtk_tree_view_column_set_sort_column_id(column, RTP_COL_PACKETS); - gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(column, 60); - gtk_tree_view_column_set_fixed_width(column, 70); - gtk_tree_view_append_column(list_view, column); - - /* Lost */ - renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes("Lost", renderer, - "text", RTP_COL_LOST, - NULL); - gtk_tree_view_column_set_sort_column_id(column, RTP_COL_LOST); - gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(column, 60); - gtk_tree_view_column_set_fixed_width(column, 90); - gtk_tree_view_append_column(list_view, column); - - /* Max Delta (ms) */ - renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes("Max Delta (ms)", renderer, - "text", RTP_COL_MAX_DELTA, - NULL); - gtk_tree_view_column_set_sort_column_id(column, RTP_COL_MAX_DELTA); - gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(column, 90); - gtk_tree_view_column_set_fixed_width(column, 130); - gtk_tree_view_append_column(list_view, column); - - /* Max Jitter (ms) */ - renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes("Max Jitter (ms)", renderer, - "text", RTP_COL_MAX_JITTER, - NULL); - gtk_tree_view_column_set_sort_column_id(column, RTP_COL_MAX_JITTER); - gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(column, 50); - gtk_tree_view_column_set_fixed_width(column, 120); - gtk_tree_view_append_column(list_view, column); - - /* Mean Jitter (ms) */ - renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes("Mean Jitter (ms)", renderer, - "text", RTP_COL_MEAN_JITTER, - NULL); - gtk_tree_view_column_set_sort_column_id(column, RTP_COL_MEAN_JITTER); - gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(column, 50); - gtk_tree_view_column_set_fixed_width(column, 130); - gtk_tree_view_append_column(list_view, column); - - /* Problems? */ - renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes("Pb?", renderer, - "text", RTP_COL_PROBLEM, - NULL); - gtk_tree_view_column_set_sort_column_id(column, RTP_COL_PROBLEM); - gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(column, 30); - gtk_tree_view_column_set_fixed_width(column, 50); - gtk_tree_view_append_column(list_view, column); - - /* Now enable the sorting of each column */ - gtk_tree_view_set_rules_hint(list_view, TRUE); - gtk_tree_view_set_headers_clickable(list_view, TRUE); - - /* Setup the selection handler */ - selection = gtk_tree_view_get_selection(list_view); - - gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE); - gtk_tree_selection_set_select_function(selection, rtpstream_view_selection_func, NULL, NULL); + GtkTreeViewColumn *column; + GtkCellRenderer *renderer; + GtkTreeSortable *sortable; + GtkTreeView *list_view; + GtkTreeSelection *selection; + + /* Create the store */ + list_store = gtk_list_store_new(NUM_COLS, /* Total number of columns */ + G_TYPE_STRING, /* Source address */ + G_TYPE_UINT, /* Source port */ + G_TYPE_STRING, /* Destination address */ + G_TYPE_UINT, /* Destination port */ + G_TYPE_STRING, /* SSRC */ + G_TYPE_STRING, /* Payload */ + G_TYPE_UINT, /* Packets */ + G_TYPE_STRING, /* Lost */ + G_TYPE_DOUBLE, /* Max. delta */ + G_TYPE_DOUBLE, /* Max. jitter */ + G_TYPE_DOUBLE, /* Mean jitter */ + G_TYPE_STRING, /* Problem */ + G_TYPE_POINTER /* Data */ + ); + + /* Create a view */ + list = gtk_tree_view_new_with_model(GTK_TREE_MODEL(list_store)); + + list_view = GTK_TREE_VIEW(list); + sortable = GTK_TREE_SORTABLE(list_store); + + /* Speed up the list display */ + gtk_tree_view_set_fixed_height_mode(list_view, TRUE); + + /* Setup the sortable columns */ + gtk_tree_sortable_set_sort_column_id(sortable, RTP_COL_SRC_ADDR, 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 + */ + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes("Src addr", renderer, + "text", RTP_COL_SRC_ADDR, + NULL); + gtk_tree_view_column_set_sort_column_id(column, RTP_COL_SRC_ADDR); + gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(column, 60); + gtk_tree_view_column_set_fixed_width(column, 100); + /* Add the column to the view. */ + gtk_tree_view_append_column(list_view, column); + + /* Source port */ + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes("Src port", renderer, + "text", RTP_COL_SRC_PORT, + NULL); + gtk_tree_view_column_set_sort_column_id(column, RTP_COL_SRC_PORT); + gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(column, 60); + gtk_tree_view_column_set_fixed_width(column, 80); + gtk_tree_view_append_column(list_view, column); + + /* Destination address */ + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes("Dst addr", renderer, + "text", RTP_COL_DST_ADDR, + NULL); + gtk_tree_view_column_set_sort_column_id(column, RTP_COL_DST_ADDR); + gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(column, 60); + gtk_tree_view_column_set_fixed_width(column, 100); + gtk_tree_view_append_column(list_view, column); + + /* Destination port */ + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes("Dst port", renderer, + "text", RTP_COL_DST_PORT, + NULL); + gtk_tree_view_column_set_sort_column_id(column, RTP_COL_DST_PORT); + gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(column, 60); + gtk_tree_view_column_set_fixed_width(column, 80); + gtk_tree_view_append_column(list_view, column); + + /* SSRC */ + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes("SSRC", renderer, + "text", RTP_COL_SSRC, + NULL); + gtk_tree_view_column_set_sort_column_id(column, RTP_COL_SSRC); + gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(column, 70); + gtk_tree_view_column_set_fixed_width(column, 90); + gtk_tree_view_append_column(list_view, column); + + /* Payload */ + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes("Payload", renderer, + "text", RTP_COL_PAYLOAD, + NULL); + gtk_tree_view_column_set_sort_column_id(column, RTP_COL_PAYLOAD); + gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(column, 80); + gtk_tree_view_column_set_fixed_width(column, 100); + gtk_tree_view_append_column(list_view, column); + + /* Packets */ + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes("Packets", renderer, + "text", RTP_COL_PACKETS, + NULL); + gtk_tree_view_column_set_sort_column_id(column, RTP_COL_PACKETS); + gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(column, 60); + gtk_tree_view_column_set_fixed_width(column, 70); + gtk_tree_view_append_column(list_view, column); + + /* Lost */ + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes("Lost", renderer, + "text", RTP_COL_LOST, + NULL); + gtk_tree_view_column_set_sort_column_id(column, RTP_COL_LOST); + gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(column, 60); + gtk_tree_view_column_set_fixed_width(column, 90); + gtk_tree_view_append_column(list_view, column); + + /* Max Delta (ms) */ + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes("Max Delta (ms)", renderer, + "text", RTP_COL_MAX_DELTA, + NULL); + gtk_tree_view_column_set_sort_column_id(column, RTP_COL_MAX_DELTA); + gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(column, 90); + gtk_tree_view_column_set_fixed_width(column, 130); + gtk_tree_view_append_column(list_view, column); + + /* Max Jitter (ms) */ + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes("Max Jitter (ms)", renderer, + "text", RTP_COL_MAX_JITTER, + NULL); + gtk_tree_view_column_set_sort_column_id(column, RTP_COL_MAX_JITTER); + gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(column, 50); + gtk_tree_view_column_set_fixed_width(column, 120); + gtk_tree_view_append_column(list_view, column); + + /* Mean Jitter (ms) */ + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes("Mean Jitter (ms)", renderer, + "text", RTP_COL_MEAN_JITTER, + NULL); + gtk_tree_view_column_set_sort_column_id(column, RTP_COL_MEAN_JITTER); + gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(column, 50); + gtk_tree_view_column_set_fixed_width(column, 130); + gtk_tree_view_append_column(list_view, column); + + /* Problems? */ + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes("Pb?", renderer, + "text", RTP_COL_PROBLEM, + NULL); + gtk_tree_view_column_set_sort_column_id(column, RTP_COL_PROBLEM); + gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(column, 30); + gtk_tree_view_column_set_fixed_width(column, 50); + gtk_tree_view_append_column(list_view, column); + + /* Now enable the sorting of each column */ + gtk_tree_view_set_rules_hint(list_view, TRUE); + gtk_tree_view_set_headers_clickable(list_view, TRUE); + + /* Setup the selection handler */ + selection = gtk_tree_view_get_selection(list_view); + + gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE); + gtk_tree_selection_set_select_function(selection, rtpstream_view_selection_func, NULL, NULL); } @@ -1068,7 +1068,7 @@ rtpstream_dlg_create (void) /****************************************************************************/ -/* PUBLIC */ +/* PUBLIC */ /****************************************************************************/ /****************************************************************************/ @@ -1076,21 +1076,21 @@ rtpstream_dlg_create (void) /* list: pointer to list of rtp_stream_info_t* */ void rtpstream_dlg_update(GList *list_lcl) { - if (rtp_stream_dlg != NULL) { - gtk_list_store_clear(list_store); - streams_nb = 0; + if (rtp_stream_dlg != NULL) { + gtk_list_store_clear(list_store); + streams_nb = 0; - list_lcl = g_list_first(list_lcl); - while (list_lcl) - { - add_to_list_store((rtp_stream_info_t*)(list_lcl->data)); - list_lcl = g_list_next(list_lcl); - } + list_lcl = g_list_first(list_lcl); + while (list_lcl) + { + add_to_list_store((rtp_stream_info_t*)(list_lcl->data)); + list_lcl = g_list_next(list_lcl); + } - rtpstream_on_unselect(NULL, NULL); - } + rtpstream_on_unselect(NULL, NULL); + } - last_list = list_lcl; + last_list = list_lcl; } @@ -1099,19 +1099,19 @@ void rtpstream_dlg_update(GList *list_lcl) /* list: pointer to list of rtp_stream_info_t* */ void rtpstream_dlg_show(GList *list_lcl) { - if (rtp_stream_dlg != NULL) { - /* There's already a dialog box; reactivate it. */ - reactivate_window(rtp_stream_dlg); - /* Another list since last call? */ - if (list_lcl != last_list) { - rtpstream_dlg_update(list_lcl); - } - } - else { - /* Create and show the dialog box */ - rtpstream_dlg_create(); - rtpstream_dlg_update(list_lcl); - } + if (rtp_stream_dlg != NULL) { + /* There's already a dialog box; reactivate it. */ + reactivate_window(rtp_stream_dlg); + /* Another list since last call? */ + if (list_lcl != last_list) { + rtpstream_dlg_update(list_lcl); + } + } + else { + /* Create and show the dialog box */ + rtpstream_dlg_create(); + rtpstream_dlg_update(list_lcl); + } } @@ -1119,16 +1119,16 @@ void rtpstream_dlg_show(GList *list_lcl) /* entry point when called via the GTK menu */ void rtpstream_launch(GtkAction *action _U_, gpointer user_data _U_) { - /* Register the tap listener */ - register_tap_listener_rtp_stream(); + /* Register the tap listener */ + register_tap_listener_rtp_stream(); - /* Scan for RTP streams (redissect all packets) */ - rtpstream_scan(); + /* Scan for RTP streams (redissect all packets) */ + rtpstream_scan(); - /* Show the dialog box with the list of streams */ - rtpstream_dlg_show(rtpstream_get_info()->strinfo_list); + /* Show the dialog box with the list of streams */ + rtpstream_dlg_show(rtpstream_get_info()->strinfo_list); - /* Tap listener will be removed and cleaned up in rtpstream_on_destroy */ + /* Tap listener will be removed and cleaned up in rtpstream_on_destroy */ } /****************************************************************************/ @@ -1143,9 +1143,9 @@ register_tap_listener_rtp_stream_dlg(void) * Local variables: * c-basic-offset: 4 * tab-width: 8 - * indent-tabs-mode: t + * indent-tabs-mode: nil * End: * - * vi: set shiftwidth=4 tabstop=8 noexpandtab: - * :indentSize=4:tabSize=8:noTabs=false: + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: */ |