1berry/wireshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the "unmarking a packet matching a color filter does not apply the color

Browse Source 
filter's colors" bug, by storing the pointer to the matching color_filter_t
structure in the frame_data structure.

Replace "frame" and "frames" by "packet" and "packets" in many places.

svn path=/trunk/; revision=9607
This commit is contained in:
Olivier Biot 2004-01-09 02:57:54 +00:00
parent eff17e272d
commit f5f60f1ba3
3 changed files with 63 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
epan/frame_data.h
View File

@ -1,7 +1,7 @@
/* frame_data.h
* Definitions for frame_data structures and routines
*
* $Id: frame_data.h,v 1.10 2003/09/12 02:48:22 sahlberg Exp $
* $Id: frame_data.h,v 1.11 2004/01/09 02:57:29 obiot Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -25,9 +25,22 @@
#ifndef __FRAME_DATA_H__
#define __FRAME_DATA_H__
//#include "color.h"
#include "column_info.h"
#include "tvbuff.h"
#if 0
/* Defined in color.h */
#ifndef __COLOR_H__
typedef struct _color_t /* {
guint32 pixel;
guint16 red;
guint16 green;
guint16 blue;
} */ color_t;
#endif
#endif
/* XXX - some of this stuff is used only while a packet is being dissected;
should we keep that stuff in the "packet_info" structure, instead, to
save memory? */
@ -54,6 +67,7 @@ typedef struct _frame_data {
unsigned int marked : 1; /* 1 = marked by user, 0 = normal */
unsigned int ref_time : 1; /* 1 = marked as a reference time frame, 0 = normal */
} flags;
void *color_filter; /* Per-packet matching color_filter_t object */
} frame_data;
/*

57
file.c
View File

@ -1,7 +1,7 @@
/* file.c
* File I/O routines
*
* $Id: file.c,v 1.334 2004/01/02 21:47:06 ulfl Exp $
* $Id: file.c,v 1.335 2004/01/09 02:57:07 obiot Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -830,11 +830,24 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf,
row = packet_list_append(cf->cinfo.col_data, fdata);
if (fdata->flags.marked) {
packet_list_set_colors(row, &prefs.gui_marked_fg, &prefs.gui_marked_bg);
} else if (filter_list != NULL && (args.colorf != NULL)) {
packet_list_set_colors(row, &args.colorf->fg_color,
&args.colorf->bg_color);
/* If the packet matches a color filter,
* store matching color_filter_t object in frame data. */
if (filter_list != NULL && (args.colorf != NULL)) {
/* add the matching colorfilter to the frame data */
fdata->color_filter = args.colorf;
/* If packet is marked, use colors from preferences */
if (fdata->flags.marked) {
packet_list_set_colors(row, &prefs.gui_marked_fg, &prefs.gui_marked_bg);
} else /* if (filter_list != NULL && (args.colorf != NULL)) */ {
packet_list_set_colors(row, &(args.colorf->fg_color),
&(args.colorf->bg_color));
}
} else {
/* No color filter match */
fdata->color_filter = NULL;
if (fdata->flags.marked) {
packet_list_set_colors(row, &prefs.gui_marked_fg, &prefs.gui_marked_bg);
}
}
/* Set the time of the previous displayed frame to the time of this
@ -960,19 +973,19 @@ filter_packets(capture_file *cf, gchar *dftext)
void
colorize_packets(capture_file *cf)
{
rescan_packets(cf, "Colorizing", "all frames", FALSE, FALSE);
rescan_packets(cf, "Colorizing", "all packets", FALSE, FALSE);
}
void
reftime_packets(capture_file *cf)
{
rescan_packets(cf, "Updating Reftime", "all frames", FALSE, FALSE);
rescan_packets(cf, "Updating Reftime", "all packets", FALSE, FALSE);
}
void
redissect_packets(capture_file *cf)
{
rescan_packets(cf, "Reprocessing", "all frames", TRUE, TRUE);
rescan_packets(cf, "Reprocessing", "all packets", TRUE, TRUE);
}
/* Rescan the list of packets, reconstructing the CList.
@ -1351,12 +1364,12 @@ print_packets(capture_file *cf, print_args_t *print_args)
if (progbar == NULL)
/* Create the progress bar if necessary */
progbar = delayed_create_progress_dlg("Printing", "selected frames", "Stop", &stop_flag,
progbar = delayed_create_progress_dlg("Printing", "selected packets", "Stop", &stop_flag,
&start_time, prog_val);
if (progbar != NULL) {
g_snprintf(status_str, sizeof(status_str),
"%4u of %u frames", count, cf->count);
"%4u of %u packets", count, cf->count);
update_progress_dlg(progbar, prog_val, status_str);
}
@ -1562,7 +1575,7 @@ change_time_formats(capture_file *cf)
if (progbar != NULL) {
g_snprintf(status_str, sizeof(status_str),
"%4u of %u frames", count, cf->count);
"%4u of %u packets", count, cf->count);
update_progress_dlg(progbar, prog_val, status_str);
}
@ -2005,7 +2018,7 @@ find_packet(capture_file *cf,
if (progbar != NULL) {
g_snprintf(status_str, sizeof(status_str),
"%4u of %u frames", count, cf->count);
"%4u of %u packets", count, cf->count);
update_progress_dlg(progbar, prog_val, status_str);
}
@ -2089,27 +2102,27 @@ goto_frame(capture_file *cf, guint fnumber)
;
if (fdata == NULL) {
/* we didn't find a frame with that frame number */
/* we didn't find a packet with that packet number */
simple_dialog(ESD_TYPE_CRIT, NULL,
"There is no frame with that frame number.");
return FALSE; /* we failed to go to that frame */
"There is no packet with that packet number.");
return FALSE; /* we failed to go to that packet */
}
if (!fdata->flags.passed_dfilter) {
/* that frame currently isn't displayed */
/* XXX - add it to the set of displayed frames? */
/* that packet currently isn't displayed */
/* XXX - add it to the set of displayed packets? */
simple_dialog(ESD_TYPE_CRIT, NULL,
"That frame is not currently being displayed.");
return FALSE; /* we failed to go to that frame */
"That packet is not currently being displayed.");
return FALSE; /* we failed to go to that packet */
}
/* We found that frame, and it's currently being displayed.
/* We found that packet, and it's currently being displayed.
Find what row it's in. */
row = packet_list_find_row_from_data(fdata);
g_assert(row != -1);
/* Select that row, make it the focus row, and make it visible. */
packet_list_set_selected_row(row);
return TRUE; /* we got to that frame */
return TRUE; /* we got to that packet */
}
/* Select the packet on a given row. */

17
gtk/main.c
View File

@ -1,6 +1,6 @@
/* main.c
*
* $Id: main.c,v 1.349 2004/01/08 20:39:51 guy Exp $
* $Id: main.c,v 1.350 2004/01/09 02:57:54 obiot Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -932,12 +932,21 @@ set_frame_mark(gboolean set, frame_data *frame, gint row) {
mark_frame(&cfile, frame);
color_t_to_gdkcolor(&fg, &prefs.gui_marked_fg);
color_t_to_gdkcolor(&bg, &prefs.gui_marked_bg);
gtk_clist_set_background(GTK_CLIST(packet_list), row, &bg);
gtk_clist_set_foreground(GTK_CLIST(packet_list), row, &fg);
gtk_clist_set_background(GTK_CLIST(packet_list), row, &bg);
} else {
color_filter_t *cfilter = frame->color_filter;
unmark_frame(&cfile, frame);
gtk_clist_set_background(GTK_CLIST(packet_list), row, NULL);
gtk_clist_set_foreground(GTK_CLIST(packet_list), row, NULL);
/* Restore the color from the matching color filter if any */
if (cfilter) { /* The packet matches a color filter */
color_t_to_gdkcolor(&fg, &cfilter->fg_color);
color_t_to_gdkcolor(&bg, &cfilter->bg_color);
gtk_clist_set_foreground(GTK_CLIST(packet_list), row, &fg);
gtk_clist_set_background(GTK_CLIST(packet_list), row, &bg);
} else { /* No color filter match */
gtk_clist_set_foreground(GTK_CLIST(packet_list), row, NULL);
gtk_clist_set_background(GTK_CLIST(packet_list), row, NULL);
}
}
file_set_save_marked_sensitive();
}