osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

for the Ethernet conversation filter, don't use ethertype but the data link address type being Ethernet. If the ethertype field is a length (0-1500), it will contain 0 - and the filter wouldn't work that way 

svn path=/trunk/; revision=22389
This commit is contained in:
Ulf Lamping 2007-07-23 20:18:01 +00:00
parent 87ee5c1a52
commit 6cae0b2193
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/menu.c
View File

@ -342,7 +342,9 @@ conversation_cb(GtkWidget * w, gpointer data _U_, int action)
break;
case(CONV_ETHER):
/* XXX - is this the right way to check for Ethernet? */
if (cfile.edt->pi.ethertype == 0x0) {
/* check for the data link address type */
/* (ethertype will be 0 when used as length field) */
if (cfile.edt->pi.dl_src.type != 1) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
"Error filtering conversation. Please make\n"
"sure you have a Ethernet packet selected.");
@ -2408,7 +2410,7 @@ set_menus_for_selected_packet(capture_file *cf)
set_menu_sensitivity(tree_view_menu_factory, "/Follow SSL Stream",
cf->current_frame != NULL ? is_ssl : FALSE);
set_menu_sensitivity(packet_list_menu_factory, "/Conversation Filter/Ethernet",
cf->current_frame != NULL ? (cf->edt->pi.ethertype != 0) : FALSE);
cf->current_frame != NULL ? (cf->edt->pi.dl_src.type == 1) : FALSE);
set_menu_sensitivity(packet_list_menu_factory, "/Conversation Filter/IP",
cf->current_frame != NULL ? (cf->edt->pi.ethertype == 0x800) : FALSE);
set_menu_sensitivity(packet_list_menu_factory, "/Conversation Filter/TCP",