osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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 <wireshark@kaiser.cx>
This commit is contained in:
Martin Kaiser 2016-05-01 18:31:55 +02:00
parent 0eff7256ec
commit 5b1d42c46a
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/asn1/snmp/packet-snmp-template.c
View File

@ -1948,13 +1948,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo,
*/ */
pinfo->desegment_offset = offset; pinfo->desegment_offset = offset;
pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT; pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT;
return -1;
/*
* Return 0, which means "I didn't dissect anything
* because I don't have enough data - we need
* to desegment".
*/
return 0;
} }
} }

12
epan/dissectors/packet-snmp.c
View File

@ -3157,13 +3157,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo,
*/ */
pinfo->desegment_offset = offset; pinfo->desegment_offset = offset;
pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT; pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT;
return -1;
/*
* Return 0, which means "I didn't dissect anything
* because I don't have enough data - we need
* to desegment".
*/
return 0;
} }
} }
@ -3901,7 +3895,7 @@ void proto_register_snmp(void) {
NULL, HFILL }}, NULL, HFILL }},
/*--- End of included file: packet-snmp-hfarr.c ---*/ /*--- 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 */ /* List of subtrees */
@ -3941,7 +3935,7 @@ void proto_register_snmp(void) {
&ett_snmp_RReqPDU_U, &ett_snmp_RReqPDU_U,
/*--- End of included file: packet-snmp-ettarr.c ---*/ /*--- 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[] = { 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 }}, { &ei_snmp_failed_decrypted_data_pdu, { "snmp.failed_decrypted_data_pdu", PI_MALFORMED, PI_WARN, "Failed to decrypt encryptedPDU", EXPFILL }},