diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2014-10-13 13:59:38 +0200 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-10-13 16:01:19 +0000 |
| commit | 748e5228156902290727986eabfbb0d37ef4aa26 (patch) | |
| tree | 8584c8a22e51097050440b655e186aa4b2e7ded1 /epan/dissectors/packet-ros.c | |
| parent | 24b6a1141a883ac369e9b7da118c462741cc3246 (diff) | |
ROS: Return dissected length from call_ros_oid_callback
Change-Id: I8d119cd3dc9ac0a724497400680a70f39fc21ede
Reviewed-on: https://code.wireshark.org/review/4641
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ros.c')
| -rw-r--r-- | epan/dissectors/packet-ros.c | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c index 007ad77923..4167605019 100644 --- a/epan/dissectors/packet-ros.c +++ b/epan/dissectors/packet-ros.c @@ -195,7 +195,8 @@ static new_dissector_t ros_lookup_err_dissector(gint32 errcode, const ros_err_t } -static gboolean ros_try_string(const char *oid, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, struct SESSION_DATA_STRUCTURE* session) +static int +ros_try_string(const char *oid, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, struct SESSION_DATA_STRUCTURE* session) { ros_info_t *rinfo; gint32 opcode_lcl = 0; @@ -254,40 +255,35 @@ static gboolean ros_try_string(const char *oid, tvbuff_t *tvb, packet_info *pinf if(suffix) col_append_str(pinfo->cinfo, COL_INFO, suffix); - (*opdissector)(tvb, pinfo, ros_tree, NULL); - - return TRUE; + return (*opdissector)(tvb, pinfo, ros_tree, NULL); } } - return FALSE; + return 0; } int call_ros_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, struct SESSION_DATA_STRUCTURE* session) { tvbuff_t *next_tvb; + int len; next_tvb = tvb_new_subset_remaining(tvb, offset); - if(!ros_try_string(oid, next_tvb, pinfo, tree, session) && - !dissector_try_string(ros_oid_dissector_table, oid, next_tvb, pinfo, tree, session)){ - proto_item *item; - proto_tree *next_tree; + if(((len = ros_try_string(oid, next_tvb, pinfo, tree, session)) == 0) && + ((len = dissector_try_string(ros_oid_dissector_table, oid, next_tvb, pinfo, tree, session)) == 0)) { + proto_item *item; + proto_tree *next_tree; - next_tree = proto_tree_add_subtree_format(tree, next_tvb, 0, -1, ett_ros_unknown, &item, - "ROS: Dissector for OID:%s not implemented. Contact Wireshark developers if you want this supported", oid); + next_tree = proto_tree_add_subtree_format(tree, next_tvb, 0, -1, ett_ros_unknown, &item, + "ROS: Dissector for OID:%s not implemented. Contact Wireshark developers if you want this supported", oid); expert_add_info_format(pinfo, item, &ei_ros_dissector_oid_not_implemented, - "ROS: Dissector for OID %s not implemented", oid); - dissect_unknown_ber(pinfo, next_tvb, offset, next_tree); + "ROS: Dissector for OID %s not implemented", oid); + len = dissect_unknown_ber(pinfo, next_tvb, offset, next_tree); } - /*XXX until we change the #.REGISTER signature for _PDU()s - * into new_dissector_t we have to do this kludge with - * manually step past the content in the ANY type. - */ - offset+=tvb_length_remaining(tvb, offset); + offset += len; return offset; } @@ -1014,7 +1010,7 @@ dissect_ros_Code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a /*--- End of included file: packet-ros-fn.c ---*/ -#line 379 "../../asn1/ros/packet-ros-template.c" +#line 375 "../../asn1/ros/packet-ros-template.c" /* * Dissect ROS PDUs inside a PPDU. @@ -1236,7 +1232,7 @@ void proto_register_ros(void) { "OBJECT_IDENTIFIER", HFILL }}, /*--- End of included file: packet-ros-hfarr.c ---*/ -#line 488 "../../asn1/ros/packet-ros-template.c" +#line 484 "../../asn1/ros/packet-ros-template.c" }; /* List of subtrees */ @@ -1266,7 +1262,7 @@ void proto_register_ros(void) { &ett_ros_Code, /*--- End of included file: packet-ros-ettarr.c ---*/ -#line 504 "../../asn1/ros/packet-ros-template.c" +#line 500 "../../asn1/ros/packet-ros-template.c" }; static ei_register_info ei[] = { |