Commit Graph

20840 Commits

Author SHA1 Message Date
Anders Broman 2cc00294c7 Use explicit casts.
svn path=/trunk/; revision=48260
2013-03-12 06:41:00 +00:00
Anders Broman d0efafbcb1 From beroset:
remove C++ incompatibilities from UAT_VS_DEF macro and all uses

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

svn path=/trunk/; revision=48259
2013-03-12 06:40:13 +00:00
Ronnie Sahlberg d249e6111a SPC-3 and later has a 16-bit allocation length for the INQUIRY allocation
length.

While SPC-2 only has one byte for allocation length

Change this to treat allocation length as a 16 bit quantity starting one byte prior to the current single byte that wireshark dissects.
This makes it correct for SPC-3 and later  and still works for SPC-2 since that first byte is reserverd, == must be 0, in SPC-2 and prior.
  

svn path=/trunk/; revision=48258
2013-03-12 01:25:06 +00:00
Chris Maynard 756824e919 Fix Coverity CID 989732: Structurally dead code.
Also, change a few tabs -> spaces.  Add modelines.

svn path=/trunk/; revision=48257
2013-03-11 20:50:19 +00:00
Chris Maynard 7be1086254 Fix Coverity CID 990224 and 990225: Unused pointer value.
svn path=/trunk/; revision=48256
2013-03-11 20:43:52 +00:00
Anders Broman dd33c46501 Improve heuristics for gmtrailer.
svn path=/trunk/; revision=48255
2013-03-11 19:32:33 +00:00
Anders Broman 9a5368a705 Dissect GRE Key and Service Selection.
svn path=/trunk/; revision=48254
2013-03-11 19:31:59 +00:00
Anders Broman 5257351bfb Dissect Contractor Number digits.
svn path=/trunk/; revision=48253
2013-03-11 19:30:59 +00:00
Evan Huus e9e54d662f Minor improvements to block allocator debugging.
svn path=/trunk/; revision=48252
2013-03-11 19:24:51 +00:00
Anders Broman 01c1661412 From: Erik Hugne
tipc: update link header according to spec
The bcastsequence gap have been removed, and the sequence field is now 13 bits.

svn path=/trunk/; revision=48238
2013-03-11 06:34:34 +00:00
Evan Huus ee744dd8c7 Allocate zeroed memory instead of manually zeroing some of the fields. We were
missing a few anyways.

Fixes the rest of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8456

Also, add modelines.

svn path=/trunk/; revision=48236
2013-03-10 22:02:07 +00:00
Evan Huus 7d1520c217 Use col_append_sep_str instead of col_set_str. Fixes another piece of
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8456

Fix suggested by Jakub in comment #5.

svn path=/trunk/; revision=48235
2013-03-10 21:42:16 +00:00
Anders Broman 812efccdae Off by one error in name length.
svn path=/trunk/; revision=48234
2013-03-10 18:32:59 +00:00
Jakub Zawadzki 85f98b5cfc r30032 again, actually make emem_verify_pointer() works with glib chunks.
after allocating glib chunk, amount_free should be 0,
and free_offset should be set to chunk size.

svn path=/trunk/; revision=48233
2013-03-10 17:49:53 +00:00
Evan Huus 4663dc0b6b Actually remove slab.h from the makefile.
svn path=/trunk/; revision=48231
2013-03-10 15:10:27 +00:00
Evan Huus 7f738de7b4 Glib docs recommend using the slice API if you know you won't need to realloc.
svn path=/trunk/; revision=48228
2013-03-10 15:04:04 +00:00
Evan Huus bbb4058954 Remove slab.h and replace its last remaining usage with glib slices.
Take the opportunity to deduplicate some code that was common to both an
if block and its else block.

svn path=/trunk/; revision=48227
2013-03-10 14:52:14 +00:00
Gerald Combs 8b215accd0 [Automatic manuf, services and enterprise-numbers update for 2013-03-10]
svn path=/trunk/; revision=48225
2013-03-10 14:03:22 +00:00
Evan Huus f5c82262b4 Add two missing NULL checks, fixes most of
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8456

svn path=/trunk/; revision=48224
2013-03-10 13:40:50 +00:00
Evan Huus e7de549c8c Add the appropriate new WS_DLL_* declarations to the wmem API.
svn path=/trunk/; revision=48220
2013-03-09 20:25:44 +00:00
Evan Huus aafe8b18e9 Remove the wmem slab. It was an optimization mimicking the emem slab
(removed in r48218) which did nothing particularly useful. Also lets us remove
another debugging environment variable.

svn path=/trunk/; revision=48219
2013-03-09 20:16:33 +00:00
Evan Huus 122b7cb6df Remove the emem slab feature (sl_* functions) completely, replacing it with
glib memory slices.

- We weren't doing anything with the emem slab that couldn't be done with glib
  slices.
- Removes a fair bit of code as well as one debugging environment variable.
- Glib slices are much cache-friendlier and are multi-threading friendly (if
  we ever go there).
- Allows glib to actually return slices to the OS on occasion. The emem slab
  would hold onto its memory forever which resulted in a great deal of wasted
  memory after closing a large file.

svn path=/trunk/; revision=48218
2013-03-09 20:02:19 +00:00
Anders Broman 97c4bc6292 Use explicit casts.
svn path=/trunk/; revision=48212
2013-03-09 10:09:58 +00:00
Alexis La Goutte f6019d9d88 Make checkAPIs Happy
svn path=/trunk/; revision=48211
2013-03-09 09:45:28 +00:00
Alexis La Goutte a4eb0a12ed From Jose Pico via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8377 NEW FEATURE IMPLEMENTED: SMB2 SUPPORT FOR EXPORT->OBJECTS->SMB
Added functionality:
- SMB2 support for Export->Objects->SMB
- support for SMB_COM_CREATE, SMB_COM_OPEN, SMB_COM_READ and SMB_COM_WRITE commands
- Ability to choose between File Id and full file name as identifier for file re-building. Implemented as an option under Edit->Preferences->Protocols->SMB and Edit->Preferences->Protocols->SMB2.

Other minor changes and fixes:
- Full filename in file
- Inclusion of IP of SMB server when treeid name (i.e. hostname) is not known
- UTF-8 filenames encoding before passing them to Export Object Window
- Re-written insert_chunk function of export_object_smb.c to make it easier to debug
- Fixed of an error in insert_chunk function of export_object_smb.c (the verification of next free_chunk was always skipped after deleting one free_chunk).
- Removed duplicated code by inserting the function feed_eo_smb in packet-smb.c and packet-smb2.c
- Changed the label of Export->Objects->SMB menu into Export->Objects->SMB/SMB2

svn path=/trunk/; revision=48210
2013-03-09 08:44:14 +00:00
Evan Huus e5d5bb67bc Put items in the tree we just created, mark an unused param as _U_.
Fixes GCC build.

svn path=/trunk/; revision=48209
2013-03-09 03:31:27 +00:00
Michael Mann 88205d4b72 RTPS Cleanup, Part 2
1. Convert more proto_tree_add_text to proto_tree_add_<something else>/expert_info.  checkAPIs.pl is happy (for packet-rtps.c), but the raw number is a bit deceiving because of macros and wrappers. 
2. Fixed the offending "uses snprintf + strlen to assemble strings" in packet-rtps.c.  The exact same code is used in packet-rtps2.c, so just proper refactoring will fix it.  There is still too much unnecessary use of g_snprintf/g_strlcpy/strlen, but that's for a later date.
3. Removed most of the "useless" wrapper functions.  Again, the number of proto_tree_add_text is deceiving, so the number of hfs that really need to be created is much larger.  
4. Whitespace cleanup.   Removed a lot of whitespace so I could see more code on the screen, to help determine duplication between packet-rtps.c and packet-rtps2.c  Comments/descriptions of fields remain untouched.

The more I trim, the more I think this should all be in a single dissector file, which will be the goal of the next update.  Trying to patch this in somewhat manageable chunks.

Also need to submit sample traces generated for (fuzz)testing.

svn path=/trunk/; revision=48206
2013-03-09 00:21:56 +00:00
Evan Huus 3721df7b19 From Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8414
Fix minor cut-and-paste error in USB-Video dissector caught by cppcheck.

svn path=/trunk/; revision=48205
2013-03-09 00:10:14 +00:00
Guy Harris 0d4763b3e7 Dissect the DCCP header by stepping through it a field at a time and
adding the fields to the protocol tree as we fetch them, rather than
fetching a bunch of them up front.  That way, if the packet was cut
short by a snapshot length, we'll dissect what we have.

Create the top-level tree item at the beginning, with an unknown length,
and set the length when we're done.  If we're putting details into that
item, update the item as we process each field; also update the Info
column as we process each field.

Don't use tvb_bytes_exist() to do our own tvbuff bounds-checking; let
the tvbuffs themselves do that.  Do not use it to do header-length
checking; check the actual header length value instead.

Do not fail if the *captured* data in the tvbuff is too short; we're
selected by an IP protocol number, which we can expect to definitively
identify us, not by a transport-layer port number, which is often an
unreliable identifier.

Do header length checks as we go along, and bail as soon as we identify
the header length as wrong.  (We do the first check once we get the X
bit, so we know whether the generic header is 12 or 16 bytes long.) 
Treat a too-*large* header as a protocol violation, not a malformed
packet indication.

Use tvb_get_ntoh24() and tvb_get_ntoh48() to fetch the sequence number,
rather than fetching it in pieces and putting them together ourselves.

Correctly pluralize "byte".

Don't use tvb_length_remaining() to check whether we have a payload, use
tvb_reported_length_remaining(), so we base it on whether the packet
actually had the data, not on whether we actually captured it.

svn path=/trunk/; revision=48201
2013-03-08 19:56:41 +00:00
Evan Huus 3e919d2b03 Add a debug function (ifdef'ed out by default) and fix another two bugs found by
reading it's output.

svn path=/trunk/; revision=48198
2013-03-08 18:50:34 +00:00
Evan Huus 680d806afc Add another pair of assertions.
svn path=/trunk/; revision=48197
2013-03-08 18:27:29 +00:00
Anders Broman 1b788d4061 Update to V11.5.0 (2012-12).
svn path=/trunk/; revision=48195
2013-03-08 17:55:53 +00:00
Evan Huus 66688f928f Use only simple allocators until I can work out the kinks with the block
allocator.

svn path=/trunk/; revision=48194
2013-03-08 17:52:13 +00:00
Evan Huus 1a78a717ed Should fix assertion failure seen by Anders on -dev.
https://www.wireshark.org/lists/wireshark-dev/201303/msg00081.html

svn path=/trunk/; revision=48193
2013-03-08 17:51:45 +00:00
Anders Broman 4237d33ab8 Add new SIP headers.
svn path=/trunk/; revision=48192
2013-03-08 16:53:14 +00:00
Evan Huus 826c14b456 From Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8414
Dissector for USBVIDEO.

svn path=/trunk/; revision=48190
2013-03-08 14:25:55 +00:00
Pascal Quantin d915e3c04f Prettify a bit dissection of sr-ProhibitTimer-r9 and drxShortCycleTimer
svn path=/trunk/; revision=48188
2013-03-08 08:19:26 +00:00
Anders Broman 2cc8731bec From beroset:
remove C++ incompatibilities

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

svn path=/trunk/; revision=48185
2013-03-08 06:06:56 +00:00
Evan Huus c6c7efd1a7 From Max Baker via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8431
Add a few member variables to the USB conversation structure, necessary
for a USB PTP dissector.

svn path=/trunk/; revision=48184
2013-03-07 23:57:43 +00:00
Martin Kaiser 24fe8f7fb2 correctly mark the payload for unknown extension tags
(fixes a bug introduced by my previous commit)

svn path=/trunk/; revision=48181
2013-03-07 22:06:18 +00:00
Guy Harris f7e497a522 Properly pluralize "octet" for the Extended Capabilities tag.
If we don't decode a tag, just say "Undecoded" on the top-level item;
the tag name or number is already on that item, and the length is
underneath it.

svn path=/trunk/; revision=48180
2013-03-07 21:42:01 +00:00
Martin Kaiser d96c8ee09d dissect Supplementary Audio Descriptor as defined in EN300468
svn path=/trunk/; revision=48176
2013-03-07 19:14:11 +00:00
Martin Kaiser faed099b43 use defines for extension tags
svn path=/trunk/; revision=48175
2013-03-07 19:05:45 +00:00
Pascal Quantin aec6d0a755 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from ssl and ssh files

svn path=/trunk/; revision=48174
2013-03-07 18:37:58 +00:00
Pascal Quantin 85048f5a96 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from packet-nfs.c

svn path=/trunk/; revision=48172
2013-03-07 18:09:23 +00:00
Michael Tüxen 15501fad2a Try to fix the buildbots.
The patch for capture_dlg.c is from Anders...

svn path=/trunk/; revision=48164
2013-03-07 12:06:55 +00:00
Irene Rüngeler cb42bc9fec Add buffersize and snap length to the preferences.
svn path=/trunk/; revision=48163
2013-03-07 09:16:55 +00:00
Anders Broman d4e23d8daa Use explicit casts.
svn path=/trunk/; revision=48162
2013-03-07 07:48:33 +00:00
Chris Maynard cfcd6deca1 Avoid a potential divide-by-zero condition.
#BACKPORT(1.8)

svn path=/trunk/; revision=48159
2013-03-07 02:04:41 +00:00
Jeff Morriss f229d12858 Fix the plurality of the length of a data source if it has only 1 byte (I'm
looking at a "Bitstring tvb" that is only 1 byte long).

svn path=/trunk/; revision=48127
2013-03-06 01:53:03 +00:00