X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_dns.c;h=a412809fab051c77c718b158b623f813a2cbf49e;hb=83149d73b8a3bd4889517a2e4d0adca0a52e7a06;hp=19afe55e904fe08d75b64e333f790cbdcbb796e1;hpb=27f7e9a53a309c23143691c37e50727a5f0e2386;p=collectd.git diff --git a/src/utils_dns.c b/src/utils_dns.c index 19afe55e..a412809f 100644 --- a/src/utils_dns.c +++ b/src/utils_dns.c @@ -33,39 +33,64 @@ * Florian octo Forster */ -#include -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef __APPLE__ -#include -#endif - -#include -#include -#include -#include - -#include -#include -#include -#include - -#include +#include "collectd.h" + +#if HAVE_NETINET_IN_SYSTM_H +# include +#endif +#if HAVE_NETINET_IN_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 +#if HAVE_NET_IF_PPP_H +# include +#endif + +#if HAVE_NETDB_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_PCAP_H +# include +#endif #define PCAP_SNAPLEN 1460 #ifndef ETHER_HDR_LEN @@ -80,7 +105,6 @@ # define ETHERTYPE_IPV6 0x86DD #endif -#include #ifndef PPP_ADDRESS_VAL # define PPP_ADDRESS_VAL 0xff /* The address byte value */ #endif @@ -88,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" @@ -126,33 +155,39 @@ int qtype_counts[T_MAX]; int opcode_counts[OP_MAX]; int qclass_counts[C_MAX]; +#if HAVE_PCAP_H static pcap_t *pcap_obj = NULL; +#endif static ip_list_t *IgnoreList = NULL; +#if HAVE_PCAP_H static void (*Callback) (const rfc1035_header_t *) = NULL; static int query_count_intvl = 0; static int query_count_total = 0; -#ifdef __OpenBSD__ +# ifdef __OpenBSD__ static struct bpf_timeval last_ts; -#else +# else static struct timeval last_ts; -#endif +# endif /* __OpenBSD__ */ +#endif /* HAVE_PCAP_H */ static int cmp_in6_addr (const struct in6_addr *a, const struct in6_addr *b) { int i; - for (i = 0; i < 4; i++) - if (a->s6_addr32[i] != b->s6_addr32[i]) + assert (sizeof (struct in6_addr) == 16); + + for (i = 0; i < 16; i++) + if (a->s6_addr[i] != b->s6_addr[i]) break; - if (i >= 4) + if (i >= 16) return (0); - return (a->s6_addr32[i] > b->s6_addr32[i] ? 1 : -1); + return (a->s6_addr[i] > b->s6_addr[i] ? 1 : -1); } /* int cmp_addrinfo */ static inline int ignore_list_match (const struct in6_addr *addr) @@ -200,10 +235,10 @@ void ignore_list_add_name (const char *name) { if (ai_ptr->ai_family == AF_INET) { - addr.s6_addr32[0] = 0; - addr.s6_addr32[1] = 0; - addr.s6_addr32[2] = htonl (0x0000FFFF); - addr.s6_addr32[3] = ((struct sockaddr_in *) ai_ptr->ai_addr)->sin_addr.s_addr; + memset (&addr, '\0', sizeof (addr)); + addr.s6_addr[10] = 0xFF; + addr.s6_addr[11] = 0xFF; + memcpy (addr.s6_addr + 12, &((struct sockaddr_in *) ai_ptr->ai_addr)->sin_addr, 4); ignore_list_add (&addr); } @@ -216,6 +251,7 @@ void ignore_list_add_name (const char *name) freeaddrinfo (ai_list); } +#if HAVE_PCAP_H static void in6_addr_from_buffer (struct in6_addr *ia, const void *buf, size_t buf_len, int family) @@ -223,8 +259,9 @@ static void in6_addr_from_buffer (struct in6_addr *ia, memset (ia, 0, sizeof (struct in6_addr)); if ((AF_INET == family) && (sizeof (uint32_t) == buf_len)) { - ia->s6_addr32[2] = htonl (0x0000FFFF); - ia->s6_addr32[3] = *((uint32_t *) buf); + ia->s6_addr[10] = 0xFF; + ia->s6_addr[11] = 0xFF; + memcpy (ia->s6_addr + 12, buf, buf_len); } else if ((AF_INET6 == family) && (sizeof (struct in6_addr) == buf_len)) { @@ -379,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)) @@ -480,6 +517,7 @@ handle_ip(const struct ip *ip, int len) return 1; } +#if HAVE_NET_IF_PPP_H static int handle_ppp(const u_char * pkt, int len) { @@ -509,6 +547,7 @@ handle_ppp(const u_char * pkt, int len) memcpy(buf, pkt, len); return handle_ip((struct ip *) buf, len); } +#endif /* HAVE_NET_IF_PPP_H */ static int handle_null(const u_char * pkt, int len) @@ -567,6 +606,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 (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) { @@ -584,9 +657,11 @@ void handle_pcap(u_char *udata, const struct pcap_pkthdr *hdr, const u_char *pkt case DLT_EN10MB: status = handle_ether (pkt, hdr->caplen); break; +#if HAVE_NET_IF_PPP_H case DLT_PPP: status = handle_ppp (pkt, hdr->caplen); break; +#endif #ifdef DLT_LOOP case DLT_LOOP: status = handle_loop (pkt, hdr->caplen); @@ -597,6 +672,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; @@ -615,11 +695,13 @@ void handle_pcap(u_char *udata, const struct pcap_pkthdr *hdr, const u_char *pkt query_count_total++; last_ts = hdr->ts; } +#endif /* HAVE_PCAP_H */ 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"); @@ -668,6 +750,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'; @@ -708,6 +849,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"); @@ -723,6 +865,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'; @@ -831,7 +989,7 @@ main(int argc, char *argv[]) case DLT_EN10MB: handle_datalink = handle_ether; break; -#if USE_PPP +#if HAVE_NET_IF_PPP_H case DLT_PPP: handle_datalink = handle_ppp; break; @@ -898,3 +1056,6 @@ main(int argc, char *argv[]) return 0; } /* static int main(int argc, char *argv[]) */ #endif +/* + * vim:shiftwidth=4:tabstop=8:softtabstop=4 + */