aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk/capture_dlg.c
AgeCommit message (Collapse)AuthorFilesLines
2016-06-06*_stdup_printf -> strdup for "single string only" formatting.Michael Mann1-3/+3
Done for performance improvements. This could probably be done in checkAPIs.pl, but this was just a quick manual check with grepping. Change-Id: I91ff102cb528bb00fa2f65489de53890e7e46f2d Reviewed-on: https://code.wireshark.org/review/15751 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-02-25Add GResource message to configure scriptJoão Valverde1-3/+3
Use more descriptive naming while at it. Change-Id: Ic89562cb9fa2cd5e315992f12ad9e46f2361da0b Reviewed-on: https://code.wireshark.org/review/14057 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-18Don't add the wiretap directory to the list of include directories.Guy Harris1-1/+1
If you include something from the wiretap directory, always precede it with wiretap/. Fix some includes of files in the top-level directory to use a path relative to the current directory, not relative to the wiretap directory. This makes it a bit clearer what's being included. Change-Id: Ib99655a13c6006cf6c3112e9d4db6f47df9aff54 Reviewed-on: https://code.wireshark.org/review/13990 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-19Allow "capture info data" to not be a singleton.Michael Mann1-1/+1
It was buried as a static variable in capture_info.c, and functions were refactored to allow a pointer to the info_data_t structure to be passed in. TShark and GTK will have their own single (global) copy of the structure, while it opens up Qt to have multiple instances. Change-Id: Ic2d7a2ad574de43f457cb18b194d6bc3fffb6120 Reviewed-on: https://code.wireshark.org/review/12691 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-13capture_dlg (gtk): The use of 'if (A) {...} else if (A) {...}' pattern was ↵Alexis La Goutte1-3/+1
detected found by PVS Studio (V517) MIN_PACKET_SIZE is define on caputils/capture-pcap-util.h to 1 Change-Id: Ib6486608cf3e0eac898ba859cf46e9d403d493d0 Reviewed-on: https://code.wireshark.org/review/12364 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-11Fix memory leaks in all_ifaces when interface list changesMikael Kanstrup1-0/+8
Valgrind report leaks of several allocations like these: 590 bytes in 50 blocks are possibly lost in loss record 29,818 of 31,670 at 0x4C2B6CD: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) by 0xCB9C8A7: __vasprintf_chk (vasprintf_chk.c:82) by 0xA3D8DCA: g_vasprintf (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.4) by 0xA3B846C: g_strdup_vprintf (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.4) by 0xA3B850B: g_strdup_printf (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.4) by 0x6F4B51: scan_local_interfaces (iface_lists.c:254) by 0x6EF3D8: iface_mon_handler2 (iface_monitor.c:113) by 0xBE56F1D: ??? (in /lib/libnl-3.so.200.3.0) by 0xBA16F19: ??? (in /usr/lib/libnl-route-3.so.200.3.0) by 0xBE54E5E: nl_cache_parse (in /lib/libnl-3.so.200.3.0) by 0xBE585CA: nl_msg_parse (in /lib/libnl-3.so.200.3.0) by 0x6EF372: iface_mon_handler (iface_monitor.c:123) When the list of network interfaces is updated allocations done for global_capture_opts.all_ifaces elements leak memory. Fixed by introducing a helper function to be used for removing an interface_t element from all_ifaces array. While at it also fixed misc leaks when updating individual allocated records of all_ifaces elements. Change-Id: I035e6936a44edeef2ebe4780931c14cde99e93a4 Reviewed-on: https://code.wireshark.org/review/12209 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-11-25Fix memory leaks related to hide_interface functionMikael Kanstrup1-1/+1
Valgrind report leaks like these: 6 bytes in 6 blocks are definitely lost in loss record 2,197 of 46,703 at 0x4C2AB80: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) by 0xA5C1610: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) by 0xA5D8B0E: g_strdup (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) by 0x69A211: ManageInterfacesDialog::localAccepted() (manage_interfaces_dialog.cpp:454) by 0x69A500: ManageInterfacesDialog::on_buttonBox_accepted() (manage_interfaces_dialog.cpp:211) by 0x71DB32: ManageInterfacesDialog::qt_metacall(QMetaObject::Call, int, void**) (manage_interfaces_dialog.moc.cpp:245) by 0xBEBE36C: QMetaObject::activate(QObject*, int, int, void**) (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.2.1) by 0xBEBE2A5: QMetaObject::activate(QObject*, int, int, void**) (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.2.1) by 0xAF87E41: QAbstractButton::clicked(bool) (in /usr/lib/x86_64-linux-gnu/libQt5Widgets.so.5.2.1) by 0xAD11095: ??? (in /usr/lib/x86_64-linux-gnu/libQt5Widgets.so.5.2.1) by 0xAD11BAD: ??? (in /usr/lib/x86_64-linux-gnu/libQt5Widgets.so.5.2.1) by 0xAD11D23: QAbstractButton::mouseReleaseEvent(QMouseEvent*) (in /usr/lib/x86_64-linux-gnu/libQt5Widgets.so.5.2.1) 96 bytes in 4 blocks are definitely lost in loss record 42,458 of 52,779 at 0x4C2AB80: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) by 0xA5C1610: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) by 0xA5D722D: g_slice_alloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) by 0xA5B84F3: g_list_append (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) by 0x731F9A: hide_interface (iface_lists.c:426) by 0x69A211: ManageInterfacesDialog::localAccepted() (manage_interfaces_dialog.cpp:454) by 0x69A4F0: ManageInterfacesDialog::on_buttonBox_accepted() (manage_interfaces_dialog.cpp:211) by 0x71DB22: ManageInterfacesDialog::qt_metacall(QMetaObject::Call, int, void**) (manage_interfaces_dialog.moc.cpp:245) by 0xBEBE36C: QMetaObject::activate(QObject*, int, int, void**) (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.2.1) by 0xBEBE2A5: QMetaObject::activate(QObject*, int, int, void**) (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.2.1) by 0xAF87E41: QAbstractButton::clicked(bool) (in /usr/lib/x86_64-linux-gnu/libQt5Widgets.so.5.2.1) by 0xAD11095: ??? (in /usr/lib/x86_64-linux-gnu/libQt5Widgets.so.5.2.1) These are caused by leaks inside hide_interface function and among its users. Fixed by letting hide_interface function free its resources properly and making sure the users follow the pattern. Change-Id: I91527b83d36dc38b402d0f4a1db4b7db40fd83f9 Reviewed-on: https://code.wireshark.org/review/12113 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-11-12[GTK] Replace deprecated gdk_pixbuf_new_from_inline()João Valverde1-3/+12
Use GResource instead, if available. Add autotools and cmake compile time checks for build requirements (GIO >= 2.32 and GDK-Pixbuf >= 2.26). Merge all the various static pixbuf csource header files into a single pixbuf-csource.h header with external linkage through use of the tools/make-pixbuf-csource.pl script. Fix inline pixbuf build target for some image paths (broken for GTK in gb4a4de7). Add missing 'expert_ok.png' file to distribution (GTK only). Minor improvements to style/structure of ui/gtk/Makefile.am. Bug: 10750 Change-Id: I031296b666ee8b92730400dfa6f71f9ee4304863 Reviewed-on: https://code.wireshark.org/review/10992 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-22Use address functions instead of ADDRESS macros in ui.Gerald Combs1-2/+2
Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case equivalents in the ui directory. Change-Id: I10e95e66c8da5b880133452ebc484c53046e87ba Reviewed-on: https://code.wireshark.org/review/11199 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-08-22Initialize extcap for pipesStig Bjørlykke1-0/+4
Change-Id: Ia731f281ee9af171c759d7f6f7c614c350cbb4e7 Reviewed-on: https://code.wireshark.org/review/10178 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-07-22Fix retrieval of data link type supported by remote interfaces with ↵Pascal Quantin1-2/+18
authentication Make use of -A parameter when querying data link types supported by a given interface with dumpcap. Ensure to pass the authentication parameters configured for a remote interface when calling capture_get_if_capabilities() Bug: 11366 Change-Id: I4efea615084a82108e4a12a64e8c46817f30a5c6 Reviewed-on: https://code.wireshark.org/review/9690 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-02Try to fix: warning C6244: Local declaration of 'airpcap_if_list' hidesAndersBroman1-4/+4
previous declaration. Change-Id: Id0c3b74ac52c427d9c1efdf749dc410bc5bb450f Reviewed-on: https://code.wireshark.org/review/9460 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-04Let capture_dev_user_pmode_find() say "not found".Guy Harris1-3/+2
"Not found" is different from "found, and false". Have it return a boolean "did I find the property" indication and, if it did, supply the property value through a pointer. Change-Id: Iaa942ea346410b35e512ff1a3821cbf60c88dfd6 Reviewed-on: https://code.wireshark.org/review/7916 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-25Have a #define for whether the capture buffer size can be set.Guy Harris1-33/+25
It can be set if either 1) this is Windows (where we're assumed to be using WinPcap, which includes calls to set the buffer size) or 2) we have pcap_create() (in which case we also have pcap_set_buffer_size(), at least in a normal libpcap release). Use that rather than testing "defined(_WIN32) || defined(HAVE_PCAP_CREATE)"; that makes it a bit more obvious what's being tested. Change-Id: Id9f8455019d19206b04dd6820a748cb97ae5ad12 Reviewed-on: https://code.wireshark.org/review/7816 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-25OK, this appears to be what's intended.Guy Harris1-4/+29
Include a column to describe what's intended. If that's *not* what's intended, fix the comment and the twisty little maze of #defines. Change-Id: Ic5d120c401d8aba23a19e9d042b1460621b80e0b Reviewed-on: https://code.wireshark.org/review/7815 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-25Clean up handling of buffer size.Guy Harris1-40/+40
Instead of a twisty little maze of #if, #ifdefs, and #elifs, all different, define HAVE_BUFFER_SIZE upfront iff we can set the buffer size - i.e., if this is Win32, and thus we're using WinPcap, or if we have pcap_create() and thus pcap_set_buffer_size() - and use that to govern whether to have a buffer size setting or not. Always put the buffer size setting in the right vertical box. If that doesn't work well for some configurations of available interface knobs, feel free to change the checks, but please make it less opaque what's going on (include a comment if necessary). Change-Id: I384c601982b470ae08de271431eac06d6c925332 Reviewed-on: https://code.wireshark.org/review/7814 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-24Win32: Compilation error if winpcap remote capturing disabledRoland Knall1-1/+3
If HAVE_PCAP_REMOTE is not set, this code is not defined and therefore will not be compiled correctly. Change-Id: Ie08a6f99598d46cfa38e2448ea979a8a9aa7c7fc Reviewed-on: https://code.wireshark.org/review/7803 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-03-23Centralize the code to set the active_dlt value for a device.Guy Harris1-3/+1
We were doing it similarly, but not the same, in several places; make a common routine for it. Have that code check to make sure the DLT_ value in question is actually supported by the device; if not, pick the first supported DLT_ value, if any; this keeps it from, for example, picking a bad DLT_ value if your defaults were set based on monitor mode being on but monitor mode actually being off, or vice versa. Change-Id: I1722bfeaf60429bc5c6f665fdea3d466052b13bd Reviewed-on: https://code.wireshark.org/review/7795 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-21Rename update_interface_list() and remove local interface code from it.Guy Harris1-25/+15
It's only used to update the remote interface list, and never updates anything else (it sets iftype_id to CAPTURE_IFREMOTE and never changes it, so all tests for whether iftype_id is == or >= CAPTURE_IFREMOTE succeed); remove the code that would be executed if, somehow, iftype_id got stomped on, and rename it to update_remote_interface_list(). Change-Id: I3bd80fb19bb14ef5bdf2c1a77a10f1f32bb62aba Reviewed-on: https://code.wireshark.org/review/7773 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-19Make the snapshot-length member of interface_t an int.Guy Harris1-2/+0
That matches what it is in other structures, and eliminates a compiler warning. While we're at it, remove an empty if statement revealed by that change. Change-Id: I5e8c8f92fdb3567e75800c729443737032a1bcc7 Reviewed-on: https://code.wireshark.org/review/7752 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-18Fix parsing of interface properties strings.Guy Harris1-5/+4
The first entry in the list does not have a leading comma, so a strstr() for ",{ifname}(" will not work. Instead, use g_strsplit() with a comma for all of the preferences. Have common code for all the "uncomplicated" preferences. Have a specialized handler for the one "complicated" preference. Change-Id: I2144a98ab0cb70db56eaaba88175d6e03885de2a Reviewed-on: https://code.wireshark.org/review/7741 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-11capture_dlg.c: Fix (possibly valid) "Using uninitialized memory" MSVC2013 ↵Bill Meier1-4/+4
Code Analysis warning Change-Id: I849b731420d779b68ab4335eb8d06482ecd649e7 Reviewed-on: https://code.wireshark.org/review/7068 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-06Replace ep_address_to_str with address_to_str.Michael Mann1-2/+8
Change-Id: I4f1078b20f41800f72a751612703ad0d4c2ae87b Reviewed-on: https://code.wireshark.org/review/6323 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-28Replace ip6_to_str and ip6_guint8_to_str with address_to_str and tvb_ip_to_str.Michael Mann1-1/+2
Change-Id: I1d258923a7a63539ec8456d3e306bca5016a1e4b Reviewed-on: https://code.wireshark.org/review/6060 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-26Replace ip_to_str with [ep_]address_to_str and tvb_ip_to_str.Michael Mann1-1/+3
Change-Id: I40d0c8253743183aecef252040b7dd6742ae5c71 Reviewed-on: https://code.wireshark.org/review/5934 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-09Fix GTK warning in EXTCAP partsIrene Ruengeler1-4/+7
Change-Id: I3a4d9baf3592db1394d1177a19014cbef9140759 Reviewed-on: https://code.wireshark.org/review/5628 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Irene Ruengeler <iruengeler@googlemail.com>
2014-10-04extcap: warning: no previous prototype for ‘extcap_free_arglist’ ↵Alexis La Goutte1-5/+0
[-Wmissing-prototypes] Remove extcap_free_arglist (never used) Change-Id: I1f751512be627380a992db63c3e4abd22b3aa486 Reviewed-on: https://code.wireshark.org/review/4455 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-25Update the simple dialog code.Gerald Combs1-1/+1
Rename simple_dialog_qt.{cpp,h} to simple_dialog.{cpp,h}. Make it a subclass of QMessageBox. Queue messages at startup similar to GTK+. Move the GTK+-specific simple_dialog declarations to gtk/simple_dialog.h. Don't yell at the user so much. Replace exclamation points with periods. Change-Id: I1cc771106222d5e06f1f52d67ac29d6dc367cce4 Reviewed-on: https://code.wireshark.org/review/4288 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-21Extcap Capture InterfaceRoland Knall1-0/+77
Extcap is a plugin interface, which allows for the usage of external capture interfaces via pipes using a predefined configuration language which results in a graphical gui. This implementation seeks for a generic implementation, which results in a seamless integration with the current system, and does add all external interfaces as simple interfaces. Windows Note: Due to limitations with GTK and Windows, a gspawn-winXX-helper.exe, respective gspawn-winXX-helper-console.exe is needed, which is part of any GTK windows installation. The default installation directory from the build is an extcap subdirectory underneath the run directory. The folder used by extcap may be viewed in the folders tab of the about dialog. The default installation directory for extcap plugins with a pre-build or installer version of wireshark is the extcap subdirectory underneath the main wireshark directory. For more information see: http://youtu.be/Nn84T506SwU bug #9009 Also take a look in doc/extcap_example.py for a Python-example and in extcap.pod for the arguments grammer. Todo: - Integrate with Qt - currently no GUI is generated, but the interfaces are still usable Change-Id: I4f1239b2f1ebd8b2969f73af137915f5be1ce50f Signed-off-by: Mike Ryan <mikeryan+wireshark@lacklustre.net> Signed-off-by: Mike Kershaw <dragorn@kismetwireless.net> Signed-off-by: Roland Knall <rknall@gmail.com> Reviewed-on: https://code.wireshark.org/review/359 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-01Move the AirPcap stuff into caputils.Guy Harris1-2/+2
Change-Id: I64b45dad36a3ec491aeb9de3439b4fe19b46f9d8 Reviewed-on: https://code.wireshark.org/review/3308 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-23Clean up indentation (consistent two-space indentation).Guy Harris1-72/+72
Change-Id: I90210a051f820e70b8b41e5376f881f812c9539f Reviewed-on: https://code.wireshark.org/review/3173 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-11GTK Remote CapturingIrene Ruengeler1-126/+30
Move the GTK files necessary for managing the recnet remote host from capture_dlg.c to recent.c in order to use them in QT, too. Change-Id: I3f3fd31ce928162de08c6db7309ef2a9b1e97760 Reviewed-on: https://code.wireshark.org/review/2955 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-06GTK: fix crash when closing Capture Options dialog box on WindowsPascal Quantin1-1/+1
Introduced in g929afd2 Change-Id: I911994af2a210f00cd099f26e68d1e1f0fea577b Reviewed-on: https://code.wireshark.org/review/2901 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-04Move utility routines for capturing into a libcaputils static library.Guy Harris1-2/+2
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-06-30Move capture.[ch] to libui.Guy Harris1-1/+1
Change-Id: I86e7e781cc9e14abab0374a18b95438529b046f0 Reviewed-on: https://code.wireshark.org/review/2711 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Move capture_ui_utils.[ch] to libui.Guy Harris1-1/+1
Change-Id: Id0f3d4d60a1acc7aa64fd3737b8f16df5bca4e5a Reviewed-on: https://code.wireshark.org/review/2708 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-28Fix several GTK warnings in Windows.Irene Ruengeler1-31/+22
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-24Fix some more capchild includes.Guy Harris1-1/+1
Change-Id: I6d6cd79ee9e630fe81eb6deca9691249b44bdaf4 Reviewed-on: https://code.wireshark.org/review/2595 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-23CaptureDialog: Fix IF type for user created pipeRoland Knall1-0/+1
- If a user adds a pipe via "Capture Options"->"Manage Interfaces" ->"Pipes" the device.if_type.type is either not filled out (in the case if no other interfaces exist), or will be set to the last set if_type of the device queried by the iteration in line 3537. - One could argue, that this is just a fixup, as still the issue remains, that the device structure will not be resetted, after the search for an already existing pipe element. Maybe a separate variable should be used for searching as it is used for adding the pipe Change-Id: Ia727bf3ce270a62d065e8c524a13768af389c346 Reviewed-on: https://code.wireshark.org/review/1296 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-21fix a crash in the GTK "Interface Management" dialogueMartin Kaiser1-1/+5
for Pipes and Local Interfaces (Capture / Options / Manage Interfaces) if you start with an empty dialogue, select a pipe using Browse and press Save, wireshark crashes because of a strcmp() against the uninitialized pipe_name initialize pipe_name to NULL and make sure its value is reset when the dialogue is closed don't add a pipe unless there's an active selection in the pipe list (which may be "New Pipe") Change-Id: Id460c8d0d43cd7fc4cb8f4e9b4357898bbef20f7 Reviewed-on: https://code.wireshark.org/review/776 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-11Migrate GTK icon handling to GTK 3.10 APIBalint Reczey1-10/+10
GtkStockItem usage is deprecated with all the GTK_STOCK_.* stock ids. We keep a stock id based approach but without relying on GTK's GtkStockItem system. We create our own internal stock ids for {icon, label} tuples and keep the original GTK stock id #define-s and values to preserve backward compatibility. Change-Id: Ia0b35a5903f079e92c8026e3df21bbf0be2d06b0 Reviewed-on: https://code.wireshark.org/review/302 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-06Reorganize Capture Options dialogPeter Hatina1-42/+38
Opening Capture Options dialog on low resolution displays (e.g. 1366x768) in GNOME-shell makes user unable to see the bottom of the dialog Change-Id: Icc39d5ca89f98edb3ff246cd23ab9663a3dfbd1e Reviewed-on: https://code.wireshark.org/review/453 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-18Fix Branch condition evaluates to a garbage value found by Clang AnalyzerAlexis La Goutte1-0/+4
Change-Id: I745f838a763e5cc89e1b9c0536ad3cb299b00786 Reviewed-on: https://code.wireshark.org/review/245 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2013-12-10Removed debug output.Stig Bjørlykke1-1/+0
svn path=/trunk/; revision=53903
2013-12-03When including <epan/prefs.h> don't force inclusion of <epan/uat.h>Jakub Zawadzki1-2/+2
svn path=/trunk/; revision=53769
2013-12-02Specify SI units for the max filesize autostop condition. For now, keep the ↵Chris Maynard1-18/+18
capture buffer size in IEC units, but document it as such. #BACKPORT(1.10, 1.8(?)) svn path=/trunk/; revision=53728
2013-11-29When a snaplength isn't specifically set by the user, the default snaplength ↵Chris Maynard1-25/+5
is used. In this case, rather than display the text, "default", display the actual value so the user always knows which value will be used. Other tools (tcpdump, for example) uses a different default snaplength, so it may not have been obvious to all users which value Wireshark uses for its default snaplength (even if it is documented in the man pages). svn path=/trunk/; revision=53660
2013-11-27While r53608 fixed the "Use promiscuous mode on all interfaces" toggle ↵Chris Maynard1-1/+4
button behavior, it wasn't enough, so use the technique from r53609 for the "Capture on all interfaces" toggle button to fix it completely. #BACKPORT(1.10) svn path=/trunk/; revision=53611
2013-11-27OK, capture_all is only ever set to TRUE or FALSE, so just use it directly.Chris Maynard1-1/+1
svn path=/trunk/; revision=53610
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 17:14:45 +0000