From: Russ Combs <rucombs@cisco.com>
Date: Tue, 28 Apr 2015 19:07:25 +0000 (-0400)
Subject: fixed build issue with exta/; bump build to 149
X-Git-Tag: 3.0.0-233~991
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e7fc0dbf048981dd38b137dd6e9161024676e69;p=thirdparty%2Fsnort3.git

fixed build issue with exta/; bump build to 149
---

diff --git a/ChangeLog b/ChangeLog
index b5d7f2c08..5bcb6b78c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+15/04/28 - build 149
+
+-- fixed build issue with extras
+
 15/04/28 - build 148
 
 -- fixed default validation issue reported by Sancho Panza
diff --git a/src/detection/detect.cc b/src/detection/detect.cc
index bec4ae60c..387bbbb3b 100644
--- a/src/detection/detect.cc
+++ b/src/detection/detect.cc
@@ -121,7 +121,8 @@ void snort_inspect(Packet* p)
             "Packet errors = 0x%x, ignoring traffic!\n",
             (p->ptrs.decode_flags & DECODE_ERR_FLAGS)); );
 
-        if ( SnortConfig::inline_mode() && SnortConfig::checksum_drop(p->ptrs.decode_flags & DECODE_ERR_CKSUM_ALL) )
+        if ( SnortConfig::inline_mode() and
+            SnortConfig::checksum_drop(p->ptrs.decode_flags & DECODE_ERR_CKSUM_ALL) )
         {
             DEBUG_WRAP(DebugMessage(DEBUG_DECODE,
                 "Dropping bad packet\n"); );
diff --git a/src/filters/sfrf.h b/src/filters/sfrf.h
index 72fa5e30e..9e456fc79 100644
--- a/src/filters/sfrf.h
+++ b/src/filters/sfrf.h
@@ -168,20 +168,19 @@ int SFRF_TestThreshold(
 void SFRF_ShowObjects(RateFilterConfig*);
 
 static inline void EnableInternalEvent(RateFilterConfig* config, uint32_t sid)
-{   
+{
     if (config == NULL)
         return;
 
     config->internal_event_mask |= (1 << sid);
 }
 
-static inline int InternalEventIsEnabled(RateFilterConfig* config, uint32_t sid)
+static inline bool InternalEventIsEnabled(RateFilterConfig* config, uint32_t sid)
 {
     if (config == NULL)
         return 0;
 
     return (config->internal_event_mask & (1 << sid));
 }
-
 #endif
 
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 454c09cab..d43816125 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -1,8 +1,10 @@
 
 set (INCLUDES
-    thread.h
+    policy.h
+    snort_config.h
     snort_debug.h
     snort_types.h
+    thread.h
 )
 
 add_library (main STATIC
@@ -14,12 +16,10 @@ add_library (main STATIC
     modules.cc
     modules.h
     policy.cc
-    policy.h
     shell.h
     shell.cc
     snort.cc
     snort.h
-    snort_config.h
     snort_debug.cc
     snort_config.cc
     snort_module.h
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
index 1e53e510c..747f0cb09 100644
--- a/src/main/Makefile.am
+++ b/src/main/Makefile.am
@@ -5,6 +5,8 @@ x_includedir = $(pkgincludedir)/main
 noinst_LIBRARIES = libmain.a
 
 x_include_HEADERS = \
+policy.h \
+snort_config.h \
 snort_debug.h \
 snort_types.h \
 thread.h
@@ -18,14 +20,12 @@ help.h \
 modules.cc \
 modules.h \
 policy.cc \
-policy.h \
 shell.cc \
 shell.h \
 snort.cc \
 snort.h \
 snort_config.cc \
 snort_config.h \
-snort_config.h \
 snort_debug.cc \
 snort_module.cc \
 snort_module.h \
diff --git a/src/main/build.h b/src/main/build.h
index 84f13dd26..31a46f41a 100644
--- a/src/main/build.h
+++ b/src/main/build.h
@@ -7,5 +7,5 @@
 //                                               //
 //-----------------------------------------------//
 
-#define BUILD "148"
+#define BUILD "149"
 
diff --git a/src/main/snort_config.h b/src/main/snort_config.h
index 2e5143a53..6cb5b9cd4 100644
--- a/src/main/snort_config.h
+++ b/src/main/snort_config.h
@@ -256,7 +256,7 @@ public:
 
     bool stdin_rules;
 
-    char pid_filename[STD_BUF];
+    char pid_filename[1024];
     char* orig_log_dir;      /* set in case of chroot */
 
     int thiszone;
diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
index 9fc2eb1fa..e55b544f7 100644
--- a/src/utils/CMakeLists.txt
+++ b/src/utils/CMakeLists.txt
@@ -23,6 +23,7 @@ set( UTIL_INCLUDES
     sfportobject.h
     snort_bounds.h
     stats.h
+    util.h
 )
 
 ADD_LIBRARY( utils STATIC
@@ -48,7 +49,6 @@ ADD_LIBRARY( utils STATIC
     strvec.h
     stats.cc
     util.cc
-    util.h
     util_jsnorm.cc 
     util_jsnorm.h
     util_math.cc 
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index e376f85bc..38956bfe3 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -13,7 +13,8 @@ sflsq.h \
 sfmemcap.h \
 sfportobject.h \
 snort_bounds.h \
-stats.h
+stats.h \
+util.h
 
 libutils_a_SOURCES = \
 boyer_moore.cc boyer_moore.h \
@@ -29,7 +30,7 @@ sfsnprintfappend.cc sfsnprintfappend.h \
 snort_bounds.h \
 stats.cc \
 strvec.cc strvec.h \
-util.cc util.h \
+util.cc \
 util_jsnorm.cc util_jsnorm.h \
 util_math.cc util_math.h \
 util_net.cc util_net.h \