aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-01-10CMake: Fix docbook dependenciesGraham Bloice2-0/+10
unset accumulator variables after use so that successive uses are not carried forward. add MAIN_DEPENDENCY for chm generation so that it is correctly rebuilt when the sources change. Change-Id: I3b0c47a775f398346cc3a3bbd39d4fab2b0ec000 Reviewed-on: https://code.wireshark.org/review/13160 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> 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>
2016-01-10GTK: plugin_if_goto_frame can cause an Access ViolationPaul Offord1-2/+2
This is a fix for bug 11989. This patch fixes the problem for the GTK variant of Wireshark and matches the Qt bug reported by bug 11810 and fixed by change 12306. Bug: 11989 Change-Id: Ib9af8ba745394ebd31825003361ec637c45d75d6 Reviewed-on: https://code.wireshark.org/review/13152 Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2016-01-09docs: Updates to Developers GuideGraham Bloice2-7/+12
Update link to Gerrit. Update Windows Git section with info on install options and updated links. Fix CMake section header level. Change-Id: I24769534e07e79a0608201e103cb8f1b8625cf86 Reviewed-on: https://code.wireshark.org/review/13158 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-01-09checkAPIs: remove false positive in shadow checkPeter Wu1-1/+1
" strlen (" would match the shadow regex due to backtracking. Disable backtracking with the "possessive quantifier". Change-Id: If5d307fd61f252c41ad6d9b6104d2add1dfa63ae Reviewed-on: https://code.wireshark.org/review/13157 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-09[dcm] set a reasonable return value if we need more dataMartin Kaiser1-6/+2
in other similar cases, we return tvb_captured_length(tvb) do this here as well instead of returning TRUE where we should return a number Change-Id: Ifafdb7011256100d127033c0a43d100525f6a42b Reviewed-on: https://code.wireshark.org/review/13084 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-01-09[quake] remove a bunch of unnecessary if (tree) checksMartin Kaiser1-107/+76
Change-Id: Id2f2597893daf527766ed9ae4560e4ef970ff426 Reviewed-on: https://code.wireshark.org/review/13151 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-01-09[aeron] simplify aeron_frame_info_setup()Martin Kaiser1-43/+37
exit straight away if the packet was already processed or if we're missing some data avoid nested if clauses that make the code hard to read Change-Id: Ied6d575f9498ab98623cd862a9d4b9dd8ad7e0b4 Reviewed-on: https://code.wireshark.org/review/13146 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-01-09Adding following dissectors for HVAC clusters for Zigbee Protocol:Aditya Jain5-3/+1089
1. Pump Configuration and Control 2. Fan Control 3. Dehumidification Control 4. Thermostat User Interface Configuration Change-Id: I854f992a0c6e8a5714f308e97f30e7bc26fb73fc Reviewed-on: https://code.wireshark.org/review/13102 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> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-09Add lempar to pre-commit ignore listAlexis La Goutte1-0/+1
Change-Id: I4ad9b1dadfdb51ad750cc61782eca69125989b55 Reviewed-on: https://code.wireshark.org/review/13144 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-01-09No need to include <sys/types.h>.Guy Harris1-59/+28
(If it turns out that there is a need, I'll fix the code to remove the need.) Use BASE_NONE for string fields, and reformat the hf[] array a bit. Change-Id: I62805e3054266589c3fa25a0047ea3e7114484d6 Reviewed-on: https://code.wireshark.org/review/13141 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-09Get rid of unused variable.Guy Harris1-2/+1
Change-Id: Ic9104ddba17797a3e541cebd4326035e874b27de Reviewed-on: https://code.wireshark.org/review/13143 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-09Get rid of unused variable.Guy Harris1-12/+7
Change-Id: I7b1f92ae5f8e2d6c2ded8aa4afce533e807e3c78 Reviewed-on: https://code.wireshark.org/review/13142 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-09Get rid of trailing white space.Guy Harris1-1/+1
Change-Id: Icc086c9dc1215115dd2a2ea4dbf7027237fe892e Reviewed-on: https://code.wireshark.org/review/13140 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-09Add routines to add an item and return the item's real length.Guy Harris7-59/+348
proto_item_get_len() is *not* guaranteed to return a correct value. Even if there's a non-null tree item, it might be pointing to a "faked" item; it really shouldn't be used. So add proto_tree_add_item_ret_length() and proto_tree_add_item_new_ret_length(), which calculate the real length themselves and return it through a pointer. Fix as many places as we straightforwardly can to use them rather than to use proto_item_get_len(). (There's a Lua API for proto_item_get_len(), so we keep it around, but we should add Lua APIs for the new routines, and deprecate the old API.) Fix ptvcursor_add() to do the same thing that proto_tree_add_item_ret_length() and proto_tree_add_item_new_ret_length() do. Split the TRY_TO_FAKE_THIS_ITEM macros into a macro to check for the tree being null and to try to fake the item. We don't always use the former macro, as we might need to do more than just return NULL if the incoming tree is null (for example, calculating the item's real length and using it...). new_field_info() never returns NULL; remove checks for it. The check for a null tree is done before the calls to new_field_info(). Change-Id: I002a218d1f810c73e0de837e0ac6ebcde21bacec Reviewed-on: https://code.wireshark.org/review/13139 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-09Qt: Save the default capture device name.Gerald Combs1-1/+10
Make sure we save the device name in capture.device. This should fix the default device selection in the welcome screen on Windows. Change-Id: I19337cf2813f3b5aba75228e855dad0a0f5e0f78 Reviewed-on: https://code.wireshark.org/review/13138 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-08Revert "Qt: Try to fix Main Welcome Interfaces List Scrollbar"Gerald Combs4-14/+11
Instead of calling InterfaceTree::reset (which clears our selection) when we resize, just pass our resize event to QTreeWidget. Additionally, select our default interface using setCurrentItem. This fixes behavior broken in gb152ca3. This reverts commit 7baac67149a68b66087c5d688dbeda2869485765. Bug: 11733 Change-Id: I58855de38561fcb6984273ae3910c0dfcda04e69 Reviewed-on: https://code.wireshark.org/review/13135 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-08Qt: Queue up redissection.Gerald Combs1-1/+1
Make the WiresharkApplication::packetDissectionChanged → MainWindow::redissectPackets connection queued rather than direct. redissectPackets eventually calls update_progress_dlg, which processes UI events. This should keep the profile dialog from destroying itself prematurely in a nested event loop when the user hits "OK". Bug: 11979 Change-Id: I7276e08c1911708c3aca5ff05ab6a40bfc336add Reviewed-on: https://code.wireshark.org/review/13134 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-08Fix a lot of typos and misspellingsmoshekaplan197-493/+493
Change-Id: I8512cfa1d424f82a873a0e0e1d22c7b075fdd7f3 Reviewed-on: https://code.wireshark.org/review/13069 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-01-08LAT: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+1
Change-Id: Id8acd15334650ce07de9991fadf3a0c8c09cddcc Reviewed-on: https://code.wireshark.org/review/13126 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-08Add a Busy status to SyntaxLineEdit.Gerald Combs8-50/+89
For CaptureFilterEdit it's possible to have an indeterminate state while we're waiting on name resolution. Add a Busy status to SyntaxLineEdit and set the text color to a mix of the normal foreground and background colors (gray on most platforms). Make the Busy state valid so that we don't have to wait on an annoyingly-long name resolution to start capturing. Update the global capture option filters using the main welcome capture filter when we start a capture instead of when we've finished checking the filter syntax. Connect the CaptureFilterEdit returnPressed signal no matter what so that we can start a capture by pressing return in the welcome screen CaptureFilterEdit. Add a fake resolution timeout to the CaptureFilterSyntaxWorker debug code to make testing the different states easier. Bug: 11950 Change-Id: I0cf01c0fbc0dd8065cdf5a91f1d6b224291b1ce6 Reviewed-on: https://code.wireshark.org/review/13110 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-08Fix warning for epan/tap.c [-Wpedantic]João Valverde1-0/+3
Disable ISO C compatibility warning when loading an external symbol. Change-Id: I85e0be1664a4f77983636a4bab559af2f79321aa Reviewed-on: https://code.wireshark.org/review/13132 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-01-08QT: add same warning as GTK when trying to save a decoded RTP stream that is ↵Pascal Quantin1-0/+10
not alaw/ulaw Change-Id: Ia11e58a20c879d1ca3ead8479f8082e204d92caf Reviewed-on: https://code.wireshark.org/review/13131 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-08Fix warnings for epan/prefs.c [-Wcast-qual]João Valverde3-112/+93
Change-Id: I86032d624ee37edc86a868eb2aaaffce81a8807b Reviewed-on: https://code.wireshark.org/review/12719 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-01-08Adding BINARY INPUT,BINARY OUTPUT,BINARY Value ClustersDarshan Nevgi2-0/+858
Change-Id: Ib16c83a300e285eac8e7f895ff4a062175af0f09 Reviewed-on: https://code.wireshark.org/review/12942 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>
2016-01-08NFS: fix crash when activating file_name_snooping optionPascal Quantin1-1/+1
gf5340b2 introduced a value destroy function. When transfering a given value from nfs_name_snoop_unmatched to nfs_name_snoop_matched hash map, do not free the value automatically Bug: 11972 Change-Id: I8c4e0db07084b041baf73ccf4d0788248574a9d8 Reviewed-on: https://code.wireshark.org/review/13115 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-01-08Again, command values are in decimal, not hex, in DEC's LAT spec.Guy Harris1-1/+1
Change-Id: I693eabbba3f9140bccb9a5e490633ba139f13193 Reviewed-on: https://code.wireshark.org/review/13129 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-08Remove commented-out table of Ethertypes.Guy Harris1-11/+0
They're just Ethertypes, so the Ethertype table in the Ethertype dissector should suffice. Change-Id: I5ee8ddf6b1a449495d827bdf4a3e39ebdd9030cb Reviewed-on: https://code.wireshark.org/review/13128 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-08LAT: Add LAT Protocol to release noteAlexis La Goutte1-0/+1
Change-Id: I1902685094e531ad876bccfa2af21bd546cba050 Reviewed-on: https://code.wireshark.org/review/13125 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-08The DEC spec gives command codes in decimal.Guy Harris1-1/+1
Change-Id: I938152dc6f3ee8b17e4c1463249d326efd29266f Reviewed-on: https://code.wireshark.org/review/13127 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-08LAT: fix indent and modelinesAlexis La Goutte1-3/+16
Change-Id: Ic6086d0dcbda425aee362d31b1b939d50ed85011 Reviewed-on: https://code.wireshark.org/review/13123 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-08Match DEC's spec.Guy Harris1-128/+179
More to dissect, if somebody has the time and energy. Change-Id: I27eca69f141ec391b48d03398f54a8c4b6ecf39f Reviewed-on: https://code.wireshark.org/review/13122 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-08Update the copyright.Guy Harris1-3/+3
As I said, 15 years. :-) Change-Id: Iaca3805547b0a822d160b87cb2b8ff453839db00 Reviewed-on: https://code.wireshark.org/review/13120 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-08Remove trailing whitespace.Guy Harris1-5/+5
Change-Id: Ic115862d4bf9f2847c768cd539d83883e32eeed2 Reviewed-on: https://code.wireshark.org/review/13119 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-08LAT dissector.Guy Harris3-0/+516
Only 15 years later: https://www.wireshark.org/lists/ethereal-dev/200010/msg00070.html as I clean up stuff I've had lying around for a while. LAT spec found at bitsavers.org; further work can use that. Change-Id: I486e4ab1ffb74d6e0b323202514cc352d63e9eef Reviewed-on: https://code.wireshark.org/review/13118 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-08Note that sometimes the packet time stamps are relative to the start time.Guy Harris1-2/+7
Change-Id: Ie248559cd924db611190a73e3f043e047421ab7f Reviewed-on: https://code.wireshark.org/review/13117 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-08Improve an error message.Guy Harris1-1/+1
Change-Id: I9c406bbd146ef525e5348f620c606d1296d3bd10 Reviewed-on: https://code.wireshark.org/review/13116 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-07Remove constness from bytestring_to_str() [-Wcast-qual]João Valverde5-16/+16
Change-Id: I7f942787dfdc4f76dd0ad5111d1eb528b20f0ba9 Reviewed-on: https://code.wireshark.org/review/13011 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> Reviewed-by: João Valverde <j@v6e.pt>
2016-01-07dBm signal strength is signed; report it as such in the RSSI column.Guy Harris1-1/+1
Change-Id: Ifc0516f0229a7bedd953e9a81beb300df1c4208c Reviewed-on: https://code.wireshark.org/review/13113 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-07extcap: Documentation for the new featuresRoland Knall2-9/+26
Add documentation for regular expression usage, required and fileextension arguments Change-Id: I9a27c4263a87774cb997a6f4e1f8783a69d818df Reviewed-on: https://code.wireshark.org/review/12949 Reviewed-by: Roland Knall <rknall@gmail.com>
2016-01-07lemon: Fix warnings [-Wpedantic]João Valverde1-26/+31
Change-Id: I7b350b2c4de5f86de24c8f2309016f3de7af8516 Reviewed-on: https://code.wireshark.org/review/12959 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> 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-01-07RTPS: Fixed DATA_BATCH dissection.Juanjo Martin1-5/+6
The DATA_BATCH dissection contained wrong proto_tree arguments in a few calls. Also, changed the size of a tree from -1 to the actual size. Change-Id: I5f34869a6d231a0bd74c815499b627fe329b6eb0 Reviewed-on: https://code.wireshark.org/review/13059 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-07Qt: Sort traffic table default protosStig Bjørlykke1-2/+2
When changing conversation types in Conversations and endpoint types in Endpoints the tabs will be arranged alphabetically, so ensure that the default protos also are alphabetically. Change-Id: Ib0e8ffb744f63867e93282b7a81b1c11b0ee3dc4 Reviewed-on: https://code.wireshark.org/review/13107 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-01-07[Diameter] Add Data from 3GPP TS 29.344 V13.0.0 (2015-12)AndersBroman2-11/+103
Update resultcodes from IANA. Change-Id: Ib71cc01a772d651d734039344c0feff394a61351 Reviewed-on: https://code.wireshark.org/review/13106 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-07[dcm] don't THROW() an exception from a dissectorMartin Kaiser1-1/+1
in this case, we can simply exit the loop if we see an invalid pdu length Change-Id: I818736f25d15d9054ea66b4670a5362b557b0e9f Reviewed-on: https://code.wireshark.org/review/13083 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-07mausb: Add dissection of ClearTransfers Req & RespSean O. Stalley1-13/+203
Add dissection for two new packets types added in the MA USB v1.0a Specification. Change-Id: Ie693f5d721a446454cc927451b69859e1992ddb3 Reviewed-on: https://code.wireshark.org/review/13081 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> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-07[dcom] don't THROW() an exception from a dissectorMartin Kaiser1-11/+14
try to clean up the use of signed vs unsigned data types in dissect_dcom_BSTR without affecting any other function: offsets are gint if we have to add a guint32 to an offset, do a range check before adding if we see an overflow, return the number of bytes consumed up to that point Change-Id: Ib06c19fee8e3477e07b190ca26743891a5b24c3d Reviewed-on: https://code.wireshark.org/review/13082 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-01-07Clean up indentation.Guy Harris1-1/+1
Change-Id: Ica6615ef80867e911a1244a8a54411519033b275 Reviewed-on: https://code.wireshark.org/review/13105 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-07Expand a comment.Guy Harris1-1/+6
Change-Id: Id928258326a1bd4512d88fe0f74b0a34262da56a Reviewed-on: https://code.wireshark.org/review/13104 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-07pcap_list_datalinks() failing is an error.Guy Harris1-10/+15
Return an error string if that happens. If it doesn't fail, it will return a value >= 1; it will never return 0, so don't check for that. Change-Id: I6d7ee2683c1ceae73e9d9d61c0a6e6d30b2c4400 Reviewed-on: https://code.wireshark.org/review/13100 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-07Clean up #ifdeffed code.Guy Harris1-40/+40
We only need is_linux_bonding_device() if we have pcap_create(). We need get_data_link_types() regardless of whether we have pcap_create() or not. Change-Id: I035f8ddcd57c0424662a2029f928bffa969a3f6c Reviewed-on: https://code.wireshark.org/review/13099 Reviewed-by: Guy Harris <guy@alum.mit.edu>