Commit Graph

49740 Commits

Author SHA1 Message Date
Chris Maynard 3e2863e6b8 Remove an extraneous semicolon.
svn path=/trunk/; revision=52985
2013-10-30 18:16:22 +00:00
Jeff Morriss 875dee28c4 Add some documentation to hopefully help dissector writers avoid the problem
in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9323 :

The string added to proto_tree_add_string*() must be NULL terminated.

svn path=/trunk/; revision=52984
2013-10-30 15:56:01 +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
Jeff Morriss aa452c378f Set SVN properties.
svn path=/trunk/; revision=52976
2013-10-30 00:43:46 +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
Jeff Morriss 119b431f6a Add some items to the list of things still to be done.
svn path=/trunk/; revision=52952
2013-10-29 15:28:49 +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
Irene Rüngeler 6d3988ffd3 Make the packet analysis for SCTP independent from GTK and QT.
svn path=/trunk/; revision=52945
2013-10-29 12:11:23 +00:00
Martin Kaiser 9f3740b414 simplify file_error()
svn path=/trunk/; revision=52944
2013-10-29 11:04:03 +00:00
Martin Kaiser 5ec452c288 allow err_info==NULL in file_error()
this fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9309
reported by Peter Wu

svn path=/trunk/; revision=52943
2013-10-29 09:15:02 +00:00
Martin Kaiser a876a4306d From Peter Wu
write editcap debug infos to stderr
print some of those messages only in verbose mode 

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

svn path=/trunk/; revision=52942
2013-10-29 08:34:35 +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
Guy Harris 766a32779a Support building and installing both Qt and GTK+.
When forcing CFLAGS and CXXFLAGS, add -g and -O2; newer versions of
autoconf do so for GCC-compatible compilers (clang is GCC-compatible in
that sense), but only do so when those variables aren't forced.

svn path=/trunk/; revision=52939
2013-10-29 01:49:59 +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 4e94bdcb85 Fix scroll bar ranges.
svn path=/trunk/; revision=52937
2013-10-28 23:57:57 +00:00
Gerald Combs 360c4fba21 Add c-ares. Untested, but it *should* work.
svn path=/trunk/; revision=52936
2013-10-28 22:38:23 +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
Pascal Quantin 447d3938ed Add Tinkerforge to the list of new protocols
svn path=/trunk/; revision=52933
2013-10-28 21:19:21 +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
Gerald Combs 31db0135f4 Add some verbosity.
svn path=/trunk/; revision=52929
2013-10-28 19:09:58 +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
Jeff Morriss d07f872c90 From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9341 :
SVN rev 50525 tried to fix out-of-source-tree builds, but did so by
writing the .rcc.cpp files to the source tree. This was noticed when
running `make distcheck`. This patch reverts that behavior, and creates
the image/ directory to fix out-of-tree builds.

In other words, fix things so "make distcheck" with Qt works in out-of-tree
builds too.

svn path=/trunk/; revision=52926
2013-10-28 18:01:09 +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