aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.common
AgeCommit message (Collapse)AuthorFilesLines
2014-02-07Replace "svn" with "git" all over the place.Gerald Combs1-3/+3
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate. Rename "svnversion.h" to "version.h" as Evan suggested. Update some URLs. In make-version.pl, make sure we don't set an improper upstream branch name. Use the number of commits + short hash from `git describe` for package names by default. Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96 Reviewed-on: https://code.wireshark.org/review/139 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-01-09Move cfile.c into SHARK_COMMON_SRC (as was done in nmake)Jörg Mayer1-4/+1
svn path=/trunk/; revision=54678
2014-01-08At least some of the files in PLATFORM_CAPTURE_SRC are needed byGuy Harris1-2/+2
programs that use {lib,win}pcap but that don't capture traffic, such as rawshark; rename it to PLATFORM_PCAP_SRC, to match CMake. svn path=/trunk/; revision=54671
2014-01-08Rename PLATFORM_SRC to PLATFORM_CAPTURE_SRC, to match the CMake name.Guy Harris1-2/+2
svn path=/trunk/; revision=54669
2014-01-08TFShark (Terminal Fileshark) v.001. Bug 9607 ↵Michael Mann1-1/+9
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607) 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
2013-12-21Drop isprint.h use g_ascii_isprint() when this include hack was enabled.Jakub Zawadzki1-1/+0
svn path=/trunk/; revision=54327
2013-12-13Add a "captype" file that just reports the type of a capture file, basedGuy Harris1-0/+4
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
2013-12-02Move most of the plugin code from epan to wsutil and remove allGuy Harris1-4/+2
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
2013-08-01Move a bunch of the crypt modules and pint.h into wsutil.Jeff Morriss1-1/+0
This means wsutil now links against libcrypt. Protect a bunch of the crypt header files from multiple inclusion. svn path=/trunk/; revision=51100
2013-07-16Move merge.{h,c} into wiretap: these modules use wiretap to merge files.Jeff Morriss1-4/+1
svn path=/trunk/; revision=50656
2013-07-16Move u3.{h,c} and g711.{h,c} into wsutil.Jeff Morriss1-4/+0
Project g711.h against multiple inclusion and add C++ compatibility wrapper. svn path=/trunk/; revision=50654
2013-07-16Move strnatcmp.{h,c} from epan into wsutil: there's nothing epan-specificJeff Morriss1-3/+1
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
2013-07-12Move the print modules into epan.Jeff Morriss1-8/+2
svn path=/trunk/; revision=50526
2013-07-12Move disabled_protos.{h,c} into epan.Jeff Morriss1-2/+0
svn path=/trunk/; revision=50521
2013-07-11Move some more modules into epan.Jeff Morriss1-4/+0
svn path=/trunk/; revision=50517
2013-07-11packet dissection now takes pointer to tvb instead of guint8 dataJakub Zawadzki1-0/+2
implement frame_tvbuff, right now almost a copy of 'real' tvb. svn path=/trunk/; revision=50497
2013-07-10Add strnatcmp by Martin Pool for 'natural order' string comparisons, and ↵Chris Maynard1-1/+2
make use of it in editcap and mergecap for listing encapsulation types. For example: 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
2013-06-26Move tap-*-common.{h,c} into ui/ since that's the home for common UI functions.Jeff Morriss1-4/+0
svn path=/trunk/; revision=50165
2013-06-26Move tempfile.{h,c} into wsutil.Jeff Morriss1-4/+0
svn path=/trunk/; revision=50163
2013-06-25Move a couple of time-related modules into wsutil.Jeff Morriss1-3/+0
A bunch of files didn't really need to include these header files so remove the include line rather than changing it. svn path=/trunk/; revision=50154
2013-06-25Allow the Gtk+ and Qt versions to be built simultaneously (with autotools).Jeff Morriss1-9/+9
./configure now accepts: --with-gtk2 : enabled by default; exclusive of --with-gtk3 --with-gtk3 : disabled by default; exclusive of --with-gtk2 --with-qt : disabled by default, can be specified with gtk --enable-wireshark : controls whether *any* GUI is built If Qt is enabled then a new program is created: "wireshark-qt". "wireshark" remains the Gtk+ version. svn path=/trunk/; revision=50147
2013-05-22Pull the capture-session state information out of capture_opts and putGuy Harris1-0/+1
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-22On OS X, get the interface type from the System Configuration framework.Guy Harris1-1/+0
svn path=/trunk/; revision=49486
2013-05-12Tiny whitespace changeJörg Mayer1-8/+8
svn path=/trunk/; revision=49262
2013-04-25Send the output of the -D and -L options to the standard output ratherGuy Harris1-1/+0
than the standard error. In Wireshark on Windows, create a console before doing so and destroy it before exiting. Don't do that in TShark or dumpcap, as those are console-mode programs on Windows. This should fix bug 8609 and still allow "wireshark -D" and "wireshark -L" to work when the standard output isn't redirected. svn path=/trunk/; revision=49025
2013-02-28Add ws_symbol_export.h WIRESHARK_COMMON_INCLUDES to fix failing distcheckBalint Reczey1-1/+2
svn path=/trunk/; revision=47941
2013-02-02Move recent.c to the ui directory, as we did with its header file.Guy Harris1-1/+0
svn path=/trunk/; revision=47438
2012-12-21Use pcapio routines. This concludes the preperation forMichael Tüxen1-0/+5
adding pcapng support. svn path=/trunk/; revision=46673
2012-11-22On UN*X, if an interface has a description, use it as the "friendlyGuy Harris1-0/+4
name". If it doesn't have a description, on OS X, use the System Configuration framework to attempt to get a "friendly name" for interfaces. If a loopback device doesn't have a friendly name, give it "Loopback" as the friendly name. Move the "turn a CFString into a mallocated C string" routine into common code, as it's used in more than one place. svn path=/trunk/; revision=46131
2012-09-24From Jim Young, bug 7745.Martin Mathieson1-0/+6
Add Makefile support for reordercap. svn path=/trunk/; revision=45090
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-06-28From Pontus Fuchs:Guy Harris1-0/+2
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
2012-06-24Build Wireshark with ws80211_utils.cJörg Mayer1-1/+2
svn path=/trunk/; revision=43463
2012-06-20Makefile.common:Jörg Mayer1-2/+1
- ws80211_utils.c is only needed to build dumpcap, not to build wireshark. If it were different it would probably indicate a bad api design. ui/gtk/Makefile.common: - Sort in the toolbar in the right place (alphabetically) svn path=/trunk/; revision=43415
2012-06-20Add ws80211_utils.[ch] of bug ↵Anders Broman1-3/+6
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6973 sligtly modified to compile on Windows. See if it breaks any other platform. svn path=/trunk/; revision=43410
2012-03-18Remove ui/qt/main.cpp from the list of source files for Wireshark, forGuy Harris1-1/+0
now. svn path=/trunk/; revision=41650
2012-03-18Add automake support for Qt - use --with-qt as a configure scriptGuy Harris1-0/+1
argument. svn path=/trunk/; revision=41647
2012-03-08Move alert_box.c to the ui directory.Guy Harris1-1/+0
svn path=/trunk/; revision=41436
2012-02-19Build the TShark taps into a static libcliui library in the ui/cliGuy Harris1-46/+1
directory, and link TShark with that; let's see if this fixes the Windows buildbots. svn path=/trunk/; revision=41070
2012-02-19Move dftest.c back to the top-level directory; that way, all of theGuy Harris1-1/+1
stuff in ui/cli can be stuffed into a libcliui library to link with TShark, and all of the source files containing main() (except for Wireshark) are in the top-level directory (dftest isn't any more special than TShark or capinfos or mergecap or editcap or...). svn path=/trunk/; revision=41064
2012-02-18Create a libui (static) library in the ui directory, which contains theGuy Harris1-18/+5
object files from all the source files in the ui directory (but not in its subdirectories), and link the programs that need it with them. This cleans things up a little bit, and may also fix the Windows build. svn path=/trunk/; revision=41061
2012-02-17Fix a typo that broke compilation on all platformsJörg Mayer1-1/+1
svn path=/trunk/; revision=41055
2012-02-17Trying to fix the compile of ui/util.c on Windows by moving theJörg Mayer1-26/+28
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
2012-02-17Start moving files to ui/ and ui/cli/Jörg Mayer1-43/+43
svn path=/trunk/; revision=41047
2012-02-05From QA Cafe:Anders Broman1-0/+1
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
2012-01-18Add some files that didn't get checked in.Guy Harris1-0/+1
svn path=/trunk/; revision=40562
2012-01-18Restructure the recent file code so that recent.c is GUI-independent;Guy Harris1-0/+3
move it to the top-level source directory for now, and move ui/gtk/recent.h to the ui directory. svn path=/trunk/; revision=40561
2012-01-16Move alert_box.c back up to the top-level directory for now, to fix theGuy Harris1-2/+2
Windows build. We probably want to construct a "ui" (static) library the same way we construct the libwireshark (dynamic) library, out of stuff in the ui directory and the relevant subdirectories. svn path=/trunk/; revision=40541
2012-01-16Move some headers for UI stuff, and the alert_box.c UI-specific file, toGuy Harris1-7/+7
the ui directory. (Perhaps some other files that would be used by all flavors of Wireshark, for any GUI toolkit or for someting such as ncurses, and not for any command-line tool such as TShark, should be moved there as well.) Shuffle some #includes to put the "ui/XXX.h" includes together. svn path=/trunk/; revision=40529
2012-01-15Rename crypt-xxx to xxxJörg Mayer1-1/+1
svn path=/trunk/; revision=40511