Keep a copy of the interface description and capture filter around so that

we can use it in the main window title during and after capture. Add a
"-X" option for providing a description for stdin.


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

1 files changed, 7 insertions, 1 deletions

diff --git a/capture_ui_utils.c b/capture_ui_utils.c
index f64e638993..f6ff8c3fb8 100644
--- a/capture_ui_utils.c
+++ b/capture_ui_utils.c
@@ -34,7 +34,8 @@
 #include <ctype.h>
 #include <glib.h>
 
-#include <epan/prefs.h>
+#include "epan/prefs.h"
+#include "epan/ex-opt.h"
 #include "capture_ifinfo.h"
 #include "capture_ui_utils.h"
 
@@ -155,6 +156,11 @@ get_interface_descriptive_name(const char *if_name)
   if (descr != NULL) {
     /* Yes - make a copy of that. */
     descr = g_strdup(descr);
+  } else if (strcmp(if_name, "-") == 0) {
+    descr = g_strdup(ex_opt_get_nth("stdin_descr", 0));
+    if (!descr) {
+      descr = g_strdup("Standard input");
+    }
   } else {
     /* No, we don't have a user-supplied description; did we get
        one from the OS or libpcap? */