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

diff --git a/src/Makefile.am b/src/Makefile.am
index ed1d285cd1f8803ff8da63621bc41368a931b459..39cf72e4e0d1e2e4c6780454641493e167b105d3 100644 (file)
--- a/src/Makefile.am
+++ b/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 \

diff --git a/src/output-dnslog.c b/src/output-json-dns.c
similarity index 99%
rename from src/output-dnslog.c
rename to src/output-json-dns.c
index 098ec197c5ef85c1efbd63a5c86b7e4583606cca..7c990b96391a82ff276d90f6410cc39dbb1f1820 100644 (file)
--- a/src/output-dnslog.c
+++ b/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"

diff --git a/src/output-dnslog.h b/src/output-json-dns.h
similarity index 89%
rename from src/output-dnslog.h
rename to src/output-json-dns.h
index cc077ebfeda40ac654516d8202127008a8c0bd67..f26227e374807dee97a07d5f5a3cf7a76ec79e66 100644 (file)
--- a/src/output-dnslog.h
+++ b/src/output-json-dns.h
@@ -21,9 +21,9 @@
  * \author Tom DeCanio <td@npulsetech.com>
  */
 
-#ifndef __OUTPUT_DNSLOG_H__
-#define __OUTPUT_DNSLOG_H__
+#ifndef __OUTPUT_JSON_DNS_H__
+#define __OUTPUT_JSON_DNS_H__
 
 void TmModuleJsonDnsLogRegister (void);
 
-#endif /* __OUTPUT_DNSLOG_H__ */
+#endif /* __OUTPUT_JSON_DNS_H__ */

diff --git a/src/suricata.c b/src/suricata.c
index 8f31ea74760e7de35c3169a35b55bd0272800679..2d687e4331cc02c55649d5bf335248cf23b463ef 100644 (file)
--- a/src/suricata.c
+++ b/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"