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

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>
This commit is contained in:
Pascal Quantin 2015-08-29 22:54:54 +02:00
parent 7791c6f4eb
commit 6c065783c5
1 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
epan/dissectors/packet-cbor.c
View File

@ -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,