projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.10'
[collectd.git]
/
src
/
dns.c
diff --git
a/src/dns.c
b/src/dns.c
index
364b958
..
09082fc
100644
(file)
--- a/
src/dns.c
+++ b/
src/dns.c
@@
-63,8
+63,8
@@
static int select_numeric_qtype = 1;
#define PCAP_SNAPLEN 1460
static char *pcap_device = NULL;
#define PCAP_SNAPLEN 1460
static char *pcap_device = NULL;
-static
counter
_t tr_queries;
-static
counter
_t tr_responses;
+static
derive
_t tr_queries;
+static
derive
_t tr_responses;
static counter_list_t *qtype_list;
static counter_list_t *opcode_list;
static counter_list_t *rcode_list;
static counter_list_t *qtype_list;
static counter_list_t *opcode_list;
static counter_list_t *rcode_list;
@@
-84,14
+84,10
@@
static counter_list_t *counter_list_search (counter_list_t **list, unsigned int
{
counter_list_t *entry;
{
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;
for (entry = *list; entry != NULL; entry = entry->next)
if (entry->key == key)
break;
- DEBUG ("return (%p)", (void *) entry);
return (entry);
}
return (entry);
}
@@
-100,9
+96,6
@@
static counter_list_t *counter_list_create (counter_list_t **list,
{
counter_list_t *entry;
{
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);
entry = (counter_list_t *) malloc (sizeof (counter_list_t));
if (entry == NULL)
return (NULL);
@@
-126,7
+119,6
@@
static counter_list_t *counter_list_create (counter_list_t **list,
last->next = entry;
}
last->next = entry;
}
- DEBUG ("return (%p)", (void *) entry);
return (entry);
}
return (entry);
}
@@
-135,9
+127,6
@@
static void counter_list_add (counter_list_t **list,
{
counter_list_t *entry;
{
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)
entry = counter_list_search (list, key);
if (entry != NULL)
@@
-148,7
+137,6
@@
static void counter_list_add (counter_list_t **list,
{
counter_list_create (list, key, increment);
}
{
counter_list_create (list, key, increment);
}
- DEBUG ("return ()");
}
static int dns_config (const char *key, const char *value)
}
static int dns_config (const char *key, const char *value)
@@
-242,7
+230,7
@@
static void *dns_child_loop (__attribute__((unused)) void *dummy)
pcap_obj = pcap_open_live ((pcap_device != NULL) ? pcap_device : "any",
PCAP_SNAPLEN,
0 /* Not promiscuous */,
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)
{
pcap_error);
if (pcap_obj == NULL)
{
@@
-265,7
+253,7
@@
static void *dns_child_loop (__attribute__((unused)) void *dummy)
return (NULL);
}
return (NULL);
}
- DEBUG ("PCAP object created.");
+ DEBUG ("
dns plugin:
PCAP object created.");
dnstop_set_pcap_obj (pcap_obj);
dnstop_set_callback (dns_child_callback);
dnstop_set_pcap_obj (pcap_obj);
dnstop_set_callback (dns_child_callback);
@@
-278,7
+266,7
@@
static void *dns_child_loop (__attribute__((unused)) void *dummy)
ERROR ("dns plugin: Listener thread is exiting "
"abnormally: %s", pcap_geterr (pcap_obj));
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;
pcap_close (pcap_obj);
listen_thread_init = 0;
@@
-315,13
+303,13
@@
static int dns_init (void)
return (0);
} /* int dns_init */
return (0);
} /* int dns_init */
-static void submit_
counter
(const char *type, const char *type_instance,
-
counter
_t value)
+static void submit_
derive
(const char *type, const char *type_instance,
+
derive
_t value)
{
value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
{
value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
- values[0].
counter
= value;
+ values[0].
derive
= value;
vl.values = values;
vl.values_len = 1;
vl.values = values;
vl.values_len = 1;
@@
-331,15
+319,15
@@
static void submit_counter (const char *type, const char *type_instance,
sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
plugin_dispatch_values (&vl);
sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
plugin_dispatch_values (&vl);
-} /* void submit_
counter
*/
+} /* void submit_
derive
*/
-static void submit_octets (
counter_t queries, counter
_t responses)
+static void submit_octets (
derive_t queries, derive
_t responses)
{
value_t values[2];
value_list_t vl = VALUE_LIST_INIT;
{
value_t values[2];
value_list_t vl = VALUE_LIST_INIT;
- values[0].
counter
= queries;
- values[1].
counter
= responses;
+ values[0].
derive
= queries;
+ values[1].
derive
= responses;
vl.values = values;
vl.values_len = 2;
vl.values = values;
vl.values_len = 2;
@@
-348,7
+336,7
@@
static void submit_octets (counter_t queries, counter_t responses)
sstrncpy (vl.type, "dns_octets", sizeof (vl.type));
plugin_dispatch_values (&vl);
sstrncpy (vl.type, "dns_octets", sizeof (vl.type));
plugin_dispatch_values (&vl);
-} /* void submit_
counter
*/
+} /* void submit_
octets
*/
static int dns_read (void)
{
static int dns_read (void)
{
@@
-379,8
+367,8
@@
static int dns_read (void)
for (i = 0; i < len; i++)
{
for (i = 0; i < len; i++)
{
- DEBUG ("qtype = %u; counter = %u;", keys[i], values[i]);
- submit_
counter
("dns_qtype", qtype_str (keys[i]), values[i]);
+ DEBUG ("
dns plugin:
qtype = %u; counter = %u;", keys[i], values[i]);
+ submit_
derive
("dns_qtype", qtype_str (keys[i]), values[i]);
}
pthread_mutex_lock (&opcode_mutex);
}
pthread_mutex_lock (&opcode_mutex);
@@
-395,8
+383,8
@@
static int dns_read (void)
for (i = 0; i < len; i++)
{
for (i = 0; i < len; i++)
{
- DEBUG ("opcode = %u; counter = %u;", keys[i], values[i]);
- submit_
counter
("dns_opcode", opcode_str (keys[i]), values[i]);
+ DEBUG ("
dns plugin:
opcode = %u; counter = %u;", keys[i], values[i]);
+ submit_
derive
("dns_opcode", opcode_str (keys[i]), values[i]);
}
pthread_mutex_lock (&rcode_mutex);
}
pthread_mutex_lock (&rcode_mutex);
@@
-411,8
+399,8
@@
static int dns_read (void)
for (i = 0; i < len; i++)
{
for (i = 0; i < len; i++)
{
- DEBUG ("rcode = %u; counter = %u;", keys[i], values[i]);
- submit_
counter
("dns_rcode", rcode_str (keys[i]), values[i]);
+ DEBUG ("
dns plugin:
rcode = %u; counter = %u;", keys[i], values[i]);
+ submit_
derive
("dns_rcode", rcode_str (keys[i]), values[i]);
}
return (0);
}
return (0);