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

From Kovarththanan Rajaratnam: 

Add "text" abbrev + tighten FT_FRAMENUM checks.

svn path=/trunk/; revision=29100
This commit is contained in:
Stig Bjørlykke 2009-07-15 08:56:12 +00:00
parent 0230d48489
commit 3ebdfb7c9c
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
epan/proto.c
View File

@ -325,7 +325,7 @@ proto_init(void (register_all_protocols_func)(register_cb cb, gpointer client_da
{
static hf_register_info hf[] = {
{ &hf_text_only,
{ "Text item", "", FT_NONE, BASE_NONE, NULL, 0x0,
{ "Text item", "text", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
};
@ -4058,7 +4058,6 @@ proto_item_fill_label(field_info *fi, gchar *label_str)
case FT_UINT16:
case FT_UINT24:
case FT_UINT32:
case FT_FRAMENUM:
if (hfinfo->bitmask) {
fill_label_bitfield(fi, label_str);
} else {
@ -4066,6 +4065,10 @@ proto_item_fill_label(field_info *fi, gchar *label_str)
}
break;
case FT_FRAMENUM:
fill_label_uint(fi, label_str);
break;
case FT_UINT64:
fill_label_uint64(fi, label_str);
break;
@ -5632,7 +5635,6 @@ construct_match_selected_string(field_info *finfo, epan_dissect_t *edt,
case FT_UINT16:
case FT_UINT24:
case FT_UINT32:
case FT_FRAMENUM:
if (filter != NULL) {
format = hfinfo_numeric_format(hfinfo);
if(is_signed_num) {
@ -5647,6 +5649,16 @@ construct_match_selected_string(field_info *finfo, epan_dissect_t *edt,
}
break;
case FT_FRAMENUM:
DISSECTOR_ASSERT(!is_signed_num);
if (filter != NULL) {
format = hfinfo_numeric_format(hfinfo);
*filter = ep_strdup_printf(format,
hfinfo->abbrev,
fvalue_get_uinteger(&finfo->value));
}
break;
case FT_INT64:
case FT_UINT64:
if (filter != NULL) {