diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-03 21:56:16 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-04 16:32:03 +0000 |
| commit | 553da374461efb87436dbbed7d319d252d4fe2e6 (patch) | |
| tree | 1f581449dc0a022f8feb4f2088aec6fb47fd023f /epan/ftypes/ftypes.c | |
| parent | 2085bbec9d0e4661af77a6e9530cffd5df15ecc8 (diff) | |
| download | wireshark-553da374461efb87436dbbed7d319d252d4fe2e6.tar.gz | |
Create BASE_DOT, BASE_DASH, and BASE_SEMICOLON types for the FT_BYTES field type.
These "bases" will put a ".", "-", or ":" respectively between hexidecimal bytes in the field in packet view and display filter. FT_BYTES with BASE_NONE will have no separator in the packet view, but continue to have the ':' as a separator in the display filter.
Converted the "string" hf_ entries that used tvb_fc_to_str as a string to use proto_tree_add_item with FT_BYTES/BASE_DOT type.
Converted applicable tvb_bytes_to_ep_str_punct() calls to use the new BASE values.
Change-Id: I2442185bb314d04a3ff2ba57883652ecd738b5f9
Reviewed-on: https://code.wireshark.org/review/6098
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/ftypes/ftypes.c')
| -rw-r--r-- | epan/ftypes/ftypes.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/ftypes/ftypes.c b/epan/ftypes/ftypes.c index 49ef2ce19a..a06594392c 100644 --- a/epan/ftypes/ftypes.c +++ b/epan/ftypes/ftypes.c @@ -348,14 +348,14 @@ fvalue_length(fvalue_t *fv) } int -fvalue_string_repr_len(fvalue_t *fv, ftrepr_t rtype) +fvalue_string_repr_len(fvalue_t *fv, ftrepr_t rtype, int field_display) { g_assert(fv->ftype->len_string_repr); - return fv->ftype->len_string_repr(fv, rtype); + return fv->ftype->len_string_repr(fv, rtype, field_display); } char * -fvalue_to_string_repr(fvalue_t *fv, ftrepr_t rtype, char *buf) +fvalue_to_string_repr(fvalue_t *fv, ftrepr_t rtype, int field_display, char *buf) { if (fv->ftype->val_to_string_repr == NULL) { /* no value-to-string-representation function, so the value cannot be represented */ @@ -363,14 +363,14 @@ fvalue_to_string_repr(fvalue_t *fv, ftrepr_t rtype, char *buf) } if (!buf) { int len; - if ((len = fvalue_string_repr_len(fv, rtype)) >= 0) { + if ((len = fvalue_string_repr_len(fv, rtype, field_display)) >= 0) { buf = (char *)g_malloc0(len + 1); } else { /* the value cannot be represented in the given representation type (rtype) */ return NULL; } } - fv->ftype->val_to_string_repr(fv, rtype, buf); + fv->ftype->val_to_string_repr(fv, rtype, field_display, buf); return buf; } |