Commit graph

23524 commits

Author SHA1 Message Date
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
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
0a0af31375 Mark unused arguments.
svn path=/trunk/; revision=53038
2013-11-02 01:07:07 +00:00
Guy Harris
4302292936 You have to cast void pointers to another type in C++; implicit
conversions aren't valid.

svn path=/trunk/; revision=53037
2013-11-02 00:50:24 +00:00
Michael Mann
f8f1f48371 Pass struct tcpinfo into all TCP subdissectors instead of through pinfo->private_data.
svn path=/trunk/; revision=53036
2013-11-02 00:36:30 +00:00
Michael Mann
b6484432aa Allow try_conversation_dissector() to pass data to subdissectors.
svn path=/trunk/; revision=53035
2013-11-01 23:45:10 +00:00
Bill Meier
953815dd11 Revert SVN #53027: It gives compile warning on GCC (at least).
(No time right now to figure the problem out).

 CC       libdissectors_la-packet-mq-base.lo
In file included from packet-mq-base.c:32:0:
packet-mq.h:42:54: error: expected '=', ',', ';', 'asm' or '__attribute__' before '_ext'
 #define DEF_VALSEXT(A)  value_string_ext GET_VALSV(A)_ext = VALUE_STRING_EXT_INIT(GET_VALSV(A))
                                                      ^
packet-mq-base.c:1301:1: note: in expansion of macro 'DEF_VALSEXT'
 DEF_VALSEXT(selector);
 ^
packet-mq.h:42:54: error: expected '=', ',', ';', 'asm' or '__attribute__' before '_ext'
 #define DEF_VALSEXT(A)  value_string_ext GET_VALSV(A)_ext = VALUE_STRING_EXT_INIT(GET_VALSV(A))
                                                      ^
packet-mq-base.c:1495:1: note: in expansion of macro 'DEF_VALSEXT'
 DEF_VALSEXT(mqcmd);
 ^


svn path=/trunk/; revision=53033
2013-11-01 21:39:23 +00:00
Bill Meier
02f2b76bdd 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

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


svn path=/trunk/; revision=53027
2013-11-01 20:13:15 +00:00
Michael Mann
9707e464ad General dissector cleanup.
The original intent was to just deal with struct tcpinfo data, but after finding it was unnecessary (and somewhat limited dissection in COL_INFO), I took the cleanup a little farther. Sample traces from wiki and bug 5956 were very helpful in proving I didn't break anything.

svn path=/trunk/; revision=53025
2013-11-01 18:29:29 +00:00
Pascal Quantin
9589727b3a From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9360 :
Fix IRC response command filter

svn path=/trunk/; revision=53016
2013-11-01 15:48:57 +00:00
Anders Broman
39515def5f Increase PROTO_PRE_ALLOC_HF_FIELDS_MEM
svn path=/trunk/; revision=53009
2013-10-31 21:26:27 +00:00
Chris Maynard
a95614a79c Make declarations consistent, fix typos, remove tabs, use consistent indentation, wrap text at column 80, add modelines.
svn path=/trunk/; revision=53004
2013-10-31 17:30:22 +00:00
Michael Mann
35dd14348e USB/PN532: Fix dissector to use new dissector *data instead of private_data. Bug 9333 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333)
From Michal Labedzki

svn path=/trunk/; revision=53003
2013-10-31 15:02:50 +00:00
Michael Mann
8baa713605 Bluetooth: SDP: Recognize attributes by record handle or by UUIDs in request. Bug 9327 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327)
From Michal Labedzki

svn path=/trunk/; revision=53002
2013-10-31 14:35:22 +00:00
Michael Mann
6aaf3aa4f0 sb3_task_id_t is not used in any existing dissector and can't be passed to any other (third-party) dissectors, so don't have it pollute pinfo->private_data.
Also, call_dissector shouldn't be under a tree.

svn path=/trunk/; revision=53001
2013-10-31 14:12:53 +00:00
Martin Mathieson
8f6b8276e7 Test was the wrong way around
svn path=/trunk/; revision=53000
2013-10-31 13:58:57 +00:00
Evan Huus
68b5888453 From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9345
openSAFETY: Changes for better dissection of additional SADR and SN Fail
messages

svn path=/trunk/; revision=52998
2013-10-31 01:49:10 +00:00
Michael Mann
c0fcebb07a Add a data parameter to call_ber_oid_callback to be able to pass data to subdissectors found with dissector_try_string_new.
The intention is to aid in the removal of pinfo->private_data use as well as static global variables in a dissector.  For now, all calls to call_ber_oid_callback have the data parameter set to NULL.

svn path=/trunk/; revision=52994
2013-10-31 00:57:03 +00:00
Martin Kaiser
b84fee4fc7 BAT has a Bouquet ID, no Service ID
svn path=/trunk/; revision=52987
2013-10-30 22:34:16 +00:00
Martin Kaiser
63325bdab8 add one more private data specifier
svn path=/trunk/; revision=52986
2013-10-30 22:18:55 +00:00
Chris Maynard
3e2863e6b8 Remove an extraneous semicolon.
svn path=/trunk/; revision=52985
2013-10-30 18:16:22 +00:00
Martin Mathieson
904971302b Initialise current_security to NULL, to avoid possibly using uninitialised
svn path=/trunk/; revision=52983
2013-10-30 13:45:28 +00:00
Martin Mathieson
7847580ac9 Get rid of value_strings that appear to be a throwback to when ROHC appeared in this dissector
svn path=/trunk/; revision=52982
2013-10-30 13:18:15 +00:00
Martin Mathieson
97070acc42 Don't call RRC dissector if should be ciphered. Take care to allow SecurityModeComplete to be shown though (i.e. the next UL frame after security is configured)
svn path=/trunk/; revision=52981
2013-10-30 12:58:03 +00:00
Michael Mann
694bc6b763 Allow string-based dissector tables to pass data between dissectors.
svn path=/trunk/; revision=52980
2013-10-30 04:06:54 +00:00
Evan Huus
a3648730a6 Replace some proto_tree_add_string_format with proto_tree_add_item +
proto_tree_set_text - the string was not the important part, the formatting was.
We were passing the string directly from tvb_get_ptr, but this meant that if the
packet didn't contain a null-terminator we would run off the end. Since the
string comes straight from the packet, just let _add_item handle the length
calculations etc efficiently, and set the display later.

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

I'm a bit confused honestly why most of these are being set hidden after being
added and formatted, but at least there are no memory errors anymore.

svn path=/trunk/; revision=52979
2013-10-30 02:09:34 +00:00
Michael Mann
1c96e97f71 Update the ASN.1 generated dissectors that were missed as part of the patches in bug 9344 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9344)
svn path=/trunk/; revision=52978
2013-10-30 02:02:08 +00:00
Evan Huus
8f5bdaa54b When adding an entry to a dissector string table, take a copy of the pattern
string (and pass g_free to g_hash_table_new_full to free it).

This means callers don't have to worry about the scope of the memory they pass
in, and fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9296

svn path=/trunk/; revision=52977
2013-10-30 01:42:11 +00:00
Anders Broman
1e6927dbb3 Fix proto.c:4498: warning: 'compare_filter_name' defined but not used
svn path=/trunk/; revision=52975
2013-10-29 23:18:26 +00:00
Anders Broman
c864a20398 Optimize proto_get_id_by_filter_name() by using the existing hastable for proto_filter_names.
svn path=/trunk/; revision=52972
2013-10-29 22:17:18 +00:00
Martin Mathieson
a7505b3027 Mark an unused parameter as such
svn path=/trunk/; revision=52971
2013-10-29 22:16:32 +00:00
Martin Kaiser
733713b4b1 if pointer==0, the section starts immediately
don't add an empty fragment to the list

this should fix the asserts reported in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9325
and
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8352

svn path=/trunk/; revision=52969
2013-10-29 21:50:21 +00:00
Martin Kaiser
41182561dd separate function for dissecting the adaptation field
svn path=/trunk/; revision=52967
2013-10-29 21:40:09 +00:00
Jeff Morriss
de0fda9436 Revert r52905 and r52908: they're causing plenty of fuzz failures.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9323 is tracking the fix.

svn path=/trunk/; revision=52966
2013-10-29 21:18:22 +00:00
Jeff Morriss
f37469da6d Remove no-longer-used parameter.
svn path=/trunk/; revision=52965
2013-10-29 21:16:50 +00:00
Michael Mann
bd683d5ee1 Pass T.38 data to subdissectors directly instead of using pinfo->private_data.
svn path=/trunk/; revision=52964
2013-10-29 21:12:50 +00:00
Michael Mann
773359cf5f Remove use of pinfo->private_data
svn path=/trunk/; revision=52963
2013-10-29 20:04:50 +00:00
Martin Mathieson
b93a567439 Add casts to results of g_hash_table_lookup() calls
svn path=/trunk/; revision=52955
2013-10-29 17:57:56 +00:00
Martin Mathieson
304b96c87b Show security config settings in each PDCP PDU. Don't call IP dissector for ciphered userplane frames. SRB messages are more complicated - need to keep track of SecurityModeRequest and SecurityModeResponse as they are not ciphered
svn path=/trunk/; revision=52953
2013-10-29 17:46:50 +00:00
Michael Mann
86951290ea Adjust when dissect_diameter_avp loop is called to avoid access violations.
from Lukasz Markowski

svn path=/trunk/; revision=52951
2013-10-29 15:18:05 +00:00
Bill Meier
1b55ee144e Whitespace fixes: Replace some tabs by spaces & etc
svn path=/trunk/; revision=52950
2013-10-29 15:00:32 +00:00
Jeff Morriss
37a66d9e0b From Marko Hrastovec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9347 :
Asterix dissector had two #if 0 ... #endif blocks because it obviously did not
compile on some systems.

Blocks were created because of mistyped variable names and variable not used
warning/error.

The errors were corrected.

svn path=/trunk/; revision=52949
2013-10-29 14:48:08 +00:00
Bill Meier
0ad98563a2 From didier gautheron: remove redundant or use faster col_xxx functions
- when the text parameter is constant col_add_str() and col_set_str() are equivalent but col_set_str() is faster.
- same for  replace col_append_fstr and col_append_str
- remove col_clear() when it's redundant:
    + before a col_set/col_add if the dissector can't throw an exception.
- replace col_append() after a col_clear() with faster col_add... or col_set

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


svn path=/trunk/; revision=52948
2013-10-29 14:09:20 +00:00
Martin Mathieson
86c145ecb3 Add a cast to try to fix OSX buildbot
svn path=/trunk/; revision=52947
2013-10-29 14:08:19 +00:00
Martin Mathieson
66d64c686e Pass security command details (integrity and ciphering algorithms) to PDCP (which doesn't yet do much with them)
svn path=/trunk/; revision=52946
2013-10-29 13:49:14 +00:00
Gerald Combs
ba49d9bcf0 Revert part of 52896 and (for now) all of 52935. As Jeff pointed out,
the PortableApps version relies on U3_-prefixed environment variables.

svn path=/trunk/; revision=52941
2013-10-29 04:05:27 +00:00
Jeff Morriss
58d01512b1 Make it so out-of-tree builds (autofoo and cmake) have access to the various
data files (diameter/*, COPYING, manuf) when running *shark from the
build directory.

Do this by passing in the top-level source directory as a compile-time
definition (unfortunately this has to be in the top-level Makefile too because
some programs link directly with epan/filesystem.c).

The plugins dir is no longer below the datafile directory but rather the
progfile directory (if we have one).  Handle the special case of AUTHORS-SHORT
(a data file but a generated one) by checking the file name before building
the path.

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

svn path=/trunk/; revision=52940
2013-10-29 02:28:16 +00:00
Michael Mann
e15afadb11 Have GTPv2 pass its "instance ID" to "private extension" subdissectors rather than use pinfo->private_data. There are no "private extension" subdissectors in the Wireshark source, so I assume it's all done by third-party plugins. They must now update their dissectors to get the "instance ID" from the dissector data parameter.
svn path=/trunk/; revision=52938
2013-10-29 00:25:57 +00:00