projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
curl_xml: fix 3 small memory leaks
[collectd.git]
/
src
/
dns.c
diff --git
a/src/dns.c
b/src/dns.c
index
8a2e87e
..
364b958
100644
(file)
--- a/
src/dns.c
+++ b/
src/dns.c
@@
-1,6
+1,7
@@
/**
* collectd - src/dns.c
/**
* collectd - src/dns.c
- * Copyright (C) 2006,2007 Florian octo Forster
+ * Copyright (C) 2006-2011 Florian octo Forster
+ * Copyright (C) 2009 Mirko Buffoni
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@
-16,7
+17,8
@@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* Authors:
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* Authors:
- * Florian octo Forster <octo at verplant.org>
+ * Florian octo Forster <octo at collectd.org>
+ * Mirko Buffoni <briareos at eswat.org>
**/
#define _BSD_SOURCE
**/
#define _BSD_SOURCE
@@
-28,9
+30,13
@@
#include "utils_dns.h"
#include <pthread.h>
#include "utils_dns.h"
#include <pthread.h>
-#include <pcap.h>
#include <poll.h>
#include <poll.h>
+#include <pcap.h>
+#if HAVE_PCAP_BPF_H
+# include <pcap-bpf.h>
+#endif
+
/*
* Private data types
*/
/*
* Private data types
*/
@@
-216,7
+222,7
@@
static void dns_child_callback (const rfc1035_header_t *dns)
pthread_mutex_unlock (&opcode_mutex);
}
pthread_mutex_unlock (&opcode_mutex);
}
-static void *dns_child_loop (
void __attribute__((unused))
*dummy)
+static void *dns_child_loop (
__attribute__((unused)) void
*dummy)
{
pcap_t *pcap_obj;
char pcap_error[PCAP_ERRBUF_SIZE];
{
pcap_t *pcap_obj;
char pcap_error[PCAP_ERRBUF_SIZE];