summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
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>
2014-09-07Eliminate proto_tree_add_text from some of the dissectors.Michael Mann13-145/+230
Other minor cleanups while in the area. Change-Id: Id8dab02df6f111c3462238c3de1bf201e037ca48 Reviewed-on: https://code.wireshark.org/review/4022 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-07[Automatic manuf, services and enterprise-numbers update for 2014-09-07]Gerald Combs4-10/+219
Change-Id: I35bc2282b41810cc9644ded0b5c4036f4508264b Reviewed-on: https://code.wireshark.org/review/4024 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-07Squelch a compiler warning and get rid of an unnecessary variable.Guy Harris1-2/+1
Just use "sizeof line" for the size of that array; don't have a separate variable with the number of elements of the array (which at least is equal to the size of the array, as it's an array of char), as that means that you have to remember to change both of them. Then cast "sizeof line" to int, as the second argument to fgets() is an int, not a size_t (fgets(), as I remember, existed before size_t). Change-Id: I3c65774527f4fcd824d7ae39208ab6e8e33eb9b4 Reviewed-on: https://code.wireshark.org/review/4023 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-07Create subdissector table for RTAC Serial and have dissectors register with ↵Michael Mann9-72/+99
it, rather than have the RTAC Serial dissector go find all of the dissectors its interested in. Change-Id: I6b6a05ec242e4798fb56ffa43c661ec277aca955 Reviewed-on: https://code.wireshark.org/review/3984 Reviewed-by: Chris Bontje <cbontje@gmail.com> 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-07GTK (conversations table): Fix Dereference of null pointer found by Clang ↵Alexis La Goutte1-0/+3
analyzer Change-Id: Iebe0c581259b80d905f0ef3e26c1caae07f715d1 Reviewed-on: https://code.wireshark.org/review/4012 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-06Don't give names to parameters you don't use.Guy Harris1-1/+1
C++, unlike C, lets you do that. This squelches warnings from MSVC++. Change-Id: Id7127392b7690769111afdb951951d743f1d5e63 Reviewed-on: https://code.wireshark.org/review/4019 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-06Convert all the other function-defining macros.Guy Harris1-15/+15
(Perhaps C2099 will finally deprecate old-style function definitions and allow you to declare parameters without names, just as C++ does, and compilers will - obviously - not warn about those parameters being unreferenced, obviating the need for __attribute((unused))__ and the like. And perhaps monkeys will fly out of....) Change-Id: Iff295c1854e66eb4f9e02cdd5761e0191d371365 Reviewed-on: https://code.wireshark.org/review/4018 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-06Try to suppress MSVC++ unused parameter warnings.Guy Harris1-5/+11
I haven't found a way to with MSVC to mark parameters in the argument list as unused. MSVC doesn't give warnings about them in C code, but does appear to give them with C++ code. An answer to http://stackoverflow.com/questions/3020584/avoid-warning-unreferenced-formal-parameter suggests not giving the formal parameter a name in C++. Have a macro UNUSED_PARAMETER(), which takes as an argument a variable name, and expands to nothing in C++ and to the variable name followed by _U_ in C, and use that for some unused parameters. If it works, we'll use it for all of them. Change-Id: I76107bed037f1f0d94615adb42234c9faf83b4db Reviewed-on: https://code.wireshark.org/review/4016 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-06Make the count of bytes read from the file 64 bits.Guy Harris1-1/+1
We probably won't get files that big, but let's at least be prepared; that squelches some compiler warnings. Change-Id: Ia43ff78af7df63c7204c41d8331fea946de63116 Reviewed-on: https://code.wireshark.org/review/4015 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-06Make some variables size_t, as values of that width are assigned to it.Guy Harris1-3/+3
(I'd say "as values of that *type* are assigned to it", but the "len" field of a GString is of type "gsize", and, for some unknown reason, the GLib folks, rather than just using size_t, which is required by C89 to be available, invented their own "gsize" type, defined as "long", which happens to be narrower than "size_t" on LLP64 platforms such as 64-bit Windows. Sigh....) This squelches some compiler warnings. Change-Id: Ifca1300297b2e9b777fb2c426dda822ba157cfe5 Reviewed-on: https://code.wireshark.org/review/4014 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-06Put asn1 back as a distributed subdirectory.Guy Harris1-0/+1
If it's not there, "make distcheck" fails. In addition, 1) "make distclean" doesn't clean out the Makefile.in files under asn1 and 2) you don't get to see the source from which the ASN.1 dissectors were built if you have a source tarball. Change-Id: Ied59d42950373476a535fcf9cfccece46de92599 Reviewed-on: https://code.wireshark.org/review/4013 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-06Remove obsolete dissectors.AndersBroman30-12547/+0
Change-Id: Icd480491670de9d8495a95861b18a8a5cb9724b4 Reviewed-on: https://code.wireshark.org/review/4006 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-06Eliminate proto_tree_add_text from some of the dissectors.Michael Mann23-435/+437
Other minor cleanups while in the area. Change-Id: I8ea59205cfe6fab643d8fe01b75ce91532004fd9 Reviewed-on: https://code.wireshark.org/review/4004 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-09-06MySQL : Eliminate proto_tree_add_text (use proto_tree_add_debug...)Alexis La Goutte1-5/+5
Change-Id: I2e14328715cd11bc1ce31dad91b1cc5ef4091130 Reviewed-on: https://code.wireshark.org/review/4005 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>