osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

RTPS: Added DTLS locator dissection 

Change-Id: I168d728a56479bd3eeac4baa2d7708dbc3d09bed
Reviewed-on: https://code.wireshark.org/review/17814
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Juanjo Martin 2016-09-20 13:32:46 +02:00 committed by Alexis La Goutte
parent 48a075b104
commit dedf926540
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
epan/dissectors/packet-rtps.c
View File

@ -619,6 +619,7 @@ static const value_string rtps_locator_kind_vals[] = {
{ LOCATOR_KIND_UDPV4, "LOCATOR_KIND_UDPV4" },
{ LOCATOR_KIND_UDPV6, "LOCATOR_KIND_UDPV6" },
{ LOCATOR_KIND_INVALID, "LOCATOR_KIND_INVALID" },
{ LOCATOR_KIND_DTLS, "LOCATOR_KIND_DTLS" },
{ LOCATOR_KIND_TCPV4_LAN, "LOCATOR_KIND_TCPV4_LAN" },
{ LOCATOR_KIND_TCPV4_WAN, "LOCATOR_KIND_TCPV4_WAN" },
{ LOCATOR_KIND_TLSV4_LAN, "LOCATOR_KIND_TLSV4_LAN" },
@ -1726,6 +1727,14 @@ void rtps_util_add_locator_t(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb
tvb_ip6_to_str(tvb, offset + 8));
break;
}
case LOCATOR_KIND_DTLS: {
proto_tree_add_int(locator_tree, hf_rtps_locator_port, tvb, offset+4, 4, port);
proto_tree_add_item(locator_tree, hf_rtps_locator_ipv6, tvb, offset+8, 16, ENC_NA);
proto_item_append_text(tree, " (%s, %s:%d)",
val_to_str(kind, rtps_locator_kind_vals, "%02x"),
tvb_ip6_to_str(tvb, offset + 8), port);
break;
}
/* Default case, we already have the locator kind so don't do anything */
default:
break;

1
epan/dissectors/packet-rtps.h
View File

@ -497,6 +497,7 @@ typedef struct _rtps_dissector_data {
#define LOCATOR_KIND_UDPV4 (1)
#define LOCATOR_KIND_UDPV6 (2)
/* Vendor specific - rti */
#define LOCATOR_KIND_DTLS (6)
#define LOCATOR_KIND_TCPV4_LAN (8)
#define LOCATOR_KIND_TCPV4_WAN (9)
#define LOCATOR_KIND_TLSV4_LAN (10)