diff options
| author | Anton Butenko <ant.butenko@gmail.com> | 2017-09-26 12:23:29 +0300 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-09-26 12:25:29 +0000 |
| commit | e60319e54bcc487f9d5baded335f516cd77fa931 (patch) | |
| tree | 10553f85738e6b3a851ea95aa55dc058d6e4b2b4 /epan | |
| parent | f2404376f807712d55e339a075d02d6f9a454a0a (diff) | |
coap: Added dissection for LWM2M JSON inside CoAP protocol
Change-Id: I29429f731b7e2f25568d44de455816ac70e079b6
Reviewed-on: https://code.wireshark.org/review/23740
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-coap.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-json.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/epan/dissectors/packet-coap.c b/epan/dissectors/packet-coap.c index 497d0420b2..a8f8654132 100644 --- a/epan/dissectors/packet-coap.c +++ b/epan/dissectors/packet-coap.c @@ -253,7 +253,9 @@ static const value_string vals_ctype[] = { { 50, "application/json" }, { 60, "application/cbor" }, { 1542, "application/vnd.oma.lwm2m+tlv" }, + { 1543, "application/vnd.oma.lwm2m+json" }, { 11542, "application/vnd.oma.lwm2m+tlv" }, + { 11543, "application/vnd.oma.lwm2m+json" }, { 0, NULL }, }; diff --git a/epan/dissectors/packet-json.c b/epan/dissectors/packet-json.c index 538d845563..de0801fc5f 100644 --- a/epan/dissectors/packet-json.c +++ b/epan/dissectors/packet-json.c @@ -663,6 +663,7 @@ proto_reg_handoff_json(void) dissector_add_string("media_type", "application/json-rpc", json_handle); /* JSON-RPC over HTTP */ dissector_add_string("media_type", "application/jsonrequest", json_handle); /* JSON-RPC over HTTP */ dissector_add_string("media_type", "application/dds-web+json", json_handle); /* DDS Web Integration Service over HTTP */ + dissector_add_string("media_type", "application/vnd.oma.lwm2m+json", json_handle); /* LWM2M JSON over CoAP */ dissector_add_string("grpc_message_type", "application/grpc+json", json_handle); text_lines_handle = find_dissector_add_dependency("data-text-lines", proto_json); |