json dns: rename output-dnslog -> output-json-dns

src/Makefile.am

@@ -217,6 +217,7 @@ output.c output.h \
 output-file.c output-file.h \
 output-filedata.c output-filedata.h \
 output-json-alert.c output-json-alert.h \
+output-json-dns.c output-json-dns.h \
 output-json-file.c output-json-file.h \
 output-json-http.c output-json-http.h \
 output-packet.c output-packet.h \
@@ -224,7 +225,6 @@ output-tx.c output-tx.h \
 output-droplog.c output-droplog.h \
 output-json.c output-json.h \
 output-tlslog.c output-tlslog.h \
-output-dnslog.c output-dnslog.h \
 packet-queue.c packet-queue.h \
 pkt-var.c pkt-var.h \
 reputation.c reputation.h \

src/output-json-dns.c

@@ -40,7 +40,6 @@
 #include "util-mem.h"
 #include "app-layer-parser.h"
 #include "output.h"
-#include "output-dnslog.h"
 #include "app-layer-dns-udp.h"
 #include "app-layer.h"
 #include "util-privs.h"

src/output-json-dns.h

@@ -21,9 +21,9 @@
  * \author Tom DeCanio <td@npulsetech.com>
  */
 
-#ifndef __OUTPUT_DNSLOG_H__
+#ifndef __OUTPUT_JSON_DNS_H__
-#define __OUTPUT_DNSLOG_H__
+#define __OUTPUT_JSON_DNS_H__
 
 void TmModuleJsonDnsLogRegister (void);
 
-#endif /* __OUTPUT_DNSLOG_H__ */
+#endif /* __OUTPUT_JSON_DNS_H__ */

src/suricata.c

@@ -85,7 +85,7 @@
 #include "log-httplog.h"
 #include "output-json-http.h"
 #include "log-dnslog.h"
-#include "output-dnslog.h"
+#include "output-json-dns.h"
 #include "log-tlslog.h"
 #include "output-tlslog.h"
 #include "log-pcap.h"