aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-03-08Add EditorConfig settings for most C filesJoão Valverde23-2/+821
Change-Id: I02e6d71290bbdf7504437b0d670955b3686b6b52 Reviewed-on: https://code.wireshark.org/review/14360 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-08Convert dissector modelines to EditorConfig fileJoão Valverde3-0/+2292
Change-Id: I467b6ca940d2f89346fde46b7348b00eab40092e Reviewed-on: https://code.wireshark.org/review/14353 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-08Start adding EditorConfig files.Gerald Combs4-0/+35
Add EditorConfig files where we currently have consistent indentation. This might let us get rid of our editor modeline footers at some point. Change-Id: I156f8d25cfa0050786eb2186c4b2e6d183c3a9ce Reviewed-on: https://code.wireshark.org/review/12383 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-07Qt: Remove unused version.h headerJoão Valverde1-2/+0
Change-Id: I3f9f38b2077077aca6106e22abe337bf724f33e7 Reviewed-on: https://code.wireshark.org/review/14379 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-07dmp: Report unused bits in last byte for 7bit string.Stig Bjørlykke1-17/+33
The protocol spec states that unused bits in the last byte in a 7bit string shall be null. Change-Id: I6fa2e0af6462c87279c19e23a98bf624e46bc9c1 Reviewed-on: https://code.wireshark.org/review/14387 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-03-07Add conflict check filterAlexis La Goutte5-1/+71
Set ENABLE_CHECK_FILTER to 1 for get list of display filter with conflict... Ping-Bug:2402 Change-Id: I8d56b1573120d1a29d437aae1088be242e15e9a3 Reviewed-on: https://code.wireshark.org/review/13644 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-07generate_authors: Align git log email columnJoão Valverde2-320/+328
Change-Id: Ic08b23e80a982805f4b512a410a1a4414afc3a8c Reviewed-on: https://code.wireshark.org/review/14354 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-07Update the Automake gen-authors target to match CMake.Gerald Combs1-1/+1
Broken in g32d60ac. Change-Id: Idf9ea0970c30c8eff8e21c3039fe47fd8a175a27 Reviewed-on: https://code.wireshark.org/review/14370 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-07sshdump: minor changesDario Lombardo1-12/+10
Change-Id: I07bd2a95622187c6bacb3013998f93bfa07af87c Reviewed-on: https://code.wireshark.org/review/14338 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-07Run checkAPIs in the (epan/) wslua and crypt directories.Jeff Morriss2-5/+4
Don't try to run it (automake only) in dcerpc: there's no target for it there. Change-Id: Idaf1d3d3ac27e837f484520406e604c12c4b473f Reviewed-on: https://code.wireshark.org/review/14346 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-06Fix indentation.Guy Harris1-23/+23
Change-Id: I78fd1d8e91443fa878e6c4ae05839d8a49849830 Reviewed-on: https://code.wireshark.org/review/14367 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-06[Automatic update for 2016-03-06]Gerald Combs19-4034/+4375
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ibd8571b495bc8170a5f77f7461d86a9a02c8b0b4 Reviewed-on: https://code.wireshark.org/review/14364 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-06To see whether a string equals another string, just use strcmp().Guy Harris1-1/+1
The goal here is to see whether out_filename is "-" or not; there's no good reason to use strncmp() here. Fixes Coverity CID 1316605. Change-Id: I851eee869afed58ac091982b8d303b0eda276c2e Reviewed-on: https://code.wireshark.org/review/14361 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-06Properly fetch the ethertype.Guy Harris1-1/+2
The ethertype is 16 bits and big-endian, so fetch it with pntoh16() to convert it to host byte order (and to handle unaligned values). Fixes Coverity CID 1355352. Change-Id: I14980e2813c3ea19c6df01681f8ed7aaad5c3f59 Reviewed-on: https://code.wireshark.org/review/14359 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-06802.15.4 update handling of PAN ID Compression to 802.15.4-2015Chris Brandson1-245/+297
Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-06MAPI (dcerpc): fix no previous prototype for 'mapi_dissect_struct_request' / ↵Alexis La Goutte2-7/+9
'mapi_dissect_struct_EcDoRpc_MAPI_REQ' [-Wmissing-prototypes] Change-Id: If5ff7835f931213f1b846776a3ea9dfa6a1952b1 Reviewed-on: https://code.wireshark.org/review/14352 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: João Valverde <j@v6e.pt> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-06DCERPC: regenerate dissector after change on generatorAlexis La Goutte6-749/+760
Fix mapi/nspi/rfc dissector Don't forget when regenerate to go on mapi/nspi/rfc and use make for regenerate Change-Id: I74b98bf84e7786f51d4f693379186b289913ca1b Reviewed-on: https://code.wireshark.org/review/11476 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>
2016-03-06PIDL (NDR): fix missing $name when regenerate MAPI dissectorAlexis La Goutte1-3/+6
Issue coming from ge41f08858b Change-Id: Ibff382b7cbf9a89904eb87d7f3e8f56b5782a0f6 Reviewed-on: https://code.wireshark.org/review/14351 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-06Improve wiretap block capabilities.Michael Mann4-1064/+725
Make a more formal method for registering options within a block and do it all with a single function (wtap_optionblock_add_block). Add ability for block to be able to write itself, refactored out of pcapng.c. This was implemented for SHB, ISB, and IDB blocks. Name resolution (NRB), while possible, seemed a little messy for the moment. Change-Id: Ie855c8550c7c7d96cfc188c0cd90bfbc4d5f0ee8 Reviewed-on: https://code.wireshark.org/review/14357 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-06CMake: Avoid pipes and the `cut` command.Gerald Combs2-7/+12
Dump the output of `git shortlog` directly to AUTHORS.git instead of piping it through `cut`. Depending on our toolchain, cmake COMMANDs might not support pipes. This appears to be the case for MSBuild. Removing the `cut` command has the added benefit of reducing our dependency on Cygwin. Pass HEAD to `git shortlog`, otherwise it doesn't return anything when run under MSBuild. Change-Id: I23e9436c007d76a700bbbc45c2772c8aba6d5749 Reviewed-on: https://code.wireshark.org/review/14349 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> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-05usb: display correctly index/interface/endpoint in urb setupVictor Dodon1-16/+52
In URB setup, wInterface is always displayed disregarding the actual bmRequestType. Show instead: wInterface if recipient is an interface, WEndpoint if recipient is an endpoint and wIndex when recipient is device or other. Change-Id: I6883dc22d80267276f9d171f39695e86e93aae83 Reviewed-on: https://code.wireshark.org/review/14283 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> 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>
2016-03-05Check source files for broken (read: not set to 8) tabstop settings.Jeff Morriss1-0/+15
Change-Id: I60e77a67189e7446f8c5ffd0add803cca10b4b57 Reviewed-on: https://code.wireshark.org/review/14345 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: Michael Mann <mmann78@netscape.net>
2016-03-04That patch is gone (we changed the menu category ourselves).Guy Harris1-1/+0
Change-Id: I4a7de0e95347aa7c1085bd4c026aaef02755a98c Reviewed-on: https://code.wireshark.org/review/14350 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-04Change "System" category to "Network" in desktop filesPino Toscano4-25/+2
Change-Id: I39346deaa9265f9684804688c36ab42ab4eee621 Reviewed-on: https://code.wireshark.org/review/14241 Petri-Dish: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-03-04Clean up modelines and indentation.Jeff Morriss5-206/+206
To quote Icf0831717de10fc615971fa1cf75af2f1ea2d03d: HT tab stops are set every 8 spaces on UN*X; UN*X tools that treat an HT character as tabbing to 4-space tab stops, or that even are configurable but *default* to 4-space tab stops (I'm looking at *you*, Xcode!) are broken. tab-width: 4, tabstop=4, and tabSize=4 are errors if you ever expect anybody to look at your file with a UN*X tool, and every text file will probably be looked at by a UN*X tool at some point, so Don't Do That. Adjust indentation to reflect the mode lines. Change-Id: Ic829541c696e0ddbc45cc109009319859c799066 Reviewed-on: https://code.wireshark.org/review/14340 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-03-04cmake: fix gen-authors target.Dario Lombardo2-1/+2
Also add AUTHORS.git to .gitignore. Change-Id: I63365816fc32b33d064ebbcae0ddb607c2b37f38 Reviewed-on: https://code.wireshark.org/review/14339 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-03-04androiddump: change first error message into verbose_print()Dario Lombardo1-1/+1
This error occurs every run of wireshark if adb is not running. This is a bit noisy, so androiddump is made less verbose. Bug: 12185 Change-Id: Ia7d0b0aba95e90a7f602c2e340f6344d09205b32 Reviewed-on: https://code.wireshark.org/review/14288 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-03-04dmp: Show correct uncompressed user data lengthStig Bjørlykke1-1/+1
Change-Id: Iac9c6434da5bdd29768fbacd2bdc9cbe2713c17b Reviewed-on: https://code.wireshark.org/review/14336 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-03-04extcap: move ssh common functions to ssh-base.Dario Lombardo6-129/+227
Change-Id: Ic06882a4f914b4f89d936d5d942b50552ae4abb3 Reviewed-on: https://code.wireshark.org/review/14264 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-03-04extcap: add local_interfaces_to_list() to wsutil.Dario Lombardo10-74/+198
This new function abstracts the creation of a list of the local interfaces that will be used by future extcaps to generate specific filters. Sshdump now uses it to create a pcap filter. Change-Id: I5b75a266f81104b3c9bcb3e51de246b7cc8785ce Reviewed-on: https://code.wireshark.org/review/14092 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-03-03We need to include <wsutil/privileges.h> for those functions.Guy Harris1-0/+1
Change-Id: I2c51ae467e1fcfb325bfac5d6fe52ef08b4429a6 Reviewed-on: https://code.wireshark.org/review/14335 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-03Add missing initialization calls.Guy Harris1-1/+8
Do the same thing editcap does; we need to know, for example, whether we were invoked with elevated privileges, so we know whether to pay attention to environment variables when loading plugins. Fix program name, and add a comment from editcap, while we're at it. Change-Id: Ia092331de129d86783a2600be21cff746d4ed5e3 Reviewed-on: https://code.wireshark.org/review/14334 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-03QT: TCP Stream Graph: Fix index numberUli Heilmeier1-1/+1
setMaximum() for stream index before calling setValue() Bug: 12163 Change-Id: Ic1678bc5282a7a01b96a39a44790949b743acf7f Reviewed-on: https://code.wireshark.org/review/14332 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-03Make sure our shell, Perl, & Python tools are executable.Gerald Combs5-0/+0
Change-Id: Ie58978473c4af7a0eaccf3e664c2f44bed2ef202 Reviewed-on: https://code.wireshark.org/review/14331 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-03Git: Ignore vgcore files.Gerald Combs1-0/+1
Change-Id: Iceb0d2778442d776320d6654cba25f7a43f63689 Reviewed-on: https://code.wireshark.org/review/14330 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-03-03Qt: Allow regex searching in the advanced prefs.Gerald Combs2-6/+7
Use a QRegex for Preferences → Advanced → Search. Change-Id: Iebf1cba9c17ff774ce50ef909b6d181751b272aa Reviewed-on: https://code.wireshark.org/review/13924 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-03Create perl script to append existing AUTHORS file with information from git ↵Michael Mann5-16/+4502
log. new AUTHORS file can be created with "gen-authors" build parameter The "original" AUTHORS file has been fixed up to be kind to parsers (so no one gets excluded) and renamed to AUTHORS.src. This preserves the features authors worked on. For authors that didn't list features, they may be converted to just getting information from git. Change-Id: I9a4c4091e229f7f5e1c46d864527a98c1278e451 Reviewed-on: https://code.wireshark.org/review/14231 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-03GTPv2 bearer resource command message conversation fixglores1-0/+3
Change-Id: Ida7d5aa9a5dd4c7fdc66806730762c70d3d951bb Reviewed-on: https://code.wireshark.org/review/14327 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-03-03Refactor wiretap option block types into a registration system.Michael Mann3-190/+304
Also required mergecap to look for plugins to initialize wiretap option blocks. Change-Id: I4208d1028dd0f94f185393801d72025329266cb7 Reviewed-on: https://code.wireshark.org/review/14300 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-03Allocate GArray when copying stat blocks within IDB block.Michael Mann1-1/+1
Don't treat it like a GList Bug: 12220 Change-Id: I057649a26d135516c6e8d4fb028c6cb9dcda2e7c Reviewed-on: https://code.wireshark.org/review/14326 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-03[PPCAP] SCTP association ID IE is alwas 16 octets long including padding.AndersBroman1-4/+2
Change-Id: I1d381cb7f60f0ec57494becddc529cafb5d23052 Reviewed-on: https://code.wireshark.org/review/14323 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>
2016-03-03Revert "autotools: Use -Werror with clean plugin code"João Valverde2-38/+24
This reverts commit 31654e5e5c0c44609584140a10eb7d9aa1572673. Change-Id: I27f3465c680daa599b96a7259ca93f96f2a622a5 Reviewed-on: https://code.wireshark.org/review/14324 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-03[IPv4] In case of a bougus IPv4 version continnue dissection as IPv6 ifAndersBroman1-0/+5
the version indicates IPv6. This handles a case of Linux cooked capture with ethertype set as IPv4 for IPv6 packets. Change-Id: Ie79f1a631980a224a7b51963f9174e75ffb69a47 Reviewed-on: https://code.wireshark.org/review/14321 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>
2016-03-03autotools: Use -Werror with clean plugin codeJoão Valverde2-24/+38
Change-Id: I0bc94702eaf87924467e6129ac22f4755308f8d3 Reviewed-on: https://code.wireshark.org/review/14319 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-03Qt/Bluetooth: HCI Summary: Miscellaneous fixesMichal Labedzki2-1/+37
1. Count vendor commands once 2. Fill Event column in case of Command Status/Command Complete types while displaying command 3. Add missing Status from Connect Complete event 4. Add missing Command Complete events opcodes Change-Id: Ie5a0e373f92f62fcb890cef7ab54762df3bb8a35 Reviewed-on: https://code.wireshark.org/review/14315 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2016-03-03Packetbb: Fix Msg sizeUli Heilmeier1-1/+1
Due to RFC5444 <msg-size> is a 16-bit unsigned integer field. Bug was reported by Matthias Tafelmeier Bug: 12227 Change-Id: I6d041015b386be7a8e02a87d0fe29e2670b1ab6e Reviewed-on: https://code.wireshark.org/review/14320 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-03-03Revert "autotools: Use explicit zlib dependency build flags"João Valverde7-78/+93
This reverts commit 2bded0b66137a2f1c8b69911d91903a24f8a2624. Change-Id: Ic898c65df4daaa395eb010e0286d97509346d43a Reviewed-on: https://code.wireshark.org/review/14318 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-03Add CMakeListsCustom.txt.example to distributionJoão Valverde3-4/+5
Change-Id: I81cebd467692d4193772ca0814fb82c06658006e Reviewed-on: https://code.wireshark.org/review/14312 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-03Accept any users choice on file close CID-703318Jaap Keuter1-1/+1
Whatever do_file_close returns is oke, so explicitly ignore it. Change-Id: Ie241cd204361e10e91bda747530d399ad8587be1 Reviewed-on: https://code.wireshark.org/review/14294 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-03RTPS: Updated code path to handle multiple vendorsJuanjo Martin1-37/+91
Before, the parameter ids were handled incorrectly. A vendor specific parameter definition was used for all the vendors. This is wrong for ids starting at 0x8000. This commits aims to fix that problem and make easier the addition of new parameters or vendors. Change-Id: I0d40aa8cbfa44d5bb2928075001fe39e6f14abc2 Reviewed-on: https://code.wireshark.org/review/14007 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 23:29:15 +0000