osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
41,177 Commits 26 Branches 0 Tags 795 MiB
Commit Graph

165 Commits

Author SHA1 Message Date
Jörg Mayer e64ba28e3b Do the changes to configure from r43354 in cmake as well. 
Log:
 Start to have an generic wireless toolbar. Sligtly modified patch from
 Pontus Fuchs.

svn path=/trunk/; revision=43361
 2012-06-19 14:21:08 +00:00
Guy Harris 72f9f25dcb No more GIOP plugins, no more plugins/giop directory. 
svn path=/trunk/; revision=42984
 2012-06-01 18:09:14 +00:00
Jörg Mayer 6b8234e001 Document which warnings are c++ only. 
svn path=/trunk/; revision=41574
 2012-03-15 21:27:04 +00:00
Guy Harris 1667f1ef11 Reflect the move of alert_box.c to the ui directory. 
svn path=/trunk/; revision=41437
 2012-03-08 17:43:34 +00:00
Guy Harris db40e0bc1a Reflect the move of dftest.c back to the top-level directory. 
svn path=/trunk/; revision=41065
 2012-02-19 08:59:17 +00:00
Jörg Mayer d205085350 Trying to fix the compile of ui/util.c on Windows by moving the 
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-17 16:59:14 +00:00
Jörg Mayer 35508464b2 Start moving files to ui/ and ui/cli/ 
svn path=/trunk/; revision=41047
 2012-02-17 12:30:27 +00:00
Jörg Mayer 4e8aa4f6f3 Last fix to the wrong approach. 
svn path=/trunk/; revision=40925
 2012-02-08 07:39:51 +00:00
Jörg Mayer dc1a9e539b Make sure that we only have to set (or pick up) the docdir environment 
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
 2012-02-07 08:05:11 +00:00
Anders Broman 8d4f6fc794 From QA Cafe: 
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-02-05 10:39:12 +00:00
Jörg Mayer 9f61b8bdd0 Fix long standing but that prevented installation to 
work at all.
Next step ist to move docbook installation back into docbook/

svn path=/trunk/; revision=40846
 2012-02-05 07:41:53 +00:00
Jörg Mayer 67d74b7f4e - Add a comment how to improve the output of supported features later on. 
- Move docbook pdf installation to toplevel.

svn path=/trunk/; revision=40840
 2012-02-04 14:19:38 +00:00
Jörg Mayer 137f3fc455 - Move setting _U_ into config.h, because 
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
 2012-02-02 12:04:22 +00:00
Jörg Mayer 0e3ac2fdf0 Prepare the cmake infrastucture for eventually building 
wireshark and qtshark simultanously.
The "only" missing thing for this is now ui/qt/CMakeLists.txt ;)

svn path=/trunk/; revision=40799
 2012-02-02 00:46:02 +00:00
Jörg Mayer 5357769aca Manually revert the changes to CMakeLists.txt from commit 40602 - they should not be necessary/are wrong 
svn path=/trunk/; revision=40605
 2012-01-20 11:02:15 +00:00
Jeff Morriss 0a6eca4097 Bug 6448 says the embedded Python stuff does not really work. 
And if I run Valgrind with Python enabled, I get pages of errors related to it.

So: disable Python by default.

svn path=/trunk/; revision=40602
 2012-01-20 03:20:35 +00:00
Guy Harris 5263048b9b Reflect the move of recent.c from ui/gtk to the top-level directory. 
svn path=/trunk/; revision=40565
 2012-01-18 20:23:30 +00:00
Jörg Mayer 333b9e0fa8 move alert box for cmake builds as well 
svn path=/trunk/; revision=40542
 2012-01-16 03:25:55 +00:00
Jörg Mayer a7d99d703f alert_box.c moved to ui/ 
svn path=/trunk/; revision=40538
 2012-01-16 02:28:38 +00:00
Jörg Mayer be706c6380 Move gtk to ui/gtk. 
This looses the last checkin to gtk, will add this manually back.

svn path=/trunk/; revision=40518
 2012-01-15 21:59:11 +00:00
Jörg Mayer 2097912587 Rename crypt-xxx to xxx 
svn path=/trunk/; revision=40511
 2012-01-15 12:29:44 +00:00
Jörg Mayer 9781eaf0f5 Sync filelists between autofoo and cmake. 
Move some dissectors that throw warnings to DIRTY_
Whitespace cleanups

svn path=/trunk/; revision=40478
 2012-01-13 19:29:58 +00:00
Gerald Combs f6ffb03ccb CMakeLists.txt: Make sure TSHARK_TAP_SRC is defined before 
register_tap_files so that the "-z" flag works for TShark.

epan/stat_cmd_args.c: Fixup whitespace.

svn path=/trunk/; revision=40443
 2012-01-12 19:16:15 +00:00
Guy Harris f210836a02 I had a capture_errs.c but capture-wpcap.c eated it. 
svn path=/trunk/; revision=40339
 2011-12-30 00:17:50 +00:00
Jörg Mayer d2dcf80ed4 Dafine G_DISABLE_SINGLE_INCLUDES while compiling. This mimics a patch 
that has been in configure.in for quite some while.

svn path=/trunk/; revision=40056
 2011-12-01 02:31:47 +00:00
Stig Bjørlykke 612dcc3c6b As reported by Michael Speck: 
Removed last occurrences of USE_THREADS.

svn path=/trunk/; revision=39775
 2011-11-09 20:45:06 +00:00
Gerald Combs 7d442f4c22 Change the use of threads from "mostly always, depending on your 
configure options and Gtk+ and GLib versions" to "always".

svn path=/trunk/; revision=39751
 2011-11-07 23:42:53 +00:00
Jörg Mayer 576ab168c9 Get rid of (hopefully) all configure options to enable MAIN_MENU_USE_UIMANAGER 
as it is the only option left.

svn path=/trunk/; revision=39138
 2011-09-25 21:27:19 +00:00
Martin Mathieson a0f614494b Add a tap for showing all expert items. 
svn path=/trunk/; revision=39010
 2011-09-15 10:30:57 +00:00
Jörg Mayer 3a48ef3e02 Make it possible to disable building with libpcap. 
svn path=/trunk/; revision=38795
 2011-08-30 11:44:21 +00:00
Jörg Mayer 6c3a7ca052 Only build rawshark and dumpcap if we have libpcap 
svn path=/trunk/; revision=38780
 2011-08-29 19:18:28 +00:00
Jörg Mayer 167628a96e rtp-player now compiles with gtk3 
svn path=/trunk/; revision=38774
 2011-08-29 13:43:23 +00:00
Jörg Mayer 4c7d6af730 GTK3 only builds if portaudio is disabled (rtp player is not 
yet gtk3 ready).

svn path=/trunk/; revision=38684
 2011-08-23 09:31:25 +00:00
Stig Bjørlykke 5603cef9f2 Remove support for libpcre, we use GRegex in GLib. 
svn path=/trunk/; revision=38683
 2011-08-23 09:25:06 +00:00
Jörg Mayer 8268c2c656 Missed (at least) one place where to rename UI_MANAGER -> ENABLE_UI_MANAGER 
svn path=/trunk/; revision=38674
 2011-08-22 16:16:16 +00:00
Jörg Mayer cf889e0707 Rename UI_MANAGER to ENABLE_UI_MANAGER, put it into 
CMakeOptions and enable it by default.
Update comment in proto_help that this feature is no
  longer built by default.
Enable PYTHON by default.


svn path=/trunk/; revision=38659
 2011-08-22 08:08:38 +00:00
Jörg Mayer 553c565699 mate_grammar.lemon: 
- Fix a bug my previous patch introduced.

mate/:
- Unset G_DISABLE_DEPRECATED for the mate files.

CMakeLists.txt
configure.in:
- Build with -DG_DISABLE_DEPRECATED so further usage of
  deprecated glib functions will be detected.

svn path=/trunk/; revision=38393
 2011-08-07 18:35:36 +00:00
Jörg Mayer a2c225e8e3 We can always add ${GTHREAD2_LIBRARIES} - this variable will be empty 
if not building with the gthread library.

svn path=/trunk/; revision=38359
 2011-08-05 11:10:26 +00:00
Gerald Combs 3d2c4f6182 Use GLIB2_LDFLAGS instead of GLIB2_LIBRARIES for wsutil, since it 
includes the path to the libraries. Add gthread to wireshark_LIBS if
threads are enabled.

svn path=/trunk/; revision=38345
 2011-08-05 00:25:02 +00:00
Gerald Combs 53c550831b Define PACKAGE in config.h. 
svn path=/trunk/; revision=38316
 2011-08-02 21:23:00 +00:00
Gerald Combs d39696be6d Add tap-hosts.c. 
svn path=/trunk/; revision=38313
 2011-08-02 18:13:16 +00:00
Chris Maynard 4a5c24b6fc At the request of Tony Trinh on -dev, set(CMAKE_VERBOSE_MAKEFILE OFF) 
Ref: http://www.wireshark.org/lists/wireshark-dev/201107/msg00156.html

svn path=/trunk/; revision=38103
 2011-07-19 01:46:16 +00:00
Michael Tüxen 7b52f1bb96 Add option for USE_THREADS. 
svn path=/trunk/; revision=38061
 2011-07-16 13:05:46 +00:00
Martin Mathieson 092b161d04 Add LTE RLC stats tap to tshark. 
svn path=/trunk/; revision=38019
 2011-07-14 17:07:41 +00:00
Martin Mathieson a7fac381ca Add LTE MAC statistics to tshark. 
svn path=/trunk/; revision=38016
 2011-07-14 13:39:02 +00:00
Jörg Mayer de185ff0b5 Copy over behaviour of commit 37967 for configure.in 
svn path=/trunk/; revision=37994
 2011-07-12 21:24:15 +00:00
Jörg Mayer a3d62412fd rev 37741 added tap-rtspstat.c to Makefile.common. 
svn path=/trunk/; revision=37745
 2011-06-22 06:52:18 +00:00
Jörg Mayer 5b22003e93 Add configure options to make change the default file format 
from pcap-ng to pcap.
Add a comment that GTK3 doesn't build yet.

svn path=/trunk/; revision=37701
 2011-06-17 22:57:02 +00:00
Jörg Mayer 48904e0a71 Add GTK3 cmake options. It doesn't build, just like its configure pendant. 
svn path=/trunk/; revision=37623
 2011-06-08 18:10:03 +00:00
Stig Bjørlykke 65b2467999 From Roland Knall via bug 6007: 
Remove plugins/interlink from CMake.

svn path=/trunk/; revision=37614
 2011-06-08 07:03:53 +00:00