diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-11-22 06:02:49 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-11-22 06:02:49 +0000 |
| commit | bd976ae6c06b2111bd82df16b77739731dc17402 (patch) | |
| tree | 406d65d00129abb45868150687f267a139bbf670 /capture_ifinfo.c | |
| parent | b9e8e95ffe9f352cde5847d458081826523cf46f (diff) | |
| download | wireshark-bd976ae6c06b2111bd82df16b77739731dc17402.tar.gz wireshark-bd976ae6c06b2111bd82df16b77739731dc17402.tar.bz2 wireshark-bd976ae6c06b2111bd82df16b77739731dc17402.zip | |
On UN*X, if an interface has a description, use it as the "friendly
name". If it doesn't have a description, on OS X, use the System
Configuration framework to attempt to get a "friendly name" for
interfaces.
If a loopback device doesn't have a friendly name, give it "Loopback" as
the friendly name.
Move the "turn a CFString into a mallocated C string" routine into
common code, as it's used in more than one place.
svn path=/trunk/; revision=46131
Diffstat (limited to 'capture_ifinfo.c')
| -rw-r--r-- | capture_ifinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/capture_ifinfo.c b/capture_ifinfo.c index 314a01ad1e..df8940d85d 100644 --- a/capture_ifinfo.c +++ b/capture_ifinfo.c @@ -159,7 +159,7 @@ capture_interface_list(int *err, char **err_str) 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); |