From cf91fdf16b2d961024ea062503ce5fb91af28186 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 5 Jun 2009 22:42:47 +0000 Subject: Have tap listeners specify whether the "packet" routine requires a protocol tree; the column values. This includes stats-tree listeners. Have the routines to build the packet list, and to retap packets, honor those requirements. This means that cf_retap_packets() no longer needs an argument to specify whether to construct the column values or not, so get rid of that argument. This also means that there's no need for a tap to have a fake filter to ensure that the protocol tree will be built, so don't set up a fake "frame" filter. While we're at it, clean up some cases where "no filter" was represented as a null string rather than a null pointer. Have a routine to return an indication of the number of tap listeners with filters; use that rather than the global num_tap_filters. Clean up some indentation and some gboolean vs. gint items. svn path=/trunk/; revision=28645 --- gtk/afp_stat.c | 4 +-- gtk/ansi_a_stat.c | 2 +- gtk/ansi_map_stat.c | 2 +- gtk/bootp_stat.c | 3 ++- gtk/camel_counter.c | 12 ++------- gtk/camel_srt.c | 31 ++++++++--------------- gtk/compare_stat.c | 4 +-- gtk/conversations_table.c | 8 +++--- gtk/dcerpc_stat.c | 4 +-- gtk/diameter_stat.c | 4 +-- gtk/expert_comp_dlg.c | 5 ++-- gtk/expert_dlg.c | 3 ++- gtk/export_object.c | 4 +-- gtk/fc_stat.c | 4 +-- gtk/flow_graph.c | 6 +++-- gtk/follow_ssl.c | 2 +- gtk/follow_udp.c | 2 +- gtk/funnel_stat.c | 4 +-- gtk/gsm_a_stat.c | 2 +- gtk/gsm_map_stat.c | 2 +- gtk/gtp_stat.c | 4 +-- gtk/h225_counter.c | 16 ++++++------ gtk/h225_ras_srt.c | 16 ++++++------ gtk/hostlist_table.c | 8 +++--- gtk/iax2_analysis.c | 8 +++--- gtk/io_stat.c | 7 +++--- gtk/ldap_stat.c | 4 +-- gtk/mac_lte_stat_dlg.c | 4 +-- gtk/mcast_stream.c | 4 +-- gtk/mcast_stream_dlg.c | 2 +- gtk/megaco_stat.c | 16 ++++++------ gtk/mgcp_stat.c | 16 ++++++------ gtk/mtp3_stat.c | 2 +- gtk/ncp_stat.c | 2 +- gtk/radius_stat.c | 16 ++++++------ gtk/rpc_progs.c | 4 +-- gtk/rpc_stat.c | 4 +-- gtk/rtp_analysis.c | 10 ++++---- gtk/rtp_stream.c | 8 +++--- gtk/scsi_stat.c | 4 +-- gtk/sctp_assoc_analyse.c | 4 +-- gtk/sctp_chunk_stat.c | 15 +++++------ gtk/sctp_chunk_stat_dlg.c | 2 +- gtk/sctp_stat.c | 2 +- gtk/sctp_stat_dlg.c | 2 +- gtk/sip_stat.c | 3 ++- gtk/smb2_stat.c | 4 +-- gtk/smb_stat.c | 4 +-- gtk/stats_tree_stat.c | 3 ++- gtk/tcp_graph.c | 6 ++--- gtk/voip_calls.c | 64 +++++++++++++++++++++++++++++++---------------- gtk/voip_calls_dlg.c | 2 +- gtk/wlan_stat_dlg.c | 9 ++++--- gtk/wsp_stat.c | 3 ++- 54 files changed, 194 insertions(+), 192 deletions(-) (limited to 'gtk') diff --git a/gtk/afp_stat.c b/gtk/afp_stat.c index e857a8e048..35d8bb34d1 100644 --- a/gtk/afp_stat.c +++ b/gtk/afp_stat.c @@ -173,7 +173,7 @@ gtk_afpstat_init(const char *optarg, void *userdata _U_) } - error_string=register_tap_listener("afp", ss, filter, afpstat_reset, afpstat_packet, afpstat_draw); + error_string=register_tap_listener("afp", ss, filter, 0, afpstat_reset, afpstat_packet, afpstat_draw); if(error_string){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); @@ -194,7 +194,7 @@ gtk_afpstat_init(const char *optarg, void *userdata _U_) gtk_widget_show_all(ss->win); window_present(ss->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(ss->win->window); } diff --git a/gtk/ansi_a_stat.c b/gtk/ansi_a_stat.c index 075042637e..d3fb09bc53 100644 --- a/gtk/ansi_a_stat.c +++ b/gtk/ansi_a_stat.c @@ -391,7 +391,7 @@ register_tap_listener_gtkansi_a_stat(void) memset((void *) &ansi_a_stat, 0, sizeof(ansi_a_stat_t)); err_p = - register_tap_listener("ansi_a", &ansi_a_stat, NULL, + register_tap_listener("ansi_a", &ansi_a_stat, NULL, 0, ansi_a_stat_reset, ansi_a_stat_packet, ansi_a_stat_draw); diff --git a/gtk/ansi_map_stat.c b/gtk/ansi_map_stat.c index 127fce25f7..7cc52ae712 100644 --- a/gtk/ansi_map_stat.c +++ b/gtk/ansi_map_stat.c @@ -367,7 +367,7 @@ register_tap_listener_gtkansi_map_stat(void) memset((void *) &ansi_a_stat, 0, sizeof(ansi_map_stat_t)); err_p = - register_tap_listener("ansi_map", &ansi_a_stat, NULL, + register_tap_listener("ansi_map", &ansi_a_stat, NULL, 0, ansi_map_stat_reset, ansi_map_stat_packet, ansi_map_stat_draw); diff --git a/gtk/bootp_stat.c b/gtk/bootp_stat.c index ffd35bcede..24799dd85f 100644 --- a/gtk/bootp_stat.c +++ b/gtk/bootp_stat.c @@ -241,6 +241,7 @@ dhcpstat_init(const char *optarg, void *userdata _U_) "bootp", sp, filter, + 0, dhcpstat_reset, dhcpstat_packet, dhcpstat_draw); @@ -267,7 +268,7 @@ dhcpstat_init(const char *optarg, void *userdata _U_) window_present(sp->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(sp->win->window); } diff --git a/gtk/camel_counter.c b/gtk/camel_counter.c index 40193d2126..9f52d75e5b 100644 --- a/gtk/camel_counter.c +++ b/gtk/camel_counter.c @@ -153,7 +153,6 @@ static void gtk_camelcounter_init(const char *optarg, void *userdata _U_) { struct camelcounter_t *p_camelcounter; const char *filter=NULL; - const char *emptyfilter=""; GString *error_string; GtkWidget *bbox; GtkWidget *close_bt; @@ -182,17 +181,10 @@ static void gtk_camelcounter_init(const char *optarg, void *userdata _U_) p_camelcounter->table = create_stat_table(p_camelcounter->scrolled_window, p_camelcounter->vbox, 2, titles); - if (filter) { - error_string=register_tap_listener("CAMEL", p_camelcounter, filter, + error_string=register_tap_listener("CAMEL", p_camelcounter, filter, 0, gtk_camelcounter_reset, gtk_camelcounter_packet, gtk_camelcounter_draw); - } else { - error_string=register_tap_listener("CAMEL", p_camelcounter, emptyfilter, - gtk_camelcounter_reset, - gtk_camelcounter_packet, - gtk_camelcounter_draw); - } if(error_string){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); @@ -214,7 +206,7 @@ static void gtk_camelcounter_init(const char *optarg, void *userdata _U_) gtk_widget_show_all(p_camelcounter->win); window_present(p_camelcounter->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(p_camelcounter->win->window); } diff --git a/gtk/camel_srt.c b/gtk/camel_srt.c index 7a721d61e4..5d81dd7c4a 100644 --- a/gtk/camel_srt.c +++ b/gtk/camel_srt.c @@ -147,7 +147,6 @@ static void gtk_camelsrt_init(const char *optarg, void *userdata _U_) { struct camelsrt_t * p_camelsrt; const char *filter=NULL; - const char *emptyfilter=""; GtkWidget *cmd_label; GtkWidget *main_label; @@ -199,25 +198,17 @@ static void gtk_camelsrt_init(const char *optarg, void *userdata _U_) val_to_str(i,camelSRTtype_naming,"Unknown")); } - if (filter) { - error_string=register_tap_listener("CAMEL", - p_camelsrt, - filter, - camelsrt_reset, - camelsrt_packet, - camelsrt_draw); - } else { - error_string=register_tap_listener("CAMEL", - p_camelsrt, - emptyfilter, - camelsrt_reset, - camelsrt_packet, - camelsrt_draw); - } + error_string=register_tap_listener("CAMEL", + p_camelsrt, + filter, + 0, + camelsrt_reset, + camelsrt_packet, + camelsrt_draw); - if(error_string){ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); - g_string_free(error_string, TRUE); + if(error_string){ + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); + g_string_free(error_string, TRUE); g_free(p_camelsrt); return; } @@ -234,7 +225,7 @@ static void gtk_camelsrt_init(const char *optarg, void *userdata _U_) gtk_widget_show_all(p_camelsrt->win); window_present(p_camelsrt->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(p_camelsrt->win->window); } diff --git a/gtk/compare_stat.c b/gtk/compare_stat.c index e50a94fd2e..785e1d743c 100644 --- a/gtk/compare_stat.c +++ b/gtk/compare_stat.c @@ -798,7 +798,7 @@ gtk_comparestat_init(const char *optarg, void* userdata _U_) /* create a Hash to count the packets with the same ip.id */ cs->packet_tree=se_tree_create(EMEM_TREE_TYPE_RED_BLACK, "Packet_info_tree"); - error_string=register_tap_listener("ip", cs, filter, comparestat_reset, comparestat_packet, comparestat_draw); + error_string=register_tap_listener("ip", cs, filter, 0, comparestat_reset, comparestat_packet, comparestat_draw); if(error_string){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); @@ -823,7 +823,7 @@ gtk_comparestat_init(const char *optarg, void* userdata _U_) gtk_widget_show_all(cs->win); window_present(cs->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); } static GtkWidget *dlg=NULL; diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c index ba7ba99bdb..7a3e73f9c6 100644 --- a/gtk/conversations_table.c +++ b/gtk/conversations_table.c @@ -1289,7 +1289,7 @@ init_ct_table_page(conversations_table *conversations, GtkWidget *vbox, gboolean ct_create_popup_menu(conversations); /* register the tap and rerun the taps on the packet list */ - error_string=register_tap_listener(tap_name, conversations, filter, reset_ct_table_data_cb, packet_func, draw_ct_table_data_cb); + error_string=register_tap_listener(tap_name, conversations, filter, 0, reset_ct_table_data_cb, packet_func, draw_ct_table_data_cb); if(error_string){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); @@ -1356,7 +1356,7 @@ init_conversation_table(gboolean hide_ports, const char *table_name, const char gtk_widget_show_all(conversations->win); window_present(conversations->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(conversations->win->window); /* Keep clist frozen to cause modifications to the clist (inserts, appends, others that are extremely slow @@ -1490,7 +1490,7 @@ ct_filter_toggle_dest(GtkWidget *widget, gpointer data) reset_ct_table_data(conversations); } - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); if (conversations) { gdk_window_raise(conversations->win->window); } @@ -1601,7 +1601,7 @@ init_conversation_notebook_cb(GtkWidget *w _U_, gpointer d _U_) gtk_widget_show_all(win); window_present(win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(win->window); /* after retapping, redraw table */ diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c index ad77538a88..da745f296a 100644 --- a/gtk/dcerpc_stat.c +++ b/gtk/dcerpc_stat.c @@ -313,7 +313,7 @@ gtk_dcerpcstat_init(const char *optarg, void* userdata _U_) } - error_string=register_tap_listener("dcerpc", rs, filter, dcerpcstat_reset, dcerpcstat_packet, dcerpcstat_draw); + error_string=register_tap_listener("dcerpc", rs, filter, 0, dcerpcstat_reset, dcerpcstat_packet, dcerpcstat_draw); if(error_string){ /* error, we failed to attach to the tap. clean up */ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); @@ -336,7 +336,7 @@ gtk_dcerpcstat_init(const char *optarg, void* userdata _U_) gtk_widget_show_all(rs->win); window_present(rs->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(rs->win->window); } diff --git a/gtk/diameter_stat.c b/gtk/diameter_stat.c index 50e51f9e6f..1f37b04eee 100644 --- a/gtk/diameter_stat.c +++ b/gtk/diameter_stat.c @@ -184,7 +184,7 @@ gtk_diameterstat_init(const char *optarg, void *userdata _U_) init_srt_table(&diameter->diameter_srt_table, 1, vbox, NULL); init_srt_table_row(&diameter->diameter_srt_table, 0, "Unknown"); - error_string=register_tap_listener("diameter", diameter, filter, diameterstat_reset, diameterstat_packet, diameterstat_draw); + error_string=register_tap_listener("diameter", diameter, filter, 0, diameterstat_reset, diameterstat_packet, diameterstat_draw); if(error_string){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); @@ -205,7 +205,7 @@ gtk_diameterstat_init(const char *optarg, void *userdata _U_) gtk_widget_show_all(diameter->win); window_present(diameter->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(diameter->win->window); } diff --git a/gtk/expert_comp_dlg.c b/gtk/expert_comp_dlg.c index da351944aa..2fc8c1e7b8 100644 --- a/gtk/expert_comp_dlg.c +++ b/gtk/expert_comp_dlg.c @@ -309,6 +309,7 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_) /* Add tap listener functions for expert details, From expert_dlg.c*/ error_string=register_tap_listener("expert", etd, NULL /* fstring */, + 0, expert_dlg_reset, expert_dlg_packet, expert_dlg_draw); @@ -324,7 +325,7 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_) /* Register the tap listener */ - error_string=register_tap_listener("expert", ss, filter, error_reset, error_packet, NULL); + error_string=register_tap_listener("expert", ss, filter, 0, error_reset, error_packet, NULL); if(error_string){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); @@ -361,7 +362,7 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_) * assumes we didn't change anything that would cause any packets to * dissect differently, and thus doesn't redo the packet display. */ - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); /* This will bring up the progress bar * Put our window back in front diff --git a/gtk/expert_dlg.c b/gtk/expert_dlg.c index 074ab1bb84..c6d9889674 100644 --- a/gtk/expert_dlg.c +++ b/gtk/expert_dlg.c @@ -542,6 +542,7 @@ expert_dlg_init(const char *optarg, void* userdata _U_) }*/ error_string=register_tap_listener("expert", etd, NULL /* fstring */, + 0, expert_dlg_reset, expert_dlg_packet, expert_dlg_draw); @@ -569,7 +570,7 @@ expert_dlg_init(const char *optarg, void* userdata _U_) gtk_widget_show_all(etd->win); window_present(etd->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); /* This will bring up the progress bar * Put our window back in front diff --git a/gtk/export_object.c b/gtk/export_object.c index 08d9015c2b..cde07a8ac8 100644 --- a/gtk/export_object.c +++ b/gtk/export_object.c @@ -283,7 +283,7 @@ export_object_window(const gchar *tapname, const gchar *name, tap_packet_cb tap_ object_list = g_malloc0(sizeof(export_object_list_t)); /* Data will be gathered via a tap callback */ - error_msg = register_tap_listener(tapname, object_list, NULL, + error_msg = register_tap_listener(tapname, object_list, NULL, 0, eo_reset, tap_packet, eo_draw); @@ -421,5 +421,5 @@ export_object_window(const gchar *tapname, const gchar *name, tap_packet_cb tap_ gtk_widget_show_all(object_list->dlg); window_present(object_list->dlg); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); } diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c index b9502d6c57..bad8b78712 100644 --- a/gtk/fc_stat.c +++ b/gtk/fc_stat.c @@ -179,7 +179,7 @@ gtk_fcstat_init(const char *optarg, void *userdata _U_) } - error_string=register_tap_listener("fc", fc, filter, fcstat_reset, fcstat_packet, fcstat_draw); + error_string=register_tap_listener("fc", fc, filter, 0, fcstat_reset, fcstat_packet, fcstat_draw); if(error_string){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); @@ -200,7 +200,7 @@ gtk_fcstat_init(const char *optarg, void *userdata _U_) gtk_widget_show_all(fc->win); window_present(fc->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(fc->win->window); } diff --git a/gtk/flow_graph.c b/gtk/flow_graph.c index c23fa6030a..4465d530c1 100644 --- a/gtk/flow_graph.c +++ b/gtk/flow_graph.c @@ -420,6 +420,7 @@ flow_graph_on_ok (GtkButton *button _U_, { /* don't register tap listener, if we have it already */ register_tap_listener("frame", &tap_identifier, NULL, + TL_REQUIRES_COLUMNS, flow_graph_reset, flow_graph_frame_packet, flow_graph_packet_draw @@ -427,7 +428,7 @@ flow_graph_on_ok (GtkButton *button _U_, have_frame_tap_listener=TRUE; } - cf_retap_packets(&cfile, TRUE); + cf_retap_packets(&cfile); } else if (type_of_flow == TCP){ /* Register the tap listener */ @@ -436,6 +437,7 @@ flow_graph_on_ok (GtkButton *button _U_, { /* don't register tap listener, if we have it already */ register_tap_listener("tcp", &tap_identifier, NULL, + 0, flow_graph_reset, flow_graph_tcp_packet, flow_graph_packet_draw @@ -443,7 +445,7 @@ flow_graph_on_ok (GtkButton *button _U_, have_tcp_tap_listener=TRUE; } - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); } if (graph_analysis_data->dlg.window != NULL){ /* if we still have a window */ diff --git a/gtk/follow_ssl.c b/gtk/follow_ssl.c index f9daa2f125..f128c4d735 100644 --- a/gtk/follow_ssl.c +++ b/gtk/follow_ssl.c @@ -203,7 +203,7 @@ follow_ssl_stream_cb(GtkWidget * w, gpointer data _U_) } /* data will be passed via tap callback*/ - msg = register_tap_listener("ssl", follow_info, follow_filter, + msg = register_tap_listener("ssl", follow_info, follow_filter, 0, NULL, ssl_queue_packet_data, NULL); if (msg) { diff --git a/gtk/follow_udp.c b/gtk/follow_udp.c index 10ac3d5705..d95c580e2a 100644 --- a/gtk/follow_udp.c +++ b/gtk/follow_udp.c @@ -151,7 +151,7 @@ follow_udp_stream_cb(GtkWidget *w, gpointer data _U_) /* data will be passed via tap callback*/ msg = register_tap_listener("udp_follow", follow_info, follow_filter, - NULL, udp_queue_packet_data, NULL); + 0, NULL, udp_queue_packet_data, NULL); if (msg) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Can't register udp_follow tap: %s\n", diff --git a/gtk/funnel_stat.c b/gtk/funnel_stat.c index e79d405ef1..f632c67bb2 100644 --- a/gtk/funnel_stat.c +++ b/gtk/funnel_stat.c @@ -476,7 +476,7 @@ static void funnel_logger(const gchar *log_domain _U_, } static void funnel_retap_packets(void) { - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); } static gboolean funnel_open_file(const char* fname, const char* filter, const char** err_str) { @@ -578,7 +578,7 @@ typedef struct _menu_cb_t { static void our_menu_callback(void* unused _U_, gpointer data) { menu_cb_t* mcb = data; mcb->callback(mcb->callback_data); - if (mcb->retap) cf_retap_packets(&cfile, FALSE); + if (mcb->retap) cf_retap_packets(&cfile); } static void register_menu_cb(const char *name, diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c index 649870c55d..5b9b04b1e5 100644 --- a/gtk/gsm_a_stat.c +++ b/gtk/gsm_a_stat.c @@ -666,7 +666,7 @@ register_tap_listener_gtkgsm_a_stat(void) memset((void *) &gsm_a_stat, 0, sizeof(gsm_a_stat_t)); err_p = - register_tap_listener("gsm_a", &gsm_a_stat, NULL, + register_tap_listener("gsm_a", &gsm_a_stat, NULL, 0, gsm_a_stat_reset, gsm_a_stat_packet, gsm_a_stat_draw); diff --git a/gtk/gsm_map_stat.c b/gtk/gsm_map_stat.c index 0735aa42bb..af13c20fe6 100644 --- a/gtk/gsm_map_stat.c +++ b/gtk/gsm_map_stat.c @@ -472,7 +472,7 @@ register_tap_listener_gtkgsm_map_stat(void) memset((void *) &gsm_map_stat, 0, sizeof(gsm_map_stat_t)); err_p = - register_tap_listener("gsm_map", &gsm_map_stat, NULL, + register_tap_listener("gsm_map", &gsm_map_stat, NULL, 0, gsm_map_stat_reset, gsm_map_stat_packet, gsm_map_stat_draw); diff --git a/gtk/gtp_stat.c b/gtk/gtp_stat.c index 5dd635f5b3..768f7bd533 100644 --- a/gtk/gtp_stat.c +++ b/gtk/gtp_stat.c @@ -196,7 +196,7 @@ gtk_gtpstat_init(const char *optarg, void *userdata _U_) init_srt_table_row(>p->gtp_srt_table, 2, "Update PDP context"); init_srt_table_row(>p->gtp_srt_table, 3, "Delete PDP context"); - error_string=register_tap_listener("gtp", gtp, filter, gtpstat_reset, gtpstat_packet, gtpstat_draw); + error_string=register_tap_listener("gtp", gtp, filter, 0, gtpstat_reset, gtpstat_packet, gtpstat_draw); if(error_string){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); @@ -217,7 +217,7 @@ gtk_gtpstat_init(const char *optarg, void *userdata _U_) gtk_widget_show_all(gtp->win); window_present(gtp->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(gtp->win->window); } diff --git a/gtk/h225_counter.c b/gtk/h225_counter.c index 3100ef97e5..eef76c0f24 100644 --- a/gtk/h225_counter.c +++ b/gtk/h225_counter.c @@ -503,20 +503,18 @@ static void gtk_h225counter_init(const char *optarg, void *userdata _U_) { h225counter_t *hs; - const char *filter=NULL; GString *error_string; GtkWidget *bbox; GtkWidget *close_bt; + hs=g_malloc(sizeof(h225counter_t)); + if(strncmp(optarg,"h225,counter,",13) == 0){ - filter=optarg+13; + hs->filter=g_strdup(optarg+13); } else { - filter=""; + hs->filter=NULL; } - hs=g_malloc(sizeof(h225counter_t)); - hs->filter=g_strdup(filter); - h225counter_reset(hs); hs->win=window_new(GTK_WINDOW_TOPLEVEL, "Wireshark: H.225 counters"); @@ -525,14 +523,14 @@ gtk_h225counter_init(const char *optarg, void *userdata _U_) hs->vbox=gtk_vbox_new(FALSE, 3); gtk_container_set_border_width(GTK_CONTAINER(hs->vbox), 12); - init_main_stat_window(hs->win, hs->vbox, "H.225 Message and Message Reason Counter", filter); + init_main_stat_window(hs->win, hs->vbox, "H.225 Message and Message Reason Counter", hs->filter); /* init a scrolled window*/ hs->scrolled_window = scrolled_window_new(NULL, NULL); hs->table = create_stat_table(hs->scrolled_window, hs->vbox, 2, titles); - error_string=register_tap_listener("h225", hs, filter, h225counter_reset, h225counter_packet, h225counter_draw); + error_string=register_tap_listener("h225", hs, hs->filter, 0, h225counter_reset, h225counter_packet, h225counter_draw); if(error_string){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); @@ -554,7 +552,7 @@ gtk_h225counter_init(const char *optarg, void *userdata _U_) gtk_widget_show_all(hs->win); window_present(hs->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(hs->win->window); } diff --git a/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c index 712ae83a0b..e28cc6d727 100644 --- a/gtk/h225_ras_srt.c +++ b/gtk/h225_ras_srt.c @@ -283,20 +283,18 @@ static void gtk_h225rassrt_init(const char *optarg, void *userdata _U_) { h225rassrt_t *hs; - const char *filter=NULL; GString *error_string; GtkWidget *bbox; GtkWidget *close_bt; + hs=g_malloc(sizeof(h225rassrt_t)); + if(strncmp(optarg,"h225,srt,",9) == 0){ - filter=optarg+9; + hs->filter=g_strdup(optarg+9); } else { - filter=""; + hs->filter=NULL; } - hs=g_malloc(sizeof(h225rassrt_t)); - hs->filter=g_strdup(filter); - h225rassrt_reset(hs); hs->win=window_new(GTK_WINDOW_TOPLEVEL, "h225-ras-srt"); @@ -305,14 +303,14 @@ gtk_h225rassrt_init(const char *optarg, void *userdata _U_) hs->vbox=gtk_vbox_new(FALSE, 3); gtk_container_set_border_width(GTK_CONTAINER(hs->vbox), 12); - init_main_stat_window(hs->win, hs->vbox, "H.225 RAS Service Response Time", filter); + init_main_stat_window(hs->win, hs->vbox, "H.225 RAS Service Response Time", hs->filter); /* init a scrolled window*/ hs->scrolled_window = scrolled_window_new(NULL, NULL); hs->table = create_stat_table(hs->scrolled_window, hs->vbox, 11, titles); - error_string=register_tap_listener("h225", hs, filter, h225rassrt_reset, h225rassrt_packet, h225rassrt_draw); + error_string=register_tap_listener("h225", hs, hs->filter, 0, h225rassrt_reset, h225rassrt_packet, h225rassrt_draw); if(error_string){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); @@ -334,7 +332,7 @@ gtk_h225rassrt_init(const char *optarg, void *userdata _U_) gtk_widget_show_all(hs->win); window_present(hs->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(hs->win->window); } diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c index ed4f420538..0082994b74 100644 --- a/gtk/hostlist_table.c +++ b/gtk/hostlist_table.c @@ -845,7 +845,7 @@ init_hostlist_table_page(hostlist_table *hosttable, GtkWidget *vbox, gboolean hi hostlist_create_popup_menu(hosttable); /* register the tap and rerun the taps on the packet list */ - error_string=register_tap_listener(tap_name, hosttable, filter, reset_hostlist_table_data_cb, packet_func, draw_hostlist_table_data_cb); + error_string=register_tap_listener(tap_name, hosttable, filter, 0, reset_hostlist_table_data_cb, packet_func, draw_hostlist_table_data_cb); if(error_string){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); @@ -936,7 +936,7 @@ init_hostlist_table(gboolean hide_ports, const char *table_name, const char *tap gtk_widget_show_all(hosttable->win); window_present(hosttable->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(hosttable->win->window); /* Keep clist frozen to cause modifications to the clist (inserts, appends, others that are extremely slow @@ -1093,7 +1093,7 @@ hostlist_filter_toggle_dest(GtkWidget *widget, gpointer data) reset_hostlist_table_data(hosttable); } - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); if (hosttable) { gdk_window_raise(hosttable->win->window); } @@ -1221,7 +1221,7 @@ init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_) gtk_widget_show_all(win); window_present(win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(win->window); /* after retapping, redraw table */ diff --git a/gtk/iax2_analysis.c b/gtk/iax2_analysis.c index 4562440d18..7094c87094 100644 --- a/gtk/iax2_analysis.c +++ b/gtk/iax2_analysis.c @@ -1504,7 +1504,7 @@ static gint filter_callback(GtkWidget *widget _U_, dialog_graph_graph_t *dgg) } enable_graph(dgg); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); dialog_graph_redraw(dgg->ud); return 0; @@ -1606,7 +1606,7 @@ static void tick_interval_select(GtkWidget *item, gpointer key) val=(long)g_object_get_data(G_OBJECT(item), "tick_interval"); user_data->dlg.dialog_graph.interval=val; - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); dialog_graph_redraw(user_data); } @@ -1837,7 +1837,7 @@ static void on_refresh_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data) unprotect_thread_critical_region(); /* register tap listener */ - error_string = register_tap_listener("IAX2", user_data, NULL, + error_string = register_tap_listener("IAX2", user_data, NULL, 0, iax2_reset, iax2_packet, iax2_draw); if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); @@ -1846,7 +1846,7 @@ static void on_refresh_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data) } /* retap all packets */ - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); /* draw statistics info */ draw_stat(user_data); diff --git a/gtk/io_stat.c b/gtk/io_stat.c index c4ba37026b..59e844dda1 100644 --- a/gtk/io_stat.c +++ b/gtk/io_stat.c @@ -1211,6 +1211,7 @@ enable_graph(io_stat_graph_t *gio, const char *filter, const char *field) } } return register_tap_listener("frame", gio, real_filter[0]?real_filter:NULL, + TL_REQUIRES_PROTO_TREE, gtk_iostat_reset, gtk_iostat_packet, gtk_iostat_draw); } @@ -1300,7 +1301,7 @@ gtk_iostat_init(const char *optarg _U_, void* userdata _U_) /* build the GUI */ init_io_stat_window(io); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(io->window->window); io_stat_redraw(io); } @@ -1502,7 +1503,7 @@ tick_interval_select(GtkWidget *item, gpointer key) val=(long)g_object_get_data(G_OBJECT(item), "tick_interval"); io->interval=val; - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(io->window->window); io_stat_redraw(io); } @@ -1892,7 +1893,7 @@ filter_callback(GtkWidget *widget _U_, io_stat_graph_t *gio) io_stat_reset(gio->io); enable_graph(gio, filter, field); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(gio->io->window->window); io_stat_redraw(gio->io); diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c index a2eb6c2384..3c107aec31 100644 --- a/gtk/ldap_stat.c +++ b/gtk/ldap_stat.c @@ -212,7 +212,7 @@ gtk_ldapstat_init(const char *optarg, void *userdata _U_) init_srt_table_row(&ldap->ldap_srt_table, 23, "Extended"); - error_string=register_tap_listener("ldap", ldap, filter, ldapstat_reset, ldapstat_packet, ldapstat_draw); + error_string=register_tap_listener("ldap", ldap, filter, 0, ldapstat_reset, ldapstat_packet, ldapstat_draw); if(error_string){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); @@ -233,7 +233,7 @@ gtk_ldapstat_init(const char *optarg, void *userdata _U_) gtk_widget_show_all(ldap->win); window_present(ldap->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(ldap->win->window); } diff --git a/gtk/mac_lte_stat_dlg.c b/gtk/mac_lte_stat_dlg.c index 121e94d632..7180dcd40a 100644 --- a/gtk/mac_lte_stat_dlg.c +++ b/gtk/mac_lte_stat_dlg.c @@ -800,7 +800,7 @@ static void mac_lte_stat_dlg_create(void) /* Register the tap listener */ /**********************************************/ - error_string = register_tap_listener("mac-lte", hs, NULL, + error_string = register_tap_listener("mac-lte", hs, NULL, 0, mac_lte_stat_reset, mac_lte_stat_packet, mac_lte_stat_draw); @@ -835,7 +835,7 @@ static void mac_lte_stat_dlg_create(void) window_present(mac_lte_stat_dlg_w); /* Retap */ - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(mac_lte_stat_dlg_w->window); } diff --git a/gtk/mcast_stream.c b/gtk/mcast_stream.c index b8f7920116..152314fa85 100644 --- a/gtk/mcast_stream.c +++ b/gtk/mcast_stream.c @@ -301,7 +301,7 @@ void mcaststream_scan(void) if (!the_tapinfo_struct.is_registered) register_tap_listener_mcast_stream(); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); if (!was_registered) remove_tap_listener_mcast_stream(); @@ -340,7 +340,7 @@ register_tap_listener_mcast_stream(void) GString *error_string; if (!the_tapinfo_struct.is_registered) { error_string = register_tap_listener("udp", &the_tapinfo_struct, - NULL, mcaststream_reset_cb, mcaststream_packet, + NULL, 0, mcaststream_reset_cb, mcaststream_packet, mcaststream_draw); if (error_string != NULL) { diff --git a/gtk/mcast_stream_dlg.c b/gtk/mcast_stream_dlg.c index 0ddf779ca1..b0d026f283 100644 --- a/gtk/mcast_stream_dlg.c +++ b/gtk/mcast_stream_dlg.c @@ -385,7 +385,7 @@ mcast_params_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) /* Clean up memory used by stream tap */ mcaststream_reset((mcaststream_tapinfo_t*) mcaststream_get_info()); /* retap all packets */ - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); } diff --git a/gtk/megaco_stat.c b/gtk/megaco_stat.c index a2aa9de9b1..622ca08b76 100644 --- a/gtk/megaco_stat.c +++ b/gtk/megaco_stat.c @@ -150,7 +150,6 @@ static void gtk_megacostat_init(const char *optarg, void *userdata _U_) { megacostat_t *ms; - const char *filter=NULL; GString *error_string; GtkWidget *bt_close; GtkWidget *bbox; @@ -164,15 +163,14 @@ gtk_megacostat_init(const char *optarg, void *userdata _U_) return; } + ms=g_malloc(sizeof(megacostat_t)); + if(strncmp(optarg,"megaco,srt,",11) == 0){ - filter=optarg+11; + ms->filter=g_strdup(optarg+11); } else { - filter=""; + ms->filter=NULL; } - ms=g_malloc(sizeof(megacostat_t)); - ms->filter=g_strdup(filter); - megacostat_reset(ms); ms->win=window_new(GTK_WINDOW_TOPLEVEL, "MEGACO SRT"); @@ -180,14 +178,14 @@ gtk_megacostat_init(const char *optarg, void *userdata _U_) ms->vbox=gtk_vbox_new(FALSE, 3); - init_main_stat_window(ms->win, ms->vbox, "MEGACO Service Response Time (SRT) Statistics", filter); + init_main_stat_window(ms->win, ms->vbox, "MEGACO Service Response Time (SRT) Statistics", ms->filter); /* init a scrolled window*/ ms->scrolled_window = scrolled_window_new(NULL, NULL); ms->table = create_stat_table(ms->scrolled_window, ms->vbox, 7, titles); - error_string=register_tap_listener("megaco", ms, filter, megacostat_reset, megacostat_packet, megacostat_draw); + error_string=register_tap_listener("megaco", ms, ms->filter, 0, megacostat_reset, megacostat_packet, megacostat_draw); if(error_string){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); @@ -209,7 +207,7 @@ gtk_megacostat_init(const char *optarg, void *userdata _U_) gtk_widget_show_all(ms->win); window_present(ms->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(ms->win->window); } diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c index 02183d9d5f..0ca343d2ca 100644 --- a/gtk/mgcp_stat.c +++ b/gtk/mgcp_stat.c @@ -250,20 +250,18 @@ static void gtk_mgcpstat_init(const char *optarg, void *userdata _U_) { mgcpstat_t *ms; - const char *filter=NULL; GString *error_string; GtkWidget *bt_close; GtkWidget *bbox; + ms=g_malloc(sizeof(mgcpstat_t)); + if(strncmp(optarg,"mgcp,srt,",9) == 0){ - filter=optarg+9; + ms->filter=g_strdup(optarg+9); } else { - filter=""; + ms->filter=NULL; } - ms=g_malloc(sizeof(mgcpstat_t)); - ms->filter=g_strdup(filter); - mgcpstat_reset(ms); ms->win=window_new(GTK_WINDOW_TOPLEVEL, "MGCP SRT"); @@ -271,14 +269,14 @@ gtk_mgcpstat_init(const char *optarg, void *userdata _U_) ms->vbox=gtk_vbox_new(FALSE, 3); - init_main_stat_window(ms->win, ms->vbox, "MGCP Service Response Time (SRT) Statistics", filter); + init_main_stat_window(ms->win, ms->vbox, "MGCP Service Response Time (SRT) Statistics", ms->filter); /* init a scrolled window*/ ms->scrolled_window = scrolled_window_new(NULL, NULL); ms->table = create_stat_table(ms->scrolled_window, ms->vbox, 7, titles); - error_string=register_tap_listener("mgcp", ms, filter, mgcpstat_reset, mgcpstat_packet, mgcpstat_draw); + error_string=register_tap_listener("mgcp", ms, ms->filter, 0, mgcpstat_reset, mgcpstat_packet, mgcpstat_draw); if(error_string){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); @@ -300,7 +298,7 @@ gtk_mgcpstat_init(const char *optarg, void *userdata _U_) gtk_widget_show_all(ms->win); window_present(ms->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(ms->win->window); } diff --git a/gtk/mtp3_stat.c b/gtk/mtp3_stat.c index e656683ee0..f9b4d6603a 100644 --- a/gtk/mtp3_stat.c +++ b/gtk/mtp3_stat.c @@ -435,7 +435,7 @@ register_tap_listener_gtkmtp3_stat(void) memset((void *) &mtp3_stat, 0, sizeof(mtp3_stat_t)); err_p = - register_tap_listener("mtp3", &mtp3_stat, NULL, + register_tap_listener("mtp3", &mtp3_stat, NULL, 0, mtp3_stat_reset, mtp3_stat_packet, mtp3_stat_draw); diff --git a/gtk/ncp_stat.c b/gtk/ncp_stat.c index 838b205abb..033a95d567 100644 --- a/gtk/ncp_stat.c +++ b/gtk/ncp_stat.c @@ -698,7 +698,7 @@ gtk_ncpstat_init(const char *optarg, void *userdata _U_) init_srt_table(&ss->nmas_srt_table, 256, temp_page, "nmas.subverb"); /* Register the tap listener */ - error_string=register_tap_listener("ncp_srt", ss, filter, ncpstat_reset, ncpstat_packet, ncpstat_draw); + error_string=register_tap_listener("ncp_srt", ss, filter, 0, ncpstat_reset, ncpstat_packet, ncpstat_draw); if(error_string){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); diff --git a/gtk/radius_stat.c b/gtk/radius_stat.c index d5b718390a..1f0da9d7ba 100644 --- a/gtk/radius_stat.c +++ b/gtk/radius_stat.c @@ -301,20 +301,18 @@ static void gtk_radiusstat_init(const char *optarg, void *userdata _U_) { radiusstat_t *rs; - const char *filter=NULL; GString *error_string; GtkWidget *bt_close; GtkWidget *bbox; + rs=g_malloc(sizeof(radiusstat_t)); + if(strncmp(optarg,"radius,srt,",11) == 0){ - filter=optarg+11; + rs->filter=g_strdup(optarg+11); } else { - filter=""; + rs->filter=NULL; } - rs=g_malloc(sizeof(radiusstat_t)); - rs->filter=g_strdup(filter); - radiusstat_reset(rs); rs->win=window_new(GTK_WINDOW_TOPLEVEL, "RADIUS SRT"); @@ -322,14 +320,14 @@ gtk_radiusstat_init(const char *optarg, void *userdata _U_) rs->vbox=gtk_vbox_new(FALSE, 3); - init_main_stat_window(rs->win, rs->vbox, "RADIUS Service Response Time (SRT) Statistics", filter); + init_main_stat_window(rs->win, rs->vbox, "RADIUS Service Response Time (SRT) Statistics", rs->filter); /* init a scrolled window*/ rs->scrolled_window = scrolled_window_new(NULL, NULL); rs->table = create_stat_table(rs->scrolled_window, rs->vbox, NUM_COLUMNS, titles); - error_string=register_tap_listener("radius", rs, filter, radiusstat_reset, radiusstat_packet, radiusstat_draw); + error_string=register_tap_listener("radius", rs, rs->filter, 0, radiusstat_reset, radiusstat_packet, radiusstat_draw); if(error_string){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); @@ -351,7 +349,7 @@ gtk_radiusstat_init(const char *optarg, void *userdata _U_) gtk_widget_show_all(rs->win); window_present(rs->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(rs->win->window); } diff --git a/gtk/rpc_progs.c b/gtk/rpc_progs.c index fa77546941..e51c64bdd0 100644 --- a/gtk/rpc_progs.c +++ b/gtk/rpc_progs.c @@ -382,7 +382,7 @@ gtk_rpcprogs_init(const char *optarg _U_, void* userdata _U_) gtk_table_attach_defaults(GTK_TABLE(table), tmp, 5,6,0,1); gtk_label_set_justify(GTK_LABEL(tmp), GTK_JUSTIFY_RIGHT); - error_string=register_tap_listener("rpc", win, NULL, rpcprogs_reset, rpcprogs_packet, rpcprogs_draw); + error_string=register_tap_listener("rpc", win, NULL, 0, rpcprogs_reset, rpcprogs_packet, rpcprogs_draw); if(error_string){ fprintf(stderr, "wireshark: Couldn't register rpc,programs tap: %s\n", error_string->str); @@ -403,7 +403,7 @@ gtk_rpcprogs_init(const char *optarg _U_, void* userdata _U_) gtk_widget_show_all(win); window_present(win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(win->window); } diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c index 7f5aaaee30..08384278a2 100644 --- a/gtk/rpc_stat.c +++ b/gtk/rpc_stat.c @@ -290,7 +290,7 @@ gtk_rpcstat_init(const char *optarg, void* userdata _U_) } - error_string=register_tap_listener("rpc", rs, filter, rpcstat_reset, rpcstat_packet, rpcstat_draw); + error_string=register_tap_listener("rpc", rs, filter, 0, rpcstat_reset, rpcstat_packet, rpcstat_draw); if(error_string){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); @@ -312,7 +312,7 @@ gtk_rpcstat_init(const char *optarg, void* userdata _U_) gtk_widget_show_all(rs->win); window_present(rs->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(rs->win->window); } diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c index 7a19105a2e..e0f974ec9b 100644 --- a/gtk/rtp_analysis.c +++ b/gtk/rtp_analysis.c @@ -1474,8 +1474,8 @@ static gint filter_callback(GtkWidget *widget _U_, dialog_graph_graph_t *dgg) return 0; } - enable_graph(dgg); - cf_retap_packets(&cfile, FALSE); + enable_graph(dgg); + cf_retap_packets(&cfile); dialog_graph_redraw(dgg->ud); return 0; @@ -1577,7 +1577,7 @@ static void tick_interval_select(GtkWidget *item, gpointer key) val=(long)g_object_get_data(G_OBJECT(item), "tick_interval"); user_data->dlg.dialog_graph.interval=val; - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); dialog_graph_redraw(user_data); } @@ -1809,7 +1809,7 @@ static void on_refresh_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data) unprotect_thread_critical_region(); /* register tap listener */ - error_string = register_tap_listener("rtp", user_data, NULL, + error_string = register_tap_listener("rtp", user_data, NULL, 0, rtp_reset, rtp_packet, rtp_draw); if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); @@ -1818,7 +1818,7 @@ static void on_refresh_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data) } /* retap all packets */ - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); /* draw statistics info */ draw_stat(user_data); diff --git a/gtk/rtp_stream.c b/gtk/rtp_stream.c index ecc543853a..8256590d4d 100644 --- a/gtk/rtp_stream.c +++ b/gtk/rtp_stream.c @@ -83,7 +83,7 @@ void rtpstream_scan(void) register_tap_listener_rtp_stream(); the_tapinfo_struct.mode = TAP_ANALYSE; - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); if (!was_registered) remove_tap_listener_rtp_stream(); @@ -114,7 +114,7 @@ gboolean rtpstream_save(rtp_stream_info_t* stream, const gchar *filename) the_tapinfo_struct.mode = TAP_SAVE; the_tapinfo_struct.filter_stream_fwd = stream; - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); the_tapinfo_struct.mode = TAP_ANALYSE; if (!was_registered) @@ -145,7 +145,7 @@ void rtpstream_mark(rtp_stream_info_t* stream_fwd, rtp_stream_info_t* stream_rev the_tapinfo_struct.mode = TAP_MARK; the_tapinfo_struct.filter_stream_fwd = stream_fwd; the_tapinfo_struct.filter_stream_rev = stream_rev; - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); the_tapinfo_struct.mode = TAP_ANALYSE; if (!was_registered) @@ -186,7 +186,7 @@ register_tap_listener_rtp_stream(void) if (!the_tapinfo_struct.is_registered) { error_string = register_tap_listener("rtp", &the_tapinfo_struct, - NULL, rtpstream_reset_cb, rtpstream_packet, + NULL, 0, rtpstream_reset_cb, rtpstream_packet, rtpstream_draw); if (error_string != NULL) { diff --git a/gtk/scsi_stat.c b/gtk/scsi_stat.c index 73ecc52761..4ce4a78821 100644 --- a/gtk/scsi_stat.c +++ b/gtk/scsi_stat.c @@ -264,7 +264,7 @@ gtk_scsistat_init(const char *optarg, void* userdata _U_) } - error_string=register_tap_listener("scsi", rs, filter, scsistat_reset, scsistat_packet, scsistat_draw); + error_string=register_tap_listener("scsi", rs, filter, 0, scsistat_reset, scsistat_packet, scsistat_draw); if(error_string){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); @@ -286,7 +286,7 @@ gtk_scsistat_init(const char *optarg, void* userdata _U_) gtk_widget_show_all(rs->win); window_present(rs->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(rs->win->window); } diff --git a/gtk/sctp_assoc_analyse.c b/gtk/sctp_assoc_analyse.c index fce1b3fded..e94b2eac19 100644 --- a/gtk/sctp_assoc_analyse.c +++ b/gtk/sctp_assoc_analyse.c @@ -931,7 +931,7 @@ struct sctp_analyse * u_data; u_data->analyse_nb = NULL; u_data->window = NULL; u_data->num_children = 0; - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); sctp_analyse_cb(u_data, TRUE); sctp_set_filter(NULL, u_data); } @@ -954,7 +954,7 @@ void sctp_analyse_start(GtkWidget *w _U_, gpointer data _U_) u_data->window = NULL; u_data->num_children = 0; - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); sctp_analyse_cb(u_data, FALSE); } diff --git a/gtk/sctp_chunk_stat.c b/gtk/sctp_chunk_stat.c index fc89dcdae2..addd2a1a7f 100644 --- a/gtk/sctp_chunk_stat.c +++ b/gtk/sctp_chunk_stat.c @@ -284,19 +284,16 @@ static void sctpstat_init(const char *optarg, void *userdata _U_) { sctpstat_t *hs; - const char *filter=NULL; GString *error_string; GtkWidget *bbox; GtkWidget *close_bt; + hs=g_malloc(sizeof(sctpstat_t)); if(strncmp(optarg,"sctp,stat,",10) == 0){ - filter=optarg+10; + hs->filter=g_strdup(optarg+10); } else { - filter=""; + hs->filter=NULL; } - - hs=g_malloc(sizeof(sctpstat_t)); - hs->filter=g_strdup(filter); hs->ep_list = NULL; hs->number_of_packets = 0; sctpstat_reset(hs); @@ -307,14 +304,14 @@ sctpstat_init(const char *optarg, void *userdata _U_) hs->vbox=gtk_vbox_new(FALSE, 3); gtk_container_set_border_width(GTK_CONTAINER(hs->vbox), 12); - init_main_stat_window(hs->win, hs->vbox, "SCTP Chunk Counter", filter); + init_main_stat_window(hs->win, hs->vbox, "SCTP Chunk Counter", hs->filter); /* init a scrolled window*/ hs->scrolled_window = scrolled_window_new(NULL, NULL); hs->table = create_stat_table(hs->scrolled_window, hs->vbox, 15, titles); - error_string=register_tap_listener("sctp", hs, filter, + error_string=register_tap_listener("sctp", hs, hs->filter, 0, sctpstat_reset, sctpstat_packet, sctpstat_draw); @@ -339,7 +336,7 @@ sctpstat_init(const char *optarg, void *userdata _U_) gtk_widget_show_all(hs->win); window_present(hs->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); } void diff --git a/gtk/sctp_chunk_stat_dlg.c b/gtk/sctp_chunk_stat_dlg.c index acc0aef68c..e019d4a612 100644 --- a/gtk/sctp_chunk_stat_dlg.c +++ b/gtk/sctp_chunk_stat_dlg.c @@ -579,7 +579,7 @@ gtk_sctpstat_dlg(struct sctp_udata *u_data, unsigned int direction) g_signal_connect(bt_close, "clicked", G_CALLBACK(sctp_chunk_stat_on_close), u_data); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); } diff --git a/gtk/sctp_stat.c b/gtk/sctp_stat.c index 04f534e082..2672ca886c 100644 --- a/gtk/sctp_stat.c +++ b/gtk/sctp_stat.c @@ -1277,7 +1277,7 @@ register_tap_listener_sctp_stat(void) if (!sctp_tapinfo_struct.is_registered) { - if ((error_string = register_tap_listener("sctp", &sctp_tapinfo_struct, NULL, reset, packet, sctp_update))) { + if ((error_string = register_tap_listener("sctp", &sctp_tapinfo_struct, NULL, 0, reset, packet, sctp_update))) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); return; diff --git a/gtk/sctp_stat_dlg.c b/gtk/sctp_stat_dlg.c index d1d1ff0a14..086926dfd7 100644 --- a/gtk/sctp_stat_dlg.c +++ b/gtk/sctp_stat_dlg.c @@ -603,7 +603,7 @@ gtk_sctpstat_dlg(void) g_signal_connect(bt_analyse, "clicked", G_CALLBACK(sctp_stat_on_analyse), NULL); sctp_stat_dlg = sctp_stat_dlg_w; - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(sctp_stat_dlg_w->window); } diff --git a/gtk/sip_stat.c b/gtk/sip_stat.c index 4fb7b4da51..34289221a5 100644 --- a/gtk/sip_stat.c +++ b/gtk/sip_stat.c @@ -668,6 +668,7 @@ gtk_sipstat_init(const char *optarg, void *userdata _U_) error_string = register_tap_listener("sip", sp, filter, + 0, sipstat_reset, sipstat_packet, sipstat_draw); @@ -696,7 +697,7 @@ gtk_sipstat_init(const char *optarg, void *userdata _U_) window_present(sp->win); sip_init_hash(sp); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(sp->win->window); } diff --git a/gtk/smb2_stat.c b/gtk/smb2_stat.c index e590237807..03ffbff3f3 100644 --- a/gtk/smb2_stat.c +++ b/gtk/smb2_stat.c @@ -176,7 +176,7 @@ gtk_smb2stat_init(const char *optarg, void *userdata _U_) } - error_string=register_tap_listener("smb2", ss, filter, smb2stat_reset, smb2stat_packet, smb2stat_draw); + error_string=register_tap_listener("smb2", ss, filter, 0, smb2stat_reset, smb2stat_packet, smb2stat_draw); if(error_string){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); @@ -197,7 +197,7 @@ gtk_smb2stat_init(const char *optarg, void *userdata _U_) gtk_widget_show_all(ss->win); window_present(ss->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(ss->win->window); } diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c index 5be5e2d57e..6b4079a4fe 100644 --- a/gtk/smb_stat.c +++ b/gtk/smb_stat.c @@ -214,7 +214,7 @@ gtk_smbstat_init(const char *optarg, void *userdata _U_) } - error_string=register_tap_listener("smb", ss, filter, smbstat_reset, smbstat_packet, smbstat_draw); + error_string=register_tap_listener("smb", ss, filter, 0, smbstat_reset, smbstat_packet, smbstat_draw); if(error_string){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); @@ -235,7 +235,7 @@ gtk_smbstat_init(const char *optarg, void *userdata _U_) gtk_widget_show_all(ss->win); window_present(ss->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(ss->win->window); } diff --git a/gtk/stats_tree_stat.c b/gtk/stats_tree_stat.c index c5ce5f26f1..0309c4d90d 100644 --- a/gtk/stats_tree_stat.c +++ b/gtk/stats_tree_stat.c @@ -301,6 +301,7 @@ init_gtk_tree(const char* optarg, void *userdata _U_) error_string = register_tap_listener( cfg->tapname, st, st->filter, + cfg->flags, reset_tap, stats_tree_packet, draw_gtk_tree); @@ -326,7 +327,7 @@ init_gtk_tree(const char* optarg, void *userdata _U_) gtk_widget_show_all(st->pr->win); window_present(st->pr->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(st->pr->win->window); } diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c index e664cbf632..c93cf04cbb 100644 --- a/gtk/tcp_graph.c +++ b/gtk/tcp_graph.c @@ -1756,14 +1756,14 @@ static void graph_segment_list_get (struct graph *g) ts.current=¤t; ts.g=g; ts.last=NULL; - error_string=register_tap_listener("tcp", &ts, "tcp", NULL, tapall_tcpip_packet, NULL); + error_string=register_tap_listener("tcp", &ts, "tcp", 0, NULL, tapall_tcpip_packet, NULL); if(error_string){ fprintf(stderr, "wireshark: Couldn't register tcp_graph tap: %s\n", error_string->str); g_string_free(error_string, TRUE); exit(1); } - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); remove_tap_listener(&ts); } @@ -1817,7 +1817,7 @@ static struct tcpheader *select_tcpip_session (capture_file *cf, struct segment } - error_string=register_tap_listener("tcp", &th, NULL, NULL, tap_tcpip_packet, NULL); + error_string=register_tap_listener("tcp", &th, NULL, 0, NULL, tap_tcpip_packet, NULL); if(error_string){ fprintf(stderr, "wireshark: Couldn't register tcp_graph tap: %s\n", error_string->str); diff --git a/gtk/voip_calls.c b/gtk/voip_calls.c index f687d1cc2f..96417afd6c 100644 --- a/gtk/voip_calls.c +++ b/gtk/voip_calls.c @@ -425,6 +425,7 @@ rtp_event_init_tap(void) { error_string = register_tap_listener("rtpevent", &(the_tapinfo_rtp_struct.rtp_event_dummy), NULL, + 0, NULL, rtp_event_packet, NULL @@ -659,6 +660,7 @@ rtp_init_tap(void) { /* don't register tap listener, if we have it already */ error_string = register_tap_listener("rtp", &(the_tapinfo_rtp_struct.rtp_dummy), NULL, + 0, voip_rtp_reset, RTP_packet, RTP_packet_draw @@ -823,6 +825,7 @@ t38_init_tap(void) { /* don't register tap listener, if we have it already */ error_string = register_tap_listener("t38", &(the_tapinfo_struct.t38_dummy), NULL, + 0, voip_calls_dlg_reset, T38_packet, voip_calls_dlg_draw @@ -1030,6 +1033,7 @@ sip_calls_init_tap(void) { /* don't register tap listener, if we have it already */ error_string = register_tap_listener("sip", &(the_tapinfo_struct.sip_dummy), NULL, + 0, voip_calls_dlg_reset, SIPcalls_packet, voip_calls_dlg_draw @@ -1255,6 +1259,7 @@ isup_calls_init_tap(void) { error_string = register_tap_listener("isup", &(the_tapinfo_struct.isup_dummy), NULL, + 0, voip_calls_dlg_reset, isup_calls_packet, voip_calls_dlg_draw @@ -1320,6 +1325,7 @@ mtp3_calls_init_tap(void) { error_string = register_tap_listener("mtp3", &(the_tapinfo_struct.mtp3_dummy), NULL, + 0, voip_calls_dlg_reset, mtp3_calls_packet, voip_calls_dlg_draw @@ -1337,11 +1343,12 @@ mtp3_calls_init_tap(void) if(have_m3ua_tap_listener==FALSE) { error_string = register_tap_listener("m3ua", &(the_tapinfo_struct.mtp3_dummy), - NULL, - voip_calls_dlg_reset, - mtp3_calls_packet, - voip_calls_dlg_draw - ); + NULL, + 0, + voip_calls_dlg_reset, + mtp3_calls_packet, + voip_calls_dlg_draw + ); if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, @@ -1662,6 +1669,7 @@ q931_calls_init_tap(void) { error_string = register_tap_listener("q931", &(the_tapinfo_struct.q931_dummy), NULL, + 0, voip_calls_dlg_reset, q931_calls_packet, voip_calls_dlg_draw @@ -1957,6 +1965,7 @@ h225_calls_init_tap(void) { /* don't register tap listener, if we have it already */ error_string = register_tap_listener("h225", &(the_tapinfo_struct.h225_dummy), NULL, + 0, voip_calls_dlg_reset, H225calls_packet, voip_calls_dlg_draw @@ -2114,6 +2123,7 @@ h245dg_calls_init_tap(void) { /* don't register tap listener, if we have it already */ error_string = register_tap_listener("h245dg", &(the_tapinfo_struct.h245dg_dummy), NULL, + 0, voip_calls_dlg_reset, H245dgcalls_packet, voip_calls_dlg_draw @@ -2180,6 +2190,7 @@ sdp_calls_init_tap(void) { /* don't register tap listener, if we have it already */ error_string = register_tap_listener("sdp", &(the_tapinfo_struct.sdp_dummy), NULL, + 0, voip_calls_dlg_reset, SDPcalls_packet, voip_calls_dlg_draw @@ -2551,6 +2562,7 @@ mgcp_calls_init_tap(void) /* don't register tap listener, if we have it already */ /* we send an empty filter, to force a non null "tree" in the mgcp dissector */ error_string = register_tap_listener("mgcp", &(the_tapinfo_struct.mgcp_dummy), g_strdup(""), + 0, voip_calls_dlg_reset, MGCPcalls_packet, voip_calls_dlg_draw @@ -2680,6 +2692,7 @@ actrace_calls_init_tap(void) { /* don't register tap listener, if we have it already */ error_string = register_tap_listener("actrace", &(the_tapinfo_struct.actrace_dummy), NULL, + 0, voip_calls_dlg_reset, ACTRACEcalls_packet, voip_calls_dlg_draw @@ -2828,10 +2841,11 @@ void h248_calls_init_tap(void) if(have_megaco_tap_listener==FALSE) { error_string = register_tap_listener("megaco", &(the_tapinfo_struct.megaco_dummy), - NULL, - voip_calls_dlg_reset, - h248_calls_packet, - voip_calls_dlg_draw); + NULL, + 0, + voip_calls_dlg_reset, + h248_calls_packet, + voip_calls_dlg_draw); if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, @@ -2846,10 +2860,11 @@ void h248_calls_init_tap(void) if(have_h248_tap_listener==FALSE) { error_string = register_tap_listener("h248", &(the_tapinfo_struct.h248_dummy), - NULL, - voip_calls_dlg_reset, - h248_calls_packet, - voip_calls_dlg_draw); + NULL, + 0, + voip_calls_dlg_reset, + h248_calls_packet, + voip_calls_dlg_draw); if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, @@ -3013,10 +3028,11 @@ void sccp_calls_init_tap(void) if(have_sccp_tap_listener==FALSE) { error_string = register_tap_listener("sccp", &(the_tapinfo_struct.sccp_dummy), - NULL, - voip_calls_dlg_reset, - sccp_calls_packet, - voip_calls_dlg_draw); + NULL, + 0, + voip_calls_dlg_reset, + sccp_calls_packet, + voip_calls_dlg_draw); if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, @@ -3031,10 +3047,11 @@ void sccp_calls_init_tap(void) if(have_sua_tap_listener==FALSE) { error_string = register_tap_listener("sua", &(the_tapinfo_struct.sua_dummy), - NULL, - voip_calls_dlg_reset, - sua_calls_packet, - voip_calls_dlg_draw); + NULL, + 0, + voip_calls_dlg_reset, + sua_calls_packet, + voip_calls_dlg_draw); if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, @@ -3538,6 +3555,7 @@ unistim_calls_init_tap(void){ error_string = register_tap_listener("unistim", &(the_tapinfo_struct.unistim_dummy), NULL, + 0, voip_calls_dlg_reset, unistim_calls_packet, voip_calls_dlg_draw @@ -3701,6 +3719,7 @@ skinny_calls_init_tap(void) /* don't register tap listener, if we have it already */ /* we send an empty filter, to force a non null "tree" in the SKINNY dissector */ error_string = register_tap_listener("skinny", &(the_tapinfo_struct.skinny_dummy), g_strdup(""), + 0, voip_calls_dlg_reset, skinny_calls_packet, voip_calls_dlg_draw @@ -3880,6 +3899,7 @@ iax2_calls_init_tap(void) /* don't register tap listener, if we have it already */ /* we send an empty filter, to force a non null "tree" in the IAX2 dissector */ error_string = register_tap_listener("IAX2", &(the_tapinfo_struct.iax2_dummy), g_strdup(""), + 0, voip_calls_dlg_reset, iax2_calls_packet, voip_calls_dlg_draw @@ -3991,6 +4011,7 @@ VoIPcalls_init_tap(void) { error_string = register_tap_listener("voip", &(the_tapinfo_struct.voip_dummy), NULL, + 0, voip_calls_dlg_reset, VoIPcalls_packet, voip_calls_dlg_draw @@ -4054,6 +4075,7 @@ prot_calls_init_tap(void) { error_string = register_tap_listener("prot_", &(the_tapinfo_struct.prot__dummy), NULL, + 0, voip_calls_dlg_reset, prot__calls_packet, voip_calls_dlg_draw diff --git a/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c index f5d91bbc97..75ed4c5fdc 100644 --- a/gtk/voip_calls_dlg.c +++ b/gtk/voip_calls_dlg.c @@ -950,7 +950,7 @@ voip_calls_init_tap(const char *dummy _U_, void* userdata _U_) gtk_clist_append(GTK_CLIST(clist), data); /* Scan for VoIP calls calls (redissect all packets) */ - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(voip_calls_dlg->window); /* Tap listener will be removed and cleaned up in voip_calls_on_destroy */ } diff --git a/gtk/wlan_stat_dlg.c b/gtk/wlan_stat_dlg.c index 38e3feee58..fc1c43c82b 100644 --- a/gtk/wlan_stat_dlg.c +++ b/gtk/wlan_stat_dlg.c @@ -646,7 +646,7 @@ wlan_filter_toggle_dest(GtkWidget *widget, gpointer data) hs->use_dfilter = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (widget)); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(wlanstat_dlg_w->window); } @@ -1257,8 +1257,9 @@ wlanstat_dlg_create (void) wlan_create_popup_menu(hs); wlan_details_create_popup_menu(hs); - error_string=register_tap_listener ("wlan", hs, NULL, wlanstat_reset, - wlanstat_packet, wlanstat_draw); + error_string=register_tap_listener ("wlan", hs, NULL, 0, + wlanstat_reset, wlanstat_packet, + wlanstat_draw); if (error_string) { simple_dialog (ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free (error_string, TRUE); @@ -1313,7 +1314,7 @@ wlanstat_dlg_create (void) gtk_widget_show_all (wlanstat_dlg_w); window_present (wlanstat_dlg_w); - cf_retap_packets (&cfile, FALSE); + cf_retap_packets (&cfile); gdk_window_raise(wlanstat_dlg_w->window); } diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c index 53db5b2cac..4c3f1a01f5 100644 --- a/gtk/wsp_stat.c +++ b/gtk/wsp_stat.c @@ -385,6 +385,7 @@ gtk_wspstat_init(const char *optarg, void *userdata _U_) "wsp", sp, filter, + 0, wspstat_reset, wspstat_packet, wspstat_draw); @@ -411,7 +412,7 @@ gtk_wspstat_init(const char *optarg, void *userdata _U_) gtk_widget_show_all(sp->win); window_present(sp->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(sp->win->window); } -- cgit v1.2.3