From: Florian Forster <octo@collectd.org>
Date: Fri, 7 Sep 2012 09:05:48 +0000 (+0200)
Subject: Merge branch 'collectd-4.10' into collectd-5.0
X-Git-Tag: collectd-5.0.5~7
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=b4c8f3f762d666742c774ab3b45815e5a416e5da;p=collectd.git

Merge branch 'collectd-4.10' into collectd-5.0
---

b4c8f3f762d666742c774ab3b45815e5a416e5da
diff --cc src/utils_dns.c
index cfd0ccfc,2899bd41..80a2ee57
--- a/src/utils_dns.c
+++ b/src/utils_dns.c
@@@ -533,15 -498,15 +532,15 @@@ 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 ((struct ip6_hdr *) ip, len));
 +	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;