diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-24 21:59:51 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-25 13:15:11 +0000 |
| commit | dcfea6a06ddf7adeafc8613efe74310251201789 (patch) | |
| tree | 04c70020bc89a90670634230a5be0560af7c9c3e /epan/dissectors/packet-wcp.c | |
| parent | 479ab3bcdc8d79b27bfc99fcde073457f72126ac (diff) | |
create_dissector_handle -> new_create_dissector_handle
This finalizes the transformation for dissectors.
Change-Id: Ie5986b72bb69a6e8779ca3f5e20a80357c9e6fea
Reviewed-on: https://code.wireshark.org/review/12122
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-wcp.c')
| -rw-r--r-- | epan/dissectors/packet-wcp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c index 42f773f854..b7d678e19b 100644 --- a/epan/dissectors/packet-wcp.c +++ b/epan/dissectors/packet-wcp.c @@ -300,7 +300,7 @@ static void wcp_save_data( tvbuff_t *tvb, packet_info *pinfo, circuit_type ctype } -static void dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { +static int dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_tree *wcp_tree; proto_item *ti; @@ -311,7 +311,7 @@ static void dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { col_set_str(pinfo->cinfo, COL_PROTOCOL, "WCP"); col_clear(pinfo->cinfo, COL_INFO); - temp =tvb_get_ntohs(tvb, 0); + temp = tvb_get_ntohs(tvb, 0); cmd = (temp & 0xf000) >> 12; ext_cmd = (temp & 0x0f00) >> 8; @@ -363,7 +363,7 @@ static void dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* exit if done */ if ( cmd != 1 && cmd != 0 && !(cmd == 0xf && ext_cmd == 0)) - return; + return 2; if ( cmd == 1) { /* uncompressed data */ if ( !pinfo->fd->flags.visited){ /* if first pass */ @@ -376,7 +376,7 @@ static void dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { next_tvb = wcp_uncompress( tvb, wcp_header_len, pinfo, wcp_tree, pinfo->ctype, pinfo->circuit_id); if ( !next_tvb){ - return; + return tvb_captured_length(tvb); } } @@ -386,7 +386,7 @@ static void dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { call_dissector(fr_uncompressed_handle, next_tvb, pinfo, tree); - return; + return tvb_captured_length(tvb); } @@ -790,7 +790,7 @@ proto_reg_handoff_wcp(void) { */ fr_uncompressed_handle = find_dissector("fr_uncompressed"); - wcp_handle = create_dissector_handle(dissect_wcp, proto_wcp); + wcp_handle = new_create_dissector_handle(dissect_wcp, proto_wcp); dissector_add_uint("fr.nlpid", NLPID_COMPRESSED, wcp_handle); dissector_add_uint("ethertype", ETHERTYPE_WCP, wcp_handle); } |