diff options
Diffstat (limited to 'epan/dissectors/packet-pppoe.c')
| -rw-r--r-- | epan/dissectors/packet-pppoe.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c index fb5956a6fb..fd50297171 100644 --- a/epan/dissectors/packet-pppoe.c +++ b/epan/dissectors/packet-pppoe.c @@ -681,7 +681,7 @@ dissect_pppoe_tags(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tr /* Discovery protocol, i.e. PPP session not yet established */ -static void dissect_pppoed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int dissect_pppoed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { guint8 pppoe_code; guint16 reported_payload_length; @@ -719,6 +719,7 @@ static void dissect_pppoed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_pppoe_tags(tvb, pinfo, 6, pppoe_tree, 6+reported_payload_length); } + return tvb_captured_length(tvb); } void proto_register_pppoed(void) @@ -1029,13 +1030,13 @@ void proto_reg_handoff_pppoed(void) { dissector_handle_t pppoed_handle; - pppoed_handle = create_dissector_handle(dissect_pppoed, proto_pppoed); + pppoed_handle = new_create_dissector_handle(dissect_pppoed, proto_pppoed); dissector_add_uint("ethertype", ETHERTYPE_PPPOED, pppoed_handle); } /* Session protocol, i.e. PPP session established */ -static void dissect_pppoes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int dissect_pppoes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { guint8 pppoe_code; guint16 reported_payload_length; @@ -1183,6 +1184,7 @@ static void dissect_pppoes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (length - credit_offset), (reported_length - credit_offset)); call_dissector(ppp_handle,next_tvb,pinfo,tree); + return tvb_captured_length(tvb); } void proto_register_pppoes(void) @@ -1289,7 +1291,7 @@ void proto_register_pppoe(void) void proto_reg_handoff_pppoes(void) { dissector_handle_t pppoes_handle = - create_dissector_handle(dissect_pppoes, proto_pppoes); + new_create_dissector_handle(dissect_pppoes, proto_pppoes); dissector_add_uint("ethertype", ETHERTYPE_PPPOES, pppoes_handle); dissector_add_uint("wtap_encap", WTAP_ENCAP_PPP_ETHER, pppoes_handle); |