From fdfbf887b399bca44d6950d4c23e40debc5660e4 Mon Sep 17 00:00:00 2001
From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 25 Oct 2006 15:43:10 +0200
Subject: [PATCH] Renamed the `named'-plugin to `dns'-plugin.

---
 configure.in                  |  6 +++---
 src/Makefile.am               | 14 +++++++-------
 src/{named.c => dns.c}        |  2 +-
 src/{dnstop.c => utils_dns.c} |  4 ++--
 src/{dnstop.h => utils_dns.h} |  8 ++++----
 5 files changed, 17 insertions(+), 17 deletions(-)
 rename src/{named.c => dns.c} (99%)
 rename src/{dnstop.c => utils_dns.c} (99%)
 rename src/{dnstop.h => utils_dns.h} (95%)

diff --git a/configure.in b/configure.in
index 25948181..48eb9015 100644
--- a/configure.in
+++ b/configure.in
@@ -272,7 +272,7 @@ AC_CHECK_HEADERS(kvm.h)
 # For debugging interface (variable number of arguments)
 AC_CHECK_HEADERS(stdarg.h)
 
-# For the named plugin
+# For the dns plugin
 AC_CHECK_HEADERS(arpa/nameser.h)
 
 dnl Checking for libraries
@@ -945,13 +945,13 @@ AC_COLLECTD([cpu],       [disable], [module], [cpu usage statistics])
 AC_COLLECTD([cpufreq],   [disable], [module], [system cpu frequency statistics])
 AC_COLLECTD([disk],      [disable], [module], [disk/partition statistics])
 AC_COLLECTD([df],        [disable], [module], [df statistics])
+AC_COLLECTD([dns],       [disable], [module], [dns statistics])
 AC_COLLECTD([quota],     [enable],  [module], [quota statistics (experimental)])
 AC_COLLECTD([hddtemp],   [disable], [module], [hdd temperature statistics])
 AC_COLLECTD([load],      [disable], [module], [system load statistics])
 AC_COLLECTD([memory],    [disable], [module], [memory statistics])
 AC_COLLECTD([multimeter],[disable], [module], [multimeter statistics])
 AC_COLLECTD([mysql],     [disable], [module], [mysql statistics])
-AC_COLLECTD([named],     [disable], [module], [named statistics])
 AC_COLLECTD([nfs],       [disable], [module], [nfs statistics])
 AC_COLLECTD([ntpd],      [disable], [module], [nfs statistics])
 AC_COLLECTD([ping],      [disable], [module], [ping statistics])
@@ -996,12 +996,12 @@ Configuration:
     cpufreq . . . . . . $enable_cpufreq
     df  . . . . . . . . $enable_df
     disk  . . . . . . . $enable_disk
+    dns . . . . . . . . $enable_dns
     hddtemp . . . . . . $enable_hddtemp
     load  . . . . . . . $enable_load
     memory  . . . . . . $enable_memory
     multimeter  . . . . $enable_multimeter
     mysql . . . . . . . $enable_mysql
-    named . . . . . . . $enable_named
     nfs . . . . . . . . $enable_nfs
     ntpd  . . . . . . . $enable_ntpd
     ping  . . . . . . . $enable_ping
diff --git a/src/Makefile.am b/src/Makefile.am
index dc45733e..246d0d43 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -236,15 +236,15 @@ collectd_LDADD += "-dlopen" mysql.la
 collectd_DEPENDENCIES += mysql.la
 endif
 
-if BUILD_MODULE_NAMED
-pkglib_LTLIBRARIES += named.la
-named_la_SOURCES = named.c dnstop.c
-named_la_LDFLAGS = -module -avoid-version
+if BUILD_MODULE_DNS
+pkglib_LTLIBRARIES += dns.la
+dns_la_SOURCES = dns.c utils_dns.c
+dns_la_LDFLAGS = -module -avoid-version
 if BUILD_WITH_LIBPCAP
-named_la_LDFLAGS += -lpcap
+dns_la_LDFLAGS += -lpcap
 endif
-collectd_LDADD += "-dlopen" named.la
-collectd_DEPENDENCIES += named.la
+collectd_LDADD += "-dlopen" dns.la
+collectd_DEPENDENCIES += dns.la
 endif
 
 if BUILD_MODULE_NFS
diff --git a/src/named.c b/src/dns.c
similarity index 99%
rename from src/named.c
rename to src/dns.c
index 61778275..7ab28141 100644
--- a/src/named.c
+++ b/src/dns.c
@@ -39,7 +39,7 @@
 #endif
 
 #if HAVE_LIBPCAP
-# include "dnstop.h"
+# include "utils_dns.h"
 # define NAMED_HAVE_READ 1
 #else
 # define NAMED_HAVE_READ 0
diff --git a/src/dnstop.c b/src/utils_dns.c
similarity index 99%
rename from src/dnstop.c
rename to src/utils_dns.c
index 306a7e0e..19afe55e 100644
--- a/src/dnstop.c
+++ b/src/utils_dns.c
@@ -1,5 +1,5 @@
 /*
- * collectd - src/dnstop.c
+ * collectd - src/utils_dns.c
  * Modifications Copyright (C) 2006  Florian octo Forster
  * Copyright (C) 2002  The Measurement Factory, Inc.
  * All rights reserved.
@@ -93,7 +93,7 @@
 #define uh_dport dest
 #endif
 
-#include "dnstop.h"
+#include "utils_dns.h"
 
 /*
  * Type definitions
diff --git a/src/dnstop.h b/src/utils_dns.h
similarity index 95%
rename from src/dnstop.h
rename to src/utils_dns.h
index 8408147e..6a613a78 100644
--- a/src/dnstop.h
+++ b/src/utils_dns.h
@@ -1,7 +1,7 @@
-#ifndef COLLECTD_DNSTOP
-#define COLLECTD_DNSTOP 1
+#ifndef COLLECTD_UTILS_DNS_H
+#define COLLECTD_UTILS_DNS_H 1
 /*
- * collectd - src/dnstop.c
+ * collectd - src/utils_dns.h
  * Copyright (C) 2006  Florian octo Forster
  * All rights reserved.
  * 
@@ -78,4 +78,4 @@ const char *qtype_str(int t);
 const char *opcode_str(int o);
 const char *rcode_str (int r);
 
-#endif /* !COLLECTD_DNSTOP */
+#endif /* !COLLECTD_UTILS_DNS_H */
-- 
2.30.2