diff options
author | Evan Huus <eapache@gmail.com> | 2013-07-26 23:51:00 +0000 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2013-07-26 23:51:00 +0000 |
commit | 5ede3bcde08bb520b712f329f95b3a60eb64a16f (patch) | |
tree | 3c1084eba21604f26a0b2ccadee056d2a7d9429f /rawshark.c | |
parent | d22919194acb88b4ddbcc26c1711bee4d8132057 (diff) |
Follow-up to r50935: add support for 64-bit value strings in more places that
need it, I think this is all of them.
svn path=/trunk/; revision=50941
Diffstat (limited to 'rawshark.c')
-rw-r--r-- | rawshark.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/rawshark.c b/rawshark.c index c06855a541..bc9a14e1dc 100644 --- a/rawshark.c +++ b/rawshark.c @@ -1276,6 +1276,8 @@ static gboolean print_field_value(field_info *finfo, int cmd_line_index) string_fmt_t *sf; guint32 uvalue; gint32 svalue; + guint64 uvalue64; + gint64 svalue64; const true_false_string *tfstring = &tfs_true_false; hfinfo = finfo->hfinfo; @@ -1347,6 +1349,13 @@ static gboolean print_field_value(field_info *finfo, int cmd_line_index) g_string_append(label_s, val_to_str(svalue, cVALS(hfinfo->strings), "Unknown")); } break; + case FT_INT64: + DISSECTOR_ASSERT(!hfinfo->bitmask); + svalue64 = (gint64)fvalue_get_integer64(&finfo->value); + if (hfinfo->display & BASE_VAL64_STRING) { + g_string_append(label_s, val64_to_str(svalue64, (const val64_string *)(hfinfo->strings), "Unknown")); + } + break; case FT_UINT8: case FT_UINT16: case FT_UINT24: @@ -1360,6 +1369,13 @@ static gboolean print_field_value(field_info *finfo, int cmd_line_index) g_string_append(label_s, val_to_str(uvalue, cVALS(hfinfo->strings), "Unknown")); } break; + case FT_UINT64: + DISSECTOR_ASSERT(!hfinfo->bitmask); + uvalue64 = fvalue_get_integer64(&finfo->value); + if (hfinfo->display & BASE_VAL64_STRING) { + g_string_append(label_s, val64_to_str(uvalue64, (const val64_string *)(hfinfo->strings), "Unknown")); + } + break; default: break; } |