diff options
author | Michael Mann <mmann78@netscape.net> | 2015-11-08 20:15:22 -0500 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-11-09 15:59:42 +0000 |
commit | 0aa9e9864721d5f425ffeba85bbb642ebd12e771 (patch) | |
tree | 98918da5fd1c719a3ca17b6df2369a663ed66550 /epan/dissectors/packet-sscop.c | |
parent | 8f529628338f20948e80835076b7b18f6d48c6cf (diff) |
Convert some UDP subdissectors to "new" style.
Change-Id: I3c1ee97f68af4539b97d50b75c03ff82147dbc5e
Reviewed-on: https://code.wireshark.org/review/11649
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-sscop.c')
-rw-r--r-- | epan/dissectors/packet-sscop.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/dissectors/packet-sscop.c b/epan/dissectors/packet-sscop.c index 0058c8282d..eb2a12be04 100644 --- a/epan/dissectors/packet-sscop.c +++ b/epan/dissectors/packet-sscop.c @@ -335,7 +335,7 @@ dissect_sscop_and_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, d } } -static void dissect_sscop(tvbuff_t* tvb, packet_info* pinfo,proto_tree* tree) +static int dissect_sscop(tvbuff_t* tvb, packet_info* pinfo,proto_tree* tree, void* data _U_) { struct _sscop_payload_info *p_sscop_info; dissector_handle_t subdissector; @@ -353,6 +353,8 @@ static void dissect_sscop(tvbuff_t* tvb, packet_info* pinfo,proto_tree* tree) dissect_sscop_and_payload(tvb,pinfo,tree,subdissector); else dissect_sscop_and_payload(tvb,pinfo,tree,default_handle); + + return tvb_captured_length(tvb); } /* Make sure handles for various protocols are initialized */ @@ -438,7 +440,7 @@ proto_register_sscop(void) proto_register_field_array(proto_sscop, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - sscop_handle = register_dissector("sscop", dissect_sscop, proto_sscop); + sscop_handle = new_register_dissector("sscop", dissect_sscop, proto_sscop); sscop_module = prefs_register_protocol(proto_sscop, proto_reg_handoff_sscop); |