X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Futils_dns.c;h=25ef18998bb9f62ad928130e49b531f71501f15f;hb=89783745dc59079eab34e0c52de6e5e972f50eb2;hp=221bac4bfdcb27c9022e75b20a406946e19bc842;hpb=63b17f56013ccbe262a745f418dc294b72408b02;p=collectd.git diff --git a/src/utils_dns.c b/src/utils_dns.c index 221bac4b..25ef1899 100644 --- a/src/utils_dns.c +++ b/src/utils_dns.c @@ -35,19 +35,23 @@ #include "collectd.h" +#if HAVE_NETINET_IN_SYSTM_H +# include +#endif #if HAVE_NETINET_IN_H # include #endif -#if HAVE_PCAP_H -# include -#endif #if HAVE_ARPA_INET_H # include #endif +#if HAVE_SYS_SOCKET_H +# include +#endif #if HAVE_ARPA_NAMESER_H # include -#elif HAVE_ARPA_NAMESER_COMPAT_H +#endif +#if HAVE_ARPA_NAMESER_COMPAT_H # include #endif @@ -60,23 +64,17 @@ #if HAVE_NETINET_IF_ETHER_H # include #endif +#if HAVE_NET_PPP_DEFS_H +# include +#endif #if HAVE_NET_IF_PPP_H # include #endif -#if HAVE_SYS_SOCKET_H -# include -#endif #if HAVE_NETDB_H # include #endif -#if HAVE_NETINET_IN_SYSTM_H -# include -#endif -#if HAVE_NETINET_IN_H -# include -#endif #if HAVE_NETINET_IP_H # include #endif @@ -90,6 +88,10 @@ # include #endif +#if HAVE_PCAP_H +# include +#endif + #define PCAP_SNAPLEN 1460 #ifndef ETHER_HDR_LEN #define ETHER_ADDR_LEN 6 @@ -110,9 +112,14 @@ # define PPP_CONTROL_VAL 0x03 /* The control byte value */ #endif -#ifdef __linux__ -#define uh_sport source -#define uh_dport dest +#if HAVE_STRUCT_UDPHDR_UH_DPORT && HAVE_STRUCT_UDPHDR_UH_SPORT +# define UDP_DEST uh_dport +# define UDP_SRC uh_dport +#elif HAVE_STRUCT_UDPHDR_DEST && HAVE_STRUCT_UDPHDR_SOURCE +# define UDP_DEST dest +# define UDP_SRC source +#else +# error "`struct udphdr' is unusable." #endif #include "utils_dns.h" @@ -409,8 +416,8 @@ handle_udp(const struct udphdr *udp, int len, const struct in6_addr *d_addr) { char buf[PCAP_SNAPLEN]; - if ((ntohs (udp->uh_dport) != 53) - && (ntohs (udp->uh_sport) != 53)) + 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)) @@ -422,13 +429,16 @@ static int handle_ipv6 (struct ip6_hdr *ipv6, int len) { char buf[PCAP_SNAPLEN]; - int offset; + unsigned int offset; int nexthdr; struct in6_addr s_addr; struct in6_addr d_addr; uint16_t payload_len; + if (0 > len) + return (0); + offset = sizeof (struct ip6_hdr); nexthdr = ipv6->ip6_nxt; s_addr = ipv6->ip6_src; @@ -452,7 +462,7 @@ handle_ipv6 (struct ip6_hdr *ipv6, int len) uint16_t ext_hdr_len; /* Catch broken packets */ - if ((offset + sizeof (struct ip6_ext)) > len) + if ((offset + sizeof (struct ip6_ext)) > (unsigned int)len) return (0); /* Cannot handle fragments. */ @@ -472,7 +482,7 @@ handle_ipv6 (struct ip6_hdr *ipv6, int len) } /* while */ /* Catch broken and empty packets */ - if (((offset + payload_len) > len) + if (((offset + payload_len) > (unsigned int)len) || (payload_len == 0) || (payload_len > PCAP_SNAPLEN)) return (0); @@ -599,6 +609,40 @@ handle_ether(const u_char * pkt, int len) return handle_ip((struct ip *) buf, len); } +#ifdef DLT_LINUX_SLL +static int +handle_linux_sll (const u_char *pkt, int len) +{ + struct sll_header + { + uint16_t pkt_type; + uint16_t dev_type; + uint16_t addr_len; + uint8_t addr[8]; + uint16_t proto_type; + } *hdr; + uint16_t etype; + + if ((0 > len) || ((unsigned int)len < sizeof (struct sll_header))) + return (0); + + hdr = (struct sll_header *) pkt; + pkt = (u_char *) (hdr + 1); + len -= sizeof (struct sll_header); + + etype = ntohs (hdr->proto_type); + + if ((ETHERTYPE_IP != etype) + && (ETHERTYPE_IPV6 != etype)) + return 0; + + if (ETHERTYPE_IPV6 == etype) + return (handle_ipv6 ((struct ip6_hdr *) pkt, len)); + else + return handle_ip((struct ip *) pkt, len); +} +#endif /* DLT_LINUX_SLL */ + /* public function */ void handle_pcap(u_char *udata, const struct pcap_pkthdr *hdr, const u_char *pkt) { @@ -631,6 +675,11 @@ void handle_pcap(u_char *udata, const struct pcap_pkthdr *hdr, const u_char *pkt status = handle_raw (pkt, hdr->caplen); break; #endif +#ifdef DLT_LINUX_SLL + case DLT_LINUX_SLL: + status = handle_linux_sll (pkt, hdr->caplen); + break; +#endif case DLT_NULL: status = handle_null (pkt, hdr->caplen); break; @@ -655,6 +704,7 @@ const char *qtype_str(int t) { static char buf[32]; switch (t) { +#if (defined (__NAMESER)) && (__NAMESER >= 19991006) case ns_t_a: return ("A"); case ns_t_ns: return ("NS"); case ns_t_md: return ("MD"); @@ -703,6 +753,65 @@ const char *qtype_str(int t) case ns_t_maila: return ("MAILA"); case ns_t_any: return ("ANY"); case ns_t_zxfr: return ("ZXFR"); +/* #endif __NAMESER >= 19991006 */ +#elif (defined (__BIND)) && (__BIND >= 19950621) + case T_A: return ("A"); /* 1 ... */ + case T_NS: return ("NS"); + case T_MD: return ("MD"); + case T_MF: return ("MF"); + case T_CNAME: return ("CNAME"); + case T_SOA: return ("SOA"); + case T_MB: return ("MB"); + case T_MG: return ("MG"); + case T_MR: return ("MR"); + case T_NULL: return ("NULL"); + case T_WKS: return ("WKS"); + case T_PTR: return ("PTR"); + case T_HINFO: return ("HINFO"); + case T_MINFO: return ("MINFO"); + case T_MX: return ("MX"); + case T_TXT: return ("TXT"); + case T_RP: return ("RP"); + case T_AFSDB: return ("AFSDB"); + case T_X25: return ("X25"); + case T_ISDN: return ("ISDN"); + case T_RT: return ("RT"); + case T_NSAP: return ("NSAP"); + case T_NSAP_PTR: return ("NSAP_PTR"); + case T_SIG: return ("SIG"); + case T_KEY: return ("KEY"); + case T_PX: return ("PX"); + case T_GPOS: return ("GPOS"); + case T_AAAA: return ("AAAA"); + case T_LOC: return ("LOC"); + case T_NXT: return ("NXT"); + case T_EID: return ("EID"); + case T_NIMLOC: return ("NIMLOC"); + case T_SRV: return ("SRV"); + case T_ATMA: return ("ATMA"); + case T_NAPTR: return ("NAPTR"); /* ... 35 */ +#if (__BIND >= 19960801) + case T_KX: return ("KX"); /* 36 ... */ + case T_CERT: return ("CERT"); + case T_A6: return ("A6"); + case T_DNAME: return ("DNAME"); + case T_SINK: return ("SINK"); + case T_OPT: return ("OPT"); + case T_APL: return ("APL"); + case T_DS: return ("DS"); + case T_SSHFP: return ("SSHFP"); + case T_RRSIG: return ("RRSIG"); + case T_NSEC: return ("NSEC"); + case T_DNSKEY: return ("DNSKEY"); /* ... 48 */ + case T_TKEY: return ("TKEY"); /* 249 */ +#endif /* __BIND >= 19960801 */ + case T_TSIG: return ("TSIG"); /* 250 ... */ + case T_IXFR: return ("IXFR"); + case T_AXFR: return ("AXFR"); + case T_MAILB: return ("MAILB"); + case T_MAILA: return ("MAILA"); + case T_ANY: return ("ANY"); /* ... 255 */ +#endif /* __BIND >= 19950621 */ default: snprintf (buf, 32, "#%i", t); buf[31] = '\0'; @@ -743,6 +852,7 @@ const char *rcode_str (int rcode) static char buf[32]; switch (rcode) { +#if (defined (__NAMESER)) && (__NAMESER >= 19991006) case ns_r_noerror: return ("NOERROR"); case ns_r_formerr: return ("FORMERR"); case ns_r_servfail: return ("SERVFAIL"); @@ -758,6 +868,22 @@ const char *rcode_str (int rcode) case ns_r_badsig: return ("BADSIG"); case ns_r_badkey: return ("BADKEY"); case ns_r_badtime: return ("BADTIME"); +/* #endif __NAMESER >= 19991006 */ +#elif (defined (__BIND)) && (__BIND >= 19950621) + case NOERROR: return ("NOERROR"); + case FORMERR: return ("FORMERR"); + case SERVFAIL: return ("SERVFAIL"); + case NXDOMAIN: return ("NXDOMAIN"); + case NOTIMP: return ("NOTIMP"); + case REFUSED: return ("REFUSED"); +#if defined (YXDOMAIN) && defined (NXRRSET) + case YXDOMAIN: return ("YXDOMAIN"); + case YXRRSET: return ("YXRRSET"); + case NXRRSET: return ("NXRRSET"); + case NOTAUTH: return ("NOTAUTH"); + case NOTZONE: return ("NOTZONE"); +#endif /* RFC2136 rcodes */ +#endif /* __BIND >= 19950621 */ default: snprintf (buf, 32, "RCode%i", rcode); buf[31] = '\0';