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 /Makefile.common | |
| 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 'Makefile.common')
| -rw-r--r-- | Makefile.common | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.common b/Makefile.common index f7dbcce970..7a5b90b3bd 100644 --- a/Makefile.common +++ b/Makefile.common @@ -48,6 +48,7 @@ WIRESHARK_COMMON_SRC = \ $(PLATFORM_SRC) \ capture-pcap-util.c \ cfile.c \ + cfutils.c \ clopts_common.c \ disabled_protos.c \ frame_data_sequence.c \ @@ -65,7 +66,9 @@ WIRESHARK_COMMON_INCLUDES = \ 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 \ @@ -196,6 +199,7 @@ dumpcap_SOURCES = \ capture_opts.c \ capture-pcap-util.c \ capture_stop_conditions.c \ + cfutils.c \ clopts_common.c \ conditions.c \ dumpcap.c \ |