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

180 Commits

Author SHA1 Message Date
Jörg Mayer d8a7eed0a7 Get netlink detection working with cmake (not complete) 
svn path=/trunk/; revision=44791
 2012-09-06 10:37:17 +00:00
Gerald Combs 5f2783de05 Revert r44644 and 44645. g_source_*, g_timeout_, and g_io_* all depend 
on the GLib main loop which isn't portable (unless you want to want to
manage the main loop yourself).

svn path=/trunk/; revision=44655
 2012-08-24 15:25:42 +00:00
Gerald Combs 5adc43f597 Move the pipe input routines to the common UI directory. 
svn path=/trunk/; revision=44644
 2012-08-23 18:42:48 +00:00
Jörg Mayer e3d925b1ff The proper way to set compiler flags in cmake is not by using 
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
 2012-08-23 12:30:16 +00:00
Jörg Mayer fcb0307fae The name configure.in has been deprecated for many years. 
Use configure.ac instead.

svn path=/trunk/; revision=44630
 2012-08-23 11:11:24 +00:00
Jörg Mayer 4546cfeab5 Commit 44474 added some arguments to the ac_init macro that broke 
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
 2012-08-19 00:14:14 +00:00
Gerald Combs bd855826a9 Move the common parts of iface_lists.[ch] from ui/gtk/ to ui/. Leave the 
GTK+-specific parts behind in capture_dlg.c.

svn path=/trunk/; revision=44196
 2012-08-01 22:32:14 +00:00
Michael Mann 1ec2f43f2c WiMAX OFDMA PHY SAP dissector plugin (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2695) 
svn path=/trunk/; revision=43844
 2012-07-20 01:21:27 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address. 
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
 2012-06-28 22:56:06 +00:00
Guy Harris 1d1391ed47 From Pontus Fuchs: 
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-28 16:21:51 +00:00
Anders Broman e6e6d6217b From Tony Trinh: 
Update Lua from 5.1 to 5.2

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7400

svn path=/trunk/; revision=43482
 2012-06-25 20:42:07 +00:00
Jörg Mayer 3b34b557f8 Also add ws80211_utils.c for CMake builds. 
Build with -g to make debugging easier. The debug info
will get removed on installation.

svn path=/trunk/; revision=43464
 2012-06-24 19:41:13 +00:00
Jörg Mayer c0da019caa Complete cmake support for netlink detection 
svn path=/trunk/; revision=43421
 2012-06-20 20:59:43 +00:00
Jörg Mayer d9f88ebdcc And another instance of HAVE_WIRELESS_TOOLBAR I missed 
svn path=/trunk/; revision=43418
 2012-06-20 19:09:35 +00:00
Jörg Mayer b5c1bd803c Copy over Makefile.common changes to CMakeLists 
svn path=/trunk/; revision=43416
 2012-06-20 18:46:16 +00:00
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