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-msproxy.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-msproxy.c')
| -rw-r--r-- | epan/dissectors/packet-msproxy.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c index c6a4276392..41d531ddc8 100644 --- a/epan/dissectors/packet-msproxy.c +++ b/epan/dissectors/packet-msproxy.c @@ -191,8 +191,8 @@ typedef struct { /************** negotiated conversation hash stuff ***************/ -static void msproxy_sub_dissector( tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree) { +static int msproxy_sub_dissector( tvbuff_t *tvb, packet_info *pinfo, + proto_tree *tree, void* data _U_) { /* Conversation dissector called from TCP or UDP dissector. Decode and */ /* display the msproxy header, the pass the rest of the data to the tcp */ @@ -249,6 +249,7 @@ static void msproxy_sub_dissector( tvbuff_t *tvb, packet_info *pinfo, pinfo->destport, -1); *ptr = redirect_info->server_int_port; + return tvb_captured_length(tvb); } @@ -1046,8 +1047,7 @@ static void dissect_msproxy_response(tvbuff_t *tvb, packet_info *pinfo, -static void dissect_msproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - +static int dissect_msproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_tree *msproxy_tree; proto_item *ti; @@ -1085,6 +1085,8 @@ static void dissect_msproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_msproxy_response( tvb, pinfo, msproxy_tree, hash_info); else dissect_msproxy_request( tvb, pinfo, msproxy_tree, hash_info); + + return tvb_captured_length(tvb); } @@ -1254,7 +1256,7 @@ proto_register_msproxy( void){ expert_msproxy = expert_register_protocol(proto_msproxy); expert_register_field_array(expert_msproxy, ei, array_length(ei)); - msproxy_sub_handle = create_dissector_handle(msproxy_sub_dissector, + msproxy_sub_handle = new_create_dissector_handle(msproxy_sub_dissector, proto_msproxy); } @@ -1266,7 +1268,7 @@ proto_reg_handoff_msproxy(void) { dissector_handle_t msproxy_handle; - msproxy_handle = create_dissector_handle(dissect_msproxy, + msproxy_handle = new_create_dissector_handle(dissect_msproxy, proto_msproxy); dissector_add_uint("udp.port", UDP_PORT_MSPROXY, msproxy_handle); } |