diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-15 16:51:45 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-16 22:00:30 +0000 |
| commit | 799d6fd057b0c20a7692a1181d811a8ff3a88d04 (patch) | |
| tree | 31d6d1248aee7c3192ae6d854b43eeb2c0b996a0 /epan/dissectors/packet-icap.c | |
| parent | 92bb13a4d22a48c43aa5fa6910c68829edebfdd0 (diff) | |
create_dissector_handle -> new_create_dissector_handle
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: I96aa9cf53533cbb07105aa400d42922baf3016b3
Reviewed-on: https://code.wireshark.org/review/11860
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-icap.c')
| -rw-r--r-- | epan/dissectors/packet-icap.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/dissectors/packet-icap.c b/epan/dissectors/packet-icap.c index 92d68202b0..8f0d5bb4f7 100644 --- a/epan/dissectors/packet-icap.c +++ b/epan/dissectors/packet-icap.c @@ -54,8 +54,8 @@ static dissector_handle_t http_handle; #define TCP_PORT_ICAP 1344 static int is_icap_message(const guchar *data, int linelen, icap_type_t *type); -static void -dissect_icap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_icap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_tree *icap_tree = NULL; proto_item *ti = NULL; @@ -245,6 +245,8 @@ is_icap_header: call_dissector(http_handle, new_tvb, pinfo, icap_tree); } } + + return tvb_captured_length(tvb); } @@ -322,7 +324,7 @@ proto_reg_handoff_icap(void) data_handle = find_dissector("data"); http_handle = find_dissector("http"); - icap_handle = create_dissector_handle(dissect_icap, proto_icap); + icap_handle = new_create_dissector_handle(dissect_icap, proto_icap); dissector_add_uint("tcp.port", TCP_PORT_ICAP, icap_handle); } |