Back out infrastructure change. We missed supporting

stdin and pipes.




svn path=/trunk/; revision=39498

1 files changed, 0 insertions, 83 deletions

diff --git a/capture_opts.h b/capture_opts.h
index ed39f25f80..7778bf49af 100644
--- a/capture_opts.h
+++ b/capture_opts.h
@@ -73,66 +73,6 @@ typedef enum {
 } capture_sampling;
 #endif
 
-typedef enum {
-	IF_LOCAL,
-	IF_REMOTE,
-	IF_AIRPCAP
-} interface_type;
-
-#ifdef HAVE_PCAP_REMOTE
-struct remote_host {
-    gchar *remote_host;          /**< Host name or network address for remote capturing */
-    gchar *remote_port;          /**< TCP port of remote RPCAP server */
-    gint auth_type;              /**< Authentication type */
-    gchar *auth_username;        /**< Remote authentication parameters */
-    gchar *auth_password;        /**< Remote authentication parameters */
-    gboolean datatx_udp;
-    gboolean nocap_rpcap;
-    gboolean nocap_local;
-};
-
-typedef struct remote_options_tag {
-    capture_source src_type;
-    struct remote_host remote_host_opts;
-#ifdef HAVE_PCAP_SETSAMPLING
-    capture_sampling sampling_method;
-    int sampling_param;
-#endif
-} remote_options;
-#endif /* HAVE_PCAP_REMOTE */
-
-typedef struct interface_tag {
-    gchar *name;
-    gchar *display_name;
-    guint type;
-    gchar *addresses;
-    gint no_addresses;
-    gchar *cfilter;
-    GList *links;
-    gint active_dlt;
-    gboolean pmode;
-    gboolean has_snaplen;
-    guint snaplen;
-#if defined(_WIN32) || defined(HAVE_PCAP_CREATE)
-    gint buffer;
-    gboolean monitor_mode_enabled;
-    gboolean monitor_mode_supported;
-#endif
-#ifdef HAVE_PCAP_REMOTE
-    remote_options remote_opts;
-#endif
-    guint32     last_packets;
-    if_info_t   if_info;
-    gboolean    selected;
-    gboolean    hidden;
-    gboolean    locked;
-} interface_t;
-
-typedef struct link_row_tag {
-    gchar *name;
-    gint dlt;
-} link_row;
-
 typedef struct interface_options_tag {
     gchar *name;
     gchar *descr;
@@ -168,8 +108,6 @@ typedef struct capture_options_tag {
     void     *cf;                   /**< handle to cfile (note: untyped handle) */
     GArray   *ifaces;               /**< array of interfaces.
                                          Currently only used by dumpcap. */
-    GArray   *all_ifaces;
-    guint    num_selected;
     interface_options default_options;
     gboolean saving_to_file;        /**< TRUE if capture is writing to a file */
     gchar    *save_file;            /**< the capture file name */
@@ -252,25 +190,4 @@ capture_opts_trim_ring_num_files(capture_options *capture_opts);
 extern gboolean
 capture_opts_trim_iface(capture_options *capture_opts, const char *capture_device);
 
-extern void
-collect_ifaces(capture_options *capture_opts);
-
-typedef struct {
-    gboolean monitor_mode;
-    int linktype;
-} cap_settings_t;
-
-/** Get capture settings for interface
- *
- * @param if_name interface name
- */
-cap_settings_t
-capture_get_cap_settings (gchar *if_name);
-
-extern void 
-scan_local_interfaces(capture_options* capture_opts);
-
-int
-capture_opts_select_iface(capture_options *capture_opts, const char *optarg_str_p);
-
 #endif /* capture_opts.h */