metze/wireshark/wip.git
11 years agoAdd a capture_file * element to packet_range_t and pass it explicitly in
Gerald Combs [Fri, 5 Oct 2012 18:52:42 +0000 (18:52 -0000)]
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

11 years agoTry to describe icmp.resp_in and icmp.resp_to more clearly.
Gerald Combs [Fri, 5 Oct 2012 16:04:04 +0000 (16:04 -0000)]
Try to describe icmp.resp_in and icmp.resp_to more clearly.

svn path=/trunk/; revision=45332

11 years agoA minor modification to Stephen Fisher's r34265 patch to [attempt to] resolve bug...
Chris Maynard [Fri, 5 Oct 2012 14:51:31 +0000 (14:51 -0000)]
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

11 years agoFix copy/paste error
Pascal Quantin [Fri, 5 Oct 2012 04:48:51 +0000 (04:48 -0000)]
Fix copy/paste error

svn path=/trunk/; revision=45330

11 years agoThe sFlow specification says there's an address type "unknown", with an
Guy Harris [Fri, 5 Oct 2012 01:17:33 +0000 (01:17 -0000)]
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

11 years agoRemove the previous distribution file.
Gerald Combs [Thu, 4 Oct 2012 22:51:23 +0000 (22:51 -0000)]
Remove the previous distribution file.

svn path=/trunk/; revision=45328

11 years agoUpgrade NAS dissector to v11.4.0 (Release 11)
Pascal Quantin [Thu, 4 Oct 2012 21:23:06 +0000 (21:23 -0000)]
Upgrade NAS dissector to v11.4.0 (Release 11)

svn path=/trunk/; revision=45325

11 years agofix fuzz test failures in sflow
Martin Kaiser [Thu, 4 Oct 2012 19:51:00 +0000 (19:51 -0000)]
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

11 years agoAdd a "patch-bzip2" target which creates a patch from the previous micro
Gerald Combs [Thu, 4 Oct 2012 19:37:03 +0000 (19:37 -0000)]
Add a "patch-bzip2" target which creates a patch from the previous micro
release.

svn path=/trunk/; revision=45323

11 years agoFrom Sven Eckelmann:
Jaap Keuter [Thu, 4 Oct 2012 19:30:15 +0000 (19:30 -0000)]
From Sven Eckelmann:
Fix dissection of IEEE 802.11 Channel Switch Announcement element.

svn path=/trunk/; revision=45321

11 years agoModify use of GtkTable in preparation for using GtkGrid instead if GTK3.
Bill Meier [Thu, 4 Oct 2012 19:29:54 +0000 (19:29 -0000)]
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

11 years agoFix tpyo.
Guy Harris [Thu, 4 Oct 2012 18:49:35 +0000 (18:49 -0000)]
Fix tpyo.

svn path=/trunk/; revision=45318

11 years agoFor VS 2010 EE, when building 64-bit, indicate why you need the SDK (to
Guy Harris [Thu, 4 Oct 2012 18:46:39 +0000 (18:46 -0000)]
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

11 years agoFix swapped column headings.
Guy Harris [Thu, 4 Oct 2012 18:33:09 +0000 (18:33 -0000)]
Fix swapped column headings.

svn path=/trunk/; revision=45316

11 years agoClarify what the problem is with building PortableApps or U3 packages
Guy Harris [Thu, 4 Oct 2012 18:31:18 +0000 (18:31 -0000)]
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

11 years agoUpdate translation files
Alexis La Goutte [Thu, 4 Oct 2012 18:26:37 +0000 (18:26 -0000)]
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

11 years agoThis is basically a rewrite from Jakub Zawadzki.
Martin Mathieson [Thu, 4 Oct 2012 18:24:21 +0000 (18:24 -0000)]
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

11 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Thu, 4 Oct 2012 18:16:08 +0000 (18:16 -0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=45312

11 years agoFor each toolchain version, split the stuff about Microsoft.VC{n}.CRT
Guy Harris [Thu, 4 Oct 2012 17:01:38 +0000 (17:01 -0000)]
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

11 years agotry to fix usb-related fuzz test crashes
Martin Kaiser [Thu, 4 Oct 2012 15:37:38 +0000 (15:37 -0000)]
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

11 years agoSimplify use of GtkTable in preparation for using GtkGrid instead if GTK3.
Bill Meier [Thu, 4 Oct 2012 15:35:10 +0000 (15:35 -0000)]
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

11 years agoFrom Alexander Koeppe
Martin Kaiser [Thu, 4 Oct 2012 14:35:09 +0000 (14:35 -0000)]
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

11 years agoNote that we redistribute "using Visual C++ Redistributable Package" for
Guy Harris [Thu, 4 Oct 2012 07:19:13 +0000 (07:19 -0000)]
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

11 years agoReflect current reality as it exists in Makefile.nmake - even with
Guy Harris [Thu, 4 Oct 2012 05:10:11 +0000 (05:10 -0000)]
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

11 years agoExpand comments about the "making the C runtime available to Wireshark"
Guy Harris [Thu, 4 Oct 2012 04:54:58 +0000 (04:54 -0000)]
Expand comments about the "making the C runtime available to Wireshark"
stuff.

svn path=/trunk/; revision=45305

11 years agoClose up space between opening quote and "Choosing a Deployment Method".
Guy Harris [Thu, 4 Oct 2012 04:02:57 +0000 (04:02 -0000)]
Close up space between opening quote and "Choosing a Deployment Method".

svn path=/trunk/; revision=45304

11 years agoOops, get rid of a cut-and-pasteo extra <para> tag.
Guy Harris [Thu, 4 Oct 2012 03:30:40 +0000 (03:30 -0000)]
Oops, get rid of a cut-and-pasteo extra <para> tag.

svn path=/trunk/; revision=45303

11 years agoFor VS 2005, also mention the IA-64 vcredist the first time we mention
Guy Harris [Thu, 4 Oct 2012 02:53:15 +0000 (02:53 -0000)]
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

11 years agoFor each of the 3 ways to redistribute Visual C++ libraries, give them
Guy Harris [Thu, 4 Oct 2012 01:44:17 +0000 (01:44 -0000)]
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

11 years agoInclude packet-range.h on Windows - file_dlg_win32.h uses
Guy Harris [Wed, 3 Oct 2012 20:48:27 +0000 (20:48 -0000)]
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

11 years agoRemove more obsolete _MSC_VER code.
Gerald Combs [Wed, 3 Oct 2012 20:23:51 +0000 (20:23 -0000)]
Remove more obsolete _MSC_VER code.

svn path=/trunk/; revision=45299

11 years agoFix compilation on Windows. Add back and fix function definitions,
Gerald Combs [Wed, 3 Oct 2012 19:45:05 +0000 (19:45 -0000)]
Fix compilation on Windows. Add back and fix function definitions,
fix doxygen d ocumentation, other fixes.

svn path=/trunk/; revision=45298

11 years ago(Trivial): add some whitespace for readability.
Bill Meier [Wed, 3 Oct 2012 19:43:36 +0000 (19:43 -0000)]
(Trivial): add some whitespace for readability.

svn path=/trunk/; revision=45297

11 years agoUnify the GTK+ and Win32 versions of "Export Specified Packets". Add a
Gerald Combs [Wed, 3 Oct 2012 19:24:14 +0000 (19:24 -0000)]
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

11 years agoDisplay the raw PFI next to the translated one (as a value string array would do...
Pascal Quantin [Wed, 3 Oct 2012 18:09:04 +0000 (18:09 -0000)]
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

11 years agoAdd the command and arguments to the error file.
Gerald Combs [Wed, 3 Oct 2012 18:03:12 +0000 (18:03 -0000)]
Add the command and arguments to the error file.

svn path=/trunk/; revision=45294

11 years agoAdd a command-line option to control how large the reordering list can
Martin Mathieson [Wed, 3 Oct 2012 18:03:01 +0000 (18:03 -0000)]
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

11 years agocapinfos needs libwsutil. Explicitely link against it.
Jörg Mayer [Wed, 3 Oct 2012 17:31:23 +0000 (17:31 -0000)]
capinfos needs libwsutil. Explicitely link against it.

svn path=/trunk/; revision=45292

11 years agoAdd manpages for reordercap
Jörg Mayer [Wed, 3 Oct 2012 17:29:06 +0000 (17:29 -0000)]
Add manpages for reordercap

svn path=/trunk/; revision=45291

11 years agoFix a spelling mistake.
Martin Mathieson [Wed, 3 Oct 2012 17:06:22 +0000 (17:06 -0000)]
Fix a spelling mistake.

svn path=/trunk/; revision=45290

11 years agoFix return code checking (hopefully).
Gerald Combs [Wed, 3 Oct 2012 16:39:35 +0000 (16:39 -0000)]
Fix return code checking (hopefully).

svn path=/trunk/; revision=45289

11 years agoTrivial: use consistent indentation; reformat a long line.
Bill Meier [Wed, 3 Oct 2012 16:20:22 +0000 (16:20 -0000)]
Trivial: use consistent indentation; reformat a long line.

svn path=/trunk/; revision=45288

11 years ago(Trivial): update a comment.
Bill Meier [Wed, 3 Oct 2012 15:42:41 +0000 (15:42 -0000)]
(Trivial): update a comment.

svn path=/trunk/; revision=45287

11 years ago*nix: Test return status of set*uid and related set*gid fcns for failure;
Bill Meier [Wed, 3 Oct 2012 15:22:31 +0000 (15:22 -0000)]
*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

11 years agoAlso add the reordercap help files to CLEANFILES.
Martin Mathieson [Wed, 3 Oct 2012 14:13:02 +0000 (14:13 -0000)]
Also add the reordercap help files to CLEANFILES.

svn path=/trunk/; revision=45285

11 years agoAdd reordercap.pod to EXTRA_DIST
Jakub Zawadzki [Wed, 3 Oct 2012 13:35:00 +0000 (13:35 -0000)]
Add reordercap.pod to EXTRA_DIST

svn path=/trunk/; revision=45284

11 years agoFix copy-paste bug.
Jakub Zawadzki [Wed, 3 Oct 2012 13:31:04 +0000 (13:31 -0000)]
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

11 years agoAdd a man page for reordercap.
Martin Mathieson [Wed, 3 Oct 2012 12:22:08 +0000 (12:22 -0000)]
Add a man page for reordercap.

svn path=/trunk/; revision=45282

11 years agoWhen drawing an axis, only call cairo_stroke once all lines are drawn.
Martin Mathieson [Wed, 3 Oct 2012 09:15:16 +0000 (09:15 -0000)]
When drawing an axis, only call cairo_stroke once all lines are drawn.

svn path=/trunk/; revision=45281

11 years agoSubmit Jacub's fix for bug 7771 (hanging while drawing graph types that
Martin Mathieson [Wed, 3 Oct 2012 08:58:12 +0000 (08:58 -0000)]
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

11 years agoOops, match opening and closing tags.
Guy Harris [Wed, 3 Oct 2012 08:02:34 +0000 (08:02 -0000)]
Oops, match opening and closing tags.

svn path=/trunk/; revision=45279

11 years agoGet rid of the "Install MSVC the usual way" paragraph - the previous
Guy Harris [Wed, 3 Oct 2012 07:38:01 +0000 (07:38 -0000)]
Get rid of the "Install MSVC the usual way" paragraph - the previous
paragraphs give more details on how to install, and the stuff about
vcvars32.bat is given later, in more detail.

While we're at it, fix another reference to vcvars32 to also refer to
vcvarsall.

svn path=/trunk/; revision=45278

11 years agoMove the stuff about setting environment variables to the "setting up
Guy Harris [Wed, 3 Oct 2012 07:20:32 +0000 (07:20 -0000)]
Move the stuff about setting environment variables to the "setting up
cmd.exe" section.

svn path=/trunk/; revision=45277

11 years agoRedo the "set the environment variables" section to fill in all parts of
Guy Harris [Wed, 3 Oct 2012 07:14:47 +0000 (07:14 -0000)]
Redo the "set the environment variables" section to fill in all parts of
the "32-bit vs. 64-bit build machine" vs. "32-bit vs. 64-bit target"
matrix.  Use the correct paths ("Visual Studio 10.0", not "Visual Studio
10" - an MSDN page uses the latter, but my virtual machine shows the
former; add "(x86)" to "Program Files" on 64-bit machines, as the batch
files are installed in 32-bitland).

svn path=/trunk/; revision=45276

11 years ago8 columns now.
Guy Harris [Wed, 3 Oct 2012 00:28:19 +0000 (00:28 -0000)]
8 columns now.

svn path=/trunk/; revision=45275

11 years agoOK, more columns, so narrower?
Guy Harris [Wed, 3 Oct 2012 00:23:16 +0000 (00:23 -0000)]
OK, more columns, so narrower?

svn path=/trunk/; revision=45274

11 years agoGo figure. Something that's not on the top or bottom is in the
Guy Harris [Tue, 2 Oct 2012 23:00:17 +0000 (23:00 -0000)]
Go figure.  Something that's not on the top or bottom is in the
"middle", while something that's not on the left or right is in the
"center".

svn path=/trunk/; revision=45273

11 years agoHave separate 32-bit and 64-bit rows in the table of compiler packages.
Guy Harris [Tue, 2 Oct 2012 22:31:27 +0000 (22:31 -0000)]
Have separate 32-bit and 64-bit rows in the table of compiler packages.

svn path=/trunk/; revision=45272

11 years agoAdjust the size and location of the "Export Specified Packets" template.
Gerald Combs [Tue, 2 Oct 2012 21:37:25 +0000 (21:37 -0000)]
Adjust the size and location of the "Export Specified Packets" template.

svn path=/trunk/; revision=45271

11 years agoFix indentation.
Guy Harris [Tue, 2 Oct 2012 21:15:54 +0000 (21:15 -0000)]
Fix indentation.

svn path=/trunk/; revision=45270

11 years agoGet rid of the always-null and unused argument to
Guy Harris [Tue, 2 Oct 2012 21:13:59 +0000 (21:13 -0000)]
Get rid of the always-null and unused argument to
host_name_lookup_process().  If, in the future, we find that we need an
argument for changes we're making, we can add it then.

svn path=/trunk/; revision=45269

11 years agoFix a comment, add another comment, and fix indentation.
Guy Harris [Tue, 2 Oct 2012 20:47:20 +0000 (20:47 -0000)]
Fix a comment, add another comment, and fix indentation.

svn path=/trunk/; revision=45268

11 years agoUse a value string array for EPS Bearer Identity and remove useless de_esm_lnkd_eps_b...
Pascal Quantin [Tue, 2 Oct 2012 20:44:36 +0000 (20:44 -0000)]
Use a value string array for EPS Bearer Identity and remove useless de_esm_lnkd_eps_bearer_id function

svn path=/trunk/; revision=45267

11 years agoThe Packet Filter Identifier range is [1;16] according to 3GPP 27.007 chapter 10.1.3
Pascal Quantin [Tue, 2 Oct 2012 20:17:08 +0000 (20:17 -0000)]
The Packet Filter Identifier range is [1;16] according to 3GPP 27.007 chapter 10.1.3

svn path=/trunk/; revision=45266

11 years agoMove the main window slots to main_window_slots.cpp.
Gerald Combs [Tue, 2 Oct 2012 18:47:05 +0000 (18:47 -0000)]
Move the main window slots to main_window_slots.cpp.

svn path=/trunk/; revision=45259

11 years agoTest with the presence (-nVxr) and absence (-nr) of the tree. We now
Gerald Combs [Tue, 2 Oct 2012 17:58:00 +0000 (17:58 -0000)]
Test with the presence (-nVxr) and absence (-nr) of the tree. We now
use an array of arguments so additional combinations can be added.

svn path=/trunk/; revision=45258

11 years agoUpgrade NAS EPS dissector to v11.4.0 (Release 11)
Pascal Quantin [Tue, 2 Oct 2012 12:46:21 +0000 (12:46 -0000)]
Upgrade NAS EPS dissector to v11.4.0 (Release 11)

svn path=/trunk/; revision=45253

11 years agoAccording to 3GPP 24.011, information element name is RP-Originator Address, not...
Pascal Quantin [Tue, 2 Oct 2012 10:58:36 +0000 (10:58 -0000)]
According to 3GPP 24.011, information element name is RP-Originator Address, not RP-Origination Address

svn path=/trunk/; revision=45252

11 years agoOK, ETSI has (not surprisingly) picked up 3GPP's values in later ETSI specs;
Jeff Morriss [Tue, 2 Oct 2012 09:00:55 +0000 (09:00 -0000)]
OK, ETSI has (not surprisingly) picked up 3GPP's values in later ETSI specs;
comment out the older, conflicting ETSI-specified values and use the more
modern ones.

Mark a couple of deprecated values as such (void).

svn path=/trunk/; revision=45251

11 years agoAdd some Specific-Action enums from 29.214 v11.6.0.
Jeff Morriss [Tue, 2 Oct 2012 08:20:37 +0000 (08:20 -0000)]
Add some Specific-Action enums from 29.214 v11.6.0.
Note a conflict here between 29.214 and the older ETSI spec for values 6 and
7.

svn path=/trunk/; revision=45250

11 years agoFix hf_me (it is a 2 bits long field, not a boolean)
Pascal Quantin [Tue, 2 Oct 2012 07:20:31 +0000 (07:20 -0000)]
Fix hf_me (it is a 2 bits long field, not a boolean)

svn path=/trunk/; revision=45249

11 years agoDon't bother setting a background gradient in the toolbar on Windows.
Gerald Combs [Mon, 1 Oct 2012 22:57:34 +0000 (22:57 -0000)]
Don't bother setting a background gradient in the toolbar on Windows.

svn path=/trunk/; revision=45246

11 years agoConstruct a proper directory URL.
Gerald Combs [Mon, 1 Oct 2012 22:55:45 +0000 (22:55 -0000)]
Construct a proper directory URL.

svn path=/trunk/; revision=45245

11 years agoAdd new fileset ui file to cmake build.
Evan Huus [Mon, 1 Oct 2012 22:52:14 +0000 (22:52 -0000)]
Add new fileset ui file to cmake build.

svn path=/trunk/; revision=45244

11 years agoImplement file sets.
Gerald Combs [Mon, 1 Oct 2012 22:40:20 +0000 (22:40 -0000)]
Implement file sets.

Replace the original file set code with a UI form. Use more consistent
file names. List the files using a QTreeWidget instead of a grid.
fileset_is_file_in_set is only used in fileset.c so make it static.

In main_window.cpp reduce our usage of the global cfile variable.

svn path=/trunk/; revision=45243

11 years agoMake protocol 5 octets long and cut down code clutter,
Jaap Keuter [Mon, 1 Oct 2012 21:43:34 +0000 (21:43 -0000)]
Make protocol 5 octets long and cut down code clutter,

svn path=/trunk/; revision=45242

11 years agoWiden the "Find text" dialog a bit so the entire title is visible.
Chris Maynard [Mon, 1 Oct 2012 20:57:15 +0000 (20:57 -0000)]
Widen the "Find text" dialog a bit so the entire title is visible.

svn path=/trunk/; revision=45241

11 years agoAdd a window pointer so that we can figure out from whence we came.
Gerald Combs [Mon, 1 Oct 2012 20:14:47 +0000 (20:14 -0000)]
Add a window pointer so that we can figure out from whence we came.
Bring the timestamp output more in line with ISO 8601.

svn path=/trunk/; revision=45240

11 years agoAdd options to dissect MCCH from LTE MAC/RLC dissectors
Pascal Quantin [Mon, 1 Oct 2012 19:51:07 +0000 (19:51 -0000)]
Add options to dissect MCCH from LTE MAC/RLC dissectors

svn path=/trunk/; revision=45239

11 years agoupdate the capture comment icon in the statusbar
Martin Kaiser [Mon, 1 Oct 2012 19:11:14 +0000 (19:11 -0000)]
update the capture comment icon in the statusbar
when a capture comment was edited via Statistics/Summary

svn path=/trunk/; revision=45238

11 years agoThere is no longer the need to define HAVE_CONFIG_H.
Jeff Morriss [Mon, 1 Oct 2012 11:49:15 +0000 (11:49 -0000)]
There is no longer the need to define HAVE_CONFIG_H.

svn path=/trunk/; revision=45232

11 years agoStop defining HAVE_CONFIG_H on Windows builds too.
Jeff Morriss [Mon, 1 Oct 2012 11:47:36 +0000 (11:47 -0000)]
Stop defining HAVE_CONFIG_H on Windows builds too.

svn path=/trunk/; revision=45231

11 years agoThe -B option is no longer only available in Win32: remove the Win32
Jeff Morriss [Mon, 1 Oct 2012 07:14:03 +0000 (07:14 -0000)]
The -B option is no longer only available in Win32: remove the Win32
restriction from the Synopsis.

This is the man page for Wireshark, not Tshark (fix a cut-n-pasteo).

svn path=/trunk/; revision=45229

11 years agouse the correct status bar icon for the capture comment
Martin Kaiser [Sun, 30 Sep 2012 18:37:59 +0000 (18:37 -0000)]
use the correct status bar icon for the capture comment

if we have an empty capture comment (an existing comment was deleted),
we should use the same icon as if no comment was present

svn path=/trunk/; revision=45227

11 years agoAdd displayed and marked percent columns and percent calculations for dropped and...
Chris Maynard [Sun, 30 Sep 2012 18:28:04 +0000 (18:28 -0000)]
Add displayed and marked percent columns and percent calculations for dropped and ignored packets in summary dialog.  Also display percent calculations for displayed, marked, ignored and dropped packets in statusbar.  Like ignored packets, only display marked packet count and percent in the statusbar if there are any.
Fixes enhancement bug: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2377

svn path=/trunk/; revision=45226

11 years agoRevert r45185. While it looks better with an icon if "Filter toolbar style" is set...
Chris Maynard [Sun, 30 Sep 2012 18:15:40 +0000 (18:15 -0000)]
Revert r45185.  While it looks better with an icon if "Filter toolbar style" is set to "Icons & Text", if the preference is set to "Icons only", all custom filters will have the same icon displayed and it will be difficult to know which is which w/out hovering on each for a tooltip.  Maybe someone else can figure out how to add the icon, but only in the case of "Icons & Text"?

svn path=/trunk/; revision=45225

11 years agodvb-ci: display cc item's name in the subtree title
Martin Kaiser [Sun, 30 Sep 2012 17:58:45 +0000 (17:58 -0000)]
dvb-ci: display cc item's name in the subtree title

svn path=/trunk/; revision=45224

11 years agoTrivial: LEDs -> Icons
Chris Maynard [Sun, 30 Sep 2012 15:59:40 +0000 (15:59 -0000)]
Trivial: LEDs -> Icons

svn path=/trunk/; revision=45223

11 years ago[Automatic manuf, services and enterprise-numbers update for 2012-09-30]
Gerald Combs [Sun, 30 Sep 2012 14:03:25 +0000 (14:03 -0000)]
[Automatic manuf, services and enterprise-numbers update for 2012-09-30]

svn path=/trunk/; revision=45220

11 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Sun, 30 Sep 2012 11:06:28 +0000 (11:06 -0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=45219

11 years agoFrom Yu Zhang via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7769
Alexis La Goutte [Sun, 30 Sep 2012 11:02:56 +0000 (11:02 -0000)]
From Yu Zhang via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7769
Add Dissector for SuboptionDeviceInstance under DevicePropertiesOption in PROFINET DCP

In PROFINET DCP dissector, current build didn't have SuboptionDeviceInstance
(0x07) under DevicePropertiesOption (0x02). This patch add the support of
SuboptionDeviceInstance

svn path=/trunk/; revision=45218

11 years agoFrom Olivier Benghozi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7734
Alexis La Goutte [Sun, 30 Sep 2012 10:38:37 +0000 (10:38 -0000)]
From Olivier Benghozi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7734
Enhance Route Refresh Capability : Add draft-ietf-idr-bgp-enhanced-route-refresh-02

Not yet support new NOTIFICATION error code : ROUTE-REFRESH Message Error (Value To Be Defined)

From me :
* Make some Route Refresh fields filterable

svn path=/trunk/; revision=45217

11 years agoFrom Olivier Benghozi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7734
Alexis La Goutte [Sun, 30 Sep 2012 10:05:18 +0000 (10:05 -0000)]
From Olivier Benghozi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7734
BGP bad decoding for Graceful Restart Capability with only helper support

BGP Capability in OPEN message: Graceful restart capability (64).

So when the length of the capability value is smaller that 6 (6 meaning full
support of GR capa, with significants elements and at least one AFI/SAFI), the
code interprets it as erroneous.

However,as described in RFC4724: " When a sender of this capability does not
include any <AFI, SAFI> in the capability, it means that the sender is not
capable of preserving its forwarding state during BGP restart, but supports
procedures for the Receiving Speaker (as defined in Section 4.2 of this
document). In that case, the value of the Restart Time field advertised by the
sender is irrelevant".

So, length of exactly 2 is valid but has to be interpreted with a particular
meaning.

In the dissector code, a length of 2 should be a special case for this capa,
decoding as "Graceful Restart helper mode only" or something like that, and
maybe also displaying an expert message if the Restart flag is not 0 in this
case, since here it's not expected to be possible.

svn path=/trunk/; revision=45216

11 years agoUpgrade LTE RRC dissector to v11.1.0
Pascal Quantin [Sun, 30 Sep 2012 08:06:50 +0000 (08:06 -0000)]
Upgrade LTE RRC dissector to v11.1.0

svn path=/trunk/; revision=45215

11 years agoFrom Bill Parker:
Guy Harris [Sat, 29 Sep 2012 19:40:27 +0000 (19:40 -0000)]
From Bill Parker:

Add some additional memory-allocation failure checks in Lemon.

Use NULL rather than 0 as the null-pointer constant in those
checks.

From me:

Catch one more of the NULL-vs-0 cases.

Fix some failure messages to use fprintf(stderr, ...) -
ErrorMsg() requires a file name and line number, and is
generally used if you're going to continue rather than just give
up.

svn path=/trunk/; revision=45214

11 years agoAdd wrapDateLine to support continuous longitudinal panning.
Chris Maynard [Sat, 29 Sep 2012 15:59:32 +0000 (15:59 -0000)]
Add wrapDateLine to support continuous longitudinal panning.

svn path=/trunk/; revision=45213

11 years agoRevert most of r45210. We don't use the return value of GetExitCodeProcess(), but...
Chris Maynard [Sat, 29 Sep 2012 15:49:06 +0000 (15:49 -0000)]
Revert most of r45210. We don't use the return value of GetExitCodeProcess(), but it still needs to be called to get childstatus.

svn path=/trunk/; revision=45212

11 years agoMore unused variables caught by cppcheck.
Evan Huus [Sat, 29 Sep 2012 14:15:20 +0000 (14:15 -0000)]
More unused variables caught by cppcheck.

svn path=/trunk/; revision=45211

11 years agoDon't fetch the exit code of our child process, we never use it.
Evan Huus [Sat, 29 Sep 2012 14:06:40 +0000 (14:06 -0000)]
Don't fetch the exit code of our child process, we never use it.

svn path=/trunk/; revision=45210

11 years agoFix some memleaks caught by cppcheck.
Evan Huus [Sat, 29 Sep 2012 14:03:36 +0000 (14:03 -0000)]
Fix some memleaks caught by cppcheck.

svn path=/trunk/; revision=45209