X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_dns.c;h=2a1e2e51d153b925b2aa6ba4c63b17ceb03e3db7;hb=2761915bed8c6caea41018be3e675aa712cc0b0a;hp=2b40676353522922446a300343820de422b96497;hpb=f634a0a8751f51560b065c5041cf457c9a5e7472;p=collectd.git
diff --git a/src/utils_dns.c b/src/utils_dns.c
index 2b406763..2a1e2e51 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,20 +30,17 @@
*
* Authors:
* The Measurement Factory, Inc.
- * Florian octo Forster
+ * Florian octo Forster
*/
#define _DEFAULT_SOURCE
#define _BSD_SOURCE
#include "collectd.h"
+
#include "plugin.h"
#include "common.h"
-#if HAVE_SYS_SOCKET_H
-# include
-#endif
-
#if HAVE_NET_IF_ARP_H
# include
#endif
@@ -66,9 +63,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 +157,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;
@@ -204,9 +195,7 @@ static int cmp_in6_addr (const struct in6_addr *a,
static inline int ignore_list_match (const struct in6_addr *addr)
{
- ip_list_t *ptr;
-
- for (ptr = IgnoreList; ptr != NULL; ptr = ptr->next)
+ for (ip_list_t *ptr = IgnoreList; ptr != NULL; ptr = ptr->next)
if (cmp_in6_addr (addr, &ptr->addr) == 0)
return (1);
return (0);
@@ -219,7 +208,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");
@@ -235,7 +224,6 @@ static void ignore_list_add (const struct in6_addr *addr)
void ignore_list_add_name (const char *name)
{
struct addrinfo *ai_list;
- struct addrinfo *ai_ptr;
struct in6_addr addr;
int status;
@@ -243,7 +231,7 @@ void ignore_list_add_name (const char *name)
if (status != 0)
return;
- for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
+ for (struct addrinfo *ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
{
if (ai_ptr->ai_family == AF_INET)
{
@@ -293,8 +281,7 @@ void dnstop_set_callback (void (*cb) (const rfc1035_header_t *))
#define RFC1035_MAXLABELSZ 63
static int
-rfc1035NameUnpack(const char *buf, size_t sz, off_t * off, char *name, size_t ns
-)
+rfc1035NameUnpack(const char *buf, size_t sz, off_t * off, char *name, size_t ns)
{
off_t no = 0;
unsigned char c;
@@ -302,10 +289,10 @@ rfc1035NameUnpack(const char *buf, size_t sz, off_t * off, char *name, size_t ns
static int loop_detect = 0;
if (loop_detect > 2)
return 4; /* compression loop */
- if (ns <= 0)
+ 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 +304,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 */
@@ -334,7 +321,6 @@ rfc1035NameUnpack(const char *buf, size_t sz, off_t * off, char *name, size_t ns
* "(The 10 and 01 combinations are reserved for future use.)"
*/
return 3; /* reserved label/compression flags */
- break;
} else {
(*off)++;
len = (size_t) c;
@@ -355,7 +341,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 +411,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);
@@ -845,9 +826,7 @@ const char *qtype_str(int t)
default:
ssnprintf (buf, sizeof (buf), "#%i", t);
return (buf);
- }; /* switch (t) */
- /* NOTREACHED */
- return (NULL);
+ } /* switch (t) */
}
const char *opcode_str (int o)
@@ -856,24 +835,18 @@ const char *opcode_str (int o)
switch (o) {
case 0:
return "Query";
- break;
case 1:
return "Iquery";
- break;
case 2:
return "Status";
- break;
case 4:
return "Notify";
- break;
case 5:
return "Update";
- break;
default:
ssnprintf(buf, sizeof (buf), "Opcode%d", o);
return buf;
}
- /* NOTREACHED */
}
const char *rcode_str (int rcode)
@@ -917,8 +890,6 @@ const char *rcode_str (int rcode)
ssnprintf (buf, sizeof (buf), "RCode%i", rcode);
return (buf);
}
- /* Never reached */
- return (NULL);
} /* const char *rcode_str (int rcode) */
#if 0