aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-09-13README.dissector was split from README.developer in 2013 - update someJoerg Mayer7-32/+34
documents referring to the split out sections. Remove trailing whitespace while at this. Change-Id: I36cfe0ac55e8f653bffbf850e01f582aacf85557 Reviewed-on: https://code.wireshark.org/review/4094 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-09-12IPSec: fix compilation when building without libgcryptPascal Quantin1-17/+16
Change-Id: Iea3de2f0a54f9c0703afbeb42722d18da99f5c9a Reviewed-on: https://code.wireshark.org/review/4090 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-12Treat a length of -1 as a Very Large Length in most cases.Guy Harris1-1/+7
For field types where it doesn't mean "to the end of the tvbuff", treat it like other negative length values - as if it were unsigned and thus Very Large and thus likely to be past the end of the tvbuff. That way, some of the "we hax0red your SNMP packets" captures, with length fields of 0xffffffff, report malformed packets rather than dissector bugs. Change-Id: Id53f828b06b6febe7d79f8539e54523e0b43e5c2 Reviewed-on: https://code.wireshark.org/review/4091 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-12Register hfi_rip_zero_padding.Guy Harris1-1/+3
Also, sort the hfi[] array to be in the same order as the declarations of the fields, to make it easier to check that all fields are being registered. Change-Id: Ida530590ebd00bbf206e0f6041b8da880bce2c6f Reviewed-on: https://code.wireshark.org/review/4089 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-12Do FT_{U}INT64 the same way we do other FT_{U}INTn types.Guy Harris1-119/+117
Change-Id: Iae9c66fa82abfe20e9e8c922ddedfe87b0ab2abe Reviewed-on: https://code.wireshark.org/review/4088 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-12proto_tree_add_text cleanupMichael Mann15-591/+648
Create filters (expert and hf_) that have the "most bang for the buck" (ie have many instances for a single filter) Change-Id: I61995e41c5b298df77e084e65cdf30ebe95da1e6 Reviewed-on: https://code.wireshark.org/review/4086 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-11Add some additional checks in SnifferDecompress().Guy Harris1-10/+29
Check the input pointer in the while clause of the loop, so that we handle an empty input buffer. When reading a bit mask, check before fetching the bit mask that we have two bytes of bit mask and the byte after it. Before putting an uncompressed input byte into the output, make sure we wouldn't run past the end of the output buffer. Before copying an earlier string from the output buffer, make sure it doesn't run past the end of the data we've decompressed so far. Bug: 10461 Change-Id: I8bb8d0d291368ae8bf0ac26970ff54d3262a7e6e Reviewed-on: https://code.wireshark.org/review/4083 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-11Show the sctp.checksum_bad filter rather than hiding it.Jeff Morriss1-23/+25
Follow TCP's lead by putting the filter in a subtree under the checksum. Change-Id: I9351ee865011cd04bc3d3e88c51e8dbb3dc23f07 Reviewed-on: https://code.wireshark.org/review/4082 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-09-11packet-cfm.c: Update some comments; Add editor modelines.Bill Meier1-11/+21
- Indicate that ITU-T G.8013/Y.1731 (11/2013) is the latest spec (and that the cfm dissector has not been updated to reflect same). - Remove a comment about a "discrepancy in the recommendation ITU-T Y.1731". The discrepancy has been corrected in the latest spec. Change-Id: I5a5f873d2a0a5fdee3aef1688403bb317a155cdf Reviewed-on: https://code.wireshark.org/review/4081 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-11Don't use tvb_bytes_exist() to check if we captured the whole frame, justJeff Morriss1-11/+11
compare captured_length to reported_length (which we've already retrieved anyway). Replace calls to tvb_length() with non-deprecated versions. Change-Id: I9f6f3461915573fb21716a87cb6af416a3656097 Reviewed-on: https://code.wireshark.org/review/4080 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-09-11packet-cfm.c: Fix Bug 10385: "Ethernet OAM (CFM) frames including TLV's are ↵Bill Meier1-1/+1
wrongly decoded as malformed" Regression introduced in ga06cccb (svn #50352) [Jul 3 16:43:40 2013] Bug 10385 Change-Id: I3f5c5518a5804a1f31cac554323a6fa8d3d55d5d Reviewed-on: https://code.wireshark.org/review/4078 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-11Fix an incorrect commentMartin Mathieson1-1/+3
Change-Id: Ic60c67fcc554b5ceb0b359a992fafd0f84521eef Reviewed-on: https://code.wireshark.org/review/4077 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-09-11Code simplification from Hadriels abandoned change.AndersBroman1-36/+29
Change-Id: If859ff904b254d3bc62d1d0dc5cf26cace11cae3 Reviewed-on: https://code.wireshark.org/review/4075 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-11Do simple sequence analysis on ESP Sequence Number fieldMartin Mathieson1-12/+181
Change-Id: I84e204fb7a84eb821f4728a50945f34f4bdba73f Reviewed-on: https://code.wireshark.org/review/4057 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-09-11Eliminate proto_tree_add_text from some dissectors.Michael Mann11-240/+342
Change-Id: Ie41ac30f8edaeee75b23717ef1d5147d804a65b3 Reviewed-on: https://code.wireshark.org/review/4074 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-11Clarify that 16777229 is the AppID for 3GPP Rx Release 6.Jeff Morriss1-3/+3
(Later releases have a different AppID.) Change-Id: I41d4a498461e777f570641936db64d0551e36186 Reviewed-on: https://code.wireshark.org/review/4070 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-11Make all "padding" fields filterableMichael Mann8-36/+73
Change-Id: Ic4e4d9142a9b05ef3b628fac2e8766014c5fccec Reviewed-on: https://code.wireshark.org/review/4073 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-10Update to V12.2.0 (2014-06), remove deprecated APIsAndersBroman8-165/+1551
Change-Id: Icfd140f39a440dda197c6e68a4cb7daec2ae0e09 Reviewed-on: https://code.wireshark.org/review/4066 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-10packet-netflow.c: fix bug: "top-of-stack" --> "bottom-of-stack"Bill Meier1-1/+1
Bug #10458 Change-Id: I733bb54b13da8dd5b96837b57c1893e14f9622ec Reviewed-on: https://code.wireshark.org/review/4067 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-10Various minor changes:Bill Meier16-1359/+1507
- Create/use some extended value_strings - Remove unneeded #includes; - Do whitespace changes; - Add editor modelines. Change-Id: I2e1ea37dddfd5e8656c90c0d45a6596c4912bb2c Reviewed-on: https://code.wireshark.org/review/4065 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-10Update to revission V12.2.0 (2014-06)AndersBroman9-194/+899
Remove soft deprecated APIs Change-Id: I30adcb9f381c77142385c22fcc4a208169b0cf5e Reviewed-on: https://code.wireshark.org/review/4062 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-10packet-opensafety.c: Fix two bugs:Bill Meier1-42/+44
- Actually register dissector on default UDP ports upon startup. - expert_...() shouldn't be called under 'if (tree)' Also: cleanup proto_reg_handoff...() and apply_prefs() code. Change-Id: I6390d9bf311c9a62fbc43647d9bb19f90156baec Reviewed-on: https://code.wireshark.org/review/4063 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-10Minor performance tweaks:AndersBroman1-14/+15
- Only calculate tvb length once. - Use tvb_reported_length() instead of tvb_reported_length_remaining() as this is a subtvb offset is always 0. Change-Id: I03bd7a95061488d4576fa93f26e6b31d55f88738 Reviewed-on: https://code.wireshark.org/review/4060 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-10Make expert info text less verbose for missing ICMP response - no point in ↵Martin Mathieson1-2/+1
including frame number Change-Id: I47ca8159c0716cb49da7ff77b1087cf37babe97e Reviewed-on: https://code.wireshark.org/review/4059 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-09-10Replace deprecated tvb_length callsEvan Huus11-88/+79
And a few other misc. cleanups while in the neighbourhood. Change-Id: Ic0d6836dec9c36d31ea244a6adc74d4713565090 Reviewed-on: https://code.wireshark.org/review/4047 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-10Add tche custom taps to WIRESHARK_TAP_SRCAndersBroman1-1/+1
Change-Id: Ifedcc261585ea7308dbe3d493711d055d6d48237 Reviewed-on: https://code.wireshark.org/review/4058 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-09EPL: Fix offset calculationRoland Knall1-3/+1
The offset was calculated too high, as it was added to itself and sizes were added multiple times Change-Id: I1a581e96e2ab66e40f5566074e8bd1089f55bdb0 Reviewed-on: https://code.wireshark.org/review/4049 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-09Fix some spelling & grammar.Bill Meier31-64/+64
Change-Id: Iedeaa411caa0823922dd79c27897a2349d4e6907 Reviewed-on: https://code.wireshark.org/review/4054 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-09packet-sip.c: col_...() functions must not be called under 'if(...tree)' ↵Bill Meier1-2/+2
(even indirectly). Fixes Bug #10453 Change-Id: I39f64b801ce9231059ee7e03416dd3828dffeb1f Reviewed-on: https://code.wireshark.org/review/4051 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-09OSPF : cleanup hf_filter arrayAnish Bhatt1-465/+478
hf_filter array was removed. Compiles, did some manual testing and didn't see any regression. Bitfield still not changed over to inbuilt functions Change-Id: I510da6160c0f2375398b9ab30042ff172ae31c9f Reviewed-on: https://code.wireshark.org/review/3147 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-09-09General cleanup of RTP-MIDI dissector.Michael Mann1-1394/+544
The biggest changes involved: 1. Use the "bounds checking" of proto_tree_add_xxx, instead of doing it manually. There are still places where it's done "manually", but they have been drastically reduced. Someone with more understanding of the protocol/dissector would need to take a look at them. 2. proto_tree_add_text -> proto_tree_add_subtree[_format] 3. Use proto_tree_add_bitmask when appropriate. Change-Id: Iddbd2aadf5fd27f2cf9ba63873eb59dbd93b6394 Reviewed-on: https://code.wireshark.org/review/4039 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-09Eliminate proto_tree_add_text from some of the dissectors.Michael Mann25-287/+397
Other minor cleanups while in the area. Change-Id: I99096ade9c69a4c148962d45bb6b0bd775040ba1 Reviewed-on: https://code.wireshark.org/review/4020 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-09proto_tree_add_text -> something filterable.Michael Mann1-942/+491
Most of the items fell under the same 3 filterable fields. Many got converted to proto_tree_add_bitmask. Also removed the superfluous return statements Change-Id: Ib429f986d1c3648e51add8ad3d208428b0ba898c Reviewed-on: https://code.wireshark.org/review/4044 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-09Revert "Explicitly lengthen some constants to 64 bits"Evan Huus1-2/+2
Guy already fixed the issue, I was looking at a stale buildbot page. This reverts commit f9bfa976e67da2f8065f172de9ed06fad61762a8. Change-Id: I04e2f1ddfae9558b6cec40740ffbb66a16c3fecb Reviewed-on: https://code.wireshark.org/review/4046 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-08Explicitly lengthen some constants to 64 bitsEvan Huus1-2/+2
Hopefully squashes the mac buildbot error packet-mp2t.c:993: warning: implicit conversion shortens 64-bit value into a 32-bit value Change-Id: I9ca6420925442b56cfdf5db629b63d6ead7bdfbd Reviewed-on: https://code.wireshark.org/review/4045 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-08Fix automatic generation of the dcerpc-eventlog dissector.Jeff Morriss5-297/+281
The problem described in the README is simply because the conformance file hadn't been updated. Remove trailing white space from the .idl and .cnf files. Change-Id: I778f206aa103e5f60574fe2c5c699597969dc644 Reviewed-on: https://code.wireshark.org/review/4042 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-08Do the PCR and the original PCR the same way.Guy Harris1-7/+6
In both cases, make the extension a 16-bit variable, cast the result of extracting the extension to guint16 to clarify that only the 9 bits visible through the mask matter. While we're at it, there's no need to use "proto_tree_add_uint64_format_value() if the format is just the standard format for a 64-bit unsigned integer. Change-Id: I8f1f48595830d4672984f3797be1c9d994e64ea0 Reviewed-on: https://code.wireshark.org/review/4043 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-08don't skip another 6 bytes after OPCRMartin Kaiser1-31/+9
Bug: 10446 simplify OPCR calculation while we're at it Change-Id: I8590e409895e712fe6bbb64ab23093caf5795fa7 Reviewed-on: https://code.wireshark.org/review/4040 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-09-08Register the dicom dissector by name so it can be used with SSL.Jeff Morriss1-5/+3
Bug: 10450 Change-Id: I786de3de39c6d4829135b67a64936c28757d1ff4 Reviewed-on: https://code.wireshark.org/review/4038 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-08Check hopcount is correctly incremented by 1Jérôme LAFORGE1-6/+16
Extract RFC3315 about hop-count : 20.1.2. Relaying a Message from a Relay Agent If the message received by the relay agent is a Relay-forward message and the hop-count in the message is greater than or equal to HOP_COUNT_LIMIT, the relay agent discards the received message. The relay agent copies the source address from the IP datagram in which the message was received from the client into the peer-address field in the Relay-forward message and sets the hop-count field to the value of the hop-count field in the received message incremented by 1. Bug:10449 Change-Id: Ifb94e7c54c0a26714fc543862d4358d3e60c2676 Reviewed-on: https://code.wireshark.org/review/4017 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-08Eliminate proto_tree_add_text from some of the dissectors.Michael Mann18-215/+282
Other minor cleanups while in the area. Change-Id: I623d941e53128f169e55dfc629547b4221fa72fc Reviewed-on: https://code.wireshark.org/review/4021 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-08ses: initialize pres_ctx_id in session structEvan Huus1-0/+1
Bug: 10454 Change-Id: Ib381646cad0a039514117735c48b461c9950f705 Reviewed-on: https://code.wireshark.org/review/4033 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-08Try to fix build error by giving function a return typeMartin Mathieson2-2/+2
Change-Id: I157b6309bc8cb0bef6fc0cd213fd4ec7e4c375ef Reviewed-on: https://code.wireshark.org/review/4035 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-09-08Show band info for inter-freq entries in UE capabilities. Addresses ↵Martin Mathieson3-7/+125
Pascal's comments. Change-Id: Ie60dc73e40a2ac1d80197fa712075ccff83cf797 Reviewed-on: https://code.wireshark.org/review/4032 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-09-08Convert some deprecated tvb_length callsEvan Huus6-19/+19
Change-Id: I6337f8e02a41106a363b9bf767bc4b3697442d41 Reviewed-on: https://code.wireshark.org/review/4027 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-08Use dissect_e164_msisdn() for MSISDN.AndersBroman1-10/+1
Change-Id: I297241cafee8ec504b46044cacba457c5f261d6e Reviewed-on: https://code.wireshark.org/review/4034 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-08ZigBee: fix compilation when building without libgcryptPascal Quantin1-1/+1
Change-Id: I4e60cbdaa7c56eca8f95945066dd31660fba045b Reviewed-on: https://code.wireshark.org/review/4031 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-09-08packet-gnm.h: remove: (should have been part of 07b003a "Remove obsolete ↵Bill Meier2-42/+0
dissectors") Change-Id: I80455f69c2830609fe34ee79492d37dc4103de10 Reviewed-on: https://code.wireshark.org/review/4030 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-08SCSI: fix dissection of ElementAddress... mode page for SMC devicesRonnie Sahlberg1-12/+9
Change-Id: If16ad422ab851f538af309fbf7d567bd2a13cace Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com> Reviewed-on: https://code.wireshark.org/review/4029
2014-09-07Remove blank line, add newline at the end of the file.Guy Harris1-2/+1
Change-Id: I26bed6f3493ee7bb52439af9d72790a0133485c9 Reviewed-on: https://code.wireshark.org/review/4028 Reviewed-by: Guy Harris <guy@alum.mit.edu>