Commit Graph

58 Commits

Author SHA1 Message Date
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
Bill Meier 126aa85393 Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, FT_STRINGZ, FT_UINT_STRING as follows:
1. If there's no character encoding (ENC_ASCII, ...) specified
    then use ENC_ASCII.
 2. For all but FT_UINT_STRING, always use ENC_NA
    (replacing any existing True/1/FALSE/0
    /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN).



svn path=/trunk/; revision=39426
2011-10-15 18:46:26 +00:00
Bill Meier 4e57694d4a Convert 'encoding' parameter of certain proto_tree_add_item() calls in non-autogenerated epan/dissectors:
Specifically:  Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
 the encoding parameter for proto_tree_add_item() calls which directly reference
 an item in hf[] which has a type of:
    FT_UINT8
    FT_UINT16
    FT_UINT24
    FT_UINT32
    FT_UINT64
    FT_INT8
    FT_INT16
    FT_INT24
    FT_INT32
    FT_INT64
    FT_FLOAT
    FT_DOUBLE


svn path=/trunk/; revision=39288
2011-10-06 03:35:44 +00:00
Bill Meier 94f36ca4ff Use ENC_NA as encoding for proto_tree_add_item() calls which directly reference an hf item (in hf[] with types:
FT_NONE
   FT_BYTES
   FT_IPV6
   FT_IPXNET
   FT_OID

Note: Encoding field set to ENC_NA only if the field was previously TRUE|FALSE|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN

svn path=/trunk/; revision=39260
2011-10-04 22:44:31 +00:00
Bill Meier 4c46725c2c Fix vi "modeline" so it works;
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5748

svn path=/trunk/; revision=39074
2011-09-21 16:28:53 +00:00
Bill Meier 3f7e7672c9 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
svn path=/trunk/; revision=38095
2011-07-18 19:11:32 +00:00
Bill Meier f3432a973c Don't assign to a proto_item* if the value won't be used:
Fixes Coverity 903,935,968,985,997,999,1024,1025,1134;
Remove unneeded #includes;
Do whitespace cleanup.

svn path=/trunk/; revision=37331
2011-05-20 15:44:25 +00:00
Bill Meier bec1c07788 From Herbert Oppmann: Fix "RTMP dissector unknown audio codec"
"
The [...] variable rtmpt_audio_codecs should be enhanced.

According to [Flash Developer's Guide]
10 = HE-AAC and 11 = Speex are missing.

There is also [Adobe "RTMP Specification V1.0]
which additionally lists 3 = INTEL (not used), 7 = G711A, 8 = G711U
and 9 = NellyMoser 16kHz.
"

From me: All but 'Intel (not used)' added to the list of audio codecs


svn path=/trunk/; revision=36073
2011-02-25 19:17:17 +00:00
Guy Harris a8bc4a0d13 Rename the routines that handle dissector tables with unsigned integer
keys to have _uint in their names, to match the routines that handle
dissector tables with string keys.  (Using _port can confuse people into
thinking they're intended solely for use with TCP/UDP/etc. ports when,
in fact, they work better for things such as Ethernet types, where the
binding of particular values to particular protocols are a lot
stronger.)

svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
Jaap Keuter 31e26fdc74 From John Sullivan:
Improve RTMP dissection:

  * Handle multi-byte csids
  * Handle extended timestamps
  * Better timestamp defaulting/calculations
  * Dechunking should now cope with any clean high quality capture without
    error (still loses sync on missing/out of order packets, but that's 
    very hard to deal with)
  * Dissect tunnelled RTMPT
  * Dissect more packet types
  * Dissect more AMF0 data types
  * Dissect audio/video control information
  * Use official packet/type names
  * Several new fields
  * Function call/response frame linking
  * Push several useful bits of data up the dissection tree or into the 
    info column for ease of use

svn path=/trunk/; revision=34720
2010-10-30 16:40:46 +00:00
Jeff Morriss 729de1a635 As suggested in http://www.wireshark.org/lists/wireshark-dev/200809/msg00075.html
(as referenced in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2907 ) and
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3411 :

Write a new convenience routine for finding a conversation and, if it is not
found, create it.  The frame number and addresses are taken from pinfo (as is
the common case).

Use this function in a bunch of dissectors.

svn path=/trunk/; revision=32790
2010-05-13 18:28:34 +00:00
Bill Meier 055dd62063 #include <string.h> not needed.
svn path=/trunk/; revision=32410
2010-04-06 21:14:01 +00:00
Stig Bjørlykke 2c01893e72 Conversation is unused in dissect_rtmpt_tcp().
svn path=/trunk/; revision=30905
2009-11-09 15:43:54 +00:00
Anders Broman 88bb44a51e From Jakub Zawadzki:
Cleanup dissector code - use proper memory functions.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4164

svn path=/trunk/; revision=30691
2009-10-25 11:43:30 +00:00
Kovarththanan Rajaratnam 0a5b014cec Don't guard col_clear with col_check
svn path=/trunk/; revision=29344
2009-08-09 07:36:13 +00:00
Kovarththanan Rajaratnam e971354a54 Don't guard col_set_str (COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29340
2009-08-09 06:26:46 +00:00
Anders Broman da98389b3e Make iCommand a guint8.
svn path=/trunk/; revision=29074
2009-07-12 19:08:55 +00:00
Jaap Keuter 1997c46083 From Nick Ford:
Chunks handled individually rather than as complete messages which have
the risk of being fragmented and unrecognizable.
Added FLV data type.
Allow simultaneous RTMP streams to be handled independently.

svn path=/trunk/; revision=29069
2009-07-12 15:03:05 +00:00