json tls log: rename to output-json-tls

diff --git a/src/Makefile.am b/src/Makefile.am
index bdc348253107615f8062f47be0b13707f2f64fd2..4723747081595da95c2e0dac6ba473838c8a7304 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -221,10 +221,10 @@ output-json-dns.c output-json-dns.h \
 output-json-drop.c output-json-drop.h \
 output-json-file.c output-json-file.h \
 output-json-http.c output-json-http.h \
+output-json-tls.c output-json-tls.h \
 output-packet.c output-packet.h \
 output-tx.c output-tx.h \
 output-json.c output-json.h \
-output-tlslog.c output-tlslog.h \
 packet-queue.c packet-queue.h \
 pkt-var.c pkt-var.h \
 reputation.c reputation.h \

diff --git a/src/output-json-drop.h b/src/output-json-drop.h
index 5f9f9f09c310d5aa6124b73050d777cf0a04f537..c02057c14cbbf74872a3277c5c3c2ac31757397c 100644 (file)
--- a/src/output-json-drop.h
+++ b/src/output-json-drop.h
@@ -23,7 +23,7 @@
  */
 
 #ifndef __OUTPUT_JSON_DROP_H__
-#define        __OUTPUT_JSON_DROP_H__
+#define __OUTPUT_JSON_DROP_H__
 
 void TmModuleJsonDropLogRegister (void);
 

diff --git a/src/output-tlslog.c b/src/output-json-tls.c
similarity index 99%
rename from src/output-tlslog.c
rename to src/output-json-tls.c
index 016f6df593e762e4eec0284fb2192a6790f1ccd8..4b859fda407ad8bb23143de5397e7a3694f8aadd 100644 (file)
--- a/src/output-tlslog.c
+++ b/src/output-json-tls.c
@@ -39,7 +39,6 @@
 #include "util-debug.h"
 #include "app-layer-parser.h"
 #include "output.h"
-#include "log-tlslog.h"
 #include "app-layer-ssl.h"
 #include "app-layer.h"
 #include "util-privs.h"

diff --git a/src/output-tlslog.h b/src/output-json-tls.h
similarity index 89%
rename from src/output-tlslog.h
rename to src/output-json-tls.h
index b6e52abf3a61f41d3a5489bc0c7ba0941bc08cf6..931414f3013b7a2d99b93d2bedef9a352a2ec3ee 100644 (file)
--- a/src/output-tlslog.h
+++ b/src/output-json-tls.h
@@ -21,9 +21,9 @@
  * \author Tom DeCanio <td@npulsetech.com>
  */
 
-#ifndef __OUTPUT_TLSLOG_H__
-#define __OUTPUT_TLSLOG_H__
+#ifndef __OUTPUT_JSON_TLS_H__
+#define __OUTPUT_JSON_TLS_H__
 
 void TmModuleJsonTlsLogRegister (void);
 
-#endif /* __OUTPUT_TLSLOG_H__ */
+#endif /* __OUTPUT_JSON_TLS_H__ */

diff --git a/src/suricata.c b/src/suricata.c
index 7e93be67738732a035b29cc887a0ed1d7f490621..8df3bfb8ae3cba1d301906d986eea24f3b9057bd 100644 (file)
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -87,7 +87,7 @@
 #include "log-dnslog.h"
 #include "output-json-dns.h"
 #include "log-tlslog.h"
-#include "output-tlslog.h"
+#include "output-json-tls.h"
 #include "log-pcap.h"
 #include "log-file.h"
 #include "output-json-file.h"