diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-09 23:01:28 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-13 17:44:24 +0000 |
| commit | 01f7356f85d33567a25e722e6488addd72ff64d4 (patch) | |
| tree | 2d8623b57706cc924f76293f0f5b6ce8d83124ab /epan/dissectors/packet-dmx.c | |
| parent | b776707af540d7431e815818e21ea1efac326d9f (diff) | |
| download | wireshark-01f7356f85d33567a25e722e6488addd72ff64d4.tar.gz | |
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-dmx.c')
| -rw-r--r-- | epan/dissectors/packet-dmx.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dmx.c b/epan/dissectors/packet-dmx.c index 94a7f81e3b..d73eda1376 100644 --- a/epan/dissectors/packet-dmx.c +++ b/epan/dissectors/packet-dmx.c @@ -69,8 +69,8 @@ static dissector_handle_t dmx_sip_handle; static dissector_handle_t data_handle; -static void -dissect_dmx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_dmx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { tvbuff_t *next_tvb; guint offset = 0; @@ -107,6 +107,7 @@ dissect_dmx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) call_dissector(data_handle, next_tvb, pinfo, tree); break; } + return tvb_captured_length(tvb); } void @@ -121,7 +122,7 @@ proto_register_dmx(void) proto_dmx = proto_register_protocol("DMX", "DMX", "dmx"); proto_register_field_array(proto_dmx, hf, array_length(hf)); - register_dissector("dmx", dissect_dmx, proto_dmx); + new_register_dissector("dmx", dissect_dmx, proto_dmx); } void |