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

RTPS: Added extra flags at the SECURE_PREFIX_FLAGS. 

Added flags and filters for the following:
- Additional Authenticated Data bit
- Message protected with PSK
- Transport-Specific Message
- Endianness flag dissection improved
This commit is contained in:
Ismael Mendez Matamoros 2023-05-22 13:42:59 +02:00 committed by Alexis La Goutte
parent bde79e1992
commit 512557a328
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1190,6 +1190,8 @@ static int hf_rtps_flag_data_present_v1 = -1;
static int hf_rtps_flag_multisubmessage = -1;
static int hf_rtps_flag_endianness = -1;
static int hf_rtps_flag_additional_authenticated_data = -1;
static int hf_rtps_flag_protected_with_psk = -1;
static int hf_rtps_flag_transport_specific_message = -1;
static int hf_rtps_flag_status_info = -1;
static int hf_rtps_flag_data_present_v2 = -1;
static int hf_rtps_flag_inline_qos_v2 = -1;
@ -2472,13 +2474,13 @@ static int* const SECURE_FLAGS[] = {
};
static int* const SECURE_PREFIX_FLAGS[] = {
&hf_rtps_flag_reserved80, /* Bit 7 */
&hf_rtps_flag_transport_specific_message, /* Bit 7 */
&hf_rtps_flag_reserved40, /* Bit 6 */
&hf_rtps_flag_reserved20, /* Bit 5 */
&hf_rtps_flag_reserved10, /* Bit 4 */
&hf_rtps_flag_reserved08, /* Bit 3 */
&hf_rtps_flag_reserved04, /* Bit 2 */
&hf_rtps_flag_additional_authenticated_data, /* Bit 1 */
&hf_rtps_flag_protected_with_psk, /* Bit 2 */
&hf_rtps_flag_additional_authenticated_data, /* Bit 1 */
&hf_rtps_flag_endianness, /* Bit 0 */
NULL
};
@ -2801,6 +2803,8 @@ static const fragment_items rtps_frag_items = {
"RTPS fragments"
};
static const true_false_string tfs_little_big_endianness = { "Little-Endian", "Big-Endian" };
static guint32 check_offset_addition(guint32 offset, guint32 value, proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb)
{
if (offset > G_MAXUINT32 - value) {
@ -15864,13 +15868,21 @@ void proto_register_rtps(void) {
FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x02, NULL, HFILL }
},
{ &hf_rtps_flag_endianness, {
"Endianness bit", "rtps.flag.endianness",
FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x01, NULL, HFILL }
"Endianness", "rtps.flag.endianness",
FT_BOOLEAN, 8, TFS(&tfs_little_big_endianness), 0x01, NULL, HFILL }
},
{ &hf_rtps_flag_additional_authenticated_data, {
"Additional Authenticated Data bit", "rtps.flag.additional_authenticated_data",
"Additional Authenticated Data", "rtps.flag.additional_authenticated_data",
FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x02, NULL, HFILL }
},
{ &hf_rtps_flag_protected_with_psk, {
"Message protected with PSK", "rtps.flag.message_protected_with_psk",
FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x04, NULL, HFILL }
},
{ &hf_rtps_flag_transport_specific_message, {
"Transport-Specific Message", "rtps.flag.transport_specific_message",
FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x80, NULL, HFILL }
},
{ &hf_rtps_flag_inline_qos_v2, {
"Inline QoS", "rtps.flag.inline_qos",
FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x02, NULL, HFILL }