Commit Graph

53210 Commits

Author SHA1 Message Date
Tomasz Moń 9538d1c433 Fix CMake build.
Change-Id: I749c6f1e978e385a9f1340f315c670404a2470ad
Reviewed-on: https://code.wireshark.org/review/2087
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-09 22:00:21 +00:00
Sean O. Stalley 3c37630c77 Dissection of USB setup data in MA USB data packets
This patch adds support for dissection of USB setup data contained
inside of MA USB data packets. The MAUSB Dissector calls the same
function used by the USB dissector to dissect the setup data.

This patch also (and a bit unintentionally) adds transfer following.
TransferReq & TransferAck packets now show a link & a time delta
to their TransferReq (ie [Request in: XXX] & [Time from request: XXX].

TransferReq packets have a [Response in: XXX] tag, but it erronously
points to the TransferAck, not the TransferResponse.

Change-Id: I01041de3c38ea6248e9d34506b0b012518a1e6d8
Reviewed-on: https://code.wireshark.org/review/1548
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-09 20:08:49 +00:00
AndersBroman c9621e2bef We must include config.h to have HAVE_SSE42
Change-Id: I2b882b05b2864edbfef0ea03bc086efeaac84ad2
Reviewed-on: https://code.wireshark.org/review/2086
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-09 19:30:17 +00:00
AndersBroman 618187a777 Hopfully thiw will make the Solaris build going.
Change-Id: I44b93494f6d3cb0504517ab4581afeef180f1513
Reviewed-on: https://code.wireshark.org/review/2079
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-09 16:36:29 +00:00
AndersBroman c2a187f4ac Try to fix OSX build
Change-Id: Iab664f349e7604b99368f4a986dfe98db48aea84
Reviewed-on: https://code.wireshark.org/review/2078
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-09 16:24:50 +00:00
AndersBroman f9254e5173 Fix a copy paste error.
Change-Id: I9a153b3e89886c7de943226dd5313c90e8be1b7b
Reviewed-on: https://code.wireshark.org/review/2075
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-09 16:00:13 +00:00
AndersBroman 8e8a4ceba3 Try to fix the builds.
Change-Id: I3ccb5c1b40504cd9314da5a09b225e3e2bf991b8
Reviewed-on: https://code.wireshark.org/review/2073
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-09 15:31:45 +00:00
Martin Kaiser 9dbf2ff28e fill the conversation info struct in dissect_linux_usb_pseudo_header()
Change-Id: I9743a6fe57ff3197baa0c084dae428df8c31b24d
Reviewed-on: https://code.wireshark.org/review/2068
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-09 15:09:06 +00:00
Martin Kaiser bea41069a2 use the direction info from the conversation struct
Change-Id: I2345fae33333568ffeaaa3aa3329cb8371a444e1
Reviewed-on: https://code.wireshark.org/review/2067
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-09 13:34:58 +00:00
Alexis La Goutte d3104c228e Make buildbot Happy about shadow index variable...
Change-Id: I4c93af520883235828a4bb1881c74035eace995d
Reviewed-on: https://code.wireshark.org/review/2070
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-09 13:33:33 +00:00
Jakub Zawadzki fcb710baec Add sse4.2 optimized function ws_mempbrk_sse42()
In text protocols, like SIP, lot of time is spend guint8_pbrk(),
assume that text is not binary (no NULs), and use SSE4.2 pcmpistri
instruction.

Also move & rename guint8_pbrk() from tvbuff.c as _ws_mempbrk.

HAVE_SSE42 must be defined to use _ws_mempbrk_sse42() only activaded for
Windows currently.

Change-Id: Ic853d84805bdb6492c4f45d2bcc79a973fd9804e
Reviewed-on: https://code.wireshark.org/review/1730
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-09 12:02:27 +00:00
AndersBroman 6669566199 Try to fix acket-tftp.c:207: error: \u2018data_tvb\u2019 may be used
uninitialized in this function.

Change-Id: I92a344b8ec86fc71b64903c2e6edc74f8ed7a330
Reviewed-on: https://code.wireshark.org/review/2066
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-09 10:52:47 +00:00
Anish Bhatt f33ead5479 remove all checks for if (tree)
Change-Id: I82617c0a396fdf42735ba39a5ed266a3f5240854
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/2048
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-09 10:47:11 +00:00
AndersBroman 05fcdc3224 Windows does not allow data copy between dlls,
declare the true_false_string locally.

Change-Id: I5470475164fd649b664e888ced089aec56a45c59
Reviewed-on: https://code.wireshark.org/review/2055
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-09 08:59:20 +00:00
U-beauty\bdn 39ac6f2d02 HPM.2 IPMI Trace Data encapsulation format
Added a mapping between DLT_IPMI_HPM_2 link-layer header type to the IPMI Trace Wiretap encapsulation.

Change-Id: I458d44ad0f51beecfe5589e0e9cb75f4771d866b
Reviewed-on: https://code.wireshark.org/review/2054
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-09 08:54:38 +00:00
Pascal Quantin 89960510e3 IEEE 80211: fix dissection of HT Capabilities
Bug: 10166
Change-Id: Iafe789968bd5b9a6e593b682f8d42ba42db5fce9
Reviewed-on: https://code.wireshark.org/review/2046
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-09 01:49:35 +00:00
Adrian Simionov c2f3e0a447 Added TLV 16 for MDD message
Change-Id: Ia48056b5680d86d343dc106cd511cd5ed5e889e8
Reviewed-on: https://code.wireshark.org/review/2034
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-09 01:48:54 +00:00
Balint Reczey e04f321c67 Fix make debian-package
Change-Id: I3474889d18036c239b22c7a21d8e949072250fbb
Reviewed-on: https://code.wireshark.org/review/2042
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-09 01:48:00 +00:00
Chugzilla 1fcc673cc0 Bugfix pdml2html.xsl fails to expand multiple identical 'proto' tags
bug:10106
Change-Id: Iaeb63325ddd7a67345c538c0688b5efc332f1963
Reviewed-on: https://code.wireshark.org/review/2032
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-08 19:28:19 +00:00
Balint Reczey 7de3d23229 Fix Wireshark's name in Vietnamese translation
Change-Id: Idf07c767587815d2cb2c8c094fd820983302b043
Reviewed-on: https://code.wireshark.org/review/2043
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-08 19:19:48 +00:00
Evan Huus 4f6e021646 Add GPLv2+ license header to headers-check.c as per private email from the
author.

svn path=/trunk/; revision=54384

Change-Id: I464197c19316700457a5575b370600db38ce4962
Reviewed-on: https://code.wireshark.org/review/2041
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-06-08 17:51:58 +00:00
Balint Reczey 671d6c9095 Fix make dist
Change-Id: I96e25a3be6db53fcfacb631fdc48c03a63f195f2
Reviewed-on: https://code.wireshark.org/review/2040
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-06-08 17:51:31 +00:00
Gerald Combs fc3a804f36 [Automatic manuf, services and enterprise-numbers update for 2014-06-08]
Change-Id: I28963e69c7bd6bdca031635e3e59a8060f52bd3b
Reviewed-on: https://code.wireshark.org/review/2036
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-08 15:45:25 +00:00
Balint Reczey cb4ec166d8 .deb package format is 'native'
Change-Id: I2b52648c74290df0e98e4be31ac6c51db309eaaf
Reviewed-on: https://code.wireshark.org/review/2001
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-06-08 15:33:29 +00:00
Balint Reczey 6d783f228c Don't ship libfiletap in the .deb packages yet
Change-Id: I5b179d2b84bc95e540def544a8b710f81fb0fccb
Reviewed-on: https://code.wireshark.org/review/2000
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-06-08 15:33:05 +00:00
Balint Reczey 97e1491aa8 Sync .deb packaging from Debian
The sync makes CMake the build system for the .deb package
and starts providing wireshark-qt in the wireshark-qt package.
The package structure, i.e. the libraries are shipped in separate
packages is also sync-ed.

Wireshark-qt uses the Qt 4 libraries, but it is easy to switch
it to Qt 5.

Change-Id: I849d18bdb8ca6ebf4072cf1d73d749080ac5dac2
Reviewed-on: https://code.wireshark.org/review/1986
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-06-08 15:32:10 +00:00
Joerg Mayer 9b4991098f Linking against libgettext and libm got broken by
commit 561460160a
 Author: Graham Bloice <graham.bloice@trihedral.com>
 Date:   Fri May 16 20:43:17 2014 +0100

     Update CMake build for win32 to build QT again, and to find
     GLib and GThread libs

Fix that (basically it put them into the packagelist which got
*replaced* by the next set of things to test).

Change-Id: I0f43a17a7c7eb087c530f6336dc61f93b121fda8
Reviewed-on: https://code.wireshark.org/review/2035
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-08 14:36:37 +00:00
Graham Bloice 561460160a Update CMake build for win32 to build QT again, and to find
GLib and GThread libs

Change-Id: If7e8ebc46f42389d174959303e13cde20687ae8a
Reviewed-on: https://code.wireshark.org/review/2010
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-08 12:13:35 +00:00
Guy Harris 39cdb98606 PEEKREMOTE packets don't appear to have Atheros padding.
Call the without-Atheros-padding dissector for the payload.

Fixes bug 10139.

Change-Id: I883bf4e58899aa78b07fae63d8c0376a31bda444
Reviewed-on: https://code.wireshark.org/review/2027
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-07 19:10:25 +00:00
Guy Harris 39ca18d71b Only nuke the startup item once we've installed the launch daemon.
That way, if we crash in the middle, there's still something installed
that will try to set the permissions on the BPF devices.

Change-Id: Ie0c32f9eaca08bdbb359d07e47f20c664bc66411
Reviewed-on: https://code.wireshark.org/review/2023
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-07 17:47:20 +00:00
Sean O. Stalley 09f53d802a Per Spec update, SetUSBDevAddrReq now contains data
Per MAUSB Spec (1.0), the SetDevAddrReq packet now contains data
in addition to the packet header.

Change-Id: I4d2c6bb2530edf5de33ef69c0e6af0441e197fa4
Reviewed-on: https://code.wireshark.org/review/2014
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-07 17:43:06 +00:00
Sean O. Stalley 78bc006082 Removed MAUSB DWORD-Aligned Length Check
Removed a check to see if the Packet is in DWORDs.
I misread section 6.2 of the spec, which states that all _headers_
mausb be DWORD-aligned, not all _packets_.

Change-Id: I11e320e6e2592930024ffa8143e4d8f470de13ba
Reviewed-on: https://code.wireshark.org/review/2013
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-07 17:42:03 +00:00
Pascal Quantin 0c62f06bc8 USB: put back URB setup to parent tree like it was before g3169939
Change-Id: I645fb04c8039bd7bf43848c14d163aa0990cc977
Reviewed-on: https://code.wireshark.org/review/2022
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-07 17:22:36 +00:00
Sean O. Stalley b8e40b6f27 Added usb_get_trans_info() function
Moved code in usb_dissect_common() for getting/creating transfer
info into it's own function.

This is part of an effort to make dissect_usb_common() more modular
so that code can be shared between the USB & the MAUSB dissector.

Change-Id: I70f4f98536a6355e57b33eb01a9b5d8688183635
Reviewed-on: https://code.wireshark.org/review/1993
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-07 17:22:17 +00:00
Michael Mann 73217d9f3f tvb_new_subset -> tvb_new_subset_length when length parameters are equal.
tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is.

Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d
Reviewed-on: https://code.wireshark.org/review/1999
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-07 15:41:07 +00:00
Anish Bhatt a048dc1d0d Updates as requested
Change-Id: I447b2c1f713710820ce81dda40992b5311285d09
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/2015
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-07 10:23:51 +00:00
Guy Harris b319a67bfb When installing the launch daemon, get rid of the old startup item.
Only one is necessary; get rid of the startup item.

Change-Id: I0bd2dabb3fc286ccd0e6634bc112e20602624c86
Reviewed-on: https://code.wireshark.org/review/2016
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-07 06:42:59 +00:00
Anish Bhatt b69642db30 Misc lldp cleanup.
I'm cheating a bit here, hf_media_loc_long & hf_media_loc_lat need a 5byte bitmask, but the bitmask field in hf is restricted to guint32

Change-Id: I7e044fc680bb947973e437fc66057488a8deee67
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/2012
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-06 23:42:31 +00:00
Sean O. Stalley 31699391a8 Moved dissection of setup field to own function
Dissection of all setup field types (standard & nonstandard) are
handled in a seperate function. Before, nonstandard dissection was
handled in dissect_usb_common.

This is part of an effort to make dissect_usb_common() more modular
so that code can be shared between the USB & the MAUSB dissector.

Change-Id: I15d7e3691afc29cd569aa5d3770d2aa569630b12
Reviewed-on: https://code.wireshark.org/review/1992
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-06 23:18:49 +00:00
Guy Harris 63dc1299ae Get rid of some stuff left over from the days of drag-install.
We're not using the Utilities directory; don't create it and don't fill
it in.

Change-Id: I7ba66b415a2e5a6aff77d4bdb57b2ca176bcd789
Reviewed-on: https://code.wireshark.org/review/2009
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-06 21:40:40 +00:00
Guy Harris 2b2fbff2dc Switch to a launch daemon for ChmodBPF.
"Ah finally blew that varmint to Kingdom Come!"

Change-Id: I4ef5f8692924772189af4158eddbc125c1c7d521
Reviewed-on: https://code.wireshark.org/review/2004
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-06 19:17:34 +00:00
Gerald Combs 6ec09094cc Comment out an empty section.
Change-Id: I2c98e5c70e5443eb927dbdc5525c67b463b837bf
Reviewed-on: https://code.wireshark.org/review/2003
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-06 18:40:43 +00:00
Pascal Quantin dbb9453b84 Q.2931: sort extended value string 'q2931_message_type_vals' in increasing order
Change-Id: I003d55b338c79b9841dd16d0947e4734f118f7c6
Reviewed-on: https://code.wireshark.org/review/2002
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06 17:23:51 +00:00
Alexis La Goutte 60ce7bce5f Add TFTP export for Qt too
Change-Id: I056829d48aa49eb106c76c8f572c0f8b6e1a4245
Reviewed-on: https://code.wireshark.org/review/1916
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-06 15:49:44 +00:00
Pascal Quantin ad7b5381ac Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0
Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4
Reviewed-on: https://code.wireshark.org/review/1978
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06 15:33:01 +00:00
Sean O. Stalley 97f0fb0e53 Fixed Fencing for Multiple MAUSB Packets in 1 TCP Packet.
Packet info for all MAUSB packets in a single TCP packet is now displayed
in the info column. Before, only info on the last packet was displayed.

See conversation for change Ib20e5e30474d93270dd24e203ab96f64f5cc77ad.
Patch 3 had fencing, I messed up and left it out of patches 4-6. This
patch adds it back in.

Change-Id: I37f0e028a8f9b5a8500700f03ac36f8bf1c4f63c
Reviewed-on: https://code.wireshark.org/review/1958
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-06 14:47:35 +00:00
Sean O. Stalley bd84767674 Added tap queue helper function to USB dissector
Added a helper function which handles all the USB-Specific tap data.

This is part of an effort to make dissect_usb_common() more modular
so that code can be shared between the USB & the MAUSB dissector.

Change-Id: If0f0b5542203ddaed28009d8a8a1bb8660fa5d70
Reviewed-on: https://code.wireshark.org/review/1990
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-06 14:14:28 +00:00
Alexis La Goutte ed2bb85035 Fix Dereference of null pointer found by Clang analyzer
packet-q931.c:2532:25: warning: Access to field 'message_type' results in a dereference of a null pointer (loaded from variable 'q931_pi')

Change-Id: I7533ff60c541e31efe4522e710f86175c1c0ccf4
Reviewed-on: https://code.wireshark.org/review/1997
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-06 14:05:44 +00:00
Alexis La Goutte be23f163ae Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Iada015df96b8c1b5070699589bb4b4f759217ecd
Reviewed-on: https://code.wireshark.org/review/1996
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-06 14:05:17 +00:00
Alexis La Goutte e27a24cc66 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I2e7e32f618f709739948b2b5ebd1db0e775bfaed
Reviewed-on: https://code.wireshark.org/review/1995
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-06 14:04:27 +00:00