From ad28576277460fcd189380c4f965879f106b5311 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Wed, 16 Jun 2010 14:12:46 +0200 Subject: [PATCH] dns plugin: Improve / remove error and debug messages. --- src/dns.c | 22 +++++----------------- src/utils_dns.c | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 27 deletions(-) diff --git a/src/dns.c b/src/dns.c index f3280c0b..6e63fe44 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) @@ -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]); } diff --git a/src/utils_dns.c b/src/utils_dns.c index 66798e2b..22c9b959 100644 --- a/src/utils_dns.c +++ b/src/utils_dns.c @@ -358,10 +358,10 @@ handle_dns(const char *buf, int len) uint16_t us; off_t offset; char *t; - int x; + int status; /* The DNS header is 12 bytes long */ - if (len < 12) + if (len < DNS_MSG_HDR_SZ) return 0; memcpy(&us, buf + 0, 2); @@ -392,11 +392,15 @@ handle_dns(const char *buf, int len) memcpy(&us, buf + 10, 2); qh.arcount = ntohs(us); - offset = 12; + offset = DNS_MSG_HDR_SZ; memset(qh.qname, '\0', MAX_QNAME_SZ); - x = rfc1035NameUnpack(buf, len, &offset, qh.qname, MAX_QNAME_SZ); - if (0 != x) + status = rfc1035NameUnpack(buf, len, &offset, qh.qname, MAX_QNAME_SZ); + if (status != 0) + { + INFO ("utils_dns: handle_dns: rfc1035NameUnpack failed " + "with status %i.", status); return 0; + } if ('\0' == qh.qname[0]) sstrncpy (qh.qname, ".", sizeof (qh.qname)); while ((t = strchr(qh.qname, '\n'))) @@ -660,10 +664,6 @@ void handle_pcap(u_char *udata, const struct pcap_pkthdr *hdr, const u_char *pkt { int status; - DEBUG ("handle_pcap (udata = %p, hdr = %p, pkt = %p): hdr->caplen = %i\n", - (void *) udata, (void *) hdr, (void *) pkt, - hdr->caplen); - if (hdr->caplen < ETHER_HDR_LEN) return; @@ -697,7 +697,7 @@ void handle_pcap(u_char *udata, const struct pcap_pkthdr *hdr, const u_char *pkt break; default: - ERROR ("handle_pcap: unsupported data link type %d\n", + ERROR ("handle_pcap: unsupported data link type %d", pcap_datalink(pcap_obj)); status = 0; break; -- 2.11.0