aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.common
AgeCommit message (Collapse)AuthorFilesLines
2014-07-16Move the monitor-for-interface-list-changes stuff to the caputils library.Guy Harris1-2/+0
Change-Id: Ie0d4504688602c2aa8e9788643b079930ca7d305 Reviewed-on: https://code.wireshark.org/review/3076 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-04Move utility routines for capturing into a libcaputils static library.Guy Harris1-12/+3
Some of those routines are used only in dumpcap; others are used in TShark and Wireshark as well. Change-Id: I9d92483f2fcff57a7d8b6bf6bdf2870505d19fb7 Reviewed-on: https://code.wireshark.org/review/2841 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Add --help and --version support.Guy Harris1-1/+2
Make the output for them resemble the output for other programs. Change-Id: I45dbee32ad403b8fedc2350ac9096ac1a5820cbe Reviewed-on: https://code.wireshark.org/review/2799 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Make --help and --version information a bit more uniform.Guy Harris1-9/+12
Have --version print the version number, the copyright information, the "compiled with" information, the "running on/with" information, and the compiler information. Have --help print the version number, a one-line summary of what the program does, a reference to http://www.wireshark.org for more information, a Usage: line, and a list of command-line options. This means programs doing that don't need to include version.h; that's left up to get_ws_vcs_version_info() to do. Change-Id: Idac641bc10e4dfd04c9914d379b3a3e0cc5ca8cb Reviewed-on: https://code.wireshark.org/review/2794 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Move filters.[ch] to libui.Guy Harris1-2/+0
Change-Id: I32f04016498dfe8f54b0480f30a84ffe5ef7868f Reviewed-on: https://code.wireshark.org/review/2727 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Move stat_menu.h to libui.Guy Harris1-1/+0
Change-Id: I7bed7f7931845bc41035535cc62e1fe17c71047d Reviewed-on: https://code.wireshark.org/review/2726 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Move proto_hier_stats.[ch] to libui.Guy Harris1-2/+0
Change-Id: Ib7c0617d88bf92cad0ac877176001d29960f1cd8 Reviewed-on: https://code.wireshark.org/review/2725 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Move capture.[ch] to libui.Guy Harris1-2/+0
Change-Id: I86e7e781cc9e14abab0374a18b95438529b046f0 Reviewed-on: https://code.wireshark.org/review/2711 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Move capture_session.h to capchild; what it declares is defined there.Guy Harris1-11/+0
Change-Id: I8b1407839390b7ac0b45bf6f583c1a509073f002 Reviewed-on: https://code.wireshark.org/review/2709 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Move capture_ui_utils.[ch] to libui.Guy Harris1-4/+2
Change-Id: Id0f3d4d60a1acc7aa64fd3737b8f16df5bca4e5a Reviewed-on: https://code.wireshark.org/review/2708 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-29Move some more stuff into wsutil.Guy Harris1-4/+0
Move the routines to parse numerical command-line arguments there. Make cmdarg_err() and cmdarg_err_cont() routines in wsutil that just call routines specified by a call to cmdarg_err_init(), and have programs supply the appropriate routines to it. Change-Id: Ic24fc758c0e647f4ff49eb91673529bcb9587b01 Reviewed-on: https://code.wireshark.org/review/2704 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-23Move the routines to talk to dumpcap into a static libcapchild.Guy Harris1-4/+0
This pulls some stuff out of the top-level directory, and means we don't have to build them once for every program using them. Change-Id: I37b31fed20f2d5c3563ecd2bae9fd86af70afff5 Reviewed-on: https://code.wireshark.org/review/2591 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Move get_os_version_info() to libwsutil.Guy Harris1-3/+0
This mean we also have to move CFString_to_C_string() there for OS X. Change-Id: Ic91ad872e9d5290cf34f842503ededd5452e4337 Reviewed-on: https://code.wireshark.org/review/2511 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
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