Merge branch 'collectd-5.4'

[collectd.git] / src / utils_dns.h

diff --git a/src/utils_dns.h b/src/utils_dns.h
index 6a613a7..83f0ea4 100644 (file)
--- a/src/utils_dns.h
+++ b/src/utils_dns.h
@@ -1,8 +1,7 @@
-#ifndef COLLECTD_UTILS_DNS_H
-#define COLLECTD_UTILS_DNS_H 1
 /*
  * collectd - src/utils_dns.h
- * Copyright (C) 2006  Florian octo Forster
+ * Copyright (C) 2006       Florian octo Forster
+ * Copyright (C) 2002       The Measurement Factory, Inc.
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -30,11 +29,23 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * Authors:
- *   Florian octo Forster <octo at verplant.org>
+ *   The Measurement Factory, Inc. <http://www.measurement-factory.com/>
+ *   Florian octo Forster <octo at collectd.org>
  */
 
+#ifndef COLLECTD_UTILS_DNS_H
+#define COLLECTD_UTILS_DNS_H 1
+
+#include "config.h"
+
 #include <arpa/nameser.h>
-#include <pcap.h>
+#include <stdint.h>
+
+#if HAVE_PCAP_H
+# include <pcap.h>
+#endif
+
+#define DNS_MSG_HDR_SZ 12
 
 #define T_MAX 65536
 #define OP_MAX 16
@@ -68,11 +79,15 @@ extern int qtype_counts[T_MAX];
 extern int opcode_counts[OP_MAX];
 extern int qclass_counts[C_MAX];
 
+#if HAVE_PCAP_H
 void dnstop_set_pcap_obj (pcap_t *po);
+#endif
 void dnstop_set_callback (void (*cb) (const rfc1035_header_t *));
 
 void ignore_list_add_name (const char *name);
+#if HAVE_PCAP_H
 void handle_pcap (u_char * udata, const struct pcap_pkthdr *hdr, const u_char * pkt);
+#endif
 
 const char *qtype_str(int t);
 const char *opcode_str(int o);