X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Futils_dns.c;h=6abfde16fba0f5cd2da6e1da4f98832717f48519;hb=26314b8c3fb08e1f0017ee9a6277b7fe370bf2a0;hp=cfd0ccfc75be7fc202ea93defbbf9b9cae19158a;hpb=4b3e4116a7c512b8e5ac660850a0a2cc6979fe3c;p=collectd.git
diff --git a/src/utils_dns.c b/src/utils_dns.c
index cfd0ccfc..6abfde16 100644
--- a/src/utils_dns.c
+++ b/src/utils_dns.c
@@ -1,12 +1,12 @@
/*
* 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
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
@@ -30,50 +30,26 @@
*
* 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_NETINET_IN_SYSTM_H
-# include
-#endif
-#if HAVE_NETINET_IN_H
-# include
-#endif
-#if HAVE_NETINET_IP6_H
-# include
-#endif
-#if HAVE_NETINET_IP_COMPAT_H
-# include
-#endif
-#if HAVE_ARPA_INET_H
-# include
-#endif
#if HAVE_SYS_SOCKET_H
# include
#endif
-#if HAVE_ARPA_NAMESER_H
-# include
-#endif
-#if HAVE_ARPA_NAMESER_COMPAT_H
-# include
-#endif
-
#if HAVE_NET_IF_ARP_H
# include
#endif
#if HAVE_NET_IF_H
# include
#endif
-#if HAVE_NETINET_IF_ETHER_H
-# include
-#endif
#if HAVE_NET_PPP_DEFS_H
# include
#endif
@@ -81,23 +57,45 @@
# include
#endif
-#if HAVE_NETDB_H
-# include
+#if HAVE_NETINET_IN_SYSTM_H
+# include
+#endif
+#if HAVE_NETINET_IN_H
+# include
+#endif
+#if HAVE_NETINET_IP6_H
+# include
+#endif
+#if HAVE_NETINET_IP_COMPAT_H
+# include
+#endif
+#if HAVE_NETINET_IF_ETHER_H
+# include
#endif
-
#if HAVE_NETINET_IP_H
# include
#endif
#ifdef HAVE_NETINET_IP_VAR_H
# include
#endif
-#if HAVE_NETINET_IP6_H
-# include
-#endif
#if HAVE_NETINET_UDP_H
# include
#endif
+#if HAVE_ARPA_INET_H
+# include
+#endif
+#if HAVE_ARPA_NAMESER_H
+# include
+#endif
+#if HAVE_ARPA_NAMESER_COMPAT_H
+# include
+#endif
+
+#if HAVE_NETDB_H
+# include
+#endif
+
#if HAVE_PCAP_H
# include
#endif
@@ -124,7 +122,7 @@
#if HAVE_STRUCT_UDPHDR_UH_DPORT && HAVE_STRUCT_UDPHDR_UH_SPORT
# define UDP_DEST uh_dport
-# define UDP_SRC uh_dport
+# define UDP_SRC uh_sport
#elif HAVE_STRUCT_UDPHDR_DEST && HAVE_STRUCT_UDPHDR_SOURCE
# define UDP_DEST dest
# define UDP_SRC source
@@ -132,6 +130,10 @@
# error "`struct udphdr' is unusable."
#endif
+#if HAVE_NETINET_IP6_H && HAVE_STRUCT_IP6_EXT
+# define HAVE_IPV6 1
+#endif
+
#include "utils_dns.h"
/*
@@ -447,7 +449,7 @@ handle_udp(const struct udphdr *udp, int len)
return 1;
}
-#if HAVE_NETINET_IP6_H
+#if HAVE_IPV6
static int
handle_ipv6 (struct ip6_hdr *ipv6, int len)
{
@@ -455,7 +457,7 @@ handle_ipv6 (struct ip6_hdr *ipv6, int len)
unsigned int offset;
int nexthdr;
- struct in6_addr s_addr;
+ struct in6_addr c_src_addr;
uint16_t payload_len;
if (0 > len)
@@ -463,10 +465,10 @@ handle_ipv6 (struct ip6_hdr *ipv6, int len)
offset = sizeof (struct ip6_hdr);
nexthdr = ipv6->ip6_nxt;
- s_addr = ipv6->ip6_src;
+ c_src_addr = ipv6->ip6_src;
payload_len = ntohs (ipv6->ip6_plen);
- if (ignore_list_match (&s_addr))
+ if (ignore_list_match (&c_src_addr))
return (0);
/* Parse extension headers. This only handles the standard headers, as
@@ -475,7 +477,6 @@ handle_ipv6 (struct ip6_hdr *ipv6, int len)
|| (IPPROTO_HOPOPTS == nexthdr) /* Hop-by-Hop options. */
|| (IPPROTO_FRAGMENT == nexthdr) /* fragmentation header. */
|| (IPPROTO_DSTOPTS == nexthdr) /* destination options. */
- || (IPPROTO_DSTOPTS == nexthdr) /* destination options. */
|| (IPPROTO_AH == nexthdr) /* destination options. */
|| (IPPROTO_ESP == nexthdr)) /* encapsulating security payload. */
{
@@ -517,31 +518,31 @@ handle_ipv6 (struct ip6_hdr *ipv6, int len)
return (1); /* Success */
} /* int handle_ipv6 */
-/* #endif HAVE_NETINET_IP6_H */
+/* #endif HAVE_IPV6 */
-#else /* if !HAVE_NETINET_IP6_H */
+#else /* if !HAVE_IPV6 */
static int
handle_ipv6 (__attribute__((unused)) void *pkg,
__attribute__((unused)) int len)
{
return (0);
}
-#endif /* !HAVE_NETINET_IP6_H */
+#endif /* !HAVE_IPV6 */
static int
handle_ip(const struct ip *ip, int len)
{
char buf[PCAP_SNAPLEN];
int offset = ip->ip_hl << 2;
- struct in6_addr s_addr;
- struct in6_addr d_addr;
+ struct in6_addr c_src_addr;
+ struct in6_addr c_dst_addr;
if (ip->ip_v == 6)
return (handle_ipv6 ((void *) ip, len));
- in6_addr_from_buffer (&s_addr, &ip->ip_src.s_addr, sizeof (ip->ip_src.s_addr), AF_INET);
- in6_addr_from_buffer (&d_addr, &ip->ip_dst.s_addr, sizeof (ip->ip_dst.s_addr), AF_INET);
- if (ignore_list_match (&s_addr))
+ in6_addr_from_buffer (&c_src_addr, &ip->ip_src.s_addr, sizeof (ip->ip_src.s_addr), AF_INET);
+ in6_addr_from_buffer (&c_dst_addr, &ip->ip_dst.s_addr, sizeof (ip->ip_dst.s_addr), AF_INET);
+ if (ignore_list_match (&c_src_addr))
return (0);
if (IPPROTO_UDP != ip->ip_p)
return 0;