Commit Graph

53069 Commits

Author SHA1 Message Date
Sean O. Stalley 918212667a Detect multiple MAUSB Packets in a single TCP packet
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-30 13:14:06 +00:00
Martin Kaiser a1656bc421 fix
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-30 13:08:26 +00:00
Balint Reczey 7bf49b31ac Set PLUGIN_INSTALL_DIR properly for wireshark.pc
Change-Id: I64c04095ce780ce2cc44a54a68695506d27e5747
Reviewed-on: https://code.wireshark.org/review/1861
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-30 12:48:08 +00:00
Michal Labedzki aff380770a cmake: Not all system have HtmlViewer
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-30 12:47:12 +00:00
Michal Labedzki 1258ce7bce Bluetooth: AVDTP: First step to fully support AVDTP session
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-30 11:27:33 +00:00
Michal Labedzki 49cc95784b Bluetooth: AVDTP: Add support for APT-X configuration
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-30 11:26:42 +00:00
Michal Labedzki 53c66a9e08 Bluetooth: Avoid using macro GPOINTER_TO_UINT()
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-30 11:26:28 +00:00
Michal Labedzki 5742d2e145 Bluetooth: L2CAP: Another fix for CIDs
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-30 11:25:50 +00:00
Michal Labedzki e3473c921f Bluetooth: AVDTP: Upgrade session logic
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-30 11:25:35 +00:00
Michal Labedzki 2abc54158d Bluetooth AVDTP/RTP: Separate the streams
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-30 11:24:59 +00:00
Michal Labedzki 32e66a4cc6 Bluetooth: Add music duration info for SBC
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-30 11:24:19 +00:00
Michal Labedzki 788228428e Bluetooth: Fix Content Protection call for VDP
Change-Id: I20a29fdb7d5737173c5b589fc8832b0b997bef2a
Reviewed-on: https://code.wireshark.org/review/1877
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-05-30 11:22:32 +00:00
Martin Kaiser 8515bd7633 avoid proto_tree_add_uint_format() when we just want the default
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-30 08:03:07 +00:00
Guy Harris 21a1208735 Introduce 802.11 dissectors with wired-in "FCS present" indications.
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-29 17:57:14 +00:00
Martin Kaiser 8b6c4e71ad add gdb to the list of new protocols
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-29 17:35:15 +00:00
Martin Kaiser 357b61092b start a dissector for GDB's remote serial protocol
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-29 17:32:41 +00:00
Martin Kaiser 7aecd47be7 convert cable freq, symbol rate into doubles
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-29 17:30:57 +00:00
Martin Kaiser 91dac2771b conver sat freq and symbol rate into doubles in order to make the
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-29 17:30:26 +00:00
Martin Kaiser 254e227266 dissect more components of the track header box
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-29 17:29:41 +00:00
Michael Mann f7b1607b5e Bugfix EIP explicit connection conversation and allow ForwardClose to not be 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-29 16:38:34 +00:00
Vikhyat Umrao 2fa5996984 glusterfs: if filename itself will become <EMPTY>
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-29 11:21:03 +00:00
Guy Harris ababf68de7 Have the protocol item cover only the PEEKREMOTE header.
Change-Id: I8e5991f636e68a956bf5e09dd6bf4be1d4619ba0
Reviewed-on: https://code.wireshark.org/review/1852
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-29 09:34:59 +00:00
Richard Sharpe 88a64b9e2b Improve the fix by removing code that miss dissects SPNEGO stuff ... as well
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-29 01:19:00 +00:00
Richard Sharpe 0ed2672abf Try to fix the problems with the SPNEGO negTokenInit differences in Microsoft implementations
Change-Id: Ifbfca88469a6bc479072c921deba280e667c7087
Reviewed-on: https://code.wireshark.org/review/1804
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-29 01:15:26 +00:00
Alexis La Goutte bb78e8f6e5 Add Modelines and use tabs and fix typo
Change-Id: Ie3f60f66f0f4a572098d1d7425c53aaf51bdb747
Reviewed-on: https://code.wireshark.org/review/1846
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-28 23:43:46 +00:00
Alexis La Goutte 56d8ff6790 Add Modelines
Change-Id: I3b41a15f53afc718ccf5892174345220a09c6714
Reviewed-on: https://code.wireshark.org/review/1847
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-28 23:41:42 +00:00
Bill Meier 40a21bc99c packet-kerberos.c: Use tfs_set_notset in hf[] entry instead of a local version.
Change-Id: I00a3ae7afb46eb50d7477c22cfa340c705cbb34a
Reviewed-on: https://code.wireshark.org/review/1851
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-05-28 21:47:48 +00:00
Bill Meier d817b27d6d Update m3ap.cnf to match packet-m3ap.c change done in commit b40cb1ad
Change-Id: Ib94647edcdba8c71439d37a48e213c8a475c351e
Reviewed-on: https://code.wireshark.org/review/1850
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-05-28 20:48:22 +00:00
ruengeler a192e4792d Use Q_UNUSED instead of _U_
Change-Id: I19732f097b1238159b634e32ee13fe6ae3f1883d
Reviewed-on: https://code.wireshark.org/review/1849
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2014-05-28 17:46:30 +00:00
Michael Tüxen 74774fd8e3 Update reference for I-Bit support.
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-28 17:01:42 +00:00
Bill Meier 48ce5629b0 Minor: use VALS macro (as per convention); Add editor modelines; Do whitespace changes.
Change-Id: I6007c1b2098d06e4a892474dd07f06a7538f94ef
Reviewed-on: https://code.wireshark.org/review/1843
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-05-28 15:40:39 +00:00
Bill Meier e5705070c8 packet-klerberos.c: Use typedef (true_false_string) to properly define a true_false_string.
Change-Id: Ic89e5add39b8b0b2c3db254292f12ce6ae25b73c
Reviewed-on: https://code.wireshark.org/review/1844
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-05-28 15:30:12 +00:00
Bill Meier 4467e02bf4 packet-ppcap.c: Minor cleanup
- 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-28 15:27:22 +00:00
Alexis La Goutte 76cabf3682 Try to fix Ubuntu buildbot (make dist failed)
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-28 15:18:29 +00:00
Joerg Mayer 6dabe124dc Commit 5ff629ec5a requires the minimum
cmake version to be 2.8.3. Make this explicit.

  commit 5ff629ec5a
  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-28 15:15:32 +00:00
ruengeler 925b48ec75 Clang complains about the size of empty structs.
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-28 14:33:50 +00:00
ruengeler 9d77e7cff8 QIcon is not needed.
Change-Id: I07207177e97e22bb8810226818b2280db5f5055e
Reviewed-on: https://code.wireshark.org/review/1836
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-28 12:36:12 +00:00
Vikhyat Umrao 9cd3c5c5fc glusterfs: show filenames in the summary for common procedures
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-28 08:51:16 +00:00
Anish Bhatt 482e6a6510 LLDP Cleanup : 802.1 Qbg TLV
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-28 05:54:53 +00:00
Michael Mann 0701d6170d Add EtherNet/IP connection conversation filters
Change-Id: Ia69cbe9fea364c735bde956d84a82404b46ec236
Reviewed-on: https://code.wireshark.org/review/1810
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-28 00:25:18 +00:00
Alexis La Goutte c3b2b54c92 Fix indent (use 4 spaces)
Change-Id: I9e37c911865a0e3b13331ec03df05d79749904c5
Reviewed-on: https://code.wireshark.org/review/1811
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-28 00:02:07 +00:00
Alexis La Goutte eb1bbb677d Fix indent (use tabs)
Change-Id: Iecb242bddb06779ba8b5ce8913fa9c4f64d7f79a
Reviewed-on: https://code.wireshark.org/review/1812
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-27 23:58:08 +00:00
Jakub Zawadzki 1b439df610 Use proto_tree_add_format_text()
Change-Id: Ie111c4db4afd0702f5a016da1547486631f571d8
Reviewed-on: https://code.wireshark.org/review/1818
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-27 23:55:27 +00:00
Bill Meier cc3931c797 FIELDDISPLAY can be or'd with BASE_VAL64_STRING.
Change-Id: I43014922fc51ddeed70235006296500ec00bd437
Reviewed-on: https://code.wireshark.org/review/1826
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-05-27 22:02:38 +00:00
Martin Kaiser b4fb165ef3 use proto_tree_add_float_format_value() correctly
Change-Id: I927a2f32aa0016b5b0c476fa4c16fc1dbe0aebb0
Reviewed-on: https://code.wireshark.org/review/1825
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-05-27 21:42:33 +00:00
Martin Kaiser b3008f31ec make cable symbol rate filterable
Change-Id: I034b351d4bc12f6c00a0224a5c5b9f85496657b6
Reviewed-on: https://code.wireshark.org/review/1824
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-05-27 21:42:15 +00:00
Martin Kaiser 9c98f9fdbd make cable frequency filterable
Change-Id: I8464fb8e98e485523127dd95948a717554b6aee4
Reviewed-on: https://code.wireshark.org/review/1823
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-05-27 21:21:44 +00:00
Hauke Mehrtens 3ce020a5fc ssl-utils: fix TLS number of padding extension
The padding extension got the number 21 (0x15) by the IANA and not 20
(0x14), see this list for details:
https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml

The number 20 is assigned to the server certificate type extension.

Change-Id: I17271a3a336bcf5a323f15da3a5301115ca4cb45
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://code.wireshark.org/review/1822
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-05-27 20:56:02 +00:00
Martin Kaiser 0911ce12ff make the satellite symbol rate filterable
Change-Id: I301d0804e097c62cd8bf7b27003918eedab9616a
Reviewed-on: https://code.wireshark.org/review/1816
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-05-27 15:13:33 +00:00
Alexis La Goutte 281616f09b Fix build on my old Windows XP Buildbot (With VS2008EE) (Try 2...)
../../asn1/atn-ulcs/packet-atn-ulcs-template.c(126) : fatal error C1083: Cannot
open include file: 'stdint.h': No such file or directory

Change-Id: Id3c3082fe91a79e44abbfd4e2b2f1fc7d5c183d4
Reviewed-on: https://code.wireshark.org/review/1814
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>
2014-05-27 11:46:53 +00:00