Commit Graph

46566 Commits

Author SHA1 Message Date
Guy Harris 9ac21fd6cc 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
2013-05-22 19:14:52 +00:00
Pascal Quantin 491b512399 Do not stop dissection when there is no tree: otherwise it prevents successful reassembly of SMS fragments
svn path=/trunk/; revision=49516
2013-05-22 18:19:05 +00:00
Chris Maynard 05288f355c Generate the man pages for dftest and randpkt.
svn path=/trunk/; revision=49515
2013-05-22 17:53:24 +00:00
Chris Maynard 34fdcb7b64 Add dftest.exe to EXECUTABLES. For clean-local target, clean randpkt.exe, not randpkt.ext.
svn path=/trunk/; revision=49514
2013-05-22 17:46:17 +00:00
Chris Maynard 0efcb85a2a Fix presentation of types.
svn path=/trunk/; revision=49513
2013-05-22 15:42:34 +00:00
Evan Huus 5426ba4e02 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
2013-05-22 15:42:12 +00:00
Guy Harris a2f6822fea And a few more fixes. Put wrappers in capture_session.h to make it work
from C++.

svn path=/trunk/; revision=49511
2013-05-22 11:53:36 +00:00
Guy Harris 5bc8bdc40e More capture_options -> capture_session fixes.
svn path=/trunk/; revision=49510
2013-05-22 11:49:36 +00:00
Guy Harris 8af092c98f More capture_options -> capture_session fixes.
svn path=/trunk/; revision=49509
2013-05-22 11:09:00 +00:00
Guy Harris 1b7fc5422d And handle the no-libpcap case here as well.
svn path=/trunk/; revision=49508
2013-05-22 10:26:07 +00:00
Guy Harris 107fa2d599 Sigh, it was a "building without libpcap" issue.
svn path=/trunk/; revision=49507
2013-05-22 10:21:52 +00:00
Guy Harris d78bbae6a7 More capture_options -> capture_session fixes.
svn path=/trunk/; revision=49506
2013-05-22 10:09:07 +00:00
Guy Harris 9277023cce 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
2013-05-22 09:59:58 +00:00
Guy Harris 367c22a42e Include "capture_session.h" to define capture_session.
svn path=/trunk/; revision=49504
2013-05-22 09:31:42 +00:00
Guy Harris 2cb6b0416e OK, maybe that version of GCC doesn't like structure definitions in
typedefs or something.

svn path=/trunk/; revision=49503
2013-05-22 09:25:28 +00:00
Guy Harris f096a1e57a OK, try directly including capture_session.h.
svn path=/trunk/; revision=49502
2013-05-22 09:05:35 +00:00
Guy Harris 90e2456849 Another Win32-only fix.
svn path=/trunk/; revision=49501
2013-05-22 08:59:13 +00:00
Guy Harris 575dc6d110 OK, what's your beef, GCC?
svn path=/trunk/; revision=49500
2013-05-22 08:48:26 +00:00
Guy Harris fb7ae678e4 More capture_options -> capture_session changes.
svn path=/trunk/; revision=49499
2013-05-22 08:47:17 +00:00
Guy Harris 57664611b9 Bite me, GCC.
svn path=/trunk/; revision=49498
2013-05-22 08:28:27 +00:00
Guy Harris e964f27f39 Fix the Windows side to look for the signal pipe stuff in cap_session.
svn path=/trunk/; revision=49497
2013-05-22 08:24:30 +00:00
Guy Harris be5b14755a Make the stuff in summary.h usable from C++ code.
svn path=/trunk/; revision=49496
2013-05-22 08:21:33 +00:00
Guy Harris f94a3b13f2 Oops, need the new header file for capture_session.
svn path=/trunk/; revision=49495
2013-05-22 07:51:15 +00:00
Guy Harris dd3dcc7a01 And reflect the new capture_options structure here.
svn path=/trunk/; revision=49494
2013-05-22 07:45:11 +00:00
Guy Harris 8596d17d7f 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
2013-05-22 07:44:28 +00:00
Guy Harris 54ca6dae29 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
2013-05-22 05:48:11 +00:00
Guy Harris 1ca63098ac Rename capture_opts_trim_iface() to
capture_opts_default_iface_if_necessary(), to reflect what it actually
does.

svn path=/trunk/; revision=49491
2013-05-22 04:49:31 +00:00
Guy Harris 9f11d6cd44 capture_unix_ifnames.c is gone.
svn path=/trunk/; revision=49490
2013-05-22 04:17:23 +00:00
Guy Harris cbdf1039c1 wsutil/file_util.h should no longer be needed here.
svn path=/trunk/; revision=49489
2013-05-22 01:57:45 +00:00
Evan Huus 18c5053f2b From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8706
"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 'tcp.stream == n' filter.

svn path=/trunk/; revision=49488
2013-05-22 01:49:57 +00:00
Evan Huus d092bb9c06 Add missing include file that's needed so symbols are defined
on all platforms.

svn path=/trunk/; revision=49487
2013-05-22 01:46:12 +00:00
Guy Harris c1d34d4be6 On OS X, get the interface type from the System Configuration framework.
svn path=/trunk/; revision=49486
2013-05-22 01:19:18 +00:00
Guy Harris 7f97cc813e From Cal Tunney:
contify some arrays;

	don't complain about "print.command" on Windows, just ignore it,
	as it's valid on non-Windows platforms;

	fix some comparisons for preferences moved elsewhere;

	clean up some comments.

svn path=/trunk/; revision=49485
2013-05-21 21:28:41 +00:00
Guy Harris dc8af1b552 Clean up white space.
svn path=/trunk/; revision=49484
2013-05-21 20:38:51 +00:00
Alexis La Goutte c97865c179 Enhance backport-rev script
pbcopy is not available in Linux (only in Mac OS)
Add check if pbcopy is available or xsel (a linux variante)

svn path=/trunk/; revision=49483
2013-05-21 16:57:55 +00:00
Irene Rüngeler aaa1f1bef9 Only overwrite the scanned link layer properties if they are specified by command line options.
svn path=/trunk/; revision=49482
2013-05-21 14:17:42 +00:00
Michael Mann 1bdf3446c5 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8700 :
Highlight correct bytes in some SDP trees.

svn path=/trunk/; revision=49481
2013-05-21 13:27:48 +00:00
Irene Rüngeler f4bb7f45be Apply the filter string if all interfaces are selected.
svn path=/trunk/; revision=49480
2013-05-21 13:00:03 +00:00
Michael Mann 77b1d9b323 add a few filterable fields/expert info
svn path=/trunk/; revision=49479
2013-05-21 12:55:55 +00:00
Michael Mann 2369729832 use ep_ allocated memory instead of g_ allocated.
svn path=/trunk/; revision=49478
2013-05-21 12:54:08 +00:00
Irene Rüngeler 24fe35173e On MacOSX en1 is not necessarily wireless.
svn path=/trunk/; revision=49477
2013-05-21 12:32:44 +00:00
Pascal Quantin 11e849032f Fix compilation with GTK version older than 2.24
svn path=/trunk/; revision=49476
2013-05-21 09:13:43 +00:00
Anders Broman 51723864c1 - Move the export_pdu tap outside of if(tree)
- Have the diameter tap request a tree.

svn path=/trunk/; revision=49475
2013-05-21 05:47:20 +00:00
Anders Broman b8618947bd Add missing element NSAP to IE Evolved Allocation/Retention Priority II.
svn path=/trunk/; revision=49474
2013-05-21 05:08:50 +00:00
Michael Mann 478ee0ae73 DHCPv6 option 56, RFC 5908
Bug 8421 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8421)

svn path=/trunk/; revision=49473
2013-05-21 03:24:55 +00:00
Michael Mann 24df2990e5 Use col_set_fence() functionality to remove an unnecessary global variable.
svn path=/trunk/; revision=49472
2013-05-21 02:08:40 +00:00
Michael Mann f04a801716 Minor cleanup. Removal of unnecessary packet_info* global variable
svn path=/trunk/; revision=49471
2013-05-21 02:04:41 +00:00
Evan Huus 575aba0a05 Fix format string typo.
svn path=/trunk/; revision=49470
2013-05-21 00:11:10 +00:00
Michael Mann e39b328f0d add a few more filterable items.
svn path=/trunk/; revision=49469
2013-05-20 23:56:47 +00:00
Jeff Morriss 8730b3e8c5 Fix:
Error: the blurb for hf_048_030_WE ("asterix.048_030_WE") matches the field name in epan/dissectors/packet-asterix.c

Also remove a few blurbs which aren't exact matches but are basically the same.

svn path=/trunk/; revision=49468
2013-05-20 23:23:34 +00:00