osmith/wireshark
1
0
Fork 0
forked from osmocom/wireshark
Code Pull requests Releases Wiki Activity
49873 commits 23 branches 0 tags 1.3 GiB
Commit graph

23524 commits

Author SHA1 Message Date
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
Gerald Combs
66558ef5a8 Remove some (but not all) U3 remnants. 
svn path=/trunk/; revision=52935
 2013-10-28 22:11:51 +00:00
Martin Kaiser
6ef5eb635c TABs -> spaces 
add editor modelines

svn path=/trunk/; revision=52934
 2013-10-28 21:49:56 +00:00
Bill Meier
fbba4415a6 FIX compiler warning: 
packet-gtp.c: In function 'dissect_gtp_common':
  packet-gtp.c:7838: warning: unused variable 'pd_save'

svn path=/trunk/; revision=52932
 2013-10-28 20:37:58 +00:00
Bill Meier
11934cfb11 From Ishraq Ibne Ashraf: Tinkerforge protocol dissector 
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9324

From me:

1. Move certain global vars to local storage in dissect_tfp_common()

2. Declare all remaining global vars as static;

3. Fix some bugs:
    - base58_encode() needed to be called before call to col_add_fstr()
    - display of UID string in tree was being truncated to 4 characters

4. Cleanup whitespace: use consistent indentation (tabs); remove trailing whitespace;

5. Add editor modelines




svn path=/trunk/; revision=52931
 2013-10-28 20:07:58 +00:00
Michael Mann
e68d15514b Add an extra parameter to gtp_match_response() so pinfo->private_data doesn't need to be used. 
svn path=/trunk/; revision=52930
 2013-10-28 20:00:04 +00:00
Michael Tüxen
9a2f5a2db2 Fix the compilation. 
I guess this is what is meant. Only compile tested...

svn path=/trunk/; revision=52928
 2013-10-28 18:59:33 +00:00
Anders Broman
3f0e0d5cbf Add an if(tree) and tweek col_add_fstr(). 
svn path=/trunk/; revision=52927
 2013-10-28 18:10:16 +00:00
Martin Kaiser
5587250676 make Pointer filterable 
svn path=/trunk/; revision=52925
 2013-10-28 17:16:43 +00:00
Martin Kaiser
8367a1acbd packed_analysis_data_t -> packet_analysis_data_t 
svn path=/trunk/; revision=52924
 2013-10-28 17:13:13 +00:00
Martin Kaiser
1a7a05ab55 correct typos 
svn path=/trunk/; revision=52923
 2013-10-28 17:10:09 +00:00
Martin Kaiser
8a2b9d87f3 remove unnecessary return; lines 
svn path=/trunk/; revision=52922
 2013-10-28 17:08:55 +00:00
Martin Kaiser
c89b9a2cdc initialize tree variables 
svn path=/trunk/; revision=52920
 2013-10-28 16:59:57 +00:00
Michael Mann
5de5fe6cb1 Pass diam_sub_dis_t directly to the subdissectors instead of using pinfo->private_data. 
svn path=/trunk/; revision=52919
 2013-10-28 15:59:26 +00:00
Martin Mathieson
63407767cf Remove accidentally-added private dissectors from Makefile 
svn path=/trunk/; revision=52918
 2013-10-28 14:26:13 +00:00
Martin Mathieson
bf004cced4 Comment changes only 
svn path=/trunk/; revision=52917
 2013-10-28 14:09:39 +00:00
Michael Mann
3b91b9586f Pass tcap_private into the dissectors that need it rather than use private_data. Not sure if value_ptr is the "proper" place to pass tcap_private "internally" within the TCAP dissector, but it gets away from (potential) private_data (ab)use. 
svn path=/trunk/; revision=52916
 2013-10-28 13:36:49 +00:00
Bill Meier
6697d30b72 Revert SVN #52914; 
OSX-10.6-x64 buildbot still givs an error
(At least we now know which line of code gives the error).

svn path=/trunk/; revision=52915
 2013-10-28 04:07:52 +00:00
Bill Meier
2c3ec284db From Shekhar Chandra: support for version 3.0 of netscaler packet wire format. 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9280

(Revised patch: let's see if this version compiles w/o error
                on all the buildbots)


svn path=/trunk/; revision=52914
 2013-10-28 03:16:31 +00:00
Evan Huus
20bbd49810 Use _add_item not _add_uint as pointed out by checkAPI 
svn path=/trunk/; revision=52912
 2013-10-28 00:43:18 +00:00
Michael Mann
3ead3a994a Remove "Cisco MDS-specific" fields from packet_info. 2 of the 3 fields were used strictly for columns that are considered "deprecated" and I think the third could be put in that category as well. 
I assume the column enumerations haven't already been removed because of legacy "indexing issues", but if I'm wrong, we should definitely remove the columns altogether.  Could also see renaming columns to DEPRECATED_[X].

svn path=/trunk/; revision=52910
 2013-10-27 23:18:19 +00:00
Evan Huus
233c409184 Dissect Kafka "fetch" requests and responses. 
svn path=/trunk/; revision=52909
 2013-10-27 23:08:01 +00:00
Jeff Morriss
9259176f87 As pointed by Evan: don't leak memory when the string pointer is NULL. 
svn path=/trunk/; revision=52908
 2013-10-27 22:40:55 +00:00
Pascal Quantin
18b9db29b9 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 : 
NFC: Add PN532 HCI dissector

svn path=/trunk/; revision=52907
 2013-10-27 22:40:45 +00:00
Jeff Morriss
8e2f00bf3d Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9323 : 
Actually handle non-NULL-terminated FT_STRINGs properly.

svn path=/trunk/; revision=52905
 2013-10-27 21:56:58 +00:00
Martin Mathieson
b0aa70b807 Initialise a couple of variables to avoid bogus may-be-used-uninitialised warnings with my version of gcc 
svn path=/trunk/; revision=52904
 2013-10-27 21:52:35 +00:00
Pascal Quantin
289c2796ad From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 : 
USB: Decode HID interface subclasses and protocols

svn path=/trunk/; revision=52903
 2013-10-27 21:32:32 +00:00
Pascal Quantin
13b39aa30d From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 : 
USB: CDC: Decode ACM, CM and Union Functional Descriptors

svn path=/trunk/; revision=52902
 2013-10-27 21:14:22 +00:00
Pascal Quantin
3f26a0fc52 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 : 
USB: Decode CDC subclasses and protocols

svn path=/trunk/; revision=52901
 2013-10-27 20:59:43 +00:00
Evan Huus
8ab858ef99 Mark unused parameters. 
svn path=/trunk/; revision=52900
 2013-10-27 20:58:00 +00:00
Michael Mann
8c64c5da89 Remove iplen and iphdrlen from struct _packet_info. 
Dissectors should just use (reported) tvb length and taps have other ways to get the data.

svn path=/trunk/; revision=52899
 2013-10-27 20:38:42 +00:00
Pascal Quantin
d8bbe9bda2 Do not reset pinfo->curr_layer_num in packet-frame.c 
Before this change, curr_layer_num could be off by 1 depending on whether we
generated items for Frame protocol or not, leading to a failure to get the
UDP heuristic dissector identified during first pass

svn path=/trunk/; revision=52897
 2013-10-27 19:33:55 +00:00
Michael Mann
471f21181b Have X.25 dissector pass boolean q_bit_set value through dissector data rather than pinfo->private_data. 
Other "related" dissectors weren't manipulating pinfo->private_data, so it doesn't make sense for them to bother saving/restore it (now that q_bit_set isn't being used)

svn path=/trunk/; revision=52894
 2013-10-27 16:03:11 +00:00
Michael Mann
394f67c1b7 Allow "circuit dissectors" to pass data between dissectors. Not sure if this is immediately useful (ie remove need for packet_info (private_)data), but opens the possibility. 
svn path=/trunk/; revision=52893
 2013-10-27 15:00:11 +00:00
Gerald Combs
469fc864e6 [Automatic manuf, services and enterprise-numbers update for 2013-10-27] 
svn path=/trunk/; revision=52890
 2013-10-27 14:03:42 +00:00
Anders Broman
21aa62a20c From Zoltán Lajos Kis: 
dissect flow_removed and port_status messages

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

svn path=/trunk/; revision=52889
 2013-10-27 13:02:05 +00:00
Anders Broman
b57038a2ee From Zoltán Lajos Kis: 
dissect experimenter, get/set config, packet in and packet out messages 

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

svn path=/trunk/; revision=52888
 2013-10-27 12:55:56 +00:00
Jörg Mayer
eb560aa56a Various updates - go into a little depth now. 
svn path=/trunk/; revision=52887
 2013-10-27 02:18:57 +00:00
Jörg Mayer
3392cb4772 Treat IE 173 (symbol proprietary) like we treat the vendor IE 
svn path=/trunk/; revision=52886
 2013-10-27 02:18:00 +00:00
Michael Mann
09bd9ad788 Have ANSI TCAP dissector pass data through subdissector parameter instead of using struct _packet_info. 
svn path=/trunk/; revision=52885
 2013-10-27 02:00:18 +00:00
Michael Mann
bb36a25089 Remove use of pinfo->private_data and just pass the data around through function parameters 
Remove g_pinfo from packet-ansi_637.c and add packet_info* as a function parameter while we're at it.

svn path=/trunk/; revision=52883
 2013-10-27 01:06:44 +00:00
Evan Huus
01c2eecc35 Updates to radiotap-iter licensing terms. The upstream version has a COPYING 
file containing what is actually the ISC license (BSD-like), so add that to the
header for licensecheck's sake (and remove the confusing reference to the BSD
license). This makes the code actually your choice of ISC
and GPL2 (since it is used in the Linux kernel which is GPL2-only). ISC is
already acceptable for us, so ISC \union * must be also, so add ISC+GPL2 to
checlicenses' list.

Upstream COPYING file, for reference:
http://git.sipsolutions.net/?p=radiotap.git;a=blob;f=COPYING;hb=97478c8467ce7ab56b7c9e8fd7cdc0f4e2cb22ed

svn path=/trunk/; revision=52879
 2013-10-26 20:57:38 +00:00
Pascal Quantin
99c75b2295 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9330: 
Add OID tests for adding named arcs

svn path=/trunk/; revision=52878
 2013-10-26 20:50:51 +00:00
Michael Mann
9804a7b332 Don't use private_data for pwatm_private_data_t and instead pass it into the dissectors. 
svn path=/trunk/; revision=52877
 2013-10-26 19:18:12 +00:00
Alexis La Goutte
3a1041c084 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang 
svn path=/trunk/; revision=52875
 2013-10-26 17:18:24 +00:00
Alexis La Goutte
39f4eb2edd Fix Dead Store (Dead assignement/Dead increment) warning found by Clang 
svn path=/trunk/; revision=52874
 2013-10-26 17:18:12 +00:00
Alexis La Goutte
70b52fc4f5 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang 
svn path=/trunk/; revision=52873
 2013-10-26 17:17:53 +00:00
Alexis La Goutte
6895d1f63d Remove unused variable 
svn path=/trunk/; revision=52872
 2013-10-26 17:17:38 +00:00
Alexis La Goutte
8bcefa0f42 Fix indent and add modelines info 
svn path=/trunk/; revision=52871
 2013-10-26 17:17:17 +00:00
Evan Huus
3342e3bc89 Convert some emem to wmem. It took some manual flow analysis, but they are only 
used during actual packet dissection.

svn path=/trunk/; revision=52870
 2013-10-26 16:04:21 +00:00
Michael Mann
df5a9be3db Bluetooth: SDP: Decode custom 128bit UUIDs and minor fixes. Bug 9327 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327) 
From Michal Labedzki

svn path=/trunk/; revision=52869
 2013-10-26 13:28:47 +00:00
Michael Mann
e154ac38f8 Bluetooth: OBEX: PBAP: Fix Filter parameter. Bug 9327 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327) 
From Michal Labedzki

svn path=/trunk/; revision=52868
 2013-10-26 13:18:21 +00:00
Anders Broman
24164080b1 Convert to value_str_ext in a couple of places. 
svn path=/trunk/; revision=52867
 2013-10-26 09:37:47 +00:00
Bill Meier
21bed98150 Fix several [-Wunused-const-variable] warnings (using '#if 0'). 
svn path=/trunk/; revision=52866
 2013-10-26 03:16:57 +00:00
Evan Huus
70cf133bf5 Cleanups to the TPNCP database parser/loader: 
- use and free glib memory instead of ep_ memory - another dissector down
- propogate errors correctly
- produce a warning if an error occurs loading the DB
- add XXX comments about realloc handling that may or may not be a memory leak
  in failure cases

svn path=/trunk/; revision=52865
 2013-10-26 02:54:58 +00:00
Michael Mann
2ebf40a1c2 Bluetooth: SDP: Decode all types of UUIDs. Bug 9327 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327). 
From Michal Labedzki

svn path=/trunk/; revision=52864
 2013-10-26 02:36:56 +00:00
Michael Mann
3cc6957fa8 Bluetooth: Use items for logical block objects. Bug 9327 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327) 
Bluetooth protocols use items, so dissect it to improve filtering and better user experience - text object cannot be filterable or comparable.

From Michal Labedzki

svn path=/trunk/; revision=52863
 2013-10-26 02:24:04 +00:00
Bill Meier
6dd42b581a Fix some [-Wunused-const-variable] warnings (using '#if 0') 
svn path=/trunk/; revision=52862
 2013-10-26 02:09:14 +00:00
Michael Mann
63869c4037 Bluetooth: SDP: Add MultiProfile UUIDs. Bug 9327 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327) 
From Michal Labedzki

svn path=/trunk/; revision=52861
 2013-10-26 00:53:23 +00:00
Jeff Morriss
d8f1af511f Mark a bunch of no-longer-used parameters as unused. Remove a couple of 
unused parameters.

svn path=/trunk/; revision=52860
 2013-10-26 00:41:54 +00:00
Michael Mann
250568ca91 Bluetooth: SDP: Fix PBAP features presentation. Bug 9327 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327) 
From Michal Labedzki

svn path=/trunk/; revision=52859
 2013-10-26 00:36:16 +00:00
Michael Mann
68a5e46e9d OBEX: Fix Presentation of Reserved Fields. Bug 9327 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327) 
From Michal Labedzki

svn path=/trunk/; revision=52858
 2013-10-26 00:31:42 +00:00
Michael Mann
5030e21822 Replace tabs by spaces. Bug 9327 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327) 
From Michal Labedzki

svn path=/trunk/; revision=52857
 2013-10-26 00:26:41 +00:00
Michael Mann
1e0405a3a3 Remove SMB's use of private_data and just pass the data through all of the dissection functions 
svn path=/trunk/; revision=52856
 2013-10-25 23:59:30 +00:00
Evan Huus
95f484a91e Add a very small hack to make the UAT update callback error string freeable, and 
convert all existing UAT update callbacks to use glib memory instead of
ephemeral memory for that string.

UAT code paths are entirely distinct from packet dissection, so using ephemeral
memory was the wrong choice, because there was no guarantees about when it would
be freed.

The move away from emem still needs to be propogated deeper into the UAT code
itself at some point.

Net effect: remove another bunch of emem calls from dissectors, where replacing
with wmem would have caused assertions.

svn path=/trunk/; revision=52854
 2013-10-25 22:14:25 +00:00
Jeff Morriss
b190de385a Fix CID 281375 (dead code) while hopefully fixing detection of Class-2 ERR 
messages.

Also fix a couple of incorrect MTP3 standard detections that I found.

svn path=/trunk/; revision=52850
 2013-10-25 20:38:50 +00:00
Jeff Morriss
274596eaab Fix up some formatting and white space. 
svn path=/trunk/; revision=52848
 2013-10-25 15:25:46 +00:00
Jeff Morriss
ce23d50028 Fix CID 715143: assert that the preference we were looking for was found. It 
should be which is why this is an assertion not a NULL check.

svn path=/trunk/; revision=52847
 2013-10-25 15:00:00 +00:00
Jeff Morriss
81b0681c12 Fix CID 715144: assert that the preference we were looking for was found. It 
should be which is why this is an assertion not a NULL check.

svn path=/trunk/; revision=52846
 2013-10-25 14:57:55 +00:00
Jeff Morriss
4cfc0f27cb Kafka's CRC is 4 bytes long and is added with ENC_BIG_ENDIAN. Make the hf 
FT_UINT32 instead of FT_BYTES to match.

svn path=/trunk/; revision=52845
 2013-10-25 14:41:12 +00:00
Jeff Morriss
3440dd73f2 Fix CID 1080758: be prepared for tvb_child_uncompress() failing (and returning 
NULL).

svn path=/trunk/; revision=52844
 2013-10-25 14:38:39 +00:00
Jeff Morriss
2aae7bc4a6 Fix CID 280081: ENC_NULL can't be used as an array index into ciphers[], rather 
ENC_NULL-0x30 needs to be used.

(This could probably use some cleanup...)

svn path=/trunk/; revision=52843
 2013-10-25 14:15:28 +00:00
Jeff Morriss
ab97b9d50b Fix CID 1111806: it's not safe to check if "tag < sizeof(tag_to_type)" before 
accessing tag_to_type[tag]: while the array is made of enums and the values of
the enum will fit in a guint8 (making the conditional safe) compilers don't
*have* to "right size" the storage for the enum.  They very well could be lazy
and store the enum in int's.

Replace it with a macro that tells us the size of the array.

svn path=/trunk/; revision=52842
 2013-10-25 14:04:22 +00:00
Michael Mann
02784747f7 Make sure "mp2t-dsmcc" dissector is registered by name so it can be picked up by etv dissector. 
svn path=/trunk/; revision=52841
 2013-10-25 13:37:10 +00:00
Jeff Morriss
3e4c954fd8 Fix checkAPIs: don't add hf_zbee_beacon_protocol with 
proto_tree_add_uint(..., ENC_NA); use proto_tree_add_item() as it appears
was intended.

svn path=/trunk/; revision=52840
 2013-10-25 13:24:29 +00:00
Jeff Morriss
86b6659210 Fix CID 1111814: segment_item is set but not used (in one conditional). 
Move a URL from in the middle of the copyright notice to up where it (appears
to) belong.

svn path=/trunk/; revision=52839
 2013-10-25 13:23:17 +00:00
Michael Mann
cf1f098afb Improvements for the KDSP dissector. Bug 8891 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8891) 
From Yuri Schaeffer

svn path=/trunk/; revision=52837
 2013-10-25 02:41:47 +00:00
Michael Mann
c09b328e13 Pass ieee802154_packet data into the heuristic check instead of using private_data. 
svn path=/trunk/; revision=52836
 2013-10-25 02:02:02 +00:00
Michael Mann
ab0ad4aa1c Make TAPA dissector heuristic instead of "ugly hack" now that IP dissector supports heuristics. 
IP heuristics pass in IP header to help subdissectors decide what to do.

svn path=/trunk/; revision=52835
 2013-10-25 01:54:53 +00:00
Jeff Morriss
787bca8ea0 Add SVN properties. 
svn path=/trunk/; revision=52832
 2013-10-25 00:56:17 +00:00
Evan Huus
29a4ebc5d4 Mark unused parameter, remove moved .h file from Makefile.common 
svn path=/trunk/; revision=52831
 2013-10-25 00:08:07 +00:00
Michael Mann
9563de93a3 AIM doesn't ever use it's private_data structure, so remove it. If it ever does, just pass the data into the subdissectors. 
svn path=/trunk/; revision=52830
 2013-10-24 23:59:47 +00:00
Michael Mann
e83fe18fcc Have ZigBee dissectors pass data through subdissector parameter instead of using struct _packet_info. 
svn path=/trunk/; revision=52827
 2013-10-24 23:40:58 +00:00
Pascal Quantin
39fd5f29af Fix copy paste errors 
svn path=/trunk/; revision=52823
 2013-10-24 21:11:00 +00:00
Martin Kaiser
bc8006b224 fix offset calculation 
highlight the correct payload bytes for unknown sub-descriptors

svn path=/trunk/; revision=52822
 2013-10-24 20:59:32 +00:00
Jeff Morriss
8601a75d51 Finish implementing https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7263 : 
Change cflow.sysuptime from an FT_UINT32 (milliseconds since the router booted)
to an FT_RELATIVE_TIME (seconds since the router booted).  I don't imagine
anyone will care if we show them seconds or milliseconds and it satisfy the
user's request (in that bug) to compare cflow.sysuptime to cflow.timeend (which
is already an FT_RELATIVE_TIME).

(If someone does care, we could always display the field twice, once in
milliseconds and once in seconds.)

svn path=/trunk/; revision=52821
 2013-10-24 20:52:00 +00:00
Jörg Mayer
1b69a6a94d CID 700176: Dereference null return value (NULL_RETURNS) 
Not sure whether this is really possible, but add a dissector_assert
just to be safe.

svn path=/trunk/; revision=52820
 2013-10-24 20:35:53 +00:00
Anders Broman
f1f72f2f57 From Zoltán Lajos Kis: 
dissect echo messages.

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

svn path=/trunk/; revision=52816
 2013-10-24 16:41:04 +00:00
Michael Mann
e4e536bf1d Remove need for match_port #define in packet_info.h and just replace existing calls. 
svn path=/trunk/; revision=52815
 2013-10-24 15:04:38 +00:00
Evan Huus
207cedd928 From Michal Labedzki via 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8818

Add correct license headers, $Id$ fields and modelines to the common dwarf
files.

svn path=/trunk/; revision=52813
 2013-10-24 12:41:27 +00:00
Anders Broman
d803c5bf9c Pascal:s patch from 52759 is needed here too. 
curr-num_layer is not always incremented by 1 when calling the subdissector.

svn path=/trunk/; revision=52811
 2013-10-24 04:04:14 +00:00
Michael Mann
71cbca03ba Remove ipxptype from struct _packet_info and pass it into subdissectors through ipxhdr_t structure. 
svn path=/trunk/; revision=52810
 2013-10-24 01:26:30 +00:00
Michael Mann
4cfd2f93ea Remove profinet_conv member of struct _packet_info and turn it into proto_data. 
svn path=/trunk/; revision=52806
 2013-10-24 00:17:58 +00:00
Martin Kaiser
a3ba5dcbf5 initialize DSM-CC over TCP and over MPEG2-TS in the same way 
svn path=/trunk/; revision=52805
 2013-10-23 21:22:14 +00:00
Martin Kaiser
00e8cd960d support DSM-CC over TCP 
dissect some DSM-CC user-to-network messages related to session
management

svn path=/trunk/; revision=52804
 2013-10-23 21:20:41 +00:00
Anders Broman
3f0bbe7669 Fix warnings. 
svn path=/trunk/; revision=52803
 2013-10-23 20:54:17 +00:00
Chris Maynard
e41d5b9049 Provide a usage example of the column formats. 
svn path=/trunk/; revision=52802
 2013-10-23 17:47:47 +00:00
Evan Huus
4e66e2ec91 Fix the last of the 32/64 conversion errors and re-enable ELF dissection. 
Actually tested on 32-bit XP vm, so should really work this time.

svn path=/trunk/; revision=52800
 2013-10-23 17:10:25 +00:00
Michael Mann
79d58dc670 Add Lua cleanup on shutdown, to help with memory leak detection. Bug 5575 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5575) 
From Robert G. Jakabosky

From me: cleanup so that it applies to trunk.

svn path=/trunk/; revision=52798
 2013-10-23 16:47:02 +00:00
Michael Mann
25c43f9dc2 Make option tag and length filterable and part of a subtree, which simplifies the switch statement handling. 
Add modelines.

svn path=/trunk/; revision=52797
 2013-10-23 16:25:26 +00:00
Jeff Morriss
0bf219035a Remove trailing spaces from hf name values (to satisfy checkAPIs). 
svn path=/trunk/; revision=52796
 2013-10-23 16:23:54 +00:00