Report a friendlier name, if possible, when capturing in Tethereal.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13062 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.common b/Makefile.common
index 43a797589ae0fd5b56e93046b69991dad276b6a3..57bf1e8111af7b39ded4a73eb046883398ecd34a 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -62,6 +62,7 @@ BUILT_SOURCES =               \
 ETHEREAL_COMMON_SRC =  \
        $(PLATFORM_SRC) \
        capture_stop_conditions.c       \
+       capture_ui_utils.c      \
        cfile.c \
        clopts_common.c \
        conditions.c    \
@@ -80,6 +81,7 @@ ETHEREAL_COMMON_INCLUDES =    \
        $(DISSECTOR_SUPPORT_INCLUDES)   \
        svnversion.h            \
        capture_stop_conditions.h       \
+       capture_ui_utils.h      \
        cfile.h \
        clopts_common.h \
        color.h \
@@ -142,7 +144,6 @@ ethereal_SOURCES =  \
        capture.c       \
        capture_sync.c  \
        capture_loop.c  \
-       capture_ui_utils.c      \
        color_filters.c \
        file.c  \
        filters.c       \
@@ -156,7 +157,6 @@ ethereal_INCLUDES = \
        alert_box.h     \
        capture.h       \
        capture_sync.h  \
-       capture_ui_utils.h      \
        color_filters.h \
        filters.h       \
        g711.h  \

diff --git a/tethereal.c b/tethereal.c
index d3c45b71ea919a6cef6bbb89aeb3540cae037817..c015bcdd49f8423abf8f3510032f72cf5e273eac 100644 (file)
--- a/tethereal.c
+++ b/tethereal.c
@@ -99,6 +99,7 @@
 #include "conditions.h"
 #include "capture_stop_conditions.h"
 #include "ringbuffer.h"
+#include "capture_ui_utils.h"
 #include <epan/epan_dissect.h>
 #include <epan/tap.h>
 #include <epan/timestamp.h>
@@ -1701,6 +1702,7 @@ capture(int out_file_type)
   char        errmsg[1024+1];
   condition  *volatile cnd_stop_capturesize = NULL;
   condition  *volatile cnd_stop_timeout = NULL;
+  char       *descr;
 #ifndef _WIN32
   void        (*oldhandler)(int);
   static const char ppamsg[] = "can't find PPA for ";
@@ -1922,7 +1924,9 @@ capture(int out_file_type)
 #endif /* _WIN32 */
 
   /* Let the user know what interface was chosen. */
-  fprintf(stderr, "Capturing on %s\n", cfile.iface);
+  descr = get_interface_descriptive_name(cfile.iface);
+  fprintf(stderr, "Capturing on %s\n", descr);
+  g_free(descr);
 
   /* initialize capture stop conditions */
   init_capture_stop_conditions();