osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Enable the tap feature for ethereal as well. (will only update in real time for the gtk2 port though) 

svn path=/trunk/; revision=6182
This commit is contained in:
Ronnie Sahlberg 2002-09-04 22:15:39 +00:00
parent 159eb51139
commit 756b43584a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
file.c
View File

@ -1,7 +1,7 @@
/* file.c /* file.c
* File I/O routines * File I/O routines
* *
* $Id: file.c,v 1.288 2002/08/31 09:55:18 oabad Exp $ * $Id: file.c,v 1.289 2002/09/04 22:15:39 sahlberg Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com> * By Gerald Combs <gerald@ethereal.com>
@ -101,6 +101,7 @@
#include "gtk2/colors.h" #include "gtk2/colors.h"
#endif #endif
#include <epan/epan_dissect.h> #include <epan/epan_dissect.h>
#include "tap.h"
extern GtkWidget *packet_list, *byte_nb_ptr, *tree_view; extern GtkWidget *packet_list, *byte_nb_ptr, *tree_view;
@ -340,6 +341,7 @@ read_cap_file(capture_file *cf, int *err)
GTimeVal start_time; GTimeVal start_time;
gchar status_str[100]; gchar status_str[100];
reset_tap_listeners();
name_ptr = get_basename(cf->filename); name_ptr = get_basename(cf->filename);
msg_len = strlen(name_ptr) + strlen(load_fmt) + 2; msg_len = strlen(name_ptr) + strlen(load_fmt) + 2;
@ -685,6 +687,7 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf,
firstusec = fdata->abs_usecs; firstusec = fdata->abs_usecs;
} }
tap_queue_init(pseudo_header, buf, fdata);
/* If either /* If either
we have a display filter and are re-applying it; we have a display filter and are re-applying it;
@ -707,7 +710,7 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf,
filter_list_prime_edt(edt); filter_list_prime_edt(edt);
} }
epan_dissect_run(edt, pseudo_header, buf, fdata, &cf->cinfo); epan_dissect_run(edt, pseudo_header, buf, fdata, &cf->cinfo);
tap_push_tapped_queue();
/* If we have a display filter, apply it if we're refiltering, otherwise /* If we have a display filter, apply it if we're refiltering, otherwise
leave the "passed_dfilter" flag alone. leave the "passed_dfilter" flag alone.
@ -958,6 +961,7 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item,
GTimeVal start_time; GTimeVal start_time;
gchar status_str[100]; gchar status_str[100];
reset_tap_listeners();
/* Which frame, if any, is the currently selected frame? /* Which frame, if any, is the currently selected frame?
XXX - should the selected frame or the focus frame be the "current" XXX - should the selected frame or the focus frame be the "current"
frame, that frame being the one from which "Find Frame" searches frame, that frame being the one from which "Find Frame" searches