Commit Graph

23480 Commits

Author SHA1 Message Date
Jakub Zawadzki b4be2fa489 tvbuff: use always ops->tvb_size
svn path=/trunk/; revision=53112
2013-11-06 20:22:28 +00:00
Jakub Zawadzki d54b3a74f6 tvbuff: cleanup, remove dead code.
ensure_contiguous() will throw exception but won't return NULL.

svn path=/trunk/; revision=53111
2013-11-06 19:03:14 +00:00
Michael Mann dc53bb7648 Bluetooth: OBEX: Storing info about previous protocol is not needed anymore. Bug 9303 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9303)
From Michal Labedzki.

svn path=/trunk/; revision=53110
2013-11-06 18:40:29 +00:00
Evan Huus 5efc340771 Mark more unused parameters.
svn path=/trunk/; revision=53109
2013-11-06 17:52:11 +00:00
Michael Mann 55922b6bac Fix for checking RTPS sub message length. Bug 9378 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9378)
From Steve Osselton

#BACKPORT(1.10)

svn path=/trunk/; revision=53107
2013-11-06 16:51:19 +00:00
Michael Mann c278a0ac0a SID28 is special kind of SID where no matter what it uses 28 bytes it's used in the DRS protocol. Bug 9337 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9337)
From Matthieu Patou

svn path=/trunk/; revision=53106
2013-11-06 16:30:14 +00:00
Bill Meier a4b4c92a45 Add _U_ to a function parameter to fix a compiler warning
svn path=/trunk/; revision=53105
2013-11-06 16:00:11 +00:00
Bill Meier 53fabc2f8a Add _U_ to a few function parameters to fix compiler warnings
Note: I hope the following is not indicative of something wrong with the code.
      (I've just marked di as _U_).

packet-dcerpc-netlogon.c: In function 'dissect_secchan_nl_auth_message':
packet-dcerpc-netlogon.c:7582:75: error: unused parameter 'di' [-Werror=unused-parameter]
                                            proto_tree *tree, dcerpc_info *di, guint8 *drep)


svn path=/trunk/; revision=53104
2013-11-06 15:54:24 +00:00
Bill Meier 0f61417ca4 Add _U_ to a function parameter to fix a compiler warning.
svn path=/trunk/; revision=53103
2013-11-06 15:46:36 +00:00
Bill Meier 7e9091e8ff Add _U_ to a few function parameters to fix compiler warnings
svn path=/trunk/; revision=53102
2013-11-06 15:43:41 +00:00
Bill Meier c4efddd7d2 From robionekenobi: "packet-mq adapted"
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9367
      especially comments 8,9,12,13

Patch: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=12014

From me: Remove several uses of DEF_VALSEXT macro
         since the above patch removed the definition.

(It seems that Microsoft C expands undefined macros as null;
 GCC complains).


svn path=/trunk/; revision=53101
2013-11-06 15:28:23 +00:00
Michael Mann 22760b2d2a Remove pinfo->private_data from DCERPC dissectors and instead have dcerpc_info* infomation be passed in as a function parameter. Bug 9387 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9387)
All "generated" source was manually modified (with the power of search/replace), but I believe the "source input" files have been adjusted (checked into revs 53098 and 53099) to reflect the necessary changes (with possible whitespace formatting differences).

The Microsoft compiler doesn't flag "unused function parameters", so I apologize in advance if I may have missed a few.  The "dcerpc_info* di" parameter is used in almost every function.

svn path=/trunk/; revision=53100
2013-11-06 14:31:29 +00:00
Michael Mann 440ac8370f Remove pinfo->private_data from DCERPC dissectors. Bug 9387 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9387)
This is the "Wireshark DCERPC" input file changes necessary to support removing pinfo->private_data from the DCERPC dissectors in favor of passing it through function parameters.  I didn't regenerate the dissector source, so this is just a "good faith" effort to mimic the manual changes.

svn path=/trunk/; revision=53099
2013-11-06 13:01:23 +00:00
Michael Mann 79cd3563fc Remove pinfo->private_data from DCERPC dissectors. Bug 9387 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9387)
This is the PIDL input file changes necessary to support removing pinfo->private_data from the DCERPC dissectors in favor of passing it through function parameters.  I didn't regenerate the dissector source, so this is just a "good faith" effort to mimic the manual changes.

svn path=/trunk/; revision=53098
2013-11-06 12:36:09 +00:00
Evan Huus 5f2c75e940 Add missing cast.
svn path=/trunk/; revision=53096
2013-11-05 22:58:50 +00:00
Michael Mann 5465c18a4b Remove DISSECTOR_ASSERT since private_data isn't being used anymore to transport tcp_info data.
svn path=/trunk/; revision=53093
2013-11-05 19:51:27 +00:00
Anders Broman f435f8c52c From Zoltán Lajos Kis:
display present bit for vlan oxm field 

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

svn path=/trunk/; revision=53092
2013-11-05 19:38:41 +00:00
Anders Broman 99b598baf1 From Zoltán Lajos Kis:
use tcp_dissect_pdus to properly dissect messages.

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

svn path=/trunk/; revision=53091
2013-11-05 19:36:09 +00:00
Michael Mann b6b78d69db In an effort to reduce the use of pinfo->private_data (and some true global variables), I converted the ASN.1 dissectors that use pinfo->private_data to exchange a SESSION_DATA_STRUCTURE to instead only exchange it in the context of ASN.1. This meant converting dissectors to the "new" style to pass the SESSION_DATA_STRUCTURE as well as providing a pointer to it in asn1_ctx_t.private_data. Yes, it's still "private data", but it's not used by all dissectors like pinfo->private data is.
svn path=/trunk/; revision=53090
2013-11-05 18:47:26 +00:00
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
Bill Meier 629aa84ea1 '#if 0' numerous unused value string arrays.
svn path=/trunk/; revision=53082
2013-11-04 20:22:54 +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
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
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