Commit Graph

53260 Commits

Author SHA1 Message Date
Joerg Mayer 935280317a Backport autofoo simd optimization
Change-Id: I5d58154bf8266eabedf550b54f18845612f514c6
Reviewed-on: https://code.wireshark.org/review/2206
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-14 06:44:15 +00:00
Joerg Mayer a4a7d2cfec Small whitespace fixes
Change-Id: I44c6c193ec2a7d88cda56ba34c2f17c03f7e121d
Reviewed-on: https://code.wireshark.org/review/2205
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-14 06:43:22 +00:00
Joerg Mayer 21b08ba8c8 Rename WIRESHARK_C_FLAGS to WIRESHARK_COMMON_FLAGS
Change-Id: If78801de797264c0924e81abaf8cd49cc5715a83
Reviewed-on: https://code.wireshark.org/review/2204
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-14 06:42:39 +00:00
Gerald Combs a6993d3806 Fix package version stamping.
Change-Id: I1615364071563c4f56b071d7d68e4660dd989296
Reviewed-on: https://code.wireshark.org/review/2198
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit fd017eeae358fbcbb3f51f2765bd31777aa513d1)
Reviewed-on: https://code.wireshark.org/review/2201
2014-06-13 20:20:57 +00:00
Jeff Morriss 4dfbb792c8 From Gisle Vanem on -dev: don't print modelines info when run with -h.
Also remove trailing white space.

Change-Id: Ic56140f617a2cbf9fa93fb427282eab0b6cff9c6
Reviewed-on: https://code.wireshark.org/review/2113
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-12 23:56:00 +00:00
Pascal Quantin 51750bea8a RTP: fix invalid memory access
Bug: 10176
Change-Id: If54e4a5a118ea10befeeed5278394665df99425e
Reviewed-on: https://code.wireshark.org/review/2187
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-12 21:24:14 +00:00
Guy Harris a972e8f2b3 Try to fix a used-but-not-set warning.
I'm guessing that GCC is complaining because "device" isn't guaranteed
to be set (if there are no interfaces, the body of the loop will never
be executed), so do with the list of link-layer header types what's done
for the buffer size and snapshot length.

But should the column-setting code be executed if the interface isn't
found?

Change-Id: I8c365a482b8af44cdd1c1a7f41ca611141387c86
Reviewed-on: https://code.wireshark.org/review/2180
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-12 18:55:17 +00:00
Guy Harris c246513dba Don't check "&(device.if_info)" to see if it's null.
It would be null only with a horribly buggy C implementation.

Change-Id: I880747e9993a8b087d2b177ee0bed63644ecd646
Reviewed-on: https://code.wireshark.org/review/2179
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-12 18:29:24 +00:00
Peter Harris 1dead2b38c X11: Update generated dissector
Change-Id: Id3fbc64b4d797d50e935223c40c5c2321a1c8198
Signed-off-by: Peter Harris <pharris@opentext.com>
Reviewed-on: https://code.wireshark.org/review/2148
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-12 15:19:39 +00:00
Peter Harris 515b78c292 X11: Support XCB's new <pad align='n' />
Change-Id: I0a45380ffcfb3be7e3190d0875626ed0fe046c4e
Signed-off-by: Peter Harris <pharris@opentext.com>
Reviewed-on: https://code.wireshark.org/review/2147
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-12 13:36:21 +00:00
Martin Mathieson d17aa36833 Fix a regression, as -1 can no longer means until the end of the tvb
Change-Id: I2bbb9c5f62984f0365a3cad6b60401ee70418e74
Reviewed-on: https://code.wireshark.org/review/2158
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-06-12 12:45:44 +00:00
Guy Harris 5a49913c49 Make sure image/expert_ok.png ends up in a source tarball.
Change-Id: I7ad2b53d706d953d443ef935f1edb84c46d7fa16
Reviewed-on: https://code.wireshark.org/review/2156
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-12 09:15:58 +00:00
Irene Ruengeler df8c4bf264 Capture Interfaces Dialog:
- allow to change the interface options in the table
- save the options to preferences when the dialog is left
- add a field for setting a capture filter for all selected interfaces
- add a "Compile BPF" button and a window to show the compiled filter output
- try to address Alexis' and Evan's comments

Change-Id: Ic1272e29183ec80e2d2f4b3e494c79dabe2c3b6f
Reviewed-on: https://code.wireshark.org/review/1946
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-12 05:54:59 +00:00
Martin Kaiser 428c5b9448 function to parse the usbpcap pseudo-header
and fill the conversation struct

Change-Id: I8917fae39458568ab980ece1e819cb83719e3baf
Reviewed-on: https://code.wireshark.org/review/2077
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-12 00:58:03 +00:00
Sean O. Stalley 8ff7729ee8 Fix USB Class-Specific Control URB requests
Fixes Bug 10165. (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10165)

The condition that caused the bug is a non-standard URB where the
length of the tvb is less than the reported length. It will pass the
tvb_reported_length_remaining() != 0, but fail the assertion in
tvb_composite_append() (which checks the length value, not reported_length).

This condition appears in a few other locations (where the if statement checks
reported_length, but the code inside the if statement uses the length value).
This patch also fixes them.

Also removes depricated calls to tvb_length() & tvb_length_remaining()
with tvb_captured_length() & tvb_captured_length_remaining(), respectively.

Change-Id: Ie8d50cfb24af62558c905c23c37ec603ce76366f
Reviewed-on: https://code.wireshark.org/review/2011
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-12 00:32:21 +00:00
Guy Harris 95065da33d Some more SVN->Git.
Change-Id: Iba5274ab5e653a0a3c0a56e62ee168ac957daf27
Reviewed-on: https://code.wireshark.org/review/2152
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-11 23:57:23 +00:00
Guy Harris 7db2135069 A Subversion->Git change that we missed.
Change-Id: I651d25cb0a59f9ec350d4c482062077833c8f278
Reviewed-on: https://code.wireshark.org/review/2149
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-11 23:50:09 +00:00
Vladimir Kondratiev 97a46ff515 Fix bit fields definition in the "DMG Capability" IE
Bits in the byte was counted wrong direction;
bit0 should be LSB (0x01) and bit7 - MSB (0x80)
Also, all fields are interpreted as little-endian

Change-Id: I3485e8743a156e2e8cb84e726045211f1d332598
Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Reviewed-on: https://code.wireshark.org/review/2138
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-06-11 18:33:27 +00:00
Anish Bhatt 4a60a30462 Rename temp variables to a more human readable form
Change-Id: Idafe97df6be71d885203e2e3426fdb6a133862c4
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/2140
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-11 17:42:25 +00:00
Anish Bhatt 508d16b037 Use offset instead of tempOffset, return offset instead of calculating (len + n) where possible
Change-Id: I91ef4ec59698903cb2a7be00e7e0ece478fc26a8
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/2139
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-11 17:41:22 +00:00
AndersBroman 803d47d49e opcua_simpletypes.c:94:12: error: static declaration of 'hf_opcua_NamespaceUri' follows non-static declaration
Change-Id: I2cae9691408c22a64144f5482cc536a5dc88ec6c
Reviewed-on: https://code.wireshark.org/review/2135
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-11 14:27:11 +00:00
Hannes Mezger 5e67c45160 Remove unused array length fields
The NoOf... fields are not used at all in the dissector.

Change-Id: I1f20a9992eab5d47c7e0ad34dabeaed07efa4a80
Reviewed-on: https://code.wireshark.org/review/2130
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-11 13:57:49 +00:00
Hannes Mezger abf1b5ead7 Regenerate all sources using latest OPC UA specification
- HistoryUpdateEventResult has been removed
- Fixes two enums
- Removes unused identifier defines

Change-Id: I39c65c1eca1701b60dfaa3541cd7a5d1b479fb9b
Reviewed-on: https://code.wireshark.org/review/2129
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-11 13:57:26 +00:00
Hannes Mezger 2ab3b2ac2b Improve display of Open/CloseSecureChannel requests and responses
- Return the ServiceId of the service calls for displaying if it's a request or response
- Add the missing parsing code for CloseSecureChannel, some fields were missing

Change-Id: Id9b1e1986e222a77ad979fb615adc6ac62a4ced8
Reviewed-on: https://code.wireshark.org/review/2125
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-11 12:59:48 +00:00
Hannes Mezger baa5888788 Move ServiceFault from ComplexType- to ServiceParser
ServiceFaults are always sent as a service response and never as value, this moves the parsing code to the correct location.

Change-Id: Ida9cb561aa40fcbfc3c0429aed732d108b295138
Reviewed-on: https://code.wireshark.org/review/2124
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-11 12:59:08 +00:00
Hannes Mezger fabee432de Unify displaying of NodeId
Adds hf_register_info for all possible NodeId identifier types for unified displaying.

Change-Id: Ic7a8077a32f435d5acfb1a956117d21a0b51b43b
Reviewed-on: https://code.wireshark.org/review/2123
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-11 12:47:18 +00:00
AndersBroman af687c581f Fix
Warn Dissector bug, protocol LPP, in packet 1: proto.c:3403:
 failed assertion "DISSECTOR_ASSERT_NOT_REACHED"
redifine FT of NavModel-GLONASS-ECEF/gloP1

Change-Id: Id865c39b8d15528417075f9e7ed0378704aa98dc
Reviewed-on: https://code.wireshark.org/review/2132
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-11 12:30:06 +00:00
Hannes Mezger e2ae387d9c Fix NodeId and ExpandedNodeId encoding mask display
There are no 'URI' NodeIds, removed this option and changed GUID/Opaque to their correct values as stated in the UA specification.

Change-Id: Ibf9afdbd72f8ad336f5eb83ece5adbcce51e8365
Reviewed-on: https://code.wireshark.org/review/2122
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-11 12:15:39 +00:00
Hannes Mezger ddc275c562 Unify variable and identifier names according to the UA specification
- Rename Uri to NamespaceUri for clarity
- Correct NsId to NsIndex
- ByteString NodeIds are called 'Opaque'

Change-Id: I622d408ef9e19a2a899906b4127bae497735d402
Reviewed-on: https://code.wireshark.org/review/2121
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-11 12:14:49 +00:00
Hannes Mezger 6ddf081f64 Fix switch case on ExpandedNodeId encoding mask
Only the bits 0-3 are significant for the type of the NodeId contained in the ExpandedNodeId.
The other bits are a mask telling if a NamespaceUri and/or a ServerIndex is set.

Change-Id: I17948524f8a1bf6cb9dffc5f66ec5cddee580bcd
Reviewed-on: https://code.wireshark.org/review/2120
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-11 12:14:36 +00:00
Anish Bhatt d8a21c8f8e Use expert info for Invalid length/type where possible, other minor fixes
Change-Id: I4a0421bf918439261f31f4bfc2cb5519b38f1711
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/2118
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-11 12:05:21 +00:00
Anish Bhatt 3fcd016029 Fix bug in dissect_lldp_port_id, support all port id subtypes
Change-Id: I8b44e0d55701ba5d583e3e734e19d4d2aa024b25
Reviewed-on: https://code.wireshark.org/review/2049
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-11 00:58:10 +00:00
AndersBroman b6f8aea069 See if this version works better on OSX 10.5
AX_EXT has been extended to deal with a situation where
AX_GCC_X86_CPUID(0x00000001) returns 'unknown'. Further details can be found
at <http://savannah.gnu.org/patch/?8321>.

Change-Id: I0b8173789ddfc1670e9896408f5d022c30a1d0a9
Reviewed-on: https://code.wireshark.org/review/2112
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-10 16:08:06 +00:00
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