6 years agoFrom Jouni Malinen via Wi...
Alexis La Goutte [Mon, 27 May 2013 16:20:29 +0000 (16:20 -0000)]
From Jouni Malinen via Wi-Fi Display dissector

The attached patch adds initial support for dissecting Wi-Fi Display information element

svn path=/trunk/; revision=49593

6 years agoSCSI Add decoding of Block Device Characteristics VPD page
Ronnie Sahlberg [Mon, 27 May 2013 03:44:06 +0000 (03:44 -0000)]
SCSI Add decoding of Block Device Characteristics VPD page

svn path=/trunk/; revision=49592

6 years agoSCSI: Print the INQUIRY EVPD page name in the info column
Ronnie Sahlberg [Mon, 27 May 2013 03:13:31 +0000 (03:13 -0000)]
SCSI: Print the INQUIRY EVPD page name in the info column

svn path=/trunk/; revision=49591

6 years agoSCSI: add dissection of Tiemout Descriptor for REPORT SUPPORTED OPCODES
Ronnie Sahlberg [Mon, 27 May 2013 01:09:49 +0000 (01:09 -0000)]
SCSI: add dissection of Tiemout Descriptor for REPORT SUPPORTED OPCODES

svn path=/trunk/; revision=49590

6 years agoSCSI: Add dissection of the data-out buffer for SANITIZE service action OVERWRITE
Ronnie Sahlberg [Sun, 26 May 2013 18:38:56 +0000 (18:38 -0000)]
SCSI: Add dissection of the data-out buffer for SANITIZE service action OVERWRITE

svn path=/trunk/; revision=49589

6 years ago[Automatic manuf, services and enterprise-numbers update for 2013-05-26]
Gerald Combs [Sun, 26 May 2013 14:03:39 +0000 (14:03 -0000)]
[Automatic manuf, services and enterprise-numbers update for 2013-05-26]

svn path=/trunk/; revision=49585

6 years agoBatch of filterable expert infos.
Michael Mann [Sun, 26 May 2013 03:29:07 +0000 (03:29 -0000)]
Batch of filterable expert infos.

svn path=/trunk/; revision=49584

6 years agoFirst batch of doxygen for wmem. Remove some things from README.wmem now that
Evan Huus [Sun, 26 May 2013 02:40:40 +0000 (02:40 -0000)]
First batch of doxygen for wmem. Remove some things from README.wmem now that
they're in doxygen instead.

svn path=/trunk/; revision=49583

6 years agoSCSI: Add basic decoding of SANITIZE opcode
Ronnie Sahlberg [Sat, 25 May 2013 22:47:10 +0000 (22:47 -0000)]
SCSI: Add basic decoding of SANITIZE opcode

svn path=/trunk/; revision=49582

6 years agoBatch of filterable expert_infos.
Michael Mann [Sat, 25 May 2013 17:06:40 +0000 (17:06 -0000)]
Batch of filterable expert_infos.

svn path=/trunk/; revision=49581

6 years agoObject::connect: No such signal WiresharkApplication::captureCaptureUpdateContinue...
Alexis La Goutte [Sat, 25 May 2013 15:20:42 +0000 (15:20 -0000)]
Object::connect: No such signal WiresharkApplication::captureCaptureUpdateContinue(capture_options*) Object::connect: (sender name: 'qtshark')

An omission with latest change in capture_session...

svn path=/trunk/; revision=49579

6 years agoUse -DBUILD_qtshark=YES for build qtshark with cmake (May be set by default ON qtshar...
Alexis La Goutte [Sat, 25 May 2013 15:20:34 +0000 (15:20 -0000)]
Use -DBUILD_qtshark=YES for build qtshark with cmake (May be set by default ON qtshark with cmake ?)

svn path=/trunk/; revision=49578

6 years agoApply change of Bug 8706 ( "Stream" should be changed to "Follow Stream" in the ...
Alexis La Goutte [Sat, 25 May 2013 15:20:23 +0000 (15:20 -0000)]
Apply change of Bug 8706 ( "Stream" should be changed to "Follow Stream" in the 'Font and Colors' dialog ) / revision 49488 to Qtshark

svn path=/trunk/; revision=49577

6 years agoFrom Fabio Tarabelloni: more minor formatting and comment fixes.
Evan Huus [Sat, 25 May 2013 13:01:25 +0000 (13:01 -0000)]
From Fabio Tarabelloni: more minor formatting and comment fixes.

svn path=/trunk/; revision=49576

6 years agoFrom Fabio Tarabelloni: fix copy-pasted comment.
Evan Huus [Sat, 25 May 2013 12:25:51 +0000 (12:25 -0000)]
From Fabio Tarabelloni: fix copy-pasted comment.

svn path=/trunk/; revision=49575

6 years agoUpdate the release notes for the changes since 1.10 branched: one new
Evan Huus [Sat, 25 May 2013 03:46:08 +0000 (03:46 -0000)]
Update the release notes for the changes since 1.10 branched: one new
protocol, one file format, and Michael's filterable expert info.

Hopefully keeping this up to date as we go will make Gerald's job a bit
easier when the next release rolls around.

svn path=/trunk/; revision=49574

6 years agoAdd filterable expert info.
Michael Mann [Sat, 25 May 2013 03:27:31 +0000 (03:27 -0000)]
Add filterable expert info.

svn path=/trunk/; revision=49573

6 years agoMenu labels aren't paths, they're just the strings shown to the user for
Guy Harris [Sat, 25 May 2013 02:37:51 +0000 (02:37 -0000)]
Menu labels aren't paths, they're just the strings shown to the user for
the menu item.

svn path=/trunk/; revision=49572

6 years agoFrom Fabio Tarabelloni via
Evan Huus [Sat, 25 May 2013 01:45:16 +0000 (01:45 -0000)]
From Fabio Tarabelloni via

ZigBee ZCL OnOff cluster dissection.

Also, fix decryption of APS commands.

svn path=/trunk/; revision=49571

6 years agoAdd Mike Garratt to the list of authors for (at the very least) his contributions...
Chris Maynard [Sat, 25 May 2013 00:54:30 +0000 (00:54 -0000)]
Add Mike Garratt to the list of authors for (at the very least) his contributions from bug6645, committed in r46083.

svn path=/trunk/; revision=49570

6 years agoEdit comments
Anders Broman [Fri, 24 May 2013 22:38:53 +0000 (22:38 -0000)]
Edit comments

svn path=/trunk/; revision=49569

6 years agouse key in all p_add_proto_data() p_get_proto_data()
Anders Broman [Fri, 24 May 2013 22:38:25 +0000 (22:38 -0000)]
use key in all p_add_proto_data() p_get_proto_data()

svn path=/trunk/; revision=49568

6 years agoFrom LI Hai via :
Pascal Quantin [Fri, 24 May 2013 20:55:42 +0000 (20:55 -0000)]
From LI Hai via :
Add MAC-DATA support to TETRA dissector and other minor improvements

svn path=/trunk/; revision=49567

6 years agoBluetooth: Highlight correct bytes in some SDP trees (Part 2). Bug 8700 (https:...
Michael Mann [Fri, 24 May 2013 19:40:09 +0000 (19:40 -0000)]
Bluetooth: Highlight correct bytes in some SDP trees (Part 2).  Bug 8700 (

svn path=/trunk/; revision=49566

6 years agoEnsure most severe is displayed in expert column. Bug 7733 (https://bugs.wireshark...
Michael Mann [Fri, 24 May 2013 19:23:36 +0000 (19:23 -0000)]
Ensure most severe is displayed in expert column.  Bug 7733 (


svn path=/trunk/; revision=49565

6 years agoexpert_add_info(): we can't use va_start()/va_end() so don't try to use a va_list...
Jeff Morriss [Fri, 24 May 2013 19:14:09 +0000 (19:14 -0000)]
expert_add_info(): we can't use va_start()/va_end() so don't try to use a va_list (which isn't used by the called function) either.

svn path=/trunk/; revision=49564

6 years agoexpert_add_info() doesn't take a variable number of args; don't use va_start()/va_end().
Jeff Morriss [Fri, 24 May 2013 18:15:09 +0000 (18:15 -0000)]
expert_add_info() doesn't take a variable number of args; don't use va_start()/va_end().

svn path=/trunk/; revision=49563

6 years agoexpert_add_info_format_text(): use the correct argument numbers in G_GNUC_PRINTF().
Jeff Morriss [Fri, 24 May 2013 18:12:00 +0000 (18:12 -0000)]
expert_add_info_format_text(): use the correct argument numbers in G_GNUC_PRINTF().

svn path=/trunk/; revision=49562

6 years agoUse new expert info API in idl dissectors. These generated about 50% of the add_expe...
Michael Mann [Fri, 24 May 2013 18:09:57 +0000 (18:09 -0000)]
Use new expert info API in idl dissectors.  These generated about 50% of the add_expert_info_format() calls.

svn path=/trunk/; revision=49561

6 years agofirst batch of dissectors to use the new expert info API.
Michael Mann [Fri, 24 May 2013 18:02:54 +0000 (18:02 -0000)]
first batch of dissectors to use the new expert info API.

svn path=/trunk/; revision=49560

6 years agoAdd expert info configuration framework. Bug 2412 (
Michael Mann [Fri, 24 May 2013 17:59:36 +0000 (17:59 -0000)]
Add expert info configuration framework.  Bug 2412 (

Expert info "fields" can now be registered/addressed by name.  Right now, the basic framework allows expert info fields to become "display filters".  However more could be done, like user preferences overriding default severity level, speeding up expert info dialog load time by not needing to redissect a file, etc.

Long term goal is to have all expert_info filterable and have the functionality of expert_add_info_format() include the "registered index".  expert_add_info_format_text() is the workaround until all current calls to expert_add_info_format() have been updated with either expert_add_info() or expert_add_info_format_text().  Then the remaining expert_add_info_format_text() will be renamed to expert_add_info_format().

svn path=/trunk/; revision=49559

6 years agoHow to mess with a keyboard...
Pascal Quantin [Fri, 24 May 2013 17:43:36 +0000 (17:43 -0000)]
How to mess with a keyboard...

svn path=/trunk/; revision=49558

6 years agoOne more compilation fix for gcc 4.3.2 ('toi' may be used uninitialized in this function)
Pascal Quantin [Fri, 24 May 2013 17:36:19 +0000 (17:36 -0000)]
One more compilation fix for gcc 4.3.2 ('toi' may be used uninitialized in this function)

svn path=/trunk/; revision=49557

6 years agoRemove unused function parameter, rename variable to avoid shadowing.
Evan Huus [Fri, 24 May 2013 17:24:58 +0000 (17:24 -0000)]
Remove unused function parameter, rename variable to avoid shadowing.

svn path=/trunk/; revision=49556

6 years agoOverhauled the RMT dissectors. Not sure each needs its own file, but since this...
Michael Mann [Fri, 24 May 2013 17:06:23 +0000 (17:06 -0000)]
Overhauled the RMT dissectors.  Not sure each needs its own file, but since this involves multiple RFCs, they remain split out by that.  More are now a "pure" dissector and not a "decoding function hook".

Some Notes:
1. Converted to "new style" dissectors with data being passed between dissectors
2. Combined header files into one since there wasn't much that should have really been in the header files.  Implemented functionality is in c module of respective dissector.

Not sure if LCT preferences should just be in the LCT dissector and not the RMT-ALC "parent", but kept for backwards compatibility.

svn path=/trunk/; revision=49555

6 years agoFix :
Jeff Morriss [Fri, 24 May 2013 15:28:04 +0000 (15:28 -0000)]
Fix :

If we're not doing dissection (in 2-pass mode) then don't try to mark frames
as depended upon: in that case epan has not been initialized so we shouldn't
be looking in the edt (and anyway without dissection there won't be any
dependent frames).

(I'm not convinced there's any reason to run 2-pass mode without dissection,

svn path=/trunk/; revision=49554

6 years agoAs suggested by Moshe Kaplan in
Jeff Morriss [Fri, 24 May 2013 14:45:55 +0000 (14:45 -0000)]
As suggested by Moshe Kaplan in :

When pointing people to the mailing lists, point them directly to the lists
page rather than explaining where to look for the link on the main page (the
directions were several years out of date).

While there also fix up some of the indentation and add a link to the Q&A site
in the developer's guide.

svn path=/trunk/; revision=49553

6 years agoHave register_param_stat() add menu items, rather than having the menu
Guy Harris [Fri, 24 May 2013 03:10:56 +0000 (03:10 -0000)]
Have register_param_stat() add menu items, rather than having the menu
items hardcoded into ui/gtk/main_menubar.c

Get rid of more stuff implying that the code for adding menu items is
used only by Lua, as it's also used by register_param_stat().

Add the items to the menu list sorted by the menu item name shown to the

Get rid of some const declarations that are lies.

Use the label given for a menu item as the label in the menu, rather
than parsing it from a token.

svn path=/trunk/; revision=49552

6 years agoAdd an optimization to req_resp_hdrs_do_reassembly that shaves about 20% off
Evan Huus [Fri, 24 May 2013 02:31:26 +0000 (02:31 -0000)]
Add an optimization to req_resp_hdrs_do_reassembly that shaves about 20% off
the load time of one of my sample captures that is HTTP-but-not-really.

Also add modelines.

svn path=/trunk/; revision=49551

6 years agoAnd another (cosmetic) change for that.
Guy Harris [Fri, 24 May 2013 01:11:07 +0000 (01:11 -0000)]
And another (cosmetic) change for that.

svn path=/trunk/; revision=49550

6 years agoA long-overdue rename of register_dfilter_stat() to
Guy Harris [Fri, 24 May 2013 01:10:16 +0000 (01:10 -0000)]
A long-overdue rename of register_dfilter_stat() to
register_param_stat() to reflect that it's for arbitrary statistics tap
parameters, not just a display filter.

svn path=/trunk/; revision=49549

6 years agoRename register_lua_menu_bar_menu_items() to
Guy Harris [Fri, 24 May 2013 01:05:39 +0000 (01:05 -0000)]
Rename register_lua_menu_bar_menu_items() to
register_menu_bar_menu_items(), to emphasize that it's not just for Lua.

svn path=/trunk/; revision=49548

6 years agoWe don't want to restrict the ability to dynamically add statistics
Guy Harris [Thu, 23 May 2013 23:32:20 +0000 (23:32 -0000)]
We don't want to restrict the ability to dynamically add statistics
menus to Lua taps.

svn path=/trunk/; revision=49547

6 years agoFix computation of TP-User-Data-Length when SMS is coded with GSM 7 bit default alpha...
Pascal Quantin [Thu, 23 May 2013 20:28:59 +0000 (20:28 -0000)]
Fix computation of TP-User-Data-Length when SMS is coded with GSM 7 bit default alphabet and TP-User-Data-Header field is present

svn path=/trunk/; revision=49546

6 years agoIt's actually enough just to add some blank lines without the need for the <pre>...
Chris Maynard [Thu, 23 May 2013 17:45:21 +0000 (17:45 -0000)]
It's actually enough just to add some blank lines without the need for the <pre> tags.

svn path=/trunk/; revision=49545

6 years agoUse a single #ifdef HAVE_LUA/#endif for two routines (currently) used
Guy Harris [Thu, 23 May 2013 03:26:22 +0000 (03:26 -0000)]
Use a single #ifdef HAVE_LUA/#endif for two routines (currently) used
only from the Lua code.

svn path=/trunk/; revision=49544

6 years agoAdd -p option to the valgrind script for profiling with callgrind.
Evan Huus [Thu, 23 May 2013 02:30:40 +0000 (02:30 -0000)]
Add -p option to the valgrind script for profiling with callgrind.

svn path=/trunk/; revision=49543

6 years agoNo need for those arguments to be pointers to arrays of const pointers,
Guy Harris [Thu, 23 May 2013 01:25:06 +0000 (01:25 -0000)]
No need for those arguments to be pointers to arrays of const pointers,
especially given that we end up freeing what all of those pointers point

svn path=/trunk/; revision=49542

6 years agoSee if this squelches a warning.
Guy Harris [Thu, 23 May 2013 01:19:09 +0000 (01:19 -0000)]
See if this squelches a warning.

svn path=/trunk/; revision=49541

6 years agoInclude ui/gtk/export_pdu_dlg.h so that the functions defined here are
Guy Harris [Thu, 23 May 2013 01:07:51 +0000 (01:07 -0000)]
Include ui/gtk/export_pdu_dlg.h so that the functions defined here are
checked against their declarations.

svn path=/trunk/; revision=49540

6 years agomake_menu_xml() is only used if we HAVE_LUA; only define it when we'll use it.
Jeff Morriss [Thu, 23 May 2013 00:33:33 +0000 (00:33 -0000)]
make_menu_xml() is only used if we HAVE_LUA; only define it when we'll use it.

svn path=/trunk/; revision=49539

6 years agoInclude ui/ssl_key_export.h so that functions defined here are checked
Guy Harris [Wed, 22 May 2013 23:30:29 +0000 (23:30 -0000)]
Include ui/ssl_key_export.h so that functions defined here are checked
against their declarations.

svn path=/trunk/; revision=49537

6 years agoInclude ui/gtk/addr_resolution_dlg.h so that functions defined here are
Guy Harris [Wed, 22 May 2013 23:28:11 +0000 (23:28 -0000)]
Include ui/gtk/addr_resolution_dlg.h so that functions defined here are
checked against their declarations.

Fix a tpo.

svn path=/trunk/; revision=49536

6 years agoMake a routine not used outside this file static.
Guy Harris [Wed, 22 May 2013 23:25:17 +0000 (23:25 -0000)]
Make a routine not used outside this file static.

svn path=/trunk/; revision=49535

6 years agoInclude ui/gtk/prefs_filter_expressions.h so that functions defined here
Guy Harris [Wed, 22 May 2013 23:22:35 +0000 (23:22 -0000)]
Include ui/gtk/prefs_filter_expressions.h so that functions defined here
are checked against their declarations.

svn path=/trunk/; revision=49534

6 years agoMake a routine not used outside this file static.
Guy Harris [Wed, 22 May 2013 23:20:35 +0000 (23:20 -0000)]
Make a routine not used outside this file static.

svn path=/trunk/; revision=49533

6 years agoMake a routine not used outside this file static.
Guy Harris [Wed, 22 May 2013 23:16:54 +0000 (23:16 -0000)]
Make a routine not used outside this file static.

svn path=/trunk/; revision=49532

6 years agoInclude ui/recent_utils.h, to check functions defined here against their
Guy Harris [Wed, 22 May 2013 23:14:44 +0000 (23:14 -0000)]
Include ui/recent_utils.h, to check functions defined here against their
declarations - and fix a problem that turned up.

svn path=/trunk/; revision=49531

6 years agoTurn "packet_is_ssl()" into a general "does the packet whose dissection
Guy Harris [Wed, 22 May 2013 23:02:19 +0000 (23:02 -0000)]
Turn "packet_is_ssl()" into a general "does the packet whose dissection
is in this epan_dissect_t contain the field whose name is passed as an
argument" routine in libwireshark, and use it where we used
packet_is_ssl().  (We should check to see if anything *else* could use

svn path=/trunk/; revision=49530

6 years agoInclude ui/gtk/main_80211_toolbar.h so that the functions we define are
Guy Harris [Wed, 22 May 2013 22:43:07 +0000 (22:43 -0000)]
Include ui/gtk/main_80211_toolbar.h so that the functions we define are
checked against their declarations in that file.

svn path=/trunk/; revision=49529

6 years agoInclude "ui/recent_utils.h" so that the functions we define are checked
Guy Harris [Wed, 22 May 2013 22:39:05 +0000 (22:39 -0000)]
Include "ui/recent_utils.h" so that the functions we define are checked
against the declarations for them.

svn path=/trunk/; revision=49528

6 years agoInclude "ui/gtk/gtk_iface_monitor.h" so that our definitions are checked
Guy Harris [Wed, 22 May 2013 22:34:27 +0000 (22:34 -0000)]
Include "ui/gtk/gtk_iface_monitor.h" so that our definitions are checked
against the published declarations.

svn path=/trunk/; revision=49527

6 years agoSupport Raptor/Raptor-Q FEC in RMT dissector. Bug 8699 (
Michael Mann [Wed, 22 May 2013 20:30:30 +0000 (20:30 -0000)]
Support Raptor/Raptor-Q FEC in RMT dissector.  Bug 8699 (

From Igor Slepchin.

svn path=/trunk/; revision=49523

6 years agoMake routines not used outside their source files static.
Guy Harris [Wed, 22 May 2013 20:23:10 +0000 (20:23 -0000)]
Make routines not used outside their source files static.

svn path=/trunk/; revision=49522

6 years agoGet rid of an unused routine.
Guy Harris [Wed, 22 May 2013 20:22:40 +0000 (20:22 -0000)]
Get rid of an unused routine.

svn path=/trunk/; revision=49521

6 years agoMake a routine not called from outside the file static.
Guy Harris [Wed, 22 May 2013 20:14:16 +0000 (20:14 -0000)]
Make a routine not called from outside the file static.

svn path=/trunk/; revision=49520

6 years agoNo capture options if no libpcap.
Guy Harris [Wed, 22 May 2013 19:21:31 +0000 (19:21 -0000)]
No capture options if no libpcap.

svn path=/trunk/; revision=49519

6 years agoFrom Abdul Hannan Khan:
Anders Broman [Wed, 22 May 2013 19:21:26 +0000 (19:21 -0000)]
From Abdul Hannan Khan:
Add tvo AVP:s

svn path=/trunk/; revision=49518

6 years agoAAAAAArgh. The capture_input_new_XXX routines are called from
Guy Harris [Wed, 22 May 2013 19:14:52 +0000 (19:14 -0000)]
AAAAAArgh.  The capture_input_new_XXX routines are called from
capture_sync.c, not from capture.c, so they should be declared in
capture_sync.h, so callers that use the capture_sync.c stuff but not the
capture.c stuff - such as TShark - get the declarations and get their
implementations compared with the signatures that they should have.

Doing so points out that some of them in TShark *don't*, so fix that.

svn path=/trunk/; revision=49517

6 years agoDo not stop dissection when there is no tree: otherwise it prevents successful reasse...
Pascal Quantin [Wed, 22 May 2013 18:19:05 +0000 (18:19 -0000)]
Do not stop dissection when there is no tree: otherwise it prevents successful reassembly of SMS fragments

svn path=/trunk/; revision=49516

6 years agoGenerate the man pages for dftest and randpkt.
Chris Maynard [Wed, 22 May 2013 17:53:24 +0000 (17:53 -0000)]
Generate the man pages for dftest and randpkt.

svn path=/trunk/; revision=49515

6 years agoAdd dftest.exe to EXECUTABLES. For clean-local target, clean randpkt.exe, not randpk...
Chris Maynard [Wed, 22 May 2013 17:46:17 +0000 (17:46 -0000)]
Add dftest.exe to EXECUTABLES.  For clean-local target, clean randpkt.exe, not randpkt.ext.

svn path=/trunk/; revision=49514

6 years agoFix presentation of types.
Chris Maynard [Wed, 22 May 2013 15:42:34 +0000 (15:42 -0000)]
Fix presentation of types.

svn path=/trunk/; revision=49513

6 years agoMinor refactor: make the framework responsible for allocating and freeing the
Evan Huus [Wed, 22 May 2013 15:42:12 +0000 (15:42 -0000)]
Minor refactor: make the framework responsible for allocating and freeing the
actual wmem_allocator_t structure. This simplifies the internal API and
deduplicates a few alloc/free calls in the individual allocator implementations.

I'd originally made the allocators responsible for this on purpose with the
idea that they'd be able to optimize something clever based on the type of
allocator, but that's clearly more work and complexity than it's worth given
the small number of allocators we create/destroy.

svn path=/trunk/; revision=49512

6 years agoAnd a few more fixes. Put wrappers in capture_session.h to make it work
Guy Harris [Wed, 22 May 2013 11:53:36 +0000 (11:53 -0000)]
And a few more fixes.  Put wrappers in capture_session.h to make it work
from C++.

svn path=/trunk/; revision=49511

6 years agoMore capture_options -> capture_session fixes.
Guy Harris [Wed, 22 May 2013 11:49:36 +0000 (11:49 -0000)]
More capture_options -> capture_session fixes.

svn path=/trunk/; revision=49510

6 years agoMore capture_options -> capture_session fixes.
Guy Harris [Wed, 22 May 2013 11:09:00 +0000 (11:09 -0000)]
More capture_options -> capture_session fixes.

svn path=/trunk/; revision=49509

6 years agoAnd handle the no-libpcap case here as well.
Guy Harris [Wed, 22 May 2013 10:26:07 +0000 (10:26 -0000)]
And handle the no-libpcap case here as well.

svn path=/trunk/; revision=49508

6 years agoSigh, it was a "building without libpcap" issue.
Guy Harris [Wed, 22 May 2013 10:21:52 +0000 (10:21 -0000)]
Sigh, it was a "building without libpcap" issue.

svn path=/trunk/; revision=49507

6 years agoMore capture_options -> capture_session fixes.
Guy Harris [Wed, 22 May 2013 10:09:07 +0000 (10:09 -0000)]
More capture_options -> capture_session fixes.

svn path=/trunk/; revision=49506

6 years agoOK, try hiding from *THIS*, GCC. Will break other buildbots, but the
Guy Harris [Wed, 22 May 2013 09:59:58 +0000 (09:59 -0000)]
OK, try hiding from *THIS*, GCC.  Will break other buildbots, but the
code prior to this built on other buildbots *and* on my 10.6 VM, so I
don't know what the GCC on the buildbots is getting wrong....

svn path=/trunk/; revision=49505

6 years agoInclude "capture_session.h" to define capture_session.
Guy Harris [Wed, 22 May 2013 09:31:42 +0000 (09:31 -0000)]
Include "capture_session.h" to define capture_session.

svn path=/trunk/; revision=49504

6 years agoOK, maybe that version of GCC doesn't like structure definitions in
Guy Harris [Wed, 22 May 2013 09:25:28 +0000 (09:25 -0000)]
OK, maybe that version of GCC doesn't like structure definitions in
typedefs or something.

svn path=/trunk/; revision=49503

6 years agoOK, try directly including capture_session.h.
Guy Harris [Wed, 22 May 2013 09:05:35 +0000 (09:05 -0000)]
OK, try directly including capture_session.h.

svn path=/trunk/; revision=49502

6 years agoAnother Win32-only fix.
Guy Harris [Wed, 22 May 2013 08:59:13 +0000 (08:59 -0000)]
Another Win32-only fix.

svn path=/trunk/; revision=49501

6 years agoOK, what's your beef, GCC?
Guy Harris [Wed, 22 May 2013 08:48:26 +0000 (08:48 -0000)]
OK, what's your beef, GCC?

svn path=/trunk/; revision=49500

6 years agoMore capture_options -> capture_session changes.
Guy Harris [Wed, 22 May 2013 08:47:17 +0000 (08:47 -0000)]
More capture_options -> capture_session changes.

svn path=/trunk/; revision=49499

6 years agoBite me, GCC.
Guy Harris [Wed, 22 May 2013 08:28:27 +0000 (08:28 -0000)]
Bite me, GCC.

svn path=/trunk/; revision=49498

6 years agoFix the Windows side to look for the signal pipe stuff in cap_session.
Guy Harris [Wed, 22 May 2013 08:24:30 +0000 (08:24 -0000)]
Fix the Windows side to look for the signal pipe stuff in cap_session.

svn path=/trunk/; revision=49497

6 years agoMake the stuff in summary.h usable from C++ code.
Guy Harris [Wed, 22 May 2013 08:21:33 +0000 (08:21 -0000)]
Make the stuff in summary.h usable from C++ code.

svn path=/trunk/; revision=49496

6 years agoOops, need the new header file for capture_session.
Guy Harris [Wed, 22 May 2013 07:51:15 +0000 (07:51 -0000)]
Oops, need the new header file for capture_session.

svn path=/trunk/; revision=49495

6 years agoAnd reflect the new capture_options structure here.
Guy Harris [Wed, 22 May 2013 07:45:11 +0000 (07:45 -0000)]
And reflect the new capture_options structure here.

svn path=/trunk/; revision=49494

6 years agoPull the capture-session state information out of capture_opts and put
Guy Harris [Wed, 22 May 2013 07:44:28 +0000 (07:44 -0000)]
Pull the capture-session state information out of capture_opts and put
it into a separate capture_session structure.  capture_opts should
contain only user-specified option information (and stuff directly
derived from it, such as the "capturing from a pipe" flag).

svn path=/trunk/; revision=49493

6 years agoThere are clearly not enough different sets of build tools out there, so
Guy Harris [Wed, 22 May 2013 05:48:11 +0000 (05:48 -0000)]
There are clearly not enough different sets of build tools out there, so
it's always nice when there's a new one, especially one that can't share
file lists with others.

Remove capture_unix_ifnames.c from YET ANOTHER build tool file.

svn path=/trunk/; revision=49492

6 years agoRename capture_opts_trim_iface() to
Guy Harris [Wed, 22 May 2013 04:49:31 +0000 (04:49 -0000)]
Rename capture_opts_trim_iface() to
capture_opts_default_iface_if_necessary(), to reflect what it actually

svn path=/trunk/; revision=49491

6 years agocapture_unix_ifnames.c is gone.
Guy Harris [Wed, 22 May 2013 04:17:23 +0000 (04:17 -0000)]
capture_unix_ifnames.c is gone.

svn path=/trunk/; revision=49490

6 years agowsutil/file_util.h should no longer be needed here.
Guy Harris [Wed, 22 May 2013 01:57:45 +0000 (01:57 -0000)]
wsutil/file_util.h should no longer be needed here.

svn path=/trunk/; revision=49489

6 years agoFrom Cal Turney via
Evan Huus [Wed, 22 May 2013 01:49:57 +0000 (01:49 -0000)]
From Cal Turney via

"Stream" should be changed to "Follow Stream" in the "Sample" textbox and
"Colors" dropdown menu of the "Font and Colors" dialog:  This is needed to
draw a distinction between the coloring of packets produced by the
"Follow TCP|UDP|SSL Stream" command and the non-colorized output of
the ' == n' filter.

svn path=/trunk/; revision=49488

6 years agoAdd missing include file that's needed so symbols are defined
Evan Huus [Wed, 22 May 2013 01:46:12 +0000 (01:46 -0000)]
Add missing include file that's needed so symbols are defined
on all platforms.

svn path=/trunk/; revision=49487

6 years agoOn OS X, get the interface type from the System Configuration framework.
Guy Harris [Wed, 22 May 2013 01:19:18 +0000 (01:19 -0000)]
On OS X, get the interface type from the System Configuration framework.

svn path=/trunk/; revision=49486