- Link against filetap
- Add cfile.c to sources
- Add the generated tshark-tap-register.c (which seems to be pulled
in by one of the intermediate libraries with autotools)
svn path=/trunk/; revision=54674
programs that use {lib,win}pcap but that don't capture traffic, such as
rawshark; rename it to PLATFORM_PCAP_SRC, and include it in
SHARK_COMMON_SRC rather than SHARK_COMMON_CAPTURE_SRC.
svn path=/trunk/; revision=54670
is that it includes files used in TShark and rawshark as well as
Wireshark, and that name is what's used by the autotools.
Add capture_sync.c to SHARK_COMMON_CAPTURE_SRC, as it's used both by
Wireshark and TShark, but not by rawshark, and as it's in the autotools
SHARK_COMMON_CAPTURE_SRC. Move PLATFORM_CAPTURE_SRC from
(WIRE)SHARK_COMMON_SRC to SHARK_COMMON_CAPTURE_SRC, as it should only be
used by programs that capture traffic.
svn path=/trunk/; revision=54668
This is a VERY PRELIMINARY version of tfshark. It's an attempt to jumpstart FileShark and its architecture. Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it)
This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture. And those layers will slowly be added in time (patches always welcome!).
svn path=/trunk/; revision=54646
on what libwiretap thinks it is.
Update some comments to reflect the death of the hack used to include
(libwiretap) plugin support in programs not built with libwireshark.
svn path=/trunk/; revision=54015
wireshark etc should now work, the basic stuff at least.
Known problems/todos:
- The plugins are not searched for in the current directory,
so find out how to let Wireshark know to search for the
plugins
- Other supporting files are missing (COPYING.txt, AUTHORS*, ...)
- Your missing feature could be listed here ;)
Ciao
Jörg
svn path=/trunk/; revision=53780
knowledge of particular types of plugins. Instead, let particular types
of plugins register with the common plugin code, giving a name and a
routine to recognize that type of plugin.
In particular applications, only process the relevant plugin types.
Add a Makefile.common to the codecs directory.
svn path=/trunk/; revision=53710
pcap probably is different from the WinPcap version.
- Set WINPCAP_VERSION for cmake builds to "unknown"
- Oh, the NEWS file changed again.
svn path=/trunk/; revision=53690
Always include the "true" zlib includes first. This works around a
bug in the Windows setup of GTK[23] which has a faulty zconf.h.
svn path=/trunk/; revision=53647
http://gcc.gnu.org/onlinedocs/gcc-4.8.2/gcc/Code-Gen-Options.html#Code-Gen-Options
-ftrapv "generates traps for signed overflow on addition, subtraction,
multiplication operations." and -fwrapv "instructs the compiler to
assume that signed arithmetic overflow of addition, subtraction and
multiplication wraps around using twos-complement representation."
Those seem mutually-exclusive to me, and we probably want wrapping, not
traps, as there's probably a fair bit of code out there that explicitly
or implicitly assumes wrapping. (Actually, we really want to avoid
signed arithmetic for the cases that most matter, such as offsets and
lengths, but, unfortunately, we currently have API conventions that
allow negative values for lengths, either with -1 meaning "to the end"
or with negative values meaning "relative to the end".) In addition,
there seem to be some bugs complaining that -ftrapv doesn't always cause
traps on signed integer overflow.
We seem to be seeing crashes in Lemon on the Solaris buildbot subsequent
to adding -ftrapv; I don't know whether that's an overflow being
detected, a bug in the compiler, or something unrelated, especially
given that we're using Sun C, not GCC, on the Solaris buildbot.
However, we'll try removing -ftrapv, to see if it fixes the problem; the
MIT CSAIL paper in question wasn't really recommending all the GCC
options it mentioned (which, as noted, wouldn't make sense, as -ftrapv
and -fwrapv appear to be mutually-exclusive).
svn path=/trunk/; revision=53556
cmake 2.6.
Add two more policy statements to avoid warnings on current cmake systems.
CMP0020 doesn't work - no idea why.
svn path=/trunk/; revision=53180
- Add a CMAKE_BUILD_TYPE default of RelWithDebInfo (Release with debug info),
print the choice.
This will pick up the previously used flags LINK_FLAGS and
CMAKE_C_FLAGS and CMAKE_CXX_FLAGS but also pick up the variables postfixed
by _<build-type>
- Remove Optimization (-O2) and debug (-g) flags from list of default flags
as they are now automagically set by CMAKE_C_FLAGS_RELWITHDEBINFO etc.
NOTE: This also needs to be done for the Windows flags, I just don't have
a Win system to test on right now.
svn path=/trunk/; revision=53083
data files (diameter/*, COPYING, manuf) when running *shark from the
build directory.
Do this by passing in the top-level source directory as a compile-time
definition (unfortunately this has to be in the top-level Makefile too because
some programs link directly with epan/filesystem.c).
The plugins dir is no longer below the datafile directory but rather the
progfile directory (if we have one). Handle the special case of AUTHORS-SHORT
(a data file but a generated one) by checking the file name before building
the path.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5664
svn path=/trunk/; revision=52940
problem/solution.
"Long" since solved by copying the solution from Makefile.nmake.
Small update to the status of cmake builds on windows
svn path=/trunk/; revision=52574
variable of our parent process isn't going to work. Plan B is to write
this stuff into a file and manually run it once.
Hard code the QT5 search path on Windows for now.
svn path=/trunk/; revision=52489
running the executables from the build tree without installation.
It doesn't really work yet but the troubleshooting has to wait
until either I've gotten some sleep or someone else fixes it.
svn path=/trunk/; revision=52454
some smaller changes by me.
- README.cmake
Document how to (one day) run on Windows
- CMakeLists.txt
Use MSVC compiler flags for MSVC instead of gcc flags
- FindWSWinLibs.cmake
New: Creates HINTS for finding includes and libraries
inside the Wireshark support library installation.
- FindXXX.cmake
Make use of HINTS generated by FindWSWinLibs.cmake
This has not really been tested on Windows as my installation seems to have
automagically downloaded some fixes and is in an inconsistent state since.
Will probably need to reinstall.
svn path=/trunk/; revision=52194
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=51322
> User: guy
> Date: 2013/08/12 01:01 PM
>
> Log:
> Just check whether dladdr() is available; we check in the code whether
> it succeeds, so there's no point in checking whether it succeeds in a
> sample program.
svn path=/trunk/; revision=51334
there and moving it avoids having to recompile the file for use in editcap
and mergecap (which don't link against libwireshark).
svn path=/trunk/; revision=50650
Before:
user0 - USER 0
user1 - USER 1
user10 - USER 10
user11 - USER 11
user12 - USER 12
user13 - USER 13
user14 - USER 14
user15 - USER 15
user2 - USER 2
user3 - USER 3
user4 - USER 4
user5 - USER 5
user6 - USER 6
user7 - USER 7
user8 - USER 8
user9 - USER 9
After:
user0 - USER 0
user1 - USER 1
user2 - USER 2
user3 - USER 3
user4 - USER 4
user5 - USER 5
user6 - USER 6
user7 - USER 7
user8 - USER 8
user9 - USER 9
user10 - USER 10
user11 - USER 11
user12 - USER 12
user13 - USER 13
user14 - USER 14
user15 - USER 15
svn path=/trunk/; revision=50482
bugs it points out that probably mean the code won't work on machines
that require alignment (e.g., SPARC machines), but we'll turn it on once
we fix them. (clang is fussier than GCC about this.)
svn path=/trunk/; revision=50187
and returned variable-names:
Old: Provide the var name and adapt the find-name
New: Provide the find-name and adapt the var name
This allows for different packages with the same var name.
This chage effects Qt4 and PythonInterp.
- Replace self created FindPYTHON with cmake provided
FindPythonLibs.
svn path=/trunk/; revision=49105
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=46575
User: gerald Date: 2012/12/17 01:24 PM
Log:
Add libui_dirty.
This is the autofoo way of solving the problem.
Implement the cmake solution (which is used in wiretap/ and other places)
which does not require building a separate lib.
svn path=/trunk/; revision=48976
shifting routines to return an error message on failure or NULL on
success. Prettify and simplify the layout of the GTK+ time shift
dialog. Make the cancel button work as expected.
Add a time shift dialog to the Qt port. I used a Mad Lib (sentence)
layout. Hopefully that won't make translation too difficult. For some
reason time shifts aren't immediately shown in the packet detail. This
appears to be a bug in the packet list / packet detail code.
Add warning role color definitions to tango_colors.h and use them.
svn path=/trunk/; revision=46680
What we *do* need is:
the Application Services framework, for GUI applications;
System Configuration, for anything that would try to get
interface friendly names;
Core Foundation for everything that uses either of those and/or
everything that displays system version information.
We're currently assuming that the only Apple platform on which we build
is OS X, in which case we have the OS X frameworks; update a comment.
cfutils.c is part of WIRESHARK_COMMON_SRC, which is included in
tshark_FILES; it doesn't need to be included in tshark_FILES.
svn path=/trunk/; revision=46147
Friendly Names for interfaces on Windows
Notes on the changes the patch covers:
* if_info_t struct: addition of friendly_name
* Dumpcap Interface list format changes:
+ Win32: "dumpcap -D" shows friendly_name in place of descript if known
+ All: machine interface "dumpcap -D -Z none" includes friendly_name in the
list in addition to the existing parameters
* interface_options struct: addition of console_display_name
+ When an interface name is displayed in a console, it will typically be the
console_display_name (instead of name).
+ console_display_name is used as the basis of the autogenerated temp
filenames
+ console_display_name is typically set to the friendly_name if known,
otherwise it is set to the interface name
* Enhancements to capture_opts_add_iface_opt() (the function which process -i
options).
+ Can now specify the interface using its name and friendly_name
+ Interface name matching is case insenstive
+ Name matching first attempts exact matching, then falls back to prefix
matching
(e.g. dumpcap -i local)
+ Validates interface names, instead of blindly sending them off to
winpcap/libpcap
+ Interface specification by number is still supported.
* capture_opts_trim_iface() has been refactored:
+ Instead of repeating a decent chunk of the cost in
capture_opts_add_iface_opt(), it calls capture_opts_trim_iface() to specify the
interface.
* introduction of capture_win_ifnames.[ch] (windows only code)
+ Implements static function GetInterfaceFriendlyNameFromDeviceGuid() - a
windows version independant function to convert an interface guid into its
friendly name. Uses published api functions on windows vista and higher, but
falls back to unpublished API functions on older windows releases.
+ void get_windows_interface_friendlyname(/* IN */ char
*interface_devicename, /* OUT */char **interface_friendlyname); - extracts the
GUID from the interface_devicename, then uses
GetInterfaceFriendlyNameFromDeviceGuid() to do the resolution
* Auto temp filename generation:
+ Now uses wireshark_pcapng_* or wireshark_pcap_* depending on file format
+ Basis temp filename format on console_display_name
+ Win32: if console_display_name is a windows interface guid, extracts
numbers from GUID here (instead of in interface option processing)
GUI CHANGES:
* Dialog that displays when you click the "Manage Interfaces" button (within
Capture Options dialog) has been renamed from "Add new interfaces" to
"Interface Management"
* ui/gtk/capture_dlg.c: new_interfaces_w variable renamed to
interface_management_w
* Win32: Local Interfaces tab on Interface Management dialog, shows includes
friendly name as far left column
* Interface Management dialog defaults to larger size on win32 - so it fits
without resizing local interfaces tab
* Interface Management dialog now saves preferences when you click the apply
button (local hidden interfaces was not persisting across restarts)
* Tweaks: "Interface Details" dialog (Interface list->Capture Interfaces ->
Details):
+ "Friendly Name" renamed to "NDIS Friendly Name"
+ Added "OS Friendly Name" to the top of the list
* Win32: The "Capture Interfaces" dialog now shows the friendly name instead of
device guid
* Welcome screen:
+ The height of the interface list scrollbox dynamically adjusts & updates to
the number visible interfaces.
Up to 10 interfaces can be listed without a scroll bar, the minimum height
is for 2 interfaces.
+ Win32: now shows just the Friendly Name if known - in place of
"Interfacename_Guid:(Description)"
svn path=/trunk/; revision=46083
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6134 :
Make VERSION_MAJOR, VERSION_MINOR, and VERSION_MICRO available in config.h so
(e.g.) dissector writers can #if around them as necessary to make a piece of
code compile with different versions of Wireshark. (Hopefully VERSION_MICRO
is not important in this respect!)
Windows also defines VERSION_EXTRA which can be used to help identify custom
builds; this is not done for these build methods (yet?).
svn path=/trunk/; revision=44986
qtshark build again.
(Also, first commit trying to use bzr as an svn client, so apologies if
something unexpected breaks)
svn path=/trunk/; revision=44908
Move the GTK+ text import code to the common UI directory. Create
wtap_encap_requires_phdr() from code in file_import_dlg.c.
svn path=/trunk/; revision=44904
add_definitions() but the variables CMAKE_C{,XX}_FLAGS. Set these
flags correctly at the toplevel, so no hack in the ui/qt/ subdir
is required anymore.
svn path=/trunk/; revision=44633
extraction of the wireshark version for cmake. Now the version part
is either terminated by ")" (old) or "," (added).
It looks like .*? does not exist for non-greedy matches in cmake regex.
svn path=/trunk/; revision=44570
Add an interface monitor that, on Linux distributions with libnl,
watches for interfaces to appear or disappear and, on such an event,
causes windows showing interface lists to update.
svn path=/trunk/; revision=43521
source file directly into the sources variable - there seems to
be a subtle difference between ui/util.c and epan/crypt/md5.c
svn path=/trunk/; revision=41052
variable on the initial cmake run and not on later re-runs (like when some
cmakelists.txt file changed and we call make).
Of course this value should really be passed as an option instead of an
environment variable but I want to document how to get the current approach
working properly before switching to the proper approach.
svn path=/trunk/; revision=40913
Add support to follow UDP and TCP streams like wireshark does. UDP streams are
selected with IP address/port pairs. TCP stream are selected with either the
stream index or IP address/port pairs.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6684
svn path=/trunk/; revision=40852
a) C++ has a standardized way of marking parameters as unused
b) cmakes autoquoting magic failed when the compiler wasn't gcc
but moc instead.
- qtshark: Don't try to compile the c source files inside ui/qt/
- qtshark: Only run moc on the files that need it.
- qtshark: It's too early to try any of the new qtshark files
as clean.
- Make Qt detection actually work
- Add C++ to the list of languages for this project
svn path=/trunk/; revision=40807