projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.4' into collectd-4.5
[collectd.git]
/
src
/
utils_dns.c
diff --git
a/src/utils_dns.c
b/src/utils_dns.c
index
25ef189
..
c16ca52
100644
(file)
--- a/
src/utils_dns.c
+++ b/
src/utils_dns.c
@@
-34,6
+34,7
@@
*/
#include "collectd.h"
*/
#include "collectd.h"
+#include "common.h"
#if HAVE_NETINET_IN_SYSTM_H
# include <netinet/in_systm.h>
#if HAVE_NETINET_IN_SYSTM_H
# include <netinet/in_systm.h>
@@
-384,13
+385,13
@@
handle_dns(const char *buf, int len,
if (0 != x)
return 0;
if ('\0' == qh.qname[0])
if (0 != x)
return 0;
if ('\0' == qh.qname[0])
- s
trcpy(qh.qname, "."
);
+ s
strncpy (qh.qname, ".", sizeof (qh.qname)
);
while ((t = strchr(qh.qname, '\n')))
*t = ' ';
while ((t = strchr(qh.qname, '\r')))
*t = ' ';
for (t = qh.qname; *t; t++)
while ((t = strchr(qh.qname, '\n')))
*t = ' ';
while ((t = strchr(qh.qname, '\r')))
*t = ' ';
for (t = qh.qname; *t; t++)
- *t = tolower(*t);
+ *t = tolower(
(int)
*t);
memcpy(&us, buf + offset, 2);
qh.qtype = ntohs(us);
memcpy(&us, buf + offset, 2);
qh.qtype = ntohs(us);
@@
-704,7
+705,7
@@
const char *qtype_str(int t)
{
static char buf[32];
switch (t) {
{
static char buf[32];
switch (t) {
-#if (defined (__NAMESER)) && (__NAMESER >= 1999100
6
)
+#if (defined (__NAMESER)) && (__NAMESER >= 1999100
1
)
case ns_t_a: return ("A");
case ns_t_ns: return ("NS");
case ns_t_md: return ("MD");
case ns_t_a: return ("A");
case ns_t_ns: return ("NS");
case ns_t_md: return ("MD");
@@
-746,7
+747,9
@@
const char *qtype_str(int t)
case ns_t_dname: return ("DNAME");
case ns_t_sink: return ("SINK");
case ns_t_opt: return ("OPT");
case ns_t_dname: return ("DNAME");
case ns_t_sink: return ("SINK");
case ns_t_opt: return ("OPT");
+# if __NAMESER >= 19991006
case ns_t_tsig: return ("TSIG");
case ns_t_tsig: return ("TSIG");
+# endif
case ns_t_ixfr: return ("IXFR");
case ns_t_axfr: return ("AXFR");
case ns_t_mailb: return ("MAILB");
case ns_t_ixfr: return ("IXFR");
case ns_t_axfr: return ("AXFR");
case ns_t_mailb: return ("MAILB");
@@
-813,8
+816,7
@@
const char *qtype_str(int t)
case T_ANY: return ("ANY"); /* ... 255 */
#endif /* __BIND >= 19950621 */
default:
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 */
return (buf);
}; /* switch (t) */
/* NOTREACHED */
@@
-841,7
+843,7
@@
const char *opcode_str (int o)
return "Update";
break;
default:
return "Update";
break;
default:
- s
nprintf(buf, 30
, "Opcode%d", o);
+ s
snprintf(buf, sizeof (buf)
, "Opcode%d", o);
return buf;
}
/* NOTREACHED */
return buf;
}
/* NOTREACHED */
@@
-885,8
+887,7
@@
const char *rcode_str (int rcode)
#endif /* RFC2136 rcodes */
#endif /* __BIND >= 19950621 */
default:
#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 */
return (buf);
}
/* Never reached */