alert-syslog: cleanup

Remove separate ipv4 and ipv6 registration functions.
Make all functions static.
Move registration function to the bottom.
Simplify OS_WIN32 wrappers usage.

diff --git a/src/alert-syslog.c b/src/alert-syslog.c
index 2503ededf7ba161264dc2b1d596af7c8e0ccc99d..2edbb751c8381d1642be4349328cda97b8987bb3 100644 (file)
--- a/src/alert-syslog.c
+++ b/src/alert-syslog.c
@@ -49,73 +49,39 @@
 #include "util-syslog.h"
 #include "util-optimize.h"
 
+#ifndef OS_WIN32
+
 #define DEFAULT_ALERT_SYSLOG_FACILITY_STR       "local0"
 #define DEFAULT_ALERT_SYSLOG_FACILITY           LOG_LOCAL0
 #define DEFAULT_ALERT_SYSLOG_LEVEL              LOG_ERR
 #define MODULE_NAME                             "AlertSyslog"
 
 extern uint8_t engine_mode;
-#ifndef OS_WIN32
 static int alert_syslog_level = DEFAULT_ALERT_SYSLOG_LEVEL;
-#endif /* OS_WIN32 */
 
 typedef struct AlertSyslogThread_ {
     /** LogFileCtx has the pointer to the file and a mutex to allow multithreading */
     LogFileCtx* file_ctx;
 } AlertSyslogThread;
 
-TmEcode AlertSyslog (ThreadVars *, Packet *, void *, PacketQueue *, PacketQueue *);
-TmEcode AlertSyslogIPv4(ThreadVars *, Packet *, void *, PacketQueue *, PacketQueue *);
-TmEcode AlertSyslogIPv6(ThreadVars *, Packet *, void *, PacketQueue *, PacketQueue *);
-TmEcode AlertSyslogThreadInit(ThreadVars *, void *, void **);
-TmEcode AlertSyslogThreadDeinit(ThreadVars *, void *);
-void AlertSyslogExitPrintStats(ThreadVars *, void *);
-void AlertSyslogRegisterTests(void);
-OutputCtx *AlertSyslogInitCtx(ConfNode *);
-#ifndef OS_WIN32
-static void AlertSyslogDeInitCtx(OutputCtx *);
-#endif /* OS_WIN32 */
-
-/** \brief   Function to register the AlertSyslog module */
-void TmModuleAlertSyslogRegister (void) {
-#ifndef OS_WIN32
-    tmm_modules[TMM_ALERTSYSLOG].name = MODULE_NAME;
-    tmm_modules[TMM_ALERTSYSLOG].ThreadInit = AlertSyslogThreadInit;
-    tmm_modules[TMM_ALERTSYSLOG].Func = AlertSyslog;
-    tmm_modules[TMM_ALERTSYSLOG].ThreadExitPrintStats = AlertSyslogExitPrintStats;
-    tmm_modules[TMM_ALERTSYSLOG].ThreadDeinit = AlertSyslogThreadDeinit;
-    tmm_modules[TMM_ALERTSYSLOG].RegisterTests = NULL;
-    tmm_modules[TMM_ALERTSYSLOG].cap_flags = 0;
-
-    OutputRegisterModule(MODULE_NAME, "syslog", AlertSyslogInitCtx);
-#endif /* !OS_WIN32 */
-}
-
-/** \brief   Function to register the AlertSyslog module for IPv4 */
-void TmModuleAlertSyslogIPv4Register (void) {
-#ifndef OS_WIN32
-    tmm_modules[TMM_ALERTSYSLOG4].name = "AlertSyslogIPv4";
-    tmm_modules[TMM_ALERTSYSLOG4].ThreadInit = AlertSyslogThreadInit;
-    tmm_modules[TMM_ALERTSYSLOG4].Func = AlertSyslogIPv4;
-    tmm_modules[TMM_ALERTSYSLOG4].ThreadExitPrintStats = AlertSyslogExitPrintStats;
-    tmm_modules[TMM_ALERTSYSLOG4].ThreadDeinit = AlertSyslogThreadDeinit;
-    tmm_modules[TMM_ALERTSYSLOG4].RegisterTests = NULL;
-#endif /* !OS_WIN32 */
-}
-
-/** \brief   Function to register the AlertSyslog module for IPv6 */
-void TmModuleAlertSyslogIPv6Register (void) {
-#ifndef OS_WIN32
-    tmm_modules[TMM_ALERTSYSLOG6].name = "AlertSyslogIPv6";
-    tmm_modules[TMM_ALERTSYSLOG6].ThreadInit = AlertSyslogThreadInit;
-    tmm_modules[TMM_ALERTSYSLOG6].Func = AlertSyslogIPv6;
-    tmm_modules[TMM_ALERTSYSLOG6].ThreadExitPrintStats = AlertSyslogExitPrintStats;
-    tmm_modules[TMM_ALERTSYSLOG6].ThreadDeinit = AlertSyslogThreadDeinit;
-    tmm_modules[TMM_ALERTSYSLOG6].RegisterTests = NULL;
-#endif /* !OS_WIN32 */
+/**
+ * \brief Function to clear the memory of the output context and closes the
+ *        syslog interface
+ *
+ * \param output_ctx pointer to the output context to be cleared
+ */
+static void AlertSyslogDeInitCtx(OutputCtx *output_ctx)
+{
+    if (output_ctx != NULL) {
+        LogFileCtx *logfile_ctx = (LogFileCtx *)output_ctx->data;
+        if (logfile_ctx != NULL) {
+            LogFileFreeCtx(logfile_ctx);
+        }
+        SCFree(output_ctx);
+    }
+    closelog();
 }
 
-#ifndef OS_WIN32
 /**
  * \brief Create a new LogFileCtx for "syslog" output style.
  *
@@ -172,24 +138,6 @@ OutputCtx *AlertSyslogInitCtx(ConfNode *conf)
     return output_ctx;
 }
 
-/**
- * \brief Function to clear the memory of the output context and closes the
- *        syslog interface
- *
- * \param output_ctx pointer to the output context to be cleared
- */
-static void AlertSyslogDeInitCtx(OutputCtx *output_ctx)
-{
-    if (output_ctx != NULL) {
-        LogFileCtx *logfile_ctx = (LogFileCtx *)output_ctx->data;
-        if (logfile_ctx != NULL) {
-            LogFileFreeCtx(logfile_ctx);
-        }
-        SCFree(output_ctx);
-    }
-    closelog();
-}
-
 /**
  * \brief Function to initialize the AlertSystlogThread and sets the output
  *        context pointer
@@ -198,7 +146,7 @@ static void AlertSyslogDeInitCtx(OutputCtx *output_ctx)
  * \param initdata      Pointer to the output context
  * \param data          pointer to pointer to point to the AlertSyslogThread
  */
-TmEcode AlertSyslogThreadInit(ThreadVars *t, void *initdata, void **data)
+static TmEcode AlertSyslogThreadInit(ThreadVars *t, void *initdata, void **data)
 {
     if(initdata == NULL) {
         SCLogDebug("Error getting context for AlertSyslog. \"initdata\" "
@@ -225,7 +173,7 @@ TmEcode AlertSyslogThreadInit(ThreadVars *t, void *initdata, void **data)
  * \param tv            Pointer to the threadvars
  * \param data          pointer to the AlertSyslogThread to be cleared
  */
-TmEcode AlertSyslogThreadDeinit(ThreadVars *t, void *data)
+static TmEcode AlertSyslogThreadDeinit(ThreadVars *t, void *data)
 {
     AlertSyslogThread *ast = (AlertSyslogThread *)data;
     if (ast == NULL) {
@@ -250,7 +198,7 @@ TmEcode AlertSyslogThreadDeinit(ThreadVars *t, void *data)
  *
  * \return On succes return TM_ECODE_OK
  */
-TmEcode AlertSyslogIPv4(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq,
+static TmEcode AlertSyslogIPv4(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq,
                         PacketQueue *postpq)
 {
     AlertSyslogThread *ast = (AlertSyslogThread *)data;
@@ -311,7 +259,7 @@ TmEcode AlertSyslogIPv4(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq,
  *
  * \return On succes return TM_ECODE_OK
  */
-TmEcode AlertSyslogIPv6(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq,
+static TmEcode AlertSyslogIPv6(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq,
                         PacketQueue *postpq)
 {
     AlertSyslogThread *ast = (AlertSyslogThread *)data;
@@ -375,7 +323,7 @@ TmEcode AlertSyslogIPv6(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq,
  *
  * \return On succes return TM_ECODE_OK
  */
-TmEcode AlertSyslogDecoderEvent(ThreadVars *tv, Packet *p, void *data,
+static TmEcode AlertSyslogDecoderEvent(ThreadVars *tv, Packet *p, void *data,
                                     PacketQueue *pq, PacketQueue *postpq)
 {
     AlertSyslogThread *ast = (AlertSyslogThread *)data;
@@ -441,7 +389,7 @@ TmEcode AlertSyslogDecoderEvent(ThreadVars *tv, Packet *p, void *data,
  *
  * \return On succes return TM_ECODE_OK
  */
-TmEcode AlertSyslog (ThreadVars *tv, Packet *p, void *data, PacketQueue *pq,
+static TmEcode AlertSyslog (ThreadVars *tv, Packet *p, void *data, PacketQueue *pq,
                         PacketQueue *postpq)
 {
     if (PKT_IS_IPV4(p)) {
@@ -461,7 +409,7 @@ TmEcode AlertSyslog (ThreadVars *tv, Packet *p, void *data, PacketQueue *pq,
  * \param tv    Pointer to the output threadvars
  * \param data  Pointer to the AlertSyslogThread data
  */
-void AlertSyslogExitPrintStats(ThreadVars *tv, void *data) {
+static void AlertSyslogExitPrintStats(ThreadVars *tv, void *data) {
     AlertSyslogThread *ast = (AlertSyslogThread *)data;
     if (ast == NULL) {
         return;
@@ -471,3 +419,17 @@ void AlertSyslogExitPrintStats(ThreadVars *tv, void *data) {
 }
 #endif /* !OS_WIN32 */
 
+/** \brief   Function to register the AlertSyslog module */
+void TmModuleAlertSyslogRegister (void) {
+#ifndef OS_WIN32
+    tmm_modules[TMM_ALERTSYSLOG].name = MODULE_NAME;
+    tmm_modules[TMM_ALERTSYSLOG].ThreadInit = AlertSyslogThreadInit;
+    tmm_modules[TMM_ALERTSYSLOG].Func = AlertSyslog;
+    tmm_modules[TMM_ALERTSYSLOG].ThreadExitPrintStats = AlertSyslogExitPrintStats;
+    tmm_modules[TMM_ALERTSYSLOG].ThreadDeinit = AlertSyslogThreadDeinit;
+    tmm_modules[TMM_ALERTSYSLOG].RegisterTests = NULL;
+    tmm_modules[TMM_ALERTSYSLOG].cap_flags = 0;
+
+    OutputRegisterModule(MODULE_NAME, "syslog", AlertSyslogInitCtx);
+#endif /* !OS_WIN32 */
+}

diff --git a/src/alert-syslog.h b/src/alert-syslog.h
index 14f774044964f4843c365ef580082a2cda340da9..20c63e3b43758c312bc012990decc8f0ade86f68 100644 (file)
--- a/src/alert-syslog.h
+++ b/src/alert-syslog.h
@@ -28,8 +28,6 @@
 #define __ALERT_SYSLOG_H__
 
 void TmModuleAlertSyslogRegister (void);
-void TmModuleAlertSyslogIPv4Register (void);
-void TmModuleAlertSyslogIPv6Register (void);
 
 #endif /* __ALERT_SYSLOG_H__ */
 

diff --git a/src/suricata.c b/src/suricata.c
index 701bba6ceccfed5a62e03c0ea85f302b140ee546..2f06f31d4dd34abee0d9c2b05b04dd7dde4bc6b2 100644 (file)
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -782,8 +782,6 @@ void RegisterAllModules()
     TmModuleAlertPreludeRegister();
     /* syslog log */
     TmModuleAlertSyslogRegister();
-    TmModuleAlertSyslogIPv4Register();
-    TmModuleAlertSyslogIPv6Register();
     /* unified2 log */
     TmModuleUnified2AlertRegister();
     /* pcap info log */