From 5b1d42c46a7b3dd58d21e6ed390506b1d35a8807 Mon Sep 17 00:00:00 2001 From: Martin Kaiser Date: Sun, 1 May 2016 18:31:55 +0200 Subject: [PATCH] snmp: return -1 (not 0) if we need more data from TCP Change-Id: I72bb68bb09a5b3d4501676594b76deff63faa0bf Reviewed-on: https://code.wireshark.org/review/15211 Reviewed-by: Martin Kaiser --- epan/dissectors/asn1/snmp/packet-snmp-template.c | 8 +------- epan/dissectors/packet-snmp.c | 12 +++--------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/epan/dissectors/asn1/snmp/packet-snmp-template.c b/epan/dissectors/asn1/snmp/packet-snmp-template.c index b76b79a159..dcd7c50bf0 100644 --- a/epan/dissectors/asn1/snmp/packet-snmp-template.c +++ b/epan/dissectors/asn1/snmp/packet-snmp-template.c @@ -1948,13 +1948,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, */ pinfo->desegment_offset = offset; pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT; - - /* - * Return 0, which means "I didn't dissect anything - * because I don't have enough data - we need - * to desegment". - */ - return 0; + return -1; } } diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index 10624e5894..f9b3640c52 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -3157,13 +3157,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, */ pinfo->desegment_offset = offset; pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT; - - /* - * Return 0, which means "I didn't dissect anything - * because I don't have enough data - we need - * to desegment". - */ - return 0; + return -1; } } @@ -3901,7 +3895,7 @@ void proto_register_snmp(void) { NULL, HFILL }}, /*--- End of included file: packet-snmp-hfarr.c ---*/ -#line 2431 "./asn1/snmp/packet-snmp-template.c" +#line 2425 "./asn1/snmp/packet-snmp-template.c" }; /* List of subtrees */ @@ -3941,7 +3935,7 @@ void proto_register_snmp(void) { &ett_snmp_RReqPDU_U, /*--- End of included file: packet-snmp-ettarr.c ---*/ -#line 2447 "./asn1/snmp/packet-snmp-template.c" +#line 2441 "./asn1/snmp/packet-snmp-template.c" }; static ei_register_info ei[] = { { &ei_snmp_failed_decrypted_data_pdu, { "snmp.failed_decrypted_data_pdu", PI_MALFORMED, PI_WARN, "Failed to decrypt encryptedPDU", EXPFILL }},