aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ecp-oui.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-11-09 23:01:28 -0500
committerMichael Mann <mmann78@netscape.net>2015-11-13 17:44:24 +0000
commit01f7356f85d33567a25e722e6488addd72ff64d4 (patch)
tree2d8623b57706cc924f76293f0f5b6ce8d83124ab /epan/dissectors/packet-ecp-oui.c
parentb776707af540d7431e815818e21ea1efac326d9f (diff)
register_dissector -> new_register_dissector
Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I3d5e576b796556ef070bb36d8b55da0b175dcba8 Reviewed-on: https://code.wireshark.org/review/11805 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ecp-oui.c')
-rw-r--r--epan/dissectors/packet-ecp-oui.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ecp-oui.c b/epan/dissectors/packet-ecp-oui.c
index 14fd8ae8a5..a544b0324a 100644
--- a/epan/dissectors/packet-ecp-oui.c
+++ b/epan/dissectors/packet-ecp-oui.c
@@ -302,8 +302,8 @@ dissect_vdp_end_of_vdpdu_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
return -1; /* Force the VDP dissector to terminate */
}
-static void
-dissect_ecp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+static int
+dissect_ecp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
proto_tree *ecp_tree;
proto_item *ti;
@@ -348,7 +348,7 @@ dissect_ecp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (tempLen < 0)
end = TRUE;
}
-
+ return tvb_captured_length(tvb);
}
void proto_register_ecp_oui(void)
@@ -438,7 +438,7 @@ void proto_register_ecp_oui(void)
proto_register_field_array(proto_ecp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
- register_dissector("ecp", dissect_ecp, proto_ecp);
+ new_register_dissector("ecp", dissect_ecp, proto_ecp);
}
void proto_reg_handoff_ecp(void)