Commit Graph

53186 Commits

Author SHA1 Message Date
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
Sean O. Stalley 52fe0aa349 (trivial) changed when transfer info is set
usb_conv_info->usb_trans_info is set to the same thing regardless
of the branch taken, to pull it out of the condition.

Change-Id: Ieabf0a6e796b942d7bafedbeba18d9e0fa113e17
Reviewed-on: https://code.wireshark.org/review/1991
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-06 13:37:47 +00:00
Pascal Quantin 38fc8ba5aa WiMAX: fix incorrect type for include_cor2_changes variable
Issue found while playing with MSVC /GL option

Change-Id: I1f734eb4054349c706b529d8080036b00e66397a
Reviewed-on: https://code.wireshark.org/review/1998
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06 13:30:21 +00:00
Anish Bhatt 65abca673f LLDP-MED Cleanup
Co-ordinate based LCI is untested, as the sample capture does not have this, could not find one anywhere.

Change-Id: Id0b52c234d6a36ee430ab9a7265bcd84f151c80c
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/1929
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-06 10:17:30 +00:00
U-beauty\bdn 977a811217 IPMI trace dissector (without PCAP-dependent part).
Added KCS and TMode protocol dissectors.
Request/response logic has been revised.
Saved request data logic has been revised.
Added Get Message command response dissector.
Added missing PICMG command dissectors.
Added new PICMG command dissectors.
Added new PPS OEM command entries.
Added VITA 46.11 command dissectors.

From: Bill Meier:
- refs to value_strings/range_strings in hf[] entries, by convention, should use VALS/RVALS macros;
- refs to true_false_strings should use TFS(&...) macro.
  also: true_false_string definitions should not be defined as arrays.
- remove some unneeded #includes (packet-ipmi.c).
- Do some re-indentation.
- Add editor-modelines as needed.

bug: 10004
Change-Id: Ib269b35784c0b70892d1e0111bcfb483ea64092c
Reviewed-on: https://code.wireshark.org/review/1185
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-06 06:43:45 +00:00
Gerald Combs a537b3f745 Windows packaging and release note updates.
For now, use "Wireshark" and "Wireshark 2 Preview" instead of
"Wireshark (GTK+)" and "Wireshark (Qt)" respectively to match the 1.12
installer. Shorten the descriptions of the command line tools. Warn
against (but don't prohibit) installing on XP.

Change-Id: Ica37ffa5b04eb48cadf41842b6fb9b1431c69803
Reviewed-on: https://code.wireshark.org/review/1988
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 25bb29a1d65896959bc3f73bcf20b400fe0d32dd)
Reviewed-on: https://code.wireshark.org/review/1989
2014-06-05 23:48:32 +00:00
Martin Mathieson 17b98ad420 Add a missing header file, and add new file to cmake build
Change-Id: I3be8bef8c7542e7bcb11f3696783ca68c3920082
Reviewed-on: https://code.wireshark.org/review/1987
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-06-05 22:03:31 +00:00
Martin Mathieson 29222aba7c Add Object (file) export for files transferred over TFTP.
Updated following review comments.

Change-Id: I56e70d8f8e332d2aea604ceec16c980ad890fa58
Reviewed-on: https://code.wireshark.org/review/1885
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-06-05 18:00:49 +00:00
Martin Mathieson 6ac68b1fd5 When have more than one SDU in the same RLC PDU, make sure output from all of them stays in the INFO column
Change-Id: I7b2555101f3a1a596a4108a13240d21786054671
Reviewed-on: https://code.wireshark.org/review/1985
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-06-05 17:59:53 +00:00
AndersBroman 7e77631eae Add a handle to dissect sip userinfo.
Change-Id: Ia8c15b710d79f12e8f62a49b17f057b746f31f0c
Reviewed-on: https://code.wireshark.org/review/1980
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-05 14:32:17 +00:00
Jakub Zawadzki 5c48774a01 sip: avoid calling tvb_format_text() when tree is not visible.
sip dissector when filtering spends ~5% of Ir in tvb_format_text(),
avoid calling.

Change-Id: I1de8e970b300354c0536aead65178401f140f509
Reviewed-on: https://code.wireshark.org/review/1974
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-05 11:48:51 +00:00
AndersBroman 52349721d5 Make socpe a local variable, can be used if we change the g_slist to a
wmem_list.

Change-Id: I176a2acc5ae334916978f543c959287bf0d8541e
Reviewed-on: https://code.wireshark.org/review/1979
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-05 11:26:33 +00:00
Alexis La Goutte 6db547f8bf STUN: Add error code from MS-ICE2BWM
Interactive Connectivity Establishment (ICE) 2.0 Bandwidth Management Extensions
http://msdn.microsoft.com/en-us/library/ff595756.aspx

Change-Id: I218229225ea5c64cfe2d5f269625deafe7eb8292
Reviewed-on: https://code.wireshark.org/review/1972
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-05 08:07:33 +00:00
Alexis La Goutte cd6e2ea6a6 STUN: Add support of MS-TURN (Used by Lync)
MS-TURN: Traversal Using Relay NAT (TURN) Extensions http://msdn.microsoft.com/en-us/library/cc431507.aspx

Change-Id: I2a6f28f5f7db4da45543816caecce1da7cf03c35
Reviewed-on: https://code.wireshark.org/review/1971
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-05 08:02:31 +00:00
Sean O. Stalley c49fcec9a6 Moved dissection of standard setup responses to own function
Standard USB setup responses are now handled by a seperate function.
Before, dissection was handled in the 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: Ibfbcd915d8cef881a6ae0f0312e5a8070984f465
Reviewed-on: https://code.wireshark.org/review/1968
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-05 05:47:37 +00:00
Sean O. Stalley 5c03010926 Moved dissection of standard setup requests to own function
Standard USB setup requests are now handled by a seperate function.
Before, dissection was handled in the 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: I51944c688cc0715887abd4c8e5a7e3639c06821b
Reviewed-on: https://code.wireshark.org/review/1967
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-05 05:47:27 +00:00
Sean O. Stalley eaa571a666 Added generic setup dissector for USB control transfers
Added helper function to remove inline duplicate code.

Change-Id: I898f1157bfa5f77613be2e82b29bfb21660124eb
Reviewed-on: https://code.wireshark.org/review/1962
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-05 05:45:32 +00:00
Martin Kaiser 653dd75483 simplify PCR calculation
Change-Id: I892088e158519e331cba89be3c8d7c71f38a8925
Reviewed-on: https://code.wireshark.org/review/1964
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-05 04:12:33 +00:00
Joerg Mayer fc13d22854 Fix typo that would have hit once conversion of the users guide to
asciidoc would have started

Change-Id: Ie4f79bbf65a56a83995c70eb864d2476885c9170
Reviewed-on: https://code.wireshark.org/review/1966
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-04 23:20:38 +00:00
Joerg Mayer 5defb48d9a Do not rebuild developers-guide.xml on each run. Do this only when
required.

Change-Id: I525c09e78c385593a7132ad3bfbca1114ea0de8b
Reviewed-on: https://code.wireshark.org/review/1965
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-04 23:05:27 +00:00
Joerg Mayer 95b694fc94 Fix message about detection of asciidoc package (would always report
not found before).

Change-Id: Iaac974e5db3e605e0b9f7256d2724ae777eaebc3
Reviewed-on: https://code.wireshark.org/review/1963
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-04 22:12:56 +00:00
Bill Meier 68a1b552f7 tshark.c: 'tshark -F pcap -w ...' should create a pcap (not pcapng) file; fixes Bug #9991.
Change-Id: I182357fc57d6e57033319afc762549d805c2c10c
Reviewed-on: https://code.wireshark.org/review/1954
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-06-04 19:31:08 +00:00
Bill Meier dc02627adf tshark.c: Change "Live captures can only be saved in libpcap format" to "[...] in pcap or pcapng format"
Change-Id: I18dd0d15e261ecbc1ec086b4870a994afc7665ee
Reviewed-on: https://code.wireshark.org/review/1953
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-06-04 19:30:29 +00:00
Bill Meier 3d23cbd11f (Trivial) Fix a typo.
Change-Id: I111d3af8d9f1a96ebbe3f4b19ab1597a93348058
Reviewed-on: https://code.wireshark.org/review/1952
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-06-04 19:29:38 +00:00
Michael Tüxen 91afb5a36e The subtype_seek_read() functions populate *phdr, not wth->phdr.
So don't use the values.
This problem show up on pcapng files resulting from captures of
multiple interfaces.

Change-Id: I30b0598602b0b69233107d35be4360475d8648d8
Reviewed-on: https://code.wireshark.org/review/1950
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-04 17:42:56 +00:00