From: Josh <jrosenba@cisco.com>
Date: Wed, 27 Aug 2014 19:30:55 +0000 (-0400)
Subject: fixing alert_sfsocket
X-Git-Tag: 3.0.0-233~1417^2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af3c65b810ce33ca51ea900087b0d213788a5ffa;p=thirdparty%2Fsnort3.git

fixing alert_sfsocket
---

diff --git a/cmake/platforms.cmake b/cmake/platforms.cmake
index 3fbe56f3e..09a8d7ceb 100644
--- a/cmake/platforms.cmake
+++ b/cmake/platforms.cmake
@@ -27,7 +27,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "linux")
 endif ()
 
 if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
-    set(LINUX "YES")
+    set(LINUX "1")
 endif("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "openbsd")
diff --git a/configure.ac b/configure.ac
index 1c3dd3a63..4aac7deb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,8 +141,8 @@ AC_DEFUN([CC_VISIBILITY],
     CFLAGS="$gl_save_CFLAGS"
     if test "x$gl_cv_cc_visibility" = "xyes"; then
         # FIXIT should be hidden, default (visible) is workaround
-        #AM_CXXFLAGS="$AM_CXXFLAGS -fvisibility=hidden"
-        AM_CXXFLAGS="$AM_CXXFLAGS -fvisibility=default"
+        AM_CXXFLAGS="$AM_CXXFLAGS -fvisibility=hidden"
+        #AM_CXXFLAGS="$AM_CXXFLAGS -fvisibility=default"
         AC_DEFINE([HAVE_VISIBILITY],[1],
             [Define if the compiler supports visibility declarations.])
     fi
diff --git a/src/loggers/CMakeLists.txt b/src/loggers/CMakeLists.txt
index 104e6f82e..ac56fa61c 100644
--- a/src/loggers/CMakeLists.txt
+++ b/src/loggers/CMakeLists.txt
@@ -21,8 +21,8 @@ set (PLUGIN_LIST
 )
 
 if (LINUX)
-    set ( PLUGIN_LIST
-        ${PLUGIN_LIST}
+    set ( LOGGER_SOURCES
+        ${LOGGER_SOURCES}
         alert_sf_socket.cc
     )
 endif()
@@ -51,9 +51,5 @@ else (STATIC_LOGGERS)
     add_shared_library(log_tcpdump loggers log_tcpdump.cc)
     add_shared_library(unified2 loggers unified2.cc unified2_common.h)
 
-    if (LINUX)
-        add_shared_library(alert_sf_socket loggers alert_sf_socket.cc)
-    endif  (LINUX)
-
 endif (STATIC_LOGGERS)
 
diff --git a/src/loggers/Makefile.am b/src/loggers/Makefile.am
index 8bd4baad5..d3ac06cf7 100644
--- a/src/loggers/Makefile.am
+++ b/src/loggers/Makefile.am
@@ -18,13 +18,14 @@ log_tcpdump.cc \
 unified2.cc \
 unified2_common.h
 
-if STATIC_LOGGERS
-libloggers_a_SOURCES += $(plugin_list)
-
 if LINUX
 libloggers_a_SOURCES += alert_sf_socket.cc
 endif
 
+
+if STATIC_LOGGERS
+libloggers_a_SOURCES += $(plugin_list)
+
 else
 ehlibdir = $(pkglibdir)/loggers
 
@@ -43,13 +44,6 @@ libalert_full_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
 libalert_full_la_LDFLAGS = -export-dynamic -shared
 libalert_full_la_SOURCES = alert_full.cc
 
-if LINUX
-ehlib_LTLIBRARIES += libalert_sf_socket.la
-libalert_sf_socket_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-libalert_sf_socket_la_LDFLAGS = -export-dynamic -shared
-libalert_sf_socket_la_SOURCES = alert_sf_socket.cc
-endif
-
 ehlib_LTLIBRARIES += libalert_syslog.la
 libalert_syslog_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
 libalert_syslog_la_LDFLAGS = -export-dynamic -shared
diff --git a/src/loggers/alert_sf_socket.cc b/src/loggers/alert_sf_socket.cc
index 5ae9da6a0..9e42268c4 100644
--- a/src/loggers/alert_sf_socket.cc
+++ b/src/loggers/alert_sf_socket.cc
@@ -45,7 +45,7 @@
 #include "treenodes.h"
 #include "snort_debug.h"
 #include "util.h"
-#include "snort.h"
+#include "main/snort.h"
 #include "parser.h"
 
 struct SfSock
@@ -408,15 +408,7 @@ static LogApi sf_sock_api
     sf_sock_dtor
 };
 
-#ifdef BUILDING_SO
-SO_PUBLIC const BaseApi* snort_plugins[] =
-{
-    &sf_sock_api.base,
-    nullptr
-};
-#else
 const BaseApi* alert_sf_socket = &sf_sock_api.base;
-#endif
 
 #endif   /* LINUX */
 
diff --git a/src/loggers/loggers.cc b/src/loggers/loggers.cc
index 6688e3cac..3370c93c9 100644
--- a/src/loggers/loggers.cc
+++ b/src/loggers/loggers.cc
@@ -26,13 +26,14 @@
 
 #include "framework/logger.h"
 
+#ifdef LINUX
+extern const BaseApi* alert_sf_socket;
+#endif
+
 #ifdef STATIC_LOGGERS
 extern const BaseApi* alert_csv;
 extern const BaseApi* alert_fast;
 extern const BaseApi* alert_full;
-#ifdef LINUX
-extern const BaseApi* alert_sf_socket;
-#endif
 extern const BaseApi* alert_syslog;
 extern const BaseApi* alert_test;
 extern const BaseApi* alert_unix_sock;
@@ -43,6 +44,10 @@ extern const BaseApi* eh_unified2;
 
 const BaseApi* loggers[] =
 {
+#ifdef LINUX
+    alert_sf_socket,
+#endif
+
 #ifdef STATIC_LOGGERS
     // alerters
     alert_fast,
@@ -50,9 +55,6 @@ const BaseApi* loggers[] =
     alert_syslog,
     alert_test,
     alert_csv,
-#ifdef LINUX
-    alert_sf_socket,
-#endif
     alert_unix_sock,
     // loggers
     log_null,