Commit Graph

53427 Commits

Author SHA1 Message Date
AndersBroman fcb019acb8 Change HAVE_SSE42 to HAVE_SSE4_2 add $(SIMD_FLAGS)
Add autotools macros to distribution
Call AX_EXT to define HAVE_SSE4_2

Change-Id: I9ff085d923dfafb32510cdd14290e74a2aaea302
Reviewed-on: https://code.wireshark.org/review/2110
Tested-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-10 14:51:26 +00:00
Michał Orynicz 94dcbfd9ac Fix annoying warnings that a variable is uninitialized in checkfiltername.pl
Change-Id: Ibb291747570e48af6306357cc13fd3a149ca88c9
Reviewed-on: https://code.wireshark.org/review/2071
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-10 14:15:32 +00:00
AndersBroman 99d8c1cce5 Add macros to make it possible to define HAVE_SSE4_2
Change-Id: I63ecfde72f33350d15c430da71fa11ac4923a121
Reviewed-on: https://code.wireshark.org/review/2109
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-10 12:22:41 +00:00
Pascal Quantin e7fbf05b48 3GPP NAS: add dissection of MSISDN in PCO
Change-Id: Ie8dac8c898ff94e955a4c0fdde7f4ffff496e97f
Reviewed-on: https://code.wireshark.org/review/2098
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-10 11:36:02 +00:00
Alexis La Goutte 5d7b59aec4 Fix Buildbot Mac OS: /wsutil/ws_cpuid.h:56: warning: unused parameter 'CPUInfo'
Change-Id: Ic0b0d5392ff049cc51f05b79fc5feae190064ce8
Reviewed-on: https://code.wireshark.org/review/2097
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-10 09:00:41 +00:00
AndersBroman e1f0ee412f Mark an unused parameter as such.
Change-Id: Ia319d7b8523ab9b9e9d8ec8533ebdcf4a506a69e
Reviewed-on: https://code.wireshark.org/review/2096
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-10 08:58:42 +00:00
Alexis La Goutte 5cff2b6d03 CAPWAP: Fix soft-deprecated APIs warning
tvb_length_remaining => tvb_reported_length_remaining

Change-Id: Ie1fa09e00e098c41df2e87771300e3842659dad6
Reviewed-on: https://code.wireshark.org/review/2095
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-10 08:20:25 +00:00
Alexis La Goutte 2f13ccc64c CAPWAP: Display incorrect value for Wireless IEEE802.11 RSSI and Data Rate
* Wireless data ieee80211 RSSI (dBm) is a signed integer. In the wireless radio the dBm value is negative.
* Wireless data ieee80211 Data Rate (Mbps) is a 100Kbps. You need divide this value by 10.

Issue found by Massimo Vellucci (SmartCAPWAP)

Change-Id: I04dd8a9e38a5f60ee5bf64cd304db1b11413c809
Reviewed-on: https://code.wireshark.org/review/2094
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-10 08:18:54 +00:00
Alexis La Goutte dc904a161f rlc lte graph: Assigned value is garbage or undefined (clang analyzer)
Change-Id: Ia371c26299aa62566a63bc1a4d4f6df827fdf5b9
Reviewed-on: https://code.wireshark.org/review/2085
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-10 08:15:02 +00:00
Alexis La Goutte d041b1e91b WS mempbrk SEE4.2: Fix indent (use 2spaces) and add Modelines info
Change-Id: I50c71401f46846a459b18347ef0b9793a2a05ea7
Reviewed-on: https://code.wireshark.org/review/2084
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-10 08:13:54 +00:00
Jakub Zawadzki 4571283379 CPUID improvements
- Make ws_cpuid() return boolean when CPUID is support or no, this way
it's easier for caller to determinate if it works (and can use cpuinfo[X] or no).

- Add function ws_cpuid_sse42(), use it in ws_mempbrk() [cached] &
  version information.

Change-Id: I4e77699f9f3d11bb9b2e8ea599e48d3c5ad84ed7
Reviewed-on: https://code.wireshark.org/review/2088
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-10 08:12:43 +00:00
Anish Bhatt 8878d7778e Current test for GIT_DIR introduced in changeset Ie1560c372e23e58fb0e310f681388b5e1a65ba5b doesn't seem to be working correctly on bash 4.3.18 : .git/hooks/pre-commit: line 11: .git: command not found
This test works correctly in bash/dash/zsh

Change-Id: Ic89fc2764d1a70e9e5d112c7928cee6ed783f50f
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/2092
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-10 00:58:20 +00:00
Anish Bhatt 9516675ca7 Add modelines
Change-Id: Ib8e157e2744198eaa1a5a69732bd8e977b146026
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/2089
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-09 23:58:36 +00:00
Alexis La Goutte 26ad824548 Add Modelines info
Change-Id: If3e77cbdfdeab75766984b10b3356b8343100602
Reviewed-on: https://code.wireshark.org/review/2065
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-09 23:57:27 +00:00
Alexis La Goutte f627ee8674 Add Modelines info
Change-Id: I2364104145518d484c2e5fb0ae5d5d80cce0982d
Reviewed-on: https://code.wireshark.org/review/2064
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-09 23:56:49 +00:00
Alexis La Goutte 8c4a13915e Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I08f4860a97d8406fef878887887b6537bf7600ee
Reviewed-on: https://code.wireshark.org/review/2063
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-09 23:56:40 +00:00
Balint Reczey a08cbe7071 Use only dpkg-buildpackage for building .debs
This makes .deb generation not depending on autotools and also removes
debian-package target from autotools-generated Makefile.

Change-Id: Ia684cd310d85906763af1035fddf39c1fbaed984
Reviewed-on: https://code.wireshark.org/review/2052
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-09 22:02:06 +00:00
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