wimaxasncp/dictionary.xml \
wimaxasncp/dictionary.dtd
-PLATFORM_SRC = capture-pcap-util-unix.c
+PLATFORM_SRC = \
+ capture-pcap-util-unix.c \
+ capture_unix_ifnames.c
if HAVE_PLUGINS
-include plugins/Custom.make
@ADNS_LIBS@ \
@KRB5_LIBS@ \
@APPLICATIONSERVICES_FRAMEWORKS@ \
+ @SYSTEMCONFIGURATION_FRAMEWORKS@ \
@COREFOUNDATION_FRAMEWORKS@ \
@PY_LIBS@ \
@LIBGCRYPT_LIBS@ \
@C_ARES_LIBS@ \
@ADNS_LIBS@ \
@KRB5_LIBS@ \
+ @SYSTEMCONFIGURATION_FRAMEWORKS@ \
@COREFOUNDATION_FRAMEWORKS@ \
@PY_LIBS@ \
@LIBGCRYPT_LIBS@ \
@C_ARES_LIBS@ \
@ADNS_LIBS@ \
@KRB5_LIBS@ \
+ @SYSTEMCONFIGURATION_FRAMEWORKS@ \
@COREFOUNDATION_FRAMEWORKS@ \
@PY_LIBS@ \
@LIBGCRYPT_LIBS@ \
@PCAP_LIBS@ \
@SOCKET_LIBS@ \
@NSL_LIBS@ \
+ @SYSTEMCONFIGURATION_FRAMEWORKS@ \
@COREFOUNDATION_FRAMEWORKS@ \
@LIBCAP_LIBS@
dumpcap_CFLAGS = $(AM_CLEAN_CFLAGS)
$(PLATFORM_SRC) \
capture-pcap-util.c \
cfile.c \
+ cfutils.c \
clopts_common.c \
disabled_protos.c \
frame_data_sequence.c \
svnversion.h \
capture-pcap-util.h \
capture-pcap-util-int.h \
+ capture_unix_ifnames.h \
cfile.h \
+ cfutils.h \
clopts_common.h \
cmdarg_err.h \
console_io.h \
capture_opts.c \
capture-pcap-util.c \
capture_stop_conditions.c \
+ cfutils.c \
clopts_common.c \
conditions.c \
dumpcap.c \
#ifndef __PCAP_UTIL_INT_H__
#define __PCAP_UTIL_INT_H__
-extern if_info_t *if_info_new(char *name, char *description);
+extern if_info_t *if_info_new(const char *name, const char *friendly_name,
+ const char *vendor_description, gboolean loopback);
extern void if_info_add_address(if_info_t *if_info, struct sockaddr *addr);
#ifdef HAVE_PCAP_FINDALLDEVS
#ifdef HAVE_PCAP_REMOTE
char *buf;
if_info_t *if_info;
char errbuf[PCAP_ERRBUF_SIZE];
+ gboolean loopback;
if (sock < 0) {
*err = CANT_GET_INTERFACE_LIST;
* don't want a loopback interface to be the default capture
* device unless there are no non-loopback devices.
*/
- if_info = if_info_new(ifr->ifr_name, NULL);
+ loopback = ((ifrflags.ifr_flags & IFF_LOOPBACK) ||
+ strncmp(ifr->ifr_name, "lo", 2) == 0);
+ if_info = if_info_new(ifr->ifr_name, loopback ? "Loopback" : NULL,
+ NULL, loopback);
if_info_add_address(if_info, &ifr->ifr_addr);
- if ((ifrflags.ifr_flags & IFF_LOOPBACK) ||
- strncmp(ifr->ifr_name, "lo", 2) == 0) {
- if_info->loopback = TRUE;
+ if (loopback)
il = g_list_append(il, if_info);
- } else {
- if_info->loopback = FALSE;
+ else {
il = g_list_insert(il, if_info, nonloopback_pos);
/*
* Insert the next non-loopback interface after this
* It worked; we can use the "any" device.
*/
if_info = if_info_new("any",
- "Pseudo-device that captures on all interfaces");
+ "Pseudo-device that captures on all interfaces",
+ NULL, FALSE);
il = g_list_insert(il, if_info, -1);
pcap_close(pch);
}
#ifdef _WIN32
#include "capture_win_ifnames.h" /* windows friendly interface names */
+#else
+#include "capture_unix_ifnames.h"
#endif
if_info_t *
-if_info_new(char *name, char *description)
+if_info_new(const char *name, const char *friendly_name,
+ const char *vendor_description, gboolean loopback)
{
if_info_t *if_info;
if_info = (if_info_t *)g_malloc(sizeof (if_info_t));
if_info->name = g_strdup(name);
- if (description == NULL)
- if_info->description = NULL;
+ if (friendly_name == NULL)
+ if_info->friendly_name = NULL;
else
- if_info->description = g_strdup(description);
-
-#ifdef _WIN32
- get_windows_interface_friendlyname(name, &if_info->friendly_name);
-#else
- if_info->friendly_name = NULL;
-#endif
-
+ if_info->friendly_name = g_strdup(friendly_name);
+ if (vendor_description == NULL)
+ if_info->vendor_description = NULL;
+ else
+ if_info->vendor_description = g_strdup(vendor_description);
+ if_info->loopback = loopback;
if_info->addrs = NULL;
- if_info->loopback = FALSE;
return if_info;
}
#ifdef HAVE_PCAP_FINDALLDEVS
/*
- * Get all IP address information, and the loopback flag, for the given
- * interface.
+ * Get all IP address information for the given interface.
*/
static void
if_info_ip(if_info_t *if_info, pcap_if_t *d)
{
pcap_addr_t *a;
- /* Loopback flag */
- if_info->loopback = (d->flags & PCAP_IF_LOOPBACK) ? TRUE : FALSE;
-
/* All addresses */
for (a = d->addresses; a != NULL; a = a->next) {
if (a->addr != NULL)
pcap_if_t *alldevs, *dev;
if_info_t *if_info;
char errbuf[PCAP_ERRBUF_SIZE];
+ gboolean loopback;
+ char *friendly_name;
if (pcap_findalldevs_ex((char *)source, auth, &alldevs, errbuf) == -1) {
*err = CANT_GET_INTERFACE_LIST;
}
for (dev = alldevs; dev != NULL; dev = dev->next) {
- if_info = if_info_new(dev->name, dev->description);
+ /* Loopback flag */
+ loopback = (dev->flags & PCAP_IF_LOOPBACK) ? TRUE : FALSE;
+
+#ifdef _WIN32
+ /*
+ * On Windows, the "description" is a vendor description,
+ * and the friendly name isn't returned by WinPcap.
+ * Fetch it ourselves.
+ */
+ get_windows_interface_friendly_name(dev->name, &friendly_name);
+ if_info = if_info_new(dev->name, friendly_name,
+ dev->description, loopback);
+#else
+ /*
+ * On UN*X, if there is a description, it's a friendly
+ * name, and there is no vendor description.
+ * If there's no description, fetch a friendly name
+ * if we can; if that fails, then, for a loopback
+ * interface, give it the friendly name "Loopback".
+ */
+ friendly_name = dev->description;
+ if (friendly_name == NULL) {
+ friendly_name = get_unix_interface_friendly_name(dev->name);
+ if (friendly_name == NULL) {
+ /*
+ * If this is a loopback interface, give it a
+ * "friendly name" of "Loopback".
+ */
+ if (loopback)
+ friendly_name = g_strdup("Loopback");
+ }
+ }
+ if_info = if_info_new(dev->name, friendly_name, NULL, loopback);
+#endif
+ g_free(friendly_name);
il = g_list_append(il, if_info);
if_info_ip(if_info, dev);
}
pcap_if_t *alldevs, *dev;
if_info_t *if_info;
char errbuf[PCAP_ERRBUF_SIZE];
+ gboolean loopback;
+ char *friendly_name;
if (pcap_findalldevs(&alldevs, errbuf) == -1) {
*err = CANT_GET_INTERFACE_LIST;
}
for (dev = alldevs; dev != NULL; dev = dev->next) {
- if_info = if_info_new(dev->name, dev->description);
+ /* Loopback flag */
+ loopback = (dev->flags & PCAP_IF_LOOPBACK) ? TRUE : FALSE;
+
+#ifdef _WIN32
+ /*
+ * On Windows, the "description" is a vendor description,
+ * and the friendly name isn't returned by WinPcap.
+ * Fetch it ourselves.
+ */
+ get_windows_interface_friendly_name(dev->name, &friendly_name);
+ if_info = if_info_new(dev->name, friendly_name,
+ dev->description, loopback);
+#else
+ /*
+ * On UN*X, if there is a description, it's a friendly
+ * name, and there is no vendor description.
+ * If there's no description, fetch a friendly name
+ * if we can; if that fails, then, for a loopback
+ * interface, give it the friendly name "Loopback".
+ */
+ friendly_name = dev->description;
+ if (friendly_name == NULL) {
+ friendly_name = get_unix_interface_friendly_name(dev->name);
+ if (friendly_name == NULL) {
+ /*
+ * If this is a loopback interface, give it a
+ * "friendly name" of "Loopback".
+ */
+ if (loopback)
+ friendly_name = g_strdup("Loopback");
+ }
+ }
+ if_info = if_info_new(dev->name, friendly_name, NULL, loopback);
+#endif
+ g_free(friendly_name);
il = g_list_append(il, if_info);
if_info_ip(if_info, dev);
}
if_info_t *if_info = (if_info_t *)data;
g_free(if_info->name);
- g_free(if_info->description);
+ g_free(if_info->friendly_name);
+ g_free(if_info->vendor_description);
g_slist_foreach(if_info->addrs, free_if_info_addr_cb, NULL);
g_slist_free(if_info->addrs);
if_info = g_malloc0(sizeof(if_info_t));
if_info->name = g_strdup(name);
if (strlen(if_parts[1]) > 0)
- if_info->description = g_strdup(if_parts[1]);
+ if_info->vendor_description = g_strdup(if_parts[1]);
if (strlen(if_parts[2]) > 0)
if_info->friendly_name = g_strdup(if_parts[2]);
addr_parts = g_strsplit(if_parts[3], ",", 0);
*/
typedef struct {
char *name; /* e.g. "eth0" */
- char *description; /* vendor description from libpcap, e.g. "Realtek PCIe GBE Family Controller" or NULL */
- char *friendly_name; /* from OS, e.g. "Local Area Connection" */
+ char *friendly_name; /* from OS, e.g. "Local Area Connection", or
+ NULL if not available */
+ char *vendor_description;
+ /* vendor description from pcap_findalldevs(),
+ e.g. "Realtek PCIe GBE Family Controller",
+ or NULL if not available */
GSList *addrs; /* containing address values of if_addr_t */
gboolean loopback; /* TRUE if loopback, FALSE otherwise */
} if_info_t;
if_info = (if_info_t *)if_entry->data;
fprintf_stderr("%d. %s", i++, if_info->name);
- /* print the interface friendly name if known, if not fall back to vendor description */
+ /* Print the interface friendly name, if it exists;
+ if not fall back to vendor description, if it exists. */
if (if_info->friendly_name != NULL){
fprintf_stderr(" (%s)", if_info->friendly_name);
- }else{
- /* Print the description if it exists */
- if (if_info->description != NULL)
- fprintf_stderr(" (%s)", if_info->description);
+ } else {
+ if (if_info->vendor_description != NULL)
+ fprintf_stderr(" (%s)", if_info->vendor_description);
}
fprintf_stderr("\n");
}
do {
if_info = if_entry->data;
if (strcmp(if_info->name, if_name) == 0) {
- if (if_info->friendly_name!= NULL) {
- /* use the friendly name */
+ if (if_info->friendly_name != NULL) {
+ /* We have a "friendly name"; return a copy of that
+ as the description - when we free the interface
+ list, that'll also free up the strings to which
+ it refers. */
descr = g_strdup(if_info->friendly_name);
- }else if (if_info->description != NULL) {
- /* Return a copy of that - when we free the interface
- list, that'll also free up the strings to which
- it refers. */
- descr = g_strdup(if_info->description);
+ } else if (if_info->vendor_description != NULL) {
+ /* We have no "friendly name", but we have a vendor
+ description; return a copy of that - when we free
+ the interface list, that'll also free up the strings
+ to which it refers. */
+ descr = g_strdup(if_info->vendor_description);
}
break;
}
/* No, we don't have a user-supplied description; did we get
one from the OS or libpcap? */
if_info = search_info(if_list, if_name);
- if (if_info != NULL && if_info->description != NULL) {
+ if (if_info != NULL && if_info->vendor_description != NULL) {
/* Yes - use it. */
- if_string = g_strdup_printf("%s: %s", if_info->description,
+ if_string = g_strdup_printf("%s: %s", if_info->vendor_description,
if_info->name);
} else {
/* No. */
} else {
/* No, we don't have a user-supplied description; did we get
one from the OS or libpcap? */
- if (if_info->description != NULL) {
+ if (if_info->vendor_description != NULL) {
/* Yes - use it. */
- if_string = g_strdup_printf("%s: %s", if_info->description,
+ if_string = g_strdup_printf("%s: %s",
+ if_info->vendor_description,
if_info->name);
} else {
/* No. */
--- /dev/null
+/* capture_unix_ifnames.c
+ * Routines supporting the use of UN*X friendly interface names, if any,
+ * within Wireshark
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 2001 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+
+#include <glib.h>
+
+#include "capture_unix_ifnames.h"
+
+/*
+ * Given an interface name, find the "friendly name" for the interface.
+ */
+
+#ifdef __APPLE__
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <SystemConfiguration/SystemConfiguration.h>
+
+#include "cfutils.h"
+
+/*
+ * On OS X, we do that by getting all the interfaces that the System
+ * Configuration framework knows about, look for the one with a "BSD
+ * name" matching the interface name, and, if we find it, return its
+ * "localized display name", if it has one.
+ */
+char *
+get_unix_interface_friendly_name(const char *ifname)
+{
+ CFStringRef ifname_CFString;
+ CFArrayRef interfaces;
+ CFIndex num_interfaces;
+ CFIndex i;
+ SCNetworkInterfaceRef interface;
+ CFStringRef bsdname_CFString;
+ CFStringRef friendly_name_CFString;
+ char *friendly_name = NULL;
+
+ interfaces = SCNetworkInterfaceCopyAll();
+ if (interfaces == NULL) {
+ /*
+ * Couldn't get a list of interfaces.
+ */
+ return NULL;
+ }
+
+ ifname_CFString = CFStringCreateWithCString(kCFAllocatorDefault,
+ ifname, kCFStringEncodingUTF8);
+ if (ifname_CFString == NULL) {
+ /*
+ * Couldn't convert the interface name to a CFString.
+ */
+ CFRelease(interfaces);
+ return NULL;
+ }
+
+ num_interfaces = CFArrayGetCount(interfaces);
+ for (i = 0; i < num_interfaces; i++) {
+ interface = CFArrayGetValueAtIndex(interfaces, i);
+ bsdname_CFString = SCNetworkInterfaceGetBSDName(interface);
+ if (bsdname_CFString == NULL) {
+ /*
+ * This interface has no BSD name, so it's not
+ * a regular network interface.
+ */
+ continue;
+ }
+ if (CFStringCompare(ifname_CFString, bsdname_CFString, 0) == 0) {
+ /*
+ * This is the interface.
+ */
+ friendly_name_CFString = SCNetworkInterfaceGetLocalizedDisplayName(interface);
+ if (friendly_name_CFString != NULL)
+ friendly_name = CFString_to_C_string(friendly_name_CFString);
+ break;
+ }
+ }
+
+ CFRelease(interfaces);
+ return friendly_name;
+}
+
+#else /* __APPLE__ */
+
+/*
+ * Nothing supported on other platforms.
+ */
+char *
+get_unix_interface_friendly_name(const char *ifname _U_)
+{
+ return NULL;
+}
+
+#endif /* __APPLE__ */
--- /dev/null
+/* capture_unix_ifnames.h
+ * Routines supporting the use of UN*X friendly interface names, if any,
+ * within Wireshark
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef CAPTURE_UNIX_IFNAMES_H
+#define CAPTURE_UNIX_IFNAMES_H
+
+/* returns the interface friendly name for a device name; if it is unable to
+ * resolve the name, NULL is returned */
+char *get_unix_interface_friendly_name(const char *ifname);
+
+#endif
--- /dev/null
+/* cfutils.c
+ * Routines to work around deficiencies in Core Foundation, such as the
+ * lack of a routine to convert a CFString to a C string of arbitrary
+ * size.
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 2001 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+
+#ifdef HAVE_OS_X_FRAMEWORKS
+#include <glib.h>
+#include <CoreFoundation/CoreFoundation.h>
+#include "cfutils.h"
+
+/*
+ * Convert a CFString to a UTF-8-encoded C string; the resulting string
+ * is allocated with g_malloc(). Returns NULL if the conversion fails.
+ */
+char *
+CFString_to_C_string(CFStringRef cfstring)
+{
+ CFIndex string_len;
+ char *string;
+
+ string_len = CFStringGetMaximumSizeForEncoding(CFStringGetLength(cfstring),
+ kCFStringEncodingUTF8);
+ string = g_malloc(string_len + 1);
+ if (!CFStringGetCString(cfstring, string, string_len + 1,
+ kCFStringEncodingUTF8)) {
+ g_free(string);
+ return NULL;
+ }
+ return string;
+}
+#endif
+
+
--- /dev/null
+/* cfutils.h
+ * Declarations of routines to work around deficiencies in Core Foundation,
+ * such as the lack of a routine to convert a CFString to a C string of
+ * arbitrary size.
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 2001 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+extern char *CFString_to_C_string(CFStringRef cfstring);
+
# "just Darwin" (as we don't currently support iOS, and as I don't
# think you can build and run "just Darwin" as an OS for PCs), we
# arrange to build some programs with Application Services so they
-# can launch Web browsers and Finder windows, and build any programs
-# that use either of those frameworks or that report version information
+# can launch Web browsers and Finder windows, arrange to build some
+# programs with System Configuration so they can get "friendly names"
+# and other information about interfaces, and build any programs that
+# use either of those frameworks or that report version information
# with Core Foundation as the frameworks in question use it and as we
# get version information from plists and thus need Core Foundation
# to process those plists.
darwin*)
AC_DEFINE(HAVE_OS_X_FRAMEWORKS, 1, [Define to 1 if you have OS X frameworks])
APPLICATIONSERVICES_FRAMEWORKS="-framework ApplicationServices"
+ SYSTEMCONFIGURATION_FRAMEWORKS="-framework SystemConfiguration"
COREFOUNDATION_FRAMEWORKS="-framework CoreFoundation"
#
;;
esac
AC_SUBST(APPLICATIONSERVICES_FRAMEWORKS)
+AC_SUBST(SYSTEMCONFIGURATION_FRAMEWORKS)
AC_SUBST(COREFOUNDATION_FRAMEWORKS)
#
* separated.
*/
/* XXX - Make sure our description doesn't contain a tab */
- if (if_info->description != NULL)
- printf("\t%s\t", if_info->description);
+ if (if_info->vendor_description != NULL)
+ printf("\t%s\t", if_info->vendor_description);
else
printf("\t\t");
+ /* XXX - Make sure our friendly name doesn't contain a tab */
if (if_info->friendly_name != NULL)
printf("%s\t", if_info->friendly_name);
else
device.active_dlt = -1;
device.locked = FALSE;
device.if_info.name = g_strdup(g_save_file);
- device.if_info.description = NULL;
+ device.if_info.friendly_name = NULL;
+ device.if_info.vendor_description = NULL;
device.if_info.addrs = NULL;
device.if_info.loopback = FALSE;
#if defined(HAVE_PCAP_CREATE)
data.descr_lb = gtk_label_new(user_descr);
g_free (user_descr);
} else {
- if (device.if_info.description)
- data.descr_lb = gtk_label_new(device.if_info.description);
+ if (device.if_info.vendor_description)
+ data.descr_lb = gtk_label_new(device.if_info.vendor_description);
else
data.descr_lb = gtk_label_new("");
}
gtk_misc_set_alignment(GTK_MISC(data.descr_lb), 0.0f, 0.5f);
gtk_table_attach_defaults(GTK_TABLE(if_tb), data.descr_lb, 4, 5, row, row+1);
- if (device.if_info.description) {
+ if (device.if_info.vendor_description) {
g_string_append(if_tool_str, "Description: ");
- g_string_append(if_tool_str, device.if_info.description);
+ g_string_append(if_tool_str, device.if_info.vendor_description);
g_string_append(if_tool_str, "\n");
}
/* set device name text */
text[0] = g_strdup(if_info->name);
- /* set OS description */
- if (if_info->description != NULL)
- text[1] = g_strdup(if_info->description);
+ /* set vendor description */
+ if (if_info->vendor_description != NULL)
+ text[1] = g_strdup(if_info->vendor_description);
else
text[1] = g_strdup("");
/*
* Used when sorting an interface list into alphabetical order by
- * their descriptions.
+ * their friendly names.
*/
gint
if_list_comparator_alph(const void *first_arg, const void *second_arg)
{
const if_info_t *first = first_arg, *second = second_arg;
- if (first != NULL && first->description != NULL &&
- second != NULL && second->description != NULL) {
- return g_ascii_strcasecmp(first->description, second->description);
+ if (first != NULL && first->friendly_name != NULL &&
+ second != NULL && second->friendly_name != NULL) {
+ return g_ascii_strcasecmp(first->friendly_name, second->friendly_name);
} else {
return 0;
}
device.locked = FALSE;
temp = g_malloc0(sizeof(if_info_t));
temp->name = g_strdup(if_info->name);
- temp->description = g_strdup(if_info->description);
+ temp->friendly_name = g_strdup(if_info->friendly_name);
+ temp->vendor_description = g_strdup(if_info->vendor_description);
temp->loopback = if_info->loopback;
/* Is this interface hidden and, if so, should we include it anyway? */
if (if_info->friendly_name != NULL) {
/* We have a friendly name from the OS, use it */
#ifdef _WIN32
- /* on windows, if known only show the interface friendly name - don't show the device guid */
+ /*
+ * On Windows, if we have a friendly name, just show it,
+ * don't show the name, as that's a string made out of
+ * the device GUID, and not at all friendly.
+ */
if_string = g_strdup_printf("%s", if_info->friendly_name);
#else
+ /*
+ * On UN*X, if we have a friendly name, show it along
+ * with the interface name; the interface name is short
+ * and somewhat friendly, and many UN*X users are used
+ * to interface names, so we should show it.
+ */
if_string = g_strdup_printf("%s: %s", if_info->friendly_name, if_info->name);
#endif
- } else if (if_info->description != NULL) {
+ } else if (if_info->vendor_description != NULL) {
/* We have a device description from libpcap - use it. */
- if_string = g_strdup_printf("%s: %s", if_info->description, if_info->name);
+ if_string = g_strdup_printf("%s: %s", if_info->vendor_description, if_info->name);
} else {
/* No. */
if_string = g_strdup(if_info->name);
}
}
- if (if_info->loopback) {
- device.display_name = g_strdup_printf("%s (loopback)", if_string);
- } else {
- device.display_name = g_strdup(if_string);
- }
- g_free(if_string);
+ device.display_name = if_string;
device.selected = FALSE;
if (prefs_is_capture_device_hidden(if_info->name)) {
device.hidden = TRUE;
}
- device.type = get_interface_type(if_info->name, if_info->description);
+ device.type = get_interface_type(if_info->name, if_info->vendor_description);
monitor_mode = prefs_capture_device_monitor_mode(if_info->name);
caps = capture_get_if_capabilities(if_info->name, monitor_mode, NULL);
for (; (curr_addr = g_slist_nth(if_info->addrs, ips)) != NULL; ips++) {
device.local = TRUE;
device.locked = FALSE;
device.if_info.name = g_strdup(interface_opts.name);
- device.if_info.description = g_strdup(interface_opts.descr);
+ device.if_info.friendly_name = NULL;
+ device.if_info.vendor_description = g_strdup(interface_opts.descr);
device.if_info.addrs = NULL;
device.if_info.loopback = FALSE;
#ifdef HAVE_OS_X_FRAMEWORKS
#include <CoreFoundation/CoreFoundation.h>
+#include "cfutils.h"
#endif
#ifdef HAVE_LIBCAP
get_string_from_dictionary(CFPropertyListRef dict, CFStringRef key)
{
CFStringRef cfstring;
- CFIndex string_len;
- char *string;
cfstring = CFDictionaryGetValue(dict, key);
if (cfstring == NULL)
/* It isn't a string. Punt. */
return NULL;
}
- string_len = CFStringGetMaximumSizeForEncoding(CFStringGetLength(cfstring),
- kCFStringEncodingUTF8);
- string = g_malloc(string_len + 1);
- if (!CFStringGetCString(cfstring, string, string_len + 1,
- kCFStringEncodingUTF8)) {
- g_free(string);
- return NULL;
- }
- return string;
+ return CFString_to_C_string(cfstring);
}
/*
git.samba.org / jelmer / wireshark.git / commitdiff