aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-08-04Write out decode_as entries from the actual dissector tables.Guy Harris4-69/+72
Have a save_decode_as_entries() routine in ui/decode_as_utils.c, that does all the work of saving the entries by iterating through all the changed entries with dissector_all_tables_foreach_changed(). When doing so, write out the selector for integral values in decimal, as older versions of Wireshark only handled decimal values, and some of those older versions are EOLed and won't be fixed. Change-Id: I2dab461604524b98e3515867839a4b86c86c5d7b Reviewed-on: https://code.wireshark.org/review/3426 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-04Squelch a compiler warning.Guy Harris1-2/+2
Change-Id: I8916bb3cc136c03c39fbdaf5d7bb61c3dae137e6 Reviewed-on: https://code.wireshark.org/review/3422 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-04Add in a missing newline.Guy Harris1-1/+1
Change-Id: I704be0f8a87c939b5058d574da833b237a32148d Reviewed-on: https://code.wireshark.org/review/3419 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-04Support both decimal and hex values for uint dissectors.Guy Harris1-1/+12
And, while we're at it, reject entries with invalid numbers. Change-Id: Ifefe28396cfe391d2d5c7f7ff335d0f041e35a03 Reviewed-on: https://code.wireshark.org/review/3417 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-04Remove a comment asking a question, as the answer is "no".Guy Harris1-1/+0
I.e., no, the epan/decode_as.c stuff belongs in libwireshark, not libui, because dissectors need to be able to say "I support decode-as...". Code to implement the UIs that allow decode-as entries to be specified would belong in libui. Change-Id: Ibf9da19e752481a3892d0f03d0a0537590ab1811 Reviewed-on: https://code.wireshark.org/review/3416 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-04Initial Ceph Dissector.Kevin Cox5-0/+8547
This is the first version of a Ceph dissector. It is not complete but is far enough along to be helpful to many people working with Ceph. Currently the dissector can fully dissect the Ceph protocol and has support for full dissection of most common messages. For the other messages for which full dissection is not available their metadata is parsed and shown along with the raw data of the different message sections. Change-Id: Ic7917a3d01148c6fe2f9ea2c13ecd09ecc06c2d7 Reviewed-on: https://code.wireshark.org/review/1889 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-04Fix a comment.Guy Harris1-2/+4
Change-Id: I4dff4912ad8355552ba9efee73c0aae9a2a55000 Reviewed-on: https://code.wireshark.org/review/3415 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-04Add a cmake build to distcheck to ensure that we distribute all the filesJeff Morriss1-0/+11
necessary to do a cmake build. Note that this does mean that anyone doing "make distcheck" needs cmake. Bug: 10331 Change-Id: I4360a305aa7f6ffc1b5a5dffad24b928eed45016 Reviewed-on: https://code.wireshark.org/review/3326 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-04Fix RPM builds with a prefix other than /usr.Jeff Morriss1-8/+8
The location of update-alternatives does not depend on Wireshark's installation prefix: it's always in /usr/sbin/. Change-Id: I7dda9cebec83bc64133adfeb5ee6af70dc6dc7ab Reviewed-on: https://code.wireshark.org/review/3413 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-04MySQL: decoding response failsAlexis La Goutte1-1/+1
MySQL Response packets within an SSL stream are not correctly decoded. When not using SSL: - Decoding works - Multiple MySQL protocol entries per frame - Info==Response With SSL: - Decoding partly works - One MySQL protocol entry per fram - Info==Response Tabular From me: call dissect_mysql (with tcp_dissect_pdus..) and not dissect_mysql_pdu ! Bug: 10339 Change-Id: I253f6683105ed23b49a72865fea005e31e2594d8 Reviewed-on: https://code.wireshark.org/review/3412 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-04DNS: Fix minor typo (Missing a space...)Alexis La Goutte1-1/+1
Change-Id: Ie983ba3b88102c4f3749ab2f13d519eb78838bbc Reviewed-on: https://code.wireshark.org/review/3410 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-04Rip out the filetap codeEvan Huus19-4209/+28
We decided at sharkfest that this wasn't the right design for file dissection; we have more-or-less settled on way forward, but nobody's shown interest in implementing it. Whether or not that ever happens, this code is effectively dead and should be removed. Change-Id: I14d6086df3204fffb6485228db39d9f407661417 Reviewed-on: https://code.wireshark.org/review/3400 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-04Always create subtree in proto_item_add_subtree().Jakub Zawadzki1-19/+6
It might fix bug #10345 Ping-Bug: 10345 Change-Id: I695a2955a9bb0248ff3967bdaef004389500bbc9 Reviewed-on: https://code.wireshark.org/review/3402 Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-04Don't try and run checkAPIs.pl on deleted filesEvan Huus1-1/+1
It fails, for obvious reasons, and makes it impossible to commit the removal of c/h files. Change-Id: Ifcd067f8959684e2e0191983fd60fb94ae86bca3 Reviewed-on: https://code.wireshark.org/review/3401 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-04CMake 2.8+ supports CMAKE_OSX_DEPLOYMENT_TARGET; don't do that stuff ourselves.Guy Harris1-35/+7
Do, however, do the "for a target of 10.4 or 10.5, build 32-bit only" stuff, as that's specific to programs that capture traffic, such as Wireshark (well, I guess we could just limit it to dumpcap, but...). Change-Id: I5f4d4d57fd126e5c295dedae9ed13b263035a911 Reviewed-on: https://code.wireshark.org/review/3403 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-04Try to detect overflow without causing signedness warnings.Evan Huus1-1/+1
Change-Id: I957ead1f674e2c56e9c741841fea11395769b238 Reviewed-on: https://code.wireshark.org/review/3398 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-04Check for multiplicative overflow in the wmem_alloc_array macros.Evan Huus1-2/+5
Bug:10343 Change-Id: Iea511c806b92999b3b497f94886c46a818100a23 Reviewed-on: https://code.wireshark.org/review/3396 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-03Stateless Transport Tunneling: Add STT dissector supportrvichery3-0/+377
Bug: 10282 Change-Id: Id3e53c53d024a74df0dfb5254e26d4594eb2e9a4 Reviewed-on: https://code.wireshark.org/review/3036 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-03Remove duplicate line.Guy Harris1-1/+0
Change-Id: I0b32ccaaa7c9e0294ee7bc96fe4937a98d8461d5 Reviewed-on: https://code.wireshark.org/review/3394 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-03Squelch some compiler warnings.Guy Harris1-1/+1
The version of GCC on the OS X 32-bit buildbot isn't smart enough to figure out that this can't happen (it's one of those "if (xxx) foo = bar; ... if (xxx) use foo;" cases.) Change-Id: I04fef2d602c913761ae7832c4f568aaaad398c87 Reviewed-on: https://code.wireshark.org/review/3390 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-03Add some issues that came up when comparing autotools and CMake compile flags.Guy Harris1-4/+7
Also be consistent about whether OS X is working or not, and note that we're also doing CMake builds on Solaris. Change-Id: I2da18d2fb5aec7e5806dc7ea186f729acef94272 Reviewed-on: https://code.wireshark.org/review/3389 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-03Add an OSX_DEPLOY_TARGET option to control building for a target OS version.Guy Harris2-3/+57
It should be set to an OS version, such as "10.5" or "10.6" or..., and, if set (and if you're building for "APPLE"), it'll try to find the SDK (and fail if it's not found), and add appropriate -isysroot, -mmacosx-version-min, and, if appropriate, -m32 compiler options. (It will need more work once we support building OS X app bundles and installers; pick up more stuff from configure.ac for that.) Change-Id: I0aebf2db8aa39304a41be4e2a9879dea6f308ec7 Reviewed-on: https://code.wireshark.org/review/3388 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-03Define INET6 in config.h rather than in the Makefile.Guy Harris1-7/+17
That's what we do with nmake and CMake; this makes it uniform, so it's easier to compare compiler commands. Change-Id: Ice2c4bd796e921fa3089e8a45a32ad14d9b0e0a4 Reviewed-on: https://code.wireshark.org/review/3387 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-03Go back to non-verbose Makefiles.Guy Harris1-7/+0
(The difference in question turned out to be that optimization wasn't turned on for autotools builds but was turned on for CMake builds. Comparing the compiler options also found some other differences that should be cleaned up.) Change-Id: I2edb28dedc47fe10b3f68f25d3e302430b27bf46 Reviewed-on: https://code.wireshark.org/review/3386 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-03Add missing macro parameterEvan Huus1-1/+1
This is what you get for forward-cherrypicking commits you made on master-1.12. Change-Id: I8e51181d497dc63c614fe623439506cfe99c6fa3 Reviewed-on: https://code.wireshark.org/review/3385 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-03Make Lua taps work in out-of-source-tree builds.Jeff Morriss4-19/+16
make-taps.pl needs to know where to find the source files in order to build the taps. This makes the wslua test suite run in autofoo out-of-source-tree builds too. To make it work with cmake builds requires putting all the epan/wslua/ output (or at least init.lua) in epan/wslua/ instead of epan/. Change-Id: I1b3c517f08d3c752ee03cb89482ee4951ceb5bf3 Reviewed-on: https://code.wireshark.org/review/3348 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-03Initialize a variable to squelch a false-positive warning on the mac buildbotEvan Huus1-1/+1
Change-Id: I43f5ea7a73941b518c714216df0d7e25ad260012 Reviewed-on: https://code.wireshark.org/review/3384 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-03Only fake an item by returning 'tree' if they use the same TVBEvan Huus1-44/+45
Otherwise the offsets will be wrong when calling, e.g. proto_item_set_end. Bug:10329 Change-Id: I5ae0c660af90678e446817b65f83c075e7c0b84e Reviewed-on: https://code.wireshark.org/review/3341 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-03Cast G_STRUCT_OFFSET to gint to fix mac buildbotEvan Huus1-1/+1
glib casts the result to glong for no apparent reason (has anybody ever defined a structure of more than 2^32 bytes?) which was causing a whole bunch of useless 64-to-32-bit conversion warnings. Change-Id: I70305fb3b03332bb876023acdd107eb1e95fea27 Reviewed-on: https://code.wireshark.org/review/3383 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-03Eliminate proto_tree_add_text from some dissectors.Michael Mann25-226/+396
Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f Reviewed-on: https://code.wireshark.org/review/3319 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-03Eliminate proto_tree_add_text from some dissectors.Michael Mann13-197/+260
Change-Id: Ib6024307e85d6c23decf40e9759f549c19ffe136 Reviewed-on: https://code.wireshark.org/review/3318 Petri-Dish: Michael Mann <mmann78@netscape.net> 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-08-03Fix TCP/UDP/SCTP conversations broken by g59ef97d and g31ecdf5Pascal Quantin4-2/+65
Bug: 10336 Change-Id: Ia0dbe3abfade59a1c9714eacd8a854eafa6cf879 Reviewed-on: https://code.wireshark.org/review/3379 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-03[Automatic manuf, services and enterprise-numbers update for 2014-08-03]Gerald Combs4-14/+194
Change-Id: Icb7fc56e6127761465c38deed755ae54bef6f272 Reviewed-on: https://code.wireshark.org/review/3380 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-03http2: Update to h2-14Tatsuhiro Tsujikawa6-630/+448
* Expand frame length field to 24 bits * Add new SETTINGS: - SETTINGS_MAX_FRAME_SIZE - SETTINGS_MAX_HEADER_LIST_SIZE * Update libnghttp2 HPACK * Remove END_SEGMENT flag Change-Id: I5906322ad5a4d61c963ed95fada9415e66e146da Reviewed-on: https://code.wireshark.org/review/3357 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-08-03HTTP2: Fix README about change of nghttp2Alexis La Goutte1-1/+1
nghttp2ver.h is a local header, so use "" not <> See commit 4a182d48b1105889b51ee3bb06b033c636965130 Change-Id: I49210906290210fde8f496996e0e5ae69d697338 Reviewed-on: https://code.wireshark.org/review/3349 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-03lbm: fix "member access within null pointer" warningPeter Wu1-1/+1
This patch avoids the following warning with `clang -fsanitize=undefined`: epan/dissectors/packet-lbtrm.c:1519:36: runtime error: member access within null pointer of type 'lbtrm_hdr_t' Change-Id: I973caf92547f5d16c0de20908b2b3fbc09227df0 Reviewed-on: https://code.wireshark.org/review/3313 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-03paltalk: fix undefined behavior (shift out of range)Peter Wu1-2/+14
The shift `(gint32)0xFF << 24` invokes undefined behavior as it may not fit in a signed integer. Fix this by explicitly casting 0xFF as unsigned. Caught by `clang -fsanitize=undefined`. While at it, convert to tvb_captured_length and add modelines. Change-Id: I241ff8ed91815369ec0c19719750cee4b6b12343 Reviewed-on: https://code.wireshark.org/review/3311 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-03HTTP2: Add a preference to enable/disable HTTP2 (weak) heuristicsAlexis La Goutte1-0/+24
By default, the heuristic is disabled Change-Id: I26ef23e8b153576a4fabd2e3324e830756e64bb7 Ping-Bug:10335 Ping-Bug:10310 Reviewed-on: https://code.wireshark.org/review/3350 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-03Get rid of debugging output, and get CMake to produce verbose makefiles.Guy Harris2-32/+29
On the 32-bit OS X buildbot, automake is old enough that autotools builds are verbose, printing the command line for each compile step; if we cause CMake to produce verbose makefiles, they will also print the command line, so we can see what differences there are. This means the other debugging output we added isn't necessary; remove it. Sort the extra warning options in configure.ac based on whether they're for C and C++ or just C, just as is the case in CMake, to make it easier to keep the lists in sync; add comments to configure.ac to mirror the ones in CMakeLists.txt. Get rid of -Wno-deprecated-declarations; the CMake build doesn't use it, and it doesn't appear to be necessary - if we ever have problems with OS X complaining about using OpenSSL, for example, we should do as tcpdump does and wrap uses of the "deprecated"-but-cross-platform APIs in the appropriate pragmas. Change-Id: I0b8b45f00481ac2b67da5c7dd028a029b130dcc4 Reviewed-on: https://code.wireshark.org/review/3377 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-03Remove get_next_di() and just use packet-scope for thoseEvan Huus1-22/+10
Presumably that was added for tap purposes, but packet-scope is much simpler and less dangerous. Noticed while investigating the scan-build issues with stack-local variables being pointed to by globals. Change-Id: I851d756b103df71079b656e624f7472354c15862 Reviewed-on: https://code.wireshark.org/review/3290 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-03Fix an infinite loop when the line has no lengthEvan Huus1-1/+1
Bug:10333 Change-Id: Ia2dae94095dddf57e4c75792b5477b0eb37c29c9 Reviewed-on: https://code.wireshark.org/review/3343 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-03Fix uninitialized session ticketPeter Wu1-0/+2
If the tvb contained too few data, ssl_dissect_hnd_hello_ext_session_ticket would then allocate session_ticket, but not initialize the contents. Fix this by adding a check for the TVB length. The same is done for ssl_dissect_hnd_new_ses_ticket. That might, or might not, be necessary as proto_tree_add_item() is called with the range. When tree is NULL, ssl is usually NULL too. For clarity (and to avoid surprises in the future), add it anyway. Bug: 10330 Change-Id: I469e97542542aaef4cbd660086bedf92ba1c0b6e Reviewed-on: https://code.wireshark.org/review/3309 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-03wmem: get rid of the allocator timing testEvan Huus1-59/+0
Some of the allocators are close enough that a little bit of system load at the time of the test was enough to throw them off, and it was causing unnecessary buildbot failures. Benchmarking on real-world cases at the time of implementation (as well as reliable "average" results on the buildbots) has left me confident that block_fast is, in fact, faster than block, which is faster than simple/strict. Additionally, the allocators are effectively "done" and unlikely to change, so the possibility of uncaught performance regressions is low. Change-Id: I144ea4cd9d6000edc4075ed682ce6a4aeaf5e28a Reviewed-on: https://code.wireshark.org/review/3356 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-03Have ConversationDialog retain data between captures.Gerald Combs1-0/+6
Remove our tap listeners when the capture file closes. This lets us view conversation data for multiple capture files. Change-Id: Ifaa1d2c9d3cd10b1d282aa0070ee2edacc7ce3b0 Reviewed-on: https://code.wireshark.org/review/3376 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-03Print the actual compiler, not its "CMake-id".Guy Harris1-2/+2
Hopefully this will help figure out whether we're using different compilers for the autotools and CMake builds. Change-Id: If6d2ee93cd14570c53723140dcedf347600cbe34 Reviewed-on: https://code.wireshark.org/review/3375 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-03OK, try sorting the compiler options.Guy Harris2-13/+15
Also, comment out the addition of -Wno-deprecated-declarations, as the CMake build doesn't use it. If this succeeds in making the autotools and CMake builds compile C code with the same -W and -f flags in the same order, that should eliminate at least one reason why the CMake build produces compiler warnings that the autotools build doesn't. Change-Id: I0eaeae91b8e3c39c53f502daef86c2d103c8bdab Reviewed-on: https://code.wireshark.org/review/3374 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-02Note that the ...COMMON_FLAGS are for C and C++.Guy Harris1-0/+2
Change-Id: I0ef87b3b4aaed984a8a53660b36746345626583a Reviewed-on: https://code.wireshark.org/review/3373 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-02Convert the Statistics chapter to AsciiDoc.Gerald Combs4-740/+481
Don't update any content for now. Change-Id: Ib4f6402d9b23bd1ad57a57831b63c63a150391aa Reviewed-on: https://code.wireshark.org/review/3372 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-02Fix markup.Gerald Combs1-1/+1
Change-Id: I370af51abca6156a5ce293485970896b417bd7bf Reviewed-on: https://code.wireshark.org/review/3371 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-02Always check some -f flags.Guy Harris1-3/+3
Now that we check each flag with all previously-accepted flags, this catches the case where -fwrapv causes -fno-strict-overflow to produce a warning when tested. This way, what we do matches what the autotools do. Change-Id: I68ce281dc33a32b591e3137db626f2749c4a0708 Reviewed-on: https://code.wireshark.org/review/3370 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 12:13:59 +0000