removing BUILDING_SO ifdefs and get daqs to build as -std=gnu99 -module

diff --git a/extra/src/codecs/cd_i4l_rawip/cd_i4l_rawip.cc b/extra/src/codecs/cd_i4l_rawip/cd_i4l_rawip.cc
index 1c862944c9d2ca67e50c397d071cdf156aff36b9..903ca310b351c641d6323b6bbf5e2a8eaf4cf971 100644 (file)
--- a/extra/src/codecs/cd_i4l_rawip/cd_i4l_rawip.cc
+++ b/extra/src/codecs/cd_i4l_rawip/cd_i4l_rawip.cc
@@ -97,13 +97,8 @@ static const CodecApi i4l_rawip_api =
     dtor,
 };
 
-#ifdef BUILDING_SO
 SO_PUBLIC const BaseApi* snort_plugins[] =
 {
     &i4l_rawip_api.base,
     nullptr
 };
-#else
-const BaseApi* cd_i4l_rawip = &i4l_rawip_api.base;
-#endif
-

diff --git a/extra/src/codecs/cd_linux_sll/cd_linux_sll.cc b/extra/src/codecs/cd_linux_sll/cd_linux_sll.cc
index ea6299d96c7cef7bcd93698099e39c563c537e86..e1db8c24d82feb0e460c3a118a167669b5897003 100644 (file)
--- a/extra/src/codecs/cd_linux_sll/cd_linux_sll.cc
+++ b/extra/src/codecs/cd_linux_sll/cd_linux_sll.cc
@@ -96,13 +96,8 @@ static const CodecApi linux_ssl_api =
     dtor,
 };
 
-#ifdef BUILDING_SO
 SO_PUBLIC const BaseApi* snort_plugins[] =
 {
     &linux_ssl_api.base,
     nullptr
 };
-#else
-const BaseApi* cd_linux_sll = &linux_ssl_api.base;
-#endif
-

diff --git a/extra/src/codecs/cd_null/cd_null.cc b/extra/src/codecs/cd_null/cd_null.cc
index 6cc6e48e9db1b2f10950040a6765567bffa17614..c9d2bd77e0766e3a7da843117da3e92bc2c41351 100644 (file)
--- a/extra/src/codecs/cd_null/cd_null.cc
+++ b/extra/src/codecs/cd_null/cd_null.cc
@@ -90,13 +90,8 @@ static const CodecApi null_api =
     dtor, // dtor
 };
 
-#ifdef BUILDING_SO
 SO_PUBLIC const BaseApi* snort_plugins[] =
 {
     &null_api.base,
     nullptr
 };
-#else
-const BaseApi* cd_null = &null_api.base;
-#endif
-

diff --git a/extra/src/codecs/cd_pflog/cd_pflog.cc b/extra/src/codecs/cd_pflog/cd_pflog.cc
index 8c849142200b91d6f179e0d393f8f4913f43de01..db7760ddd7723c7846dc12c4eec6ed5c9dc4cd13 100644 (file)
--- a/extra/src/codecs/cd_pflog/cd_pflog.cc
+++ b/extra/src/codecs/cd_pflog/cd_pflog.cc
@@ -261,13 +261,8 @@ static const CodecApi pflog_api =
     dtor,
 };
 
-#ifdef BUILDING_SO
 SO_PUBLIC const BaseApi* snort_plugins[] =
 {
     &pflog_api.base,
     nullptr
 };
-#else
-const BaseApi* cd_pflog = &pflog_api.base;
-#endif
-

diff --git a/extra/src/codecs/cd_ppp/cd_ppp.cc b/extra/src/codecs/cd_ppp/cd_ppp.cc
index df44b463293aa7eb0648aac10fc333a5ccf49496..6fc6f35399a23d3442044d3583e90b0dccb155d3 100644 (file)
--- a/extra/src/codecs/cd_ppp/cd_ppp.cc
+++ b/extra/src/codecs/cd_ppp/cd_ppp.cc
@@ -100,13 +100,8 @@ static const CodecApi ppp_api =
     dtor,
 };
 
-#ifdef BUILDING_SO
 SO_PUBLIC const BaseApi* snort_plugins[] =
 {
     &ppp_api.base,
     nullptr
 };
-#else
-const BaseApi* cd_ppp = &ppp_api.base;
-#endif
-

diff --git a/extra/src/codecs/cd_raw4/cd_raw4.cc b/extra/src/codecs/cd_raw4/cd_raw4.cc
index 3622721248a7ae77108d6d57ca8e2c642ba57757..795cd8c4747e6630211e669f6a769df0cf7d861a 100644 (file)
--- a/extra/src/codecs/cd_raw4/cd_raw4.cc
+++ b/extra/src/codecs/cd_raw4/cd_raw4.cc
@@ -87,13 +87,8 @@ static const CodecApi raw4_api =
     dtor, // dtor
 };
 
-#ifdef BUILDING_SO
 SO_PUBLIC const BaseApi* snort_plugins[] =
 {
     &raw4_api.base,
     nullptr
 };
-#else
-const BaseApi* cd_raw4 = &raw4_api.base;
-#endif
-

diff --git a/extra/src/codecs/cd_raw6/cd_raw6.cc b/extra/src/codecs/cd_raw6/cd_raw6.cc
index f6357ab60bbe2ece4c2dcdf0200a4a9f1a418f20..2175bc645d1737b5db0058ce0afe2adc45151864 100644 (file)
--- a/extra/src/codecs/cd_raw6/cd_raw6.cc
+++ b/extra/src/codecs/cd_raw6/cd_raw6.cc
@@ -84,13 +84,8 @@ static const CodecApi raw6_api =
     dtor, // dtor
 };
 
-#ifdef BUILDING_SO
 SO_PUBLIC const BaseApi* snort_plugins[] =
 {
     &raw6_api.base,
     nullptr
 };
-#else
-const BaseApi* cd_raw6 = &raw6_api.base;
-#endif
-

diff --git a/extra/src/codecs/cd_slip/cd_slip.cc b/extra/src/codecs/cd_slip/cd_slip.cc
index e92bcbc6037182dfd32bf872b2783c473746d992..16e28c2b615ceaabde6e8461805877101f3c58f6 100644 (file)
--- a/extra/src/codecs/cd_slip/cd_slip.cc
+++ b/extra/src/codecs/cd_slip/cd_slip.cc
@@ -91,13 +91,8 @@ static const CodecApi slip_api =
     dtor
 };
 
-#ifdef BUILDING_SO
 SO_PUBLIC const BaseApi* snort_plugins[] =
 {
     &slip_api.base,
     nullptr
 };
-#else
-const BaseApi* cd_slip = &slip_api.base;
-#endif
-

diff --git a/extra/src/codecs/cd_wlan/cd_wlan.cc b/extra/src/codecs/cd_wlan/cd_wlan.cc
index b15d4498f9c3a14cffb8c010843809a35b61cdd5..2eb378d7004ebb111de7dc2b9b5329bb48441885 100644 (file)
--- a/extra/src/codecs/cd_wlan/cd_wlan.cc
+++ b/extra/src/codecs/cd_wlan/cd_wlan.cc
@@ -194,13 +194,8 @@ static const CodecApi wlan_api =
     dtor,
 };
 
-#ifdef BUILDING_SO
 SO_PUBLIC const BaseApi* snort_plugins[] =
 {
     &wlan_api.base,
     nullptr
 };
-#else
-const BaseApi* cd_wlan = &wlan_api.base;
-#endif
-

diff --git a/extra/src/daqs/daq_socket/CMakeLists.txt b/extra/src/daqs/daq_socket/CMakeLists.txt
index c54be559aedbf39e67af503b56dc3fedeb21dc21..74095854341b05b5710e29584ec54bc69dcebb99 100644 (file)
--- a/extra/src/daqs/daq_socket/CMakeLists.txt
+++ b/extra/src/daqs/daq_socket/CMakeLists.txt
@@ -4,8 +4,8 @@ project ( daq_socket C )
 if ( APPLE )
     set ( CMAKE_MACOSX_RPATH OFF )
     set (
-        CMAKE_SHARED_LINKER_FLAGS
-        "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup"
+        CMAKE_MODULE_LINKER_FLAGS
+        "${CMAKE_MODULE_LINKER_FLAGS} -undefined dynamic_lookup"
     )
 endif ( APPLE )
 
@@ -13,10 +13,12 @@ include ( FindPkgConfig )
 pkg_search_module ( SNORT3 REQUIRED snort>=3 )
 
 add_library (
-    daq_socket SHARED
+    daq_socket MODULE
     daq_socket.c
 )
 
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+
 target_include_directories (
     daq_socket PUBLIC
     ${SNORT3_INCLUDE_DIRS}

diff --git a/extra/src/daqs/daq_socket/Makefile.am b/extra/src/daqs/daq_socket/Makefile.am
index 7a2a95780bad22445a6dc80bb835ef8a79a15a78..c188f586c289dec244c2a1926ed6bfe8c1a5557f 100644 (file)
--- a/extra/src/daqs/daq_socket/Makefile.am
+++ b/extra/src/daqs/daq_socket/Makefile.am
@@ -1,8 +1,9 @@
 daq_socketlibdir = $(pkglibdir)/daqs
 
-AM_CFLAGS   = @SNORT3_CFLAGS@
+AM_CFLAGS   = @SNORT3_CFLAGS@ -std=gnu99
 
 daq_socketlib_LTLIBRARIES = libdaq_socket.la
 libdaq_socket_la_CFLAGS   = $(AM_CFLAGS)
 libdaq_socket_la_LDFLAGS  = -export-dynamic -shared -avoid-version
+libdaq_socket_la_LDFLAGS += -module
 libdaq_socket_la_SOURCES  = daq_socket.c

diff --git a/extra/src/daqs/daq_socket/daq_socket.c b/extra/src/daqs/daq_socket/daq_socket.c
index 89f4840d091c1df8d4cd9eda5052d080603b891e..64e3e4d8a0f7f989127a7da46c871337a6b357f0 100644 (file)
--- a/extra/src/daqs/daq_socket/daq_socket.c
+++ b/extra/src/daqs/daq_socket/daq_socket.c
@@ -566,11 +566,7 @@ static int socket_daq_set_filter (void* handle, const char* filter)
 
 //-------------------------------------------------------------------------
 
-#ifdef BUILDING_SO
 DAQ_SO_PUBLIC DAQ_Module_t DAQ_MODULE_DATA =
-#else
-DAQ_Module_t socket_daq_module_data =
-#endif
 {
     .api_version = DAQ_API_VERSION,
     .module_version = DAQ_MOD_VERSION,
@@ -598,4 +594,3 @@ DAQ_Module_t socket_daq_module_data =
     .hup_apply = NULL,
     .hup_post = NULL,
 };
-

diff --git a/extra/templates/CMakeLists.txt.erb b/extra/templates/CMakeLists.txt.erb
index c9dcb70c1b655d713b98d2d44e472fc7d96b332b..e451d3752bd22d0394851c65409d2330a109cafa 100644 (file)
--- a/extra/templates/CMakeLists.txt.erb
+++ b/extra/templates/CMakeLists.txt.erb
@@ -8,8 +8,13 @@ project ( <%= @project.name %><% if @project.language == "CXX" %> CXX<% elsif @p
 if ( APPLE )
     set ( CMAKE_MACOSX_RPATH OFF )
     set (
+%if @project.language == "CXX"
         CMAKE_SHARED_LINKER_FLAGS
         "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup"
+%elsif @project.language == "C"
+        CMAKE_MODULE_LINKER_FLAGS
+        "${CMAKE_MODULE_LINKER_FLAGS} -undefined dynamic_lookup"
+%end
     )
 endif ( APPLE )
 %end
@@ -18,7 +23,11 @@ include ( FindPkgConfig )
 pkg_search_module ( SNORT3 REQUIRED snort>=3 )
 
 add_library (
+%if @project.language == "CXX"
     <%= @project.libname %> SHARED
+%elsif @project.language == "C"
+    <%= @project.libname %> MODULE
+%end
 %for source in @project.sources
     <%= source %>
 %end
@@ -27,6 +36,10 @@ add_library (
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 %end
+%if @project.language == "C"
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+%end
 
 target_include_directories (
     <%= @project.libname %> PUBLIC

diff --git a/extra/templates/Makefile.am.erb b/extra/templates/Makefile.am.erb
index 54a1cfb6edfbf018b46551bfe539b7e9eb19f6f6..bd72baa98db5fbf81392ac85066c54fe24680783 100644 (file)
--- a/extra/templates/Makefile.am.erb
+++ b/extra/templates/Makefile.am.erb
@@ -3,17 +3,20 @@
 
 %if @project.language == "CXX"
 AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-%else
-AM_CFLAGS   = @SNORT3_CFLAGS@
+%elsif @project.language == "C"
+AM_CFLAGS   = @SNORT3_CFLAGS@ -std=gnu99
 %end
 
 <%= @project.libname %>lib_LTLIBRARIES = lib<%= @project.libname %>.la
 %if @project.language == "CXX"
 lib<%= @project.libname %>_la_CXXFLAGS = $(AM_CXXFLAGS)
-%else
+%elsif @project.language == "C"
 lib<%= @project.libname %>_la_CFLAGS   = $(AM_CFLAGS)
 %end
 lib<%= @project.libname %>_la_LDFLAGS  = -export-dynamic -shared -avoid-version
+%if @project.language == "C"
+lib<%= @project.libname %>_la_LDFLAGS += -module
+%end
 lib<%= @project.libname %>_la_SOURCES  =<% for source in @project.sources %> <%= source %><% end %>
 %end
 %if !@project.scripts.empty?