projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/Makefile: Don't unnecessarily set plugin specific CXXFLAGS.
[collectd.git]
/
src
/
utils_dns.c
diff --git
a/src/utils_dns.c
b/src/utils_dns.c
index
6abfde1
..
991d346
100644
(file)
--- a/
src/utils_dns.c
+++ b/
src/utils_dns.c
@@
-40,10
+40,6
@@
#include "plugin.h"
#include "common.h"
#include "plugin.h"
#include "common.h"
-#if HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-
#if HAVE_NET_IF_ARP_H
# include <net/if_arp.h>
#endif
#if HAVE_NET_IF_ARP_H
# include <net/if_arp.h>
#endif
@@
-66,9
+62,6
@@
#if HAVE_NETINET_IP6_H
# include <netinet/ip6.h>
#endif
#if HAVE_NETINET_IP6_H
# include <netinet/ip6.h>
#endif
-#if HAVE_NETINET_IP_COMPAT_H
-# include <netinet/ip_compat.h>
-#endif
#if HAVE_NETINET_IF_ETHER_H
# include <netinet/if_ether.h>
#endif
#if HAVE_NETINET_IF_ETHER_H
# include <netinet/if_ether.h>
#endif
@@
-163,9
+156,6
@@
typedef int (printer)(const char *, ...);
/*
* Global variables
*/
/*
* 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;
#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;
if (ignore_list_match (addr) != 0)
return;
- new = malloc (sizeof (
ip_list_t
));
+ new = malloc (sizeof (
*new
));
if (new == NULL)
{
perror ("malloc");
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 (ns <= 0)
return 4; /* probably compression loop */
do {
- if ((*off) >=
sz
)
+ if ((*off) >=
((off_t) sz)
)
break;
c = *(buf + (*off));
if (c > 191) {
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 */
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 */
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 */
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 */
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;
}
return 0;
}
@@
-425,11
+415,6
@@
handle_dns(const char *buf, int len)
qh.length = (uint16_t) 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);
if (Callback != NULL)
Callback (&qh);