diff options
| author | chrysn <chrysn@fsfe.org> | 2014-09-16 08:27:02 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-09-17 23:37:23 +0000 |
| commit | 5d80686f453c5b051fea3d4ddde735850aead0a3 (patch) | |
| tree | 43915c3cf0bcbcf18c16ccab3fd2829bd5351754 /epan/dissectors/packet-coap.c | |
| parent | b2f03f19679188160b8b563e891984b37e60b513 (diff) | |
CoAP dissector: Update option numbers from RFC7252
* "Accept" option: The option number was changed late in the
specification process.
* "Proxy-Scheme" / "Size1": After including those, all option numbers
specified in the RFC can be dissected by wireshark.
Change-Id: I1b475ac6920fd021e3217cd3b44c173d264a5298
Reviewed-on: https://code.wireshark.org/review/4123
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-coap.c')
| -rw-r--r-- | epan/dissectors/packet-coap.c | 45 |
1 files changed, 44 insertions, 1 deletions
diff --git a/epan/dissectors/packet-coap.c b/epan/dissectors/packet-coap.c index d3f4654e97..6250fa6b4c 100644 --- a/epan/dissectors/packet-coap.c +++ b/epan/dissectors/packet-coap.c @@ -60,6 +60,8 @@ static int hf_coap_opt_end_marker = -1; static int hf_coap_opt_ctype = -1; static int hf_coap_opt_max_age = -1; static int hf_coap_opt_proxy_uri = -1; +static int hf_coap_opt_proxy_scheme = -1; +static int hf_coap_opt_size1 = -1; static int hf_coap_opt_etag = -1; static int hf_coap_opt_uri_host = -1; static int hf_coap_opt_location_path = -1; @@ -173,12 +175,14 @@ static const value_string vals_code[] = { #define COAP_OPT_CONTENT_TYPE 12 #define COAP_OPT_MAX_AGE 14 #define COAP_OPT_URI_QUERY 15 -#define COAP_OPT_ACCEPT 16 +#define COAP_OPT_ACCEPT 17 #define COAP_OPT_LOCATION_QUERY 20 #define COAP_OPT_BLOCK2 23 /* core-block-10 */ #define COAP_OPT_BLOCK_SIZE 28 /* core-block-10 */ #define COAP_OPT_BLOCK1 27 /* core-block-10 */ #define COAP_OPT_PROXY_URI 35 +#define COAP_OPT_PROXY_SCHEME 39 +#define COAP_OPT_SIZE1 60 static const value_string vals_opt_type[] = { { COAP_OPT_IF_MATCH, "If-Match" }, @@ -194,6 +198,8 @@ static const value_string vals_opt_type[] = { { COAP_OPT_ACCEPT, "Accept" }, { COAP_OPT_LOCATION_QUERY, "Location-Query" }, { COAP_OPT_PROXY_URI, "Proxy-Uri" }, + { COAP_OPT_PROXY_SCHEME, "Proxy-Scheme" }, + { COAP_OPT_SIZE1, "Size1" }, { COAP_OPT_OBSERVE, "Observe" }, { COAP_OPT_BLOCK2, "Block2" }, { COAP_OPT_BLOCK1, "Block1" }, @@ -219,6 +225,8 @@ struct coap_option_range_t { { COAP_OPT_ACCEPT, 0, 2 }, { COAP_OPT_LOCATION_QUERY, 0, 255 }, { COAP_OPT_PROXY_URI, 1,1034 }, + { COAP_OPT_PROXY_SCHEME, 1, 255 }, + { COAP_OPT_SIZE1, 0, 4 }, { COAP_OPT_OBSERVE, 0, 2 }, { COAP_OPT_BLOCK2, 0, 3 }, { COAP_OPT_BLOCK1, 0, 3 }, @@ -447,6 +455,23 @@ dissect_coap_opt_proxy_uri(tvbuff_t *tvb, proto_item *head_item, proto_tree *sub } static void +dissect_coap_opt_proxy_scheme(tvbuff_t *tvb, proto_item *head_item, proto_tree *subtree, gint offset, gint opt_length) +{ + const guint8 *str = NULL; + + if (opt_length == 0) { + str = nullstr; + } else { + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, opt_length, ENC_ASCII); + } + + proto_tree_add_string(subtree, hf_coap_opt_proxy_scheme, tvb, offset, opt_length, str); + + /* add info to the head of the packet detail */ + proto_item_append_text(head_item, ": %s", str); +} + +static void dissect_coap_opt_ctype(tvbuff_t *tvb, proto_item *head_item, proto_tree *subtree, gint offset, gint opt_length, int hf) { if (opt_length == 0) { @@ -675,6 +700,14 @@ dissect_coap_options_main(tvbuff_t *tvb, packet_info *pinfo, proto_tree *coap_tr dissect_coap_opt_proxy_uri(tvb, item, subtree, offset, opt_length); break; + case COAP_OPT_PROXY_SCHEME: + dissect_coap_opt_proxy_scheme(tvb, item, subtree, offset, + opt_length); + break; + case COAP_OPT_SIZE1: + dissect_coap_opt_uint(tvb, item, subtree, offset, + opt_length, hf_coap_opt_size1); + break; case COAP_OPT_ETAG: dissect_coap_opt_hex_string(tvb, item, subtree, offset, opt_length, hf_coap_opt_etag); @@ -991,6 +1024,16 @@ proto_register_coap(void) FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_coap_opt_proxy_scheme, + { "Proxy-Scheme", "coap.opt.proxy_scheme", + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_coap_opt_size1, + { "Size1", "coap.opt.size1", + FT_UINT32, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, { &hf_coap_opt_etag, { "Etag", "coap.opt.etag", FT_BYTES, BASE_NONE, NULL, 0x0, |