aboutsummaryrefslogtreecommitdiffstats
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
2014-07-04Move utility routines for capturing into a libcaputils static library.Guy Harris20-118/+51
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-04Remove accidental trailing \Evan Huus1-1/+1
Change-Id: I84e6aa71e31528b2949e68f0f07778fb9e26379e Reviewed-on: https://code.wireshark.org/review/2839 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-04Sort by name list of fileAlexis La Goutte1-15/+16
fix also indent (use spaces) Change-Id: I06234936c3128f7aa21a345415d7e420135dd601 Reviewed-on: https://code.wireshark.org/review/2824 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-03Rename and move ui/stat_menu.h to epan/stat_groups.h.Guy Harris87-162/+85
The groups are, technically, independent of the notion of a menu, and, if we have mechanisms by which taps that are not only GUI toolkit-independent but independent of the *existence* of a GUI can be registered, they might want to register themselves in a group just in case they're running in a program that has a GUI. Also, this might fix the Debian package build. Change-Id: I29435681e79748fd4f2e0c5ac872cd11f831d172 Reviewed-on: https://code.wireshark.org/review/2830 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Include <sys/capaibility.h> to get _LINUX_CAPABILITY_VERSION defined.Guy Harris2-0/+8
It's no longer used in version_info.c, but is used in the main source files of TShark and Wireshark (it's already included in dumpcap). Change-Id: I2169a2bbed678baf26fc8711d7c13d95cce3ee2a Reviewed-on: https://code.wireshark.org/review/2819 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Include "capture-pcap-util.h" even if we don't have libpcap.Guy Harris2-2/+4
The routines to get libpcap version information just say "no pcap here" if we don't have it, so they're called regardless of whether we were compiled with it. Change-Id: I4e58cce83f7c0e36aa6ef9b40ec7075732402f3b Reviewed-on: https://code.wireshark.org/review/2800 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Make --help and --version information a bit more uniform.Guy Harris2-10/+113
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-07-03Regularize the help output of programs.Guy Harris2-13/+9
Only print to the standard output, and only give the version information, if a "print help" command-line option is specified. Otherwise, leave out the version information, and print to the standard error. Leave out the copyright information; it's extra cruft, and http://www.gnu.org/prep/standards/html_node/_002d_002dhelp.html doesn't say anything about it (and bash, at least, doesn't print it). Change-Id: Ic5029ccf96e096453f3bd38383cc2dd355542e8a Reviewed-on: https://code.wireshark.org/review/2789 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Regularize the first line of version output.Guy Harris2-4/+4
For Wireshark, say "Wireshark", not "wireshark". For other programs, put "(Wireshark)" after the program name, as per http://www.gnu.org/prep/standards/html_node/_002d_002dversion.html ("If the program is a subsidiary part of a larger package, mention the package name in parentheses, like this"). Change-Id: I68558f64cfa6ee4423e42f3d6b120633ef1b2716 Reviewed-on: https://code.wireshark.org/review/2788 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-02Manage InterfacesIrene Ruengeler15-15/+1003
- Add dialog to manage interfaces - Add and delete pipes - Hide local interfaces Change-Id: I08323c306c2ea736f99e57c28e2fe3170a0c2216 Reviewed-on: https://code.wireshark.org/review/2613 Tested-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2014-07-01Use G_GNUC_PRINTF() for simple_message_box().Guy Harris1-5/+1
We don't need to do the right __attribute__ magic ourselves; GLib does it for us. Change-Id: Id31943a8413f0272237be4f868659b5bd5e70626 Reviewed-on: https://code.wireshark.org/review/2758 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-01Fix the QT build on Qt 5.3 or later to use the windeployqt toolGraham Bloice1-7/+16
to copy the rquired Qt files into the runtime directory Qt 5.2 is broken as windeployqt doesn't take the required --release flag Also fix the passing of GCC_DLL and GPGERROR_DLL into config.pri so that the Qt build copies the required files instead of the entire gnutls bin dir twice (the variables expanded to nothing). Add support for autodetection of Qt 5.3.0 with msvc2013 Change-Id: I1e9c70a5ff5d1fdfdce88ba15d324f1899c8129c Reviewed-on: https://code.wireshark.org/review/2734 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-01Keep VS Code Analysis happyBalint Reczey1-1/+1
Change-Id: I4ef92f715d7a0a1449f1b509ce7ed59651cd1a6a Reviewed-on: https://code.wireshark.org/review/2745 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-01Log2() and exp2() are missing on WindowsBalint Reczey1-1/+1
Change-Id: I8a970f9030fafd8fdcb4e2a24620033ec8005da7 Reviewed-on: https://code.wireshark.org/review/2744 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2014-07-01Add a comment that appears in other programs.Guy Harris2-0/+2
Change-Id: Ife885779d339fbb706c9d6cfd931833afba25277 Reviewed-on: https://code.wireshark.org/review/2742 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-01Squelch some warnings.Guy Harris2-5/+5
Make some arguments and structure members gsize, as that's what stored into them or passed to them. (And move a newly-widened-on-LP64 item, to avoid extra structure padding.) Add a cast, which also appears necessary to squelch a warning. Clean up indentation while we're at it. Change-Id: I0cc92e7d2904c5af1f3f3d93f51b6ecb3aed464d Reviewed-on: https://code.wireshark.org/review/2741 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-01Increase space allocated for IO Graph slower after 1 million itemsBalint Reczey1-1/+3
Change-Id: I691070b572e519f412a80db5d7415331f07e8e50 Reviewed-on: https://code.wireshark.org/review/2689 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2014-07-01GTK: Unlimited, dynamically allocated IO GraphBalint Reczey1-58/+44
Bug: 8460 Change-Id: Id9aad3f5f69bee9e5a62601ecac28a6a7019e623 Reviewed-on: https://code.wireshark.org/review/2672 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2014-07-01Fix access to uninitialised valuesBalint Reczey1-0/+2
Change-Id: Id3592fed0cca5133d493f26d3b8ce27a3cf8505c Reviewed-on: https://code.wireshark.org/review/2723 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-30Reflect the move of filters.c to libui.Guy Harris1-0/+1
Change-Id: Ic1099927e3fb63c020c622e0a92e99a376908f4e Reviewed-on: https://code.wireshark.org/review/2737 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Do startup things in an order more like that of gtkshark.Guy Harris1-47/+48
Get credential information and drop privileges *very* early on. Get the pathname of the executable right after that, then initialize the 802.11 decryption, then, on Windows, load WinPcap and, if available, AirPcap. *Then* we can get the version information and set the crash information. We should drop privileges as early as possible. We have to load WinPcap and AirPcap before getting the run-time information, as the run-time information includes the *pcap versions. Change-Id: Ib40e5a848cc7f42fcb424faa15a91868eaa0b9a4 Reviewed-on: https://code.wireshark.org/review/2733 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Always set the crash information.Guy Harris1-1/+1
There's no reason to do it only on Windows - and, in fact, the only platform where we currently do anything with the information is OS X. Every other program in the Wireshark suite that does it at all does it on all platforms. Change-Id: I8ab29fd86656dd44322991d0d7263c6bb4fcd425 Reviewed-on: https://code.wireshark.org/review/2730 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Get rid of trailing blank line.Guy Harris1-1/+0
Change-Id: Id7d134b1d217ef319e3162ae007432fdbe87d0c1 Reviewed-on: https://code.wireshark.org/review/2728 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Move filters.[ch] to libui.Guy Harris7-6/+704
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 Harris87-85/+162
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 Harris6-3/+393
Change-Id: Ib7c0617d88bf92cad0ac877176001d29960f1cd8 Reviewed-on: https://code.wireshark.org/review/2725 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Get rid of another unused routine.Guy Harris1-20/+0
Change-Id: I58943faaf6e77023ab1fb7bd7a22324a713659da Reviewed-on: https://code.wireshark.org/review/2714 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Get rid of unused routine.Guy Harris1-33/+0
Change-Id: Iaf12ba7f13804a6d351ea85c0daa52d4489e8c57 Reviewed-on: https://code.wireshark.org/review/2713 Reviewed-by: Guy Harris <guy@alum.mit.edu>
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>