Commit Graph

45613 Commits

Author SHA1 Message Date
Michael Tüxen 0bbf82a38a Add -t to synopsis.
svn path=/trunk/; revision=48221
2013-03-10 11:40:46 +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 deefa09237 Use explicit casts.
svn path=/trunk/; revision=48217
2013-03-09 17:33:15 +00:00
Jakub Zawadzki 7b9a23a53a [NPL] Misc fixes
svn path=/trunk/; revision=48216
2013-03-09 15:53:30 +00:00
Evan Huus 91cec2a12e From Thomas Wiens via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8455
Don't add an extra 16 to offset, we've been updating it as we go. Fixes cases
where valid AMS packets were marked as malformed.

svn path=/trunk/; revision=48215
2013-03-09 13:47:08 +00:00
Evan Huus 1fbece78ab Two instances of s/delete/delete_id/ to satisfy C++ that were missed in
r48212 and were causing build failures.

svn path=/trunk/; revision=48214
2013-03-09 12:21:00 +00:00
Anders Broman 0685f1d5e1 Update lex and yacc
svn path=/trunk/; revision=48213
2013-03-09 10:10:32 +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
Jeff Morriss 23c06af6b3 Update URLs to specs.
svn path=/trunk/; revision=48208
2013-03-09 01:35:58 +00:00
Gerald Combs 7613251d1c Switch to WinPcap 4.1.3.
svn path=/trunk/; revision=48207
2013-03-09 01:20:09 +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
Jeff Morriss 6eb2e2899a freekdesktop.org says all themes must fall back to 'hicolor' if they don't find
a theme-specific icon (and as such hicolor is where applications should
install their icons).  So: don't install some of our icons in the gnome area,
install them all in hicolor.

While we're at it, go ahead and install all the icon sizes we have.

If we're on SuSE, use their desktop-file-updater macro; without that they
won't recognize our desktop file.

Fix bug which prevented the MIME database from being updated if our install
prefix is not /usr .

svn path=/trunk/; revision=48204
2013-03-08 23:40:37 +00:00
Jeff Morriss cfbba71508 The Icon is not supposed to have an extension; remove it.
svn path=/trunk/; revision=48203
2013-03-08 23:04:52 +00:00
Anders Broman 58fd156d97 Use explicit casts.
svn path=/trunk/; revision=48202
2013-03-08 22:10:06 +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
Gerald Combs a606a88647 Add /SD defaults to every MessageBox call (even if they're commented
out). Fixes bug 8451.

Don't yell at the user so much.

svn path=/trunk/; revision=48196
2013-03-08 18:23:58 +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
Gerald Combs ac364779f7 Switch to c-ares 1.9.1.
svn path=/trunk/; revision=48191
2013-03-08 16:51:21 +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
Irene Rüngeler 00d64fade2 Don't try to show an IP address if none is present.
svn path=/trunk/; revision=48189
2013-03-08 09:00:48 +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 5147d6cffa Use explicit casts.
svn path=/trunk/; revision=48187
2013-03-08 07:09:39 +00:00
Anders Broman 48ac65e5d6 Use explicit casts.
svn path=/trunk/; revision=48186
2013-03-08 06:07: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
Anders Broman 76fd64bd9f Use explicit casts.
svn path=/trunk/; revision=48183
2013-03-07 22:57:36 +00:00
Anders Broman dc505fd90e Make the prefernce settings work.
svn path=/trunk/; revision=48182
2013-03-07 22:57:11 +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
Anders Broman ed87ba43a6 Use explicit casts.
svn path=/trunk/; revision=48179
2013-03-07 19:52:33 +00:00
Jakub Zawadzki e4ebcf4469 [NPL] Simplify parser for EXPRESSION_FIELD (Expression, ".", ID)
svn path=/trunk/; revision=48178
2013-03-07 19:38:35 +00:00
Bill Meier e59c185dae Fix proto stats window size allocation so it works with GTK3.
(adapted from a suggested patch by Peter Hatina in Bug #8315)
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8315)

From me:
 Widen the default width to show all the columns when the window is opened.

svn path=/trunk/; revision=48177
2013-03-07 19:25:36 +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 27a334560e From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from capture.c

svn path=/trunk/; revision=48173
2013-03-07 18:25:25 +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
Pascal Quantin c2862992b9 Revert part of r48021: those hunks are no more needed with r48170
svn path=/trunk/; revision=48171
2013-03-07 17:39:20 +00:00
Gerald Combs 29ceca1b26 From Balint:
[PATCH 1/2] Revert "Try to fix the "LNK4217: locally defined symbol"
warnings.

This reverts commit r48158.

[PATCH 2/2] Employ small hack in editcap to link with a few objects from
libwireshark properly


From me:

Add the ability to reset symbol exports via ws_symbol_export.h's include
guard and do so in capinfos.c and editcap.c. We include ws_symbol_export.h
in over 200 files so it didn't seem to make sense to remove its include
guard entirely.

svn path=/trunk/; revision=48170
2013-03-07 17:20:12 +00:00