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-linx.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-linx.c')
| -rw-r--r-- | epan/dissectors/packet-linx.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/epan/dissectors/packet-linx.c b/epan/dissectors/packet-linx.c index 0b362e2a76..b624522f6f 100644 --- a/epan/dissectors/packet-linx.c +++ b/epan/dissectors/packet-linx.c @@ -283,8 +283,8 @@ static const value_string linx_conn_cmd[] = { { 0, NULL} }; -static void -dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { guint32 dword; int offset = 0; @@ -639,6 +639,7 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } + return tvb_captured_length(tvb); } @@ -838,7 +839,7 @@ proto_reg_handoff_linx(void) { dissector_handle_t linx_handle; - linx_handle = create_dissector_handle(dissect_linx, proto_linx); + linx_handle = new_create_dissector_handle(dissect_linx, proto_linx); dissector_add_uint("ethertype", ETHERTYPE_LINX, linx_handle); } @@ -849,8 +850,8 @@ proto_reg_handoff_linx(void) /* Default the port to zero */ static guint linx_tcp_port = 0; -static void -dissect_linx_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_linx_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { guint32 dword; int offset = 0; @@ -981,6 +982,7 @@ dissect_linx_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } } + return tvb_captured_length(tvb); } void @@ -1087,7 +1089,7 @@ proto_reg_handoff_linx_tcp(void) if (!linx_tcp_prefs_initialized) { - linx_tcp_handle = create_dissector_handle(dissect_linx_tcp, proto_linx_tcp); + linx_tcp_handle = new_create_dissector_handle(dissect_linx_tcp, proto_linx_tcp); dissector_add_uint("tcp.port", linx_tcp_port, linx_tcp_handle); linx_tcp_prefs_initialized = TRUE; } |