Commit Graph

42874 Commits

Author SHA1 Message Date
Evan Huus 0d9522c059 Unify the bzr and git ignore files - they're the exact same format,
so do any necessary cross-pollination and then just make one a symlink
to the other.

svn path=/trunk/; revision=45353
2012-10-06 20:23:37 +00:00
Evan Huus dd26e55049 Ignore qm files in bzr and git.
svn path=/trunk/; revision=45352
2012-10-06 20:20:25 +00:00
Evan Huus 5560416f3a Don't store qm files in svn: they're generated from the ts files and get removed
on a make clean.

svn path=/trunk/; revision=45351
2012-10-06 20:18:28 +00:00
Gerald Combs 4bbbc326c6 Reduce the contrast for many of the rules. Most of the color values were
taken from http://emilis.info/other/extended_tango/ .

svn path=/trunk/; revision=45350
2012-10-06 19:27:48 +00:00
Bill Meier add85b1cbb Remove unneeded code ("[set_but_unused]").
svn path=/trunk/; revision=45347
2012-10-06 15:56:08 +00:00
Ronnie Sahlberg cde73df2e7 ICMP: Icmp was a mad mix of different indentation styles.
indent -kr -i8   for now to make it use a consistent style
No code changes, only formatting in this patch


svn path=/trunk/; revision=45346
2012-10-06 15:53:01 +00:00
Bill Meier 4f578199b5 Minor changes:
- proto_reg_handoff...() called only once: simplify;
- move proto_register...() to just before proto_reg_handoff...() as per convention;
- misc.

svn path=/trunk/; revision=45345
2012-10-06 15:52:14 +00:00
Evan Huus 25103896f9 Remove unused variable caught by cppcheck.
svn path=/trunk/; revision=45344
2012-10-06 15:39:21 +00:00
Ronnie Sahlberg 1693627478 ICMP request/response matching fixes
Change icmp request/response matching to be more aligned to other matching
strategies and use two tables. One table for first time we visit a packet
and a second table to track all confirmed matches.


svn path=/trunk/; revision=45343
2012-10-06 15:06:00 +00:00
Martin Mathieson 62d83ed0c8 Give up trying to parse those lines - the format has changed and its too
complicated now.

svn path=/trunk/; revision=45342
2012-10-06 15:00:38 +00:00
Martin Mathieson 5bd351fb32 Look up once and store the RLC and PDCP dissectors.
svn path=/trunk/; revision=45341
2012-10-06 14:59:51 +00:00
Jaap Keuter c80ed42fc6 Vastly improve the debug presentation( of trees)+.
svn path=/trunk/; revision=45340
2012-10-06 14:35:59 +00:00
Evan Huus dfd86092f2 Fix error caught by valgrind where we were running off the end of a
variable because we were passing the address of a single guint8 as a
char*. Work around it by making the guint8 an array and filling the last
element with 0 as if it were a null-terminated string.

svn path=/trunk/; revision=45339
2012-10-06 14:23:44 +00:00
Pascal Quantin 062ad6bad1 pinfo is now used
svn path=/trunk/; revision=45338
2012-10-06 10:03:41 +00:00
Pascal Quantin 75dd452b24 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7801 :
Ensure that the sub-type length is at least 2 (for sub-type and length fields).
Prevents an infinite loop when the length equals 0.

svn path=/trunk/; revision=45337
2012-10-06 10:01:59 +00:00
Martin Mathieson 0e32b4e2ef Use ellipses rather than crosses made from lines to show data points,
and no longer connect the data points with lines.

Because this is slower than before, increase the zoom multipler.

The (very) slow part is filling in the circles - using
cairo_set_tolerance() with 1.0 doesn't do anti-aliasing but looks good
enough (halfing the time for this operation).

svn path=/trunk/; revision=45336
2012-10-06 00:56:55 +00:00
Martin Mathieson 3884220435 Fix some indentation, add missing braces, and don't bother calling
cairo_set_width() inside the loops while doing the axes.

svn path=/trunk/; revision=45335
2012-10-06 00:23:23 +00:00
Chris Maynard 5ef60b46a3 We are already saving size and maximized state by default. Save position too.
svn path=/trunk/; revision=45334
2012-10-05 21:58:45 +00:00
Gerald Combs 71ed773862 Add a capture_file * element to packet_range_t and pass it explicitly in
packet_range_init(). Get rid of global cfile references in
packet-range.c. C++-ize packet-range.h. Shuffle some includes around.

svn path=/trunk/; revision=45333
2012-10-05 18:52:42 +00:00
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