diff options
author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-03-25 19:02:18 +0000 |
---|---|---|
committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-03-25 19:02:18 +0000 |
commit | cc6fc23812104d4a075a3beac738c7dcd3ee8e8b (patch) | |
tree | 018418cf804b5694292966d5073ccffac84a3bd4 /epan/dissectors/packet-snmp.c | |
parent | 28ef67fb391330d617c5d43b0179069aff725497 (diff) | |
download | wireshark-cc6fc23812104d4a075a3beac738c7dcd3ee8e8b.tar.gz wireshark-cc6fc23812104d4a075a3beac738c7dcd3ee8e8b.tar.bz2 wireshark-cc6fc23812104d4a075a3beac738c7dcd3ee8e8b.zip |
From Didier via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3055 :
Apply rev 25869 to most of the rest of the TCP-desegmenting dissectors.
(The SSL dissector was already updated in one of two spots with bug 4535/rev
32456.)
A couple of the patches had to be manually applied.
From me: Fix the comments to match the change (including in the TCP and SSL
dissectors.)
svn path=/trunk/; revision=36332
Diffstat (limited to 'epan/dissectors/packet-snmp.c')
-rw-r--r-- | epan/dissectors/packet-snmp.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index e5a650ea3b..3c14c631a9 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-snmp.c */ -/* ../../tools/asn2wrs.py -b -p snmp -c ./snmp.cnf -s ./packet-snmp-template -D . snmp.asn */ +/* ../../../tools/asn2wrs.py -b -p snmp -c ../../../asn1/snmp/snmp.cnf -s ../../../asn1/snmp/packet-snmp-template -D ../../../asn1/snmp snmp.asn */ /* Input file: packet-snmp-template.c */ @@ -2785,8 +2785,16 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, * BER). */ if (length_remaining < 6) { + /* + * Yes. Tell the TCP dissector where the data + * for this message starts in the data it handed + * us and that we need "some more data." Don't tell + * it exactly how many bytes we need because if/when + * we ask for even more (after the header) that will + * break reassembly. + */ pinfo->desegment_offset = offset; - pinfo->desegment_len = 6 - length_remaining; + pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT; /* * Return 0, which means "I didn't dissect anything @@ -3625,7 +3633,7 @@ void proto_register_snmp(void) { NULL, HFILL }}, /*--- End of included file: packet-snmp-hfarr.c ---*/ -#line 2140 "packet-snmp-template.c" +#line 2148 "packet-snmp-template.c" }; /* List of subtrees */ @@ -3665,7 +3673,7 @@ void proto_register_snmp(void) { &ett_snmp_RReqPDU_U, /*--- End of included file: packet-snmp-ettarr.c ---*/ -#line 2156 "packet-snmp-template.c" +#line 2164 "packet-snmp-template.c" }; module_t *snmp_module; |