Commit Graph

75 Commits

Author SHA1 Message Date
Bill Meier 18d72987cb Do encoding-arg changes (all benign)
For:
- FT_BYTES: Always use just ENC_NA
- integral/floating (other than FT_[U]INT8): Do ENC_NA --> ENC_BIG_ENDIAN

Also:
- FT_UINT... --> FT_UINT8 in a few cases (to match proto_tree_add_item...)
- Change one case of incorrect '||' to '|'

Change-Id: I427e0e61618ff8faf55691c8a695930f67d455b0
Reviewed-on: https://code.wireshark.org/review/4184
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-19 01:38:08 +00:00
Michael Mann 6318a29fa3 convert to proto_tree_add_subtree[_format]
Change-Id: Ia2567695ffed30c990eda3740b08bfab101cea96
Reviewed-on: https://code.wireshark.org/review/2883
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-06 14:21:15 +00:00
Guy Harris ce3d2ff3de Rename dissector_add_handle() to dissector_add_for_decode_as().
Hopefully that name makes it clear what the routiner's purpose is, and
will encourage people to use it rather than using dissector_add_uint()
with a bogus integer value.

Change-Id: Ic5be456d0ad40b176aab01712ab7b13aed5de2a8
Reviewed-on: https://code.wireshark.org/review/2483
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20 16:43:56 +00:00
Michael Mann 14824e6adf Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html

This reverts commit 246fe2ca4c.

Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 18:25:59 +00:00
Dario Lombardo 246fe2ca4c Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:14:58 +00:00
Dario Lombardo 971ffd683e Fixup: tvb_get_string(z) -> tvb_get_string(z)_enc
Change-Id: I63a3704effe3fcab01a193dc39b6a22e9f1cf3fe
Reviewed-on: https://code.wireshark.org/review/2376
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:13:58 +00:00
Evan Huus de00c49bd8 Convert a bunch of time_to_str functions to wmem
Change-Id: I24fe3cc4a3589dadc4528a77fe7ff13d06b1a983
Reviewed-on: https://code.wireshark.org/review/2245
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-16 17:26:25 +00:00
Michael Mann 73217d9f3f tvb_new_subset -> tvb_new_subset_length when length parameters are equal.
tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is.

Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d
Reviewed-on: https://code.wireshark.org/review/1999
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-07 15:41:07 +00:00
Alexis La Goutte 296591399f Remove all $Id$ from top of file
(Using sed : sed -i '/^ \* \$Id\$/,+1 d')

Fix manually some typo (in export_object_dicom.c and crc16-plain.c)

Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8
Reviewed-on: https://code.wireshark.org/review/497
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04 14:27:33 +00:00
Gregor Jasny 02b5bf9718 Extend RTMPT video types table
Change-Id: Ic97edfa64bb2d69b97295564e2f11cd07a0fe54c
Reviewed-on: https://code.wireshark.org/review/129
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-06 22:21:14 +00:00
Jakub Zawadzki deb2b236f2 Add missing includes
svn path=/trunk/; revision=54332
2013-12-21 17:23:17 +00:00
Evan Huus 2ae8edccea Rename more to_str functions to have ep_ in the name if they return ephemeral
buffers. Remove two unused functions.

svn path=/trunk/; revision=54250
2013-12-19 16:28:39 +00:00
Evan Huus a6415ece0a Rename a couple of to_str functions to have ep_ in the name. This makes it
obvious that the returned string is ephemeral, and opens up the original names
in the API for versions that take a wmem pool (and thus can work in any scope).

svn path=/trunk/; revision=54249
2013-12-19 15:49:09 +00:00
Bill Meier bacfeda9e9 Move proto_reg_handoff...() to the file end as per convevntion;
Reformat certain lines to use a consistent style;
tabs --> spaces (to match the editor modelines);
Rework some whitespace;

svn path=/trunk/; revision=53974
2013-12-12 19:59:23 +00:00
Anders Broman b781d6c99d - Make local functions static.
- Forward declaration of register functions.

svn path=/trunk/; revision=53958
2013-12-12 06:11:05 +00:00
Chris Maynard ae9e6dfd0f Reject the packet if data is NULL.
svn path=/trunk/; revision=53946
2013-12-11 21:06:09 +00:00
Jakub Zawadzki 5ac6474c94 Rename some of pint.h macros to match common style (bits number on the end).
pntohs  -> pntoh16
   pntohl  -> pntoh32
   pletohs -> pletoh16
   pletohl -> pletoh32
   phtons  -> phton16
   phtonl  -> phton32


svn path=/trunk/; revision=53652
2013-11-29 18:59:06 +00:00
Jakub Zawadzki c9b2ee3768 include <wsutil/pint.h> only when needed.
svn path=/trunk/; revision=53196
2013-11-09 15:44:29 +00:00
Jakub Zawadzki 0b0bbf0965 Replace STRINGIFY with glib version.
svn path=/trunk/; revision=53193
2013-11-09 14:37:13 +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
Pascal Quantin a0c53ffaa1 emem -> wmem conversion:
- ep_tvb_get_bits() -> wmem_packet_tvb_get_bits()
- tvb_g_memdup()/ep_tvb_memdup() -> tvb_memdup()
- tvb_fake_unicode()/tvb_get_ephemeral_faked_unicode() -> tvb_get_faked_unicode()
- tvb_get_g_string()/tvb_get_ephemeral_string()/tvb_get_seasonal_string() -> tvb_get_string()
- tvb_get_g_unicode_string()/tvb_get_ephemeral_unicode_string() -> tvb_get_unicode_string()
- tvb_get_ephemeral_string_enc() -> tvb_get_string_enc()
- update docs accordingly

svn path=/trunk/; revision=52172
2013-09-22 15:50:55 +00:00
Evan Huus 8abfcaea79 Lower the default RTMPT max reassembly size. A bigger bandaid for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6898

svn path=/trunk/; revision=52163
2013-09-21 16:27:55 +00:00
Evan Huus 14e6dddcdc Replace some emem with wmem.
svn path=/trunk/; revision=51512
2013-08-25 14:23:13 +00:00
Chris Maynard f5f20fa8e3 Fix warning: ISO C does not allow extra ';' outside of a function.
svn path=/trunk/; revision=50638
2013-07-15 20:42:57 +00:00
Michael Mann fa5b45834b Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49921
2013-06-14 01:56:28 +00:00
Michael Mann 24df2990e5 Use col_set_fence() functionality to remove an unnecessary global variable.
svn path=/trunk/; revision=49472
2013-05-21 02:08:40 +00:00
Evan Huus 0919116ccd Make the rtmpt max packet size that Jeff just halved a preference, so that
people who really want it can set it higher again.

svn path=/trunk/; revision=49322
2013-05-16 01:56:48 +00:00
Jeff Morriss 80cab0bdbb Temporarily lower the max packet size for this dissector in order to silence
the fuzz bot (see https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6898 and
all of its duplicates--and the bugs marked as duplicates of those duplicates).

Halving the packet size seems to work for most of the captures I've tried;
we'll see if the buildbot agrees.

If someone can figure out a good way to control the memory usage of this
dissector then the limit could be increased again.

svn path=/trunk/; revision=49321
2013-05-16 01:48:44 +00:00
Evan Huus 37600a157b Rename value string (and similar) functions to use a consistent pattern. This
was done using textual search+replace, not anything syntax-aware, so presumably
it got most comments as well (except where there were typos).

Use a consistent coding style, and make proper use of the WS_DLL_* defines.

Group the functions appropriately in the header.

I ended up getting rid of most of the explanatory comments since many of them
duplicated what was in the value_string.c file (and were out of sync with the
recent updates I made to those in r48633). Presumably most of the comments
should be in the .h file not the .c file, but there's enough churn ahead that
it's not worth fixing yet.

Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8467

svn path=/trunk/; revision=48634
2013-03-29 00:26:23 +00:00
Anders Broman 3e38475176 From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48356
2013-03-17 17:52:26 +00:00
Bill Meier d3a7f4b817 Use '#if 0 ... #endif' rather than /** ... **/ to comment out
unused hf[] entries (which I should have done in the first place).

svn path=/trunk/; revision=47390
2013-01-31 18:31:28 +00:00
Bill Meier 0960e508e4 Comment out cases of unused hf array entries found by checkhf.
svn path=/trunk/; revision=47302
2013-01-26 18:54:53 +00:00
Guy Harris 5788ca7c88 Fix some blurbs that matched the field tag.
De-RTMP-ize more AMF-related names and move more of the AMF stuff
together.

svn path=/trunk/; revision=46069
2012-11-18 08:03:05 +00:00
Guy Harris 2f9292c1ea Move all the AMF stuff under the AMF protocol, as AMF, while it's used
with RTMP, can be sent over HTTP, for example, as well.

svn path=/trunk/; revision=46068
2012-11-18 04:30:10 +00:00
Evan Huus 0d46c5a82b There's no point in initializing variables to 0 when we unconditionally assign
a new value to them on the very next line. Caught by cppcheck.

svn path=/trunk/; revision=46058
2012-11-17 13:58:02 +00:00
Guy Harris 889b302b0d Add casts to let the compiler know that we know what we're doing here.
svn path=/trunk/; revision=46049
2012-11-16 22:21:22 +00:00
Guy Harris 6578ab9975 Thank you, llvm-gcc, for eliminating much of the dataflow analysis that
regular gcc does.  Time to start using clang, I guess....

svn path=/trunk/; revision=46048
2012-11-16 22:17:37 +00:00
Guy Harris 924bb8c131 Add support for dissecting AMF messages; register the dissector for them
as handling the application/x-amf media type.

Add support for dissecting AMF3.

Dissect AMF0 dates as milliseconds-since-the-Epoch.

Dissect AMF0 typed objects.

Add URLs for various Adobe specs for RTMP, AMF0 and AMF3.

svn path=/trunk/; revision=46047
2012-11-16 21:59:58 +00:00
Alexis La Goutte 02a97f92e2 From report of Sergio Garcia Murillo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7906 Nelly Mosser (Control: 0x66) at 11Khz incorrectly displayed as 8Khz
From me
Fix issue and add link to SWF documentation ( http://www.adobe.com/content/dam/Adobe/en/devnet/swf/pdf/swf_file_format_spec_v10.pdf )

svn path=/trunk/; revision=45827
2012-10-29 14:13:12 +00:00
Jeff Morriss 2552c750e5 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Alexis La Goutte 42451447b1 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=43091
2012-06-04 22:26:40 +00:00
Guy Harris 8c71eacce0 Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.

svn path=/trunk/; revision=42542
2012-05-10 05:52:22 +00:00
Guy Harris ee13854e77 Give some URLs for descriptions of RTMP.
svn path=/trunk/; revision=42039
2012-04-12 22:13:59 +00:00
Bill Meier 198c9ba55f FT_BOOLEAN hf[] entries with a 0 'bitmask' should have 'display' = BASE_NONE;
In some cases:
 Use val_to_str_const() instead of val_to_str();
 Reformat long lines;
 Do some general whitespace changes.


svn path=/trunk/; revision=41587
2012-03-16 02:00:29 +00:00
Chris Maynard fb6cce75d9 Fix some duplicate display filter names.
svn path=/trunk/; revision=40669
2012-01-23 20:14:37 +00:00
Guy Harris 7e4c02ee18 The frame number is an unsigned integer, so there's no guarantee that it
won't equal (guint32)-1.

Fortunately, frame numbers are 1-based, so there *is* a guarantee that
it won't equal 0.

svn path=/trunk/; revision=40544
2012-01-16 08:10:49 +00:00
Bill Meier 98ed218772 Conform indentation to that specified by the modeline; Reformat long lines.
svn path=/trunk/; revision=40212
2011-12-15 18:47:57 +00:00
Bill Meier 8fe471e0c3 Fix some tvb memory leaks; Fix a typo.
svn path=/trunk/; revision=40211
2011-12-15 18:13:21 +00:00
Bill Meier 794757ae8f For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.
Also: remove trailing whitespace for a number of files.

svn path=/trunk/; revision=39503
2011-10-21 02:10:19 +00:00