X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Futils_dns.c;h=991d346a4e4d034dade4423ea3ec9776747d28a4;hb=82e59ce7eb02c78d911dac7663383ce372b79c90;hp=2b40676353522922446a300343820de422b96497;hpb=43a771aa5443266cca4cb7aecaf70eb75100a32c;p=collectd.git
diff --git a/src/utils_dns.c b/src/utils_dns.c
index 2b406763..991d346a 100644
--- a/src/utils_dns.c
+++ b/src/utils_dns.c
@@ -1,7 +1,7 @@
/*
* collectd - src/utils_dns.c
- * Modifications Copyright (C) 2006 Florian octo Forster
- * Copyright (C) 2002 The Measurement Factory, Inc.
+ * 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,7 +30,7 @@
*
* Authors:
* The Measurement Factory, Inc.
- * Florian octo Forster
+ * Florian octo Forster
*/
#define _DEFAULT_SOURCE
@@ -40,10 +40,6 @@
#include "plugin.h"
#include "common.h"
-#if HAVE_SYS_SOCKET_H
-# include
-#endif
-
#if HAVE_NET_IF_ARP_H
# include
#endif
@@ -66,9 +62,6 @@
#if HAVE_NETINET_IP6_H
# include
#endif
-#if HAVE_NETINET_IP_COMPAT_H
-# include
-#endif
#if HAVE_NETINET_IF_ETHER_H
# include
#endif
@@ -163,9 +156,6 @@ typedef int (printer)(const char *, ...);
/*
* Global variables
*/
-int qtype_counts[T_MAX];
-int opcode_counts[OP_MAX];
-int qclass_counts[C_MAX];
#if HAVE_PCAP_H
static pcap_t *pcap_obj = NULL;
@@ -219,7 +209,7 @@ static void ignore_list_add (const struct in6_addr *addr)
if (ignore_list_match (addr) != 0)
return;
- new = malloc (sizeof (ip_list_t));
+ new = malloc (sizeof (*new));
if (new == NULL)
{
perror ("malloc");
@@ -305,7 +295,7 @@ rfc1035NameUnpack(const char *buf, size_t sz, off_t * off, char *name, size_t ns
if (ns <= 0)
return 4; /* probably compression loop */
do {
- if ((*off) >= sz)
+ if ((*off) >= ((off_t) sz))
break;
c = *(buf + (*off));
if (c > 191) {
@@ -317,11 +307,11 @@ rfc1035NameUnpack(const char *buf, size_t sz, off_t * off, char *name, size_t ns
s = ntohs(s);
(*off) += sizeof(s);
/* Sanity check */
- if ((*off) >= sz)
+ if ((*off) >= ((off_t) sz))
return 1; /* message too short */
ptr = s & 0x3FFF;
/* Make sure the pointer is inside this message */
- if (ptr >= sz)
+ if (ptr >= ((off_t) sz))
return 2; /* bad compression ptr */
if (ptr < DNS_MSG_HDR_SZ)
return 2; /* bad compression ptr */
@@ -355,7 +345,7 @@ rfc1035NameUnpack(const char *buf, size_t sz, off_t * off, char *name, size_t ns
if (no > 0)
*(name + no - 1) = '\0';
/* make sure we didn't allow someone to overflow the name buffer */
- assert(no <= ns);
+ assert(no <= ((off_t) ns));
return 0;
}
@@ -425,11 +415,6 @@ handle_dns(const char *buf, int len)
qh.length = (uint16_t) len;
- /* gather stats */
- qtype_counts[qh.qtype]++;
- qclass_counts[qh.qclass]++;
- opcode_counts[qh.opcode]++;
-
if (Callback != NULL)
Callback (&qh);