diff options
author | Anders Broman <anders.broman@ericsson.com> | 2009-10-09 09:56:16 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2009-10-09 09:56:16 +0000 |
commit | 4bd41da30774500e46024fa4493ac8456221b172 (patch) | |
tree | cb6d3e799cabc40b3875dc7afc2948f8a92a3ee6 /gtk/iax2_analysis.c | |
parent | 49be9390598ee420a34715abce61e7089e416417 (diff) |
Remove code guarded by #ifdef USE_CONVERSATION_GRAPH
as this eems to newer have been fully implemented and the old clist is replaced now.
svn path=/trunk/; revision=30425
Diffstat (limited to 'gtk/iax2_analysis.c')
-rw-r--r-- | gtk/iax2_analysis.c | 133 |
1 files changed, 1 insertions, 132 deletions
diff --git a/gtk/iax2_analysis.c b/gtk/iax2_analysis.c index 5cff50bdaa..24e981ebc0 100644 --- a/gtk/iax2_analysis.c +++ b/gtk/iax2_analysis.c @@ -180,9 +180,6 @@ typedef struct _dialog_data_t { GtkWidget *save_csv_as_w; gint notebook_signal_id; dialog_graph_t dialog_graph; -#ifdef USE_CONVERSATION_GRAPH - GtkWidget *graph_window; -#endif } dialog_data_t; #define OK_TEXT "[ Ok ]" @@ -236,10 +233,6 @@ typedef struct _user_data_t { /* dialog associated data */ dialog_data_t dlg; -#ifdef USE_CONVERSATION_GRAPH - time_series_t series_fwd; - time_series_t series_rev; -#endif } user_data_t; @@ -344,16 +337,6 @@ iax2_reset(void *user_data_arg) /* reset graph info */ dialog_graph_reset(user_data); -#ifdef USE_CONVERSATION_GRAPH - if (user_data->dlg.graph_window != NULL) - window_destroy(user_data->dlg.graph_window); - - g_array_free(user_data->series_fwd.value_pairs, TRUE); - user_data->series_fwd.value_pairs = g_array_new(FALSE, FALSE, sizeof(value_pair_t)); - - g_array_free(user_data->series_rev.value_pairs, TRUE); - user_data->series_rev.value_pairs = g_array_new(FALSE, FALSE, sizeof(value_pair_t)); -#endif /* XXX check for error at fclose? */ if (user_data->forward.saveinfo.fp != NULL) @@ -453,9 +436,7 @@ static int iax2_packet(void *user_data_arg, packet_info *pinfo, epan_dissect_t * { user_data_t *user_data = user_data_arg; const struct _iax2_info_t *iax2info = iax2info_arg; -#ifdef USE_CONVERSATION_GRAPH - value_pair_t vp; -#endif + /* we ignore packets that are not displayed */ if (pinfo->fd->flags.passed_dfilter == 0) return 0; @@ -469,11 +450,6 @@ static int iax2_packet(void *user_data_arg, packet_info *pinfo, epan_dissect_t * && user_data->port_src_fwd == pinfo->srcport && CMP_ADDRESS(&(user_data->ip_dst_fwd), &(pinfo->net_dst)) == 0 && user_data->port_dst_fwd == pinfo->destport) { -#ifdef USE_CONVERSATION_GRAPH - vp.time = ((double)pinfo->fd->rel_secs + (double)pinfo->fd->rel_usecs/1000000); - vp.fnumber = pinfo->fd->num; - g_array_append_val(user_data->series_fwd.value_pairs, vp); -#endif iax2_packet_analyse(&(user_data->forward.statinfo), pinfo, iax2info); iax2_packet_add_graph(&(user_data->dlg.dialog_graph.graph[GRAPH_FWD_JITTER]), &(user_data->forward.statinfo), pinfo, (guint32)(user_data->forward.statinfo.jitter*1000000)); iax2_packet_add_graph(&(user_data->dlg.dialog_graph.graph[GRAPH_FWD_DIFF]), &(user_data->forward.statinfo), pinfo, (guint32)(user_data->forward.statinfo.diff*1000000)); @@ -487,11 +463,6 @@ static int iax2_packet(void *user_data_arg, packet_info *pinfo, epan_dissect_t * && user_data->port_src_rev == pinfo->srcport && CMP_ADDRESS(&(user_data->ip_dst_rev), &(pinfo->net_dst)) == 0 && user_data->port_dst_rev == pinfo->destport) { -#ifdef USE_CONVERSATION_GRAPH - vp.time = ((double)pinfo->fd->rel_secs + (double)pinfo->fd->rel_usecs/1000000); - vp.fnumber = pinfo->fd->num; - g_array_append_val(user_data->series_rev.value_pairs, vp); -#endif iax2_packet_analyse(&(user_data->reversed.statinfo), pinfo, iax2info); iax2_packet_add_graph(&(user_data->dlg.dialog_graph.graph[GRAPH_REV_JITTER]), &(user_data->reversed.statinfo), pinfo, (guint32)(user_data->reversed.statinfo.jitter*1000000)); iax2_packet_add_graph(&(user_data->dlg.dialog_graph.graph[GRAPH_REV_DIFF]), &(user_data->reversed.statinfo), pinfo, (guint32)(user_data->reversed.statinfo.diff*1000000)); @@ -771,11 +742,6 @@ static void on_destroy(GtkWidget *win _U_, user_data_t *user_data) if (user_data->dlg.dialog_graph.window != NULL) window_destroy(user_data->dlg.dialog_graph.window); -#ifdef USE_CONVERSATION_GRAPH - /* destroy graph window if open */ - if (user_data->dlg.graph_window != NULL) - window_destroy(user_data->dlg.graph_window); -#endif /* disable the "switch_page" signal in the dlg, otherwise will be called when the windows is destroy and cause an exception using GTK1*/ /* XXX: Is this still true for GTK2 ??? */ @@ -807,86 +773,6 @@ static void on_list_select_row(GtkTreeSelection *selection, } -#ifdef USE_CONVERSATION_GRAPH -Note this will not work any more as clist is removed. -/****************************************************************************/ -/* when the graph window gets destroyed */ -static void on_destroy_graph(GtkWidget *win _U_, user_data_t *user_data _U_) -{ - /* note that graph window has been destroyed */ - user_data->dlg.graph_window = NULL; -} - -/****************************************************************************/ -static void graph_selection_callback(value_pair_t vp, user_data_t *user_data) -{ - guint row; - GtkCList *clist = NULL; - if (vp.fnumber != 0) { - clist = GTK_CLIST(user_data->dlg.clist_fwd); - row = gtk_clist_find_row_from_data(clist, - GUINT_TO_POINTER(vp.fnumber)); - if (row==-1) { - clist = GTK_CLIST(user_data->dlg.clist_rev); - row = gtk_clist_find_row_from_data(clist, - GUINT_TO_POINTER(vp.fnumber)); - } - if (row!=-1) { - gtk_notebook_set_current_page(GTK_NOTEBOOK(user_data->dlg.notebook), - (clist == GTK_CLIST(user_data->dlg.clist_fwd)) ? 0 : 1); - gtk_clist_select_row(clist, row, 0); - gtk_clist_moveto(clist, row, 0, 0.5, 0); - } - } -} - - -/****************************************************************************/ -static void on_graph_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data _U_) -{ - gchar title1[80]; - gchar title2[80]; - GList *list = NULL; - - if (user_data->dlg.graph_window != NULL) { - /* There's already a graph window; reactivate it. */ - reactivate_window(user_data->dlg.graph_window); - return; - } - list = g_list_append(list, &(user_data->series_fwd)); - list = g_list_append(list, &(user_data->series_rev)); - - user_data->series_fwd.color.pixel = 0; - user_data->series_fwd.color.red = 0x80ff; - user_data->series_fwd.color.green = 0xe0ff; - user_data->series_fwd.color.blue = 0xffff; - user_data->series_fwd.yvalue = 0.5; - - user_data->series_rev.color.pixel = 0; - user_data->series_rev.color.red = 0x60ff; - user_data->series_rev.color.green = 0xc0ff; - user_data->series_rev.color.blue = 0xffff; - user_data->series_rev.yvalue = -0.5; - - g_snprintf(title1, sizeof(title1), "Forward: %s:%u to %s:%u", - get_addr_name(&(user_data->ip_src_fwd)), - user_data->port_src_fwd, - get_addr_name(&(user_data->ip_dst_fwd)), - user_data->port_dst_fwd); - - g_snprintf(title2, sizeof(title2), "Reverse: %s:%u to %s:%u", - get_addr_name(&(user_data->ip_src_rev)), - user_data->port_src_rev, - get_addr_name(&(user_data->ip_dst_rev)), - user_data->port_dst_rev); - - user_data->dlg.graph_window = show_conversation_graph(list, title1, title2, - &graph_selection_callback, user_data); - g_signal_connect(user_data->dlg.graph_window, "destroy", - G_CALLBACK(on_destroy_graph), user_data); -} -#endif /*USE_CONVERSATION_GRAPH*/ - /****************************************************************************/ static void dialog_graph_set_title(user_data_t* user_data) { @@ -3169,9 +3055,6 @@ static void create_iax2_dialog(user_data_t* user_data) GtkWidget *label; GtkWidget *scrolled_window, *scrolled_window_r/*, *frame, *text, *label4, *page_help*/; GtkWidget *box4, *voice_bt, *refresh_bt, *goto_bt, *close_bt, *csv_bt, *next_bt; -#ifdef USE_CONVERSATION_GRAPH - GtkWidget *graph_bt; -#endif GtkWidget *graph_bt; gchar label_forward[150]; gchar label_reverse[150]; @@ -3306,14 +3189,6 @@ static void create_iax2_dialog(user_data_t* user_data) gtk_widget_show(graph_bt); g_signal_connect(graph_bt, "clicked", G_CALLBACK(on_graph_bt_clicked), user_data); - -#ifdef USE_CONVERSATION_GRAPH - graph_bt = gtk_button_new_with_label("Graph"); - gtk_container_add(GTK_CONTAINER(box4), graph_bt); - gtk_widget_show(graph_bt); - g_signal_connect(graph_bt, "clicked", G_CALLBACK(on_graph_bt_clicked), user_data); -#endif - next_bt = gtk_button_new_with_label("Next non-Ok"); gtk_container_add(GTK_CONTAINER(box4), next_bt); gtk_widget_show(next_bt); @@ -3469,12 +3344,6 @@ void iax2_analysis( user_data->dlg.save_csv_as_w = NULL; user_data->dlg.dialog_graph.window = NULL; -#ifdef USE_CONVERSATION_GRAPH - user_data->dlg.graph_window = NULL; - user_data->series_fwd.value_pairs = NULL; - user_data->series_rev.value_pairs = NULL; -#endif - /* init dialog_graph */ user_data->dlg.dialog_graph.needs_redraw=TRUE; user_data->dlg.dialog_graph.interval=tick_interval_values[DEFAULT_TICK_VALUE]; |