summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-02-06rawshark: fix err code.Dario Lombardo1-0/+2
Change-Id: I5aec3ad14eb0f0d591691f2aa7eb8ce09341e020 Reviewed-on: https://code.wireshark.org/review/19963 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-06Bluetooth: ATT: Implement "Resolvable Private Address"Michal Labedzki1-20/+32
"Resolvable Private Address" comes in Core 5. Also fix expert infos (usage) for all GAP characteristics are described in Core 5. Change-Id: I8386f5908b64cb758e2a973fb6f92fabcb30885a Reviewed-on: https://code.wireshark.org/review/19974 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-06Bluetooth: SDP: Add HDP MDEP Data Type values for ISO/IEEE 11073-20601Michal Labedzki1-42/+61
Values found at Bluetooth SIG: Assign Number: https://www.bluetooth.com/specifications/assigned-numbers/health-device-profile Change-Id: Ic99129e717f1de22162f5e398fa5b81ff3dcdc5a Reviewed-on: https://code.wireshark.org/review/19975 Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-06llc: replace GHashTable and glib allocator with wmem.Dario Lombardo1-6/+6
Change-Id: Ia7736e0faff16dd73d56a91b5a96cc715e3ce75d Reviewed-on: https://code.wireshark.org/review/19953 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-06geoip_db: remove leak.Dario Lombardo1-0/+2
Change-Id: I40911820fa09111c167a5c526027f10381038dbb Reviewed-on: https://code.wireshark.org/review/19952 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-06checkfiltername: Add llc.bluetooth_pid to the whitelistMichal Labedzki1-1/+1
"llc.bluetooth_pid" is now placed in bluetooth-file, it seems to be fine, but there is a need to avoid terrible/horrible scream from this script. Change-Id: I0bf3f5b5f6459ab1f13a8c2c6ad12859af608e85 Reviewed-on: https://code.wireshark.org/review/19969 Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-02-06Couchbase: Add decoding for create_bucket configOliver Downard1-2/+71
Change-Id: I7d84e67723196d9b39f6007950ec8fb95fe9a50e Reviewed-on: https://code.wireshark.org/review/19934 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>
2017-02-05RSVD dissector: minor fixesVolodymyr Khomenko2-3/+11
DataIn field should be three-state enum (not boolean) See https://msdn.microsoft.com/en-us/library/dn393496.aspx Fixed HandleStateShared value of QUERY_SHARED_VIRTUAL_DISK_SUPPORT reply See https://msdn.microsoft.com/en-us/library/dn409282.aspx Added VHDSET disk format (used by RSVD v2). Change-Id: I7a9528e680dd4fede7e982d98316af5ef40cff3b Reviewed-on: https://code.wireshark.org/review/19964 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>
2017-02-05GTK: Add 'in' operator in display filter expression dialogJaap Keuter1-94/+162
Add the 'in' operator to the list of available operators, where 'eq' operator would be present also. Setup the curly bracket expression in the filter and allow for multiple enums to be selected. Bug: 12808 Change-Id: I42b328bcb3328521d193d9cdae56577eb66f8e15 Reviewed-on: https://code.wireshark.org/review/19913 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-02-05[Automatic update for 2017-02-05]Gerald Combs12-169/+390
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ic3553d0e987fc7c0eafbe42a517f46212d137edc Reviewed-on: https://code.wireshark.org/review/19959 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-02-05ieee802.11: fix indentAlexis La Goutte1-1/+1
Change-Id: I8d521200b645b7a7b73c1da1d466bfd992c70c17 Reviewed-on: https://code.wireshark.org/review/19957 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-02-05iee80211: fix typo on some tag defineAlexis La Goutte1-6/+6
Change-Id: Ib3c35d332ef4c4b1b6d66d5fb9de7f87bcf15461 Reviewed-on: https://code.wireshark.org/review/19956 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-02-05PDML: protocol filter incorrectly filters desired subfieldsMartin Kacer5-15/+69
Bug: 12847 Change-Id: I8a560dc44dceb06123d8bcecd512d132ee4ebb0d Reviewed-on: https://code.wireshark.org/review/19671 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-02-05DNP3: Fix reassembly of out of order fragmentsGraham Bloice1-130/+45
Rework Application Layer fragment reassembly to handle out of order fragments (seen over UDP). Change-Id: Ifd2bffba30f0a419a5f82ea6b9d2d221f7d6d276 Reviewed-on: https://code.wireshark.org/review/19947 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-02-05[GSA RR] Dissect System Information Type 21AndersBroman2-6/+124
Change-Id: I85535dfdb7b064ba81f44ed08c3b1e84e7204e9e Reviewed-on: https://code.wireshark.org/review/19954 Reviewed-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: Michael Mann <mmann78@netscape.net>
2017-02-05pint(.h): Add Modelines and fix indent (use spaces)Michael Mann1-10/+23
Change-Id: Icadbf65ad186c775b2a0ca8596d5bf4ba66e4c68 Reviewed-on: https://code.wireshark.org/review/19873 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-04There's an RFC for that.Guy Harris1-3/+1
Change-Id: If9a3ba7fbd93374b4c63be7ce37510be5c2848f0 Reviewed-on: https://code.wireshark.org/review/19948 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-04IPv6: Update SRH dissection to draft-*-05João Valverde1-20/+20
Change-Id: Ia61e8ffb4499e2ea25e66e9e05a6d2881f15d6ae Reviewed-on: https://code.wireshark.org/review/19914 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>
2017-02-04tap: add cleanup routine.Dario Lombardo3-0/+26
Change-Id: I460b053880ed43a7377b7696531bbaeb0fd0d68b Reviewed-on: https://code.wireshark.org/review/19764 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-04tap-stats_tree: use wmem allocator.Dario Lombardo1-2/+2
Change-Id: I17e652bf9c6e8a17c57afa0bc7bb909636152d15 Reviewed-on: https://code.wireshark.org/review/19945 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-04conversation_table: replace g_string with wmem allocated string.Dario Lombardo1-3/+2
Change-Id: I54402822ee24214d13e052c0379514a39de16980 Reviewed-on: https://code.wireshark.org/review/19944 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-04srt_table: add cleanup function.Dario Lombardo3-0/+11
Change-Id: I8d1e9d587f7d47a9064d7b2e0c89f31dc41854ea Reviewed-on: https://code.wireshark.org/review/19946 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-03.mailmap: Update (of december)Alexis La Goutte2-3/+5
Change-Id: Id96ce391b9957ac37705c503bea35395ee3d358d Reviewed-on: https://code.wireshark.org/review/19207 Reviewed-by: Paul Williamson <paul@mustbeart.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-03Add support for Couchbase LWW *_with_meta commandsolivermd1-0/+87
Decodes the options and meta length fields added with LWW for {set,del}_with_meta request commands. Decodes get_meta responses extra field. Please see https://issues.couchbase.com/browse/MB-22003 Change-Id: Ie5205e8188a32d59145c4f9c499b16c7a7997274 Reviewed-on: https://code.wireshark.org/review/19928 Reviewed-by: Dave Rigby <daver@couchbase.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-02-03MKA: Padding support for basic-param-set dissection addedsamsaha1-0/+4
* It must be multiple of 4 Octets otherwise NULL padding should be there Change-Id: I7563b0407bd70d1f0b7aac8597ce3a757a08925e Reviewed-on: https://code.wireshark.org/review/19893 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-03BTLE: check connection_info presence before trying to perform reassemblyPascal Quantin1-48/+52
Bug: 13379 Change-Id: Idafa780f24bf9f181c0913cbe16a0cfa9bce382e Reviewed-on: https://code.wireshark.org/review/19927 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-03extcap: destroy hash tables on exit.Dario Lombardo1-0/+10
Change-Id: Ia6a1d8a45c36aff7f2bea8bde2ed5f308bddd2e1 Reviewed-on: https://code.wireshark.org/review/19919 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-02-03sharkd: fix warning C4090: 'function' : different 'const' qualifiersPascal Quantin2-2/+15
According to https://msdn.microsoft.com/en-us/library/windows/desktop/ms682425(v=vs.85).aspx the lpCommandLine argument must not be const as is may cause an access violation. Change-Id: Iedd77663cd21ca8df542595890fbc7023f2c9c2b Reviewed-on: https://code.wireshark.org/review/19922 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-03dfilter-macro: add cleanup routine.Dario Lombardo3-0/+9
Change-Id: I3de59c0366e9bec058de144eb136abaca24b5911 Reviewed-on: https://code.wireshark.org/review/19918 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-03stream: clean up reassembly table.Dario Lombardo1-0/+1
Change-Id: I71bc19eed5de342cd794938e3eb21545249d4853 Reviewed-on: https://code.wireshark.org/review/19917 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-03Fix builds without libpcap.Guy Harris1-0/+2
capture_opts_cleanup() doesn't exist if we're building without libpcap, so don't call it if we're building without libpcap. Change-Id: I9ae33b0c13af2785b5adb380a5b03e89116f67df Reviewed-on: https://code.wireshark.org/review/19925 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-03Fix builds without libpcap.Guy Harris2-0/+4
capture_opts_cleanup() doesn't exist if we're building without libpcap, so don't call it if we're building without libpcap. Change-Id: I6c9defea15fac7df5533269c4945b965d9a67c25 Reviewed-on: https://code.wireshark.org/review/19924 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-02capture_opts: free memory on exit to avoid leak.Dario Lombardo7-102/+221
This required a restyle of the way the different apps exit. Change-Id: Iedf728488954cc415b620ff0284d2e60f38f87d2 Reviewed-on: https://code.wireshark.org/review/19780 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-02NFSv4.2 mode_umask supportAndreas Gruenbacher1-0/+19
Add support for the NFSV4.2 mode_umask attribute which will be initially supported by Linux v4.10. Change-Id: Id98e20cd0ed93bf7ad9b2246e9e05299f3d7a9fc Reviewed-on: https://code.wireshark.org/review/19921 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>
2017-02-02dtls: Support Decode As for selecting appdata dissectorPeter Wu1-1/+41
Being able to override (set) the application data dissector without hacks (RSA keys dialog) would be nice. Modelled after v2.3.0rc0-481-gafa2605e43 ("Support Decode As for {SSL,TLS}-over-TCP.") Change-Id: Ic4c5ca55e8f20ad599c41c1df58b24f3bced2281 Reviewed-on: https://code.wireshark.org/review/19869 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-02wsutil/sober128: remove unused macros and functionsPeter Wu2-429/+4
Removed unused macros/functions that are apparently imported from LibTomCrypt, only LOAD32L and STORE32L are needed. Remove code that tries to distinguish between little/big endian, since WORDS_BIGENDIAN was never defined, this would never have worked on big endian anyway. Remove the special ROR "optimization" for GCC on i386, modern compilers are able to optimize it to exactly the same thing. The generic LOAD32L/STORE32L macros are less optimized (as can be seen in the generated code), but this was not noticable in the mean running time. Tested with the packet capture from bug 3232, the result is the same: tshark -ocorosync_totemnet.private_keys:example.com -r corosync-totemsrp--key:example.com--2nodes.pcap -Vx Bug: 13368 Change-Id: I59bf27d7dd990bbcd5ad34a1797f4a6c8a04512d Reviewed-on: https://code.wireshark.org/review/19894 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-02xml: use wmem allocators and replace GHashTable with wmem_map_t.Dario Lombardo2-109/+87
Change-Id: I9dbddc6fd4a5eaa458843343b3e9b8e1832bde8f Reviewed-on: https://code.wireshark.org/review/19630 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-02sharkd: make it compile without libGeoIP.Dario Lombardo1-2/+1
Change-Id: Ief867ce8552136298bd6bd6879ec482cc5b38b6f Reviewed-on: https://code.wireshark.org/review/19887 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-02-02imf: convert GHashTable to wmem_mapDario Lombardo1-4/+4
Change-Id: Ia5bd6af88db76bbe4e0a267c30b6f7749b23e299 Reviewed-on: https://code.wireshark.org/review/19903 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-02Rawshark: Add a memory limit (-m) option.Gianluca Borello2-1/+29
Add an option to rawshark that lets the user set a maximum memory limit. Change-Id: Ie102ee5f6ba5aec90a35bd63297184c7dc37662c Reviewed-on: https://code.wireshark.org/review/19911 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-02-02ncp: convert GHashTable to wmem_map_t.Dario Lombardo2-39/+11
Change-Id: I0de1c332a6052c20f6afbe1e51dfb14e18485891 Reviewed-on: https://code.wireshark.org/review/19899 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: Dario Lombardo <lomato@gmail.com>
2017-02-02GHashtable -> wmem_map conversionsMichael Mann30-721/+289
Many of the register_init_routine/register_cleanup_routine functions are for initializing and cleaning up a GHashtable. wmem_map_new_autoreset can do that automatically, so convert many of the simple cases. Change-Id: I93e1f435845fd5a5e5286487e9f0092fae052f3e Reviewed-on: https://code.wireshark.org/review/19912 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-02iso15765: convert GHashTable to wmem_map.Dario Lombardo1-18/+5
Change-Id: I25fd598f3c2bd75548213140e93198b611f30d4b Reviewed-on: https://code.wireshark.org/review/19900 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-02tools: add a Gtk/GNOME suppression file.Dario Lombardo2-0/+295
As described here https://wiki.gnome.org/Valgrind valgrind can be tuned for Gtk/GNOME (glib) software by this official (or so) suppression file. Add it to the standard valgrind script to reduce the output for those functions out of Wireshark scope. Change-Id: I5dbc91ce82a890c9c02b624289ced96909be5f84 Reviewed-on: https://code.wireshark.org/review/19910 Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-02Qt: Add extcap placeholder parameterStig Bjørlykke5-4/+17
Added a parameter to set placeholder text in textBox. Change-Id: Iccf92fe60abc78be8f0fa112c0c9eb78890674b5 Reviewed-on: https://code.wireshark.org/review/12463 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-02-02Make some more protocols into pinos.Michael Mann7-29/+24
Change-Id: I87d842e3efe9f82eaaab81347dfb79d6c0932792 Reviewed-on: https://code.wireshark.org/review/19491 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-01Use INVALID_SOCKET for an invalid socket handle.Guy Harris1-14/+14
-1 is fine on UN*X, but, on Windows, it's INVALID_SOCKET. We define INVALID_SOCKET as (-1) on UN*X, so it can be used on both platforms. Change-Id: Ib2269ddf98c352a1d3c85e44006cc49d80750a78 Reviewed-on: https://code.wireshark.org/review/19909 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-01Fix some more UN*X-vs-Windows issues.Guy Harris1-3/+3
Change-Id: Ie9ad31289f0572a7e7249fcb3305849673536f05 Reviewed-on: https://code.wireshark.org/review/19908 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-01frame: use wmem instead of glib allocator.Dario Lombardo1-1/+2
Change-Id: Ibed5c2418d1dd400fe586d40681fb5ba90efbd9f Reviewed-on: https://code.wireshark.org/review/19906 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-01h460: use wmem for strdup.Dario Lombardo2-8/+8
Change-Id: Iac6027e4b1449a77bc6b0a3d089634a296b8e802 Reviewed-on: https://code.wireshark.org/review/19904 Reviewed-by: Michael Mann <mmann78@netscape.net>