aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2011-04-18 15:27:27 +0000
committerstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2011-04-18 15:27:27 +0000
commit79a3113f0d1515e77c2f08aec063193db50aebe3 (patch)
tree0f5e79e81379581d6ae80c59f81b4240e0605435 /epan
parent1a2bfc45402fba3d870526c2b8b5814abaaa423a (diff)
Make it build.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36697 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-rohc.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/epan/dissectors/packet-rohc.c b/epan/dissectors/packet-rohc.c
index 83ca46402a..22025c9eb6 100644
--- a/epan/dissectors/packet-rohc.c
+++ b/epan/dissectors/packet-rohc.c
@@ -104,11 +104,17 @@ static int ett_rohc_ir_dyn = -1;
static int ett_rohc_rtp_static = -1;
static int ett_rohc_rtp_dynamic = -1;
-static gboolean g_small_cid = TRUE;
/* RTP profile and IPv4 hard wired for now */
static guint8 g_profile = 1;
static guint8 g_version = 4;
+enum rohc_mode
+{
+ UNIDIRECTIONAL = 1,
+ OPTIMISTIC_BIDIRECTIONAL = 2,
+ RELIABLE_BIDIRECTIONAL = 3
+};
+
typedef struct rohc_info
{
@@ -124,13 +130,6 @@ typedef struct rohc_info
proto_item *last_created_item;
} rohc_info;
-enum rohc_mode
-{
- UNIDIRECTIONAL = 1,
- OPTIMISTIC_BIDIRECTIONAL = 2,
- RELIABLE_BIDIRECTIONAL = 3
-};
-
/* ROHC Profiles */
#define ROHC_PROFILE_RTP 1
#define ROHC_PROFILE_UDP 2
@@ -572,7 +571,7 @@ static void
dissect_rohc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_item *ti, *item, *ir_item;
- proto_tree *rohc_tree, *ir_tree, *sub_tree;
+ proto_tree *rohc_tree, *ir_tree, *sub_tree = NULL;
int offset = 0, length, x_bit_offset;
guint8 oct, code, size , cid, profile, val_len;
gint16 feedback_data_len = 0;