Commit Graph

53427 Commits

Author SHA1 Message Date
Michael Mann dc4d3706a8 packet-ipmi-se.c : proto_tree_add_text -> something filterable.
Also did some minor cleanup noticed while doing the filter conversion

Change-Id: Iea61b395c0eeb6fbcaac4c09964da2cb3cdccda5
Reviewed-on: https://code.wireshark.org/review/2184
Reviewed-by: Dmitry Bazhenov <dima_b@pigeonpoint.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-15 12:18:54 +00:00
Michael Mann e9dea8542b acknowledge BASE_RANGE_STRING
Change-Id: I3e899f79a3d58b8a2e72b88253a7e9ec51a314b5
Reviewed-on: https://code.wireshark.org/review/2222
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-15 03:18:14 +00:00
Joerg Mayer 4c261cf6a0 Policy CMP020 was being set twice. Remove my original clumsy implementation.
Set CMP0015 to NEW

Change-Id: Idea76f365f27e59eb6f56c7edec6d96224668c0d
Reviewed-on: https://code.wireshark.org/review/2219
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-14 14:34:22 +00:00
Dario Lombardo d4c6b2a4bb Added monlist support
Change-Id: Ia96bfb71449624ff75c694080fef30d57300b30d
Bug: 10174
Reviewed-on: https://code.wireshark.org/review/2131
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-14 14:27:08 +00:00
Martin Kaiser a1a5f6513d limit the scope of setup_tvb
Change-Id: Id3fc3f017c02c2df3b0578c28f187b106c3ad2ed
Reviewed-on: https://code.wireshark.org/review/2218
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-14 14:08:33 +00:00
Martin Kaiser 548d8aaf6c limit the scope of new_offset
Change-Id: Ib7f57696e40df770f5ae21ca066b27d28c13b57b
Reviewed-on: https://code.wireshark.org/review/2217
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-14 14:08:07 +00:00
Martin Kaiser 04b3118524 let the subfct fill win32_data_len
Change-Id: I39012cf467b27eb0be4c63bbc648a72f831d9068
Reviewed-on: https://code.wireshark.org/review/2216
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-14 14:07:44 +00:00
Martin Kaiser 7d5821f441 mark both transfer header and payload bytes for usbpcap iso packets
Change-Id: I2aadbde82b59ac0135230e5e370a9a3f81951365
Reviewed-on: https://code.wireshark.org/review/2215
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-14 14:07:16 +00:00
Martin Kaiser 4cb848800c more descriptive names for tree variables
Change-Id: I3eaa39784be9c00de834325dbfe9be4c545dcec7
Reviewed-on: https://code.wireshark.org/review/2214
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-14 14:06:43 +00:00
Martin Kaiser 29a25d25f7 rename tree_ti to urb_tree_ti
Change-Id: I2cda4c90de1be774d80cc2cd044ce2609a350c3e
Reviewed-on: https://code.wireshark.org/review/2213
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-14 14:06:17 +00:00
Martin Kaiser f1523a66fb remove unnecessary tree variable
Change-Id: Ie3eb6f91a99e82c9068074aa20e99ca5b2525882
Reviewed-on: https://code.wireshark.org/review/2212
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-14 14:05:49 +00:00
Martin Kaiser 2c9b7c54a3 simplify the detection of iso data start offset
Change-Id: Idcae64accda9d812fdeb21b71bed35601cfbcd89
Reviewed-on: https://code.wireshark.org/review/2211
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-14 14:05:23 +00:00
Martin Kaiser 09784a977c rename dissect_win32_usb_pseudo_header() to
dissect_usbpcap_buffer_packet_header()

only process the generic part of the usbpcap pseudo header in this
function, the transfer-specific parts are handled in
dissect_usb_common()

Change-Id: I1e97db9905ef1d14f04b53624e82feed7270912f
Reviewed-on: https://code.wireshark.org/review/2210
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-14 14:04:54 +00:00
Martin Kaiser 464c26399d dissect the usbpcap_buffer_control_header in dissect_usb_common()
Change-Id: I605908619b5d87c846810016c15cccfce9da858e
Reviewed-on: https://code.wireshark.org/review/2209
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-14 14:04:31 +00:00
Irene Ruengeler e14357032f Define INET6 for all platforms.
Show the addresses as a tooltip in capture interfaces.

Change-Id: I911784e09ed9479229a7d6f8a7f1476e2e1e6224
Reviewed-on: https://code.wireshark.org/review/2155
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-14 13:27:10 +00:00
Joerg Mayer 30480da87a Match for contents of WIRESHARK_SIMD_FLAGS only if non-empty
Change-Id: I99e15b237c74783b455461ce58ba32f1f8202990
Reviewed-on: https://code.wireshark.org/review/2208
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-14 08:49:51 +00:00
Joerg Mayer b70bb4654a Make it harder to miss that this is also about Win builds
Change-Id: Id4fd7a4672ed32dfcb57a4435a6b3e5cf2e5ca3d
Reviewed-on: https://code.wireshark.org/review/2207
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-14 07:38:23 +00:00
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