summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-06-17Qt: fix a crash when closing application under WindowsPascal Quantin2-8/+15
QCoreApplication visits eldritch horrors upon argv on Windows. Keep a local copy for our own processing. --- [ Pascal's original comments ] g6c4ec4a introduced the use of arg_list_utf_16to8 that triggers a crash on my computer when freeing the g_allocated memory. Let's do a similar work but with a memory allocator that does not trigger an exception. Also fix a memory leak in arg_list_utf_16to8 while we are at it. Change-Id: I93d899af20b09c9a5d584a46297f715591502df9 Reviewed-on: https://code.wireshark.org/review/8961 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-17Asterix dissector support for category 021 v2.3Andrew Hoag1-6/+48
- Add item 040 field LLC - Add item 200 field ME - Edit item 271 field LW Change-Id: I13b3774b248731f208b3b950f7ae0736398edbe4 Reviewed-on: https://code.wireshark.org/review/8892 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Marko Hrastovec <marko.hrastovec@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-17[ath] minor cleanupBill Meier1-66/+62
- Remove unneeded #include; - Remove unused code; - Adjust whitespace. Change-Id: I1a287478e629af26234e97824db091c732168447 Reviewed-on: https://code.wireshark.org/review/8964 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-17[ocfs2] trivial changes: unneeded initializer; indentation/whitespaceBill Meier1-118/+118
Change-Id: Icef38e94d5c3e9f5598d55c3e988c94b2798f81f Reviewed-on: https://code.wireshark.org/review/8963 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-17Profinet: I&M5 Data is added.Birol Capa1-1/+109
This optional attribute allows identifying separately orderable OEM parts used to built the device. It consists of the following attributes: Number Of Entries, IM Annotation, Vendor ID, IM Order ID, Serial Number, Hardware Revision, Software Revision Change-Id: I793f6ecd798f93e7f40e8e1a42e42a7070a4a1c1 Reviewed-on: https://code.wireshark.org/review/8955 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-17Fix the Qt main window popup behavior.Gerald Combs4-1/+29
By default QMainWindow::createPopupMenu shows a checkable list of toolbars which aren't synced with our actions under the View menu. Replace it with a version that handles all the main window widgets. Change-Id: I5f5c23880133e97e815d3bbbf19ea3bacc482096 Reviewed-on: https://code.wireshark.org/review/8958 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-17Qt: Add protocol preferences menus.Gerald Combs10-7/+447
Add protocol preferences in the packet list and packet detail context menus. Note that we need a PreferencesEditorFrame in the main window for editing numeric and string preferences. For now we just show the prefs dialog. Change-Id: Ice0cc8e9bc25963cc14aa47698f042f2a73088d8 Reviewed-on: https://code.wireshark.org/review/8957 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-06-16Save the wireless toolbar recent settings.Gerald Combs1-2/+2
Change-Id: I2b0417b7dae8679e80f30de2cd10c7bb6fdc1dbf Reviewed-on: https://code.wireshark.org/review/8956 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-16Don't include <wsutil/frequency-utils.h> if it's not needed.Guy Harris3-4/+0
Change-Id: I7c958a31681defb5297428fdb77aa43462b2d160 Reviewed-on: https://code.wireshark.org/review/8953 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-16Qt: Make sure we have usable command line arguments.Gerald Combs2-11/+24
Call arg_list_utf_16to8 in wireshark-qt.cpp on Windows. Set our default codec in Qt4 to UTF-8 before doing so. Bug: 11276 Change-Id: I8e0afb9523ddb5956d30424b7b7ad7f3ea0838c7 Reviewed-on: https://code.wireshark.org/review/8954 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-16Pass the pseudo-header to wtap_encap dissectors via the "data" argument.Guy Harris2-11/+15
Have the "data" argument to dissectors registered in thw wtap_encap dissector table point to the pseudo-header for the packet. Use that argument in the Bluetooth dissector. Change-Id: I022bbfb796ef51d95df09fb952a149960170d631 Reviewed-on: https://code.wireshark.org/review/8951 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-16Disable AirPcap by default in Autotools.Gerald Combs1-2/+4
Note that we might want to remove the check entirely. Change-Id: Ie0003abc64cd6f47c4f49770beb5d418995e939a Reviewed-on: https://code.wireshark.org/review/8950 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-16[Qt] Delete generated file config.pri at "clean"AndersBroman1-1/+1
Change-Id: Ia8469a91eebf92bf8349d2507bdfcfdba55da916 Reviewed-on: https://code.wireshark.org/review/8949 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-16PKCS12: fix a duplicate OIDEtienne Millon2-2/+2
The value for OID 1.2.840.113549.1.12.1.6 was copy-pasted from the line above. Its correct definition can be found in RFC7292, whose relevant parts are in pkcs12.asn. Note that the capitalization is not consistent in the RFC (pbeWith/pbewith). I used the same convention. Change-Id: I702c2b698660a7ea8df043775d37cadfa6d3ca72 Reviewed-on: https://code.wireshark.org/review/8928 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-06-16TLS Decryption is now possible with a user provided PMS and Client Random valuesAdam Pridgen2-11/+43
Bug: 11263 Change-Id: I1476948ed823fc34de2cecdeb1bddafccbb8ec39 Reviewed-on: https://code.wireshark.org/review/8803 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-16Qt: Remove redundant actions from UI fileMichal Labedzki1-10/+0
Change-Id: Ia571844a2729683ef5f9487fca0aa9d5fd09b235 Reviewed-on: https://code.wireshark.org/review/8948 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-06-16packet-nfs: For flexfiles the versions is now an arrayTom Haynes1-5/+13
Change-Id: I1b61f6a91fbd3553106d1a9a8aba56db1894a010 Signed-off-by: Tom Haynes <loghyr@primarydata.com> Reviewed-on: https://code.wireshark.org/review/8940 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-16packet-nfs: flexfiles now uses string uid/gidWeston Andros Adamson1-2/+6
And no longer uses opaque_auth Change-Id: I272e1c5c1391dac977ad850b899505a28c42b6fd Reviewed-on: https://code.wireshark.org/review/8939 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-16packet-nfs: update to draft 05 of flexfiles xdrWeston Andros Adamson1-4/+10
Change-Id: I7a4e99242365a6fd7c0fa81c6bc97cbe01a00763 Reviewed-on: https://code.wireshark.org/review/8938 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-16packet-nfs: flexfile getdeviceinfo needs to decode rsize/wsizePeng Tao2-17/+62
Change-Id: I67239a7cd1ea63499e5ee1956a2a5ac7b8191f9e Reviewed-on: https://code.wireshark.org/review/8936 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-16packet-nfs: flexfile getdeviceinfo supportWeston Andros Adamson1-0/+42
Change-Id: I7ba0720f4f1dcf15d257d5358226e82b4ee7d2d9 Reviewed-on: https://code.wireshark.org/review/8935 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-16packet-nfs: flexfile layoutget supportWeston Andros Adamson4-20/+84
Change-Id: Idd162119b1fdc6747452b9a13ef580705567983e Signed-off-by: Tom Haynes <loghyr@primarydata.com> Reviewed-on: https://code.wireshark.org/review/8934 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-16packet-nfs: switch on layout type for getdeviceinfoWeston Andros Adamson1-8/+20
We can only parse file layout ds addrs, treat all other layouts as having opaque data. Change-Id: I50892dbdbd6785d8216e2d8725da7bec0c554ee2 Reviewed-on: https://code.wireshark.org/review/8933 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-16Check for NL and AIRPCAP defines.Gerald Combs1-11/+11
This should hopefully fix compilation on OS X. Change-Id: I621c92499232dafb6d6db867615baed8dc81eb17 Reviewed-on: https://code.wireshark.org/review/8947 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-16Add the wireless toolbar.Gerald Combs30-1529/+2512
Add the wireless toolbar to the Qt UI. Start adding AirPcap support to ui/80211_utils. Add FCS validation routines to ws80211_utils. Move a bunch of AirPcap routines that require epan from caputils to ui/gtk. They were required for driver key management, which we'll leave to the AirPcap Control Panel in the Qt UI. Move frequency-utils to wsutil. Change-Id: I44446758046621d183f5c2ba9f6526bf01e084f1 Reviewed-on: https://code.wireshark.org/review/8910 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-06-16wtap_encap dissectors don't get passed a media type name as data.Guy Harris1-21/+2
Get rid of stuff probably left over from copying-and-pasting a lines-of-text dissector that *did* register for a media type. Change-Id: I1197b254dd66d82883a4078c043f5cf1b2777e17 Reviewed-on: https://code.wireshark.org/review/8946 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-16Don't assume we get passed a null data pointer for JSON files.Guy Harris1-1/+12
That assumption will cease to be valid in the future. Change-Id: I021900c7a2f18f94e24cf6d372bb0c5e6fa3fdfe Reviewed-on: https://code.wireshark.org/review/8945 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-16Clean up whitespace.Guy Harris1-3/+3
Change-Id: I5db2f0cdb2e5339d4f0fa1f8d1ce9b3866d640fb Reviewed-on: https://code.wireshark.org/review/8944 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-16Clean up handling of metadata in Bluetooth dissectors.Guy Harris8-46/+167
Make the "previous protocol data" union in bluetooth_data_t a discriminated union, and use the discriminator to decide whether to use a given member of the union or not (or to check whether the member you plan to use is valid). Have separate top-level dissectors depending on what the data type pointed to by the "data" argument is. Use that member to point to pseudo-header metadata, and, for now, set it to point to the appropriate pinfo->pseudo_header value; eventually, we plan to pass the pseudo-header pointer in as the "data" argument from the "frame" dissector. Don't overwrite the pseudo-header in the packetlogger dissector - construct a new one and pass it in. Change-Id: Ia1ef71e7082a964c5d92d47221f8c00e32f3f087 Reviewed-on: https://code.wireshark.org/review/8943 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-15Accept drop events immediately.Gerald Combs1-1/+1
Accept drop events before opening our capture file instead after. Change-Id: I48fe1cd1e3b5e6f7b076aaa0e3a0d035938a5af7 Reviewed-on: https://code.wireshark.org/review/8929 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-15Define XXX_phdr structures in the order in which they appear in the union.Guy Harris1-34/+35
Change-Id: Ia1fe1758998237a344889bdf8215ecfba7b871ee Reviewed-on: https://code.wireshark.org/review/8942 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-15Move some structures used only in pcap-common.c there.Guy Harris2-30/+30
Those aren't pseudo-headers exported from libwiretap, they're just structures corresponding to the pseudo-headers for some pcap/pcap-ng link-layer header types. Change-Id: Iec37cfc162b64adacdeb57e14e546bced7b673fa Reviewed-on: https://code.wireshark.org/review/8941 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-15Fix the CMake windows installer to pickup the locally built zlib1.dllGraham Bloice1-0/+1
Change-Id: I8880a760d9817dd038694e96b4a3d9b8d2db3c2c Reviewed-on: https://code.wireshark.org/review/8931 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-15[vsip] Fix 2 minor bugs; Do some minor cleanupBill Meier1-106/+98
Bugs: Incorrect bytes pane highlighting in certain cases. Change-Id: I6f0fd4e3f7f1599c20524c8715ef831668b7391f Reviewed-on: https://code.wireshark.org/review/8932 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-15GTP: put T-PDU Data item under GTP treePascal Quantin1-1/+1
Otherwise it is put in the top tree, which seems a bit surprising (as seen in the attachment for bug 11271) Change-Id: I0e7f9c89d8ecaeecc3a951893e10154bc11927d3 Reviewed-on: https://code.wireshark.org/review/8927 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-15TFS: Mutualize Response/Request TFSAlexis La Goutte7-16/+3
move tfs_response_request to epan/tfs.[ch] and use this Change-Id: I29d5894fade721b5234649a7c2d83dd1d6a19a0d Reviewed-on: https://code.wireshark.org/review/8930 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-15Support for MPLRobert Cragie1-13/+76
(https://tools.ietf.org/html/draft-ietf-roll-trickle-mcast-12) Change-Id: Idde0f0ef6c23b4c91f08fed1d5b18c68e8c5cf4e Reviewed-on: https://code.wireshark.org/review/8885 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-06-15Separate Windows CMake compiler definitions and flagsGraham Bloice1-10/+15
Change-Id: I70af6d43f45e2110ee7707ff5747b5e990ba7238 Reviewed-on: https://code.wireshark.org/review/8926 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-15Profinet: Combined Object Container is added.Birol Capa2-3/+50
An IO device may define so called “combined objects”. A particular combined object is a group of related submodules, e.g. an interface and its ports. The Combined Object Container holds the parametrization for all submodules. Change-Id: Ifb6c63d2c3a1d3cf2cf100a8f54cf0eafa84fe6c Reviewed-on: https://code.wireshark.org/review/8853 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-15PCP: fix dissection of R bitPascal Quantin1-4/+4
Request and response values were inverted. Bug: 11278 Change-Id: I9b337f423055578252cc01211d74c77837b7ae87 Reviewed-on: https://code.wireshark.org/review/8924 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-15openflow_v4: oxm_length includes experimenterHiroaki KAWAI1-0/+3
As defined in section 7.2.3.10 "Experimenter Flow Match Fields" of openflow-switch v1.3.5 spec. Change-Id: I7268f614417720f225a22b226c8f21603b7f2d0f Reviewed-on: https://code.wireshark.org/review/8882 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-15icmp,wimax: Fix undefined shiftPeter Wu2-7/+5
Fixes these warnings reported by Undefined Behavior Sanitizer (UBSan) while running the test suite: icmp: left shift of 55099 by 16 places cannot be represented in type 'int' wimax: left shift of 1 by 31 places cannot be represented in type 'int' Change-Id: I72913a901b61033098750da9c8f1617b055999a1 Reviewed-on: https://code.wireshark.org/review/8913 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>
2015-06-15Qt/Bluetooth: Add Devices dialogueMichal Labedzki24-208/+1248
Please found it under Bluetooth menu. It shows all devices found in logs, not only connected, all that its address can be found in logs. Show if device is local (in most cases: capturing on it side) and manufacturer and LMP version what should answer the question what version of Bluetooth is used by Bluetooth device chip. Also firmware version. Change-Id: I32e3b7100cdebcaa850b6541de0ab89dff41c0e1 Reviewed-on: https://code.wireshark.org/review/8901 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-06-15Qt: Add the ability to show preferences by module name.Gerald Combs5-11/+53
Currently unused, but allows feature parity with the GTK+ UI. Change-Id: I33e0bfb434949aabd75ecd2ed36e696731195542 Reviewed-on: https://code.wireshark.org/review/8922 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-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>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-13 12:24:07 +0000