aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-06-14Clean up the ATM dissection a bit.Guy Harris2-139/+163
Have separate dissectors for ATM MPLS pseudo-wire traffic and regular traffic. That way, we can handle the regular traffic dissectors being handed private data, e.g. an ATM pseudo-header from libwiretap. Change-Id: I11e5abfdb1c3a5acc070ddaba8ef53813bc85e1a Reviewed-on: https://code.wireshark.org/review/8921 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-14ZVT: add the transaction struct as an argument to the payload functionsMartin Kaiser1-15/+16
Change-Id: Idec2ca4f2db7a10e96c7acb030e0619c4f607b73 Reviewed-on: https://code.wireshark.org/review/8920 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-14ZVT: check the minimum apdu lengthMartin Kaiser1-5/+25
Change-Id: Ie86519345556b4a674ff1c7b4527de7219b2a539 Reviewed-on: https://code.wireshark.org/review/8919 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-14Include QUrl.Gerald Combs1-0/+1
It's apparently required by Qt4. Change-Id: Ic5f32b9acd0a244477b7631bff39b3ed5ba86a39 Reviewed-on: https://code.wireshark.org/review/8918 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-14Qt: Enable Drag and Drop in the main window.Gerald Combs3-2/+30
Change-Id: I446163dd9e1a277118caab2f7296a3605cb23fd5 Reviewed-on: https://code.wireshark.org/review/8917 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-14[Automatic update for 2015-06-14]Gerald Combs18-449/+1219
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Id3ff0d609b0a34066c3d23053b8d8bbebfc43070 Reviewed-on: https://code.wireshark.org/review/8914 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-14ber: fix undefined shiftPeter Wu1-1/+1
Fixes this UBSan warning: epan/dissectors/packet-ber.c:1917:23: runtime error: left shift of 54645397829836991 by 8 places cannot be represented in type 'long int' Integers are two's complement, so really just cast it to unsigned to avoid undefined behavior and still set the upper bit. Change-Id: Ia5d080ae8b9dd39aef5e700daeede5c235b425ea Reviewed-on: https://code.wireshark.org/review/8908 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-06-13MPLS: always display payload when no 'Decode As' preference is setPascal Quantin2-9/+16
Based on the heuristic suggested by Jasper, check whether ethertype matches IPv4, ARP, RARP, VLAN or IPv6 and decode payload as Ethernet PW (CW heuristic) by default. Otherwise display payload as data by default. This can be overridden by the 'Decode As' configuration. Follow up of g7ca0472 Bug: 11271 Change-Id: Idb2ce1f8b967813a8f4a5e29e6005d5442729395 Reviewed-on: https://code.wireshark.org/review/8912 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> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-12Fix some CMake compiler tests for Win64Graham Bloice2-2/+2
Change-Id: I03244b48e6593d1fe5f4d139fa5d171debeb9fd7 Reviewed-on: https://code.wireshark.org/review/8909 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-06-12Cleanup and hardening for the Aeron dissector.David Ameiss1-53/+111
Change-Id: Iee544315401784b097ab05e6de5e5c950b622c80 Reviewed-on: https://code.wireshark.org/review/8877 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-12AMQP 1.0: Fix dissection of UUID datatypesPetr Gotthard1-2/+3
Set a correct data length: 16-bytes, not 1-byte. And use the standard function to print the uuid. Change-Id: Ic4cc8d8de3f469e43664fbd7f6eb89083dc83be6 Reviewed-on: https://code.wireshark.org/review/8905 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-12AMQP 1.0: Don't treat decimal[32|64|128] as packet errorsPetr Gotthard1-1/+19
Packets with a decimal datatype should be correctly dissected. Yet, we still cannot display the decimal floating-point numbers as there is no support in printf and glib. Change-Id: I48a6dafd1e12ab55f660fad37a759dd16a9cf4b1 Reviewed-on: https://code.wireshark.org/review/8902 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-12Qt/Bluetooth/ATT: Add SaveAsImage option for tableMichal Labedzki3-8/+31
Also remove CopyAll button and move this option to table's context menu, where "Save as image" is placed. Change-Id: Ifbdd0c1625f449cb2af33a6cf2de2d282e4c6e6e Reviewed-on: https://code.wireshark.org/review/8900 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Orynicz <michal.orynicz@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-06-12Qt/Bluetooth/ATT: Fix behaviour when capture file is closedMichal Labedzki2-1/+8
Disable go to frame and control components when capture is closed. You can only browse data and copy them. Change-Id: I05aee5eae5f91f39ab3bb942afdf9000d9b86add Reviewed-on: https://code.wireshark.org/review/8899 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-06-12Bluetooth: SDP: Fix alone DID attributesMichal Labedzki1-4/+6
Fix "malformed" packets where there is only one attribute of DID. Change-Id: If71ec66e09edbb7c1ca2ebf97acbf65cc52ab038 Reviewed-on: https://code.wireshark.org/review/8898 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-06-12Bluetooth: Device name is UTF-8, not ASCIIMichal Labedzki2-7/+7
Change-Id: I14578ea9e23dcc3431176b119fa4bbc4eea907c8 Reviewed-on: https://code.wireshark.org/review/8897 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-06-12androiddump: Fix socket resource leakMichal Labedzki1-2/+67
Change-Id: I79cadef71d3d6f8e44c6a66045fb150119e0b40e Reviewed-on: https://code.wireshark.org/review/8896 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-06-12androiddump: Fix Bluetooth External ParserMichal Labedzki1-1/+12
Be careful when use char buffer [aka signed char] with arithmetic and thinking in unsigned logic. Also add missing rules for SCO. Change-Id: I3fbb0407c74215719103e08344be8f673a7deedf Reviewed-on: https://code.wireshark.org/review/8895 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-06-12Squelch PortAudio warnings on Windows x64 cmake buildGraham Bloice1-0/+12
pa_win_wmme.c generates 4 warnings due to converting size_t down to a long All 4 get the size_t from a strlen() call on a device path so are unlikely to exceed a long. Change-Id: I1d768b96abf42514149db067b24c98d0b9bdfaed Reviewed-on: https://code.wireshark.org/review/8893 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>
2015-06-12Add RPCoRDMA dissectorSlava Shwartsman4-0/+649
Add support for RPCoRDMA and as a result support NFSoRDMA protocol Bug:11251 Change-Id: I1a4af1b4e6b344224f5ce0efa77d7dbfca8aae46 Signed-off-by: Slava Shwartsman <slavash@mellanox.com> Signed-off-by: Yan Burman <yanb@mellanox.com> Reviewed-on: https://code.wireshark.org/review/8758 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>
2015-06-12Asterix dissector can now dissect ASTERIX Category 004.Marko Hrastovec1-5/+1217
The code was added to dissect CAT004. Change-Id: I7be543468d7df959db6bcef53d21d49846d29990 Reviewed-on: https://code.wireshark.org/review/8883 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>
2015-06-11AMQP 1.0: float/double should be in network byte orderPetr Gotthard1-2/+2
The standard says that (unless otherwise specified) AMQP uses network byte order for all numeric values. Change-Id: I3ca154a6fb882d9194a9af891f92f760aae776eb Reviewed-on: https://code.wireshark.org/review/8889 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-11AMQP 1.0: 'char' should be 4-bytes UTF32Petr Gotthard1-2/+3
Change-Id: I219b65fd989e1811eda9e2b7197148e6b22ef97a Reviewed-on: https://code.wireshark.org/review/8887 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-11Mark items unused or rarely-used as appropriate.Gerald Combs1-4/+4
Change-Id: Id9c046333dedd6f22d476083f395ef72a52c8439 Reviewed-on: https://code.wireshark.org/review/8888 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-11Search for the Lua (version < 5.3) package first: it's the most common case.Jeff Morriss1-1/+1
Change-Id: I5a74870c491d46e538200f2b275b1608c0afecd4 Ping-Bug: 11219 Reviewed-on: https://code.wireshark.org/review/8865 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-06-11.mailmap: Update .mailmap for fix some name / duplicate entryAlexis La Goutte1-1/+11
Change-Id: If0ea60700dab808f1b2851396190df55e470c60a Reviewed-on: https://code.wireshark.org/review/8732 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-11Replace tabs in files with editor modeline "expandtab"Bill Meier13-43/+43
Change-Id: I4667fd4091c510a4c798f79dae333a07dc42dad6 Reviewed-on: https://code.wireshark.org/review/8880 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-10BER: fix call to proto_tree_add_bytes_format()Pascal Quantin1-1/+1
The start_ptr parameter was missing. Bug: 11264 Fixes: 8ccf65bfb244 Eliminate proto_tree_add_text from a few dissectors. Change-Id: I52a59fe572cd1d0da8c6eb64e703752f5e352ed6 Reviewed-on: https://code.wireshark.org/review/8878 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Peter Wu <peter@lekensteyn.nl>
2015-06-10ZVT: use the transaction info to set source and destination addressMartin Kaiser1-9/+34
Change-Id: Ieef2747ce7cc42f0f1b56dd48268d65b1875a5d6 Reviewed-on: https://code.wireshark.org/review/8879 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-10Provide port names for UDP ports so they can be used in filter expressions.Michael Mann1-4/+26
Change-Id: I134290624d40b7a14c3aaeb2f0793838a411805e Reviewed-on: https://code.wireshark.org/review/8876 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>
2015-06-10Provide port names for TCP ports so they can be used in filter expressions.Jakub Zawadzki1-3/+27
Bug: 594 Change-Id: Ib41c4c753e24ac78b39463ab1daae7fd00631230 Reviewed-on: https://code.wireshark.org/review/8851 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-06-10epl: Add config option for dupl. cmd layerRoland Knall1-1/+5
Allow the command layer to be shown for duplicated frames if needed for deep-packet analysis Change-Id: I2e0026b6e448ebfd96f879f2f002a6f30a0a5031 Reviewed-on: https://code.wireshark.org/review/8874 Reviewed-by: Roland Knall <rknall@gmail.com> 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>
2015-06-10openSAFETY: Fix smaller bugs in detection and tapRoland Knall1-5/+23
- Add b16 counter to SPDO Time Request/Response - Mark generated time fields as generated - Fix +1 addition for frameOffset - Fix CRC2 calculation for subframes with just 5 bytes datalength Change-Id: I59ef7bf445de47c2bd165ae0f94d64d9f11d636b Reviewed-on: https://code.wireshark.org/review/8875 Reviewed-by: Roland Knall <rknall@gmail.com> 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>
2015-06-10[MSVC 2015] Use intptr_t to make MSVC happy.AndersBroman2-5/+5
Change-Id: I1a39495bc2a752070db8c62136b17d9567bc33ab Reviewed-on: https://code.wireshark.org/review/8856 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>
2015-06-10tshark: fix computation of iostat table width when specifying an intervalPascal Quantin1-1/+1
Bug: 11262 Change-Id: I57468d1e96ade8926a2911bd035adf85500eba39 Reviewed-on: https://code.wireshark.org/review/8860 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-06-10NFSv4: A zero attribute mask is acceptable in dissect_nfs4_fattrs() ifcturney1-11/+17
'type' = FATTR4_BITMAP_ONLY This patch updates the code accordingly. Vars 'num_bitmaps', and 'count' are declared as guint8 but being passed to 32-bit fields of proto_tree_add_uint() and tvb_ensure_bytes_exist(). In glibconfig.h 'guint8' is defined as 'typedef unsigned char guint8;' and in 'limits.h', ‘char’ is defined as 8 bits: #define CHAR_BIT 8 /* number of bits in a char */. These vars have been changed to 32-bits. There are 22 other dissectors that call "tvb_ensure_bytes_exist()". In addition, there are an 215 CHECK_BYTE_COUNT_SUBR macro calls in packet-smb.c which essentially do the same thing. README.developer does state "you can check whether the data is present by using "tvb_ensure_bytes_exist()" although this frequently is not needed." This call has been removed in accordance with that statement. Bug: 10483 Change-Id: Ib06ab14254882e9110af265d2d67a66dcce694f2 Reviewed-on: https://code.wireshark.org/review/8847 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-10It's INVALID_HANDLE_VALUE, not INVALID_HANDLE.Guy Harris1-1/+1
Change-Id: I71d18ced0a1bd3438498230b6e647697be8e275d Reviewed-on: https://code.wireshark.org/review/8872 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-10Squelch some type-clash warnings on Windows.Guy Harris2-12/+23
Define WS_INVALID_PID to be the appropriate "there is no process" value. On UN*X, -1 works; the "pid" is actually a HANDLE for the process on Windows, so INVALID_HANDLE is appropriate. Cast HANDLE to intptr_t in the _cwait() call. Change-Id: Ica2d2319f5c95ba41f590776a745fe040fe494d2 Reviewed-on: https://code.wireshark.org/review/8871 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-10Rename wsutil/process.h to wsutil/processes.h to avoid collisions.Guy Harris4-7/+7
The MSVC rules for searching for headers are a huge barrel of fun; it appears that, for some files that need the MSVC <process.h> to declare getpid(), they're getting our <wsutil/process.h> instead, as that's in the current directory. Rename it to avoid the collision. Change-Id: I88eb70237062fa7957e38d7ff8132524390a6a5c Reviewed-on: https://code.wireshark.org/review/8870 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-10Make sure we include <windows.h> to get HANDLE declared.Guy Harris1-0/+2
Change-Id: I8cba1120f4667864eadeebd48bcdced3a2b71f4c Reviewed-on: https://code.wireshark.org/review/8867 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-10One more ws_process_id change.Guy Harris1-1/+1
Change-Id: I21dc38c248f4412e8f48e7dfd54aa12497167e5a Reviewed-on: https://code.wireshark.org/review/8866 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-10Get rid of extra blank line at the end.Guy Harris1-1/+0
Change-Id: Ibe7904b7e01a1b0b81ba20673cd85e08ebf660c2 Reviewed-on: https://code.wireshark.org/review/8863 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-10Use pid_t on UN*X, and HANDLE on Windows, for the process ID.Guy Harris11-29/+77
This avoids type punning; at least with Xcode 7 beta on El Capitan beta, that produces warnings that get turned into errors. Change-Id: I57f47455b9630f359828c07c92a190b5cb33816f Reviewed-on: https://code.wireshark.org/review/8862 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-09Clean up --with-qt handling.Guy Harris2-7/+14
If you don't specify --with-qt or --without-qt, we build with Qt iff we find it; we don't fail if we don't find it. If you specify --with-qt, we build with Qt if we find it and fail if we don't find it. If you specify --without-qt, we don't look for Qt and don't build with it. This is all independent of --with-gtk2 or --with-gtk3. Change-Id: I508d3281192bda9168fc46aba6011687c83ef818 Reviewed-on: https://code.wireshark.org/review/8861 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-09Qt: fix a V595 warning reported by PVS-StudioPascal Quantin1-2/+3
The 'cur_item' pointer was utilized before it was verified against nullptr. Change-Id: I46185f24cf5700e2137f6e40bed45575197c36e7 Reviewed-on: https://code.wireshark.org/review/8858 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-09GTK: fix a V610 warning reported by PVS-StudioPascal Quantin1-1/+1
Unspecified behavior. Check the shift operator '>>'. The left operand '(- 1)' is negative. Change-Id: I508d451736830a150b8839aa6353ee4c7bcf848f Reviewed-on: https://code.wireshark.org/review/8859 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-09[MSVC 2015] Use intptr_t for "pointer stored as int" to make MSVC happy.Anders9-38/+43
Change-Id: I5dbbea8527a8bb73b17e5a8a5611c3923d82459c Reviewed-on: https://code.wireshark.org/review/8852 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>
2015-06-09Remove the executable bit from epan/addr_resolv.cEvan Huus1-0/+0
It was added (presumably by accident) in 41ac67c. Change-Id: If9c2daae6d9f6a0f09fc04c5332faeaa69d355c2 Reviewed-on: https://code.wireshark.org/review/8855 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-09Add PortAudio to Windows CMake buildGraham Bloice2-15/+89
Change-Id: I774ff0bf858280f2a5aa551ae1a5e23eedf8dc20 Reviewed-on: https://code.wireshark.org/review/8848 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-06-09[MSVC 2015] Change the check to look for MSVC 2010 or newer rather thanAnders1-2/+1
adding MSVC 2015 Change-Id: I151be089529f2bb460b313f84a348f51689eb445 Reviewed-on: https://code.wireshark.org/review/8854 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-06 17:29:13 +0000