diff options
| author | JC Wren <jcwren@jcwren.com> | 2014-12-17 15:19:20 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-02-21 16:57:52 +0000 |
| commit | e2bcee6ac442e6eb66dd3b09186070de4acb0010 (patch) | |
| tree | e38e70de1a7160c6833601584774f12936559568 /rawshark.c | |
| parent | 13531d36fb91f3abbd6e62add83faf863e62d974 (diff) | |
| download | wireshark-e2bcee6ac442e6eb66dd3b09186070de4acb0010.tar.gz | |
Make FT_{U}INT64 behave more like FT_{U}INT32, add support for FT_{U}INT{40,48,56}
Change-Id: I57354c309ecf3a0c8f0c7cff485638027f30bb19
Reviewed-on: https://code.wireshark.org/review/5813
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'rawshark.c')
| -rw-r--r-- | rawshark.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/rawshark.c b/rawshark.c index 6c901fcb57..52cc79f022 100644 --- a/rawshark.c +++ b/rawshark.c @@ -1348,9 +1348,12 @@ static gboolean print_field_value(field_info *finfo, int cmd_line_index) g_string_append(label_s, val_to_str_const(svalue, cVALS(hfinfo->strings), "Unknown")); } break; + case FT_INT40: /* XXX: Shouldn't these be as smart as FT_INT{8,16,24,32}? */ + case FT_INT48: + case FT_INT56: case FT_INT64: DISSECTOR_ASSERT(!hfinfo->bitmask); - svalue64 = (gint64)fvalue_get_integer64(&finfo->value); + svalue64 = (gint64)fvalue_get_sinteger64(&finfo->value); if (hfinfo->display & BASE_VAL64_STRING) { g_string_append(label_s, val64_to_str_const(svalue64, (const val64_string *)(hfinfo->strings), "Unknown")); } @@ -1359,6 +1362,7 @@ static gboolean print_field_value(field_info *finfo, int cmd_line_index) case FT_UINT16: case FT_UINT24: case FT_UINT32: + DISSECTOR_ASSERT(!hfinfo->bitmask); uvalue = fvalue_get_uinteger(&finfo->value); if (!hfinfo->bitmask && hfinfo->display & BASE_RANGE_STRING) { g_string_append(label_s, rval_to_str_const(uvalue, RVALS(hfinfo->strings), "Unknown")); @@ -1368,9 +1372,12 @@ static gboolean print_field_value(field_info *finfo, int cmd_line_index) g_string_append(label_s, val_to_str_const(uvalue, cVALS(hfinfo->strings), "Unknown")); } break; + case FT_UINT40: /* XXX: Shouldn't these be as smart as FT_INT{8,16,24,32}? */ + case FT_UINT48: + case FT_UINT56: case FT_UINT64: DISSECTOR_ASSERT(!hfinfo->bitmask); - uvalue64 = fvalue_get_integer64(&finfo->value); + uvalue64 = fvalue_get_uinteger64(&finfo->value); if (hfinfo->display & BASE_VAL64_STRING) { g_string_append(label_s, val64_to_str_const(uvalue64, (const val64_string *)(hfinfo->strings), "Unknown")); } |