*
* Laurent Deniel <laurent.deniel@free.fr>
*
- * 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
#include <signal.h>
#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h> /* needed to define AF_ values on UNIX */
+#include <sys/socket.h> /* needed to define AF_ values on UNIX */
#endif
#ifdef HAVE_WINSOCK2_H
-#include <winsock2.h> /* needed to define AF_ values on Windows */
-#endif
-
-#ifdef AVOID_DNS_TIMEOUT
-# include <setjmp.h>
+#include <winsock2.h> /* needed to define AF_ values on Windows */
#endif
#ifdef NEED_INET_ATON_H
# include "inet_v6defs.h"
#endif
-#ifdef HAVE_GNU_ADNS
-# include <errno.h>
-# include <adns.h>
-#endif
-
#if defined(_WIN32) && defined(INET6)
# include <ws2tcpip.h>
#endif
+#ifdef HAVE_C_ARES
+# if defined(_WIN32) && !defined(INET6)
+# define socklen_t unsigned int
+# endif
+# include <ares.h>
+# include <ares_version.h>
+#else
+# ifdef HAVE_GNU_ADNS
+# include <errno.h>
+# include <adns.h>
+# if defined(inet_aton) && defined(_WIN32)
+# undef inet_aton
+# endif
+# endif /* HAVE_GNU_ADNS */
+#endif /* HAVE_C_ARES */
+
+
#include <glib.h>
#include "report_err.h"
#include "ipv6-utils.h"
#include "addr_resolv.h"
#include "filesystem.h"
-#include <epan/prefs.h>
-#define ENAME_HOSTS "hosts"
-#define ENAME_ETHERS "ethers"
-#define ENAME_IPXNETS "ipxnets"
-#define ENAME_MANUF "manuf"
-
-#define MAXMANUFLEN 9 /* max vendor name length with ending '\0' */
-#define HASHETHSIZE 1024
-#define HASHHOSTSIZE 1024
-#define HASHIPXNETSIZE 256
+#include <epan/strutil.h>
+#include <wsutil/file_util.h>
+#include <epan/prefs.h>
+#include <epan/emem.h>
+
+#define ENAME_HOSTS "hosts"
+#define ENAME_SUBNETS "subnets"
+#define ENAME_ETHERS "ethers"
+#define ENAME_IPXNETS "ipxnets"
+#define ENAME_MANUF "manuf"
+#define ENAME_SERVICES "services"
+
+#define MAXMANUFLEN 9 /* max vendor name length with ending '\0' */
+#define HASHETHSIZE 2048
+#define HASHHOSTSIZE 2048
+#define HASHIPXNETSIZE 256
#define HASHMANUFSIZE 256
-#define HASHPORTSIZE 256
+#define HASHPORTSIZE 256
+#define SUBNETLENGTHSIZE 32 /*1-32 inc.*/
/* hash table used for IPv4 lookup */
-#define HASH_IPV4_ADDRESS(addr) ((addr) & (HASHHOSTSIZE - 1))
+#define HASH_IPV4_ADDRESS(addr) (g_htonl(addr) & (HASHHOSTSIZE - 1))
typedef struct hashipv4 {
- guint addr;
- gchar name[MAXNAMELEN];
- gboolean is_dummy_entry; /* name is IPv4 address in dot format */
- struct hashipv4 *next;
+ guint addr;
+ gboolean is_dummy_entry; /* name is IPv4 address in dot format */
+ gboolean resolve; /* already tried to resolve it */
+ struct hashipv4 *next;
+ gchar ip[16];
+ gchar name[MAXNAMELEN];
} hashipv4_t;
/* hash table used for IPv6 lookup */
-#define HASH_IPV6_ADDRESS(addr) \
- ((((addr).s6_addr8[14] << 8)|((addr).s6_addr8[15])) & (HASHHOSTSIZE - 1))
+#define HASH_IPV6_ADDRESS(addr) \
+ ((((addr).bytes[14] << 8)|((addr).bytes[15])) & (HASHHOSTSIZE - 1))
typedef struct hashipv6 {
- struct e_in6_addr addr;
- gchar name[MAXNAMELEN];
- gboolean is_dummy_entry; /* name is IPv6 address in colon format */
- struct hashipv6 *next;
+ struct e_in6_addr addr;
+ gboolean is_dummy_entry; /* name is IPv6 address in colon format */
+ gboolean resolve; /* */
+ struct hashipv6 *next;
+ gchar ip6[47]; /* XX */
+ gchar name[MAXNAMELEN];
} hashipv6_t;
+/* Array of entries of subnets of different lengths */
+typedef struct {
+ gsize mask_length; /*1-32*/
+ guint32 mask; /* e.g. 255.255.255.*/
+ hashipv4_t** subnet_addresses; /* Hash table of subnet addresses */
+} subnet_length_entry_t;
+
/* hash table used for TCP/UDP/SCTP port lookup */
-#define HASH_PORT(port) ((port) & (HASHPORTSIZE - 1))
+#define HASH_PORT(port) ((port) & (HASHPORTSIZE - 1))
typedef struct hashport {
- guint16 port;
- gchar name[MAXNAMELEN];
- struct hashport *next;
+ guint16 port;
+ struct hashport *next;
+ gchar name[MAXNAMELEN];
} hashport_t;
/* hash table used for IPX network lookup */
/* XXX - check goodness of hash function */
-#define HASH_IPX_NET(net) ((net) & (HASHIPXNETSIZE - 1))
+#define HASH_IPX_NET(net) ((net) & (HASHIPXNETSIZE - 1))
typedef struct hashipxnet {
- guint addr;
- gchar name[MAXNAMELEN];
- struct hashipxnet *next;
+ guint addr;
+ struct hashipxnet *next;
+ gchar name[MAXNAMELEN];
} hashipxnet_t;
/* hash tables used for ethernet and manufacturer lookup */
#define HASH_ETH_ADDRESS(addr) \
- (((((addr)[2] << 8) | (addr)[3]) ^ (((addr)[4] << 8) | (addr)[5])) & \
- (HASHETHSIZE - 1))
+ (((((addr)[2] << 8) | (addr)[3]) ^ (((addr)[4] << 8) | (addr)[5])) & \
+ (HASHETHSIZE - 1))
#define HASH_ETH_MANUF(addr) (((int)(addr)[2]) & (HASHMANUFSIZE - 1))
typedef struct hashmanuf {
- guint8 addr[3];
- char name[MAXMANUFLEN];
- struct hashmanuf *next;
+ guint8 addr[3];
+ struct hashmanuf *next;
+ char name[MAXMANUFLEN];
} hashmanuf_t;
typedef struct hashether {
- guint8 addr[6];
- char name[MAXNAMELEN];
- gboolean is_dummy_entry; /* not a complete entry */
- struct hashether *next;
+ guint8 addr[6];
+ gboolean is_dummy_entry; /* not a complete entry */
+ gboolean resolve; /* */
+ struct hashether *next;
+ char hexa[6*3];
+ char name[MAXNAMELEN];
} hashether_t;
/* internal ethernet type */
typedef struct _ether
{
- guint8 addr[6];
- char name[MAXNAMELEN];
+ guint8 addr[6];
+ char name[MAXNAMELEN];
} ether_t;
/* internal ipxnet type */
typedef struct _ipxnet
{
- guint addr;
- char name[MAXNAMELEN];
+ guint addr;
+ char name[MAXNAMELEN];
} ipxnet_t;
-static hashipv4_t *ipv4_table[HASHHOSTSIZE];
-static hashipv6_t *ipv6_table[HASHHOSTSIZE];
-static hashport_t *udp_port_table[HASHPORTSIZE];
-static hashport_t *tcp_port_table[HASHPORTSIZE];
-static hashport_t *sctp_port_table[HASHPORTSIZE];
-static hashether_t *eth_table[HASHETHSIZE];
-static hashmanuf_t *manuf_table[HASHMANUFSIZE];
-static hashether_t *(*wka_table[48])[HASHETHSIZE];
-static hashipxnet_t *ipxnet_table[HASHIPXNETSIZE];
+static hashipv4_t *ipv4_table[HASHHOSTSIZE];
+static hashipv6_t *ipv6_table[HASHHOSTSIZE];
+
+static hashport_t **cb_port_table;
+static gchar *cb_service;
+
+static hashport_t *udp_port_table[HASHPORTSIZE];
+static hashport_t *tcp_port_table[HASHPORTSIZE];
+static hashport_t *sctp_port_table[HASHPORTSIZE];
+static hashport_t *dccp_port_table[HASHPORTSIZE];
+static hashether_t *eth_table[HASHETHSIZE];
+static hashmanuf_t *manuf_table[HASHMANUFSIZE];
+static hashether_t *(*wka_table[48])[HASHETHSIZE];
+static hashipxnet_t *ipxnet_table[HASHIPXNETSIZE];
-static int eth_resolution_initialized = 0;
-static int ipxnet_resolution_initialized = 0;
+static subnet_length_entry_t subnet_length_entries[SUBNETLENGTHSIZE]; /* Ordered array of entries */
+static gboolean have_subnet_entry = FALSE;
+
+static int eth_resolution_initialized = 0;
+static int ipxnet_resolution_initialized = 0;
+static int service_resolution_initialized = 0;
static hashether_t *add_eth_name(const guint8 *addr, const gchar *name);
+static void add_serv_port_cb(guint32 port);
/*
* Flag controlling what names to resolve.
* GUI code to change them.
*/
-gchar *g_ethers_path = NULL; /* global ethers file */
-gchar *g_pethers_path = NULL; /* personal ethers file */
-gchar *g_ipxnets_path = NULL; /* global ipxnets file */
-gchar *g_pipxnets_path = NULL; /* personal ipxnets file */
- /* first resolving call */
+gchar *g_ethers_path = NULL; /* global ethers file */
+gchar *g_pethers_path = NULL; /* personal ethers file */
+gchar *g_ipxnets_path = NULL; /* global ipxnets file */
+gchar *g_pipxnets_path = NULL; /* personal ipxnets file */
+gchar *g_services_path = NULL; /* global services file */
+gchar *g_pservices_path = NULL; /* personal services file */
+ /* first resolving call */
-/* GNU ADNS */
+/* c-ares */
+#ifdef HAVE_C_ARES
+/*
+ * Submitted queries trigger a callback (c_ares_ghba_cb()).
+ * Queries are added to c_ares_queue_head. During processing, queries are
+ * popped off the front of c_ares_queue_head and submitted using
+ * ares_gethostbyaddr().
+ * The callback processes the response, then frees the request.
+ */
+#define ASYNC_DNS
+ares_channel alchan;
-#ifdef HAVE_GNU_ADNS
+typedef struct _async_dns_queue_msg
+{
+ union {
+ guint32 ip4;
+ struct e_in6_addr ip6;
+ } addr;
+ int family;
+} async_dns_queue_msg_t;
+
+#if ( ( ARES_VERSION_MAJOR < 1 ) \
+ || ( 1 == ARES_VERSION_MAJOR && ARES_VERSION_MINOR < 5 ) )
+static void c_ares_ghba_cb(void *arg, int status, struct hostent *hostent);
+#else
+static void c_ares_ghba_cb(void *arg, int status, int timeouts _U_, struct hostent *hostent);
+#endif
-static gboolean gnu_adns_initialized = FALSE;
+#else
+/* GNU ADNS */
+#ifdef HAVE_GNU_ADNS
+#define ASYNC_DNS
+/*
+ * Submitted queries have to be checked individually using adns_check().
+ * Queries are added to adns_queue_head. During processing, the list is
+ * iterated twice: once to request queries up to the concurrency limit,
+ * and once to check the status of each query.
+ */
adns_state ads;
-int adns_currently_queued = 0;
-
-typedef struct _adns_queue_msg
+typedef struct _async_dns_queue_msg
{
gboolean submitted;
guint32 ip4_addr;
- struct e_in6_addr ip6_addr;
int type;
adns_query query;
-} adns_queue_msg_t;
-
-GList *adns_queue_head = NULL;
+} async_dns_queue_msg_t;
#endif /* HAVE_GNU_ADNS */
+#endif /* HAVE_C_ARES */
+#ifdef ASYNC_DNS
+static gboolean async_dns_initialized = FALSE;
+static int async_dns_in_flight = 0;
+static GList *async_dns_queue_head = NULL;
+
+/* push a dns request */
+static void
+add_async_dns_ipv4(int type, guint32 addr)
+{
+ async_dns_queue_msg_t *msg;
+
+ msg = g_malloc(sizeof(async_dns_queue_msg_t));
+#ifdef HAVE_C_ARES
+ msg->family = type;
+ msg->addr.ip4 = addr;
+#else
+ msg->type = type;
+ msg->ip4_addr = addr;
+ msg->submitted = FALSE;
+#endif
+ async_dns_queue_head = g_list_append(async_dns_queue_head, (gpointer) msg);
+}
+
+#endif
+
+typedef struct {
+ guint32 mask;
+ gsize mask_length;
+ const gchar* name; /* Shallow copy */
+} subnet_entry_t;
+
+/*
+ * Miscellaneous functions
+ */
+
+static int fgetline(char **buf, int *size, FILE *fp)
+{
+ int len;
+ int c;
+
+ if (fp == NULL || buf == NULL)
+ return -1;
+
+ if (*buf == NULL) {
+ if (*size == 0)
+ *size = BUFSIZ;
+
+ *buf = g_malloc(*size);
+ }
+
+ g_assert(*buf);
+ g_assert(*size > 0);
+
+ if (feof(fp))
+ return -1;
+
+ len = 0;
+ while ((c = getc(fp)) != EOF && c != '\r' && c != '\n') {
+ if (len+1 >= *size) {
+ *buf = g_realloc(*buf, *size += BUFSIZ);
+ }
+ (*buf)[len++] = c;
+ }
+
+ if (len == 0 && c == EOF)
+ return -1;
+
+ (*buf)[len] = '\0';
+
+ return len;
+
+} /* fgetline */
+
/*
* Local function definitions
*/
+static subnet_entry_t subnet_lookup(const guint32 addr);
+static void subnet_entry_set(guint32 subnet_addr, guint32 mask_length, const gchar* name);
+
+
+static void add_service_name(hashport_t **proto_table, guint port, const char *service_name)
+{
+ int hash_idx;
+ hashport_t *tp;
+
+
+ hash_idx = HASH_PORT(port);
+ tp = proto_table[hash_idx];
+
+ if( tp == NULL ) {
+ tp = proto_table[hash_idx] = (hashport_t *)g_malloc(sizeof(hashport_t));
+ } else {
+ while(1) {
+ if( tp->port == port ) {
+ return;
+ }
+ if (tp->next == NULL) {
+ tp->next = (hashport_t *)g_malloc(sizeof(hashport_t));
+ tp = tp->next;
+ break;
+ }
+ tp = tp->next;
+ }
+ }
+
+ /* fill in a new entry */
+ tp->port = port;
+ tp->next = NULL;
+
+ g_strlcpy(tp->name, service_name, MAXNAMELEN);
+}
+
+
+static void parse_service_line (char *line)
+{
+ /*
+ * See the services(4) or services(5) man page for services file format
+ * (not available on all systems).
+ */
+
+ gchar *cp;
+ gchar *service;
+ gchar *port;
+
+ range_t *port_rng = NULL;
+ guint32 max_port = MAX_UDP_PORT;
+
+ if ((cp = strchr(line, '#')))
+ *cp = '\0';
+
+ if ((cp = strtok(line, " \t")) == NULL)
+ return;
+
+ service = cp;
+
+ if ((cp = strtok(NULL, " \t")) == NULL)
+ return;
+
+ port = cp;
+
+ if ((cp = strtok(cp, "/")) == NULL)
+ return;
+
+ if ((cp = strtok(NULL, "/")) == NULL)
+ return;
+
+ /* seems we got all interesting things from the file */
+ if(strcmp(cp, "tcp") == 0) {
+ max_port = MAX_TCP_PORT;
+ cb_port_table = tcp_port_table;
+ }
+ else if(strcmp(cp, "udp") == 0) {
+ max_port = MAX_UDP_PORT;
+ cb_port_table = udp_port_table;
+ }
+ else if(strcmp(cp, "sctp") == 0) {
+ max_port = MAX_SCTP_PORT;
+ cb_port_table = sctp_port_table;
+ }
+ else if(strcmp(cp, "dccp") == 0) {
+ max_port = MAX_DCCP_PORT;
+ cb_port_table = dccp_port_table;
+ } else {
+ return;
+ }
+
+ if(CVT_NO_ERROR != range_convert_str(&port_rng, port, max_port) ) {
+ /* some assertion here? */
+ return;
+ }
+
+ cb_service = service;
+ range_foreach(port_rng, add_serv_port_cb);
+ g_free (port_rng);
+} /* parse_service_line */
+
+
+static void
+add_serv_port_cb(guint32 port)
+{
+ if ( port ) {
+ add_service_name(cb_port_table, port, cb_service);
+ }
+}
+
+
+static void parse_services_file(const char * path)
+{
+ FILE *serv_p;
+ static int size = 0;
+ static char *buf = NULL;
+
+ /* services hash table initialization */
+ serv_p = ws_fopen(path, "r");
+
+ if (serv_p == NULL)
+ return;
+
+ while (fgetline(&buf, &size, serv_p) >= 0) {
+ parse_service_line (buf);
+ }
+
+ fclose(serv_p);
+}
+
+static void initialize_services(void)
+{
+
+ /* the hash table won't ignore duplicates, so use the personal path first */
+
+ /* set personal services path */
+ if (g_pservices_path == NULL)
+ g_pservices_path = get_persconffile_path(ENAME_SERVICES, FALSE, FALSE);
+
+ parse_services_file(g_pservices_path);
+
+ /* Compute the pathname of the services file. */
+ if (g_services_path == NULL) {
+ g_services_path = get_datafile_path(ENAME_SERVICES);
+ }
+
+ parse_services_file(g_services_path);
+
+} /* initialize_services */
+
+
static gchar *serv_name_lookup(guint port, port_type proto)
{
int hash_idx;
hashport_t *tp;
hashport_t **table;
- char *serv_proto = NULL;
+ const char *serv_proto = NULL;
struct servent *servp;
+
+ if (!service_resolution_initialized) {
+ initialize_services();
+ service_resolution_initialized = 1;
+ }
+
switch(proto) {
case PT_UDP:
table = udp_port_table;
table = sctp_port_table;
serv_proto = "sctp";
break;
+ case PT_DCCP:
+ table = dccp_port_table;
+ serv_proto = "dcp";
+ break;
default:
/* not yet implemented */
return NULL;
/*NOTREACHED*/
- break;
} /* proto */
hash_idx = HASH_PORT(port);
} else {
while(1) {
if( tp->port == port ) {
- return tp->name;
+ return tp->name;
}
if (tp->next == NULL) {
- tp->next = (hashport_t *)g_malloc(sizeof(hashport_t));
- tp = tp->next;
- break;
+ tp->next = (hashport_t *)g_malloc(sizeof(hashport_t));
+ tp = tp->next;
+ break;
}
tp = tp->next;
}
if (!(g_resolv_flags & RESOLV_TRANSPORT) ||
(servp = getservbyport(g_htons(port), serv_proto)) == NULL) {
/* unknown port */
- sprintf(tp->name, "%d", port);
+ g_snprintf(tp->name, MAXNAMELEN, "%d", port);
} else {
- strncpy(tp->name, servp->s_name, MAXNAMELEN);
- tp->name[MAXNAMELEN-1] = '\0';
+ g_strlcpy(tp->name, servp->s_name, MAXNAMELEN);
}
return (tp->name);
} /* serv_name_lookup */
-#ifdef AVOID_DNS_TIMEOUT
+/* Fill in an IP4 structure with info from subnets file or just with the
+ * string form of the address.
+ */
+static void fill_dummy_ip4(guint addr, hashipv4_t* volatile tp)
+{
+ subnet_entry_t subnet_entry;
+
+ if (tp->is_dummy_entry)
+ return; /* already done */
+
+ tp->is_dummy_entry = TRUE; /* Overwrite if we get async DNS reply */
+
+ /* Do we have a subnet for this address? */
+ subnet_entry = subnet_lookup(addr);
+ if(0 != subnet_entry.mask) {
+ /* Print name, then '.' then IP address after subnet mask */
+ guint32 host_addr;
+ gchar buffer[MAX_IP_STR_LEN];
+ gchar* paddr;
+ gsize i;
+
+ host_addr = addr & (~(guint32)subnet_entry.mask);
+ ip_to_str_buf((guint8 *)&host_addr, buffer, MAX_IP_STR_LEN);
+ paddr = buffer;
+
+ /* Skip to first octet that is not totally masked
+ * If length of mask is 32, we chomp the whole address.
+ * If the address string starts '.' (should not happen?),
+ * we skip that '.'.
+ */
+ i = subnet_entry.mask_length / 8;
+ while(*(paddr) != '\0' && i > 0) {
+ if(*(++paddr) == '.') {
+ --i;
+ }
+ }
-#define DNS_TIMEOUT 2 /* max sec per call */
+ /* There are more efficient ways to do this, but this is safe if we
+ * trust g_snprintf and MAXNAMELEN
+ */
+ g_snprintf(tp->name, MAXNAMELEN, "%s%s", subnet_entry.name, paddr);
+ } else {
+ ip_to_str_buf((guint8 *)&addr, tp->name, MAXNAMELEN);
+ }
+}
-jmp_buf hostname_env;
+#ifdef HAVE_C_ARES
-static void abort_network_query(int sig _U_)
+static void
+#if ( ( ARES_VERSION_MAJOR < 1 ) \
+ || ( 1 == ARES_VERSION_MAJOR && ARES_VERSION_MINOR < 5 ) )
+c_ares_ghba_cb(void *arg, int status, struct hostent *he) {
+#else
+c_ares_ghba_cb(void *arg, int status, int timeouts _U_, struct hostent *he) {
+#endif
+ async_dns_queue_msg_t *caqm = arg;
+ char **p;
+
+ if (!caqm) return;
+ async_dns_in_flight--;
+
+ if (status == ARES_SUCCESS) {
+ for (p = he->h_addr_list; *p != NULL; p++) {
+ switch(caqm->family) {
+ case AF_INET:
+ add_ipv4_name(caqm->addr.ip4, he->h_name);
+ break;
+ case AF_INET6:
+ add_ipv6_name(&caqm->addr.ip6, he->h_name);
+ break;
+ default:
+ /* Throw an exception? */
+ break;
+ }
+ }
+ }
+ g_free(caqm);
+}
+#endif /* HAVE_C_ARES */
+
+/* --------------- */
+static hashipv4_t *new_ipv4(guint addr)
{
- longjmp(hostname_env, 1);
+ hashipv4_t *tp = g_malloc(sizeof(hashipv4_t));
+ tp->addr = addr;
+ tp->next = NULL;
+ tp->resolve = FALSE;
+ tp->is_dummy_entry = FALSE;
+ ip_to_str_buf((guint8 *)&addr, tp->ip, sizeof(tp->ip));
+ return tp;
}
-#endif /* AVOID_DNS_TIMEOUT */
-static gchar *host_name_lookup(guint addr, gboolean *found)
+static hashipv4_t *host_lookup(guint addr, gboolean resolve, gboolean *found)
{
int hash_idx;
hashipv4_t * volatile tp;
struct hostent *hostp;
-#ifdef HAVE_GNU_ADNS
- adns_queue_msg_t *qmsg;
-#endif
*found = TRUE;
tp = ipv4_table[hash_idx];
if( tp == NULL ) {
- tp = ipv4_table[hash_idx] = (hashipv4_t *)g_malloc(sizeof(hashipv4_t));
+ tp = ipv4_table[hash_idx] = new_ipv4(addr);
} else {
while(1) {
if( tp->addr == addr ) {
- if (tp->is_dummy_entry)
- *found = FALSE;
- return tp->name;
+ if (tp->is_dummy_entry && !tp->resolve)
+ break;
+ if (tp->is_dummy_entry)
+ *found = FALSE;
+ return tp;
}
if (tp->next == NULL) {
- tp->next = (hashipv4_t *)g_malloc(sizeof(hashipv4_t));
- tp = tp->next;
- break;
+ tp->next = new_ipv4(addr);
+ tp = tp->next;
+ break;
}
tp = tp->next;
}
}
- /* fill in a new entry */
- tp->addr = addr;
- tp->next = NULL;
-
-#ifdef HAVE_GNU_ADNS
- if ((g_resolv_flags & RESOLV_CONCURRENT) &&
+ if (resolve) {
+ tp->resolve = TRUE;
+#ifdef ASYNC_DNS
+ if ((g_resolv_flags & RESOLV_CONCURRENT) &&
prefs.name_resolve_concurrency > 0 &&
- gnu_adns_initialized) {
- qmsg = g_malloc(sizeof(adns_queue_msg_t));
- qmsg->type = AF_INET;
- qmsg->ip4_addr = addr;
- qmsg->submitted = FALSE;
- adns_queue_head = g_list_append(adns_queue_head, (gpointer) qmsg);
-
- tp->is_dummy_entry = TRUE;
- ip_to_str_buf((guint8 *)&addr, tp->name);
- return tp->name;
+ async_dns_initialized) {
+ add_async_dns_ipv4(AF_INET, addr);
+ /* XXX found is set to TRUE, which seems a bit odd, but I'm not
+ * going to risk changing the semantics.
+ */
+ fill_dummy_ip4(addr, tp);
+ return tp;
}
-#endif /* HAVE_GNU_ADNS */
+#endif /* ASYNC_DNS */
/*
* The Windows "gethostbyaddr()" insists on translating 0.0.0.0 to
* else call gethostbyaddr and hope for the best
*/
-# ifdef AVOID_DNS_TIMEOUT
-
- /* Quick hack to avoid DNS/YP timeout */
-
- if (!setjmp(hostname_env)) {
- signal(SIGALRM, abort_network_query);
- alarm(DNS_TIMEOUT);
-# endif /* AVOID_DNS_TIMEOUT */
-
hostp = gethostbyaddr((char *)&addr, 4, AF_INET);
-# ifdef AVOID_DNS_TIMEOUT
- alarm(0);
-# endif /* AVOID_DNS_TIMEOUT */
-
if (hostp != NULL) {
- strncpy(tp->name, hostp->h_name, MAXNAMELEN);
- tp->name[MAXNAMELEN-1] = '\0';
- tp->is_dummy_entry = FALSE;
- return tp->name;
+ g_strlcpy(tp->name, hostp->h_name, MAXNAMELEN);
+ tp->is_dummy_entry = FALSE;
+ return tp;
}
-
-# ifdef AVOID_DNS_TIMEOUT
- }
-# endif /* AVOID_DNS_TIMEOUT */
-
}
/* unknown host or DNS timeout */
- ip_to_str_buf((guint8 *)&addr, tp->name);
- tp->is_dummy_entry = TRUE;
+ }
+
*found = FALSE;
- return (tp->name);
+ fill_dummy_ip4(addr, tp);
+ return tp;
} /* host_name_lookup */
-static gchar *host_name_lookup6(struct e_in6_addr *addr, gboolean *found)
+static gchar *host_name_lookup(guint addr, gboolean *found)
+{
+ hashipv4_t *tp;
+ tp = host_lookup(addr, TRUE, found);
+ return tp->name;
+}
+
+
+/* --------------- */
+static hashipv6_t *new_ipv6(const struct e_in6_addr *addr)
+{
+ hashipv6_t *tp = g_malloc(sizeof(hashipv6_t));
+ tp->addr = *addr;
+ tp->next = NULL;
+ tp->resolve = FALSE;
+ tp->is_dummy_entry = FALSE;
+ ip6_to_str_buf(addr, tp->ip6);
+ return tp;
+}
+
+/* ------------------------------------ */
+static hashipv6_t *host_lookup6(const struct e_in6_addr *addr, gboolean resolve, gboolean *found)
{
int hash_idx;
hashipv6_t * volatile tp;
#ifdef INET6
+#ifdef HAVE_C_ARES
+ async_dns_queue_msg_t *caqm;
+#endif /* HAVE_C_ARES */
struct hostent *hostp;
#endif
tp = ipv6_table[hash_idx];
if( tp == NULL ) {
- tp = ipv6_table[hash_idx] = (hashipv6_t *)g_malloc(sizeof(hashipv6_t));
+ tp = ipv6_table[hash_idx] = new_ipv6(addr);
} else {
while(1) {
if( memcmp(&tp->addr, addr, sizeof (struct e_in6_addr)) == 0 ) {
- if (tp->is_dummy_entry)
- *found = FALSE;
- return tp->name;
+ if (tp->is_dummy_entry && !tp->resolve)
+ break;
+ if (tp->is_dummy_entry)
+ *found = FALSE;
+ return tp;
}
if (tp->next == NULL) {
- tp->next = (hashipv6_t *)g_malloc(sizeof(hashipv6_t));
- tp = tp->next;
- break;
+ tp->next = new_ipv6(addr);
+ tp = tp->next;
+ break;
}
tp = tp->next;
}
}
- /* fill in a new entry */
- tp->addr = *addr;
- tp->next = NULL;
-
+ if (resolve) {
+ tp->resolve = TRUE;
#ifdef INET6
- if (g_resolv_flags & RESOLV_NETWORK) {
-#ifdef AVOID_DNS_TIMEOUT
- /* Quick hack to avoid DNS/YP timeout */
+#ifdef HAVE_C_ARES
+ if ((g_resolv_flags & RESOLV_CONCURRENT) &&
+ prefs.name_resolve_concurrency > 0 &&
+ async_dns_initialized) {
+ caqm = g_malloc(sizeof(async_dns_queue_msg_t));
+ caqm->family = AF_INET6;
+ memcpy(&caqm->addr.ip6, addr, sizeof(caqm->addr.ip6));
+ async_dns_queue_head = g_list_append(async_dns_queue_head, (gpointer) caqm);
+
+ /* XXX found is set to TRUE, which seems a bit odd, but I'm not
+ * going to risk changing the semantics.
+ */
+ if (!tp->is_dummy_entry) {
+ strcpy(tp->name, tp->ip6);
+ ip6_to_str_buf(addr, tp->name);
+ tp->is_dummy_entry = TRUE;
+ }
+ return tp;
+ }
+#endif /* HAVE_C_ARES */
- if (!setjmp(hostname_env)) {
- signal(SIGALRM, abort_network_query);
- alarm(DNS_TIMEOUT);
-#endif /* AVOID_DNS_TIMEOUT */
+ /* Quick hack to avoid DNS/YP timeout */
hostp = gethostbyaddr((char *)addr, sizeof(*addr), AF_INET6);
-#ifdef AVOID_DNS_TIMEOUT
- alarm(0);
-# endif /* AVOID_DNS_TIMEOUT */
if (hostp != NULL) {
- strncpy(tp->name, hostp->h_name, MAXNAMELEN);
- tp->name[MAXNAMELEN-1] = '\0';
- tp->is_dummy_entry = FALSE;
- return tp->name;
+ g_strlcpy(tp->name, hostp->h_name, MAXNAMELEN);
+ tp->is_dummy_entry = FALSE;
+ return tp;
}
-
-#ifdef AVOID_DNS_TIMEOUT
- }
-# endif /* AVOID_DNS_TIMEOUT */
-
+#endif /* INET6 */
}
/* unknown host or DNS timeout */
-#endif /* INET6 */
- ip6_to_str_buf(addr, tp->name);
- tp->is_dummy_entry = TRUE;
+ if (!tp->is_dummy_entry) {
+ tp->is_dummy_entry = TRUE;
+ strcpy(tp->name, tp->ip6);
+ }
*found = FALSE;
- return (tp->name);
+ return tp;
-} /* host_name_lookup6 */
+} /* host_lookup6 */
-/*
- * Miscellaneous functions
- */
+#if 0
+static gchar *host_name_lookup6(struct e_in6_addr *addr, gboolean *found)
+{
+ hashipv6_t *tp;
+ tp = host_lookup6(addr, TRUE, found);
+ return tp->name;
+}
+#endif
-static int fgetline(char **buf, int *size, FILE *fp)
+static const gchar *solve_address_to_name(const address *addr)
{
- int len;
- int c;
+ switch (addr->type) {
- if (fp == NULL)
- return -1;
+ case AT_ETHER:
+ return get_ether_name(addr->data);
- if (*buf == NULL) {
- if (*size == 0)
- *size = BUFSIZ;
+ case AT_IPv4: {
+ guint32 ipv4_addr;
+ memcpy(&ipv4_addr, addr->data, sizeof ipv4_addr);
+ return get_hostname(ipv4_addr);
+ }
- if ((*buf = g_malloc(*size)) == NULL)
- return -1;
+ case AT_IPv6: {
+ struct e_in6_addr ipv6_addr;
+ memcpy(&ipv6_addr.bytes, addr->data, sizeof ipv6_addr.bytes);
+ return get_hostname6(&ipv6_addr);
}
- if (feof(fp))
- return -1;
+ case AT_STRINGZ:
+ return addr->data;
- len = 0;
- while ((c = getc(fp)) != EOF && c != '\n') {
- if (len+1 >= *size) {
- if ((*buf = g_realloc(*buf, *size += BUFSIZ)) == NULL)
- return -1;
- }
- (*buf)[len++] = c;
+ default:
+ return NULL;
}
+}
- if (len == 0 && c == EOF)
- return -1;
+static const gchar *se_solve_address_to_name(const address *addr)
+{
+ switch (addr->type) {
- (*buf)[len] = '\0';
+ case AT_ETHER:
+ return get_ether_name(addr->data);
- return len;
+ case AT_IPv4: {
+ guint32 ipv4_addr;
+ memcpy(&ipv4_addr, addr->data, sizeof ipv4_addr);
+ return get_hostname(ipv4_addr);
+ }
-} /* fgetline */
+ case AT_IPv6: {
+ struct e_in6_addr ipv6_addr;
+ memcpy(&ipv6_addr.bytes, addr->data, sizeof ipv6_addr.bytes);
+ return get_hostname6(&ipv6_addr);
+ }
+
+ case AT_STRINGZ:
+ return se_strdup(addr->data);
+ default:
+ return NULL;
+ }
+}
/*
* Ethernet / manufacturer resolution
return FALSE;
num = strtoul(cp, &p, 16);
if (p == cp)
- return FALSE; /* failed */
+ return FALSE; /* failed */
if (num > 0xFF)
- return FALSE; /* not a valid octet */
+ return FALSE; /* not a valid octet */
eth->addr[i] = (guint8) num;
- cp = p; /* skip past the number */
+ cp = p; /* skip past the number */
/* OK, what character terminated the octet? */
if (*cp == '/') {
/* "/" - this has a mask. */
if (!manuf_file) {
- /* Entries with masks are allowed only in the "manuf" files. */
- return FALSE;
+ /* Entries with masks are allowed only in the "manuf" files. */
+ return FALSE;
}
- cp++; /* skip past the '/' to get to the mask */
+ cp++; /* skip past the '/' to get to the mask */
if (!isdigit((unsigned char)*cp))
- return FALSE; /* no sign allowed */
+ return FALSE; /* no sign allowed */
num = strtoul(cp, &p, 10);
if (p == cp)
- return FALSE; /* failed */
- cp = p; /* skip past the number */
+ return FALSE; /* failed */
+ cp = p; /* skip past the number */
if (*cp != '\0' && !isspace((unsigned char)*cp))
- return FALSE; /* bogus terminator */
+ return FALSE; /* bogus terminator */
if (num == 0 || num >= 48)
- return FALSE; /* bogus mask */
+ return FALSE; /* bogus mask */
/* Mask out the bits not covered by the mask */
*mask = num;
for (i = 0; num >= 8; i++, num -= 8)
- ; /* skip octets entirely covered by the mask */
+ ; /* skip octets entirely covered by the mask */
/* Mask out the first masked octet */
eth->addr[i] &= (0xFF << (8 - num));
i++;
/* Mask out completely-masked-out octets */
for (; i < 6; i++)
- eth->addr[i] = 0;
+ eth->addr[i] = 0;
return TRUE;
}
if (*cp == '\0') {
/* We're at the end of the address, and there's no mask. */
if (i == 2) {
- /* We got 3 bytes, so this is a manufacturer ID. */
- if (!manuf_file) {
- /* Manufacturer IDs are only allowed in the "manuf"
- files. */
- return FALSE;
- }
- /* Indicate that this is a manufacturer ID (0 is not allowed
- as a mask). */
- *mask = 0;
- return TRUE;
+ /* We got 3 bytes, so this is a manufacturer ID. */
+ if (!manuf_file) {
+ /* Manufacturer IDs are only allowed in the "manuf"
+ files. */
+ return FALSE;
+ }
+ /* Indicate that this is a manufacturer ID (0 is not allowed
+ as a mask). */
+ *mask = 0;
+ return TRUE;
}
if (i == 5) {
- /* We got 6 bytes, so this is a MAC address.
- If we're reading one of the "manuf" files, indicate that
- this is a MAC address (48 is not allowed as a mask). */
- if (manuf_file)
- *mask = 48;
- return TRUE;
+ /* We got 6 bytes, so this is a MAC address.
+ If we're reading one of the "manuf" files, indicate that
+ this is a MAC address (48 is not allowed as a mask). */
+ if (manuf_file)
+ *mask = 48;
+ return TRUE;
}
/* We didn't get 3 or 6 bytes, and there's no mask; this is
return FALSE;
} else {
if (sep == '\0') {
- /* We don't know the separator used in this number; it can either
- be ':', '-', or '.'. */
- if (*cp != ':' && *cp != '-' && *cp != '.')
- return FALSE;
- sep = *cp; /* subsequent separators must be the same */
+ /* We don't know the separator used in this number; it can either
+ be ':', '-', or '.'. */
+ if (*cp != ':' && *cp != '-' && *cp != '.')
+ return FALSE;
+ sep = *cp; /* subsequent separators must be the same */
} else {
/* It has to be the same as the first separator */
if (*cp != sep)
}
static int parse_ether_line(char *line, ether_t *eth, unsigned int *mask,
- gboolean manuf_file)
+ gboolean manuf_file)
{
/*
* See the ethers(4) or ethers(5) man page for ethers file format
* (not available on all systems).
* We allow both ethernet address separators (':' and '-'),
- * as well as Ethereal's '.' separator.
+ * as well as Wireshark's '.' separator.
*/
gchar *cp;
if ((cp = strtok(NULL, " \t")) == NULL)
return -1;
- strncpy(eth->name, cp, MAXNAMELEN);
- eth->name[MAXNAMELEN-1] = '\0';
+ g_strlcpy(eth->name, cp, MAXNAMELEN);
return 0;
if (eth_p)
rewind(eth_p);
else
- eth_p = fopen(path, "r");
+ eth_p = ws_fopen(path, "r");
}
static void end_ethent(void)
{
ether_t *eth;
- set_ethent(g_ethers_path);
+ set_ethent(g_pethers_path);
while ((eth = get_ethent(NULL, FALSE)) && strncmp(name, eth->name, MAXNAMELEN) != 0)
;
if (eth == NULL) {
end_ethent();
- set_ethent(g_pethers_path);
+ set_ethent(g_ethers_path);
while ((eth = get_ethent(NULL, FALSE)) && strncmp(name, eth->name, MAXNAMELEN) != 0)
;
ether_t *eth;
- set_ethent(g_ethers_path);
+ set_ethent(g_pethers_path);
while ((eth = get_ethent(NULL, FALSE)) && memcmp(addr, eth->addr, 6) != 0)
;
if (eth == NULL) {
end_ethent();
- set_ethent(g_pethers_path);
+ set_ethent(g_ethers_path);
while ((eth = get_ethent(NULL, FALSE)) && memcmp(addr, eth->addr, 6) != 0)
;
/* All but the topmost 4 bytes are masked out */
return ((((addr[0] << 8) | addr[1]) ^
((addr[2] << 8) | (addr[3] & (0xFF << (8 - mask)))))) &
- (HASHETHSIZE - 1);
+ (HASHETHSIZE - 1);
}
mask -= 8;
if (mask <= 8) {
/* All but the topmost 5 bytes are masked out */
return ((((addr[1] << 8) | addr[2]) ^
((addr[3] << 8) | (addr[4] & (0xFF << (8 - mask)))))) &
- (HASHETHSIZE - 1);
+ (HASHETHSIZE - 1);
}
mask -= 8;
/* No bytes are fully masked out */
tp = manuf_table[hash_idx] = (hashmanuf_t *)g_malloc(sizeof(hashmanuf_t));
} else {
while(1) {
- if (tp->next == NULL) {
- tp->next = (hashmanuf_t *)g_malloc(sizeof(hashmanuf_t));
- tp = tp->next;
- break;
- }
- tp = tp->next;
+ if (tp->next == NULL) {
+ tp->next = (hashmanuf_t *)g_malloc(sizeof(hashmanuf_t));
+ tp = tp->next;
+ break;
+ }
+ tp = tp->next;
}
}
memcpy(tp->addr, addr, sizeof(tp->addr));
- strncpy(tp->name, name, MAXMANUFLEN);
- tp->name[MAXMANUFLEN-1] = '\0';
+ g_strlcpy(tp->name, name, MAXMANUFLEN);
tp->next = NULL;
return;
}
} else {
while(1) {
if (memcmp(etp->addr, addr, sizeof(etp->addr)) == 0) {
- /* address already known */
- return;
+ /* address already known */
+ return;
}
if (etp->next == NULL) {
- etp->next = (hashether_t *)g_malloc(sizeof(hashether_t));
- etp = etp->next;
- break;
+ etp->next = (hashether_t *)g_malloc(sizeof(hashether_t));
+ etp = etp->next;
+ break;
}
etp = etp->next;
}
}
memcpy(etp->addr, addr, sizeof(etp->addr));
- strncpy(etp->name, name, MAXNAMELEN);
- etp->name[MAXNAMELEN-1] = '\0';
+ g_strlcpy(etp->name, name, MAXNAMELEN);
etp->next = NULL;
etp->is_dummy_entry = FALSE;
{
int hash_idx;
hashmanuf_t *tp;
+ guint8 stripped_addr[3];
hash_idx = HASH_ETH_MANUF(addr);
+ /* first try to find a "perfect match" */
tp = manuf_table[hash_idx];
-
while(tp != NULL) {
if (memcmp(tp->addr, addr, sizeof(tp->addr)) == 0) {
return tp;
tp = tp->next;
}
+ /* Mask out the broadcast/multicast flag but not the locally
+ * administered flag as localy administered means: not assigend
+ * by the IEEE but the local administrator instead.
+ * 0x01 multicast / broadcast bit
+ * 0x02 locally administered bit */
+ memcpy(stripped_addr, addr, 3);
+ stripped_addr[0] &= 0xFE;
+
+ tp = manuf_table[hash_idx];
+ while(tp != NULL) {
+ if (memcmp(tp->addr, stripped_addr, sizeof(tp->addr)) == 0) {
+ return tp;
+ }
+ tp = tp->next;
+ }
+
return NULL;
} /* manuf_name_lookup */
/* Get the part of the address covered by the mask. */
for (i = 0, num = mask; num >= 8; i++, num -= 8)
- masked_addr[i] = addr[i]; /* copy octets entirely covered by the mask */
+ masked_addr[i] = addr[i]; /* copy octets entirely covered by the mask */
/* Mask out the first masked octet */
masked_addr[i] = addr[i] & (0xFF << (8 - num));
i++;
/* Compute the pathname of the ethers file. */
if (g_ethers_path == NULL) {
g_ethers_path = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s",
- get_systemfile_dir(), ENAME_ETHERS);
+ get_systemfile_dir(), ENAME_ETHERS);
}
/* Set g_pethers_path here, but don't actually do anything
* with it. It's used in get_ethbyname() and get_ethbyaddr()
*/
if (g_pethers_path == NULL)
- g_pethers_path = get_persconffile_path(ENAME_ETHERS, FALSE);
+ g_pethers_path = get_persconffile_path(ENAME_ETHERS, FALSE, FALSE);
/* manuf hash table initialization */
{
int hash_idx;
hashether_t *tp;
+ int new_one = TRUE;
hash_idx = HASH_ETH_ADDRESS(addr);
} else {
while(1) {
if (memcmp(tp->addr, addr, sizeof(tp->addr)) == 0) {
- /* address already known */
- if (!tp->is_dummy_entry) {
- return tp;
- } else {
- /* replace this dummy (manuf) entry with a real name */
- break;
- }
+ /* address already known */
+ if (!tp->is_dummy_entry) {
+ return tp;
+ } else {
+ /* replace this dummy (manuf) entry with a real name */
+ new_one = FALSE;
+ break;
+ }
}
if (tp->next == NULL) {
- tp->next = (hashether_t *)g_malloc(sizeof(hashether_t));
- tp = tp->next;
- break;
+ tp->next = (hashether_t *)g_malloc(sizeof(hashether_t));
+ tp = tp->next;
+ break;
}
tp = tp->next;
}
}
- memcpy(tp->addr, addr, sizeof(tp->addr));
- strncpy(tp->name, name, MAXNAMELEN);
- tp->name[MAXNAMELEN-1] = '\0';
- tp->next = NULL;
+ g_strlcpy(tp->name, name, MAXNAMELEN);
+ if (new_one) {
+ memcpy(tp->addr, addr, sizeof(tp->addr));
+ g_strlcpy(tp->hexa, bytestring_to_str(addr, sizeof(tp->addr), ':'), sizeof(tp->hexa));
+ tp->next = NULL;
+ }
tp->is_dummy_entry = FALSE;
return tp;
} /* add_eth_name */
-static gchar *eth_name_lookup(const guint8 *addr)
+/* XXXX */
+static hashether_t *eth_name_lookup(const guint8 *addr, gboolean resolve)
{
int hash_idx;
hashmanuf_t *manufp;
} else {
while(1) {
if (memcmp(tp->addr, addr, sizeof(tp->addr)) == 0) {
- return tp->name;
+ return tp;
}
if (tp->next == NULL) {
- tp->next = (hashether_t *)g_malloc(sizeof(hashether_t));
- tp = tp->next;
- break;
+ tp->next = (hashether_t *)g_malloc(sizeof(hashether_t));
+ tp = tp->next;
+ break;
}
tp = tp->next;
}
memcpy(tp->addr, addr, sizeof(tp->addr));
tp->next = NULL;
+ g_strlcpy(tp->hexa, bytestring_to_str(addr, sizeof(tp->addr), ':'), sizeof(tp->hexa));
+ if (!resolve) {
+ strcpy(tp->name, tp->hexa);
+ return tp;
+ }
if ( (eth = get_ethbyaddr(addr)) == NULL) {
/* Unknown name. Try looking for it in the well-known-address
for (;;) {
/* Only the topmost 5 bytes participate fully */
if ((etp = wka_name_lookup(addr, mask+40)) != NULL) {
- sprintf(tp->name, "%s_%02x",
- etp->name, addr[5] & (0xFF >> mask));
- tp->is_dummy_entry = TRUE;
- return (tp->name);
+ g_snprintf(tp->name, MAXNAMELEN, "%s_%02x",
+ etp->name, addr[5] & (0xFF >> mask));
+ tp->is_dummy_entry = TRUE;
+ return tp;
}
if (mask == 0)
break;
for (;;) {
/* Only the topmost 4 bytes participate fully */
if ((etp = wka_name_lookup(addr, mask+32)) != NULL) {
- sprintf(tp->name, "%s_%02x:%02x",
- etp->name, addr[4] & (0xFF >> mask), addr[5]);
- tp->is_dummy_entry = TRUE;
- return (tp->name);
+ g_snprintf(tp->name, MAXNAMELEN, "%s_%02x:%02x",
+ etp->name, addr[4] & (0xFF >> mask), addr[5]);
+ tp->is_dummy_entry = TRUE;
+ return tp;
}
if (mask == 0)
break;
for (;;) {
/* Only the topmost 3 bytes participate fully */
if ((etp = wka_name_lookup(addr, mask+24)) != NULL) {
- sprintf(tp->name, "%s_%02x:%02x:%02x",
- etp->name, addr[3] & (0xFF >> mask), addr[4], addr[5]);
- tp->is_dummy_entry = TRUE;
- return (tp->name);
+ g_snprintf(tp->name, MAXNAMELEN, "%s_%02x:%02x:%02x",
+ etp->name, addr[3] & (0xFF >> mask), addr[4], addr[5]);
+ tp->is_dummy_entry = TRUE;
+ return tp;
}
if (mask == 0)
break;
/* Now try looking in the manufacturer table. */
if ((manufp = manuf_name_lookup(addr)) != NULL) {
- sprintf(tp->name, "%s_%02x:%02x:%02x",
- manufp->name, addr[3], addr[4], addr[5]);
+ g_snprintf(tp->name, MAXNAMELEN, "%s_%02x:%02x:%02x",
+ manufp->name, addr[3], addr[4], addr[5]);
tp->is_dummy_entry = TRUE;
- return (tp->name);
+ return tp;
}
/* Now try looking for it in the well-known-address
for (;;) {
/* Only the topmost 2 bytes participate fully */
if ((etp = wka_name_lookup(addr, mask+16)) != NULL) {
- sprintf(tp->name, "%s_%02x:%02x:%02x:%02x",
- etp->name, addr[2] & (0xFF >> mask), addr[3], addr[4],
- addr[5]);
- tp->is_dummy_entry = TRUE;
- return (tp->name);
+ g_snprintf(tp->name, MAXNAMELEN, "%s_%02x:%02x:%02x:%02x",
+ etp->name, addr[2] & (0xFF >> mask), addr[3], addr[4],
+ addr[5]);
+ tp->is_dummy_entry = TRUE;
+ return tp;
}
if (mask == 0)
break;
for (;;) {
/* Only the topmost byte participates fully */
if ((etp = wka_name_lookup(addr, mask+8)) != NULL) {
- sprintf(tp->name, "%s_%02x:%02x:%02x:%02x:%02x",
- etp->name, addr[1] & (0xFF >> mask), addr[2], addr[3],
- addr[4], addr[5]);
- tp->is_dummy_entry = TRUE;
- return (tp->name);
+ g_snprintf(tp->name, MAXNAMELEN, "%s_%02x:%02x:%02x:%02x:%02x",
+ etp->name, addr[1] & (0xFF >> mask), addr[2], addr[3],
+ addr[4], addr[5]);
+ tp->is_dummy_entry = TRUE;
+ return tp;
}
if (mask == 0)
break;
for (mask = 7; mask > 0; mask--) {
/* Not even the topmost byte participates fully */
if ((etp = wka_name_lookup(addr, mask)) != NULL) {
- sprintf(tp->name, "%s_%02x:%02x:%02x:%02x:%02x:%02x",
- etp->name, addr[0] & (0xFF >> mask), addr[1], addr[2],
- addr[3], addr[4], addr[5]);
- tp->is_dummy_entry = TRUE;
- return (tp->name);
+ g_snprintf(tp->name, MAXNAMELEN, "%s_%02x:%02x:%02x:%02x:%02x:%02x",
+ etp->name, addr[0] & (0xFF >> mask), addr[1], addr[2],
+ addr[3], addr[4], addr[5]);
+ tp->is_dummy_entry = TRUE;
+ return tp;
}
}
/* No match whatsoever. */
- sprintf(tp->name, "%s", ether_to_str(addr));
+ g_snprintf(tp->name, MAXNAMELEN, "%s", ether_to_str(addr));
tp->is_dummy_entry = TRUE;
} else {
- strncpy(tp->name, eth->name, MAXNAMELEN);
- tp->name[MAXNAMELEN-1] = '\0';
+ g_strlcpy(tp->name, eth->name, MAXNAMELEN);
tp->is_dummy_entry = FALSE;
}
- return (tp->name);
+ return tp;
} /* eth_name_lookup */
tp = table[i];
while (tp) {
if (strcmp(tp->name, name) == 0)
- return tp->addr;
+ return tp->addr;
tp = tp->next;
}
}
* as well as no separators
*/
- gchar *cp;
- guint32 a, a0, a1, a2, a3;
- gboolean found_single_number = FALSE;
+ gchar *cp;
+ guint32 a, a0, a1, a2, a3;
+ gboolean found_single_number = FALSE;
if ((cp = strchr(line, '#')))
*cp = '\0';
if (sscanf(cp, "%x-%x-%x-%x", &a0, &a1, &a2, &a3) != 4) {
if (sscanf(cp, "%x.%x.%x.%x", &a0, &a1, &a2, &a3) != 4) {
if (sscanf(cp, "%x", &a) == 1) {
- found_single_number = TRUE;
- }
- else {
- return -1;
- }
+ found_single_number = TRUE;
+ }
+ else {
+ return -1;
+ }
}
}
}
return -1;
if (found_single_number) {
- ipxnet->addr = a;
+ ipxnet->addr = a;
}
else {
- ipxnet->addr = (a0 << 24) | (a1 << 16) | (a2 << 8) | a3;
+ ipxnet->addr = (a0 << 24) | (a1 << 16) | (a2 << 8) | a3;
}
- strncpy(ipxnet->name, cp, MAXNAMELEN);
- ipxnet->name[MAXNAMELEN-1] = '\0';
+ g_strlcpy(ipxnet->name, cp, MAXNAMELEN);
return 0;
if (ipxnet_p)
rewind(ipxnet_p);
else
- ipxnet_p = fopen(path, "r");
+ ipxnet_p = ws_fopen(path, "r");
}
static void end_ipxnetent(void)
* directory as well?
*/
if (g_ipxnets_path == NULL) {
- g_ipxnets_path = g_malloc(strlen(get_systemfile_dir()) +
- strlen(ENAME_IPXNETS) + 2);
- sprintf(g_ipxnets_path, "%s" G_DIR_SEPARATOR_S "%s",
- get_systemfile_dir(), ENAME_IPXNETS);
+ g_ipxnets_path = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s",
+ get_systemfile_dir(), ENAME_IPXNETS);
}
/* Set g_pipxnets_path here, but don't actually do anything
* with it. It's used in get_ipxnetbyname() and get_ipxnetbyaddr()
*/
if (g_pipxnets_path == NULL)
- g_pipxnets_path = get_persconffile_path(ENAME_IPXNETS, FALSE);
+ g_pipxnets_path = get_persconffile_path(ENAME_IPXNETS, FALSE, FALSE);
} /* initialize_ipxnets */
} else {
while(1) {
if (tp->next == NULL) {
- tp->next = (hashipxnet_t *)g_malloc(sizeof(hashipxnet_t));
- tp = tp->next;
- break;
+ tp->next = (hashipxnet_t *)g_malloc(sizeof(hashipxnet_t));
+ tp = tp->next;
+ break;
}
tp = tp->next;
}
}
tp->addr = addr;
- strncpy(tp->name, name, MAXNAMELEN);
- tp->name[MAXNAMELEN-1] = '\0';
+ g_strlcpy(tp->name, name, MAXNAMELEN);
tp->next = NULL;
return tp;
} else {
while(1) {
if (tp->addr == addr) {
- return tp->name;
+ return tp->name;
}
if (tp->next == NULL) {
- tp->next = (hashipxnet_t *)g_malloc(sizeof(hashipxnet_t));
- tp = tp->next;
- break;
+ tp->next = (hashipxnet_t *)g_malloc(sizeof(hashipxnet_t));
+ tp = tp->next;
+ break;
}
tp = tp->next;
}
if ( (ipxnet = get_ipxnetbyaddr(addr)) == NULL) {
/* unknown name */
- sprintf(tp->name, "%X", addr);
+ g_snprintf(tp->name, MAXNAMELEN, "%X", addr);
} else {
- strncpy(tp->name, ipxnet->name, MAXNAMELEN);
- tp->name[MAXNAMELEN-1] = '\0';
+ g_strlcpy(tp->name, ipxnet->name, MAXNAMELEN);
}
return (tp->name);
for (i = 0; i < HASHIPXNETSIZE; i++) {
tp = table[i];
while (tp) {
- if (strcmp(tp->name, name) == 0)
- return tp->addr;
+ if (strcmp(tp->name, name) == 0) {
+ *success = TRUE;
+ return tp->addr;
+ }
tp = tp->next;
}
}
/* not in hash table : performs a file lookup */
if ((ipxnet = get_ipxnetbyname(name)) == NULL) {
- *success = FALSE;
- return 0;
+ *success = FALSE;
+ return 0;
}
/* add new entry in hash table */
* See the hosts(4) or hosts(5) man page for hosts file format
* (not available on all systems).
*/
- if ((hf = fopen(hostspath, "r")) == NULL)
+ if ((hf = ws_fopen(hostspath, "r")) == NULL)
return FALSE;
while (fgetline(&line, &size, hf) >= 0) {
add_ipv4_name(host_addr[0], cp);
}
}
- if (line != NULL)
- g_free(line);
+ g_free(line);
fclose(hf);
return TRUE;
} /* read_hosts_file */
+
+/* Read in a list of subnet definition - name pairs.
+ * <line> = <comment> | <entry> | <whitespace>
+ * <comment> = <whitespace>#<any>
+ * <entry> = <subnet_definition> <whitespace> <subnet_name> [<comment>|<whitespace><any>]
+ * <subnet_definition> = <ipv4_address> / <subnet_mask_length>
+ * <ipv4_address> is a full address; it will be masked to get the subnet-ID.
+ * <subnet_mask_length> is a decimal 1-31
+ * <subnet_name> is a string containing no whitespace.
+ * <whitespace> = (space | tab)+
+ * Any malformed entries are ignored.
+ * Any trailing data after the subnet_name is ignored.
+ *
+ * XXX Support IPv6
+ */
+static gboolean
+read_subnets_file (const char *subnetspath)
+{
+ FILE *hf;
+ char *line = NULL;
+ int size = 0;
+ gchar *cp, *cp2;
+ guint32 host_addr; /* IPv4 ONLY */
+ int mask_length;
+
+ if ((hf = ws_fopen(subnetspath, "r")) == NULL)
+ return FALSE;
+
+ while (fgetline(&line, &size, hf) >= 0) {
+ if ((cp = strchr(line, '#')))
+ *cp = '\0';
+
+ if ((cp = strtok(line, " \t")) == NULL)
+ continue; /* no tokens in the line */
+
+
+ /* Expected format is <IP4 address>/<subnet length> */
+ cp2 = strchr(cp, '/');
+ if(NULL == cp2) {
+ /* No length */
+ continue;
+ }
+ *cp2 = '\0'; /* Cut token */
+ ++cp2 ;
+
+ /* Check if this is a valid IPv4 address */
+ if (inet_pton(AF_INET, cp, &host_addr) != 1) {
+ continue; /* no */
+ }
+
+ mask_length = atoi(cp2);
+ if(0 >= mask_length || mask_length > 31) {
+ continue; /* invalid mask length */
+ }
+
+ if ((cp = strtok(NULL, " \t")) == NULL)
+ continue; /* no subnet name */
+
+ subnet_entry_set(host_addr, (guint32)mask_length, cp);
+ }
+ g_free(line);
+
+ fclose(hf);
+ return TRUE;
+} /* read_subnets_file */
+
+static subnet_entry_t subnet_lookup(const guint32 addr)
+{
+ subnet_entry_t subnet_entry;
+ guint32 i;
+
+ /* Search mask lengths linearly, longest first */
+
+ i = SUBNETLENGTHSIZE;
+ while(have_subnet_entry && i > 0) {
+ guint32 masked_addr;
+ subnet_length_entry_t* length_entry;
+
+ /* Note that we run from 31 (length 32) to 0 (length 1) */
+ --i;
+ g_assert(i < SUBNETLENGTHSIZE);
+
+
+ length_entry = &subnet_length_entries[i];
+
+ if(NULL != length_entry->subnet_addresses) {
+ hashipv4_t * tp;
+ guint32 hash_idx;
+
+ masked_addr = addr & length_entry->mask;
+ hash_idx = HASH_IPV4_ADDRESS(masked_addr);
+
+ tp = length_entry->subnet_addresses[hash_idx];
+ while(tp != NULL && tp->addr != masked_addr) {
+ tp = tp->next;
+ }
+
+ if(NULL != tp) {
+ subnet_entry.mask = length_entry->mask;
+ subnet_entry.mask_length = i + 1; /* Length is offset + 1 */
+ subnet_entry.name = tp->name;
+ return subnet_entry;
+ }
+ }
+ }
+
+ subnet_entry.mask = 0;
+ subnet_entry.mask_length = 0;
+ subnet_entry.name = NULL;
+
+ return subnet_entry;
+}
+
+/* Add a subnet-definition - name pair to the set.
+ * The definition is taken by masking the address passed in with the mask of the
+ * given length.
+ */
+static void subnet_entry_set(guint32 subnet_addr, guint32 mask_length, const gchar* name)
+{
+ subnet_length_entry_t* entry;
+ hashipv4_t * tp;
+ gsize hash_idx;
+
+ g_assert(mask_length > 0 && mask_length <= 32);
+
+ entry = &subnet_length_entries[mask_length - 1];
+
+ subnet_addr &= entry->mask;
+
+ hash_idx = HASH_IPV4_ADDRESS(subnet_addr);
+
+ if(NULL == entry->subnet_addresses) {
+ entry->subnet_addresses = g_new0(hashipv4_t*,HASHHOSTSIZE);
+ }
+
+ if(NULL != (tp = entry->subnet_addresses[hash_idx])) {
+ if(tp->addr == subnet_addr) {
+ return; /* XXX provide warning that an address was repeated? */
+ } else {
+ hashipv4_t * new_tp = g_new(hashipv4_t,1);
+ tp->next = new_tp;
+ tp = new_tp;
+ }
+ } else {
+ tp = entry->subnet_addresses[hash_idx] = g_new(hashipv4_t,1);
+ }
+
+ tp->next = NULL;
+ tp->addr = subnet_addr;
+ tp->is_dummy_entry = FALSE; /*Never used again...*/
+ g_strlcpy(tp->name, name, MAXNAMELEN); /* This is longer than subnet names can actually be */
+ have_subnet_entry = TRUE;
+}
+
+static guint32 get_subnet_mask(guint32 mask_length) {
+
+ static guint32 masks[SUBNETLENGTHSIZE];
+ static gboolean initialised = FALSE;
+
+ if(!initialised) {
+ memset(masks, 0, sizeof(masks));
+
+ initialised = TRUE;
+
+ /* XXX There must be a better way to do this than
+ * hand-coding the values, but I can't seem to
+ * come up with one!
+ */
+
+ inet_pton(AF_INET, "128.0.0.0", &masks[0]);
+ inet_pton(AF_INET, "192.0.0.0", &masks[1]);
+ inet_pton(AF_INET, "224.0.0.0", &masks[2]);
+ inet_pton(AF_INET, "240.0.0.0", &masks[3]);
+ inet_pton(AF_INET, "248.0.0.0", &masks[4]);
+ inet_pton(AF_INET, "252.0.0.0", &masks[5]);
+ inet_pton(AF_INET, "254.0.0.0", &masks[6]);
+ inet_pton(AF_INET, "255.0.0.0", &masks[7]);
+
+ inet_pton(AF_INET, "255.128.0.0", &masks[8]);
+ inet_pton(AF_INET, "255.192.0.0", &masks[9]);
+ inet_pton(AF_INET, "255.224.0.0", &masks[10]);
+ inet_pton(AF_INET, "255.240.0.0", &masks[11]);
+ inet_pton(AF_INET, "255.248.0.0", &masks[12]);
+ inet_pton(AF_INET, "255.252.0.0", &masks[13]);
+ inet_pton(AF_INET, "255.254.0.0", &masks[14]);
+ inet_pton(AF_INET, "255.255.0.0", &masks[15]);
+
+ inet_pton(AF_INET, "255.255.128.0", &masks[16]);
+ inet_pton(AF_INET, "255.255.192.0", &masks[17]);
+ inet_pton(AF_INET, "255.255.224.0", &masks[18]);
+ inet_pton(AF_INET, "255.255.240.0", &masks[19]);
+ inet_pton(AF_INET, "255.255.248.0", &masks[20]);
+ inet_pton(AF_INET, "255.255.252.0", &masks[21]);
+ inet_pton(AF_INET, "255.255.254.0", &masks[22]);
+ inet_pton(AF_INET, "255.255.255.0", &masks[23]);
+
+ inet_pton(AF_INET, "255.255.255.128", &masks[24]);
+ inet_pton(AF_INET, "255.255.255.192", &masks[25]);
+ inet_pton(AF_INET, "255.255.255.224", &masks[26]);
+ inet_pton(AF_INET, "255.255.255.240", &masks[27]);
+ inet_pton(AF_INET, "255.255.255.248", &masks[28]);
+ inet_pton(AF_INET, "255.255.255.252", &masks[29]);
+ inet_pton(AF_INET, "255.255.255.254", &masks[30]);
+ inet_pton(AF_INET, "255.255.255.255", &masks[31]);
+ }
+
+ if(mask_length == 0 || mask_length > SUBNETLENGTHSIZE) {
+ g_assert_not_reached();
+ return 0;
+ } else {
+ return masks[mask_length - 1];
+ }
+}
+
+static void subnet_name_lookup_init(void)
+{
+ gchar* subnetspath;
+
+ guint32 i;
+ for(i = 0; i < SUBNETLENGTHSIZE; ++i) {
+ guint32 length = i + 1;
+
+ subnet_length_entries[i].subnet_addresses = NULL;
+ subnet_length_entries[i].mask_length = length;
+ subnet_length_entries[i].mask = get_subnet_mask(length);
+ }
+
+ subnetspath = get_persconffile_path(ENAME_SUBNETS, FALSE, FALSE);
+ if (!read_subnets_file(subnetspath) && errno != ENOENT) {
+ report_open_failure(subnetspath, errno, FALSE);
+ }
+ g_free(subnetspath);
+
+ /*
+ * Load the global subnets file, if we have one.
+ */
+ subnetspath = get_datafile_path(ENAME_SUBNETS);
+ if (!read_subnets_file(subnetspath) && errno != ENOENT) {
+ report_open_failure(subnetspath, errno, FALSE);
+ }
+ g_free(subnetspath);
+}
+
/*
* External Functions
*/
void
host_name_lookup_init(void) {
char *hostspath;
+
+#ifdef HAVE_GNU_ADNS
+#ifdef _WIN32
+ char *sysroot;
+ static char rootpath_nt[] = "\\system32\\drivers\\etc\\hosts";
+ static char rootpath_ot[] = "\\hosts";
+#endif /* _WIN32 */
+#endif /*GNU_ADNS */
+
+ /*
+ * Load the user's hosts file, if they have one.
+ */
+ hostspath = get_persconffile_path(ENAME_HOSTS, FALSE, FALSE);
+ if (!read_hosts_file(hostspath) && errno != ENOENT) {
+ report_open_failure(hostspath, errno, FALSE);
+ }
+ g_free(hostspath);
+
+ /*
+ * Load the global hosts file, if we have one.
+ */
+ hostspath = get_datafile_path(ENAME_HOSTS);
+ if (!read_hosts_file(hostspath) && errno != ENOENT) {
+ report_open_failure(hostspath, errno, FALSE);
+ }
+ g_free(hostspath);
+
+#ifdef HAVE_C_ARES
+#ifdef CARES_HAVE_ARES_LIBRARY_INIT
+ if (ares_library_init(ARES_LIB_INIT_ALL) == ARES_SUCCESS) {
+#endif
+ if (ares_init(&alchan) == ARES_SUCCESS) {
+ async_dns_initialized = TRUE;
+ }
+#ifdef CARES_HAVE_ARES_LIBRARY_INIT
+ }
+#endif
+#else
#ifdef HAVE_GNU_ADNS
/*
* We're using GNU ADNS, which doesn't check the system hosts file;
* we load that file ourselves.
*/
-#ifdef WIN32
- char *sysroot;
- static char rootpath_nt[] = "\\system32\\drivers\\etc\\hosts";
- static char rootpath_ot[] = "\\hosts";
+#ifdef _WIN32
- sysroot = getenv("WINDIR");
+ sysroot = getenv_utf8("WINDIR");
if (sysroot != NULL) {
/*
* The file should be under WINDIR.
}
g_free(hostspath);
}
-#else /* WIN32 */
+#else /* _WIN32 */
read_hosts_file("/etc/hosts");
-#endif /* WIN32 */
-#endif /* HAVE_GNU_ADNS */
-
- /*
- * Load the user's hosts file, if they have one.
- */
- hostspath = get_persconffile_path(ENAME_HOSTS, FALSE);
- if (!read_hosts_file(hostspath) && errno != ENOENT) {
- report_open_failure(hostspath, errno, FALSE);
- }
+#endif /* _WIN32 */
-#ifdef HAVE_GNU_ADNS
/* XXX - Any flags we should be using? */
/* XXX - We could provide config settings for DNS servers, and
pass them to ADNS with adns_init_strcfg */
*/
return;
}
- gnu_adns_initialized = TRUE;
- adns_currently_queued = 0;
+ async_dns_initialized = TRUE;
+ async_dns_in_flight = 0;
#endif /* HAVE_GNU_ADNS */
+#endif /* HAVE_C_ARES */
+
+ subnet_name_lookup_init();
}
-#ifdef HAVE_GNU_ADNS
+#ifdef HAVE_C_ARES
+gboolean
+host_name_lookup_process(gpointer data _U_) {
+ async_dns_queue_msg_t *caqm;
+ struct timeval tv = { 0, 0 };
+ int nfds;
+ fd_set rfds, wfds;
+
+ if (!async_dns_initialized)
+ /* c-ares not initialized. Bail out and cancel timers. */
+ return FALSE;
+
+ async_dns_queue_head = g_list_first(async_dns_queue_head);
+
+ while (async_dns_queue_head && async_dns_in_flight <= prefs.name_resolve_concurrency) {
+ caqm = (async_dns_queue_msg_t *) async_dns_queue_head->data;
+ async_dns_queue_head = g_list_remove(async_dns_queue_head, (void *) caqm);
+ if (caqm->family == AF_INET) {
+ ares_gethostbyaddr(alchan, &caqm->addr.ip4, sizeof(guint32), AF_INET,
+ c_ares_ghba_cb, caqm);
+ async_dns_in_flight++;
+ } else if (caqm->family == AF_INET6) {
+ ares_gethostbyaddr(alchan, &caqm->addr.ip6, sizeof(struct e_in6_addr),
+ AF_INET6, c_ares_ghba_cb, caqm);
+ async_dns_in_flight++;
+ }
+ }
+
+ FD_ZERO(&rfds);
+ FD_ZERO(&wfds);
+ nfds = ares_fds(alchan, &rfds, &wfds);
+ if (nfds > 0) {
+ select(nfds, &rfds, &wfds, NULL, &tv);
+ ares_process(alchan, &rfds, &wfds);
+ }
+
+ /* Keep the timeout in place */
+ return TRUE;
+}
+
+void
+host_name_lookup_cleanup(void) {
+ GList *cur;
+
+ cur = g_list_first(async_dns_queue_head);
+ while (cur) {
+ g_free(cur->data);
+ cur = g_list_next (cur);
+ }
+
+ g_list_free(async_dns_queue_head);
+
+ if (async_dns_initialized) {
+ ares_destroy(alchan);
+ }
+#ifdef CARES_HAVE_ARES_LIBRARY_INIT
+ ares_library_cleanup();
+#endif
+ async_dns_initialized = FALSE;
+}
+
+#elif defined(HAVE_GNU_ADNS)
/* XXX - The ADNS "documentation" isn't very clear:
* - Do we need to keep our query structures around?
*/
-gint
+gboolean
host_name_lookup_process(gpointer data _U_) {
- adns_queue_msg_t *almsg;
+ async_dns_queue_msg_t *almsg;
GList *cur;
char addr_str[] = "111.222.333.444.in-addr.arpa.";
guint8 *addr_bytes;
int ret;
gboolean dequeue;
- adns_queue_head = g_list_first(adns_queue_head);
+ async_dns_queue_head = g_list_first(async_dns_queue_head);
- cur = adns_queue_head;
- while (cur && adns_currently_queued <= prefs.name_resolve_concurrency) {
- almsg = (adns_queue_msg_t *) cur->data;
+ cur = async_dns_queue_head;
+ while (cur && async_dns_in_flight <= prefs.name_resolve_concurrency) {
+ almsg = (async_dns_queue_msg_t *) cur->data;
if (! almsg->submitted && almsg->type == AF_INET) {
addr_bytes = (guint8 *) &almsg->ip4_addr;
- sprintf(addr_str, "%u.%u.%u.%u.in-addr.arpa.", addr_bytes[3],
+ g_snprintf(addr_str, sizeof addr_str, "%u.%u.%u.%u.in-addr.arpa.", addr_bytes[3],
addr_bytes[2], addr_bytes[1], addr_bytes[0]);
/* XXX - what if it fails? */
adns_submit (ads, addr_str, adns_r_ptr, 0, NULL, &almsg->query);
almsg->submitted = TRUE;
- adns_currently_queued++;
+ async_dns_in_flight++;
}
cur = cur->next;
}
- cur = adns_queue_head;
+ cur = async_dns_queue_head;
while (cur) {
dequeue = FALSE;
- almsg = (adns_queue_msg_t *) cur->data;
+ almsg = (async_dns_queue_msg_t *) cur->data;
if (almsg->submitted) {
ret = adns_check(ads, &almsg->query, &ans, NULL);
if (ret == 0) {
- if (ans->status == adns_s_ok) {
- add_ipv4_name(almsg->ip4_addr, *ans->rrs.str);
- }
- dequeue = TRUE;
+ if (ans->status == adns_s_ok) {
+ add_ipv4_name(almsg->ip4_addr, *ans->rrs.str);
+ }
+ dequeue = TRUE;
}
}
cur = cur->next;
if (dequeue) {
- adns_queue_head = g_list_remove(adns_queue_head, (void *) almsg);
+ async_dns_queue_head = g_list_remove(async_dns_queue_head, (void *) almsg);
g_free(almsg);
- adns_currently_queued--;
+ async_dns_in_flight--;
}
}
/* Keep the timeout in place */
- return 1;
+ return TRUE;
}
void
host_name_lookup_cleanup(void) {
void *qdata;
- adns_queue_head = g_list_first(adns_queue_head);
- while (adns_queue_head) {
- qdata = adns_queue_head->data;
- adns_queue_head = g_list_remove(adns_queue_head, qdata);
+ async_dns_queue_head = g_list_first(async_dns_queue_head);
+ while (async_dns_queue_head) {
+ qdata = async_dns_queue_head->data;
+ async_dns_queue_head = g_list_remove(async_dns_queue_head, qdata);
g_free(qdata);
}
-
- if (gnu_adns_initialized)
+
+ if (async_dns_initialized)
adns_finish(ads);
+ async_dns_initialized = FALSE;
}
-#else
+#else /* HAVE_GNU_ADNS */
-gint
+gboolean
host_name_lookup_process(gpointer data _U_) {
/* Kill the timeout, as there's nothing for it to do */
- return 0;
+ return FALSE;
}
void
host_name_lookup_cleanup(void) {
}
-#endif /* HAVE_GNU_ADNS */
+#endif /* HAVE_C_ARES */
-extern gchar *get_hostname(guint addr)
+extern const gchar *get_hostname(guint addr)
{
gboolean found;
+ gboolean resolve = g_resolv_flags & RESOLV_NETWORK;
+ hashipv4_t *tp = host_lookup(addr, resolve, &found);
- if (!(g_resolv_flags & RESOLV_NETWORK))
- return ip_to_str((guint8 *)&addr);
+ if (!resolve)
+ return tp->ip;
- return host_name_lookup(addr, &found);
+ return tp->name;
}
+/* -------------------------- */
+
extern const gchar *get_hostname6(struct e_in6_addr *addr)
{
gboolean found;
+ gboolean resolve = g_resolv_flags & RESOLV_NETWORK;
+ hashipv6_t *tp = host_lookup6(addr, resolve, &found);
-#ifdef INET6
- if (!(g_resolv_flags & RESOLV_NETWORK))
- return ip6_to_str(addr);
-#ifdef SOLARIS8_INET6
- if (IN6_IS_ADDR_LINKLOCAL((struct in6_addr*)addr) || IN6_IS_ADDR_MULTICAST((struct in6_addr*)addr))
-#else
- if (IN6_IS_ADDR_LINKLOCAL(addr) || IN6_IS_ADDR_MULTICAST(addr))
-#endif
- return ip6_to_str(addr);
-#endif
-
- return host_name_lookup6(addr, &found);
+ if (!resolve || E_IN6_IS_ADDR_LINKLOCAL(addr) || E_IN6_IS_ADDR_MULTICAST(addr))
+ return tp->ip6;
+ return tp->name;
}
+/* -------------------------- */
extern void add_ipv4_name(guint addr, const gchar *name)
{
int hash_idx;
tp = ipv4_table[hash_idx];
if( tp == NULL ) {
- tp = ipv4_table[hash_idx] = (hashipv4_t *)g_malloc(sizeof(hashipv4_t));
+ tp = ipv4_table[hash_idx] = new_ipv4(addr);
} else {
while(1) {
if (tp->addr == addr) {
- /* address already known */
- if (!tp->is_dummy_entry) {
- return;
- } else {
- /* replace this dummy entry with the new one */
- break;
- }
+ /* address already known */
+ if (!tp->is_dummy_entry) {
+ return;
+ } else {
+ /* replace this dummy entry with the new one */
+ break;
+ }
}
if (tp->next == NULL) {
- tp->next = (hashipv4_t *)g_malloc(sizeof(hashipv4_t));
- tp = tp->next;
- break;
+ tp->next = new_ipv4(addr);
+ tp = tp->next;
+ break;
}
tp = tp->next;
}
}
-
- strncpy(tp->name, name, MAXNAMELEN);
- tp->name[MAXNAMELEN-1] = '\0';
- tp->addr = addr;
- tp->next = NULL;
- tp->is_dummy_entry = FALSE;
-
+ g_strlcpy(tp->name, name, MAXNAMELEN);
+ tp->resolve = TRUE;
} /* add_ipv4_name */
+/* -------------------------- */
extern void add_ipv6_name(struct e_in6_addr *addrp, const gchar *name)
{
int hash_idx;
tp = ipv6_table[hash_idx];
if( tp == NULL ) {
- tp = ipv6_table[hash_idx] = (hashipv6_t *)g_malloc(sizeof(hashipv6_t));
+ tp = ipv6_table[hash_idx] = new_ipv6(addrp);
} else {
while(1) {
if (memcmp(&tp->addr, addrp, sizeof (struct e_in6_addr)) == 0) {
- /* address already known */
- if (!tp->is_dummy_entry) {
- return;
- } else {
- /* replace this dummy entry with the new one */
- break;
- }
+ /* address already known */
+ if (!tp->is_dummy_entry) {
+ return;
+ } else {
+ /* replace this dummy entry with the new one */
+ break;
+ }
}
if (tp->next == NULL) {
- tp->next = (hashipv6_t *)g_malloc(sizeof(hashipv6_t));
- tp = tp->next;
- break;
+ tp->next = new_ipv6(addrp);
+ tp = tp->next;
+ break;
}
tp = tp->next;
}
}
- strncpy(tp->name, name, MAXNAMELEN);
- tp->name[MAXNAMELEN-1] = '\0';
- tp->addr = *addrp;
- tp->next = NULL;
- tp->is_dummy_entry = FALSE;
+ g_strlcpy(tp->name, name, MAXNAMELEN);
+ tp->resolve = TRUE;
} /* add_ipv6_name */
+/* -----------------
+ * unsigned integer to ascii
+*/
+static gchar *ep_utoa(guint port)
+{
+ gchar *bp = ep_alloc(MAXNAMELEN);
+
+ bp = &bp[MAXNAMELEN -1];
+
+ *bp = 0;
+ do {
+ *--bp = (port % 10) +'0';
+ } while ((port /= 10) != 0);
+ return bp;
+}
+
+
extern gchar *get_udp_port(guint port)
{
- static gchar str[3][MAXNAMELEN];
- static gchar *cur;
if (!(g_resolv_flags & RESOLV_TRANSPORT)) {
- if (cur == &str[0][0]) {
- cur = &str[1][0];
- } else if (cur == &str[1][0]) {
- cur = &str[2][0];
- } else {
- cur = &str[0][0];
- }
- sprintf(cur, "%u", port);
- return cur;
+ return ep_utoa(port);
}
return serv_name_lookup(port, PT_UDP);
} /* get_udp_port */
+extern gchar *get_dccp_port(guint port)
+{
+
+ if (!(g_resolv_flags & RESOLV_TRANSPORT)) {
+ return ep_utoa(port);
+ }
+
+ return serv_name_lookup(port, PT_DCCP);
+
+} /* get_dccp_port */
+
+
extern gchar *get_tcp_port(guint port)
{
- static gchar str[3][MAXNAMELEN];
- static gchar *cur;
if (!(g_resolv_flags & RESOLV_TRANSPORT)) {
- if (cur == &str[0][0]) {
- cur = &str[1][0];
- } else if (cur == &str[1][0]) {
- cur = &str[2][0];
- } else {
- cur = &str[0][0];
- }
- sprintf(cur, "%u", port);
- return cur;
+ return ep_utoa(port);
}
return serv_name_lookup(port, PT_TCP);
extern gchar *get_sctp_port(guint port)
{
- static gchar str[3][MAXNAMELEN];
- static gchar *cur;
if (!(g_resolv_flags & RESOLV_TRANSPORT)) {
- if (cur == &str[0][0]) {
- cur = &str[1][0];
- } else if (cur == &str[1][0]) {
- cur = &str[2][0];
- } else {
- cur = &str[0][0];
- }
- sprintf(cur, "%u", port);
- return cur;
+ return ep_utoa(port);
}
return serv_name_lookup(port, PT_SCTP);
} /* get_sctp_port */
-const gchar *get_addr_name(address *addr)
+const gchar *get_addr_name(const address *addr)
{
- guint32 ipv4_addr;
- struct e_in6_addr ipv6_addr;
+ const gchar *result;
- switch (addr->type) {
+ result = solve_address_to_name(addr);
- case AT_ETHER:
- return get_ether_name(addr->data);
+ if (result != NULL)
+ return result;
- case AT_IPv4:
- memcpy(&ipv4_addr, addr->data, sizeof ipv4_addr);
- return get_hostname(ipv4_addr);
+ /* if it gets here, either it is of type AT_NONE, */
+ /* or it should be solvable in address_to_str -unless addr->type is wrongly defined */
- case AT_IPv6:
- memcpy(&ipv6_addr.s6_addr, addr->data, sizeof ipv6_addr.s6_addr);
- return get_hostname6(&ipv6_addr);
+ if (addr->type == AT_NONE){
+ return "NONE";
+ }
- case AT_STRINGZ:
- return addr->data;
+ /* We need an ephemeral allocated string */
+ return ep_address_to_str(addr);
+}
- default:
- return NULL;
+const gchar *se_get_addr_name(const address *addr)
+{
+ const gchar *result;
+
+ result = se_solve_address_to_name(addr);
+
+ if (result != NULL)
+ return result;
+
+ /* if it gets here, either it is of type AT_NONE, */
+ /* or it should be solvable in se_address_to_str -unless addr->type is wrongly defined */
+
+ if (addr->type == AT_NONE){
+ return "NONE";
}
+
+ /* We need a "permanently" allocated string */
+ return se_address_to_str(addr);
}
-extern gchar *get_ether_name(const guint8 *addr)
+void get_addr_name_buf(address *addr, gchar *buf, gsize size)
+{
+ const gchar *result = get_addr_name(addr);
+
+ g_strlcpy(buf, result, size);
+} /* get_addr_name_buf */
+
+
+gchar *get_ether_name(const guint8 *addr)
{
+ hashether_t *tp;
+ gboolean resolve = g_resolv_flags & RESOLV_MAC;
+#if 0
if (!(g_resolv_flags & RESOLV_MAC))
return ether_to_str(addr);
-
- if (!eth_resolution_initialized) {
+#endif
+ if (resolve && !eth_resolution_initialized) {
initialize_ethers();
eth_resolution_initialized = 1;
}
- return eth_name_lookup(addr);
-
+ tp = eth_name_lookup(addr, resolve);
+ return tp->name;
} /* get_ether_name */
+
/* Look for an ether name in the hash, and return it if found.
* If it's not found, simply return NULL. We DO NOT make a new
* hash entry for it with the hex digits turned into a string.
tp = eth_table[hash_idx];
if( tp == NULL ) {
- /* Hash key not found in table.
- * Force a lookup (and a hash entry) for addr, then call
- * myself. I plan on not getting into an infinite loop because
- * eth_name_lookup() is guaranteed to make a hashtable entry,
- * so when I call myself again, I can never get into this
- * block of code again. Knock on wood...
- */
- (void) eth_name_lookup(addr);
- return get_ether_name_if_known(addr); /* a well-placed goto would suffice */
+ /* Hash key not found in table.
+ * Force a lookup (and a hash entry) for addr, then call
+ * myself. I plan on not getting into an infinite loop because
+ * eth_name_lookup() is guaranteed to make a hashtable entry,
+ * so when I call myself again, I can never get into this
+ * block of code again. Knock on wood...
+ */
+ (void) eth_name_lookup(addr, TRUE);
+ return get_ether_name_if_known(addr); /* a well-placed goto would suffice */
}
else {
while(1) {
if (memcmp(tp->addr, addr, sizeof(tp->addr)) == 0) {
- if (!tp->is_dummy_entry) {
- /* A name was found, and its origin is an ethers file */
- return tp->name;
- }
- else {
- /* A name was found, but it was created, not found in a file */
- return NULL;
- }
+ if (!tp->is_dummy_entry) {
+ /* A name was found, and its origin is an ethers file */
+ return tp->name;
+ }
+ else {
+ /* A name was found, but it was created, not found in a file */
+ return NULL;
+ }
}
if (tp->next == NULL) {
- /* Read my reason above for why I'm sure I can't get into an infinite loop */
- (void) eth_name_lookup(addr);
- return get_ether_name_if_known(addr); /* a well-placed goto would suffice */
+ /* Read my reason above for why I'm sure I can't get into an infinite loop */
+ (void) eth_name_lookup(addr, TRUE);
+ return get_ether_name_if_known(addr); /* a well-placed goto would suffice */
}
tp = tp->next;
}
gboolean found;
/* first check that IP address can be resolved */
+ if (!(g_resolv_flags & RESOLV_NETWORK))
+ return;
if ((host = host_name_lookup(ip, &found)) == NULL)
return;
{
if (!(g_resolv_flags & RESOLV_NETWORK)) {
- return ipxnet_to_str_punct(addr, '\0');
+ return ipxnet_to_str_punct(addr, '\0');
}
if (!ipxnet_resolution_initialized) {
extern const gchar *get_manuf_name(const guint8 *addr)
{
- static gchar str[3][MAXMANUFLEN];
- static gchar *cur;
+ gchar *cur;
hashmanuf_t *manufp;
if ((g_resolv_flags & RESOLV_MAC) && !eth_resolution_initialized) {
}
if (!(g_resolv_flags & RESOLV_MAC) || ((manufp = manuf_name_lookup(addr)) == NULL)) {
- if (cur == &str[0][0]) {
- cur = &str[1][0];
- } else if (cur == &str[1][0]) {
- cur = &str[2][0];
- } else {
- cur = &str[0][0];
- }
- sprintf(cur, "%02x:%02x:%02x", addr[0], addr[1], addr[2]);
+ cur=ep_alloc(MAXMANUFLEN);
+ g_snprintf(cur, MAXMANUFLEN, "%02x:%02x:%02x", addr[0], addr[1], addr[2]);
return cur;
}
} /* get_manuf_name */
+const gchar *get_manuf_name_if_known(const guint8 *addr)
+{
+ hashmanuf_t *manufp;
+
+ if (!eth_resolution_initialized) {
+ initialize_ethers();
+ eth_resolution_initialized = 1;
+ }
+
+ if ((manufp = manuf_name_lookup(addr)) == NULL) {
+ return NULL;
+ }
+
+ return manufp->name;
+
+} /* get_manuf_name_if_known */
+
/* Translate a string, assumed either to be a dotted-quad IP address or
* a host name, to a numeric IP address. Return TRUE if we succeed and
* Used more in the dfilter parser rather than in packet dissectors */
gboolean get_host_ipaddr(const char *host, guint32 *addrp)
{
- struct in_addr ipaddr;
- struct hostent *hp;
-
- /*
- * don't change it to inet_pton(AF_INET), they are not 100% compatible.
- * inet_pton(AF_INET) does not support hexadecimal notation nor
- * less-than-4 octet notation.
- */
- if (!inet_aton(host, &ipaddr)) {
- /* It's not a valid dotted-quad IP address; is it a valid
- * host name? */
- hp = gethostbyname(host);
- if (hp == NULL) {
- /* No. */
- return FALSE;
- /* Apparently, some versions of gethostbyaddr can
- * return IPv6 addresses. */
- } else if (hp->h_length <= (int) sizeof (struct in_addr)) {
- memcpy(&ipaddr, hp->h_addr, hp->h_length);
- } else {
- return FALSE;
- }
- } else {
- /* Does the string really contain dotted-quad IP?
- * Check against inet_atons that accept strings such as
- * "130.230" as valid addresses and try to convert them
- * to some form of a classful (host.net) notation.
- */
- unsigned int a0, a1, a2, a3;
- if (sscanf(host, "%u.%u.%u.%u", &a0, &a1, &a2, &a3) != 4)
- return FALSE;
- }
-
- *addrp = g_ntohl(ipaddr.s_addr);
- return TRUE;
+ struct in_addr ipaddr;
+ struct hostent *hp;
+
+ /*
+ * don't change it to inet_pton(AF_INET), they are not 100% compatible.
+ * inet_pton(AF_INET) does not support hexadecimal notation nor
+ * less-than-4 octet notation.
+ */
+ if (!inet_aton(host, &ipaddr)) {
+ /* It's not a valid dotted-quad IP address; is it a valid
+ * host name? */
+ hp = gethostbyname(host);
+ if (hp == NULL) {
+ /* No. */
+ return FALSE;
+ /* Apparently, some versions of gethostbyaddr can
+ * return IPv6 addresses. */
+ } else if (hp->h_length <= (int) sizeof (struct in_addr)) {
+ memcpy(&ipaddr, hp->h_addr, hp->h_length);
+ } else {
+ return FALSE;
+ }
+ } else {
+ /* Does the string really contain dotted-quad IP?
+ * Check against inet_atons that accept strings such as
+ * "130.230" as valid addresses and try to convert them
+ * to some form of a classful (host.net) notation.
+ */
+ unsigned int a0, a1, a2, a3;
+ if (sscanf(host, "%u.%u.%u.%u", &a0, &a1, &a2, &a3) != 4)
+ return FALSE;
+ }
+
+ *addrp = g_ntohl(ipaddr.s_addr);
+ return TRUE;
}
/*
*/
gboolean get_host_ipaddr6(const char *host, struct e_in6_addr *addrp)
{
- struct hostent *hp;
+ struct hostent *hp;
- if (inet_pton(AF_INET6, host, addrp) == 1)
- return TRUE;
+ if (inet_pton(AF_INET6, host, addrp) == 1)
+ return TRUE;
- /* try FQDN */
+ /* try FQDN */
#ifdef HAVE_GETHOSTBYNAME2
- hp = gethostbyname2(host, AF_INET6);
+ hp = gethostbyname2(host, AF_INET6);
#else
- hp = NULL;
+ hp = NULL;
#endif
- if (hp != NULL && hp->h_length == sizeof(struct e_in6_addr)) {
- memcpy(addrp, hp->h_addr, hp->h_length);
- return TRUE;
- }
+ if (hp != NULL && hp->h_length == sizeof(struct e_in6_addr)) {
+ memcpy(addrp, hp->h_addr, hp->h_length);
+ return TRUE;
+ }
- return FALSE;
+ return FALSE;
}
/*
)
{
#ifdef HAVE_GETHOSTBYNAME2
- struct hostent *h;
- return (h = gethostbyname2(host, AF_INET6)) && h->h_addrtype == AF_INET6 ? "ip6" : "ip";
+ struct hostent *h;
+ return (h = gethostbyname2(host, AF_INET6)) && h->h_addrtype == AF_INET6 ? "ip6" : "ip";
#else
- return "ip";
+ return "ip";
#endif
}
git.samba.org / obnox / wireshark / wip.git / blobdiff