Commit Graph

23429 Commits

Author SHA1 Message Date
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