aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-rtps.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-10-19 16:46:19 -0400
committerAnders Broman <a.broman58@gmail.com>2015-10-20 03:16:38 +0000
commita4d2b0306ea887cc80017637187debc2e6e67f30 (patch)
treed98d4af6a0e0cc53cbecea89aa5aef7fd1eb0d4d /epan/dissectors/packet-rtps.c
parent9a61b9a5be2e426b5c3b6cf20994ca71d8a39ac2 (diff)
Bugfix missing NULL elements for proto_tree_add_bitmask array values.
Change-Id: Idbe7ee2750233eea3cb7c2bbef2bbb2c629a0183 Reviewed-on: https://code.wireshark.org/review/11160 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-rtps.c')
-rw-r--r--epan/dissectors/packet-rtps.c23
1 files changed, 23 insertions, 0 deletions
diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c
index 7333e2d3e3..b8c2be8123 100644
--- a/epan/dissectors/packet-rtps.c
+++ b/epan/dissectors/packet-rtps.c
@@ -844,6 +844,7 @@ static const int* PAD_FLAGS[] = {
&hf_rtps_flag_reserved04, /* Bit 2 */
&hf_rtps_flag_reserved02, /* Bit 1 */
&hf_rtps_flag_endianness, /* Bit 0 */
+ NULL
};
static const int* DATA_FLAGSv1[] = {
@@ -867,6 +868,7 @@ static const int* DATA_FLAGSv2[] = {
&hf_rtps_flag_data_present_v2, /* Bit 2 */
&hf_rtps_flag_inline_qos_v2, /* Bit 1 */
&hf_rtps_flag_endianness, /* Bit 0 */
+ NULL
};
static const int* NOKEY_DATA_FRAG_FLAGS[] = {
@@ -878,6 +880,7 @@ static const int* NOKEY_DATA_FRAG_FLAGS[] = {
&hf_rtps_flag_reserved04, /* Bit 2 */
&hf_rtps_flag_inline_qos_v2, /* Bit 1 */
&hf_rtps_flag_endianness, /* Bit 0 */
+ NULL
};
static const int* NOKEY_DATA_FLAGS[] = {
@@ -889,6 +892,7 @@ static const int* NOKEY_DATA_FLAGS[] = {
&hf_rtps_flag_reserved04, /* Bit 2 */
&hf_rtps_flag_inline_qos_v2, /* Bit 1 */
&hf_rtps_flag_endianness, /* Bit 0 */
+ NULL
};
static const int* ACKNACK_FLAGS[] = {
@@ -900,6 +904,7 @@ static const int* ACKNACK_FLAGS[] = {
&hf_rtps_flag_reserved04, /* Bit 2 */
&hf_rtps_flag_final, /* Bit 1 */
&hf_rtps_flag_endianness, /* Bit 0 */
+ NULL
};
static const int* NACK_FRAG_FLAGS[] = {
@@ -911,6 +916,7 @@ static const int* NACK_FRAG_FLAGS[] = {
&hf_rtps_flag_reserved04, /* Bit 2 */
&hf_rtps_flag_reserved02, /* Bit 1 */
&hf_rtps_flag_endianness, /* Bit 0 */
+ NULL
};
static const int* GAP_FLAGS[] = {
@@ -922,6 +928,7 @@ static const int* GAP_FLAGS[] = {
&hf_rtps_flag_reserved04, /* Bit 2 */
&hf_rtps_flag_reserved02, /* Bit 1 */
&hf_rtps_flag_endianness, /* Bit 0 */
+ NULL
};
static const int* HEARTBEAT_FLAGS[] = {
@@ -933,6 +940,7 @@ static const int* HEARTBEAT_FLAGS[] = {
&hf_rtps_flag_liveliness, /* Bit 2 */
&hf_rtps_flag_final, /* Bit 1 */
&hf_rtps_flag_endianness, /* Bit 0 */
+ NULL
};
static const int* HEARTBEAT_BATCH_FLAGS[] = {
@@ -944,6 +952,7 @@ static const int* HEARTBEAT_BATCH_FLAGS[] = {
&hf_rtps_flag_liveliness, /* Bit 2 */
&hf_rtps_flag_final, /* Bit 1 */
&hf_rtps_flag_endianness, /* Bit 0 */
+ NULL
};
static const int* HEARTBEAT_FRAG_FLAGS[] = {
@@ -955,6 +964,7 @@ static const int* HEARTBEAT_FRAG_FLAGS[] = {
&hf_rtps_flag_reserved04, /* Bit 2 */
&hf_rtps_flag_reserved02, /* Bit 1 */
&hf_rtps_flag_endianness, /* Bit 0 */
+ NULL
};
static const int* RTPS_DATA_FLAGS[] = {
@@ -966,6 +976,7 @@ static const int* RTPS_DATA_FLAGS[] = {
&hf_rtps_flag_data_present_v2, /* Bit 2 */
&hf_rtps_flag_inline_qos_v2, /* Bit 1 */
&hf_rtps_flag_endianness, /* Bit 0 */
+ NULL
};
static const int* RTPS_DATA_FRAG_FLAGS[] = {
@@ -977,6 +988,7 @@ static const int* RTPS_DATA_FRAG_FLAGS[] = {
&hf_rtps_flag_data_frag_serialized_key, /* Bit 2 */
&hf_rtps_flag_inline_qos_v2, /* Bit 1 */
&hf_rtps_flag_endianness, /* Bit 0 */
+ NULL
};
static const int* RTPS_DATA_BATCH_FLAGS[] = {
@@ -988,6 +1000,7 @@ static const int* RTPS_DATA_BATCH_FLAGS[] = {
&hf_rtps_flag_reserved04, /* Bit 2 */
&hf_rtps_flag_inline_qos_v2, /* Bit 1 */
&hf_rtps_flag_endianness, /* Bit 0 */
+ NULL
};
static const int* RTPS_SAMPLE_INFO_FLAGS16[] = {
@@ -1007,6 +1020,7 @@ static const int* RTPS_SAMPLE_INFO_FLAGS16[] = {
&hf_rtps_flag_offsetsn_present, /* Bit 2 */
&hf_rtps_flag_inline_qos16_v2, /* Bit 1 */
&hf_rtps_flag_timestamp_present, /* Bit 0 */
+ NULL
};
static const int* INFO_TS_FLAGS[] = {
@@ -1018,6 +1032,7 @@ static const int* INFO_TS_FLAGS[] = {
&hf_rtps_flag_reserved04, /* Bit 2 */
&hf_rtps_flag_timestamp, /* Bit 1 */
&hf_rtps_flag_endianness, /* Bit 0 */
+ NULL
};
static const int* INFO_SRC_FLAGS[] = {
@@ -1029,6 +1044,7 @@ static const int* INFO_SRC_FLAGS[] = {
&hf_rtps_flag_reserved04, /* Bit 2 */
&hf_rtps_flag_reserved02, /* Bit 1 */
&hf_rtps_flag_endianness, /* Bit 0 */
+ NULL
};
static const int* INFO_REPLY_IP4_FLAGS[] = {
@@ -1040,6 +1056,7 @@ static const int* INFO_REPLY_IP4_FLAGS[] = {
&hf_rtps_flag_reserved04, /* Bit 2 */
&hf_rtps_flag_multicast, /* Bit 1 */
&hf_rtps_flag_endianness, /* Bit 0 */
+ NULL
};
static const int* INFO_DST_FLAGS[] = {
@@ -1051,6 +1068,7 @@ static const int* INFO_DST_FLAGS[] = {
&hf_rtps_flag_reserved04, /* Bit 2 */
&hf_rtps_flag_reserved02, /* Bit 1 */
&hf_rtps_flag_endianness, /* Bit 0 */
+ NULL
};
static const int* INFO_REPLY_FLAGS[] = {
@@ -1062,6 +1080,7 @@ static const int* INFO_REPLY_FLAGS[] = {
&hf_rtps_flag_reserved04, /* Bit 2 */
&hf_rtps_flag_multicast, /* Bit 1 */
&hf_rtps_flag_endianness, /* Bit 0 */
+ NULL
};
@@ -1075,6 +1094,7 @@ static const int* APP_ACK_FLAGS[] = {
&hf_rtps_flag_reserved04, /* Bit 2 */
&hf_rtps_flag_reserved02, /* Bit 1 */
&hf_rtps_flag_endianness, /* Bit 0 */
+ NULL
};
/* Vendor specific: RTI */
static const int* APP_ACK_CONF_FLAGS[] = {
@@ -1098,6 +1118,7 @@ static const int* HEARTBEAT_VIRTUAL_FLAGS[] = {
&hf_rtps_flag_multiple_writers, /* Bit 2 */
&hf_rtps_flag_multiple_virtual_guids, /* Bit 1 */
&hf_rtps_flag_endianness, /* Bit 0 */
+ NULL
};
/* Vendor specific: RTI */
static const int* DATA_FRAG_FLAGS[] = {
@@ -1109,6 +1130,7 @@ static const int* DATA_FRAG_FLAGS[] = {
&hf_rtps_flag_hash_key_rti, /* Bit 2 */
&hf_rtps_flag_inline_qos_v2, /* Bit 1 */
&hf_rtps_flag_endianness, /* Bit 0 */
+ NULL
};
#if 0
/* Vendor specific: RTI */
@@ -1121,6 +1143,7 @@ static const int* NACK_FLAGS[] = {
&hf_rtps_flag_reserved04, /* Bit 2 */
&hf_rtps_flag_final, /* Bit 1 */
&hf_rtps_flag_endianness, /* Bit 0 */
+ NULL
};
#endif