summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-rdm.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-rdm.c')
-rw-r--r--epan/dissectors/packet-rdm.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/dissectors/packet-rdm.c b/epan/dissectors/packet-rdm.c
index a4d6e4fdf3..1f57a10f75 100644
--- a/epan/dissectors/packet-rdm.c
+++ b/epan/dissectors/packet-rdm.c
@@ -44,6 +44,7 @@
#include <glib.h>
#include <epan/packet.h>
+#include <epan/dissectors/packet-rdm.h>
void proto_register_rdm(void);
@@ -133,7 +134,7 @@ static const value_string rdm_rt_vals[] = {
#define RDM_PARAM_ID_CAPTURE_PRESET 0x1030
#define RDM_PARAM_ID_PRESET_PLAYBACK 0x1031
-static const value_string rdm_param_id_vals[] = {
+const value_string rdm_param_id_vals[] = {
{ RDM_PARAM_ID_DISC_UNIQUE_BRANCH, "DISC_UNIQUE_BRANCH" },
{ RDM_PARAM_ID_DISC_MUTE, "DISC_MUTE" },
{ RDM_PARAM_ID_DISC_UN_MUTE, "DISC_UN_MUTE" },
@@ -188,7 +189,8 @@ static const value_string rdm_param_id_vals[] = {
{ RDM_PARAM_ID_PRESET_PLAYBACK, "PRESET_PLAYBACK" },
{ 0, NULL },
};
-static value_string_ext rdm_param_id_vals_ext = VALUE_STRING_EXT_INIT(rdm_param_id_vals);
+
+value_string_ext rdm_param_id_vals_ext = VALUE_STRING_EXT_INIT(rdm_param_id_vals);
#define RDM_STATUS_NONE 0x00
#define RMD_STATUS_GET_LAST_MESSAGE 0x01
@@ -2122,7 +2124,7 @@ dissect_rdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += 2;
- if (offset < tvb_length(tvb))
+ if (offset < tvb_reported_length(tvb))
proto_tree_add_item(rdm_tree, hf_rdm_trailer, tvb,
offset, -1, ENC_NA);
}