Commit graph

49873 commits

Author SHA1 Message Date
Evan Huus
389423aaaa Replace pinfo->layer_names as a string with pinfo->layers as a wmem_list of
protocol IDs. This is substantially more efficient, which means we can build it
all the time rather than only if tree (in my benchmarks the extra time taken is
not large enough to be statistically significant even over tens of thousands of
packets).

This fixes what was probably a bug in btobex that relied on layer_names for
non-tree dissection. It also enables a much simpler fix for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9303

svn path=/trunk/; revision=53089
2013-11-05 17:48:48 +00:00
Evan Huus
d04079eedc Expose wmem_list_remove_frame to make it efficient to do pop operations as
wmem_list_remove_frame(wmem_list_tail())

svn path=/trunk/; revision=53088
2013-11-05 17:28:19 +00:00
Evan Huus
1051504005 From Michael Labedzki, call data dissector instead if handle is NULL.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9379

svn path=/trunk/; revision=53087
2013-11-05 13:17:55 +00:00
Alexis La Goutte
bb362a8059 From J. Bruce Fields via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9383
Incorrect FATTR4_SECURITY_LABEL value

We got this constant wrong.
See http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion2-dot-x-19 and http://marc.info/?l=linux-nfs&m=138359828516861&w=2

svn path=/trunk/; revision=53086
2013-11-05 08:40:55 +00:00
Bill Meier
005f86cde7 Change "4 space tabs" indentation to use "4 spaces";
Clean up alignment of various structs & etc.

svn path=/trunk/; revision=53085
2013-11-05 02:03:18 +00:00
Bill Meier
e656eea99e Declare many value_string_arrays not used elsewhere as static;
IOW: Explicitly declare as global only those value_string_arrays
     used elsewhere.

svn path=/trunk/; revision=53084
2013-11-04 20:57:01 +00:00
Jörg Mayer
de057472f3 - Reenable /LARGEADDRESSAWARE on Windows platform
- Add a CMAKE_BUILD_TYPE default of RelWithDebInfo (Release with debug info),
  print the choice.
  This will pick up the previously used flags LINK_FLAGS and
  CMAKE_C_FLAGS and CMAKE_CXX_FLAGS but also pick up the variables postfixed
  by _<build-type>
- Remove Optimization (-O2) and debug (-g) flags from list of default flags
  as they are now automagically set by CMAKE_C_FLAGS_RELWITHDEBINFO etc.
  NOTE: This also needs to be done for the Windows flags, I just don't have
  a Win system to test on right now.


svn path=/trunk/; revision=53083
2013-11-04 20:29:29 +00:00
Bill Meier
629aa84ea1 '#if 0' numerous unused value string arrays.
svn path=/trunk/; revision=53082
2013-11-04 20:22:54 +00:00
Bill Meier
85d4d46591 Promote/update the entry for robionekenobi.
svn path=/trunk/; revision=53081
2013-11-04 20:09:13 +00:00
Anders Broman
996b07a814 Print if_dropped
svn path=/trunk/; revision=53080
2013-11-04 19:38:20 +00:00
Anders Broman
7bd7c70907 From Zoltán Lajos Kis:
tidying some stuff.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283

svn path=/trunk/; revision=53079
2013-11-04 19:35:00 +00:00
Bill Meier
0243d69057 From robionekenobi: Enhancement of the packet-mq dissector (WMQ 7.1-7.5)
Add more detail for SPI Open LPOO Structure
 Add more int_to_vals for INQ_Q_MGR reply
 Add more display detail for encoding value
 Some fix and display correction

Note: The patch used was the *original* patch submitted (plus some fixes by me).

That is: (https://bugs.wireshark.org/bugzilla/attachment.cgi?id=11962)
         plus my fixes

See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9367 and comments for
details.

From me:
- Fix bug which resulted in a macro expansion fail on GCC
- Fix a -Wshadow error in packet-mq-pcf.c


svn path=/trunk/; revision=53078
2013-11-04 18:55:06 +00:00
Martin Mathieson
7c1ab97ca4 Don't show the channel information twice in the protocol root proto_item
svn path=/trunk/; revision=53077
2013-11-04 15:10:58 +00:00
Evan Huus
8a0ef07000 Effectively remove the tree memory pool and port some of its behaviour to the
pinfo memory pool, they have exactly the same scope. Simplification and minor
performance win (one GHashTable we longer have to create/destroy on every
packet).

svn path=/trunk/; revision=53076
2013-11-04 14:12:59 +00:00
Jörg Mayer
ca7923f7d5 Revert r53073, by now the vast majority of dissector do declare the
registration functions and if we want to standardize it makes more
sense to fix the remaining ones.

svn path=/trunk/; revision=53075
2013-11-04 10:07:33 +00:00
Alexis La Goutte
55e3b53563 From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9373
ieee80211: Decode Radio Measurements (Action Frames)

The length of the fixed fields are dependent on the radio measurement
action. Before this patch, fields following the action code were
ignored, leading to wrong decoding results. This patch adds recognition
for the Radio Measurement action management frames as specified in
IEEE Std 802.11-2012.

From me:
* Rename some hf (Add ff_ in name)
* Link Margin and Transmit Power are signed
* Use always proto_tree_add_item (replace proto_tree_add_text)

svn path=/trunk/; revision=53074
2013-11-04 08:59:48 +00:00
Jörg Mayer
f8e232e8ba Remove forward declarations of registration functions.
svn path=/trunk/; revision=53073
2013-11-03 22:12:48 +00:00
Pascal Quantin
b1b84826f6 Please checkAPIs.pl script
svn path=/trunk/; revision=53072
2013-11-03 19:36:36 +00:00
Pascal Quantin
ea0a85c230 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9031 :
SIP contact-param parsing fails in case the last parameter includes a quoted string

svn path=/trunk/; revision=53071
2013-11-03 18:07:46 +00:00
Chris Maynard
f1a3e8634f Try to clarify the documentation for tvb_length_remaining() and tvb_reported_length_remaining() based on Jörg's recommendation from bug 9263.
svn path=/trunk/; revision=53070
2013-11-03 18:02:17 +00:00
Anders Broman
6de593197e NULL terminate a value_str
svn path=/trunk/; revision=53069
2013-11-03 17:04:13 +00:00
Anders Broman
3f9ff99ca7 From Zoltán Lajos Kis:
dissect the rest of the messages.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283

svn path=/trunk/; revision=53068
2013-11-03 16:59:11 +00:00
Michael Mann
a0062fd684 Sync remaining patches with latest SAMBA PIDL source per http://www.wireshark.org/lists/wireshark-dev/201310/msg00217.html
0010-frsrpc-Regenerate-frsrpc-due-to-changes-in-the-pidl-.patch
0016-Regenerate-the-dnserver.patch

are now integrated, but modified to compile on Windows.  I suspect the PIDL generators may need to be updated to support this, otherwise regeneration will break the build on Windows again.

svn path=/trunk/; revision=53067
2013-11-03 16:17:35 +00:00
Michael Mann
65b6a98b4a Bluetooth: AVDTP: Add support for Content Protection type SCMS-T (and some minor cleanup). Bug 7893 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893)
From Michal Labedzki

svn path=/trunk/; revision=53065
2013-11-03 15:25:52 +00:00
Gerald Combs
5c93974dab [Automatic manuf, services and enterprise-numbers update for 2013-11-03]
svn path=/trunk/; revision=53063
2013-11-03 15:03:48 +00:00
Evan Huus
e960c882f8 Fix what appears to be an off-by-one error in the IMAP dissector, causing
valgrind errors with the capture from
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9263

svn path=/trunk/; revision=53062
2013-11-03 14:22:53 +00:00
Michael Mann
149de99d68 Have rose_ctx_t passed into subdissectors instead of using pinfo->private_data.
svn path=/trunk/; revision=53061
2013-11-03 12:57:58 +00:00
Jörg Mayer
0dc80637da Fix autoconf broken by last commit.
svn path=/trunk/; revision=53060
2013-11-03 12:39:50 +00:00
Jörg Mayer
117a59d7a2 Pass the name of the sed executable as an explicit argurment to
runlex.sh (like it is done with LEX already). May fix a problem
on Windows with cmake.

svn path=/trunk/; revision=53059
2013-11-03 12:22:39 +00:00
Alexis La Goutte
7054372c26 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=53058
2013-11-03 11:19:10 +00:00
Alexis La Goutte
95d4c4ac88 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=53057
2013-11-03 11:18:54 +00:00
Alexis La Goutte
6166208f12 Make Mac OS X buildbot happy (Missing _U_)
svn path=/trunk/; revision=53056
2013-11-03 10:56:55 +00:00
Michael Mann
60e3e52a53 Have asn1_ctx_t passed into the "h245.gef.name" and "h245.gef.content" subdissectors instead of using pinfo->private_data.
svn path=/trunk/; revision=53055
2013-11-03 02:45:22 +00:00
Michael Mann
3b7f6f0e5f Partially revert r53052 because hf_ fields aren't defined (or used)
svn path=/trunk/; revision=53054
2013-11-02 21:06:07 +00:00
Evan Huus
cc19763433 Replace glib with wmem when constructing dynamic RADIUS fields. Fixes the memory
leaks reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9370

svn path=/trunk/; revision=53053
2013-11-02 20:16:54 +00:00
Michael Mann
f1e8e58ec5 Bluetooth: minor improvements. Bug 7893 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893)
1. AVDTP: Fix double decoded stream
2. AVDTP: Use items for logical block objects
3. HCI_USB use handoffed dissector handles instead of find_dissector() 

From Michal Labedzki

svn path=/trunk/; revision=53052
2013-11-02 20:10:51 +00:00
Michael Mann
a267501b82 Bluetooth: Use dissector data instead of pinfo->private_data. Bug 7893 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893)
From Michal Labedzki

svn path=/trunk/; revision=53051
2013-11-02 19:20:04 +00:00
Gerald Combs
2c85824a46 From bkpsu via bug 9374:
Minor grammar error in the NSIS installer script messageBox for
"isRunning" section. "one is associated" should be changed to "one of
its associated"

svn path=/trunk/; revision=53050
2013-11-02 16:17:23 +00:00
Michael Mann
02a8391535 Require dissector_try_string to pass a data parameter to its subdissectors. There weren't that many calls, so might as well modify the function than create a need for dissector_try_string_new.
svn path=/trunk/; revision=53049
2013-11-02 15:52:25 +00:00
Alexis La Goutte
925cba4e91 Fix build (missing some _U_)
svn path=/trunk/; revision=53048
2013-11-02 13:31:24 +00:00
Alexis La Goutte
c09657cd7f Fix warning found by fix-encodings-arg tool
svn path=/trunk/; revision=53047
2013-11-02 13:16:19 +00:00
Alexis La Goutte
ea54dd103c Make checkAPIs Happy (Missing const for value_string)
svn path=/trunk/; revision=53046
2013-11-02 13:12:56 +00:00
Michael Mann
872f3efeca Prep a few more dissectors to receive their string data through dissector data.
svn path=/trunk/; revision=53045
2013-11-02 13:05:58 +00:00
Michael Mann
26105b7739 get tcpinfo from dissector data, not pinfo->private_data
svn path=/trunk/; revision=53044
2013-11-02 13:02:55 +00:00
Anders Broman
870346a66e From Zoltán Lajos Kis:
dissect multipart request and reply messages

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283

svn path=/trunk/; revision=53043
2013-11-02 10:21:52 +00:00
Michael Mann
8dc0db8d72 Allow json dissector to receive a string through dissector data and give dissector data priority over pinfo->private_data (to discourage it's use)
svn path=/trunk/; revision=53042
2013-11-02 02:12:36 +00:00
Michael Mann
ac09e775c9 Allow text-data dissector to receive a string through dissector data and give dissector data priority over pinfo->private_data (to discourage it's use)
svn path=/trunk/; revision=53041
2013-11-02 01:36:53 +00:00
Michael Mann
f6934a4ae1 Remove rpc_defrag.h
Move the #defines to packet-rpc.h and pull the functions into packet-rpc.c since they aren't used by any dissectors.

svn path=/trunk/; revision=53040
2013-11-02 01:15:13 +00:00
Guy Harris
2f78757f42 libcap is UN*X-only; libnl is Linux-only.
svn path=/trunk/; revision=53039
2013-11-02 01:12:30 +00:00
Guy Harris
0a0af31375 Mark unused arguments.
svn path=/trunk/; revision=53038
2013-11-02 01:07:07 +00:00