add parameter dcerpc_info to PIDL_dissect_ipv?address()

[metze/wireshark/wip.git] / capture_ifinfo.h

diff --git a/capture_ifinfo.h b/capture_ifinfo.h
index 3ec2e511601277bf7107bf058eb54a14f2ea03fb..b19454f89980f1f5e5cf0fc1dbb153b1005059df 100644 (file)
--- a/capture_ifinfo.h
+++ b/capture_ifinfo.h
@@ -29,15 +29,32 @@
 extern "C" {
 #endif /* __cplusplus */
 
+typedef enum {
+       IF_WIRED,
+       IF_AIRPCAP,
+       IF_PIPE,
+       IF_STDIN,
+       IF_BLUETOOTH,
+       IF_WIRELESS,
+       IF_DIALUP,
+       IF_USB,
+       IF_VIRTUAL
+} interface_type;
+
 /*
  * The list of interfaces returned by "get_interface_list()" is
  * a list of these structures.
  */
 typedef struct {
        char    *name;          /* e.g. "eth0" */
-    char    *description;   /* vendor description from libpcap, e.g. "Realtek PCIe GBE Family Controller" or NULL */
-    char    *friendly_name; /* from OS, e.g. "Local Area Connection" */
+       char    *friendly_name; /* from OS, e.g. "Local Area Connection", or
+                                  NULL if not available */
+       char    *vendor_description;
+                               /* vendor description from pcap_findalldevs(),
+                                  e.g. "Realtek PCIe GBE Family Controller",
+                                  or NULL if not available */
        GSList  *addrs;         /* containing address values of if_addr_t */
+       interface_type type;    /* type of interface */
        gboolean loopback;      /* TRUE if loopback, FALSE otherwise */
 } if_info_t;
 
@@ -60,7 +77,7 @@ typedef struct {
 /**
  * Fetch the interface list from a child process.
  */
-extern GList *capture_interface_list(int *err, char **err_str);
+extern GList *capture_interface_list(int *err, char **err_str, void (*update_cb)(void));
 
 /* Error values from "get_interface_list()/capture_interface_list()". */
 #define        CANT_GET_INTERFACE_LIST 1       /* error getting list */
@@ -93,18 +110,12 @@ typedef struct {
  */
 extern if_capabilities_t *
 capture_get_if_capabilities(const char *devname, gboolean monitor_mode,
-                            char **err_str);
+                            char **err_str, void (*update_cb)(void));
 
 void free_if_capabilities(if_capabilities_t *caps);
 
 void add_interface_to_remote_list(if_info_t *if_info);
 
-/**
- * Get the type of an interface, given its name and description.
- */
-extern guint
-get_interface_type(gchar *name, gchar *description);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */