X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdns.c;h=47da4e94c122e60dbd3084212e09e71cb3e5fbc1;hb=83077c18c3e78739c2d2d18debf99875944eaa72;hp=f3280c0bed9f65ef37d3e8e554be640ca36ab83d;hpb=4374305bd9523620d4291c9be5bfd81640f789a7;p=collectd.git

diff --git a/src/dns.c b/src/dns.c
index f3280c0b..47da4e94 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -80,14 +80,10 @@ static counter_list_t *counter_list_search (counter_list_t **list, unsigned int
 {
 	counter_list_t *entry;
 
-	DEBUG ("counter_list_search (list = %p, key = %u)",
-			(void *) *list, key);
-
 	for (entry = *list; entry != NULL; entry = entry->next)
 		if (entry->key == key)
 			break;
 
-	DEBUG ("return (%p)", (void *) entry);
 	return (entry);
 }
 
@@ -96,9 +92,6 @@ static counter_list_t *counter_list_create (counter_list_t **list,
 {
 	counter_list_t *entry;
 
-	DEBUG ("counter_list_create (list = %p, key = %u, value = %u)",
-			(void *) *list, key, value);
-
 	entry = (counter_list_t *) malloc (sizeof (counter_list_t));
 	if (entry == NULL)
 		return (NULL);
@@ -122,7 +115,6 @@ static counter_list_t *counter_list_create (counter_list_t **list,
 		last->next = entry;
 	}
 
-	DEBUG ("return (%p)", (void *) entry);
 	return (entry);
 }
 
@@ -131,9 +123,6 @@ static void counter_list_add (counter_list_t **list,
 {
 	counter_list_t *entry;
 
-	DEBUG ("counter_list_add (list = %p, key = %u, increment = %u)",
-			(void *) *list, key, increment);
-
 	entry = counter_list_search (list, key);
 
 	if (entry != NULL)
@@ -144,7 +133,6 @@ static void counter_list_add (counter_list_t **list,
 	{
 		counter_list_create (list, key, increment);
 	}
-	DEBUG ("return ()");
 }
 
 static int dns_config (const char *key, const char *value)
@@ -238,7 +226,7 @@ static void *dns_child_loop (void __attribute__((unused)) *dummy)
 	pcap_obj = pcap_open_live ((pcap_device != NULL) ? pcap_device : "any",
 			PCAP_SNAPLEN,
 			0 /* Not promiscuous */,
-			interval_g,
+			(int) CDTIME_T_TO_MS (interval_g / 2),
 			pcap_error);
 	if (pcap_obj == NULL)
 	{
@@ -261,7 +249,7 @@ static void *dns_child_loop (void __attribute__((unused)) *dummy)
 		return (NULL);
 	}
 
-	DEBUG ("PCAP object created.");
+	DEBUG ("dns plugin: PCAP object created.");
 
 	dnstop_set_pcap_obj (pcap_obj);
 	dnstop_set_callback (dns_child_callback);
@@ -274,7 +262,7 @@ static void *dns_child_loop (void __attribute__((unused)) *dummy)
 		ERROR ("dns plugin: Listener thread is exiting "
 				"abnormally: %s", pcap_geterr (pcap_obj));
 
-	DEBUG ("child is exiting");
+	DEBUG ("dns plugin: Child is exiting.");
 
 	pcap_close (pcap_obj);
 	listen_thread_init = 0;
@@ -375,7 +363,7 @@ static int dns_read (void)
 
 	for (i = 0; i < len; i++)
 	{
-		DEBUG ("qtype = %u; counter = %u;", keys[i], values[i]);
+		DEBUG ("dns plugin: qtype = %u; counter = %u;", keys[i], values[i]);
 		submit_counter ("dns_qtype", qtype_str (keys[i]), values[i]);
 	}
 
@@ -391,7 +379,7 @@ static int dns_read (void)
 
 	for (i = 0; i < len; i++)
 	{
-		DEBUG ("opcode = %u; counter = %u;", keys[i], values[i]);
+		DEBUG ("dns plugin: opcode = %u; counter = %u;", keys[i], values[i]);
 		submit_counter ("dns_opcode", opcode_str (keys[i]), values[i]);
 	}
 
@@ -407,7 +395,7 @@ static int dns_read (void)
 
 	for (i = 0; i < len; i++)
 	{
-		DEBUG ("rcode = %u; counter = %u;", keys[i], values[i]);
+		DEBUG ("dns plugin: rcode = %u; counter = %u;", keys[i], values[i]);
 		submit_counter ("dns_rcode", rcode_str (keys[i]), values[i]);
 	}