aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-idmp.c
diff options
context:
space:
mode:
authorGraeme Lunt <graeme.lunt@smhs.co.uk>2010-06-09 14:45:38 +0000
committerGraeme Lunt <graeme.lunt@smhs.co.uk>2010-06-09 14:45:38 +0000
commitcfdd4788cf7420dc403e99d8d24313cb300f61f3 (patch)
tree61bd0bcdb54c4a07d67f128b8d5ce18f98442ee0 /epan/dissectors/packet-idmp.c
parent70c26add0af7cb4c5fb96e5754bc69effa47f881 (diff)
Updates to the ROS dissector to support IDMP and fix to IDMP for implicit declaration of return value of call_ros_oid_callback().
svn path=/trunk/; revision=33182
Diffstat (limited to 'epan/dissectors/packet-idmp.c')
-rw-r--r--epan/dissectors/packet-idmp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-idmp.c b/epan/dissectors/packet-idmp.c
index 539a8f09f1..7bd4fbcab9 100644
--- a/epan/dissectors/packet-idmp.c
+++ b/epan/dissectors/packet-idmp.c
@@ -115,7 +115,7 @@ static const fragment_items idmp_frag_items = {
};
-static call_idmp_oid_callback(tvbuff_t *tvb, int offset, packet_info *pinfo, int op, proto_tree *tree)
+static int call_idmp_oid_callback(tvbuff_t *tvb, int offset, packet_info *pinfo, int op, proto_tree *tree)
{
struct SESSION_DATA_STRUCTURE *session;
@@ -625,7 +625,7 @@ register_idmp_protocol_info(const char *oid, const ros_info_t *rinfo, int proto
}
-static gint dissect_idmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
+static int dissect_idmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
{
int offset = 0;