From Lars Roland: add support for building a libethereal.dll with MSVC:

[obnox/wireshark/wip.git] / epan / resolv.h

diff --git a/epan/resolv.h b/epan/resolv.h
index 5613e11db360fdad96aa3d74a8fea07fef65750f..1eef0da6fca474faff40aecb06474ade907b3978 100644 (file)
--- a/epan/resolv.h
+++ b/epan/resolv.h
@@ -1,7 +1,7 @@
 /* resolv.h
  * Definitions for network object lookup
  *
- * $Id: resolv.h,v 1.13 2003/05/05 08:20:01 guy Exp $
+ * $Id: resolv.h,v 1.17 2004/05/09 10:03:40 guy Exp $
  *
  * Laurent Deniel <laurent.deniel@free.fr>
  *
@@ -34,7 +34,7 @@
 /*
  * Flag controlling what names to resolve.
  */
-extern guint32 g_resolv_flags;
+ETH_VAR_IMPORT guint32 g_resolv_flags;
 
 /* 32 types are sufficient (as are 640k of RAM) */
 /* FIXME: Maybe MANUF/m, IP/i, IP6/6, IPX/x, UDP+TCP/t etc would be
@@ -43,6 +43,9 @@ extern guint32 g_resolv_flags;
 #define RESOLV_MAC             0x1
 #define RESOLV_NETWORK         0x2
 #define RESOLV_TRANSPORT       0x4
+#define RESOLV_CONCURRENT      0x8
+
+#define RESOLV_ALL_ADDRS       (RESOLV_MAC|RESOLV_NETWORK|RESOLV_TRANSPORT)
 #define RESOLV_ALL             0xFFFFFFFF
 
 /* global variables */
@@ -58,13 +61,13 @@ extern gchar *g_pipxnets_path;
 extern void resolv_set_flags(guint32 flags);
 
 /* get_tcp_port returns the UDP port name or "%u" if not found */
-extern guchar *get_udp_port(guint port);
+extern gchar *get_udp_port(guint port);
 
 /* get_tcp_port returns the TCP port name or "%u" if not found */
-extern guchar *get_tcp_port(guint port);
+extern gchar *get_tcp_port(guint port);
 
 /* get_sctp_port returns the SCTP port name or "%u" if not found */
-extern guchar *get_sctp_port(guint port);
+extern gchar *get_sctp_port(guint port);
 
 /*
  * Asynchronous host name lookup initialization, processing, and cleanup
@@ -81,37 +84,37 @@ extern gint host_name_lookup_process(gpointer data);
 extern void host_name_lookup_cleanup(void);
 
 /* get_hostname returns the host name or "%d.%d.%d.%d" if not found */
-extern guchar *get_hostname(guint addr);
+extern gchar *get_hostname(guint addr);
 
 /* get_hostname6 returns the host name, or numeric addr if not found */
 struct e_in6_addr;
-const guchar* get_hostname6(struct e_in6_addr *ad);
+const gchar* get_hostname6(struct e_in6_addr *ad);
 
 /* get_ether_name returns the logical name if found in ethers files else
    "<vendor>_%02x:%02x:%02x" if the vendor code is known else
    "%02x:%02x:%02x:%02x:%02x:%02x" */
-extern guchar *get_ether_name(const guint8 *addr);
+extern gchar *get_ether_name(const guint8 *addr);
 
 /* get_ether_name returns the logical name if found in ethers files else NULL */
-extern guchar *get_ether_name_if_known(const guint8 *addr);
+extern gchar *get_ether_name_if_known(const guint8 *addr);
 
 /* get_manuf_name returns the vendor name or "%02x:%02x:%02x" if not known */
-extern const guchar *get_manuf_name(const guint8 *addr);
+extern const gchar *get_manuf_name(const guint8 *addr);
 
 /* get_ipxnet_name returns the logical name if found in an ipxnets file,
  * or a string formatted with "%X" if not */
-extern const guchar *get_ipxnet_name(const guint32 addr);
+extern const gchar *get_ipxnet_name(const guint32 addr);
 
 /* returns the ethernet address corresponding to name or NULL if not known */
-extern guint8 *get_ether_addr(const guchar *name);
+extern guint8 *get_ether_addr(const gchar *name);
 
 /* returns the ipx network corresponding to name. If name is unknown,
  * 0 is returned and 'known' is set to FALSE. On success, 'known'
  * is set to TRUE. */
-guint32 get_ipxnet_addr(const guchar *name, gboolean *known);
+guint32 get_ipxnet_addr(const gchar *name, gboolean *known);
 
 /* adds a hostname/IP in the hash table */
-extern void add_host_name(guint addr, const guchar *name);
+extern void add_host_name(guint addr, const gchar *name);
 
 /* add ethernet address / name corresponding to IP address  */
 extern void add_ether_byip(guint ip, const guint8 *eth);