aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-02-04RADIUS: Sync with FreeRADIUS MasterAlexis La Goutte5-0/+604
commit 852f15c72d41c637865776d5b80097e8ffbbb444 Author: Alan T. DeKok <aland@freeradius.org> Date: Mon Jan 26 13:08:21 2015 -0500 As found on the net commit 53bf263d6ca9010acdc004bada894b1bfe0ed676 Author: Tobias Hachmer <tobias@hachmer.de> Date: Mon Jan 26 13:45:04 2015 +0100 add perle dictionary Change-Id: I15dd8705277f3a0cedd2ea12a7cac9974dadf3c0 Reviewed-on: https://code.wireshark.org/review/6835 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-04CAPWAP: Use proto_tree_add_bitmask(_with_flags)Alexis La Goutte1-88/+108
Change-Id: I39ff2e15b91981111f8de091e6e5dfb7586b4599 Reviewed-on: https://code.wireshark.org/review/6937 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-04emem is dead! Long live wmem!Michael Mann12-1053/+1
Change-Id: Iddd1200e62bf3200cb1a68408378dd9d47120b77 Reviewed-on: https://code.wireshark.org/review/6939 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-04Convert val_to_str -> val_to_str_wmem.Michael Mann27-162/+331
This is mostly for GUI usage, but a few dissectors needed some "non-packet scope" conversions. val_to_str officially now uses wmem_packet_scope() Change-Id: Ic9413eeb3406d7a7683222b86709f3675d628d81 Reviewed-on: https://code.wireshark.org/review/6933 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-04MySQL: Add Server ext caps and Auth Plugin Length to Server GreetingAlexis La Goutte1-3/+23
Ping-Bug: 10346 Change-Id: I1b2bd3e9b1dc01118c48c6e159c9a06d4daa061b Reviewed-on: https://code.wireshark.org/review/6936 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-04MySQL: Use proto_tree_add_bitmask(with_flags)Alexis La Goutte1-129/+92
Merge also mysql_dissect_caps_client and mysql_dissect_caps_server and rename mysql_dissect_extcaps_client to mysql_dissect_extacps (it will be reused soon) Ping-Bug: 10346 Change-Id: I6543363a337d7bbfddba6dd699697a257a2cbb49 Reviewed-on: https://code.wireshark.org/review/6935 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-04MySQL: Add support of AuthSwitchRequest/AuthSwitchResponseAlexis La Goutte1-3/+80
Bug: 10351 Ping-Bug: 10346 Change-Id: I730080a0aef293c3c8119f6c762ee246227bd07a Reviewed-on: https://code.wireshark.org/review/6915 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Daniël van Eeden <wireshark@myname.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-04SEL Protocol Maintenance (1/2)cbontje1-150/+155
- Clean up naming conventions & variables - 'SEL Protocol' is the entire protocol suite - 'Fast SER' is a function code of 'Fast Message' sub-type 'selfm' will remain the protocol name in Wireshark so no major architecture naming changes are anticipated Change-Id: Idc5117dcede0b61c61c0c64d5cd20199535ed471 Reviewed-on: https://code.wireshark.org/review/6919 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>
2015-02-04Only set HAVE_LUA if we, er, have Lua.Jeff Morriss1-0/+3
Change-Id: Idb6f1dfa06c2b4e5d9e1f77743f13b4e0a6d8afe Reviewed-on: https://code.wireshark.org/review/6942 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-02-04Qt: Add the Protocol Hierarchy statistics dialog.Gerald Combs19-32/+654
Change-Id: I6872e323daca4798c638d764873f54c4c0dc0006 Reviewed-on: https://code.wireshark.org/review/6934 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-04Minor WSDG updates.Gerald Combs1-19/+6
Change-Id: I847af9ef7f18b271a5a2dc8da6c5817735a8c856 Reviewed-on: https://code.wireshark.org/review/6941 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-04Simplify how we find Lua and expand the places we look.Jeff Morriss5-225/+108
First, it appears some packagers actually ship a pkg-config file for Lua. Try to use it. (Unfortunately the package name varies so we have to try several package names.) If that fails, try to find Lua directly, accounting for the various naming conventions we've seen. Bug: 10475 Bug: 10572 Change-Id: I82e789c466a488dc12431cdd90c49b4c1052414a Reviewed-on: https://code.wireshark.org/review/6756 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-02-04Decorate declarations with G_GNUC_PRINTF() as appropriate.Guy Harris1-2/+4
Decorate val_to_qstring() and val_ext_to_qstring() similarly to val_to_str_wmem(); this squelches some compiler warnings. Change-Id: I86e102e7c0a1a135be9492b7d605001c5d922031 Reviewed-on: https://code.wireshark.org/review/6940 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-04Don't build app_bundle by default.Gerald Combs1-1/+1
As it turns out, building the app bundle makes wireshark-gtk unusable. Change-Id: Ic3608f0a485c3ec4ea21fbc2e7194553eda8c806 Reviewed-on: https://code.wireshark.org/review/6938 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-03Dumpcap: avoid collecting stats on nf* interfaces.Dario Lombardo1-0/+12
On Linux nf* interfaces don't collect stats properly and don't allows multiple connections. Change-Id: I69d8f343017d77bda313de7d2c501fab542f2e9b Bug: 10886 Reviewed-on: https://code.wireshark.org/review/6796 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-03Updates in it translation.Dario Lombardo2-675/+934
This fixes also the "duplicate messages" error. Change-Id: Iec93d82d4776c4f9805c5bfa2b2453c22b0e24e8 Reviewed-on: https://code.wireshark.org/review/6929 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-03xtp: Don't call col_...() under 'if (tree)'Bill Meier1-1/+1
Change-Id: Ie80476e919b5ba0a2e5f036c654a5379b91ddd32 Reviewed-on: https://code.wireshark.org/review/6931 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-02-03BT ATT: Fix what appears to be a value string mismatch.Gerald Combs1-1/+1
Change-Id: I440ed41c659bed9dcee43d8388ad780015971611 Reviewed-on: https://code.wireshark.org/review/6930 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-03Convert val_to_str_ext -> val_to_str_ext_wmem for calls that don't have ↵Michael Mann15-63/+128
valid packet scope (GUI). val_to_str_ext now officially uses wmem_packet_scope(). Removed const from val_to_str[_ext]_wmem return value since it's not really constant. Created utility functions in qt_ui_utils.h to help with the new memory management for its GUI. Change-Id: Idf2ce4a4ce78d628b2269ad23a3a48fbfc9c077c Reviewed-on: https://code.wireshark.org/review/6926 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-03Bluetooth/USB HID: Move boot form of reports from bthid to usbhidMichal Labedzki3-696/+768
Then call it as new dissectors from bthid and btatt. In future they will be used in usbhid, because they are part of HID. Change-Id: I9cb545f3079c27945b17bf8791ba4e3736c29e7c Reviewed-on: https://code.wireshark.org/review/6912 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>
2015-02-03Initialize the entire UUID.Guy Harris1-2/+1
Squelches a compiler warning. Change-Id: I050710dd296f7fe7d315f881b0edf43699d2fa91 Reviewed-on: https://code.wireshark.org/review/6928 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-03Bluetooth: ATT: Dissect almost all attributesMichal Labedzki3-111/+3609
Change-Id: Ia388c07150d9664327daf2d1990b4465b5f4ae28 Reviewed-on: https://code.wireshark.org/review/6910 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>
2015-02-03Bluetooth: ATT: Dissect Read Multiple ResponseMichal Labedzki1-37/+66
Change-Id: Ifcbde05389901bd66355e42540f3850bfd55def5 Reviewed-on: https://code.wireshark.org/review/6909 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-03Bluetooth: ATT: Decode some HOGP attributesMichal Labedzki4-34/+262
Change-Id: I169f767b699a2f95e5a1553f1380f0b88cd7c67d Reviewed-on: https://code.wireshark.org/review/6908 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-03Bluetooth: ATT: Dissection stage 3: Assign UUID to HandleMichal Labedzki1-33/+156
Add possibility to dissect attributes by UUID assigned to handle. Change-Id: I0e510bf902492f87e0eaee339d82609c37e12741 Reviewed-on: https://code.wireshark.org/review/6905 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-03Bluetooth: ATT: Dissect GATT levelMichal Labedzki5-123/+597
ATT dissector is now able to decode GATT level fields. This is results of added request-response tracking/share information. Change-Id: I41ac622a38916a7a20f625fa30ac72d7812446c6 Reviewed-on: https://code.wireshark.org/review/6904 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-03Fix nameless application in NokiaSolutionsAndNetworks.xml (fromJeff Morriss4-5/+10
I4cd9bd7f7219e4d9ff1bb8a71fab32439a8a9a35). (The nameless application was causing known applications to be reported as unknown.) Add code to the Diameter dissector to report such problems at startup (similar code exists for other entities). Tweak the parser debug slightly. Change-Id: I6b28cda8660e6eb96648c7b3697d7fd85151ac96 Reviewed-on: https://code.wireshark.org/review/6927 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-03Qt: Fix IO Graph capture file closing.Gerald Combs2-5/+8
Make sure our IOGraphs remove their respective tap listeners before the capture file closes, otherwise the graph data ends up getting cleared via reset_tap_listeners. Bug: 10871 Change-Id: I0ef2af2dc84be1921a930df8bb68f63626aa874a Reviewed-on: https://code.wireshark.org/review/6925 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-03ISIS: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+1
Change-Id: I58debb32cc7a4aa476961eda342f1cd90884c800 Reviewed-on: https://code.wireshark.org/review/6921 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-03AMQP: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-18/+0
Change-Id: Ie55dd06b6c4d6f77012e8e13079279ded2997907 Reviewed-on: https://code.wireshark.org/review/6920 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-03HTTP2: Fix offset for heuristicAlexis La Goutte1-1/+2
With >= draft-14, length is encoded in 3 octets (2 octets before) Bug: 10908 Change-Id: I061570186206548fafcc39a8df0ba6bafe8576a0 Reviewed-on: https://code.wireshark.org/review/6883 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-02WSUG: Chocolatey updates.Gerald Combs4-51/+121
Move PowerShell and Chocolatey to the top of the quick setup since most of the instructions now have a "Chocolatey" example. Use "choco install" instead of "cinst" to match the pages at chocolatey.org/packages. Show how to install Cygwin and Python using Chocolatey. MAC = Media Access Control (among other things). Mac = Macintosh. Change-Id: Ic6aabacdd3a86b4e8ca556cc6f3daa62c3e5986b Reviewed-on: https://code.wireshark.org/review/6924 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-02AMQP: fix declaration of 'index' shadows a global declarationAlexis La Goutte1-4/+4
St*** Mac OS X buildbot... Part 2 (Oups...) Change-Id: I082d73d4581365d7152aca764e4dfe599ce12c64 Reviewed-on: https://code.wireshark.org/review/6923 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-02AMQP: fix declaration of 'index' shadows a global declarationAlexis La Goutte1-1/+1
St*** Mac OS X buildbot... Change-Id: I5efff34ce818f52fb6414191c58b5cabb388ba26 Reviewed-on: https://code.wireshark.org/review/6922 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-02AMQP 0-9-1: Fix dissection of field types.Petr Gotthard1-210/+295
This patch resolves review comments I received from the AMQP 0-9-1 community. Some field types were not implemented, other field types (introduced by my earlier patch) were incorrectly parsed. https://groups.google.com/forum/#!topic/rabbitmq-users/PR7P1bgonwo I had to split the dissect_amqp_0_9_field_table() function into two parts and put the field value dissectors in a separate function: dissect_amqp_0_9_field_value(). Change-Id: I9aa7d73e426a790830ad260ca6892a7650791e6c Reviewed-on: https://code.wireshark.org/review/6882 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>
2015-02-02LTE RRC: only display band mapping for the initial supportedBandListEUTRA IEPascal Quantin3-32/+62
Handling bands > 64 would require to store the mapping in file scope and current code is broken for the Carrier Aggregation band combination list Change-Id: I9f10022a50520ca9bc16a33f2c16361729f1b01b Reviewed-on: https://code.wireshark.org/review/6917 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-02Minor doc changes for Windows buildGraham Bloice1-18/+4
Further removal of older style build environment. Change-Id: I499ba50f55620ad627de3dc4316051985d00a7f5 Reviewed-on: https://code.wireshark.org/review/6918 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-02-02Create wmem versions of val_to_str and val_to_str_extMichael Mann3-1/+42
These will be used to replace cases where packet-scope isn't valid for val_to_str/val_to_str_ext calls Change-Id: Ie8a4c423a8608548c837c1ae7edde52c4d728340 Reviewed-on: https://code.wireshark.org/review/6880 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-02Try to fix builbot OSX 10.5 buildbot false-positiveMichal Labedzki1-1/+1
Change-Id: If62eba937326ac5119bde97d9a827e165825b377 Reviewed-on: https://code.wireshark.org/review/6914 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-02Fix some indent typo (after g2bf7878e)Alexis La Goutte2-10/+10
Change-Id: I44769f127f32ffd8a97b1579f371501f4aa9832a Reviewed-on: https://code.wireshark.org/review/6913 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-02Bluetooth: Simplify to "UnknownDirection" in Info column when direction is ↵Michal Labedzki26-51/+26
unknown Change-Id: Ibad679c0b6c95d65389ce087f65b8f31cf3acd68 Reviewed-on: https://code.wireshark.org/review/6903 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-02Bluetooth: Advertising Data: Fix Service Data entryMichal Labedzki1-3/+75
Service Data entry is defined as UUID (16, 32 or 128) and rest of payload is specific service data. Bug: 10859 Change-Id: Ibaee075a66a144dfc52ed70614677c73a88d6a2c Reviewed-on: https://code.wireshark.org/review/6902 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-02Bluetooth: btle_rf: Use proto_tree_add_bitmaskMichal Labedzki1-16/+19
Change-Id: I79143cb788a13bd67ce2bd515b2b90d427dbcfcb Reviewed-on: https://code.wireshark.org/review/6901 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-02Bluetooth: AVCTP: Improve IPID handlingMichal Labedzki1-7/+20
If profile is invalid (IPID=1) then add expert info. Change-Id: Id102e51eefe7e5e6314c3677468cb66573e5a893 Reviewed-on: https://code.wireshark.org/review/6900 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-02Bluetooth: HCI Vendor: Fix for "Enable WBS" commandMichal Labedzki1-3/+6
Codec value for mSBC is 0x02 (not 0x01), also "Codec" field does not appear when Codec state in Disable. Change-Id: I4f0b27d0dc8659fdc054eaf18b54a42aad60275b Reviewed-on: https://code.wireshark.org/review/6899 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-02Bluetooth: HCI: Improve detecting of undecoded and unknown commandsMichal Labedzki2-12/+43
Undecoded command - command does exist in specification, but not fully implemented in Wireshark yet Unknown command - command does not exist in specification or it is quite new and opcode number is not added yet Unexpected parameter - is now working correctly that means if there is known command but too many parameters so user should know about this issue Change-Id: If3ee24f617f7e6683049558f7a6d68e346e7c92f Reviewed-on: https://code.wireshark.org/review/6898 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-01CMake: Build a complete application bundle on OS X.Gerald Combs1-12/+18
Run osx-app.sh by default on OS X. Aside from giving us a fully portable application bundle after building this should let us clear our library path at startup should the need arise. Change the name of the osx-app target to app_bundle. Search ../Frameworks before ../lib. Create PkgInfo at configure time instead of compile time. Build our program list as we go. Change-Id: If5511ee921108b1c079cef67026eac9e47211be1 Reviewed-on: https://code.wireshark.org/review/6896 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-01Fix a typo.Guy Harris1-1/+1
Change-Id: I2724340e41572fdaa56ebf75478297090563c522 Reviewed-on: https://code.wireshark.org/review/6895 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-01dlm3: col_...() shouldn't be called under 'if (tree)'Bill Meier1-1/+1
Change-Id: I577dbfacf13854c74a430d7abec20faca3f0985b Reviewed-on: https://code.wireshark.org/review/6891 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-02-01rip: Fix "Dissector Bug": register 5 missing hfi_... fieldsBill Meier1-0/+5
[ Bug Introduced in gf8e24c9 ] Change-Id: I99207334e33b30bf622bbed366c2222113108230 Reviewed-on: https://code.wireshark.org/review/6890 Reviewed-by: Bill Meier <wmeier@newsguy.com>