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

Added functionality to highlight the FCS bytes in Ethernet and IEEE 802.11 

packets in the Packet Details View.

This "appendix" bytes are not copied with the Copy functions or in the
Export Selected Packet Bytes.

svn path=/trunk/; revision=22887
This commit is contained in:
Stig Bjørlykke 2007-09-17 12:12:02 +00:00
parent 8f19616ae8
commit 72af3183ab
6 changed files with 65 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
epan/dissectors/packet-eth.c
View File

@ -428,6 +428,7 @@ add_ethernet_trailer(proto_tree *fh_tree, int trailer_id, tvbuff_t *tvb,
"Frame check sequence: 0x%08x [incorrect, should be 0x%08x]",
sent_fcs, fcs);
}
proto_tree_set_appendix(fh_tree, tvb, tvb_length(tvb) - 4, 4);
}
}
}

3
epan/dissectors/packet-ieee80211.c
View File

@ -6081,6 +6081,8 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo,
"Frame check sequence: 0x%08x [incorrect, should be 0x%08x]",
sent_fcs, fcs);
proto_tree_set_appendix(hdr_tree, tvb, hdr_len + len, 4);
fcs_tree = proto_item_add_subtree(fcs_item, ett_fcs);
fcs_item = proto_tree_add_boolean(fcs_tree,
@ -6327,6 +6329,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo,
#ifdef HAVE_AIRPDCAP
}
#endif
proto_item_set_len (ti, hdr_len + 8);
wep_tree = proto_item_add_subtree (extiv_fields, ett_wep_parameters);

19
epan/proto.c
View File

@ -3069,6 +3069,9 @@ new_field_info(proto_tree *tree, header_field_info *hfinfo, tvbuff_t *tvb,
/* add the data source tvbuff */
fi->ds_tvb=tvb?TVB_GET_DS_TVB(tvb):NULL;
fi->appendix_start = 0;
fi->appendix_length = 0;
return fi;
}
@ -3412,6 +3415,22 @@ proto_tree_move_item(proto_tree *tree, proto_item *fixed_item, proto_item *item_
}
}
void
proto_tree_set_appendix(proto_tree *tree, tvbuff_t *tvb, gint start, gint length)
{
field_info *fi;
if (tree == NULL)
return;
fi = tree->finfo;
start += TVB_RAW_OFFSET(tvb);
DISSECTOR_ASSERT(start >= 0);
DISSECTOR_ASSERT(length >= 0);
fi->appendix_start = start;
fi->appendix_length = length;
}
int
proto_register_protocol(const char *name, const char *short_name, const char *filter_name)

8
epan/proto.h
View File

@ -213,6 +213,8 @@ typedef struct field_info {
header_field_info *hfinfo; /**< pointer to registered field information */
gint start; /**< current start of data in field_info.ds_tvb */
gint length; /**< current data length of item in field_info.ds_tvb */
gint appendix_start; /**< start of appendix data */
gint appendix_length; /**< length of appendix data */
gint tree_type; /**< one of ETT_ or -1 */
item_label_t *rep; /**< string for GUI tree */
int flags; /**< bitfield like FI_GENERATED, ... */
@ -468,6 +470,12 @@ extern proto_tree* proto_tree_get_root(proto_tree *tree);
extern void proto_tree_move_item(proto_tree *tree, proto_item *fixed_item, proto_item *item_to_move);
/** Set start and length of an appendix for a proto_tree.
@param tree the tree to set the appendix start and length
@param start the start offset of the appendix
@param length the length of the appendix */
extern void proto_tree_set_appendix(proto_tree *tree, tvbuff_t *tvb, gint start, gint length);
/** Add an item to a proto_tree, using the text label registered to that item.
The item is extracted from the tvbuff handed to it.

8
gtk/main.c
View File

@ -767,6 +767,7 @@ tree_view_selection_changed_cb(GtkTreeSelection *sel, gpointer user_data _U_)
guint length = 0, byte_len;
GtkWidget *byte_view;
const guint8 *byte_data;
gint finfo_length;
#if GTK_MAJOR_VERSION >= 2
GtkTreeModel *model;
GtkTreeIter iter;
@ -817,12 +818,13 @@ tree_view_selection_changed_cb(GtkTreeSelection *sel, gpointer user_data _U_)
} else {
length = strlen(finfo->hfinfo->name);
}
if (finfo->length == 0) {
finfo_length = finfo->length + finfo->appendix_length;
if (finfo_length == 0) {
len_str[0] = '\0';
} else if (finfo->length == 1) {
} else if (finfo_length == 1) {
strcpy (len_str, ", 1 byte");
} else {
g_snprintf (len_str, sizeof len_str, ", %d bytes", finfo->length);
g_snprintf (len_str, sizeof len_str, ", %d bytes", finfo_length);
}
statusbar_pop_field_msg(); /* get rid of current help msg */
if (length) {

48
gtk/proto_draw.c
View File

@ -90,6 +90,8 @@
#define E_BYTE_VIEW_TVBUFF_KEY "byte_view_tvbuff"
#define E_BYTE_VIEW_START_KEY "byte_view_start"
#define E_BYTE_VIEW_END_KEY "byte_view_end"
#define E_BYTE_VIEW_APP_START_KEY "byte_view_app_start"
#define E_BYTE_VIEW_APP_END_KEY "byte_view_app_end"
#define E_BYTE_VIEW_ENCODE_KEY "byte_view_encode"
@ -1151,7 +1153,7 @@ void savehex_cb(GtkWidget * w _U_, gpointer data _U_)
*/
static void
packet_hex_print_common(GtkWidget *bv, const guint8 *pd, int len, int bstart,
int bend, int encoding)
int bend, int astart, int aend, int encoding)
{
int i = 0, j, k, cur;
guchar line[MAX_LINE_LEN + 1];
@ -1288,7 +1290,7 @@ packet_hex_print_common(GtkWidget *bv, const guint8 *pd, int len, int bstart,
if (prefs.gui_hex_dump_highlight_style) {
gtk_text_insert(bv_text, user_font_get_regular(), &BLACK, &WHITE, line, -1);
/* Do we start in reverse? */
reverse = i >= bstart && i < bend;
reverse = (i >= bstart && i < bend) || (i >= astart && i < aend);
fg = reverse ? &WHITE : &BLACK;
bg = reverse ? &BLACK : &WHITE;
j = i;
@ -1303,7 +1305,7 @@ packet_hex_print_common(GtkWidget *bv, const guint8 *pd, int len, int bstart,
line[cur++] = ' '; line[cur++] = ' ';
}
i++;
newreverse = i >= bstart && i < bend;
newreverse = (i >= bstart && i < bend) || (i >= astart && i < aend);
/* Have we gone from reverse to plain? */
if (reverse && (reverse != newreverse)) {
gtk_text_insert(bv_text, user_font_get_regular(), fg, bg, line, cur);
@ -1339,7 +1341,7 @@ packet_hex_print_common(GtkWidget *bv, const guint8 *pd, int len, int bstart,
/* Print the ASCII bit */
i = j;
/* Do we start in reverse? */
reverse = i >= bstart && i < bend;
reverse = (i >= bstart && i < bend) || (i >= astart && i < aend);
fg = reverse ? &WHITE : &BLACK;
bg = reverse ? &BLACK : &WHITE;
while (i < k) {
@ -1358,7 +1360,7 @@ packet_hex_print_common(GtkWidget *bv, const guint8 *pd, int len, int bstart,
line[cur++] = ' ';
}
i++;
newreverse = i >= bstart && i < bend;
newreverse = (i >= bstart && i < bend) || (i >= astart && i < aend);
/* Have we gone from reverse to plain? */
if (reverse && (reverse != newreverse)) {
gtk_text_insert(bv_text, user_font_get_regular(), fg, bg, line, cur);
@ -1391,7 +1393,7 @@ packet_hex_print_common(GtkWidget *bv, const guint8 *pd, int len, int bstart,
else {
gtk_text_insert(bv_text, user_font_get_regular(), NULL, NULL, line, -1);
/* Do we start in bold? */
cur_font = (i >= bstart && i < bend) ? user_font_get_bold() : user_font_get_regular();
cur_font = ((i >= bstart && i < bend) || (i >= astart && i < aend)) ? user_font_get_bold() : user_font_get_regular();
j = i;
k = i + BYTE_VIEW_WIDTH;
cur = 0;
@ -1408,7 +1410,7 @@ packet_hex_print_common(GtkWidget *bv, const guint8 *pd, int len, int bstart,
/* insert a space every BYTE_VIEW_SEP bytes */
if( ( i % BYTE_VIEW_SEP ) == 0 ) line[cur++] = ' ';
/* Did we cross a bold/plain boundary? */
new_font = (i >= bstart && i < bend) ? user_font_get_bold() : user_font_get_regular();
new_font = ((i >= bstart && i < bend) || (i >= astart && i < aend)) ? user_font_get_bold() : user_font_get_regular();
if (cur_font != new_font) {
gtk_text_insert(bv_text, cur_font, NULL, NULL, line, cur);
cur_font = new_font;
@ -1421,7 +1423,7 @@ packet_hex_print_common(GtkWidget *bv, const guint8 *pd, int len, int bstart,
cur = 0;
i = j;
/* Print the ASCII bit */
cur_font = (i >= bstart && i < bend) ? user_font_get_bold() : user_font_get_regular();
cur_font = ((i >= bstart && i < bend) || (i >= astart && i < aend)) ? user_font_get_bold() : user_font_get_regular();
while (i < k) {
if (i < len) {
if (encoding == CHAR_ASCII) {
@ -1441,7 +1443,7 @@ packet_hex_print_common(GtkWidget *bv, const guint8 *pd, int len, int bstart,
/* insert a space every BYTE_VIEW_SEP bytes */
if( ( i % BYTE_VIEW_SEP ) == 0 ) line[cur++] = ' ';
/* Did we cross a bold/plain boundary? */
new_font = (i >= bstart && i < bend) ? user_font_get_bold() : user_font_get_regular();
new_font = ((i >= bstart && i < bend) || (i >= astart && i < aend)) ? user_font_get_bold() : user_font_get_regular();
if (cur_font != new_font) {
gtk_text_insert(bv_text, cur_font, NULL, NULL, line, cur);
cur_font = new_font;
@ -1461,7 +1463,7 @@ packet_hex_print_common(GtkWidget *bv, const guint8 *pd, int len, int bstart,
gtk_text_buffer_insert_with_tags_by_name(buf, &iter, line, -1,
"plain", NULL);
/* Do we start in reverse? */
reverse = i >= bstart && i < bend;
reverse = (i >= bstart && i < bend) || (i >= astart && i < aend);
j = i;
k = i + BYTE_VIEW_WIDTH;
cur = 0;
@ -1474,7 +1476,7 @@ packet_hex_print_common(GtkWidget *bv, const guint8 *pd, int len, int bstart,
line[cur++] = ' '; line[cur++] = ' ';
}
i++;
newreverse = i >= bstart && i < bend;
newreverse = (i >= bstart && i < bend) || (i >= astart && i < aend);
/* Have we gone from reverse to plain? */
if (reverse && (reverse != newreverse)) {
gtk_text_buffer_insert_with_tags_by_name(buf, &iter, line, cur,
@ -1512,7 +1514,7 @@ packet_hex_print_common(GtkWidget *bv, const guint8 *pd, int len, int bstart,
/* Print the ASCII bit */
i = j;
/* Do we start in reverse? */
reverse = i >= bstart && i < bend;
reverse = (i >= bstart && i < bend) || (i >= astart && i < aend);
while (i < k) {
if (i < len) {
if (encoding == CHAR_ASCII) {
@ -1529,7 +1531,7 @@ packet_hex_print_common(GtkWidget *bv, const guint8 *pd, int len, int bstart,
line[cur++] = ' ';
}
i++;
newreverse = i >= bstart && i < bend;
newreverse = (i >= bstart && i < bend) || (i >= astart && i < aend);
/* Have we gone from reverse to plain? */
if (reverse && (reverse != newreverse)) {
convline = g_locale_to_utf8(line, cur, NULL, &newsize, NULL);
@ -1600,27 +1602,32 @@ packet_hex_print(GtkWidget *bv, const guint8 *pd, frame_data *fd,
/* do the initial printing and save the information needed */
/* to redraw the display if preferences change. */
int bstart, bend = -1, blen;
int bstart = -1, bend = -1, blen = -1;
int astart = -1, aend = -1, alen = -1;
if (finfo != NULL) {
bstart = finfo->start;
blen = finfo->length;
} else {
bstart = -1;
blen = -1;
astart = finfo->appendix_start;
alen = finfo->appendix_length;
}
if (bstart >= 0 && blen >= 0) {
bend = bstart + blen;
}
if (astart >= 0 && alen >= 0) {
aend = astart + alen;
}
/* save the information needed to redraw the text */
/* should we save the fd & finfo pointers instead ?? */
OBJECT_SET_DATA(bv, E_BYTE_VIEW_START_KEY, GINT_TO_POINTER(bend));
OBJECT_SET_DATA(bv, E_BYTE_VIEW_END_KEY, GINT_TO_POINTER(bstart));
OBJECT_SET_DATA(bv, E_BYTE_VIEW_APP_START_KEY, GINT_TO_POINTER(aend));
OBJECT_SET_DATA(bv, E_BYTE_VIEW_APP_END_KEY, GINT_TO_POINTER(astart));
OBJECT_SET_DATA(bv, E_BYTE_VIEW_ENCODE_KEY,
GUINT_TO_POINTER((guint)fd->flags.encoding));
packet_hex_print_common(bv, pd, len, bstart, bend, fd->flags.encoding);
packet_hex_print_common(bv, pd, len, bstart, bend, astart, aend, fd->flags.encoding);
}
/*
@ -1631,16 +1638,19 @@ void
packet_hex_reprint(GtkWidget *bv)
{
int start, end, encoding;
int astart, aend;
const guint8 *data;
guint len;
start = GPOINTER_TO_INT(OBJECT_GET_DATA(bv, E_BYTE_VIEW_START_KEY));
end = GPOINTER_TO_INT(OBJECT_GET_DATA(bv, E_BYTE_VIEW_END_KEY));
astart = GPOINTER_TO_INT(OBJECT_GET_DATA(bv, E_BYTE_VIEW_APP_START_KEY));
aend = GPOINTER_TO_INT(OBJECT_GET_DATA(bv, E_BYTE_VIEW_APP_END_KEY));
data = get_byte_view_data_and_length(bv, &len);
g_assert(data != NULL);
encoding = GPOINTER_TO_INT(OBJECT_GET_DATA(bv, E_BYTE_VIEW_ENCODE_KEY));
packet_hex_print_common(bv, data, len, start, end, encoding);
packet_hex_print_common(bv, data, len, start, end, astart, aend, encoding);
}
/* List of all protocol tree widgets, so we can globally set the selection