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-netbios.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-netbios.c')
| -rw-r--r-- | epan/dissectors/packet-netbios.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c index 48c155c214..02eba9bfd2 100644 --- a/epan/dissectors/packet-netbios.c +++ b/epan/dissectors/packet-netbios.c @@ -1076,8 +1076,8 @@ dissect_netbios_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) call_dissector(data_handle,tvb, pinfo, tree); } -static void -dissect_netbios(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_netbios(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_tree *netb_tree = NULL; proto_item *ti; @@ -1107,7 +1107,7 @@ dissect_netbios(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* print bad packet */ col_set_str( pinfo->cinfo, COL_INFO, "Bad packet, no 0xEFFF marker"); - return; /* this is an unknown packet, no marker */ + return 3; /* this is an unknown packet, no marker */ } } @@ -1237,6 +1237,7 @@ dissect_netbios(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } pinfo->fragmented = save_fragmented; } + return tvb_captured_length(tvb); } static void @@ -1483,7 +1484,7 @@ proto_reg_handoff_netbios(void) { dissector_handle_t netbios_handle; - netbios_handle = create_dissector_handle(dissect_netbios, + netbios_handle = new_create_dissector_handle(dissect_netbios, proto_netbios); dissector_add_uint("llc.dsap", SAP_NETBIOS, netbios_handle); data_handle = find_dissector("data"); |