* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* This is the RTPS packet dissector for RTPS version 2.x
*
- * RTPS protocol was initially developed by Real-Time Innovations, Inc. as wire
+ * RTPS protocol was initially developed by Real-Time Innovations, Inc. as wire
* protocol for Data Distribution System, and then adopted as a standard by
* the Object Management Group (as version 2.0).
*
* Additional information at:
- * Full OMG DDS Standard Specification:
+ * Full OMG DDS Standard Specification:
* http://www.omg.org/cgi-bin/doc?ptc/2003-07-07
- *
+ *
* RTI DDS and RTPS information: http://www.rti.com/resources.html
*
*/
{ PID_METATRAFFIC_MULTICAST_LOCATOR, "PID_METATRAFFIC_MULTICAST_LOCATOR" },
{ PID_PARTICIPANT_MANUAL_LIVELINESS_COUNT, "PID_PARTICIPANT_MANUAL_LIVELINESS_COUNT" },
{ PID_CONTENT_FILTER_PROPERTY, "PID_CONTENT_FILTER_PROPERTY" },
- { PID_PROPERTY_LIST, "PID_PROPERTY_LIST" },
+ { PID_PROPERTY_LIST, "PID_PROPERTY_LIST" },
{ PID_HISTORY, "PID_HISTORY" },
{ PID_RESOURCE_LIMIT, "PID_RESOURCE_LIMIT" },
{ PID_EXPECTS_INLINE_QOS, "PID_EXPECTS_INLINE_QOS" },
{ PID_ENTITY_NAME, "PID_ENTITY_NAME" },
{ PID_KEY_HASH, "PID_KEY_HASH" },
{ PID_STATUS_INFO, "PID_STATUS_INFO" },
-
+
/* Vendor specific: RTI */
{ PID_PRODUCT_VERSION, "PID_PRODUCT_VERSION" },
{ PID_PLUGIN_PROMISCUITY_KIND, "PID_PLUGIN_PROMISCUITY_KIND" },
{ DURABILITY_PERSISTENT, "PERSISTENT_DURABILITY_QOS" },
{ 0, NULL }
};
-
+
static const value_string ownership_qos_vals[] = {
{ OWNERSHIP_SHARED, "SHARED_OWNERSHIP_QOS" },
{ OWNERSHIP_EXCLUSIVE, "EXCLUSIVE_OWNERSHIP_QOS" },
{ PARTICIPANT_MESSAGE_DATA_KIND_MANUAL_LIVELINESS_UPDATE, "PARTICIPANT_MESSAGE_DATA_KIND_MANUAL_LIVELINESS_UPDATE" },
{ 0, NULL }
};
-
+
/* Flag Decoding defintions ***********************************************/
/* Utility to add elements to the protocol tree */
static void rtps_util_format_ipv6(guint8 *, guint8 *, gint);
static void rtps_util_add_protocol_version(proto_tree *, tvbuff_t *, gint);
-static void rtps_util_add_vendor_id(proto_tree *, tvbuff_t *,
+static void rtps_util_add_vendor_id(proto_tree *, tvbuff_t *,
gint, guint8 *, gint);
-static void rtps_util_add_locator_t(proto_tree *, tvbuff_t *,
+static void rtps_util_add_locator_t(proto_tree *, tvbuff_t *,
gint, int, const guint8 *, guint8 *, gint);
static int rtps_util_add_locator_list(proto_tree *, tvbuff_t *,
gint, const guint8 *, int);
static void rtps_util_add_entity_id(proto_tree *, tvbuff_t *,
gint, int, int, int, int, const char *, guint32 *);
static void rtps_util_add_generic_entity_id(proto_tree *, tvbuff_t *,
- gint, const char *,
+ gint, const char *,
guint8 *, gint);
static void rtps_util_add_generic_guid(proto_tree *, tvbuff_t *,
gint, const char *, guint8 *, gint);
static void rtps_util_add_seq_octets(proto_tree *, tvbuff_t *,
gint, int, int, int, guint8 *, gint);
static int rtps_util_add_bitmap(proto_tree *, tvbuff_t *,
- gint, int, const char *);
+ gint, int, const char *);
static int rtps_util_add_fragment_number_set(proto_tree *, tvbuff_t *,
- gint, int, const char *, gint);
+ gint, int, const char *, gint);
static void rtps_util_decode_flags(proto_tree *, tvbuff_t *,
gint, guint8, const struct Flag_definition *);
static void rtps_util_decode_flags_16bit(proto_tree *, tvbuff_t *,
gint, guint16, const struct Flag_definition *);
static gint rtps_util_add_seq_ulong(proto_tree *, tvbuff_t *,
gint, int, int, int, int, char *);
-static void rtps_util_add_extra_flags(proto_tree *, tvbuff_t *,
+static void rtps_util_add_extra_flags(proto_tree *, tvbuff_t *,
gint, const char *);
/* The data (payload) dissector */
val_to_str(submessageId, submessage_id_vals, "Unknown[%02x]"),
extra_text);
}
-
+
/* *********************************************************************** */
-/* Appends a submessage description to the info summary text, with
+/* Appends a submessage description to the info summary text, with
* extra formatting for those submessages that has a status info
*/
-static void info_summary_append_ex(char *info_summary_text,
- int submessageId,
- guint32 writer_id,
+static void info_summary_append_ex(char *info_summary_text,
+ int submessageId,
+ guint32 writer_id,
guint32 status_info) {
/* Defines the extra information associated to the writer involved in
* this communication
*
* Format: [?Ptwrpm]\(u?d?\)
- *
+ *
* First letter table:
*
* writerEntityId value | Letter
/* 0123456 */
char buffer[10] = "(?[??])";
- if (writer_id == ENTITYID_PARTICIPANT)
+ if (writer_id == ENTITYID_PARTICIPANT)
buffer[1] = 'P';
else if (writer_id == ENTITYID_SEDP_BUILTIN_TOPIC_WRITER)
buffer[1] = 't';
info_summary_append(info_summary_text, submessageId, NULL);
return;
}
-
+
switch(status_info) {
case 0: buffer[3] = '_'; buffer[4] = '_'; break;
case 1: buffer[3] = '_'; buffer[4] = 'D'; break;
/* *********************************************************************** */
/* Format the given address (16 octets) as an IPv6 address
*/
-static void rtps_util_format_ipv6(guint8 *addr,
+static void rtps_util_format_ipv6(guint8 *addr,
guint8 *buffer,
gint buffer_size) {
guint32 i;
/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
* NOTE:
- * In general those utility functions (they all starts with 'rtps_util')
+ * In general those utility functions (they all starts with 'rtps_util')
* are used to dissect some part of a submessage.
* They take as first parameter the proto_tree.
* Now, the proto_tree can be NULL if the dissector is invoked without
- * a packet tree.
+ * a packet tree.
* Sometimes those functions they also return some value (as result of
- * the dissecting).
+ * the dissecting).
* At the price of optimizing the code, each function MUST tollerate
* a NULl tree.
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
/* *********************************************************************** */
static void rtps_util_add_extra_flags(proto_tree *tree,
- tvbuff_t *tvb,
+ tvbuff_t *tvb,
gint offset,
const char *label) {
if (tree) {
temp_buffer[i] = ((flags & (1 << (15-i))) != 0) ? '1' : '0';
}
temp_buffer[16] = '\0';
-
- proto_tree_add_text(tree,
- tvb,
- offset,
+
+ proto_tree_add_text(tree,
+ tvb,
+ offset,
2,
"%s: %s",
label,
proto_tree * version_tree;
guint8 major = 0;
guint8 minor = 0;
-
+
major = tvb_get_guint8(tvb, offset);
minor = tvb_get_guint8(tvb, offset+1);
-
- ti = proto_tree_add_none_format(tree,
+
+ ti = proto_tree_add_none_format(tree,
hf_rtps_protocol_version,
- tvb,
- offset,
+ tvb,
+ offset,
2,
"Protocol version: %d.%d",
tvb_get_guint8(tvb, offset),
tvb_get_guint8(tvb, offset+1));
version_tree = proto_item_add_subtree(ti,
ett_rtps_proto_version);
- proto_tree_add_item(version_tree,
+ proto_tree_add_item(version_tree,
hf_rtps_protocol_version_major,
tvb,
offset,
1,
FALSE);
- proto_tree_add_item(version_tree,
+ proto_tree_add_item(version_tree,
hf_rtps_protocol_version_minor,
tvb,
offset+1,
/* ------------------------------------------------------------------------- */
/* Interpret the next bytes as vendor ID. If proto_tree and field ID is
- * provided, it can also set.
+ * provided, it can also set.
*/
static void rtps_util_add_vendor_id(proto_tree *tree,
tvbuff_t * tvb,
}
if (tree) {
- proto_tree_add_uint_format(tree,
+ proto_tree_add_uint_format(tree,
hf_rtps_vendor_id,
tvb,
offset,
/* ------------------------------------------------------------------------- */
/* Insert in the protocol tree the next 8 bytes interpreted as Locator_t
- *
+ *
* Locator_t is a struct defined as:
- * struct {
- * long kind; // kind of locator
- * unsigned long port;
- * octet[16] address;
+ * struct {
+ * long kind; // kind of locator
+ * unsigned long port;
+ * octet[16] address;
* } Locator_t;
*/
static void rtps_util_add_locator_t(proto_tree *tree,
case LOCATOR_KIND_UDPV6:
kind_string = "LOCATOR_KIND_UDPV6";
rtps_util_format_ipv6(addr, &addr_buff[0], MAX_IPV6_SIZE);
- g_snprintf(temp_buff, MAX_LOCATOR_SIZE,
+ g_snprintf(temp_buff, MAX_LOCATOR_SIZE,
"IPv6: { addr=%s, port=%d }",
addr_buff,
port);
case LOCATOR_KIND_RESERVED:
if (!kind_string) /* Need to guard overrides (no break before) */
kind_string = "LOCATOR_KIND_RESERVED";
-
+
default:
if (!kind_string) /* Need to guard overrides (no break before) */
kind_string = "(unknown)";
tvb,
offset,
24,
- "%s: %s",
+ "%s: %s",
label,
temp_buff);
tvb,
offset,
4,
- "%s: %d Locators",
+ "%s: %d Locators",
label,
num_locators);
} else {
locator_tree = proto_item_add_subtree(ti,
ett_rtps_locator_udp_v4);
-
+
for (i = 0; i < num_locators; ++i) {
g_snprintf(temp_buff, 20, "Locator[%d]", i);
rtps_util_add_locator_t(tree,
}
}
return offset;
-}
+}
/* ------------------------------------------------------------------------- */
-/* Insert in the protocol tree the next 4 bytes interpreted as IPV4Address_t
+/* Insert in the protocol tree the next 4 bytes interpreted as IPV4Address_t
*/
static void rtps_util_add_ipv4_address_t(proto_tree *tree,
tvbuff_t * tvb,
const guint8 * label,
guint8 * buffer, /* Can be NULL */
gint buffer_size) { /* Can be 0 */
-
+
guint32 address;
address = NEXT_guint32(tvb, offset, little_endian);
tvb,
offset,
4,
- "%s: %s",
+ "%s: %s",
label,
IPADDRESS_INVALID_STRING);
}
tvb,
offset,
4,
- "%s: %d.%d.%d.%d",
+ "%s: %d.%d.%d.%d",
label,
(address >> 24) & 0xff,
(address >> 16) & 0xff,
/* ------------------------------------------------------------------------- */
/* Insert in the protocol tree the next 8 bytes interpreted as LocatorUDPv4
- *
+ *
* LocatorUDPv4 is a struct defined as:
- * struct {
- * unsigned long address;
- * unsigned long port;
+ * struct {
+ * unsigned long address;
+ * unsigned long port;
* } LocatorUDPv4_t;
*
*/
guint32 port;
char portLabel[MAX_PORT_SIZE];
char address[MAX_IPV4_ADDRESS_SIZE];
-
+
port = NEXT_guint32(tvb, offset+4, little_endian);
-
+
if (port == PORT_INVALID) {
g_snprintf(portLabel, MAX_PORT_SIZE, "%s (0x00000000)", PORT_INVALID_STRING);
} else {
g_snprintf(portLabel, MAX_PORT_SIZE, "%u", port);
}
-
+
ti = proto_tree_add_text(tree,
tvb,
offset,
4,
"port: %s",
portLabel);
-
- proto_item_set_text(ti, "%s: { address=%s, port=%s }",
+
+ proto_item_set_text(ti, "%s: { address=%s, port=%s }",
label,
address,
portLabel);
* - hf_rtps_host_id
* - hf_rtps_app_id
* - hf_rtps_counter
- *
+ *
* If buffer is specified, it returns in it a string representation of the
* data read.
*/
/* ------------------------------------------------------------------------- */
- /* Insert the entityId from the next 4 bytes. Since there are more than
+ /* Insert the entityId from the next 4 bytes. Since there are more than
* one entityId, we need to specify also the IDs of the entityId (and its
* sub-components), as well as the label identifying it.
*/
if (str_predef == NULL) {
/* entityId is not a predefined value, format it */
- ti = proto_tree_add_uint_format(tree,
+ ti = proto_tree_add_uint_format(tree,
hf_item,
- tvb,
- offset,
+ tvb,
+ offset,
4,
entity_id,
"%s: 0x%08x (%s: 0x%06x)",
label,
entity_id,
- val_to_str(entity_kind, entity_kind_vals,
+ val_to_str(entity_kind, entity_kind_vals,
"unknown kind (%02x)"),
entity_key);
} else {
/* entityId is a predefined value */
- ti = proto_tree_add_uint_format(tree,
+ ti = proto_tree_add_uint_format(tree,
hf_item,
- tvb,
- offset,
+ tvb,
+ offset,
4,
entity_id,
"%s: %s (0x%08x)", label, str_predef, entity_id);
entity_tree = proto_item_add_subtree(ti,
subtree_entity_id);
- proto_tree_add_item(entity_tree,
+ proto_tree_add_item(entity_tree,
hf_item_entity_key,
tvb,
offset,
3,
FALSE);
- proto_tree_add_item(entity_tree,
+ proto_tree_add_item(entity_tree,
hf_item_entity_kind,
tvb,
offset+3,
1,
FALSE);
-
+
}
}
g_snprintf(temp_buffer, MAX_GUID_SIZE,
"0x%08x (%s: 0x%06x)",
entity_id,
- val_to_str(entity_kind, entity_kind_vals,
+ val_to_str(entity_kind, entity_kind_vals,
"unknown kind (%02x)"),
entity_key);
} else {
/* entityId is a predefined value */
g_snprintf(temp_buffer, MAX_GUID_SIZE,
- "%s (0x%08x)",
- str_predef,
+ "%s (0x%08x)",
+ str_predef,
entity_id);
}
if (tree) {
- proto_tree_add_text(tree,
- tvb,
- offset,
+ proto_tree_add_text(tree,
+ tvb,
+ offset,
4,
"%s: %s",
label,
guid_raw[8], guid_raw[9], guid_raw[10], guid_raw[11],
guid_raw[12], guid_raw[13], guid_raw[14], guid_raw[15],
host_id,
- app_id,
+ app_id,
counter,
entity_id, str_entity_kind, entity_key);
if (tree) {
guint64 all = (hi << 32) | lo;
if (tree) {
- proto_tree_add_int64_format(tree,
+ proto_tree_add_int64_format(tree,
hf_rtps_sm_seq_number,
tvb,
offset,
label,
tempBuffer);
time_tree = proto_item_add_subtree(ti, ett_rtps_ntp_time);
- proto_tree_add_item(time_tree,
+ proto_tree_add_item(time_tree,
hf_rtps_param_ntpt_sec,
tvb,
offset,
4,
little_endian);
- proto_tree_add_item(time_tree,
+ proto_tree_add_item(time_tree,
hf_rtps_param_ntpt_fraction,
tvb,
offset+4,
guint32 size = NEXT_guint32(tvb, offset, little_endian);
if (size > 0) {
- retVal = tvb_get_string(tvb, offset+4, size);
- }
+ retVal = tvb_get_ephemeral_string(tvb, offset+4, size);
+ }
if (tree) {
if (hf_item != -1) {
proto_item * hidden_item;
- hidden_item = proto_tree_add_string(tree,
+ hidden_item = proto_tree_add_string(tree,
hf_item,
tvb,
offset,
tvb,
offset,
size+4,
- "%s: \"%s\"",
- ((label != NULL) ? label : (const guint8 *)"value") ,
+ "%s: \"%s\"",
+ ((label != NULL) ? label : (const guint8 *)"value") ,
(size == 0) ? (guint8 *)"" : retVal);
}
if (buffer != NULL) {
g_snprintf(buffer, (gulong) buffer_size, "%s", retVal);
}
}
- g_free(retVal);
/* NDDS align strings at 4-bytes word. So:
* string_length: 4 -> buffer_length = 4;
char temp_buff[16];
guint32 retVal = NEXT_guint32(tvb, offset, little_endian);
- g_snprintf(temp_buff, 16,
- (is_hex ? "0x%08x" : (is_signed ? "%d" : "%u")),
+ g_snprintf(temp_buff, 16,
+ (is_hex ? "0x%08x" : (is_signed ? "%d" : "%u")),
NEXT_guint32(tvb, offset, little_endian));
if (tree != NULL) {
if (hf_item != -1) {
- proto_tree_add_item(tree,
+ proto_tree_add_item(tree,
hf_item,
tvb,
offset,
tvb,
offset,
4,
- "%s: %s",
+ "%s: %s",
label,
temp_buff);
}
char temp_buff[16];
guint16 retVal = NEXT_guint16(tvb, offset, little_endian);
- g_snprintf(temp_buff, 16,
- (is_hex ? "0x%04x" : (is_signed ? "%d" : "%u")),
+ g_snprintf(temp_buff, 16,
+ (is_hex ? "0x%04x" : (is_signed ? "%d" : "%u")),
retVal);
if (tree != NULL) {
if (hf_item != -1) {
- proto_tree_add_item(tree,
+ proto_tree_add_item(tree,
hf_item,
tvb,
offset,
tvb,
offset,
2,
- "%s: %s",
+ "%s: %s",
label,
temp_buff);
}
tvb,
offset,
4,
- "%s: %s",
+ "%s: %s",
label,
tempBuffer);
}
/* ------------------------------------------------------------------------- */
-/* Insert in the protocol tree the next data interpreted as a boolean
- * Returns the pointer to a dynamically allocated buffer containing the
+/* Insert in the protocol tree the next data interpreted as a boolean
+ * Returns the pointer to a dynamically allocated buffer containing the
* formatted version of the value.
*/
static void rtps_util_add_boolean(proto_tree *tree,
tvb,
offset,
1,
- "%s: %s",
+ "%s: %s",
label,
str);
}
/* ------------------------------------------------------------------------- */
-/* Insert in the protocol tree the next bytes interpreted as
+/* Insert in the protocol tree the next bytes interpreted as
* DurabilityServiceQosPolicy
*/
static void rtps_util_add_durability_service_qos(proto_tree *tree,
temp_buffer,
MAX_NTP_TIME_SIZE);
- g_snprintf(buffer, buffer_size,
+ g_snprintf(buffer, buffer_size,
"{ service_cleanup_delay=%s, history_kind='%s', "
"history_depth=%d, max_samples=%d, max_instances=%d, "
- "max_samples_per_instances=%d }",
+ "max_samples_per_instances=%d }",
temp_buffer,
val_to_str(kind, history_qos_vals, "0x%08x"),
history_depth,
temp_buffer,
MAX_NTP_TIME_SIZE);
- g_snprintf(buffer, buffer_size,
- "{ kind=%s, lease_duration=%s }",
+ g_snprintf(buffer, buffer_size,
+ "{ kind=%s, lease_duration=%s }",
val_to_str(kind, liveliness_qos_vals, "0x%08x"),
temp_buffer);
if (tree) {
/* Create the string node with a fake string, the replace it later */
if (tree) {
- ti = proto_tree_add_text(tree,
+ ti = proto_tree_add_text(tree,
tvb,
offset,
param_length-8,
"Strings");
string_tree = proto_item_add_subtree(ti, ett_rtps_seq_string);
}
-
+
overview_buffer[0] = '\0';
for (i = 0; i < num_strings; ++i) {
- g_snprintf(temp_buff, MAX_LABEL_SIZE,
+ g_snprintf(temp_buff, MAX_LABEL_SIZE,
"%s[%d]",
label,
i);
/* Create the string node with an empty string, the replace it later */
if (tree) {
- ti = proto_tree_add_text(tree,
+ ti = proto_tree_add_text(tree,
tvb,
offset,
param_length-8,
} else {
return offset + 4*num_elem;
}
-
+
overview_buff[0] = '\0';
for (i = 0; i < num_elem; ++i) {
- g_snprintf(temp_buff, MAX_LABEL_SIZE,
+ g_snprintf(temp_buff, MAX_LABEL_SIZE,
"%s[%d]",
label,
i);
/* ------------------------------------------------------------------------- */
/* Insert in the protocol tree the next bytes interpreted as typecode info
- * Returns the number of bytes parsed
+ * Returns the number of bytes parsed
*/
static gint rtps_util_add_typecode(proto_tree *tree,
tvbuff_t * tvb,
char indent_string[40];
gint retVal;
char type_name[40];
-
+
/* Structure of the typecode data:
* Offset | Size | Field | Notes
* ----------|-------|------------------------------|---------------------
/* Calc indent string */
memset(indent_string, ' ', 40);
indent_string[indent_level*2] = '\0';
-
+
/* Gets TK ID */
LONG_ALIGN(offset);
tk_id = NEXT_guint32(tvb, offset, little_endian);
offset += 4;
-
+
/* Gets TK size */
tk_size = NEXT_guint16(tvb, offset, little_endian);
offset += 2;
/* The first bit of typecode is set to 1, clear it */
tk_id &= 0x7fffffff;
- /* HACK: NDDS 4.0 and NDDS 4.1 has different typecode ID list.
+ /* HACK: NDDS 4.0 and NDDS 4.1 has different typecode ID list.
* The ID listed in the RTI_CDR_TK_XXXXX are the one from NDDS 4.1
- * In order to correctly dissect NDDS 4.0 packets containing typecode
- * information, we check if the ID of the element at level zero is a
+ * In order to correctly dissect NDDS 4.0 packets containing typecode
+ * information, we check if the ID of the element at level zero is a
* struct or union. If not, it means we are dissecting a ndds 4.0 packet
* (and we can decrement the ID to match the correct values).
*/
* <string> ::= <length>char+<eol>
* <length> ::= unsigned long
* <eol> ::= (char)0
- *
+ *
* <union_member_detail> ::= <is_pointer>
- * <labels_count>
+ * <labels_count>
* <label>+
- * <type_code>
+ * <type_code>
* <labels_count> ::= unsigned long
* <label> ::= long
- *
+ *
*/
case RTI_CDR_TK_UNION: {
guint32 struct_name_len;
/* Get structure name length */
struct_name_len = NEXT_guint32(tvb, offset, little_endian);
offset += 4;
- struct_name = tvb_get_string(tvb, offset, struct_name_len);
+ struct_name = tvb_get_ephemeral_string(tvb, offset, struct_name_len);
offset += struct_name_len;
/* - - - - - - - Default index - - - - - - - */
/* Enums has also a name that we should print */
LONG_ALIGN(offset);
discriminator_enum_name_length = NEXT_guint32(tvb, offset, little_endian);
- discriminator_enum_name = tvb_get_string(tvb, offset+4, discriminator_enum_name_length);
- }
+ discriminator_enum_name = tvb_get_ephemeral_string(tvb, offset+4, discriminator_enum_name_length);
+ }
offset = disc_offset_begin + disc_size;
/*
field_offset_begin = offset;
tree,
tvb, next_offset = offset;
- offset,
- little_endian,
+ offset,
+ little_endian,
indent_level+1,
0,
0,
if (seq_max_len != -1) {
/* We're dissecting a sequence of struct, bypass the seq definition */
g_snprintf(type_name, 40, "%s", struct_name);
- g_free(struct_name);
break;
}
- g_free(struct_name);
/* - - - - - - - Number of members - - - - - - - */
LONG_ALIGN(offset);
num_members = NEXT_guint32(tvb, offset, little_endian);
offset += 4;
-
+
/* - - - - - - - <union_member>+ - - - - - - - */
next_offset = offset;
offset += 4;
/* Name */
- member_name = tvb_get_string(tvb, offset, member_name_len);
+ member_name = tvb_get_ephemeral_string(tvb, offset, member_name_len);
offset += member_name_len;
/* is Pointer ? */
LONG_ALIGN(offset);
member_label_count = NEXT_guint32(tvb, offset, little_endian);
offset += 4;
-
+
for (j = 0; j < member_label_count; ++j) {
/* Label count */
LONG_ALIGN(offset);
offset += rtps_util_add_typecode(
tree,
- tvb,
- offset,
- little_endian,
+ tvb,
+ offset,
+ little_endian,
indent_level+2,
member_is_pointer,
0,
-1,
NULL,
ndds_40_hack);
- g_free(member_name);
}
/* Finally prints the name of the struct (if provided) */
g_strlcpy(type_name, "}", 40);
* <length> ::= unsigned long
* <eol> ::= (char)0
* <member_count> ::= unsigned long
- *
+ *
* STRUCT / UNION:
* Foreach member {
- * - A2: 2: member length
+ * - A2: 2: member length
* - A4: 4: member name length
* - n: member name
* - 1: isPointer?
* - A4: 4: member name length
* - n: member name
* - A4: 4: ordinal number
- *
+ *
* -> ----------------------------------------------------- <-
* -> The alignment pad bytes belong to the FOLLOWING field <-
* -> A4 = 4 bytes alignment, A2 = 2 bytes alignment <-
offset += 4;
/* struct name */
- struct_name = tvb_get_string(tvb, offset, struct_name_len);
+ struct_name = tvb_get_ephemeral_string(tvb, offset, struct_name_len);
offset += struct_name_len;
if (seq_max_len != -1) {
/* We're dissecting a sequence of struct, bypass the seq definition */
g_snprintf(type_name, 40, "%s", struct_name);
- g_free(struct_name);
break;
}
/* Prints it */
indent_string,
typecode_name,
struct_name);
- g_free(struct_name);
/* PAD align */
LONG_ALIGN(offset);
offset += 4;
/* Name */
- member_name = tvb_get_string(tvb, offset, member_name_len);
+ member_name = tvb_get_ephemeral_string(tvb, offset, member_name_len);
offset += member_name_len;
if (tk_id == RTI_CDR_TK_ENUM) {
SHORT_ALIGN(offset);
member_bitfield = NEXT_guint16(tvb, offset, little_endian);
offset += 2; /* pad will be added by typecode dissector */
-
+
/* is Key ? */
member_is_key = tvb_get_guint8(tvb, offset);
offset++;
offset += rtps_util_add_typecode(
tree,
- tvb,
- offset,
- little_endian,
+ tvb,
+ offset,
+ little_endian,
indent_level+1,
member_is_pointer,
member_bitfield,
NULL,
ndds_40_hack);
}
-
- g_free(member_name);
}
/* Finally prints the name of the struct (if provided) */
g_strlcpy(type_name, "}", 40);
/* Recursive decode seq typecode */
offset += rtps_util_add_typecode(
tree,
- tvb,
- offset,
- little_endian,
+ tvb,
+ offset,
+ little_endian,
indent_level,
is_pointer,
bitfield,
/* Recursive decode seq typecode */
offset += rtps_util_add_typecode(
tree,
- tvb,
- offset,
- little_endian,
+ tvb,
+ offset,
+ little_endian,
indent_level,
is_pointer,
bitfield,
LONG_ALIGN(offset);
alias_name_length = NEXT_guint32(tvb, offset, little_endian);
offset += 4;
- alias_name = tvb_get_string(tvb, offset, alias_name_length);
+ alias_name = tvb_get_ephemeral_string(tvb, offset, alias_name_length);
offset += alias_name_length;
g_strlcpy(type_name, alias_name, 40);
- g_free(alias_name);
break;
}
* - A2: type modifier
* - A4: base type code
* - A4: number of members
- * Foreach member: (it's just like a struct)
+ * Foreach member: (it's just like a struct)
*
*/
case RTI_CDR_TK_VALUE: {
offset += 4;
/* value name */
- value_name = tvb_get_string(tvb, offset, value_name_len);
+ value_name = tvb_get_ephemeral_string(tvb, offset, value_name_len);
offset += value_name_len;
g_snprintf(type_name, 40, "valuetype %s", value_name);
is_key ? KEY_COMMENT : "");
return retVal;
}
-
+
/* Array print */
if (arr_dimension != NULL) {
/* Printing an array */
g_strlcpy(buffer, "RTPS PROTOCOL ERROR: parameter value too small", buffer_size);
if (tree) {
proto_tree_add_text(tree,
- tvb,
- offset,
+ tvb,
+ offset,
param_length, "%s",
buffer);
}
seq_length = MAX_SEQ_OCTETS_PRINTED;
}
for (i = 0; i < seq_length; ++i) {
- idx += g_snprintf(&buffer[idx],
+ idx += g_snprintf(&buffer[idx],
buffer_size - idx - 1,
- "%02x",
+ "%02x",
tvb_get_guint8(tvb, offset++));
if (idx >= buffer_size) {
break;
* SequenceNumber_t bitmapBase;
* sequence<long, 8> bitmap;
* } SequenceNumberSet;
- *
+ *
* Returns the new offset after reading the bitmap.
*/
static int rtps_util_add_bitmap(proto_tree *tree,
* FragmentNumber_t bitmapBase;
* sequence<FragmentNumber_t> bitmap;
* } FragmentNumberSet;
- *
+ *
* Returns the new offset after reading the bitmap.
*/
static int rtps_util_add_fragment_number_set(proto_tree *tree,
guint32 datamask;
gint expected_size;
gint base_size;
-
+
/* RTI DDS 4.2d was sending the FragmentNumber_t as a 64-bit long integer
* instead of 32-bit long.
* Attempt to decode this section as 32-bit, then check if the size of the
return -1;
}
}
-
+
/* Reads the bits (and format the print buffer) */
idx = 0;
temp_buff[0] = '\0';
if (tree == NULL) {
return;
}
-
+
flags_str[0] = '\0';
for (i = 0; i < 8; ++i) {
g_snprintf(flags_str + (2 * i), MAX_FLAG_SIZE - (2 * i), "%c ",
((flags & (1<<(7-i))) ? flag_def[i].letter : RESERVEDFLAG_CHAR));
}
- ti = proto_tree_add_uint_format(tree,
+ ti = proto_tree_add_uint_format(tree,
hf_rtps_sm_flags,
- tvb,
- offset,
- 1,
+ tvb,
+ offset,
+ 1,
flags,
- "Flags: 0x%02x (%s)",
+ "Flags: 0x%02x (%s)",
flags,
flags_str);
flags_str[j] = (i == j) ? (is_set ? '1' : '0') : '.';
}
flags_str[8] = '\0';
-
+
proto_tree_add_text(flags_tree,
tvb,
offset,
flag_def[i].description,
is_set ? "Set" : "Not set");
}
-
+
}
/* ------------------------------------------------------------------------- */
((flags & (1<<(15-i))) ? flag_def[i].letter : RESERVEDFLAG_CHAR));
}
- ti = proto_tree_add_uint_format(tree,
+ ti = proto_tree_add_uint_format(tree,
hf_rtps_sm_flags,
- tvb,
- offset,
- 2,
+ tvb,
+ offset,
+ 2,
flags,
- "Flags: 0x%04x (%s)",
+ "Flags: 0x%04x (%s)",
flags,
flags_str);
flags_str[j] = (i == j) ? (is_set ? '1' : '0') : '.';
}
flags_str[16] = '\0';
-
+
proto_tree_add_text(flags_tree,
tvb,
offset,
}
/* Creates the sub-tree */
- ti = proto_tree_add_text(tree,
- tvb,
- offset,
+ ti = proto_tree_add_text(tree,
+ tvb,
+ offset,
-1,
"%s:", label);
rtps_parameter_sequence_tree = proto_item_add_subtree(ti,
ett_rtps_serialized_data);
-
-
+
+
/* Encapsulation ID */
encapsulation_id = NEXT_guint16(tvb, offset, 0); /* Always big endian */
- proto_tree_add_text(rtps_parameter_sequence_tree,
+ proto_tree_add_text(rtps_parameter_sequence_tree,
tvb,
offset,
2,
"encapsulation kind: %s",
val_to_str(encapsulation_id, encapsulation_id_vals, "unknown (%02x)"));
- offset += 2;
+ offset += 2;
/* Sets the correct values for encapsulation_le */
- if (encapsulation_id == ENCAPSULATION_CDR_LE ||
+ if (encapsulation_id == ENCAPSULATION_CDR_LE ||
encapsulation_id == ENCAPSULATION_PL_CDR_LE) {
encapsulation_little_endian = 1;
}
/* Encapsulation length (or option) */
encapsulation_len = NEXT_guint16(tvb, offset, 0); /* Always big endian */
- proto_tree_add_text(rtps_parameter_sequence_tree,
+ proto_tree_add_text(rtps_parameter_sequence_tree,
tvb,
offset,
2,
"encapsulation options: %04x",
encapsulation_len);
- offset += 2;
-
+ offset += 2;
+
/* The payload */
size -= 4;
switch (encapsulation_id) {
size,
encapsulation_little_endian);
break;
-
+
case ENCAPSULATION_PL_CDR_LE:
case ENCAPSULATION_PL_CDR_BE:
- dissect_parameter_sequence(rtps_parameter_sequence_tree,
- tvb,
- offset,
+ dissect_parameter_sequence(rtps_parameter_sequence_tree,
+ tvb,
+ offset,
encapsulation_little_endian,
size,
label, NULL, vendor_id);
offset,
size, "%s",
label);
- }
+ }
}
}
/* Creates the sub-tree */
- ti = proto_tree_add_text(tree,
- tvb,
- offset,
+ ti = proto_tree_add_text(tree,
+ tvb,
+ offset,
-1,
"%s:", label);
rtps_parameter_sequence_tree = proto_item_add_subtree(ti,
ett_rtps_serialized_data);
-
-
+
+
/* Length */
length = NEXT_guint32(tvb, offset, 0); /* Always big endian */
- proto_tree_add_text(rtps_parameter_sequence_tree,
+ proto_tree_add_text(rtps_parameter_sequence_tree,
tvb,
offset,
4,
"Sequence length: %d", length);
- offset += 4;
+ offset += 4;
/* The payload */
proto_tree_add_item(rtps_parameter_sequence_tree,
guint16 parameter, param_length;
guint8 buffer[MAX_PARAM_SIZE];
gint original_offset = offset;
-
+
buffer[0] = '\0';
if (tree) {
- ti = proto_tree_add_text(tree,
- tvb,
- offset,
+ ti = proto_tree_add_text(tree,
+ tvb,
+ offset,
-1,
"%s:", label);
rtps_parameter_sequence_tree = proto_item_add_subtree(ti,
*/
parameter = NEXT_guint16(tvb, offset, little_endian);
if (tree) {
- ti = proto_tree_add_text(rtps_parameter_sequence_tree,
- tvb,
- offset,
+ ti = proto_tree_add_text(rtps_parameter_sequence_tree,
+ tvb,
+ offset,
-1,
"%s",
val_to_str(parameter, parameter_id_vals,
parameter,
val_to_str(parameter, parameter_id_vals,
"unknown %04x"));
- }
+ }
offset += 2;
if (parameter == PID_SENTINEL) {
/* PID_SENTINEL closes the parameter list, (length is ignored) */
return offset +2;
}
-
+
/* parameter length */
param_length = NEXT_guint16(tvb, offset, little_endian);
if (tree) {
}
switch(parameter) {
-
+
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_STATUS_INFO | 0x0004 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_STATUS_INFO | 0x0004 |
* +---------------+---------------+---------------+---------------+
* | long statusInfo |
* +---------------+---------------+---------------+---------------+
}
break;
}
-
+
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_DIRECTED_WRITE | 0x0010 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_DIRECTED_WRITE | 0x0010 |
* +---------------+---------------+---------------+---------------+
* | |
* +- -+
* | octet[12] guidPrefix |
* +- -+
- * | |
+ * | |
* +---------------+---------------+---------------+---------------+
* | octet[4] entityId |
* +---------------+---------------+---------------+---------------+
hf_rtps_sm_entity_id_kind,
ett_rtps_entity,
"guidSuffix",
- NULL);
+ NULL);
memset(buffer, 0, MAX_PARAM_SIZE);
for (i = 0; i < 16; ++i) {
guidPart = tvb_get_guint8(tvb, offset+i);
- g_snprintf(buffer+strlen(buffer), MAX_PARAM_SIZE-(gulong)strlen(buffer),
+ g_snprintf(buffer+strlen(buffer), MAX_PARAM_SIZE-(gulong)strlen(buffer),
"%02x", guidPart);
if (i == 3 || i == 7 || i == 11) g_strlcat(buffer, ":", MAX_PARAM_SIZE);
}
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_KEY_HASH | xxxx |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_KEY_HASH | xxxx |
* +---------------+---------------+---------------+---------------+
* | |
* +- -+
* | |
* +---------------+---------------+---------------+---------------+
* Differently from the other GUID, the KEY_HASH parameter may have
- * variable length in the future.
+ * variable length in the future.
* As consequence, no interpretation is performed here (and no check
* for size).
*/
case PID_KEY_HASH: {
guint8 guidPart;
- int i;
+ int i;
g_strlcat(buffer, "guid: ", MAX_PARAM_SIZE);
for (i = 0; i < param_length; ++i) {
guidPart = tvb_get_guint8(tvb, offset+i);
- g_snprintf(buffer+strlen(buffer), MAX_PARAM_SIZE-(gulong)strlen(buffer),
+ g_snprintf(buffer+strlen(buffer), MAX_PARAM_SIZE-(gulong)strlen(buffer),
"%02x", guidPart);
- if (( ((i+1) % 4) == 0 ) && (i != param_length-1) )
+ if (( ((i+1) % 4) == 0 ) && (i != param_length-1) )
g_strlcat(buffer, ":", MAX_PARAM_SIZE);
}
proto_tree_add_text(rtps_parameter_tree,
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_PARTICIPANT_LEASE_DURATION| 0x0008 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_PARTICIPANT_LEASE_DURATION| 0x0008 |
* +---------------+---------------+---------------+---------------+
* | long NtpTime.seconds |
* +---------------+---------------+---------------+---------------+
buffer,
MAX_PARAM_SIZE);
break;
-
+
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_TIME_BASED_FILTER | 0x0008 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_TIME_BASED_FILTER | 0x0008 |
* +---------------+---------------+---------------+---------------+
* | long NtpTime.seconds |
* +---------------+---------------+---------------+---------------+
break;
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_TOPIC_NAME | length |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_TOPIC_NAME | length |
* +---------------+---------------+---------------+---------------+
* | unsigned long String.length |
* +---------------+---------------+---------------+---------------+
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_OWNERSHIP_STRENGTH | 0x0004 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_OWNERSHIP_STRENGTH | 0x0004 |
* +---------------+---------------+---------------+---------------+
* | long strength |
* +---------------+---------------+---------------+---------------+
TRUE, /* Is Signed ? */
NULL, /* No Label, use the protocol item ID */
buffer,
- MAX_PARAM_SIZE);
+ MAX_PARAM_SIZE);
break;
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_TYPE_NAME | length |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_TYPE_NAME | length |
* +---------------+---------------+---------------+---------------+
* | unsigned long String.length |
* +---------------+---------------+---------------+---------------+
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_XXXXXXXXXXX | 0x0004 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_XXXXXXXXXXX | 0x0004 |
* +---------------+---------------+---------------+---------------+
* | long port |
* +---------------+---------------+---------------+---------------+
rtps_util_add_port(rtps_parameter_tree,
tvb,
offset,
- little_endian,
+ little_endian,
"port",
buffer,
MAX_PARAM_SIZE);
break;
-
-
+
+
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_EXPECTS_INLINE_QOS | 0x0004 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_EXPECTS_INLINE_QOS | 0x0004 |
* +---------------+---------------+---------------+---------------+
* | boolean | N O T U S E D |
* +---------------+---------------+---------------+---------------+
break;
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_XXXXXXXXXXX | length |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_XXXXXXXXXXX | length |
* +---------------+---------------+---------------+---------------+
* | unsigned long ip_address |
* +---------------+---------------+---------------+---------------+
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_PROTOCOL_VERSION | 0x0004 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_PROTOCOL_VERSION | 0x0004 |
* +---------------+---------------+---------------+---------------+
* | uint8 major | uint8 minor | N O T U S E D |
* +---------------+---------------+---------------+---------------+
tvb,
offset,
param_length,
- "protocolVersion: %s",
+ "protocolVersion: %s",
buffer);
break;
}
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_VENDOR_ID | 0x0004 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_VENDOR_ID | 0x0004 |
* +---------------+---------------+---------------+---------------+
* | uint8 major | uint8 minor | N O T U S E D |
* +---------------+---------------+---------------+---------------+
tvb,
offset,
2,
- "vendorId: %s",
+ "vendorId: %s",
buffer);
break;
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_RELIABILITY | 0x0004 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_RELIABILITY | 0x0004 |
* +---------------+---------------+---------------+---------------+
* | unsigned long kind |
* +---------------+---------------+---------------+---------------+
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_LIVELINESS | 0x000c |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_LIVELINESS | 0x000c |
* +---------------+---------------+---------------+---------------+
* | unsigned long kind |
* +---------------+---------------+---------------+---------------+
* | unsigned long NtpTime.fraction |
* +---------------+---------------+---------------+---------------+
* NDDS 3.1 sends only 'kind' on the wire.
- *
+ *
*/
case PID_LIVELINESS_OFFERED: /* Deprecated */
case PID_LIVELINESS:
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_DURABILITY | 0x0004 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_DURABILITY | 0x0004 |
* +---------------+---------------+---------------+---------------+
* | unsigned long kind |
* +---------------+---------------+---------------+---------------+
break;
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_DURABILITY_SERVICE | 0x0004 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_DURABILITY_SERVICE | 0x0004 |
* +---------------+---------------+---------------+---------------+
* | long NtpTime.seconds |
* +---------------+---------------+---------------+---------------+
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_OWNERSHIP | 0x0004 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_OWNERSHIP | 0x0004 |
* +---------------+---------------+---------------+---------------+
* | unsigned long kind |
* +---------------+---------------+---------------+---------------+
MAX_PARAM_SIZE);
break;
-
+
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_TRANSPORT_PRIORITY | 0x0004 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_TRANSPORT_PRIORITY | 0x0004 |
* +---------------+---------------+---------------+---------------+
* | unsigned long value |
* +---------------+---------------+---------------+---------------+
break;
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_PRESENTATION | 0x0008 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_PRESENTATION | 0x0008 |
* +---------------+---------------+---------------+---------------+
* | unsigned long kind |
* +---------------+---------------+---------------+---------------+
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_DEADLINE | 0x0008 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_DEADLINE | 0x0008 |
* +---------------+---------------+---------------+---------------+
* | long NtpTime.seconds |
* +---------------+---------------+---------------+---------------+
break;
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_DESTINATION_ORDER | 0x0004 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_DESTINATION_ORDER | 0x0004 |
* +---------------+---------------+---------------+---------------+
* | unsigned long kind |
* +---------------+---------------+---------------+---------------+
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_LATENCY_BUDGET | 0x0008 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_LATENCY_BUDGET | 0x0008 |
* +---------------+---------------+---------------+---------------+
* | long NtpTime.seconds |
* +---------------+---------------+---------------+---------------+
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_PARTITION | length |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_PARTITION | length |
* +---------------+---------------+---------------+---------------+
* | unsigned long sequence_size |
* +---------------+---------------+---------------+---------------+
* The value is a sequence of strings.
*/
case PID_PARTITION_OFFERED: /* Deprecated */
- case PID_PARTITION:
+ case PID_PARTITION:
ENSURE_LENGTH(4);
rtps_util_add_seq_string(rtps_parameter_tree,
tvb,
break;
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_LIFESPAN | 0x0008 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_LIFESPAN | 0x0008 |
* +---------------+---------------+---------------+---------------+
* | long NtpTime.seconds |
* +---------------+---------------+---------------+---------------+
break;
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_USER_DATA | length |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_USER_DATA | length |
* +---------------+---------------+---------------+---------------+
* | unsigned long sequence_size |
* +---------------+---------------+---------------+---------------+
* +---------------+---------------+---------------+---------------+
*/
case PID_USER_DATA:
- ENSURE_LENGTH(4);
+ ENSURE_LENGTH(4);
rtps_util_add_seq_octets(rtps_parameter_tree,
tvb,
offset,
break;
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_GROUP_DATA | length |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_GROUP_DATA | length |
* +---------------+---------------+---------------+---------------+
* | unsigned long sequence_size |
* +---------------+---------------+---------------+---------------+
* | ... |
* +---------------+---------------+---------------+---------------+
*/
- case PID_GROUP_DATA:
+ case PID_GROUP_DATA:
ENSURE_LENGTH(4);
rtps_util_add_seq_octets(rtps_parameter_tree,
tvb,
break;
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_TOPIC_DATA | length |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_TOPIC_DATA | length |
* +---------------+---------------+---------------+---------------+
* | unsigned long sequence_size |
* +---------------+---------------+---------------+---------------+
* | ... |
* +---------------+---------------+---------------+---------------+
*/
- case PID_TOPIC_DATA:
+ case PID_TOPIC_DATA:
ENSURE_LENGTH(4);
rtps_util_add_seq_octets(rtps_parameter_tree,
tvb,
break;
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_UNICAST_LOCATOR | 0x0018 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_UNICAST_LOCATOR | 0x0018 |
* +---------------+---------------+---------------+---------------+
* | long kind |
* +---------------+---------------+---------------+---------------+
* | ipv6addr[12] | ipv6addr[13] | ipv6addr[14] | ipv6addr[15] |
* +---------------+---------------+---------------+---------------+
*/
- case PID_UNICAST_LOCATOR:
+ case PID_UNICAST_LOCATOR:
ENSURE_LENGTH(24);
rtps_util_add_locator_t(rtps_parameter_tree,
tvb,
break;
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_DEFAULT_MULTICAST_LOCATOR | 0x0018 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_DEFAULT_MULTICAST_LOCATOR | 0x0018 |
* +---------------+---------------+---------------+---------------+
* | long kind |
* +---------------+---------------+---------------+---------------+
* | ipv6addr[12] | ipv6addr[13] | ipv6addr[14] | ipv6addr[15] |
* +---------------+---------------+---------------+---------------+
*/
- case PID_DEFAULT_MULTICAST_LOCATOR:
+ case PID_DEFAULT_MULTICAST_LOCATOR:
ENSURE_LENGTH(24);
rtps_util_add_locator_t(rtps_parameter_tree,
tvb,
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_MULTICAST_LOCATOR | 0x0018 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_MULTICAST_LOCATOR | 0x0018 |
* +---------------+---------------+---------------+---------------+
* | long kind |
* +---------------+---------------+---------------+---------------+
* | ipv6addr[12] | ipv6addr[13] | ipv6addr[14] | ipv6addr[15] |
* +---------------+---------------+---------------+---------------+
*/
- case PID_MULTICAST_LOCATOR:
+ case PID_MULTICAST_LOCATOR:
ENSURE_LENGTH(24);
rtps_util_add_locator_t(rtps_parameter_tree,
tvb,
break;
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_DEFAULT_UNICAST_LOCATOR | 0x0018 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_DEFAULT_UNICAST_LOCATOR | 0x0018 |
* +---------------+---------------+---------------+---------------+
* | long kind |
* +---------------+---------------+---------------+---------------+
* | ipv6addr[12] | ipv6addr[13] | ipv6addr[14] | ipv6addr[15] |
* +---------------+---------------+---------------+---------------+
*/
- case PID_DEFAULT_UNICAST_LOCATOR:
+ case PID_DEFAULT_UNICAST_LOCATOR:
ENSURE_LENGTH(24);
rtps_util_add_locator_t(rtps_parameter_tree,
tvb,
break;
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_METATRAFFIC_UNICAST_LOC...| 0x0018 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_METATRAFFIC_UNICAST_LOC...| 0x0018 |
* +---------------+---------------+---------------+---------------+
* | long kind |
* +---------------+---------------+---------------+---------------+
* | ipv6addr[12] | ipv6addr[13] | ipv6addr[14] | ipv6addr[15] |
* +---------------+---------------+---------------+---------------+
*/
- case PID_METATRAFFIC_UNICAST_LOCATOR:
+ case PID_METATRAFFIC_UNICAST_LOCATOR:
ENSURE_LENGTH(24);
rtps_util_add_locator_t(rtps_parameter_tree,
tvb,
break;
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_METATRAFFIC_MULTICAST_L...| 0x0018 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_METATRAFFIC_MULTICAST_L...| 0x0018 |
* +---------------+---------------+---------------+---------------+
* | long kind |
* +---------------+---------------+---------------+---------------+
* | ipv6addr[12] | ipv6addr[13] | ipv6addr[14] | ipv6addr[15] |
* +---------------+---------------+---------------+---------------+
*/
- case PID_METATRAFFIC_MULTICAST_LOCATOR:
+ case PID_METATRAFFIC_MULTICAST_LOCATOR:
ENSURE_LENGTH(24);
rtps_util_add_locator_t(rtps_parameter_tree,
tvb,
break;
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_PARTICIPANT_MANUAL_LIVE...| 0x0004 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_PARTICIPANT_MANUAL_LIVE...| 0x0004 |
* +---------------+---------------+---------------+---------------+
* | long livelinessEpoch |
* +---------------+---------------+---------------+---------------+
break;
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_HISTORY | 0x0004 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_HISTORY | 0x0004 |
* +---------------+---------------+---------------+---------------+
* | long kind |
* +---------------+---------------+---------------+---------------+
buffer+strlen(buffer),
MAX_PARAM_SIZE-strlen(buffer));
g_strlcat(buffer, ", ", MAX_PARAM_SIZE);
-
+
rtps_util_add_long(rtps_parameter_tree,
tvb,
offset+4,
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_RESOURCE_LIMIT | 0x0004 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_RESOURCE_LIMIT | 0x0004 |
* +---------------+---------------+---------------+---------------+
* | long max_samples |
* +---------------+---------------+---------------+---------------+
buffer + strlen(buffer),
MAX_PARAM_SIZE-strlen(buffer));
g_strlcat(buffer, ", ", MAX_PARAM_SIZE);
-
+
rtps_util_add_long(rtps_parameter_tree,
tvb,
offset+8,
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_CONTENT_FILTER_PROPERTY | length |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_CONTENT_FILTER_PROPERTY | length |
* +---------------+---------------+---------------+---------------+
* | unsigned long String1.length |
* +---------------+---------------+---------------+---------------+
* | Filter Parameters |
* | ... |
* +---------------+---------------+---------------+---------------+
- *
+ *
* String1: ContentFilterName
* String2: RelatedTopicName
* String3: FilterName
}
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_PROPERTY_LIST | length |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_PROPERTY_LIST | length |
* +---------------+---------------+---------------+---------------+
* | unsigned long Seq.Length |
* +---------------+---------------+---------------+---------------+
* | Property n |
* | ... |
* +---------------+---------------+---------------+---------------+
- *
+ *
* IDL:
* struct PROPERTY {
* String Name;
tvb,
prev_offset,
temp_offset - prev_offset,
- "%-29s | %-29s",
+ "%-29s | %-29s",
tempName,
tempValue);
}
break;
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_CONTENT_FILTER_INFO | length |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_CONTENT_FILTER_INFO | length |
* +---------------+---------------+---------------+---------------+
* | ... |
* +---------------+---------------+---------------+---------------+
- *
+ *
* IDL:
* struct CONTENT_FILTER_SIGNATURE {
* sequence<long> filterBitmap;
guint32 fs_elem;
guint32 fs[4];
ENSURE_LENGTH(8);
-
+
/* Dissect filter bitmap */
temp_offset = rtps_util_add_seq_ulong(rtps_parameter_tree,
tvb,
TRUE, /* is_hex */
FALSE, /* filterSignature: is_signed */
"filterBitmap");
-
+
/* Dissect sequence of FILTER_SIGNATURE */
fs_elem = NEXT_guint32(tvb, temp_offset, little_endian);
temp_offset += 4;
"filterSignature: %08x %08x %08x %08x",
fs[0], fs[1], fs[2], fs[3]);
}
-
+
break;
}
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_COHERENT_SET | length |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_COHERENT_SET | length |
* +---------------+---------------+---------------+---------------+
* | |
* + SequenceNumber seqNumber +
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_BUILTIN_ENDPOINT_SET | length |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_BUILTIN_ENDPOINT_SET | length |
* +---------------+---------------+---------------+---------------+
* | long value |
* +---------------+---------------+---------------+---------------+
}
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_TYPE_MAX_SIZE_SERIALIZED | length |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_TYPE_MAX_SIZE_SERIALIZED | length |
* +---------------+---------------+---------------+---------------+
* | long value |
* +---------------+---------------+---------------+---------------+
buffer,
MAX_PARAM_SIZE);
break;
-
+
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_ORIGINAL_WRITER_INFO | length |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_ORIGINAL_WRITER_INFO | length |
* +---------------+---------------+---------------+---------------+
* | |
* +- -+
* | octet[12] guidPrefix |
* +- -+
- * | |
+ * | |
* +---------------+---------------+---------------+---------------+
* | octet[4] entityId |
* +---------------+---------------+---------------+---------------+
ett_rtps_entity,
"virtualGUIDSuffix",
NULL);
-
+
/* Sequence number */
rtps_util_add_seq_number(rtps_parameter_tree,
tvb,
offset+16,
little_endian,
- "virtualSeqNumber");
+ "virtualSeqNumber");
break;
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_ENTITY_NAME | length |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_ENTITY_NAME | length |
* +---------------+---------------+---------------+---------------+
* | unsigned long String.length |
* +---------------+---------------+---------------+---------------+
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_PARTICIPANT_GUID | 0x0010 |
- * | PID_ENDPOINT_GUID | |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_PARTICIPANT_GUID | 0x0010 |
+ * | PID_ENDPOINT_GUID | |
* +---------------+---------------+---------------+---------------+
* | guid[0] | guid[1] | guid[2] | guid[3] |
* +---------------+---------------+---------------+---------------+
"GUID",
buffer,
MAX_PARAM_SIZE);
-
+
break;
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_PARTICIPANT_ENTITY_ID | 0x0004 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_PARTICIPANT_ENTITY_ID | 0x0004 |
* +---------------+---------------+---------------+---------------+
* | entity[0] | entity[1] | entity[2] | entity[3] |
* +---------------+---------------+---------------+---------------+
break;
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_GROUP_GUID | 0x0010 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_GROUP_GUID | 0x0010 |
* +---------------+---------------+---------------+---------------+
* | guid[0] | guid[1] | guid[2] | guid[3] |
* +---------------+---------------+---------------+---------------+
"Group GUID",
buffer,
MAX_PARAM_SIZE);
-
+
break;
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_GROUP_ENTITY_ID | 0x0004 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_GROUP_ENTITY_ID | 0x0004 |
* +---------------+---------------+---------------+---------------+
* | entity[0] | entity[1] | entity[2] | entity[3] |
* +---------------+---------------+---------------+---------------+
*/
- case PID_GROUP_ENTITY_ID:
+ case PID_GROUP_ENTITY_ID:
ENSURE_LENGTH(4);
rtps_util_add_generic_entity_id(rtps_parameter_tree,
"Group entity ID",
buffer,
MAX_PARAM_SIZE);
-
+
break;
"%c 0x%08x",
sep,
manager_key);
- proto_tree_add_text(rtps_parameter_tree,
- tvb,
- offset,
+ proto_tree_add_text(rtps_parameter_tree,
+ tvb,
+ offset,
param_length,
"Key[%d]: 0x%X", i, manager_key);
++i;
* parameters.
*/
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | <pid_id> | 0x0000 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | <pid_id> | 0x0000 |
* +---------------+---------------+---------------+---------------+
*/
case PID_IS_RELIABLE:
case PID_PAD:
break;
-
+
default:
-
+
/* The following PIDS are vendor-specific */
if (vendor_id == RTPS_VENDOR_RTI) {
switch(parameter) {
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_PRODUCT_VERSION | length |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_PRODUCT_VERSION | length |
* +---------------+---------------+---------------+---------------+
* | uint8 major | uint8 minor | N O T U S E D |
* +---------------+---------------+---------------+---------------+
minor = tvb_get_guint8(tvb, offset+1);
release = tvb_get_guint8(tvb, offset+2);
revision = tvb_get_guint8(tvb, offset+3);
- g_snprintf(buffer, MAX_PARAM_SIZE, "%d.%d%c rev%d",
+ g_snprintf(buffer, MAX_PARAM_SIZE, "%d.%d%c rev%d",
major, minor, release, revision);
proto_tree_add_text(rtps_parameter_tree,
tvb,
offset,
param_length,
- "productVersion: %s",
+ "productVersion: %s",
buffer);
break;
}
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_PLUGIN_PROMISCUITY_KIND | length |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_PLUGIN_PROMISCUITY_KIND | length |
* +---------------+---------------+---------------+---------------+
* | short value | |
* +---------------+---------------+---------------+---------------+
ENSURE_LENGTH(4);
val = NEXT_guint32(tvb, offset, little_endian);
g_snprintf(buffer, MAX_PARAM_SIZE, "%s",
- val_to_str(val, plugin_promiscuity_kind_vals,
+ val_to_str(val, plugin_promiscuity_kind_vals,
"unknown (%04x)"));
proto_tree_add_text(rtps_parameter_tree,
tvb,
offset,
param_length,
- "promiscuityKind: %s",
+ "promiscuityKind: %s",
buffer);
break;
}
-
+
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_ENTITY_VIRTUAL_GUID | length |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_ENTITY_VIRTUAL_GUID | length |
* +---------------+---------------+---------------+---------------+
* | |
* +- -+
* | octet[12] guidPrefix |
* +- -+
- * | |
+ * | |
* +---------------+---------------+---------------+---------------+
* | octet[4] entityId |
* +---------------+---------------+---------------+---------------+
hf_rtps_sm_entity_id_kind,
ett_rtps_entity,
"virtualGUIDSuffix",
- NULL);
+ NULL);
break;
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_SERVICE_KIND | length |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_SERVICE_KIND | length |
* +---------------+---------------+---------------+---------------+
* | long value |
* +---------------+---------------+---------------+---------------+
guint32 val;
ENSURE_LENGTH(4);
val = NEXT_guint32(tvb, offset, little_endian);
-
+
g_snprintf(buffer, MAX_PARAM_SIZE, "%s",
val_to_str(val, service_kind_vals, "unknown (%04x)"));
tvb,
offset,
param_length,
- "serviceKind: %s",
+ "serviceKind: %s",
buffer);
break;
}
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PID_TYPECODE | length |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PID_TYPECODE | length |
* +---------------+---------------+---------------+---------------+
* | |
* + Type code description +
} /* End of switch for parameters for vendor RTI */
} /* End of branch vendor RTI */
-
+
/* Put here other branches if you are planning to dissect parameters
* ID from different vendors.
*/
-
+
else {
if (param_length > 0) {
proto_tree_add_text(rtps_parameter_tree,
/* *********************************************************************** */
/* * P A D * */
/* *********************************************************************** */
-static void dissect_PAD(tvbuff_t *tvb,
- gint offset,
- guint8 flags,
+static void dissect_PAD(tvbuff_t *tvb,
+ gint offset,
+ guint8 flags,
gboolean little_endian,
- int octets_to_next_header,
+ int octets_to_next_header,
proto_tree *tree,
- char * info_summary_text,
+ char * info_summary_text,
guint16 G_GNUC_UNUSED vendor_id) {
/* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | PAD |X|X|X|X|X|X|X|E| octetsToNextHeader |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | PAD |X|X|X|X|X|X|X|E| octetsToNextHeader |
* +---------------+---------------+---------------+---------------+
*/
if (tree) {
rtps_util_decode_flags(tree, tvb, offset + 1, flags, PAD_FLAGS);
-
+
if (octets_to_next_header != 0) {
proto_tree_add_uint_format(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset + 2,
+ tvb,
+ offset + 2,
2,
octets_to_next_header,
"octetsToNextHeader: %u (Error: should be ZERO)",
octets_to_next_header);
return;
}
-
- proto_tree_add_item(tree,
+
+ proto_tree_add_item(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset + 2,
- 2,
+ tvb,
+ offset + 2,
+ 2,
little_endian);
}
info_summary_append(info_summary_text, SUBMESSAGE_PAD, NULL);
/* *********************************************************************** */
/* * D A T A * */
/* *********************************************************************** */
-static void dissect_DATA(tvbuff_t *tvb,
- gint offset,
- guint8 flags,
+static void dissect_DATA(tvbuff_t *tvb,
+ gint offset,
+ guint8 flags,
gboolean little_endian,
- int octets_to_next_header,
+ int octets_to_next_header,
proto_tree *tree,
- char * info_summary_text,
+ char * info_summary_text,
guint16 vendor_id) {
- /*
+ /*
*
* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | DATA |X|X|X|I|H|D|Q|E| octetsToNextHeader |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | DATA |X|X|X|I|H|D|Q|E| octetsToNextHeader |
* +---------------+---------------+---------------+---------------+
* | EntityId readerEntityId |
* +---------------+---------------+---------------+---------------+
* ~ ParameterList inlineQos [only if Q==1] ~
* | |
* +---------------+---------------+---------------+---------------+
- * | |
+ * | |
* ~ SerializedData serializedData [only if D==1] ~
* | |
* +---------------+---------------+---------------+---------------+
if ((flags & FLAG_DATA_H) != 0) min_len += 12;
if (octets_to_next_header < min_len) {
- if (tree) proto_tree_add_uint_format(tree,
+ if (tree) proto_tree_add_uint_format(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset+2,
- 2,
+ tvb,
+ offset+2,
+ 2,
octets_to_next_header,
"octetsToNextHeader: %u (Error: should be >= %u)",
- octets_to_next_header,
+ octets_to_next_header,
min_len);
return;
}
return;
}
- if (tree) proto_tree_add_item(tree,
+ if (tree) proto_tree_add_item(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset + 2,
- 2,
+ tvb,
+ offset + 2,
+ 2,
little_endian);
offset += 4;
little_endian,
"writerSeqNumber");
offset += 8;
-
+
/* If flag H is defined, read the GUID Prefix */
if ((flags & FLAG_DATA_H) != 0) {
rtps_util_add_guid_prefix(tree,
} else {
/* Flag H not set, use hostId, appId from the packet header */
}
-
+
/* Complete the GUID by reading the Object ID */
rtps_util_add_entity_id(tree,
tvb,
/* InlineQos */
if ((flags & FLAG_DATA_Q) != 0) {
- offset = dissect_parameter_sequence(tree,
- tvb,
- offset,
- little_endian,
+ offset = dissect_parameter_sequence(tree,
+ tvb,
+ offset,
+ little_endian,
octets_to_next_header - (offset - old_offset) + 4,
"inlineQos",
NULL,
/* SerializedData */
if ((flags & FLAG_DATA_D) != 0) {
- dissect_serialized_data(tree,
- tvb,
- offset,
+ dissect_serialized_data(tree,
+ tvb,
+ offset,
octets_to_next_header - (offset - old_offset) + 4,
"serializedData",
vendor_id);
/* *********************************************************************** */
/* * D A T A _ F R A G * */
/* *********************************************************************** */
-static void dissect_DATA_FRAG(tvbuff_t *tvb,
- gint offset,
- guint8 flags,
+static void dissect_DATA_FRAG(tvbuff_t *tvb,
+ gint offset,
+ guint8 flags,
gboolean little_endian,
- int octets_to_next_header,
+ int octets_to_next_header,
proto_tree *tree,
char *info_summary_text,
guint16 vendor_id) {
/*
* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | DATA_FRAG |X|X|X|X|X|H|Q|E| octetsToNextHeader |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | DATA_FRAG |X|X|X|X|X|H|Q|E| octetsToNextHeader |
* +---------------+---------------+---------------+---------------+
* | EntityId readerEntityId |
* +---------------+---------------+---------------+---------------+
if ((flags & FLAG_DATA_FRAG_H) != 0) min_len += 12;
if (octets_to_next_header < min_len) {
- proto_tree_add_uint_format(tree,
+ proto_tree_add_uint_format(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset+2,
- 2,
+ tvb,
+ offset+2,
+ 2,
octets_to_next_header,
"octetsToNextHeader: %u (Error: should be >= %u)",
- octets_to_next_header,
+ octets_to_next_header,
min_len);
return;
}
return;
}
- proto_tree_add_item(tree,
+ proto_tree_add_item(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset + 2,
- 2,
+ tvb,
+ offset + 2,
+ 2,
little_endian);
offset += 4;
} else {
/* Flag H not set, use hostId, appId from the packet header */
}
-
+
/* Complete the GUID by reading the Object ID */
rtps_util_add_entity_id(tree,
tvb,
NULL,
0);
offset += 4;
-
+
/* Fragments in submessage */
rtps_util_add_short(tree,
tvb,
NULL,
0);
offset += 2;
-
+
/* sampleSize */
rtps_util_add_long(tree,
tvb,
/* InlineQos */
if ((flags & FLAG_DATA_Q) != 0) {
- offset = dissect_parameter_sequence(tree,
- tvb,
- offset,
- little_endian,
+ offset = dissect_parameter_sequence(tree,
+ tvb,
+ offset,
+ little_endian,
octets_to_next_header - (offset - old_offset) + 4,
"inlineQos",
NULL,
/* SerializedData */
if ((flags & FLAG_DATA_D) != 0) {
- dissect_serialized_data(tree,
- tvb,
- offset,
+ dissect_serialized_data(tree,
+ tvb,
+ offset,
octets_to_next_header - (offset - old_offset) + 4,
"serializedData",
vendor_id);
/* *********************************************************************** */
/* * N O K E Y _ D A T A * */
/* *********************************************************************** */
-static void dissect_NOKEY_DATA(tvbuff_t *tvb,
- gint offset,
- guint8 flags,
+static void dissect_NOKEY_DATA(tvbuff_t *tvb,
+ gint offset,
+ guint8 flags,
gboolean little_endian,
- int octets_to_next_header,
+ int octets_to_next_header,
proto_tree *tree,
- char * info_summary_text,
+ char * info_summary_text,
guint16 vendor_id) {
/*
* RTPS 2.0:
* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | NOKEY_DATA |X|X|X|X|X|D|Q|E| octetsToNextHeader |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | NOKEY_DATA |X|X|X|X|X|D|Q|E| octetsToNextHeader |
* +---------------+---------------+---------------+---------------+
* | EntityId readerEntityId |
* +---------------+---------------+---------------+---------------+
if ((flags & FLAG_NOKEY_DATA_Q) != 0) min_len += 4;
if (octets_to_next_header < min_len) {
- proto_tree_add_uint_format(tree,
+ proto_tree_add_uint_format(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset+2,
- 2,
+ tvb,
+ offset+2,
+ 2,
octets_to_next_header,
"octetsToNextHeader: %u (Error: should be >= %u)",
- octets_to_next_header,
+ octets_to_next_header,
min_len);
return;
}
return;
}
- proto_tree_add_item(tree,
+ proto_tree_add_item(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset + 2,
- 2,
+ tvb,
+ offset + 2,
+ 2,
little_endian);
offset += 4;
/* InlineQos */
if ((flags & FLAG_DATA_Q) != 0) {
- offset = dissect_parameter_sequence(tree,
- tvb,
- offset,
- little_endian,
+ offset = dissect_parameter_sequence(tree,
+ tvb,
+ offset,
+ little_endian,
octets_to_next_header - (offset - old_offset) + 4,
"inlineQos",
NULL,
/* SerializedData */
if ((flags & FLAG_DATA_D) != 0) {
- dissect_serialized_data(tree,
- tvb,
- offset,
+ dissect_serialized_data(tree,
+ tvb,
+ offset,
octets_to_next_header - (offset - old_offset) + 4,
"serializedData",
vendor_id);
/* *********************************************************************** */
/* * N O K E Y _ D A T A _ F R A G * */
/* *********************************************************************** */
-static void dissect_NOKEY_DATA_FRAG(tvbuff_t *tvb,
- gint offset,
- guint8 flags,
+static void dissect_NOKEY_DATA_FRAG(tvbuff_t *tvb,
+ gint offset,
+ guint8 flags,
gboolean little_endian,
- int octets_to_next_header,
+ int octets_to_next_header,
proto_tree *tree,
- char * info_summary_text,
+ char * info_summary_text,
guint16 vendor_id) {
/*
* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * |NOKEY_DATA_FRAG|X|X|X|X|X|X|Q|E| octetsToNextHeader |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |NOKEY_DATA_FRAG|X|X|X|X|X|X|Q|E| octetsToNextHeader |
* +---------------+---------------+---------------+---------------+
* | EntityId readerEntityId |
* +---------------+---------------+---------------+---------------+
if ((flags & FLAG_NOKEY_DATA_Q) != 0) min_len += 4;
if (octets_to_next_header < min_len) {
- proto_tree_add_uint_format(tree,
+ proto_tree_add_uint_format(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset+2,
- 2,
+ tvb,
+ offset+2,
+ 2,
octets_to_next_header,
"octetsToNextHeader: %u (Error: should be >= %u)",
- octets_to_next_header,
+ octets_to_next_header,
min_len);
return;
}
return;
}
- proto_tree_add_item(tree,
+ proto_tree_add_item(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset + 2,
- 2,
+ tvb,
+ offset + 2,
+ 2,
little_endian);
offset += 4;
NULL,
0);
offset += 4;
-
+
/* Fragments in submessage */
rtps_util_add_short(tree,
tvb,
/* InlineQos */
if ((flags & FLAG_DATA_Q) != 0) {
- offset = dissect_parameter_sequence(tree,
- tvb,
- offset,
- little_endian,
+ offset = dissect_parameter_sequence(tree,
+ tvb,
+ offset,
+ little_endian,
octets_to_next_header - (offset - old_offset) + 4,
"inlineQos",
NULL,
/* SerializedData */
if ((flags & FLAG_DATA_D) != 0) {
- dissect_serialized_data(tree,
- tvb,
- offset,
+ dissect_serialized_data(tree,
+ tvb,
+ offset,
octets_to_next_header - (offset - old_offset) + 4,
"serializedData",
vendor_id);
/* *********************************************************************** */
/* * A C K N A C K * */
/* *********************************************************************** */
-static void dissect_ACKNACK(tvbuff_t *tvb,
- gint offset,
- guint8 flags,
+static void dissect_ACKNACK(tvbuff_t *tvb,
+ gint offset,
+ guint8 flags,
gboolean little_endian,
- int octets_to_next_header,
+ int octets_to_next_header,
proto_tree *tree,
- char * info_summary_text,
+ char * info_summary_text,
guint16 G_GNUC_UNUSED vendor_id ) {
/*
* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | ACKNACK |X|X|X|X|X|X|F|E| octetsToNextHeader |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ACKNACK |X|X|X|X|X|X|F|E| octetsToNextHeader |
* +---------------+---------------+---------------+---------------+
* | EntityId readerEntityId |
* +---------------+---------------+---------------+---------------+
rtps_util_decode_flags(tree, tvb, offset + 1, flags, ACKNACK_FLAGS);
if (octets_to_next_header < 20) {
- proto_tree_add_uint_format(tree,
+ proto_tree_add_uint_format(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset + 2,
- 2,
+ tvb,
+ offset + 2,
+ 2,
octets_to_next_header,
"octetsToNextHeader: %u (Error: should be >= 20)",
octets_to_next_header);
return;
}
- proto_tree_add_item(tree,
+ proto_tree_add_item(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset + 2,
- 2,
+ tvb,
+ offset + 2,
+ 2,
little_endian);
offset += 4;
original_offset = offset;
TRUE, /* Is Signed ? */
"counter", /* No Label, use the protocol item ID */
NULL,
- 0);
+ 0);
} else if (offset < original_offset + octets_to_next_header) {
/* In this case there must be something wrong in the bitmap: there
* are some extra bytes that we don't know how to decode
*/
- proto_tree_add_text(tree,
- tvb,
- offset,
- octets_to_next_header - offset,
+ proto_tree_add_text(tree,
+ tvb,
+ offset,
+ octets_to_next_header - offset,
"Packet malformed: don't know how to decode those "
- "extra bytes: %d",
+ "extra bytes: %d",
octets_to_next_header - offset);
} else if (offset > original_offset + octets_to_next_header) {
/* Decoding the bitmap went over the end of this submessage.
* Enter an item in the protocol tree that spans over the entire
* submessage.
*/
- proto_tree_add_text(tree,
- tvb,
- original_offset,
+ proto_tree_add_text(tree,
+ tvb,
+ original_offset,
octets_to_next_header + original_offset,
"Packet malformed: not enough bytes to decode");
}
/* *********************************************************************** */
/* * N A C K _ F R A G * */
/* *********************************************************************** */
-static void dissect_NACK_FRAG(tvbuff_t *tvb,
- gint offset,
- guint8 flags,
+static void dissect_NACK_FRAG(tvbuff_t *tvb,
+ gint offset,
+ guint8 flags,
gboolean little_endian,
- int octets_to_next_header,
+ int octets_to_next_header,
proto_tree *tree,
- char * info_summary_text,
+ char * info_summary_text,
guint16 G_GNUC_UNUSED vendor_id ) {
/*
* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | NACK_FRAG |X|X|X|X|X|X|X|E| octetsToNextHeader |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | NACK_FRAG |X|X|X|X|X|X|X|E| octetsToNextHeader |
* +---------------+---------------+---------------+---------------+
* | EntityId readerEntityId |
* +---------------+---------------+---------------+---------------+
rtps_util_decode_flags(tree, tvb, offset + 1, flags, NACK_FRAG_FLAGS);
if (octets_to_next_header < 24) {
- proto_tree_add_uint_format(tree,
+ proto_tree_add_uint_format(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset + 2,
- 2,
+ tvb,
+ offset + 2,
+ 2,
octets_to_next_header,
"octetsToNextHeader: %u (Error: should be >= 24)",
octets_to_next_header);
}
- proto_tree_add_item(tree,
+ proto_tree_add_item(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset + 2,
- 2,
+ tvb,
+ offset + 2,
+ 2,
little_endian);
offset += 4;
TRUE, /* Is Signed ? */
"count", /* No Label, use the protocol item ID */
NULL,
- 0);
+ 0);
}
/* *********************************************************************** */
-/* * H E A R T B E A T * */
+/* * H E A R T B E A T * */
/* *********************************************************************** */
-static void dissect_HEARTBEAT(tvbuff_t *tvb,
- gint offset,
- guint8 flags,
+static void dissect_HEARTBEAT(tvbuff_t *tvb,
+ gint offset,
+ guint8 flags,
gboolean little_endian,
- int octets_to_next_header,
+ int octets_to_next_header,
proto_tree *tree,
- char * info_summary_text,
+ char * info_summary_text,
guint16 G_GNUC_UNUSED vendor_id) {
- /*
+ /*
* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | HEARTBEAT |X|X|X|X|X|L|F|E| octetsToNextHeader |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | HEARTBEAT |X|X|X|X|X|L|F|E| octetsToNextHeader |
* +---------------+---------------+---------------+---------------+
* | EntityId readerEntityId |
* +---------------+---------------+---------------+---------------+
if (octets_to_next_header < 28) {
- proto_tree_add_uint_format(tree,
+ proto_tree_add_uint_format(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset+2,
- 2,
+ tvb,
+ offset+2,
+ 2,
octets_to_next_header,
"octetsToNextHeader: %u (Error: should be >= 28)",
octets_to_next_header);
return;
}
- proto_tree_add_item(tree,
+ proto_tree_add_item(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset + 2,
- 2,
+ tvb,
+ offset + 2,
+ 2,
little_endian);
offset += 4;
/* *********************************************************************** */
-/* * H E A R T B E A T _ B A T C H * */
+/* * H E A R T B E A T _ B A T C H * */
/* *********************************************************************** */
-static void dissect_HEARTBEAT_BATCH(tvbuff_t *tvb,
- gint offset,
- guint8 flags,
+static void dissect_HEARTBEAT_BATCH(tvbuff_t *tvb,
+ gint offset,
+ guint8 flags,
gboolean little_endian,
- int octets_to_next_header,
+ int octets_to_next_header,
proto_tree *tree,
- char * info_summary_text,
+ char * info_summary_text,
guint16 G_GNUC_UNUSED vendor_id) {
- /*
+ /*
* 0...2...........7...............15.............23...............31
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * |HEARTBEAT_BATCH|X|X|X|X|X|L|F|E| octetsToNextHeader |
+ * |HEARTBEAT_BATCH|X|X|X|X|X|L|F|E| octetsToNextHeader |
* +---------------+---------------+---------------+---------------+
* | EntityId readerId |
* +---------------+---------------+---------------+---------------+
if (octets_to_next_header < 36) {
- proto_tree_add_uint_format(tree,
+ proto_tree_add_uint_format(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset+2,
- 2,
+ tvb,
+ offset+2,
+ 2,
octets_to_next_header,
"octetsToNextHeader: %u (Error: should be >= 36)",
octets_to_next_header);
info_summary_append(info_summary_text, SUBMESSAGE_HEARTBEAT, NULL);
return;
}
- proto_tree_add_item(tree,
+ proto_tree_add_item(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset + 2,
- 2,
+ tvb,
+ offset + 2,
+ 2,
little_endian);
offset += 4;
/* *********************************************************************** */
-/* * H E A R T B E A T _ F R A G * */
+/* * H E A R T B E A T _ F R A G * */
/* *********************************************************************** */
-static void dissect_HEARTBEAT_FRAG(tvbuff_t *tvb,
- gint offset,
- guint8 flags,
+static void dissect_HEARTBEAT_FRAG(tvbuff_t *tvb,
+ gint offset,
+ guint8 flags,
gboolean little_endian,
- int octets_to_next_header,
+ int octets_to_next_header,
proto_tree *tree,
- char * info_summary_text,
+ char * info_summary_text,
guint16 G_GNUC_UNUSED vendor_id) {
- /*
+ /*
* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * |HEARTBEAT_FRAG |X|X|X|X|X|X|X|E| octetsToNextHeader |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |HEARTBEAT_FRAG |X|X|X|X|X|X|X|E| octetsToNextHeader |
* +---------------+---------------+---------------+---------------+
* | EntityId readerEntityId |
* +---------------+---------------+---------------+---------------+
rtps_util_decode_flags(tree, tvb, offset + 1, flags, HEARTBEAT_FRAG_FLAGS);
if (octets_to_next_header < 24) {
- proto_tree_add_uint_format(tree,
+ proto_tree_add_uint_format(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset+2,
- 2,
+ tvb,
+ offset+2,
+ 2,
octets_to_next_header,
"octetsToNextHeader: %u (Error: should be >= 24)",
octets_to_next_header);
return;
}
- proto_tree_add_item(tree,
+ proto_tree_add_item(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset + 2,
- 2,
+ tvb,
+ offset + 2,
+ 2,
little_endian);
offset += 4;
/* *********************************************************************** */
/* * G A P * */
/* *********************************************************************** */
-static void dissect_GAP(tvbuff_t *tvb,
- gint offset,
- guint8 flags,
+static void dissect_GAP(tvbuff_t *tvb,
+ gint offset,
+ guint8 flags,
gboolean little_endian,
- int octets_to_next_header,
+ int octets_to_next_header,
proto_tree *tree,
- char * info_summary_text,
+ char * info_summary_text,
guint16 G_GNUC_UNUSED vendor_id) {
- /*
+ /*
* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | GAP |X|X|X|X|X|X|X|E| octetsToNextHeader |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | GAP |X|X|X|X|X|X|X|E| octetsToNextHeader |
* +---------------+---------------+---------------+---------------+
* | EntityId readerEntityId |
* +---------------+---------------+---------------+---------------+
rtps_util_decode_flags(tree, tvb, offset + 1, flags, GAP_FLAGS);
if (octets_to_next_header < 24) {
- proto_tree_add_uint_format(tree,
+ proto_tree_add_uint_format(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset + 2,
- 2,
+ tvb,
+ offset + 2,
+ 2,
octets_to_next_header,
"octetsToNextHeader: %u (Error: should be >= 24)",
octets_to_next_header);
return;
}
- proto_tree_add_item(tree,
+ proto_tree_add_item(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset + 2,
- 2,
+ tvb,
+ offset + 2,
+ 2,
little_endian);
offset += 4;
/* *********************************************************************** */
/* * I N F O _ T S * */
/* *********************************************************************** */
-static void dissect_INFO_TS(tvbuff_t *tvb,
- gint offset,
- guint8 flags,
+static void dissect_INFO_TS(tvbuff_t *tvb,
+ gint offset,
+ guint8 flags,
gboolean little_endian,
- int octets_to_next_header,
+ int octets_to_next_header,
proto_tree *tree,
- char * info_summary_text,
+ char * info_summary_text,
guint16 G_GNUC_UNUSED vendor_id) {
/*
* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | INFO_TS |X|X|X|X|X|X|I|E| octetsToNextHeader |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | INFO_TS |X|X|X|X|X|X|I|E| octetsToNextHeader |
* +---------------+---------------+---------------+---------------+
* | |
* + Timestamp timestamp [only if I==1] +
if ((flags & FLAG_INFO_TS_T) == 0) min_len += 8;
if (octets_to_next_header != min_len) {
- proto_tree_add_uint_format(tree,
+ proto_tree_add_uint_format(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset+2,
- 2,
+ tvb,
+ offset+2,
+ 2,
octets_to_next_header,
"octetsToNextHeader: %u (Error: should be == %u)",
- octets_to_next_header,
+ octets_to_next_header,
min_len);
return;
}
return;
}
- proto_tree_add_item(tree,
+ proto_tree_add_item(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset + 2,
- 2,
+ tvb,
+ offset + 2,
+ 2,
little_endian);
offset += 4;
/* *********************************************************************** */
/* * I N F O _ S R C * */
/* *********************************************************************** */
-static void dissect_INFO_SRC(tvbuff_t *tvb,
- gint offset,
- guint8 flags,
+static void dissect_INFO_SRC(tvbuff_t *tvb,
+ gint offset,
+ guint8 flags,
gboolean little_endian,
- int octets_to_next_header,
+ int octets_to_next_header,
proto_tree *tree,
- char * info_summary_text,
+ char * info_summary_text,
guint16 G_GNUC_UNUSED vendor_id) {
/*
* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | INFO_SRC |X|X|X|X|X|X|X|E| octetsToNextHeader |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | INFO_SRC |X|X|X|X|X|X|X|E| octetsToNextHeader |
* +---------------+---------------+---------------+---------------+
* | long unused |
* +---------------+---------------+---------------+---------------+
rtps_util_decode_flags(tree, tvb, offset + 1, flags, INFO_SRC_FLAGS);
if (octets_to_next_header != 16) {
- proto_tree_add_uint_format(tree,
+ proto_tree_add_uint_format(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset+2,
- 2,
+ tvb,
+ offset+2,
+ 2,
octets_to_next_header,
"octetsToNextHeader: %u (Error: should be == 16)",
octets_to_next_header);
return;
}
- proto_tree_add_item(tree,
+ proto_tree_add_item(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset + 2,
- 2,
+ tvb,
+ offset + 2,
+ 2,
little_endian);
offset += 4;
offset,
2,
"version: %d.%d",
- major,
+ major,
minor);
offset += 2;
}
guint8 vendor[MAX_VENDOR_ID_SIZE];
rtps_util_add_vendor_id(NULL,
tvb,
- offset,
- vendor,
+ offset,
+ vendor,
MAX_VENDOR_ID_SIZE);
proto_tree_add_text(tree,
tvb,
vendor);
offset += 2;
}
-
- {
+
+ {
/* guint8 temp_buffer[MAX_GUID_PREFIX_SIZE]; */
rtps_util_add_guid_prefix(tree,
tvb,
/* *********************************************************************** */
/* * I N F O _ R E P L Y _ I P 4 * */
/* *********************************************************************** */
-static void dissect_INFO_REPLY_IP4(tvbuff_t *tvb,
- gint offset,
- guint8 flags,
+static void dissect_INFO_REPLY_IP4(tvbuff_t *tvb,
+ gint offset,
+ guint8 flags,
gboolean little_endian,
- int octets_to_next_header,
+ int octets_to_next_header,
proto_tree *tree,
- char * info_summary_text,
+ char * info_summary_text,
guint16 G_GNUC_UNUSED vendor_id) {
/*
* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * |INFO_REPLY_IP4 |X|X|X|X|X|X|M|E| octetsToNextHeader |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |INFO_REPLY_IP4 |X|X|X|X|X|X|M|E| octetsToNextHeader |
* +---------------+---------------+---------------+---------------+
* | |
* + LocatorUDPv4 unicastReplyLocator +
if (octets_to_next_header != min_len) {
- proto_tree_add_uint_format(tree,
+ proto_tree_add_uint_format(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset+2,
- 2,
+ tvb,
+ offset+2,
+ 2,
octets_to_next_header,
"octetsToNextHeader: %u (Error: should be == %u)",
octets_to_next_header,
info_summary_append(info_summary_text, SUBMESSAGE_INFO_REPLY_IP4, NULL);
return;
}
- proto_tree_add_item(tree,
+ proto_tree_add_item(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset + 2,
- 2,
+ tvb,
+ offset + 2,
+ 2,
little_endian);
offset += 4;
/* *********************************************************************** */
/* * I N F O _ D S T * */
/* *********************************************************************** */
-static void dissect_INFO_DST(tvbuff_t *tvb,
- gint offset,
- guint8 flags,
+static void dissect_INFO_DST(tvbuff_t *tvb,
+ gint offset,
+ guint8 flags,
gboolean little_endian,
- int octets_to_next_header,
+ int octets_to_next_header,
proto_tree *tree,
- char * info_summary_text,
+ char * info_summary_text,
guint16 G_GNUC_UNUSED vendor_id) {
- /*
+ /*
* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | INFO_DST |X|X|X|X|X|X|X|E| octetsToNextHeader |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | INFO_DST |X|X|X|X|X|X|X|E| octetsToNextHeader |
* +---------------+---------------+---------------+---------------+
* | |
* + +
rtps_util_decode_flags(tree, tvb, offset + 1, flags, INFO_DST_FLAGS);
if (octets_to_next_header != 12) {
- proto_tree_add_uint_format(tree,
+ proto_tree_add_uint_format(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset+2,
- 2,
+ tvb,
+ offset+2,
+ 2,
octets_to_next_header,
"octetsToNextHeader: %u (Error: should be == 12)",
octets_to_next_header);
return;
}
- proto_tree_add_item(tree,
+ proto_tree_add_item(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset + 2,
- 2,
+ tvb,
+ offset + 2,
+ 2,
little_endian);
offset += 4;
/* *********************************************************************** */
/* * I N F O _ R E P L Y * */
/* *********************************************************************** */
-static void dissect_INFO_REPLY(tvbuff_t *tvb,
- gint offset,
- guint8 flags,
+static void dissect_INFO_REPLY(tvbuff_t *tvb,
+ gint offset,
+ guint8 flags,
gboolean little_endian,
- int octets_to_next_header,
+ int octets_to_next_header,
proto_tree *tree,
- char * info_summary_text,
+ char * info_summary_text,
guint16 G_GNUC_UNUSED vendor_id) {
- /*
+ /*
* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | INFO_REPLY |X|X|X|X|X|X|M|E| octetsToNextHeader |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | INFO_REPLY |X|X|X|X|X|X|M|E| octetsToNextHeader |
* +---------------+---------------+---------------+---------------+
* | |
* ~ LocatorList unicastReplyLocatorList ~
if (octets_to_next_header != min_len) {
- proto_tree_add_uint_format(tree,
+ proto_tree_add_uint_format(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset+2,
- 2,
+ tvb,
+ offset+2,
+ 2,
octets_to_next_header,
"octetsToNextHeader: %u (Error: should be == %u)",
octets_to_next_header,
return;
}
- proto_tree_add_item(tree,
+ proto_tree_add_item(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset + 2,
- 2,
+ tvb,
+ offset + 2,
+ 2,
little_endian);
offset += 4;
/* *********************************************************************** */
/* * R T P S _ D A T A * */
/* *********************************************************************** */
-static void dissect_RTPS_DATA(tvbuff_t *tvb,
- gint offset,
- guint8 flags,
+static void dissect_RTPS_DATA(tvbuff_t *tvb,
+ gint offset,
+ guint8 flags,
gboolean little_endian,
- int octets_to_next_header,
+ int octets_to_next_header,
proto_tree *tree,
- char * info_summary_text,
+ char * info_summary_text,
guint16 vendor_id) {
- /*
+ /*
*
* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | RTPS_DATA |X|X|X|X|X|D|Q|E| octetsToNextHeader |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | RTPS_DATA |X|X|X|X|X|D|Q|E| octetsToNextHeader |
* +---------------+---------------+---------------+---------------+
- * | Flags extraFlags | octetsToInlineQos |
+ * | Flags extraFlags | octetsToInlineQos |
* +---------------+---------------+---------------+---------------+
* | EntityId readerEntityId |
* +---------------+---------------+---------------+---------------+
* ~ ParameterList inlineQos [only if Q==1] ~
* | |
* +---------------+---------------+---------------+---------------+
- * | |
+ * | |
* ~ SerializedData serializedData [only if D==1] ~
* | |
* +---------------+---------------+---------------+---------------+
if ((flags & FLAG_RTPS_DATA_D) != 0) min_len += 4;
if (octets_to_next_header < min_len) {
- proto_tree_add_uint_format(tree,
+ proto_tree_add_uint_format(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset+2,
- 2,
+ tvb,
+ offset+2,
+ 2,
octets_to_next_header,
"octetsToNextHeader: %u (Error: should be >= %u)",
- octets_to_next_header,
+ octets_to_next_header,
min_len);
return;
}
offset += 12;
/* writerEntityId */
wid = NEXT_guint32(tvb, offset, little_endian);
-
+
offset += 12;
if ((flags & FLAG_DATA_Q) != 0) {
- offset = dissect_parameter_sequence(tree,
- tvb,
- offset,
- little_endian,
+ offset = dissect_parameter_sequence(tree,
+ tvb,
+ offset,
+ little_endian,
octets_to_next_header - (offset - old_offset) + 4,
"inlineQos",
&status_info,
return;
}
- proto_tree_add_item(tree,
+ proto_tree_add_item(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset + 2,
- 2,
+ tvb,
+ offset + 2,
+ 2,
little_endian);
offset += 4;
rtps_util_add_extra_flags(tree,
tvb,
offset,
- "Extra flags:");
+ "Extra flags:");
offset += 2;
/* octetsToInlineQos */
little_endian,
"writerSeqNumber");
offset += 8;
-
+
/* InlineQos */
if ((flags & FLAG_DATA_Q) != 0) {
- offset = dissect_parameter_sequence(tree,
- tvb,
- offset,
- little_endian,
+ offset = dissect_parameter_sequence(tree,
+ tvb,
+ offset,
+ little_endian,
octets_to_next_header - (offset - old_offset) + 4,
"inlineQos",
&status_info,
"ParticipantMessageData");
guid_tree = proto_item_add_subtree(ti,
ett_rtps_part_message_data);
-
+
rtps_util_add_guid_prefix(guid_tree,
tvb,
offset,
NULL,
0);
offset += 12;
-
+
/* Kind */
kind = NEXT_guint32(tvb, offset, 0); /* Always big endian */
- proto_tree_add_text(guid_tree,
+ proto_tree_add_text(guid_tree,
tvb,
offset,
4,
offset += 4;
dissect_octet_seq(guid_tree,
- tvb,
- offset,
+ tvb,
+ offset,
"serializedData");
} else {
/* At the end still dissect the rest of the bytes as raw data */
- dissect_serialized_data(tree,
- tvb,
- offset,
+ dissect_serialized_data(tree,
+ tvb,
+ offset,
octets_to_next_header - (offset - old_offset) + 4,
"serializedData",
vendor_id);
/* *********************************************************************** */
/* * R T P S _ D A T A _ F R A G * */
/* *********************************************************************** */
-static void dissect_RTPS_DATA_FRAG(tvbuff_t *tvb,
- gint offset,
- guint8 flags,
+static void dissect_RTPS_DATA_FRAG(tvbuff_t *tvb,
+ gint offset,
+ guint8 flags,
gboolean little_endian,
- int octets_to_next_header,
+ int octets_to_next_header,
proto_tree *tree,
- char * info_summary_text,
+ char * info_summary_text,
guint16 vendor_id) {
- /*
+ /*
*
* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * |RTPS_DATA_FRAG |X|X|X|X|X|X|Q|E| octetsToNextHeader |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |RTPS_DATA_FRAG |X|X|X|X|X|X|Q|E| octetsToNextHeader |
* +---------------+---------------+---------------+---------------+
- * | Flags extraFlags | octetsToInlineQos |
+ * | Flags extraFlags | octetsToInlineQos |
* +---------------+---------------+---------------+---------------+
* | EntityId readerEntityId |
* +---------------+---------------+---------------+---------------+
* ~ ParameterList inlineQos [only if Q==1] ~
* | |
* +---------------+---------------+---------------+---------------+
- * | |
+ * | |
* ~ SerializedData serializedData ~
* | |
* +---------------+---------------+---------------+---------------+
if ((flags & FLAG_RTPS_DATA_FRAG_Q) != 0) min_len += 4;
if (octets_to_next_header < min_len) {
- proto_tree_add_uint_format(tree,
+ proto_tree_add_uint_format(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset+2,
- 2,
+ tvb,
+ offset+2,
+ 2,
octets_to_next_header,
"octetsToNextHeader: %u (Error: should be >= %u)",
- octets_to_next_header,
+ octets_to_next_header,
min_len);
return;
}
offset += 12;
/* writerEntityId */
wid = NEXT_guint32(tvb, offset, little_endian);
-
+
offset += 24;
if ((flags & FLAG_DATA_Q) != 0) {
- offset = dissect_parameter_sequence(tree,
- tvb,
- offset,
- little_endian,
+ offset = dissect_parameter_sequence(tree,
+ tvb,
+ offset,
+ little_endian,
octets_to_next_header - (offset - old_offset) + 4,
"inlineQos",
&status_info,
return;
}
- proto_tree_add_item(tree,
+ proto_tree_add_item(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset + 2,
- 2,
+ tvb,
+ offset + 2,
+ 2,
little_endian);
offset += 4;
rtps_util_add_extra_flags(tree,
tvb,
offset,
- "Extra flags:");
+ "Extra flags:");
offset += 2;
/* octetsToInlineQos */
little_endian,
"writerSeqNumber");
offset += 8;
-
+
/* Fragment number */
rtps_util_add_long(tree,
tvb,
NULL,
0);
offset += 4;
-
+
/* Fragments in submessage */
rtps_util_add_short(tree,
tvb,
/* InlineQos */
if ((flags & FLAG_RTPS_DATA_FRAG_Q) != 0) {
- offset = dissect_parameter_sequence(tree,
- tvb,
- offset,
- little_endian,
+ offset = dissect_parameter_sequence(tree,
+ tvb,
+ offset,
+ little_endian,
octets_to_next_header - (offset - old_offset) + 4,
"inlineQos",
&status_info,
}
/* SerializedData */
- dissect_serialized_data(tree,
- tvb,
- offset,
+ dissect_serialized_data(tree,
+ tvb,
+ offset,
octets_to_next_header - (offset - old_offset) + 4,
"serializedData",
vendor_id);
/* *********************************************************************** */
/* * R T P S _ D A T A _ B A T C H * */
/* *********************************************************************** */
-static void dissect_RTPS_DATA_BATCH(tvbuff_t *tvb,
- gint offset,
- guint8 flags,
+static void dissect_RTPS_DATA_BATCH(tvbuff_t *tvb,
+ gint offset,
+ guint8 flags,
gboolean little_endian,
- int octets_to_next_header,
+ int octets_to_next_header,
proto_tree *tree,
char * info_summary_text,
guint16 vendor_id) {
- /*
+ /*
*
* 0...2...........7...............15.............23...............31
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * |RTPS_DATA_BATCH|X|X|X|X|X|X|Q|E| octetsToNextHeader |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |RTPS_DATA_BATCH|X|X|X|X|X|X|Q|E| octetsToNextHeader |
* +---------------+---------------+---------------+---------------+
* | Flags extraFlags | octetsToInlineQos |
* +---------------+---------------+---------------+---------------+
* | |
* +---------------+---------------+---------------+---------------+
*
- *
+ *
* SampleInfo:
* 0...............8..............16..............24..............32
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* ~ ParameterList sampleInlineQos [only if Q==1] ~
* | |
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *
- *
+ *
+ *
* Sample:
* 0...............8..............16..............24..............32
* +---------------+---------------+---------------+---------------+
if ((flags & FLAG_RTPS_DATA_BATCH_Q) != 0) min_len += 4;
if (octets_to_next_header < min_len) {
- proto_tree_add_uint_format(tree,
+ proto_tree_add_uint_format(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset+2,
- 2,
+ tvb,
+ offset+2,
+ 2,
octets_to_next_header,
"octetsToNextHeader: %u (Error: should be >= %u)",
- octets_to_next_header,
+ octets_to_next_header,
min_len);
return;
}
offset += 12;
/* writerEntityId */
wid = NEXT_guint32(tvb, offset, little_endian);
-
+
offset += 24;
if ((flags & FLAG_DATA_Q) != 0) {
- offset = dissect_parameter_sequence(tree,
- tvb,
- offset,
- little_endian,
+ offset = dissect_parameter_sequence(tree,
+ tvb,
+ offset,
+ little_endian,
octets_to_next_header - (offset - old_offset) + 4,
"inlineQos",
&status_info,
info_summary_append_ex(info_summary_text, SUBMESSAGE_RTPS_DATA_BATCH, wid, status_info);
return;
}
- proto_tree_add_item(tree,
+ proto_tree_add_item(tree,
hf_rtps_sm_octets_to_next_header,
- tvb,
- offset + 2,
- 2,
+ tvb,
+ offset + 2,
+ 2,
little_endian);
offset += 4;
rtps_util_add_extra_flags(tree,
tvb,
offset,
- "Extra flags:");
+ "Extra flags:");
offset += 2;
/* octetsToInlineQos */
little_endian,
"batchSeqNumber");
offset += 8;
-
+
/* First stample sequence number */
rtps_util_add_seq_number(tree,
tvb,
/* Parameter list (if Q==1) */
/* InlineQos */
if ((flags & FLAG_RTPS_DATA_BATCH_Q) != 0) {
- offset = dissect_parameter_sequence(tree,
- tvb,
- offset,
- little_endian,
+ offset = dissect_parameter_sequence(tree,
+ tvb,
+ offset,
+ little_endian,
octets_to_next_header - (offset - old_offset) + 4,
"batchInlineQos",
&status_info,
proto_tree * sil_tree;
guint count = 0;
- ti = proto_tree_add_text(tree,
- tvb,
- offset,
+ ti = proto_tree_add_text(tree,
+ tvb,
+ offset,
-1,
"Sample Info List");
sil_tree = proto_item_add_subtree(ti, ett_rtps_sample_info_list);
gint offset_begin_sampleinfo = offset;
if (rtps_max_batch_samples_dissected > 0 && count >= rtps_max_batch_samples_dissected) {
- ti = proto_tree_add_text(sil_tree,
- tvb,
- offset,
+ ti = proto_tree_add_text(sil_tree,
+ tvb,
+ offset,
-1,
"... (more samples available. Configure this limit from preferences dialog)");
offset = sampleListOffset;
break;
}
- ti = proto_tree_add_text(sil_tree,
- tvb,
- offset,
+ ti = proto_tree_add_text(sil_tree,
+ tvb,
+ offset,
-1,
"sampleInfo[%d]", count++);
si_tree = proto_item_add_subtree(ti, ett_rtps_sample_info);
/* Ensure there are enough bytes to decode */
if (sampleListOffset - offset < min_length) {
- proto_tree_add_text(si_tree,
+ proto_tree_add_text(si_tree,
tvb,
offset-4,
4,
0);
offset += 4;
}
-
+
/* Parameter list [only if Q==1] */
if ((flags & FLAG_SAMPLE_INFO_Q) != 0) {
- offset = dissect_parameter_sequence(si_tree,
- tvb,
- offset,
- little_endian,
+ offset = dissect_parameter_sequence(si_tree,
+ tvb,
+ offset,
+ little_endian,
octets_to_next_header - (offset - old_offset) + 4,
"sampleInlineQos",
&status_info,
/* Encapsulation ID for the entire data sequence */
encapsulation_id = NEXT_guint16(tvb, offset, 0); /* Always big endian */
- proto_tree_add_text(tree,
+ proto_tree_add_text(tree,
tvb,
offset,
2,
"encapsulation kind: %s",
val_to_str(encapsulation_id, encapsulation_id_vals, "unknown (%02x)"));
- offset += 2;
+ offset += 2;
/* The next two bytes are ignored */
offset += 2;
-
+
/* Now the list of serialized data: */
proto_tree_add_text(tree,
tvb,
offset,
octets_to_next_header - (offset - old_offset) + 4,
"serializedData");
-
+
/* TODO: enter one entry in the tree per sample (still keep it serialized)
*/
info_summary_append_ex(info_summary_text, SUBMESSAGE_RTPS_DATA_BATCH, wid, status_info);
/***************************************************************************/
/* The main packet dissector function
*/
-static gboolean dissect_rtps(tvbuff_t *tvb,
- packet_info *pinfo,
+static gboolean dissect_rtps(tvbuff_t *tvb,
+ packet_info *pinfo,
proto_tree *tree) {
proto_item *ti = NULL;
proto_tree *rtps_tree = NULL;
char info_summary_text[MAX_SUMMARY_SIZE];
info_summary_text[0] = '\0';
-
- /* Check 'RTPS' signature:
- * A header is invalid if it has less than 16 octets
+
+ /* Check 'RTPS' signature:
+ * A header is invalid if it has less than 16 octets
*/
if (!tvb_bytes_exist(tvb, offset, 16)) return FALSE;
/* If is not PING, the next 12 bytes are the GUID prefix */
if (!is_ping) {
- rtps_util_add_guid_prefix(rtps_tree,
+ rtps_util_add_guid_prefix(rtps_tree,
tvb,
offset+8,
hf_rtps_guid_prefix,
nature = (pinfo->destport % 10);
For Unicast, the port mapping formula is:
- metatraffic_unicast_port = port_base +
- (domain_id_gain * domain_id) +
- (participant_id_gain * participant_id) +
- builtin_unicast_port_offset
+ metatraffic_unicast_port = port_base +
+ (domain_id_gain * domain_id) +
+ (participant_id_gain * participant_id) +
+ builtin_unicast_port_offset
For Multicast, the port mapping is:
- metatraffic_multicast_port = port_base +
+ metatraffic_multicast_port = port_base +
(domain_id_gain * domain_id) +
- builtin_multicast_port_offset
+ builtin_multicast_port_offset
Where the constants are:
port_base = 7400
builtin_unicast_port_offset = 10
user_multicast_port_offset = 1
user_unicast_port_offset = 11
-
+
To obtain the individual components from the port number, the reverse formulas are:
domain_id = (port - port_base) / 250 (valid both multicast / unicast)
Doffset = (port - port_Base - (domain_id * 250));
participant_idx = (Doffset - 10) / 2;
- */
+ */
domain_id = (pinfo->destport - PORT_BASE) / 250;
Doffset = (pinfo->destport - PORT_BASE - domain_id * 250);
if (Doffset == 0) {
/* Creates the subtree 'Submessage: XXXX' */
if (rtps_tree) {
if (submessageId & 0x80) {
- ti = proto_tree_add_text(rtps_tree,
- tvb,
- offset,
- -1,
+ ti = proto_tree_add_text(rtps_tree,
+ tvb,
+ offset,
+ -1,
"Submessage: %s",
val_to_str(submessageId, submessage_id_vals,
"Vendor-specific (0x%02x)"));
} else {
- ti = proto_tree_add_text(rtps_tree,
- tvb,
- offset,
- -1,
+ ti = proto_tree_add_text(rtps_tree,
+ tvb,
+ offset,
+ -1,
"Submessage: %s",
val_to_str(submessageId, submessage_id_vals,
"Unknown (0x%02x)"));
/* Decode the submessage ID */
if (submessageId & 0x80) {
- proto_tree_add_uint_format(rtps_submessage_tree,
+ proto_tree_add_uint_format(rtps_submessage_tree,
hf_rtps_sm_id,
- tvb,
- offset,
- 1,
+ tvb,
+ offset,
+ 1,
submessageId,
"submessageId: Vendor-specific (0x%02x)",
submessageId);
/* Gets the E (Little endian) flag */
little_endian = ((flags & FLAG_E) != 0);
-
+
/* octet-to-next-header */
octets_to_next_header = NEXT_guint16(tvb, offset + 2, little_endian);
next_submsg = offset + octets_to_next_header + 4;
/* Set length of this item */
if (ti != NULL) {
proto_item_set_len(ti, octets_to_next_header + 4);
- }
+ }
/* Now decode each single submessage
*
* Note: if tree==NULL, it's true we don't care too much about the
* details, but we are still calling the individual submessage
- * dissectors in order to correctly compose the INFO list.
- * The offset passed to the dissectors points to the start of the
+ * dissectors in order to correctly compose the INFO list.
+ * The offset passed to the dissectors points to the start of the
* submessage (at the ID byte).
*/
switch (submessageId) {
case SUBMESSAGE_PAD:
- dissect_PAD(tvb,
- offset,
- flags,
- little_endian,
+ dissect_PAD(tvb,
+ offset,
+ flags,
+ little_endian,
octets_to_next_header,
rtps_submessage_tree,
info_summary_text,
break;
case SUBMESSAGE_DATA:
- dissect_DATA(tvb,
- offset,
- flags,
- little_endian,
+ dissect_DATA(tvb,
+ offset,
+ flags,
+ little_endian,
octets_to_next_header,
rtps_submessage_tree,
info_summary_text,
break;
case SUBMESSAGE_DATA_FRAG:
- dissect_DATA_FRAG(tvb,
- offset,
- flags,
- little_endian,
+ dissect_DATA_FRAG(tvb,
+ offset,
+ flags,
+ little_endian,
octets_to_next_header,
rtps_submessage_tree,
info_summary_text,
break;
case SUBMESSAGE_NOKEY_DATA:
- dissect_NOKEY_DATA(tvb,
- offset,
- flags,
- little_endian,
+ dissect_NOKEY_DATA(tvb,
+ offset,
+ flags,
+ little_endian,
octets_to_next_header,
rtps_submessage_tree,
info_summary_text,
break;
case SUBMESSAGE_NOKEY_DATA_FRAG:
- dissect_NOKEY_DATA_FRAG(tvb,
- offset,
- flags,
- little_endian,
+ dissect_NOKEY_DATA_FRAG(tvb,
+ offset,
+ flags,
+ little_endian,
octets_to_next_header,
rtps_submessage_tree,
info_summary_text,
break;
case SUBMESSAGE_NACK_FRAG:
- dissect_NACK_FRAG(tvb,
- offset,
- flags,
- little_endian,
+ dissect_NACK_FRAG(tvb,
+ offset,
+ flags,
+ little_endian,
octets_to_next_header,
rtps_submessage_tree,
info_summary_text,
case SUBMESSAGE_ACKNACK_BATCH:
case SUBMESSAGE_ACKNACK:
- dissect_ACKNACK(tvb,
- offset,
- flags,
- little_endian,
+ dissect_ACKNACK(tvb,
+ offset,
+ flags,
+ little_endian,
octets_to_next_header,
rtps_submessage_tree,
info_summary_text,
break;
case SUBMESSAGE_HEARTBEAT:
- dissect_HEARTBEAT(tvb,
- offset,
- flags,
- little_endian,
+ dissect_HEARTBEAT(tvb,
+ offset,
+ flags,
+ little_endian,
octets_to_next_header,
rtps_submessage_tree,
info_summary_text,
break;
case SUBMESSAGE_HEARTBEAT_BATCH:
- dissect_HEARTBEAT_BATCH(tvb,
- offset,
- flags,
- little_endian,
+ dissect_HEARTBEAT_BATCH(tvb,
+ offset,
+ flags,
+ little_endian,
octets_to_next_header,
rtps_submessage_tree,
info_summary_text,
break;
case SUBMESSAGE_HEARTBEAT_FRAG:
- dissect_HEARTBEAT_FRAG(tvb,
- offset,
- flags,
- little_endian,
+ dissect_HEARTBEAT_FRAG(tvb,
+ offset,
+ flags,
+ little_endian,
octets_to_next_header,
rtps_submessage_tree,
info_summary_text,
break;
case SUBMESSAGE_GAP:
- dissect_GAP(tvb,
- offset,
- flags,
- little_endian,
+ dissect_GAP(tvb,
+ offset,
+ flags,
+ little_endian,
octets_to_next_header,
rtps_submessage_tree,
info_summary_text,
break;
case SUBMESSAGE_INFO_TS:
- dissect_INFO_TS(tvb,
- offset,
- flags,
- little_endian,
+ dissect_INFO_TS(tvb,
+ offset,
+ flags,
+ little_endian,
octets_to_next_header,
rtps_submessage_tree,
info_summary_text,
break;
case SUBMESSAGE_INFO_SRC:
- dissect_INFO_SRC(tvb,
- offset,
- flags,
- little_endian,
+ dissect_INFO_SRC(tvb,
+ offset,
+ flags,
+ little_endian,
octets_to_next_header,
rtps_submessage_tree,
info_summary_text,
break;
case SUBMESSAGE_INFO_REPLY_IP4:
- dissect_INFO_REPLY_IP4(tvb,
- offset,
- flags,
- little_endian,
+ dissect_INFO_REPLY_IP4(tvb,
+ offset,
+ flags,
+ little_endian,
octets_to_next_header,
rtps_submessage_tree,
info_summary_text,
break;
case SUBMESSAGE_INFO_DST:
- dissect_INFO_DST(tvb,
- offset,
- flags,
- little_endian,
+ dissect_INFO_DST(tvb,
+ offset,
+ flags,
+ little_endian,
octets_to_next_header,
rtps_submessage_tree,
info_summary_text,
break;
case SUBMESSAGE_INFO_REPLY:
- dissect_INFO_REPLY(tvb,
- offset,
- flags,
- little_endian,
+ dissect_INFO_REPLY(tvb,
+ offset,
+ flags,
+ little_endian,
octets_to_next_header,
rtps_submessage_tree,
info_summary_text,
break;
case SUBMESSAGE_RTPS_DATA:
- dissect_RTPS_DATA(tvb,
- offset,
- flags,
- little_endian,
+ dissect_RTPS_DATA(tvb,
+ offset,
+ flags,
+ little_endian,
octets_to_next_header,
rtps_submessage_tree,
info_summary_text,
vendor_id);
break;
-
+
case SUBMESSAGE_RTPS_DATA_FRAG:
- dissect_RTPS_DATA_FRAG(tvb,
- offset,
- flags,
- little_endian,
+ dissect_RTPS_DATA_FRAG(tvb,
+ offset,
+ flags,
+ little_endian,
octets_to_next_header,
rtps_submessage_tree,
info_summary_text,
break;
case SUBMESSAGE_RTPS_DATA_BATCH:
- dissect_RTPS_DATA_BATCH(tvb,
- offset,
- flags,
- little_endian,
+ dissect_RTPS_DATA_BATCH(tvb,
+ offset,
+ flags,
+ little_endian,
octets_to_next_header,
rtps_submessage_tree,
info_summary_text,
if (rtps_submessage_tree != NULL) {
proto_tree_add_uint(rtps_submessage_tree, hf_rtps_sm_flags,
tvb, offset + 1, 1, flags);
- proto_tree_add_uint(rtps_submessage_tree,
+ proto_tree_add_uint(rtps_submessage_tree,
hf_rtps_sm_octets_to_next_header,
tvb, offset + 2, 2, next_submsg);
}
/***************************************************************************
- * Register the protocol with Wireshark
+ * Register the protocol with Wireshark
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*/
void proto_register_rtps2(void) {
* This section declares all the protocol items that are parsed in the
* dissectors.
* Structure of each element:
- * {
+ * {
* item_id, {
* name, // As appears in the GUI tree
* abbrev, // Referenced by filters (rtps.xxxx[.yyyy])
"RTPS protocol version number",
HFILL }
},
- { &hf_rtps_protocol_version_major, {
+ { &hf_rtps_protocol_version_major, {
"major",
"rtps2.version.major",
FT_INT8,
"Unique identifier of the DDS vendor that generated this packet",
HFILL }
},
-
+
/* Guid Prefix for the Packet ------------------------------------------ */
- { &hf_rtps_guid_prefix, {
+ { &hf_rtps_guid_prefix, {
"guidPrefix",
"rtps2.guidPrefix",
FT_BYTES,
/* Submessage ID ------------------------------------------------------- */
- { &hf_rtps_sm_id, {
- "submessageId",
+ { &hf_rtps_sm_id, {
+ "submessageId",
"rtps2.sm.id",
- FT_UINT8,
- BASE_HEX,
- VALS(submessage_id_vals),
+ FT_UINT8,
+ BASE_HEX,
+ VALS(submessage_id_vals),
0,
- "defines the type of submessage",
+ "defines the type of submessage",
HFILL }
},
/* Submessage flags ---------------------------------------------------- */
- { &hf_rtps_sm_flags, {
- "flags",
+ { &hf_rtps_sm_flags, {
+ "flags",
"rtps2.sm.flags",
- FT_UINT8,
- BASE_HEX,
- NULL,
+ FT_UINT8,
+ BASE_HEX,
+ NULL,
0,
- "bitmask representing the flags associated with a submessage",
+ "bitmask representing the flags associated with a submessage",
HFILL }
},
/* octets to next header ---------------------------------------------- */
- { &hf_rtps_sm_octets_to_next_header, {
- "octetsToNextHeader",
+ { &hf_rtps_sm_octets_to_next_header, {
+ "octetsToNextHeader",
"rtps2.sm.octetsToNextHeader",
- FT_UINT16,
- BASE_DEC,
- NULL,
+ FT_UINT16,
+ BASE_DEC,
+ NULL,
0,
- "Size of the submessage payload",
+ "Size of the submessage payload",
HFILL }
},
HFILL }
},
- { &hf_rtps_sm_host_id, {
+ { &hf_rtps_sm_host_id, {
"host_id",
"rtps2.sm.guidPrefix.hostId",
FT_UINT32,
HFILL }
},
- { &hf_rtps_sm_app_id, {
+ { &hf_rtps_sm_app_id, {
"appId",
"rtps2.sm.guidPrefix.appId",
FT_UINT32,
"instanceId component of the AppId of the rtps2.sm.guidPrefix",
HFILL }
},
- { &hf_rtps_sm_app_kind, {
+ { &hf_rtps_sm_app_kind, {
"appKind",
"rtps2.sm.guidPrefix.appId.appKind",
FT_UINT8,
HFILL }
},
- { &hf_rtps_sm_counter, {
+ { &hf_rtps_sm_counter, {
"counter",
"rtps2.sm.guidPrefix.counter",
FT_UINT32,
"Object entity ID as it appears in a DATA submessage (keyHashSuffix)",
HFILL }
},
- { &hf_rtps_sm_entity_id_key, {
+ { &hf_rtps_sm_entity_id_key, {
"entityKey",
"rtps2.sm.entityId.entityKey",
FT_UINT24,
},
/* Parameter Id -------------------------------------------------------- */
- { &hf_rtps_parameter_id, {
- "parameterId",
+ { &hf_rtps_parameter_id, {
+ "parameterId",
"rtps2.param.id",
- FT_UINT16,
- BASE_HEX,
- VALS(parameter_id_vals),
+ FT_UINT16,
+ BASE_HEX,
+ VALS(parameter_id_vals),
0,
- "Parameter Id",
+ "Parameter Id",
HFILL }
},
/* Parameter Length ---------------------------------------------------- */
- { &hf_rtps_parameter_length, {
- "parameterLength",
+ { &hf_rtps_parameter_length, {
+ "parameterLength",
"rtps2.param.length",
- FT_UINT16,
- BASE_DEC,
- NULL,
+ FT_UINT16,
+ BASE_DEC,
+ NULL,
0,
- "Parameter Length",
+ "Parameter Length",
HFILL }
},
/* Parameter / Status Info --------------------------------------------- */
- { &hf_rtps_param_status_info, {
- "statusInfo",
+ { &hf_rtps_param_status_info, {
+ "statusInfo",
"rtps2.param.statusInfo",
- FT_UINT32,
- BASE_HEX,
+ FT_UINT32,
+ BASE_HEX,
NULL,
0,
- "State information of the data object to which the message apply (i.e. lifecycle)",
+ "State information of the data object to which the message apply (i.e. lifecycle)",
HFILL }
},
/* Parameter / NtpTime ------------------------------------------------- */
- { &hf_rtps_param_ntpt, {
- "ntpTime",
+ { &hf_rtps_param_ntpt, {
+ "ntpTime",
"rtps2.param.ntpTime",
- FT_NONE,
- BASE_NONE,
+ FT_NONE,
+ BASE_NONE,
NULL,
0,
- "Time using the NTP standard format",
+ "Time using the NTP standard format",
HFILL }
},
- { &hf_rtps_param_ntpt_sec, {
- "seconds",
+ { &hf_rtps_param_ntpt_sec, {
+ "seconds",
"rtps2.param.ntpTime.sec",
- FT_INT32,
- BASE_DEC,
+ FT_INT32,
+ BASE_DEC,
NULL,
0,
- "The 'second' component of a NTP time",
+ "The 'second' component of a NTP time",
HFILL }
},
- { &hf_rtps_param_ntpt_fraction, {
- "fraction",
+ { &hf_rtps_param_ntpt_fraction, {
+ "fraction",
"rtps2.param.ntpTime.fraction",
- FT_UINT32,
- BASE_DEC,
+ FT_UINT32,
+ BASE_DEC,
NULL,
0,
"The 'fraction' component of a NTP time",
/* Parameter / Topic --------------------------------------------------- */
- { &hf_rtps_param_topic_name, {
- "topic",
+ { &hf_rtps_param_topic_name, {
+ "topic",
"rtps2.param.topicName",
- FT_STRINGZ,
- BASE_NONE,
+ FT_STRINGZ,
+ BASE_NONE,
NULL,
0,
- "String representing the value value of a PID_TOPIC parameter",
+ "String representing the value value of a PID_TOPIC parameter",
HFILL }
},
/* Parameter / Entity -------------------------------------------------- */
- { &hf_rtps_param_entity_name, {
- "entity",
+ { &hf_rtps_param_entity_name, {
+ "entity",
"rtps2.param.entityName",
- FT_STRINGZ,
- BASE_NONE,
+ FT_STRINGZ,
+ BASE_NONE,
NULL,
0,
- "String representing the name of the entity addressed by the submessage",
+ "String representing the name of the entity addressed by the submessage",
HFILL }
},
/* Parameter / Strength ------------------------------------------------ */
- { &hf_rtps_param_strength, {
- "strength",
+ { &hf_rtps_param_strength, {
+ "strength",
"rtps2.param.strength",
- FT_INT32,
- BASE_DEC,
+ FT_INT32,
+ BASE_DEC,
NULL,
0,
- "Decimal value representing the value of a PID_OWNERSHIP_STRENGTH parameter",
+ "Decimal value representing the value of a PID_OWNERSHIP_STRENGTH parameter",
HFILL }
},
/* Parameter / Type Name ----------------------------------------------- */
- { &hf_rtps_param_type_name, {
- "typeName",
+ { &hf_rtps_param_type_name, {
+ "typeName",
"rtps2.param.typeName",
- FT_STRINGZ,
- BASE_NONE,
+ FT_STRINGZ,
+ BASE_NONE,
NULL,
0,
- "String representing the value of a PID_TYPE_NAME parameter",
+ "String representing the value of a PID_TYPE_NAME parameter",
HFILL }
},
/* Parameter / User Data ----------------------------------------------- */
- { &hf_rtps_param_user_data, {
- "userData",
+ { &hf_rtps_param_user_data, {
+ "userData",
"rtps2.param.userData",
- FT_BYTES,
- BASE_NONE,
- NULL,
+ FT_BYTES,
+ BASE_NONE,
+ NULL,
0,
- "The user data sent in a PID_USER_DATA parameter",
+ "The user data sent in a PID_USER_DATA parameter",
HFILL }
},
/* Parameter / Group Data ---------------------------------------------- */
- { &hf_rtps_param_group_data, {
- "groupData",
+ { &hf_rtps_param_group_data, {
+ "groupData",
"rtps2.param.groupData",
- FT_BYTES,
- BASE_NONE,
- NULL,
+ FT_BYTES,
+ BASE_NONE,
+ NULL,
0,
- "The user data sent in a PID_GROUP_DATA parameter",
+ "The user data sent in a PID_GROUP_DATA parameter",
HFILL }
},
/* Parameter / Topic Data ---------------------------------------------- */
- { &hf_rtps_param_topic_data, {
- "topicData",
+ { &hf_rtps_param_topic_data, {
+ "topicData",
"rtps2.param.topicData",
- FT_BYTES,
- BASE_NONE,
- NULL,
+ FT_BYTES,
+ BASE_NONE,
+ NULL,
0,
- "The user data sent in a PID_TOPIC_DATA parameter",
+ "The user data sent in a PID_TOPIC_DATA parameter",
HFILL }
},
/* Parameter / Content Filter Name ------------------------------------- */
- { &hf_rtps_param_content_filter_name, {
- "contentFilterName",
+ { &hf_rtps_param_content_filter_name, {
+ "contentFilterName",
"rtps2.param.contentFilterName",
- FT_STRINGZ,
- BASE_NONE,
+ FT_STRINGZ,
+ BASE_NONE,
NULL,
0,
- "Value of the content filter name as sent in a PID_CONTENT_FILTER_PROPERTY parameter",
+ "Value of the content filter name as sent in a PID_CONTENT_FILTER_PROPERTY parameter",
HFILL }
},
- { &hf_rtps_param_related_topic_name, {
- "relatedTopicName",
+ { &hf_rtps_param_related_topic_name, {
+ "relatedTopicName",
"rtps2.param.relatedTopicName",
- FT_STRINGZ,
- BASE_NONE,
+ FT_STRINGZ,
+ BASE_NONE,
NULL,
0,
- "Value of the related topic name as sent in a PID_CONTENT_FILTER_PROPERTY parameter",
+ "Value of the related topic name as sent in a PID_CONTENT_FILTER_PROPERTY parameter",
HFILL }
},
- { &hf_rtps_param_filter_name, {
- "filterName",
+ { &hf_rtps_param_filter_name, {
+ "filterName",
"rtps2.param.filterName",
- FT_STRINGZ,
- BASE_NONE,
+ FT_STRINGZ,
+ BASE_NONE,
NULL,
0,
- "Value of the filter name as sent in a PID_CONTENT_FILTER_PROPERTY parameter",
+ "Value of the filter name as sent in a PID_CONTENT_FILTER_PROPERTY parameter",
HFILL }
},
/* Finally the raw issue data ------------------------------------------ */
- { &hf_rtps_issue_data, {
- "serializedData",
+ { &hf_rtps_issue_data, {
+ "serializedData",
"rtps2.serializedData",
- FT_BYTES,
- BASE_NONE,
- NULL,
+ FT_BYTES,
+ BASE_NONE,
+ NULL,
0,
- "The user data transferred in a ISSUE submessage",
+ "The user data transferred in a ISSUE submessage",
HFILL }
},
-
+
};
static gint *ett[] = {
proto_rtps = proto_register_protocol(
"Real-Time Publish-Subscribe Wire Protocol 2.x",
- "RTPS2",
+ "RTPS2",
"rtps2");
proto_register_field_array(proto_rtps, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
git.samba.org / obnox / wireshark / wip.git / commitdiff