diff options
| author | Adam Mitz <mitza@objectcomputing.com> | 2020-05-01 17:37:14 -0500 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2020-05-02 17:52:17 +0000 |
| commit | a367b0c55d723365d2b293cf78298b31af2ebe4d (patch) | |
| tree | 97b4354d761e32bbb63f77ff5ab9b21f9ed14a06 | |
| parent | 6341185a4910371b1bcc23c9194dc523fa2e1220 (diff) | |
RTPS: Updated built-in entity names and values to match spec
Change-Id: Ibe8115b068236e52e26a2c178a1ae724c1112663
Reviewed-on: https://code.wireshark.org/review/37016
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-rtps.c | 14 | ||||
| -rw-r--r-- | epan/dissectors/packet-rtps.h | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index 9b8b3c600b..9845f21dfd 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -627,8 +627,8 @@ static const value_string entity_id_vals[] = { { ENTITYID_BUILTIN_PUBLICATIONS_READER, "ENTITYID_BUILTIN_PUBLICATIONS_READER" }, { ENTITYID_BUILTIN_SUBSCRIPTIONS_WRITER, "ENTITYID_BUILTIN_SUBSCRIPTIONS_WRITER" }, { ENTITYID_BUILTIN_SUBSCRIPTIONS_READER, "ENTITYID_BUILTIN_SUBSCRIPTIONS_READER" }, - { ENTITYID_BUILTIN_SDP_PARTICIPANT_WRITER, "ENTITYID_BUILTIN_SDP_PARTICIPANT_WRITER" }, - { ENTITYID_BUILTIN_SDP_PARTICIPANT_READER, "ENTITYID_BUILTIN_SDP_PARTICIPANT_READER" }, + { ENTITYID_BUILTIN_PARTICIPANT_WRITER, "ENTITYID_BUILTIN_PARTICIPANT_WRITER" }, + { ENTITYID_BUILTIN_PARTICIPANT_READER, "ENTITYID_BUILTIN_PARTICIPANT_READER" }, { ENTITYID_P2P_BUILTIN_PARTICIPANT_MESSAGE_WRITER, "ENTITYID_P2P_BUILTIN_PARTICIPANT_MESSAGE_WRITER" }, { ENTITYID_P2P_BUILTIN_PARTICIPANT_MESSAGE_READER, "ENTITYID_P2P_BUILTIN_PARTICIPANT_MESSAGE_READER" }, { ENTITYID_SEDP_BUILTIN_PUBLICATIONS_SECURE_WRITER, "ENTITYID_SEDP_BUILTIN_PUBLICATIONS_SECURE_WRITER" }, @@ -1812,7 +1812,7 @@ static void append_status_info(packet_info *pinfo, case ENTITYID_BUILTIN_SUBSCRIPTIONS_WRITER: writerId = "r"; break; - case ENTITYID_BUILTIN_SDP_PARTICIPANT_WRITER: + case ENTITYID_BUILTIN_PARTICIPANT_WRITER: writerId = "p"; break; case ENTITYID_P2P_BUILTIN_PARTICIPANT_MESSAGE_WRITER: @@ -7325,8 +7325,8 @@ static void dissect_DATA_v1(tvbuff_t *tvb, packet_info *pinfo, gint offset, guin * ENTITYID_BUILTIN_SUBSCRIPTIONS_WRITER | 0 | r- * ENTITYID_BUILTIN_PUBLICATIONS_WRITER | 1 | w+ * ENTITYID_BUILTIN_PUBLICATIONS_WRITER | 0 | w- - * ENTITYID_BUILTIN_SDP_PARTICIPANT_WRITER | 1 | p+ - * ENTITYID_BUILTIN_SDP_PARTICIPANT_WRITER | 0 | p- (*) + * ENTITYID_BUILTIN_PARTICIPANT_WRITER | 1 | p+ + * ENTITYID_BUILTIN_PARTICIPANT_WRITER | 0 | p- (*) * ENTITYID_BUILTIN_TOPIC_WRITER | 1 | t+ (*) * ENTITYID_BUILTIN_TOPIC_WRITER | 0 | t- (*) * @@ -7340,9 +7340,9 @@ static void dissect_DATA_v1(tvbuff_t *tvb, packet_info *pinfo, gint offset, guin col_append_str(pinfo->cinfo, COL_INFO, SM_EXTRA_RPLUS); } else if (wid == ENTITYID_BUILTIN_SUBSCRIPTIONS_WRITER && (flags & FLAG_DATA_A) == 0) { col_append_str(pinfo->cinfo, COL_INFO, SM_EXTRA_RMINUS); - } else if (wid == ENTITYID_BUILTIN_SDP_PARTICIPANT_WRITER && (flags & FLAG_DATA_A) != 0) { + } else if (wid == ENTITYID_BUILTIN_PARTICIPANT_WRITER && (flags & FLAG_DATA_A) != 0) { col_append_str(pinfo->cinfo, COL_INFO, SM_EXTRA_PPLUS); - } else if (wid == ENTITYID_BUILTIN_SDP_PARTICIPANT_WRITER && (flags & FLAG_DATA_A) == 0) { + } else if (wid == ENTITYID_BUILTIN_PARTICIPANT_WRITER && (flags & FLAG_DATA_A) == 0) { col_append_str(pinfo->cinfo, COL_INFO, SM_EXTRA_PMINUS); } else if (wid == ENTITYID_BUILTIN_TOPIC_WRITER && (flags & FLAG_DATA_A) != 0) { col_append_str(pinfo->cinfo, COL_INFO, SM_EXTRA_TPLUS); diff --git a/epan/dissectors/packet-rtps.h b/epan/dissectors/packet-rtps.h index 70355b4d7e..04a3e524c9 100644 --- a/epan/dissectors/packet-rtps.h +++ b/epan/dissectors/packet-rtps.h @@ -330,8 +330,8 @@ typedef struct _rtps_dissector_data { #define ENTITYID_BUILTIN_PUBLICATIONS_READER (0x000003c7) #define ENTITYID_BUILTIN_SUBSCRIPTIONS_WRITER (0x000004c2) #define ENTITYID_BUILTIN_SUBSCRIPTIONS_READER (0x000004c7) -#define ENTITYID_BUILTIN_SDP_PARTICIPANT_WRITER (0x000100c2) -#define ENTITYID_BUILTIN_SDP_PARTICIPANT_READER (0x000100c7) +#define ENTITYID_BUILTIN_PARTICIPANT_WRITER (0x000100c2) +#define ENTITYID_BUILTIN_PARTICIPANT_READER (0x000100c7) #define ENTITYID_P2P_BUILTIN_PARTICIPANT_MESSAGE_WRITER (0x000200c2) #define ENTITYID_P2P_BUILTIN_PARTICIPANT_MESSAGE_READER (0x000200c7) @@ -344,8 +344,8 @@ typedef struct _rtps_dissector_data { #define ENTITYID_SEDP_BUILTIN_SUBSCRIPTIONS_SECURE_READER (0xff0004c7) #define ENTITYID_P2P_BUILTIN_PARTICIPANT_MESSAGE_SECURE_WRITER (0xff0200c2) #define ENTITYID_P2P_BUILTIN_PARTICIPANT_MESSAGE_SECURE_READER (0xff0200c7) -#define ENTITYID_P2P_BUILTIN_PARTICIPANT_VOLATILE_SECURE_WRITER (0xff0202c2) -#define ENTITYID_P2P_BUILTIN_PARTICIPANT_VOLATILE_SECURE_READER (0xff0202c7) +#define ENTITYID_P2P_BUILTIN_PARTICIPANT_VOLATILE_SECURE_WRITER (0xff0202c3) +#define ENTITYID_P2P_BUILTIN_PARTICIPANT_VOLATILE_SECURE_READER (0xff0202c4) #define ENTITYID_SPDP_RELIABLE_BUILTIN_PARTICIPANT_SECURE_WRITER (0xff0101c2) #define ENTITYID_SPDP_RELIABLE_BUILTIN_PARTICIPANT_SECURE_READER (0xff0101c7) |