Commit Graph

42855 Commits

Author SHA1 Message Date
Gerald Combs dec2d034b0 Try to describe icmp.resp_in and icmp.resp_to more clearly.
svn path=/trunk/; revision=45332
2012-10-05 16:04:04 +00:00
Chris Maynard b436d64d55 A minor modification to Stephen Fisher's r34265 patch to [attempt to] resolve bug 553. This change takes into account that viewable_area.[x|y] may not be 0,0. Will this finally fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=553 ?Unknown, but I am unable to reproduce it.
svn path=/trunk/; revision=45331
2012-10-05 14:51:31 +00:00
Pascal Quantin 9bcae55a34 Fix copy/paste error
svn path=/trunk/; revision=45330
2012-10-05 04:48:51 +00:00
Guy Harris f569edbcef The sFlow specification says there's an address type "unknown", with an
address type value of 0, and with zero bytes of address; handle it
explicitly, and don't treat it as an error.

In the sFlow dissectors, do all the checks for "is this an sFlow
packet?" *before* we do anything to the columns and the protocol tree.

svn path=/trunk/; revision=45329
2012-10-05 01:17:33 +00:00
Gerald Combs 113d731ed8 Remove the previous distribution file.
svn path=/trunk/; revision=45328
2012-10-04 22:51:23 +00:00
Pascal Quantin 04ba20fa0e Upgrade NAS dissector to v11.4.0 (Release 11)
svn path=/trunk/; revision=45325
2012-10-04 21:23:06 +00:00
Martin Kaiser 6afaa3ed63 fix fuzz test failures in sflow
in dissect_sflow_245_address_type(), don't reset the offset to 0 when
the address family is unkown
bring up an expert info instead and increment offset by the number of
bytes processed

svn path=/trunk/; revision=45324
2012-10-04 19:51:00 +00:00
Gerald Combs 361063457e Add a "patch-bzip2" target which creates a patch from the previous micro
release.

svn path=/trunk/; revision=45323
2012-10-04 19:37:03 +00:00
Jaap Keuter 4bcc01b5bd From Sven Eckelmann:
Fix dissection of IEEE 802.11 Channel Switch Announcement element.

svn path=/trunk/; revision=45321
2012-10-04 19:30:15 +00:00
Bill Meier 0a0b4aecbf Modify use of GtkTable in preparation for using GtkGrid instead if GTK3.
Specifically:
 - keep track of number of table rows instead of using gtk_table_get_size();
 - remove call to gtk_table_resize() [not required].

svn path=/trunk/; revision=45320
2012-10-04 19:29:54 +00:00
Guy Harris 1ef26ea00f Fix tpyo.
svn path=/trunk/; revision=45318
2012-10-04 18:49:35 +00:00
Guy Harris 79b3cd9989 For VS 2010 EE, when building 64-bit, indicate why you need the SDK (to
compilers that generate 64-bit code).

svn path=/trunk/; revision=45317
2012-10-04 18:46:39 +00:00
Guy Harris 6d0f0a4ccc Fix swapped column headings.
svn path=/trunk/; revision=45316
2012-10-04 18:33:09 +00:00
Guy Harris d42dff7973 Clarify what the problem is with building PortableApps or U3 packages
with Visual Studio Express Edition - the resulting package cannot be
self-contained and will require that the Visual C++ Redistributables be
installed on any machine into which you plug the portable Wireshark
package, which kinda defeats the purpose of a portable package (plug it
in and go).

svn path=/trunk/; revision=45315
2012-10-04 18:31:18 +00:00
Alexis La Goutte 2d8a0b5158 Update translation files
Updating 'qtshark_de.ts'...
    Found 198 source text(s) (135 new and 63 already existing)
    Kept 9 obsolete entries
Updating 'qtshark_fr.ts'...
    Found 198 source text(s) (135 new and 63 already existing)
    Kept 9 obsolete entries


svn path=/trunk/; revision=45314
2012-10-04 18:26:37 +00:00
Martin Mathieson 3f3743834b This is basically a rewrite from Jakub Zawadzki.
Rather than store the FrameRecord entries in a sorted linked list,
instead use an unsorted GPtrArray, then sort it all at once.

Also, there is no longer the option to limit the amount of sorting (and memory
used), but a new option means we can avoid writing the output file
altogether if the input file is found already to be in order.

svn path=/trunk/; revision=45313
2012-10-04 18:24:21 +00:00
Alexis La Goutte 79d7ae18aa Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45312
2012-10-04 18:16:08 +00:00
Guy Harris 061131b172 For each toolchain version, split the stuff about Microsoft.VC{n}.CRT
and vcredist_{processor}.exe into three paragraphs, and put the bit
about vcredist_{64-bit processor}.exe into the paragraph about 64-bit
targets.

svn path=/trunk/; revision=45311
2012-10-04 17:01:38 +00:00
Martin Kaiser a0ce1f8fc2 try to fix usb-related fuzz test crashes
in dissect_usb_interface_descriptor() and
dissect_usb_endpoint_descriptor, the offset should be incremented
depending on the number of bytes we dissected, not based on the len
field (len field==0 would then cause an endless loop)

also fixed one occurrence of old_offset-offset, that's probably a typo,
the values will always be negative...

svn path=/trunk/; revision=45310
2012-10-04 15:37:38 +00:00
Bill Meier 54e814970d Simplify use of GtkTable in preparation for using GtkGrid instead if GTK3.
Specifically: remove/replace use of gtk_table_resize().

Also: minor indentation and whitespace cleanup;

svn path=/trunk/; revision=45309
2012-10-04 15:35:10 +00:00
Martin Kaiser e8205fb955 From Alexander Koeppe
support for EPRT command as defined in RFC 2428 (IPv4 addresses only)

from me
simplify the code, expert info must not be under if(tree)

based on the submission in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7729

svn path=/trunk/; revision=45308
2012-10-04 14:35:09 +00:00
Guy Harris 066c17c4e0 Note that we redistribute "using Visual C++ Redistributable Package" for
*all* 64-bit builds, regardless of whether you have Visual Studio Express
Edition or not.

You only need to download the redistributable package when you're using
the Express Edition or are doing 64-bit builds.

svn path=/trunk/; revision=45307
2012-10-04 07:19:13 +00:00
Guy Harris 75672d926d Reflect current reality as it exists in Makefile.nmake - even with
MSVC2008 and MSVC2010, when doing 32-bit builds, with the non-Express
versions we "Install a particular Visual C++ assembly as a private
assembly for the application", if for no other reason than to support
"portable" versions of Wireshark, where the application is provided a a
completely self-contained directory tree on a medium such as a flash
drive, and where there is no installer to install anything on the target
machine.  For 64-bit builds, we currently don't support a "portable"
version, so we "Use the Visual C++ Redistributable Package".

Convert tabs to spaces.

svn path=/trunk/; revision=45306
2012-10-04 05:10:11 +00:00
Guy Harris 97ec1b176d Expand comments about the "making the C runtime available to Wireshark"
stuff.

svn path=/trunk/; revision=45305
2012-10-04 04:54:58 +00:00
Guy Harris 4e0c2b4d09 Close up space between opening quote and "Choosing a Deployment Method".
svn path=/trunk/; revision=45304
2012-10-04 04:02:57 +00:00
Guy Harris 99147c7b11 Oops, get rid of a cut-and-pasteo extra <para> tag.
svn path=/trunk/; revision=45303
2012-10-04 03:30:40 +00:00
Guy Harris 1fb353e77b For VS 2005, also mention the IA-64 vcredist the first time we mention
the versions of vcredist, just in case anybody is building for Itanium. 
The second time we mention them, mention all three, not just the 32-bit
x86 version.  Rewrite the sentence for that a bit - it's not as if MSVC
uses particular deployment methods, those were chosen by the Wireshark
development team.

For VS 2008, note that Microsoft mentions all three redistribution
mechanisms, and link to the "Choosing a Deployment Method" page for VS
2008 (which looks as if Microsoft didn't do a good job of editing it
after copying-and-pasting the 2005 version, or didn't set up ASP or
whatever it is that supplies VS-specific versions of the pages
correctly).

For VS 2010, note that Microsoft mentions all three redistribution
mechanisms, link to the "Choosing a Deployment Method" page for VS 2010,
and note that it recommends the method we chose and gives it as as the
first method.

svn path=/trunk/; revision=45302
2012-10-04 02:53:15 +00:00
Guy Harris e64724222e For each of the 3 ways to redistribute Visual C++ libraries, give them
tags from the "Redistributing Visual C++ libraries" section of the MSDN
"Choosing a Deployment Method" page, and put them in the same order as
the three methods mentioned on that page (which means swapping the
second and third ways in the list, so "method 2" becomes "method 3" and
"method 3" becomes "method 2".

svn path=/trunk/; revision=45301
2012-10-04 01:44:17 +00:00
Guy Harris 96bc499fd8 Include packet-range.h on Windows - file_dlg_win32.h uses
packet_range_t, which is defined in packet-range.h.

svn path=/trunk/; revision=45300
2012-10-03 20:48:27 +00:00
Gerald Combs 13a2e931b7 Remove more obsolete _MSC_VER code.
svn path=/trunk/; revision=45299
2012-10-03 20:23:51 +00:00
Gerald Combs bdd98d63cd Fix compilation on Windows. Add back and fix function definitions,
fix doxygen d ocumentation, other fixes.

svn path=/trunk/; revision=45298
2012-10-03 19:45:05 +00:00
Bill Meier c74466c744 (Trivial): add some whitespace for readability.
svn path=/trunk/; revision=45297
2012-10-03 19:43:36 +00:00
Gerald Combs bcd2cea774 Unify the GTK+ and Win32 versions of "Export Specified Packets". Add a
shared "file_add_extension" routine. We no longer support _MSC_VER <
1400 so get rid of some clutter. Add a gzip checkbox to the Win32 export
packets dialog. Windows code hasn't yet been tested (and is likely
broken). I'll fix it shortly.

svn path=/trunk/; revision=45296
2012-10-03 19:24:14 +00:00
Pascal Quantin 191dd647a1 Display the raw PFI next to the translated one (as a value string array would do) so as to reduce a bit confusion
svn path=/trunk/; revision=45295
2012-10-03 18:09:04 +00:00
Gerald Combs 52972458e8 Add the command and arguments to the error file.
svn path=/trunk/; revision=45294
2012-10-03 18:03:12 +00:00
Martin Mathieson afbf3cd596 Add a command-line option to control how large the reordering list can
become.  The default is now 0 (infinite).

svn path=/trunk/; revision=45293
2012-10-03 18:03:01 +00:00
Jörg Mayer 218aaf05e3 capinfos needs libwsutil. Explicitely link against it.
svn path=/trunk/; revision=45292
2012-10-03 17:31:23 +00:00
Jörg Mayer 4844896d63 Add manpages for reordercap
svn path=/trunk/; revision=45291
2012-10-03 17:29:06 +00:00
Martin Mathieson 6a99c30e53 Fix a spelling mistake.
svn path=/trunk/; revision=45290
2012-10-03 17:06:22 +00:00
Gerald Combs a5b9de38b4 Fix return code checking (hopefully).
svn path=/trunk/; revision=45289
2012-10-03 16:39:35 +00:00
Bill Meier ac6e9cbb8b Trivial: use consistent indentation; reformat a long line.
svn path=/trunk/; revision=45288
2012-10-03 16:20:22 +00:00
Bill Meier 68aeb27b90 (Trivial): update a comment.
svn path=/trunk/; revision=45287
2012-10-03 15:42:41 +00:00
Bill Meier d882372200 *nix: Test return status of set*uid and related set*gid fcns for failure;
This fixes gcc compiler errors [-Werror=unused-result]  caused by the recent addition
of the "__wur" (warn_unused_result) attribute to the declarations of these functions in
unistd.h.

svn path=/trunk/; revision=45286
2012-10-03 15:22:31 +00:00
Martin Mathieson 08a1014c31 Also add the reordercap help files to CLEANFILES.
svn path=/trunk/; revision=45285
2012-10-03 14:13:02 +00:00
Jakub Zawadzki 3be454cb3b Add reordercap.pod to EXTRA_DIST
svn path=/trunk/; revision=45284
2012-10-03 13:35:00 +00:00
Jakub Zawadzki 701f33e126 Fix copy-paste bug.
it should also fix bulding error:
 Can't open ../../doc/reordercap.pod: No such file or directory at /usr/bin/pod2man line 60

svn path=/trunk/; revision=45283
2012-10-03 13:31:04 +00:00
Martin Mathieson 181cb3e036 Add a man page for reordercap.
svn path=/trunk/; revision=45282
2012-10-03 12:22:08 +00:00
Martin Mathieson bf370afa44 When drawing an axis, only call cairo_stroke once all lines are drawn.
svn path=/trunk/; revision=45281
2012-10-03 09:15:16 +00:00
Martin Mathieson a273e4a913 Submit Jacub's fix for bug 7771 (hanging while drawing graph types that
involved ellipses). cairo_save/restore is nicer than
cairo_create/destroy, and quite a bit quicker too.

svn path=/trunk/; revision=45280
2012-10-03 08:58:12 +00:00
Guy Harris 50c8d588c6 Oops, match opening and closing tags.
svn path=/trunk/; revision=45279
2012-10-03 08:02:34 +00:00