X-Git-Url: http://git.samba.org/samba.git/?p=obnox%2Fwireshark%2Fwip.git;a=blobdiff_plain;f=capture_ui_utils.h;h=f2c6f4c117a1f2c007dc34873339244c83ed398e;hp=a06a2db7e6ad5de6fecafaa347b964d17e921c9f;hb=6326f06ddbd2de2395df27d6c50bd81aad1b944b;hpb=cef97ce083b0303f75922c922967044a927f5610

diff --git a/capture_ui_utils.h b/capture_ui_utils.h
index a06a2db7e6..f2c6f4c117 100644
--- a/capture_ui_utils.h
+++ b/capture_ui_utils.h
@@ -3,8 +3,8 @@
  *
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * 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
@@ -25,13 +25,31 @@
 #ifndef __CAPTURE_UI_UTILS_H__
 #define __CAPTURE_UI_UTILS_H__
 
+#include "capture_opts.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /** @file
  *  GList of available capture interfaces.
  */
 
+/**
+ * Find user-specified capture device description that matches interface
+ * name, if any.
+ */
+char *capture_dev_user_descr_find(const gchar *if_name);
+
+/**
+ * Find user-specified link-layer header type that matches interface
+ * name, if any.
+ */
+gint capture_dev_user_linktype_find(const gchar *if_name);
+
 /** Return as descriptive a name for an interface as we can get.
  * If the user has specified a comment, use that.  Otherwise,
- * if get_interface_list() supplies a description, use that,
+ * if capture_interface_list() supplies a description, use that,
  * otherwise use the interface name.
  *
  * @param if_name The name of the interface.
@@ -42,7 +60,7 @@ char *get_interface_descriptive_name(const char *if_name);
 
 /** Build the GList of available capture interfaces.
  *
- * @param if_list An interface list from get_interface_list().
+ * @param if_list An interface list from capture_interface_list().
  * @param do_hide Hide the "hidden" interfaces.
  *
  * @return A list of if_info_t structs (use free_capture_combo_list() later).
@@ -65,14 +83,28 @@ void free_capture_combo_list(GList *combo_list);
  *
  * @return The raw interface name, without description (must NOT be g_free'd later)
  */
-char *get_if_name(const char *if_text);
+const char *get_if_name(const char *if_text);
 
 /** Convert plain interface name to the displayed name in the combo box.
  *
+ * @param if_list The list of interfaces returned by build_capture_combo_list()
  * @param if_name The name of the interface.
  *
  * @return The descriptive name (must be g_free'd later)
  */
-char * build_capture_combo_name(GList *if_list, gchar *if_name);
+char *build_capture_combo_name(GList *if_list, gchar *if_name);
+
+/** Return the interface description (after setting it if not already set)
+ *
+ * @param capture_opts The capture_options structure that contains the used interface
+ * @param i The index of the interface
+ *
+ * @return A pointer to interface_opts->descr
+ */
+const char *get_iface_description_for_interface(capture_options *capture_opts, guint i);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
 
-#endif
+#endif /* __CAPTURE_UI_UTILS_H__ */