json tls log: rename to output-json-tls

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 \

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);
 

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"

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__ */

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"