aboutsummaryrefslogtreecommitdiffstats
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
2014-06-30Move capture.[ch] to libui.Guy Harris20-16/+925
Change-Id: I86e7e781cc9e14abab0374a18b95438529b046f0 Reviewed-on: https://code.wireshark.org/review/2711 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Make a routine unused outside capture_ui_utils.c static.Guy Harris2-10/+1
Change-Id: I63f1e5fb119a44edf4ee489683e79cb39a746c08 Reviewed-on: https://code.wireshark.org/review/2710 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Move capture_session.h to capchild; what it declares is defined there.Guy Harris7-7/+7
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 Harris19-16/+732
Change-Id: Id0f3d4d60a1acc7aa64fd3737b8f16df5bca4e5a Reviewed-on: https://code.wireshark.org/review/2708 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30clopts_common.c is now part of wsutil.Guy Harris1-1/+0
Change-Id: I474443567e83cab83e4859a4d89a19a8904e08f8 Reviewed-on: https://code.wireshark.org/review/2707 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-29Move some more stuff into wsutil.Guy Harris2-28/+17
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-29Standardize the names of, and document, the taps and heuristic dissector ↵David Ameiss2-2/+2
tables made avaialble by these dissectors. Change-Id: If3a143eb9546c9de63cd32b2347000b09e0e3c93 Reviewed-on: https://code.wireshark.org/review/2688 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-28Fix missing g_list_next() with GLib < 2.32Balint Reczey1-0/+1
Change-Id: I825e74de378acc9d35e4b620a3eeb4807fe7accd Reviewed-on: https://code.wireshark.org/review/2690 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-28Fix several GTK warnings in Windows.Irene Ruengeler2-32/+24
Change-Id: I300137319129c3e188884e1240c025d92e34e410 Reviewed-on: https://code.wireshark.org/review/2687 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-27Use g_queue_free_full() only on GLib > 2.32Balint Reczey1-2/+12
Change-Id: I7a72fe8243fc809b444f1b026ed872cd2aa92245 Reviewed-on: https://code.wireshark.org/review/2686 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-06-27Use GQueue for generating statisticsBalint Reczey12-210/+198
This makes reversing the list back and forth to keep adding data at O(n) complexity obsolete. Bug: 9696 Change-Id: Ice77328b8f6c5bf72bbfcfd82e08d09d4f986d3f Reviewed-on: https://code.wireshark.org/review/2571 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-06-25fix_bug_10199: enhancement Telephony VoIP Call add ability to show all SIP ↵James Coleman5-13/+91
Flows. Add SIP Flows menu option beside VoIP Calls. Flow for all SIP message types (which have a call-id) is shown in SIP Flow. Add useful info(original flow method, response code, cseq) to comment field in conversation and flow dialogs. Change-Id: I4801a633ed9b6594b2d89629c9d6fec6352da150 Reviewed-on: https://code.wireshark.org/review/2479 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: James Coleman <gaoithe@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-25List elided_label.h only once.Irene Ruengeler1-1/+0
Change-Id: Ibd00e55fb31d571b0b1f6f1c4595a35835e22d4d Reviewed-on: https://code.wireshark.org/review/2641 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-24GTK3: Fix changing filter expression's bg color based on validityBalint Reczey1-8/+20
Bug: 8598 Change-Id: Id5a52c05cab25df9e228b1b4d2caf07335c1f4c8 Reviewed-on: https://code.wireshark.org/review/2614 Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-24Fix sorting RTP Streams by jitterBalint Reczey1-9/+9
Bug: 9460 Change-Id: I80d991053eb47b8650561e8af4cc8dec512e2c9c Reviewed-on: https://code.wireshark.org/review/2619 Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24Another capchild.lib -> libcapchild.lib.Guy Harris1-1/+1
Change-Id: I4c7750f05c831f12d0d34e2edf0d982d501d90d8 Reviewed-on: https://code.wireshark.org/review/2610 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24Add libcapchild, remove the files that are now in it.Guy Harris1-4/+2
Change-Id: I79c16bbea47e507859c904e4142fc06fa6bfc127 Reviewed-on: https://code.wireshark.org/review/2606 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24Fix some more capchild includes.Guy Harris2-2/+2
Change-Id: I6d6cd79ee9e630fe81eb6deca9691249b44bdaf4 Reviewed-on: https://code.wireshark.org/review/2595 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24For capchild headers, include <capchild/XXX.h>.Guy Harris4-6/+6
Change-Id: I780c69ee637dcd9846756a2e2d6a35baf02d826d Reviewed-on: https://code.wireshark.org/review/2594 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24Include ZLIB_CFLAGS so we file zlib.h.Guy Harris1-1/+2
Change-Id: I9026f99397b1dfbc550af550d0c71597b3c87950 Reviewed-on: https://code.wireshark.org/review/2592 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-23Move the routines to talk to dumpcap into a static libcapchild.Guy Harris1-1/+1
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-23Don't report the run-time version of pcap if we weren't built with pcap.Guy Harris1-0/+2
Change-Id: Ib879290b72938cc999e00b6e044f917161ba5801 Reviewed-on: https://code.wireshark.org/review/2589 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-23Have individual programs get libpcap and libz version info.Guy Harris2-7/+35
That way, the code that constructs the runtime version string doesn't itself have to call libpcap and libz, and could be usable in programs that don't call them. While we're at it, add "with" to the run-time version information for GnuTLS and libgcrypt, to match the compile-time version information, and add the version information from libwireshark to TShark. Change-Id: I3726a027d032270b032292da9314c1cec535dcd2 Reviewed-on: https://code.wireshark.org/review/2587 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-23[WIP] qt: Add support for Polish languageMichal Labedzki8-0/+943
Change-Id: Ib63937e741b737f171a9b383a9cbabb55dfdd8ef Reviewed-on: https://code.wireshark.org/review/2553 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-22Add a routine to return a version string including VCS information.Guy Harris12-35/+37
Add a routine get_ws_vcs_version_info() that, for builds from a tree checked out from Wireshark's version control system, returns a string that includes both the Wireshark version number and an indication of what particular VCS version was checked out, and just returns Wireshark's version number for other builds. Use that routine rather than manually gluing VERSION and the Git version number together. ("vcs", not "git", just in case we do something bizarre or mercurial some day. :-)) Change-Id: Ie5c6dc83b9d3f56655eaef30fec3ec9916b6320d Reviewed-on: https://code.wireshark.org/review/2529 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Move get_os_major_version() to wsutil and rename it to ↵Guy Harris1-1/+2
get_windows_major_version(). It's Windows-specific, so name it appropriately. Change-Id: Ic518cbfabebf95757f6b308a4d547a6cabed6a5e Reviewed-on: https://code.wireshark.org/review/2528 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21cfutils.c is now part of libwsutils.Guy Harris1-1/+0
Change-Id: I86ab5f5890a10cc8475f5e9bee4c4f7c89dfb8bc Reviewed-on: https://code.wireshark.org/review/2521 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Move get_os_version_info() to libwsutil.Guy Harris2-0/+2
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-06-21Move get_copyright_info() to wsutil.Guy Harris4-0/+4
Change-Id: I75c1c747cd2b4a9845c659636582d54b2caecf1a Reviewed-on: https://code.wireshark.org/review/2510 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20Fix build without pcap.Guy Harris2-9/+0
The files that use LONGOPT_CAPTURE_COMMON and OPTSTRING_CAPTURE_COMMON include capture_opts.h unconditionally, so there's no need to define them if we don't have pcap. In addition, we want the capture options "available" even if we don't have pcap, so we can tell the user "you're using a version of *shark without pcap, but you gave a capture option". Change-Id: I0bd3893b73d3d903610d0bc6cacb60bfb37096f4 Reviewed-on: https://code.wireshark.org/review/2503 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20Fix builds without pcap.Guy Harris1-1/+1
Change-Id: I6c67f9ea9d115a8396af0904ef9a73d2c528dcaa Reviewed-on: https://code.wireshark.org/review/2498 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20Also define LONGOPT_CAPTURE_COMMON as nothing if we don't have pcap.Guy Harris1-0/+1
While we're at it, simplify the #ifdefs and #defines in capture_opts.h - don't do the same tests twice. Change-Id: I2079167f31789470ef77120054d769d5914745e3 Reviewed-on: https://code.wireshark.org/review/2496 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20Use OPTSTRING_CAPTURE_COMMON here as well.Guy Harris1-19/+3
Change-Id: If0078797a2e7b14edbd1b64863c4961c9b198168 Reviewed-on: https://code.wireshark.org/review/2494 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20Define OPTSTRING_CAPTURE_COMMON as nothing if we don't have pcap.Guy Harris1-14/+2
No capturing, no capture options. Change-Id: I0023184b9c358d5876f19a098590f34d641c8649 Reviewed-on: https://code.wireshark.org/review/2493 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20Add some long options for capture short options.Guy Harris1-1/+2
The names match tcpdump trunk's names for the corresponding options. Also have capture_opts.h provide a #define for the part of the short option string that corresponds to the capture short options that all our programs that take capture short options take (those are largely the ones we have in common with tcpdump). Change-Id: Ia209425959c801725850b56a7d63441ee99b5001 Reviewed-on: https://code.wireshark.org/review/2492 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20Add --help and --version long options.Guy Harris1-2/+4
Also, make the convention for long-only options be that their case-statement values start at 128, so they avoid colliding with any ASCII code points, including control characters. Make the tables of long options "static const" while we're at it, and get rid of unnecessary casts. Change-Id: I55702a85e9bc078b1cd0f2803ebb68a710405bab Reviewed-on: https://code.wireshark.org/review/2491 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-19Changed a cast (from guint to guint64) in a call to gtk_tree_store_set(). ↵dameiss1-1/+1
The data is actually 64-bit, and was being fetched that way - but not stored that way - leading to some very strange (and large) values. Change-Id: I2235ae7f1bab7f48f99afac70109a7d8f9b38e2b Reviewed-on: https://code.wireshark.org/review/2468 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-19Save the size and position of the expert info dialogChris Maynard10-13/+77
Set initialize position to center on parent bug: 3817 Change-Id: Iad48aa762d892908d50f742606160c8305084f48 Reviewed-on: https://code.wireshark.org/review/2459 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-06-19Cleaned up some CLang dead assignment warnings.dameiss1-3/+2
Change-Id: Ibd2fa6c791253e4dbac9a21532e894db3327ce57 Reviewed-on: https://code.wireshark.org/review/2465 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19Don't crash when closing the Summary window if the file has been closed.Jeff Morriss1-1/+1
Yes, this is a Gtk-UI fix but it's a one-liner and easy enough. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8715 Bug: 8715 Change-Id: I554b6c953e83ff3d8cb57029e844f2f481b751dd Reviewed-on: https://code.wireshark.org/review/2460 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-19gtk_table_new is deprecated in GTK3. Change to use grid instead, and usedameiss1-7/+9
ws_gtk_grid_attach_extended() to do the heavy lifting. Change-Id: I1c9d12556857196f53fadbce70f206a3cc41f7a5 Reviewed-on: https://code.wireshark.org/review/2433 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-19Add GTK modules for existing LBM dissectors.dameiss7-0/+1372
bug: 10204 Change-Id: Ie21cc07b0ac9a56648ec72062ce58a1ac800318e Reviewed-on: https://code.wireshark.org/review/2420 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19Add the ability to dynamically add a new protocol to export PDU dialog boxPascal Quantin2-8/+9
Change-Id: I83012cc963d514982e40010e837e11a6fcf1bc3e Reviewed-on: https://code.wireshark.org/review/2423 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17Make sure we hide columns for live captures as well.Gerald Combs2-18/+11
Remove some dependencies on having an open capture file. Change-Id: Iad5d03e0a45ed31c83781861ef1ed7fdeb92e4a5 Reviewed-on: https://code.wireshark.org/review/2352 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-17Get QtShark building on Win7 with Qt 5.3.0 using Qt Creator.Tim Furlong6-6/+6
Several header file references in .ui files needed to be changed to not be global, and the path to stats_tree_dialog.ui needed a "../qt" path prepended to be found from the build...-Release directory. Change-Id: I51c0bb15eed706f483085020ce2b3cea3c1cdc95 Reviewed-on: https://code.wireshark.org/review/2281 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-17Qt: fix loading of language translationAlexis La Goutte2-0/+21
But need always restart to apply change... Based on http://qt-project.org/wiki/How_to_create_a_multi_language_application Change-Id: I0f95afb68aa5b125e0707b0af1ce096dab9c29e4 Reviewed-on: https://code.wireshark.org/review/2286 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-16Column visibility fixups.Gerald Combs2-5/+15
Move visibility to its own method and call it when we show ourselves and when we thaw. Change-Id: I936cd33e5ccabddb32061ea347a465ac12f1be87 Reviewed-on: https://code.wireshark.org/review/2289 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-16More Python-bindings removal.Jeff Morriss3-17/+0
Change-Id: I4d82175781e65c73179f4c8e737a7900cb050bce Reviewed-on: https://code.wireshark.org/review/2283 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-16Hide hidden columns in Qt.Gerald Combs1-1/+5
Change-Id: I1da0d95c606eb2f17c03874f20d38b9a7ba9e8ee Reviewed-on: https://code.wireshark.org/review/2278 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-16Fix indent (Use 4spaces like end of the file and modelines infoAlexis La Goutte1-92/+92
Change-Id: I80e0193240032e62c685c5b976df921ea1e6a581 Reviewed-on: https://code.wireshark.org/review/2251 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com>