diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-08-29 22:54:54 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-08-30 06:03:35 +0000 |
| commit | 6c065783c5698e699067ad2b50fd884ee8408ace (patch) | |
| tree | eda40007098a7beb97c3edecd9ceb02c2c31402f /epan/dissectors/packet-cbor.c | |
| parent | 7791c6f4ebc63850914abc692226cbeb1ffcbbc9 (diff) | |
| download | wireshark-6c065783c5698e699067ad2b50fd884ee8408ace.tar.gz | |
CBOR: fix definition of cbor.type.tag64 field
Bug: 11486
Change-Id: I070c8c397a41c0c8231720c611938d7282c03d19
Reviewed-on: https://code.wireshark.org/review/10310
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-cbor.c')
| -rw-r--r-- | epan/dissectors/packet-cbor.c | 36 |
1 files changed, 35 insertions, 1 deletions
diff --git a/epan/dissectors/packet-cbor.c b/epan/dissectors/packet-cbor.c index a8b02913ec..80b674ca76 100644 --- a/epan/dissectors/packet-cbor.c +++ b/epan/dissectors/packet-cbor.c @@ -115,6 +115,40 @@ static const value_string vals_tags[] = { { 0, NULL }, }; +static const val64_string vals64_tags[] = { + { 0, "Standard date/time string" }, + { 1, "Epoch-based date/time" }, + { 2, "Positive bignum" }, + { 3, "Negative bignum" }, + { 4, "Decimal fraction" }, + { 5, "Bigfloat" }, + { 21, "Expected conversion to base64url encoding" }, + { 22, "Expected conversion to base64 encoding" }, + { 23, "Expected conversion to base16 encoding" }, + { 24, "Encoded CBOR data item" }, + { 25, "reference the nth previously seen string" }, + { 26, "Serialised Perl object with classname and constructor arguments" }, + { 27, "Serialised language-independent object with type name and constructor arguments" }, + { 28, "mark value as (potentially) shared" }, + { 29, "reference nth marked value" }, + { 30, "Rational number" }, + { 32, "URI" }, + { 33, "base64url" }, + { 34, "base64" }, + { 35, "Regular expression" }, + { 36, "MIME message" }, + { 37, "Binary UUID" }, + { 38, "Language-tagged string" }, + { 39, "Identifier" }, + { 256, "mark value as having string references" }, + { 257, "Binary MIME message" }, + { 264, "Decimal fraction with arbitrary exponent" }, + { 265, "Bigfloat with arbitrary exponent" }, + { 22098, "hint that indicates an additional level of indirection" }, + { 55799, "Self-describe CBOR" }, + { 0, NULL }, +}; + static const value_string vals_simple_data[] = { { 20, "False" }, { 21, "True" }, @@ -760,7 +794,7 @@ proto_register_cbor(void) }, { &hf_cbor_type_tag64, { "Tag", "cbor.type.tag64", - FT_UINT64, BASE_DEC, VALS(vals_tags), 0x00, + FT_UINT64, BASE_DEC|BASE_VAL64_STRING, VALS64(vals64_tags), 0x00, NULL, HFILL } }, { &hf_cbor_type_simple_datas, |