X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Futils_dns.c;h=9a2e479c5ce500a60d396c30140768d9091ab769;hp=5316a71aefc6bae6bb840e4616013146a37384ff;hb=61a1fa91ba73e4fe3a34949f77c5f017056f2b7a;hpb=f5edd182195cb7a13fa32846ae869a8b8dcc1e3f

diff --git a/src/utils_dns.c b/src/utils_dns.c
index 5316a71a..9a2e479c 100644
--- a/src/utils_dns.c
+++ b/src/utils_dns.c
@@ -33,8 +33,11 @@
  *   Florian octo Forster <octo at verplant.org>
  */
 
+#define _BSD_SOURCE
+
 #include "collectd.h"
 #include "plugin.h"
+#include "common.h"
 
 #if HAVE_NETINET_IN_SYSTM_H
 # include <netinet/in_systm.h>
@@ -336,9 +339,7 @@ rfc1035NameUnpack(const char *buf, size_t sz, off_t * off, char *name, size_t ns
 }
 
 static int
-handle_dns(const char *buf, int len,
-	const struct in6_addr *s_addr,
-	const struct in6_addr *d_addr)
+handle_dns(const char *buf, int len)
 {
     rfc1035_header_t qh;
     uint16_t us;
@@ -384,7 +385,7 @@ handle_dns(const char *buf, int len,
     if (0 != x)
 	return 0;
     if ('\0' == qh.qname[0])
-	strncpy (qh.qname, ".", sizeof (qh.qname));
+	sstrncpy (qh.qname, ".", sizeof (qh.qname));
     while ((t = strchr(qh.qname, '\n')))
 	*t = ' ';
     while ((t = strchr(qh.qname, '\r')))
@@ -411,16 +412,14 @@ handle_dns(const char *buf, int len,
 }
 
 static int
-handle_udp(const struct udphdr *udp, int len,
-	const struct in6_addr *s_addr,
-	const struct in6_addr *d_addr)
+handle_udp(const struct udphdr *udp, int len)
 {
     char buf[PCAP_SNAPLEN];
     if ((ntohs (udp->UDP_DEST) != 53)
 		    && (ntohs (udp->UDP_SRC) != 53))
 	return 0;
     memcpy(buf, udp + 1, len - sizeof(*udp));
-    if (0 == handle_dns(buf, len - sizeof(*udp), s_addr, d_addr))
+    if (0 == handle_dns(buf, len - sizeof(*udp)))
 	return 0;
     return 1;
 }
@@ -433,7 +432,6 @@ handle_ipv6 (struct ip6_hdr *ipv6, int len)
     int nexthdr;
 
     struct in6_addr s_addr;
-    struct in6_addr d_addr;
     uint16_t payload_len;
 
     if (0 > len)
@@ -442,7 +440,6 @@ handle_ipv6 (struct ip6_hdr *ipv6, int len)
     offset = sizeof (struct ip6_hdr);
     nexthdr = ipv6->ip6_nxt;
     s_addr = ipv6->ip6_src;
-    d_addr = ipv6->ip6_dst;
     payload_len = ntohs (ipv6->ip6_plen);
 
     if (ignore_list_match (&s_addr))
@@ -491,7 +488,7 @@ handle_ipv6 (struct ip6_hdr *ipv6, int len)
 	return (0);
 
     memcpy (buf, (char *) ipv6 + offset, payload_len);
-    if (handle_udp ((struct udphdr *) buf, payload_len, &s_addr, &d_addr) == 0)
+    if (handle_udp ((struct udphdr *) buf, payload_len) == 0)
 	return (0);
 
     return (1); /* Success */
@@ -515,7 +512,7 @@ handle_ip(const struct ip *ip, int len)
     if (IPPROTO_UDP != ip->ip_p)
 	return 0;
     memcpy(buf, (void *) ip + offset, len - offset);
-    if (0 == handle_udp((struct udphdr *) buf, len - offset, &s_addr, &d_addr))
+    if (0 == handle_udp((struct udphdr *) buf, len - offset))
 	return 0;
     return 1;
 }
@@ -815,8 +812,7 @@ const char *qtype_str(int t)
 	    case T_ANY:		return ("ANY"); /* ... 255 */
 #endif /* __BIND >= 19950621 */
 	    default:
-		    snprintf (buf, 32, "#%i", t);
-		    buf[31] = '\0';
+		    ssnprintf (buf, sizeof (buf), "#%i", t);
 		    return (buf);
     }; /* switch (t) */
     /* NOTREACHED */
@@ -843,7 +839,7 @@ const char *opcode_str (int o)
 	return "Update";
 	break;
     default:
-	snprintf(buf, 30, "Opcode%d", o);
+	ssnprintf(buf, sizeof (buf), "Opcode%d", o);
 	return buf;
     }
     /* NOTREACHED */
@@ -887,8 +883,7 @@ const char *rcode_str (int rcode)
 #endif  /* RFC2136 rcodes */
 #endif /* __BIND >= 19950621 */
 		default:
-			snprintf (buf, 32, "RCode%i", rcode);
-			buf[31] = '\0';
+			ssnprintf (buf, sizeof (buf), "RCode%i", rcode);
 			return (buf);
 	}
 	/* Never reached */