Commit Graph

45437 Commits

Author SHA1 Message Date
Gerald Combs a7cef5b7c8 Prettify the WinPcap version display.
svn path=/trunk/; revision=48250
2013-03-11 19:12:17 +00:00
Jeff Morriss 965cb6384e Followup to r48218: remove documentation of the WIRESHARK_DEBUG_USE_SLICES environment variable.
svn path=/trunk/; revision=48249
2013-03-11 18:04:46 +00:00
Bill Meier 48d769db85 Add Peter Hatina;
Do a few other minor edits.

svn path=/trunk/; revision=48247
2013-03-11 17:33:41 +00:00
Bill Meier f97e7fa8ee Update GTK3 port status.
svn path=/trunk/; revision=48245
2013-03-11 17:26:03 +00:00
Bill Meier 978d314630 GTK3 "expand" handling changes.
As suggested by Peter Hatini in the patch attached to Bug #8315.

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


svn path=/trunk/; revision=48244
2013-03-11 17:15:54 +00:00
Bill Meier 5662419a06 Remove leftover "//".
svn path=/trunk/; revision=48242
2013-03-11 16:28:11 +00:00
Bill Meier ed9c682383 From the proposed patch by Peter Hatina in Bug #8315.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8315


svn path=/trunk/; revision=48241
2013-03-11 16:18:41 +00:00
Bill Meier db5727f34c Set the "Capture Options" window as the parent ('transient_for') of the "Interface Management" window.
svn path=/trunk/; revision=48240
2013-03-11 15:46:04 +00:00
Anders Broman ac2515ee6f Use explicit casts.
svn path=/trunk/; revision=48239
2013-03-11 06:47:34 +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
Bill Meier 60b9be7c7b "Capture ! Options ! Manage Interfaces": Cleanup handling of Window epansion.
Improves 'expand' handling for both Gtk2 & Gtk3;

Adapted (with additions by me) from a proposed patch by Peter Hatina (Bug #8315).

Also:

1. Don't use gtk_widget_set_size() in several cases when a single use of
   gtk_window_set_default_size() for the "Manage Interfaces" window is sufficient.

2. Add an XXX comment as to a specific call to 'gtk_window_destroy_with_parent'
   actually being a no-op on Windows.

svn path=/trunk/; revision=48237
2013-03-11 01:11:38 +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
Anders Broman 98387d0498 Use explicit casts.
svn path=/trunk/; revision=48232
2013-03-10 16:56:40 +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 419d10656e Update usage info for valgrind script. We almost need a proper man page for
this now.

svn path=/trunk/; revision=48230
2013-03-10 15:07:42 +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
Michael Tüxen da07699dd3 Make the memory limit (in bytes or packets) used for storing packets
configurable via command line options and print specific drop numbers
at the end. This allows to tune the buffering when using multiple
threads.
This also fixes a logic arrow in enforcing the limits.
The patch for the enhanced counters is from Anders Broman.


svn path=/trunk/; revision=48223
2013-03-10 11:57:40 +00:00
Michael Tüxen 58f61d29c7 Only cast the variable after checking it.
svn path=/trunk/; revision=48222
2013-03-10 11:51:25 +00:00
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