aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanjo Martin <juanjo@rti.com>2016-03-22 18:12:03 +0100
committerPascal Quantin <pascal.quantin@gmail.com>2016-03-30 19:03:55 +0000
commit0e8e4914faa9471044dea6b91eaf2029847cc34e (patch)
tree7475ca8c2c57909111ffdb7dca301247f96eadd1
parentb4d16b4495b732888e12baf5b8a7e9bf2665e22b (diff)
RTPS: Now PID_ENTITY_NAME and PID_ROLE_NAME use different filters
Change-Id: I852aa09bff6a37ef03b5f55bdf8933ed181da2d0 Reviewed-on: https://code.wireshark.org/review/14705 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-rw-r--r--epan/dissectors/packet-rtps.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c
index 1650bdc2a0..4437840898 100644
--- a/epan/dissectors/packet-rtps.c
+++ b/epan/dissectors/packet-rtps.c
@@ -193,6 +193,7 @@ static int hf_rtps_param_serialize_encap_len = -1;
static int hf_rtps_param_transport_priority = -1;
static int hf_rtps_param_type_max_size_serialized = -1;
static int hf_rtps_param_entity_name = -1;
+static int hf_rtps_param_role_name = -1;
static int hf_rtps_disable_positive_ack = -1;
static int hf_rtps_participant_guid = -1;
static int hf_rtps_group_guid = -1;
@@ -3193,7 +3194,7 @@ static gboolean dissect_parameter_sequence_rti(proto_tree *rtps_parameter_tree,
case PID_ROLE_NAME: {
- rtps_util_add_string(rtps_parameter_tree, tvb, offset, hf_rtps_param_entity_name, little_endian);
+ rtps_util_add_string(rtps_parameter_tree, tvb, offset, hf_rtps_param_role_name, little_endian);
break;
}
@@ -8972,12 +8973,19 @@ void proto_register_rtps(void) {
},
{ &hf_rtps_param_entity_name,
- { "entity", "rtps.param.entityName",
+ { "entityName", "rtps.param.entityName",
FT_STRINGZ, BASE_NONE, NULL, 0,
"String representing the name of the entity addressed by the submessage",
HFILL }
},
+ { &hf_rtps_param_role_name,
+ { "roleName", "rtps.param.roleName",
+ FT_STRINGZ, BASE_NONE, NULL, 0,
+ "String representing the role name of the entity addressed by the submessage",
+ HFILL }
+ },
+
{ &hf_rtps_disable_positive_ack,
{ "disablePositiveAcks", "rtps.disable_positive_ack",
FT_BOOLEAN, 8, TFS(&tfs_true_false), 0,