Added functionality for handling global profiles.

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

diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h
index ff37d5fb891a05bb6bbacc8193a80597366a28ff..79b424232a4bf8b82ab227a413f7c2d6406cfcf2 100644 (file)
--- a/epan/addr_resolv.h
+++ b/epan/addr_resolv.h
@@ -47,7 +47,7 @@ extern "C" {
 /*
  * Flag controlling what names to resolve.
  */
-WS_VAR_IMPORT guint32 g_resolv_flags;
+WS_VAR_IMPORT guint32 gbl_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
@@ -114,7 +114,7 @@ const gchar *se_get_addr_name(const address *addr);
 /* the result which is always NUL ('\0') terminated. The buffer should be large enough to */
 /* contain size characters including the terminator */
 
-void get_addr_name_buf(address *addr, gchar *buf, gsize size);
+void get_addr_name_buf(const address *addr, gchar *buf, gsize size);
 
 
 /*
@@ -138,11 +138,11 @@ extern gboolean 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 const gchar *get_hostname(guint addr);
+extern const gchar *get_hostname(const guint addr);
 
 /* get_hostname6 returns the host name, or numeric addr if not found */
 struct e_in6_addr;
-extern const gchar* get_hostname6(struct e_in6_addr *ad);
+extern const gchar* get_hostname6(const 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
@@ -171,22 +171,27 @@ extern guint8 *get_ether_addr(const gchar *name);
 guint32 get_ipxnet_addr(const gchar *name, gboolean *known);
 
 /* adds a hostname/IPv4 in the hash table */
-extern void add_ipv4_name(guint addr, const gchar *name);
+extern void add_ipv4_name(const guint addr, const gchar *name);
 
 /* adds a hostname/IPv6 in the hash table */
-extern void add_ipv6_name(struct e_in6_addr *addr, const gchar *name);
+extern void add_ipv6_name(const struct e_in6_addr *addr, const gchar *name);
+
+/* adds a hostname in the hash table */
+extern gboolean add_ip_name_from_string (const char *addr, const char *name);
 
 /* add ethernet address / name corresponding to IP address  */
-extern void add_ether_byip(guint ip, const guint8 *eth);
+extern void add_ether_byip(const guint ip, const guint8 *eth);
 
 /** Translates a string representing a hostname or dotted-decimal IPv4 address
  *  into a numeric IPv4 address value in network byte order. If compiled with
  *  c-ares, the request will wait a maximum of 250ms for the request to finish.
  *  Otherwise the wait time will be system-dependent, ususally much longer.
+ *  Immediately returns FALSE for hostnames if network name resolution is
+ *  disabled.
  *
  * @param[in] host The hostname.
  * @param[out] addrp The numeric IPv4 address in network byte order.
- * @return TRUE on success, FALSE on failure or timeout.
+ * @return TRUE on success, FALSE on failure, timeout.
  */
 gboolean get_host_ipaddr(const char *host, guint32 *addrp);
 
@@ -194,6 +199,8 @@ gboolean get_host_ipaddr(const char *host, guint32 *addrp);
  *  into a numeric IPv6 address value in network byte order. If compiled with
  *  c-ares, the request will wait a maximum of 250ms for the request to finish.
  *  Otherwise the wait time will be system-dependent, usually much longer.
+ *  Immediately returns FALSE for hostnames if network name resolution is
+ *  disabled.
  *
  * @param[in] host The hostname.
  * @param[out] addrp The numeric IPv6 address in network byte order.