aboutsummaryrefslogtreecommitdiffstats
path: root/capture_ui_utils.c
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2010-03-04 01:12:04 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2010-03-04 01:12:04 +0000
commit58a3f1328d7bac383111dbdef7d335d5e09e19cb (patch)
treec2af1e714cc510427cdd87a9b63979038cfc40ac /capture_ui_utils.c
parentb7e1b595c94c47d44a3fceffb19440ceda8731ce (diff)
In Wireshark and TShark, run dumpcap to get interface lists and lists of
link-layer header types for interfaces; if special privileges are necessary to open capture devices, Wireshark and TShark shouldn't have those privileges, but dumpcap should. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32104 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'capture_ui_utils.c')
-rw-r--r--capture_ui_utils.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/capture_ui_utils.c b/capture_ui_utils.c
index c975aa6df5..ffff697eda 100644
--- a/capture_ui_utils.c
+++ b/capture_ui_utils.c
@@ -34,7 +34,7 @@
#include <glib.h>
#include <epan/prefs.h>
-#include "capture-pcap-util.h"
+#include "capture_ifinfo.h"
#include "capture_ui_utils.h"
/*
@@ -130,12 +130,12 @@ capture_dev_user_linktype_find(const gchar *if_name)
/*
* Return as descriptive a name for an interface as we can get.
* If the user has specified a comment, use that. Otherwise,
- * if get_interface_list() supplies a description, use that,
+ * if capture_interface_list() supplies a description, use that,
* otherwise use the interface name.
*
* The result must be g_free()'d when you're done with it.
*
- * Note: given that this calls get_interface_list(), which attempts to
+ * Note: given that this calls capture_interface_list(), which attempts to
* open all adapters it finds in order to check whether they can be
* captured on, this is an expensive routine to call, so don't call it
* frequently.
@@ -158,7 +158,7 @@ get_interface_descriptive_name(const char *if_name)
/* No, we don't have a user-supplied description; did we get
one from the OS or libpcap? */
descr = NULL;
- if_list = get_interface_list(&err, NULL);
+ if_list = capture_interface_list(&err, NULL);
if (if_list != NULL && if_name != NULL) {
if_entry = if_list;
do {