osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
53,643 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

992 Commits

Author SHA1 Message Date
Pascal Quantin e2801d0da0 Windows: fix update of version information in wireshark and tshark 
Broken since gc46329c

Change-Id: I00146675d16db021e2cbb7b16841ea9ecb1439b9
Reviewed-on: https://code.wireshark.org/review/2703
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-06-30 05:13:24 +00:00
AndersBroman 18e14a4c6c Have the makefile run windepoyqt if it exists to copy the required dlls to the install dir. 
Change-Id: If87c2670e1ffef116d4497241f070fa41a70015b
Reviewed-on: https://code.wireshark.org/review/2644
Reviewed-by: Anders Broman <a.broman58@gmail.com>
 2014-06-27 13:29:53 +00:00
Guy Harris deda668e4c Add the capchild directory to some lists of rules. 
Change-Id: Ic06cf8005a16cc61c8e3ae506dba4c4916ab6471
Reviewed-on: https://code.wireshark.org/review/2626
Reviewed-by: Guy Harris <guy@alum.mit.edu>
 2014-06-24 20:11:21 +00:00
Guy Harris 7fe1f82302 Fix name of library. 
Change-Id: I463637a6218a86ed6dbd95019f33d8b999bcaaf2
Reviewed-on: https://code.wireshark.org/review/2596
Reviewed-by: Guy Harris <guy@alum.mit.edu>
 2014-06-24 00:48:12 +00:00
Guy Harris 213189ef9e Move the routines to talk to dumpcap into a static libcapchild. 
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-23 23:58:29 +00:00
Guy Harris 3e5e18f55a Build version.h before trying to build wsutil. 
Code in wsutil includes it.

Change-Id: I02cb49c3a672955b74a183996d2e815b8d55b668
Reviewed-on: https://code.wireshark.org/review/2539
Reviewed-by: Guy Harris <guy@alum.mit.edu>
 2014-06-22 03:55:55 +00:00
Pascal Quantin cc37b50334 Get rid of obsolete references to nettle 
Bug: 2089
Change-Id: Ie3337a1b750d8d95f6291c77dfd19cd1b0c57e83
Reviewed-on: https://code.wireshark.org/review/2388
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-06-18 18:03:43 +00:00
AndersBroman 1777f60824 The broken python support is beeing removed. 
Change-Id: I5f4d3d381d8629158c9d1bea344b5a2e64a0f462
Reviewed-on: https://code.wireshark.org/review/2282
Reviewed-by: Anders Broman <a.broman58@gmail.com>
 2014-06-16 22:14:23 +00:00
Pascal Quantin ad7b5381ac Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0 
Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4
Reviewed-on: https://code.wireshark.org/review/1978
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-06-06 15:33:01 +00:00
Gerald Combs 0a249087c3 Build with GTK+ 2.24.23. 
Change-Id: Ic5c385c0fcef4d40a8cb9e7a271d14eb80905460
Reviewed-on: https://code.wireshark.org/review/1665
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
 2014-05-16 16:25:38 +00:00
Bill Meier 5410fab080 Add a comment re certain variables beibg defined in win32.mak. 
Change-Id: I9246a1786a5bf8c48744378f25a66f6881caed81
Reviewed-on: https://code.wireshark.org/review/1459
Reviewed-by: Bill Meier <wmeier@newsguy.com>
 2014-05-01 15:11:44 +00:00
Pascal Quantin 590fcbc66f Upgrade Windows builds to Lua 5.2.3 
Change-Id: Ie7fffa9d57b1b861ab57cc55259c79cf0e8ee0e0
Reviewed-on: https://code.wireshark.org/review/974
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-04-05 22:41:06 +00:00
Bill Meier 249daa686f Copy randpkt.exe & randpkt.pdb to install directory during windows build. 
Change-Id: I6ef6b181897bd3d35dc94ebb2d04aaa209d8df6e
Reviewed-on: https://code.wireshark.org/review/904
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
 2014-04-01 04:29:36 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file 
(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-03-31 18:48:06 +00:00
Pascal Quantin a1d4189c5e Upgrade Windows builds to Lua 5.2.1 
Change-Id: I5d2058673b69beb8393aae0571703cd9dbb79c4e
Reviewed-on: https://code.wireshark.org/review/863
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-03-29 16:30:53 +00:00
Gerald Combs f966980937 Replace "svn" with "git" all over the place. 
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-02-07 23:03:03 +00:00
Anders Broman a40f824e0e Make it easier to try GTK 3.6 
svn path=/trunk/; revision=54986
 2014-01-27 19:22:10 +00:00
Gerald Combs bce9eaad75 Partially revert r54824. 
svn path=/trunk/; revision=54825
 2014-01-16 02:23:42 +00:00
Gerald Combs d5b706be51 Allow the use of Win flex-bison and document how to do that. 
svn path=/trunk/; revision=54824
 2014-01-16 01:28:02 +00:00
Gerald Combs bbc7ad3c4e cfile.c is in WIRESHARK_COMMON_SRC so there's no need to add it again. 
svn path=/trunk/; revision=54675
 2014-01-09 01:30:25 +00:00
Guy Harris 658e0b30e6 At least some of the files in PLATFORM_CAPTURE_SRC are needed by 
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-08 20:50:52 +00:00
Guy Harris 324a7c9043 Rename PLATFORM_SRC to PLATFORM_CAPTURE_SRC, to match the CMake name. 
svn path=/trunk/; revision=54669
 2014-01-08 20:22:13 +00:00
Michael Mann bf284da2ee TFShark (Terminal Fileshark) v.001. Bug 9607 (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
 2014-01-08 04:35:28 +00:00
Guy Harris e21fd7c0ce Add a "captype" file that just reports the type of a capture file, based 
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-13 02:59:16 +00:00
Guy Harris 0cc1545d05 Move most of the plugin code from epan to wsutil and remove all 
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-12-02 08:30:29 +00:00
Jörg Mayer 244000000d - Rename PCAP_VERSION to WINPCAP_VERSION - the version of the underlying 
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
 2013-12-01 10:05:16 +00:00
Gerald Combs 26325020a2 Try to get qmake to create wireshark-tap-register.c. 
svn path=/trunk/; revision=53466
 2013-11-21 02:05:36 +00:00
Guy Harris db25270df8 Move the epan/filesystem.c routines to wsutil; they're not specific to 
packet dissection, they're specific to the entire Wireshark suite of
programs.

svn path=/trunk/; revision=53377
 2013-11-17 02:55:14 +00:00
Pascal Quantin 63ff652b8e Fix relative path now that u3 folder has been removed 
svn path=/trunk/; revision=52898
 2013-10-27 19:45:30 +00:00
Gerald Combs 69741d086b Remove U3 code and packaging. 
svn path=/trunk/; revision=52896
 2013-10-27 17:15:39 +00:00
Gerald Combs e7202d159a If static analysis is enabled disable error checking when compiling the 
Qt code. This should hopefully work around a builder issue.

svn path=/trunk/; revision=52661
 2013-10-17 17:50:00 +00:00
Pascal Quantin 6390f33772 Update the User Guide for the upcoming 1.11.0 release 
svn path=/trunk/; revision=52576
 2013-10-12 23:48:43 +00:00
Gerald Combs 6a5afa8e95 Update to the latest Windows library tags. Add an "install_qt" target. 
svn path=/trunk/; revision=52558
 2013-10-12 01:02:34 +00:00
Gerald Combs fcff2c96e6 QT_DIR → QT5_BASE_DIR. This matches the CMake environment. 
svn path=/trunk/; revision=52557
 2013-10-12 00:12:24 +00:00
Gerald Combs 383ed6465a Look for Qt in WIRESHARK_LIB_DIR. Add a conditional check for qmake. 
svn path=/trunk/; revision=52556
 2013-10-11 23:52:19 +00:00
Gerald Combs 59e24dfb1d "install-generated-files" depends on "doc". Set dependencies 
accordingly.

svn path=/trunk/; revision=52530
 2013-10-11 01:31:59 +00:00
Gerald Combs c03546c8c6 qtshark.exe doesn't depend on tshark_OBJECTS. 
svn path=/trunk/; revision=52529
 2013-10-11 01:16:19 +00:00
Gerald Combs c62f096ec7 Don't return an error if cleaning the Qt directory fails. 
svn path=/trunk/; revision=52525
 2013-10-11 00:29:21 +00:00
Chris Maynard 37a7e3382c Revert the changes made to resolve https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528 (When following an HTTP tcp stream decode gzip data automatically), as they caused a bigger problem reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9044 ("Follow TCP Stream" shows only first HTTP req+res). 
#BACKPORT(1.10)


svn path=/trunk/; revision=52506
 2013-10-10 19:48:37 +00:00
Jörg Mayer c3d138dca5 As the Qt build will not use portaudio, we don't need to 
put portaudio flags into config.pri

svn path=/trunk/; revision=52485
 2013-10-10 07:13:36 +00:00
Gerald Combs f54c08ed35 Add some QT_DIR checks. 
svn path=/trunk/; revision=52459
 2013-10-08 23:45:26 +00:00
Gerald Combs b3c844fa64 Add an initial Qt configuration and makefile targets. 
svn path=/trunk/; revision=52456
 2013-10-08 23:03:56 +00:00
Gerald Combs 34e2a96d0b Define NOMINMAX for the entire Qt build. 
svn path=/trunk/; revision=51955
 2013-09-11 19:59:22 +00:00
Gerald Combs 2dab57f425 Switch to make-services.py. Fix some variable names and version tests. 
svn path=/trunk/; revision=51189
 2013-08-07 16:33:39 +00:00
Anders Broman 78afe3fa82 Add a routine to get application memory usage to epan. 
svn path=/trunk/; revision=51023
 2013-07-30 05:49:58 +00:00
Graham Bloice 71921ced57 clean target misses some build artefacts; capinfos.lib and editcap.lib 
svn path=/trunk/; revision=50972
 2013-07-28 13:57:12 +00:00
Anders Broman 61e0e4d88c Make it possible to use GetProcessMemoryInfo on Windows. 
svn path=/trunk/; revision=50865
 2013-07-24 15:54:55 +00:00
Gerald Combs a692824160 GeoIP 1.5.1. 
svn path=/trunk/; revision=50742
 2013-07-20 01:01:55 +00:00
Jeff Morriss 54bb2e7a5c Move report_err.{h,c} from epan into wsutil: there's nothing epan-specific there and moving it avoids having to recompile the file for use in editcap and capinfos (which don't link against libwireshark). 
svn path=/trunk/; revision=50598
 2013-07-15 02:48:26 +00:00
Jeff Morriss 4dcc156cf3 Move the print modules into epan. 
svn path=/trunk/; revision=50526
 2013-07-12 03:50:50 +00:00