aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-05-30ssl: use SslSessionHauke Mehrtens1-80/+76
Use the struct SslSession instead of passing the tls version and cipher to each function. Change-Id: I19b163913f8f6521a34d94d130e2ae74546a615a Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Reviewed-on: https://code.wireshark.org/review/1821 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-30dtls: use SslSessionHauke Mehrtens1-58/+55
Use the struct SslSession instead of passing the tls version and cipher to each function. Change-Id: I95ad8cb5857794608f0f8db5c2dfd4b16e6578d5 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Reviewed-on: https://code.wireshark.org/review/1820 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-30ssl: add SslSession structureHauke Mehrtens4-42/+46
This structure is used to store information about a SSL session which is not only needed for decrypting the session, but also to show nice dissection information. In an other patch I will add some more members to the struct because the old way of passing them to the function does not scale. Change-Id: I88e7f2896e0364a41d4538752dad291de83bfbca Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Reviewed-on: https://code.wireshark.org/review/1819 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-30cmake: Add feature info for SBCMichal Labedzki1-0/+2
It is helpful to find and build this optional dependance. Change-Id: I73d7a7bb730778bc8b9a54d6560f7f42f1e23bc0 Reviewed-on: https://code.wireshark.org/review/1876 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-30Fix wireshark.pc install destinationBalint Reczey1-1/+1
Change-Id: I136d654ac5ea54237494d9b61c3ddb445b0720ae Reviewed-on: https://code.wireshark.org/review/1863 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-30Honor configured CMAKE_INSTALL_LIBDIR when installing librariesBalint Reczey4-12/+12
Change-Id: I860c9408ed01e9567992b0dcf5c6c6421344c13e Reviewed-on: https://code.wireshark.org/review/1862 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-30EPL: Duplicated framesLukas Emersberger1-16/+225
The MN interprets the CMD layer data only if the CN increments the Send-Sequence-Counter => new data. The MN interprets the data only once, if the same frame is sent again the MN ignores the data. The behaviour is described in the powerlink specification 301 v1.2.0 chapter 6.3.2.3.2.3 Error: Duplication of Frame Frames which duplicate previous sent data are now marked as duplicated frames. Signed-off-by: Lukas Emersberger <lukas.emersberger@gmail.com> Change-Id: I9ef24b52712bfd3c735856b0cd5747c47aeef72a Reviewed-on: https://code.wireshark.org/review/992 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-30Detect multiple MAUSB Packets in a single TCP packetSean O. Stalley1-1/+11
Puts a tag in the info column when multiple MAUSB packets are in a single TCP packet. Change-Id: Ib20e5e30474d93270dd24e203ab96f64f5cc77ad Reviewed-on: https://code.wireshark.org/review/1658 Reviewed-by: Sean Onufer Stalley <sean.stalley@intel.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-30fixMartin Kaiser1-0/+2
packet-btavdtp.c: In function 'dissect_bta2dp': packet-btavdtp.c:2796:36: error: 'sep_data.vendor_codec' may be used uninitialized in this function [-Werror=maybe-uninitialized] packet-btavdtp.c:2799:12: error: 'sep_data.vendor_id' may be used uninitialized in this function [-Werror=maybe-uninitialized] Change-Id: I5b9e22e7ec787430ee25d2cd7dbe13f854f9eaa2 Reviewed-on: https://code.wireshark.org/review/1884 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-05-30Set PLUGIN_INSTALL_DIR properly for wireshark.pcBalint Reczey4-9/+6
Change-Id: I64c04095ce780ce2cc44a54a68695506d27e5747 Reviewed-on: https://code.wireshark.org/review/1861 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-30cmake: Not all system have HtmlViewerMichal Labedzki1-0/+5
Not all system have HtmlViewer, but we support that case by inform user about file/website, so we "have" HtmlViewer. Change-Id: I46e16a86b5c7f9dd47e1d1ded9d10fd4f565660f Reviewed-on: https://code.wireshark.org/review/1875 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-30Bluetooth: AVDTP: First step to fully support AVDTP sessionMichal Labedzki3-5/+18
Session should be finished too on HCI Disconnect and Adapter disappear. Change-Id: I0823872e60ec932fc0831975e54dc33d49fb5dbc Reviewed-on: https://code.wireshark.org/review/1882 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-05-30Bluetooth: AVDTP: Add support for APT-X configurationMichal Labedzki1-26/+405
Also add Service informations to Info column and service item. Change-Id: I0a565df94d7980432c524bd675b291f0e80704e5 Reviewed-on: https://code.wireshark.org/review/1881 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-05-30Bluetooth: Avoid using macro GPOINTER_TO_UINT()Michal Labedzki5-48/+176
Fix warnings and try to inform user about unknown values in "Decode As". Also use define instead of magic number for Unknown L2CAP CIDs. Change-Id: Ie6f26a9e3330b84cef14bbf8861ffbdbdb789225 Reviewed-on: https://code.wireshark.org/review/1880 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-05-30Bluetooth: L2CAP: Another fix for CIDsMichal Labedzki3-67/+64
Example: if there is Connection Request than field with CID always is called SCID. If we Sent this packet, it is okay, but if we Receive it, then it is not SCID for us, but DCID. If we receive Connection Request (DCID) and than we want to make disconnection, so we send Disconnection Request with DCID that is SCID in Connection Request... etc. I try to clarify this, so rename stored SCID to Local CID and DCID to Remote CID. Change-Id: Idde0939a03955d8f4a10d8c9f7c43fd364254460 Reviewed-on: https://code.wireshark.org/review/1879 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-05-30Bluetooth: AVDTP: Upgrade session logicMichal Labedzki3-3/+12
To correctly resolve connections single "ID" value like L2CAP PSM, is not enough, because next connection may use the same PSM value. Solution is save frame number of frame that make disconnection. Conclusion: Any session key values should be updated to pair: {ID_1, disconnect_in_frame}, {ID_2, disconnect_in_frame}... then we should check if "disconnect_in_frame" is greater then current frame number, otherwise it is not valid session. Change-Id: I3d760112b6e53358a93c994f4aae455ac1bf5de6 Reviewed-on: https://code.wireshark.org/review/1878 Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-05-30Bluetooth AVDTP/RTP: Separate the streamsMichal Labedzki6-243/+315
The Stream is defined here as media stream that beginning on AVDTP Start (ResponseAccept). Also fix recognizing Channel streams by AVDTP according to the specification that says: 1. First channel is always Signaling. 2. Second may be Media. 3. Third may be Reporting. 4. Fourth may be Recovery. First and second will be supported right now. Change-Id: Id6d4dae6be1b9df68382288c2d520b7ed3661237 Reviewed-on: https://code.wireshark.org/review/1053 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-05-30Bluetooth: Add music duration info for SBCMichal Labedzki4-23/+189
Music duration info can be used to detect underflow, what can decrease music quality. Change-Id: I8ea06655395d3e66473a09ee72b6833b894aa6e1 Reviewed-on: https://code.wireshark.org/review/1052 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-05-30Bluetooth: Fix Content Protection call for VDPMichal Labedzki1-1/+1
Change-Id: I20a29fdb7d5737173c5b589fc8832b0b997bef2a Reviewed-on: https://code.wireshark.org/review/1877 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-05-30avoid proto_tree_add_uint_format() when we just want the defaultMartin Kaiser1-5/+5
description Change-Id: Ice06e257a72f3b4ce1229ff90129628f0e3bbcfb Reviewed-on: https://code.wireshark.org/review/1873 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-05-29Introduce 802.11 dissectors with wired-in "FCS present" indications.Guy Harris8-24/+56
For a number of protocols that encapsulate 802.11 frames inside packets, whether the frame includes an FCS or not is specified by the protocol, not by whether the link-layer frame carrying the packets *itself* includes an FCS. As we've done with Ethernet, add "_withfcs" and "_withoutfcs" dissectors, which *don't* check the pseudo-header FCS length indication, and call those, rather than dissectors that check the pseudo-header length indication, from the dissectors for those protocols. Change-Id: Ib8c8ecdd872e1782fdfc66e7573415d91911a62e Reviewed-on: https://code.wireshark.org/review/1866 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-29add gdb to the list of new protocolsMartin Kaiser1-0/+1
Change-Id: Ia985f5bbc3f60409ee119883451ea36f0c4b0605 Reviewed-on: https://code.wireshark.org/review/1865 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-05-29start a dissector for GDB's remote serial protocolMartin Kaiser3-0/+264
Change-Id: I8e20917ac08e2349caf330ee967d24d7c738bb71 Reviewed-on: https://code.wireshark.org/review/1815 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-05-29convert cable freq, symbol rate into doublesMartin Kaiser1-12/+12
Change-Id: Iaddd3c4847e803af855c847212ae822b2529ff06 Reviewed-on: https://code.wireshark.org/review/1860 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-05-29conver sat freq and symbol rate into doubles in order to make theMartin Kaiser1-13/+14
filtering work, fix typos Change-Id: I7ed989807826d1322dab00d13d998488caaf73ff Reviewed-on: https://code.wireshark.org/review/1859 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-05-29dissect more components of the track header boxMartin Kaiser1-3/+94
Change-Id: If8d35122ce096f52837bdff1c6599b47456697d5 Reviewed-on: https://code.wireshark.org/review/1858 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-05-29Bugfix EIP explicit connection conversation and allow ForwardClose to not be ↵Michael Mann1-29/+69
present in capture for generated filter to work properly. Change-Id: I8e442dff85ef856672f42e787feb88453eba6f0e Reviewed-on: https://code.wireshark.org/review/1857 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-29glusterfs: if filename itself will become <EMPTY>Vikhyat Umrao1-1/+3
This patch will solve the issue in LOOKUP procedure if filename itself will become <EMPTY>. Change-Id: Ib983ac4f9325db040a6b4eb3fc63179b36103bf4 Reported-by: Pranith Kumar Karampuri <pkarampu@redhat.com> Reviewed-by: Niels de Vos <ndevos@redhat.com> Signed-off-by: Vikhyat Umrao <vumrao@redhat.com> Reviewed-on: https://code.wireshark.org/review/1854 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-29Have the protocol item cover only the PEEKREMOTE header.Guy Harris1-0/+2
Change-Id: I8e5991f636e68a956bf5e09dd6bf4be1d4619ba0 Reviewed-on: https://code.wireshark.org/review/1852 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-29Improve the fix by removing code that miss dissects SPNEGO stuff ... as wellRichard Sharpe2-135/+9
as remove redundant stuff from the spnego.cnf file. Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com> Change-Id: I90a962a39dc4da0f13055c9b3893c26044f1fc97 Reviewed-on: https://code.wireshark.org/review/1809 Reviewed-by: Tomáš Kukosa <tomas.kukosa@unify.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-29Try to fix the problems with the SPNEGO negTokenInit differences in ↵Richard Sharpe4-146/+213
Microsoft implementations Change-Id: Ifbfca88469a6bc479072c921deba280e667c7087 Reviewed-on: https://code.wireshark.org/review/1804 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-28Add Modelines and use tabs and fix typoAlexis La Goutte2-6/+19
Change-Id: Ie3f60f66f0f4a572098d1d7425c53aaf51bdb747 Reviewed-on: https://code.wireshark.org/review/1846 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-28Add ModelinesAlexis La Goutte3-0/+39
Change-Id: I3b41a15f53afc718ccf5892174345220a09c6714 Reviewed-on: https://code.wireshark.org/review/1847 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-28packet-kerberos.c: Use tfs_set_notset in hf[] entry instead of a local version.Bill Meier2-12/+8
Change-Id: I00a3ae7afb46eb50d7477c22cfa340c705cbb34a Reviewed-on: https://code.wireshark.org/review/1851 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-05-28Update m3ap.cnf to match packet-m3ap.c change done in commit b40cb1adBill Meier1-1/+1
Change-Id: Ib94647edcdba8c71439d37a48e213c8a475c351e Reviewed-on: https://code.wireshark.org/review/1850 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-05-28Use Q_UNUSED instead of _U_ruengeler1-1/+2
Change-Id: I19732f097b1238159b634e32ee13fe6ae3f1883d Reviewed-on: https://code.wireshark.org/review/1849 Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2014-05-28Update reference for I-Bit support.Michael Tüxen1-1/+1
Also remove the reference to the original ID. Change-Id: I51357fc04699a40af2d34ec2bd36518d09d3b180 Reviewed-on: https://code.wireshark.org/review/1848 Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2014-05-28Minor: use VALS macro (as per convention); Add editor modelines; Do ↵Bill Meier24-515/+727
whitespace changes. Change-Id: I6007c1b2098d06e4a892474dd07f06a7538f94ef Reviewed-on: https://code.wireshark.org/review/1843 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-05-28packet-klerberos.c: Use typedef (true_false_string) to properly define a ↵Bill Meier2-4/+4
true_false_string. Change-Id: Ic89e5add39b8b0b2c3db254292f12ce6ae25b73c Reviewed-on: https://code.wireshark.org/review/1844 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-05-28packet-ppcap.c: Minor cleanupBill Meier1-21/+31
- Remove SVN ID; - Add editor-modelines; - Do some whitespace changes. Change-Id: I7b8b38cfb1d5d206b35fb04c759f22f094810875 Reviewed-on: https://code.wireshark.org/review/1842 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-05-28Try to fix Ubuntu buildbot (make dist failed)Alexis La Goutte1-1/+0
No rule to make target `cmake/modules/FeatureSummary.cmake', needed by `distdir'. Stop. Change-Id: I66124151ded4d9e3aeed3f9f27aa2fca81a962cb Reviewed-on: https://code.wireshark.org/review/1817 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-28Commit 5ff629ec5ac636b901b2a004aa4d5248f68a5d0f requires the minimumJoerg Mayer1-2/+1
cmake version to be 2.8.3. Make this explicit. commit 5ff629ec5ac636b901b2a004aa4d5248f68a5d0f Author: Alexis La Goutte <alexis.lagoutte@gmail.com> Date: Thu May 22 22:05:08 2014 +0200 CMake: Remove FeatureSummary.cmake and fix display of feature Change-Id: If6f67c837f1bee92a22bbff8965baa3cc71bf663 Reviewed-on: https://code.wireshark.org/review/1841 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-05-28Clang complains about the size of empty structs.ruengeler1-1/+2
Change-Id: I2951b1b384cf9b32677aea81c66c34ab07b0090f Reviewed-on: https://code.wireshark.org/review/1835 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2014-05-28QIcon is not needed.ruengeler1-1/+0
Change-Id: I07207177e97e22bb8810226818b2280db5f5055e Reviewed-on: https://code.wireshark.org/review/1836 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-28glusterfs: show filenames in the summary for common proceduresVikhyat Umrao1-3/+12
With this patch we will have filename on the summary for procedures MKDIR, CREATE and LOOKUP. Example output: 173 18.309307 192.168.100.3 -> 192.168.100.4 GlusterFS 224 MKDIR V330 MKDIR Call, Filename: testdir 2606 36.767766 192.168.100.3 -> 192.168.100.4 GlusterFS 376 LOOKUP V330 LOOKUP Call, Filename: 1.txt 2612 36.768242 192.168.100.3 -> 192.168.100.4 GlusterFS 228 CREATE V330 CREATE Call, Filename: 1.txt Change-Id: I1995c309028f1472a61719d6d7d6ae2c68412a95 Signed-off-by: Vikhyat Umrao <vumrao@redhat.com> Reviewed-on: https://code.wireshark.org/review/1833 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-28LLDP Cleanup : 802.1 Qbg TLVAnish Bhatt1-8/+18
Change-Id: Ibdea530928d1bd98cb353ad8d7d938f739aa693f Signed-off-by: Anish Bhatt <anish@chelsio.com> Reviewed-on: https://code.wireshark.org/review/1830 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-28Add EtherNet/IP connection conversation filtersMichael Mann4-38/+158
Change-Id: Ia69cbe9fea364c735bde956d84a82404b46ec236 Reviewed-on: https://code.wireshark.org/review/1810 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-28Fix indent (use 4 spaces)Alexis La Goutte1-4/+4
Change-Id: I9e37c911865a0e3b13331ec03df05d79749904c5 Reviewed-on: https://code.wireshark.org/review/1811 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-27Fix indent (use tabs)Alexis La Goutte1-57/+57
Change-Id: Iecb242bddb06779ba8b5ce8913fa9c4f64d7f79a Reviewed-on: https://code.wireshark.org/review/1812 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-27Use proto_tree_add_format_text()Jakub Zawadzki2-9/+3
Change-Id: Ie111c4db4afd0702f5a016da1547486631f571d8 Reviewed-on: https://code.wireshark.org/review/1818 Reviewed-by: Michael Mann <mmann78@netscape.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-26 18:38:57 +0000