From: Russ Combs <rucombs@cisco.com>
Date: Sat, 30 May 2015 15:12:23 +0000 (-0400)
Subject: build 155; file fixup
X-Git-Tag: 3.0.0-233~960
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d7551304bdfb41b6a9f0280e04abe7b8d7e6cf5;p=thirdparty%2Fsnort3.git

build 155; file fixup
---

diff --git a/src/file_api/file_mime_config.h b/src/file_api/file_mime_config.h
index 39b6827f9..30402bb72 100644
--- a/src/file_api/file_mime_config.h
+++ b/src/file_api/file_mime_config.h
@@ -29,13 +29,13 @@
 #include "file_api.h"
 
 /* Function prototypes  */
-void set_mime_decode_config_defauts(DecodeConfig* decode_conf);
-void set_mime_log_config_defauts(MAIL_LogConfig* log_config);
-int parse_mime_decode_args(DecodeConfig* decode_conf, char* arg, const char* preproc_name);
-bool is_decoding_enabled(DecodeConfig* decode_conf);
-bool is_mime_log_enabled(MAIL_LogConfig* log_config);
+void set_mime_decode_config_defauts(DecodeConfig*);
+void set_mime_log_config_defauts(MAIL_LogConfig*);
+int parse_mime_decode_args(DecodeConfig*, char* arg, const char* preproc_name);
+bool is_mime_log_enabled(MAIL_LogConfig*);
+bool is_decoding_enabled(DecodeConfig*);
 bool is_decoding_conf_changed(DecodeConfig* configNext, DecodeConfig* config, const
     char* preproc_name);
-void check_decode_config(DecodeConfig* currentConfig);
+void check_decode_config(DecodeConfig*);
 #endif
 
diff --git a/src/file_api/file_mime_process.cc b/src/file_api/file_mime_process.cc
index 9c1bf19f1..377f2715d 100644
--- a/src/file_api/file_mime_process.cc
+++ b/src/file_api/file_mime_process.cc
@@ -37,6 +37,7 @@
 #include "protocols/packet.h"
 #include "detection_util.h"
 #include "framework/data_bus.h"
+#include "file_mime_config.h"
 
 MimePcre mime_boundary_pcre;
 
@@ -335,18 +336,6 @@ static int search_str_found(void* id, void*, int index, void*, void*)
     return 1;
 }
 
-static inline int is_decoding_enabled(DecodeConfig* pPolicyConfig)
-{
-    if ( (pPolicyConfig->b64_depth > -1) || (pPolicyConfig->qp_depth > -1)
-        || (pPolicyConfig->uu_depth > -1) || (pPolicyConfig->bitenc_depth > -1)
-        || (pPolicyConfig->file_depth > -1))
-    {
-        return 0;
-    }
-    else
-        return -1;
-}
-
 static inline void process_decode_type(const char* start, int length, bool cnt_xf,
     MimeState* mime_ssn)
 {
diff --git a/src/file_api/libs/file_lib.h b/src/file_api/libs/file_lib.h
index 7dc16cc75..2e39f5728 100644
--- a/src/file_api/libs/file_lib.h
+++ b/src/file_api/libs/file_lib.h
@@ -87,8 +87,6 @@ void file_sig_sha256_set(FileContext* context, uint8_t* signature);
 uint8_t* file_sig_sha256_get(FileContext* context);
 
 const char* file_type_name(void* conf, uint32_t id);
-extern int64_t file_type_depth;
-extern int64_t file_signature_depth;
 
 void free_file_identifiers(void*);
 void file_sha256_print(unsigned char* hash);
diff --git a/src/main/build.h b/src/main/build.h
index 9ced4405d..87306d358 100644
--- a/src/main/build.h
+++ b/src/main/build.h
@@ -7,5 +7,5 @@
 //                                               //
 //-----------------------------------------------//
 
-#define BUILD "154"
+#define BUILD "155"
 
diff --git a/src/service_inspectors/imap/imap.cc b/src/service_inspectors/imap/imap.cc
index 7e7f63781..da62f26f8 100644
--- a/src/service_inspectors/imap/imap.cc
+++ b/src/service_inspectors/imap/imap.cc
@@ -804,7 +804,7 @@ bool Imap::configure(SnortConfig*)
 {
     config->decode_conf.file_depth = file_api->get_max_file_depth();
 
-    if (config->decode_conf.file_depth > 0)
+    if (config->decode_conf.file_depth > -1)
         config->log_config.log_filename = 1;
 
     if (file_api->is_decoding_enabled(&config->decode_conf) )
diff --git a/src/service_inspectors/imap/imap_module.cc b/src/service_inspectors/imap/imap_module.cc
index 2aad99180..ba51581b0 100644
--- a/src/service_inspectors/imap/imap_module.cc
+++ b/src/service_inspectors/imap/imap_module.cc
@@ -97,7 +97,7 @@ bool ImapModule::set(const char*, Value& v, SnortConfig*)
             decode_depth += 4 - (decode_depth & 3);
             if (decode_depth > 65535 )
             {
-                decode_depth = decode_depth - 4;
+                decode_depth = decode_depth - 4;  // FIXIT-L what does this do?
             }
             LogMessage("WARNING: IMAP: 'b64_decode_depth' is not a multiple of 4. "
                 "Rounding up to the next multiple of 4. The new 'b64_decode_depth' is %d.\n",
diff --git a/src/service_inspectors/pop/pop.cc b/src/service_inspectors/pop/pop.cc
index d8b96c4cb..4000400ce 100644
--- a/src/service_inspectors/pop/pop.cc
+++ b/src/service_inspectors/pop/pop.cc
@@ -738,7 +738,7 @@ bool Pop::configure(SnortConfig* )
 {
     config->decode_conf.file_depth = file_api->get_max_file_depth();
 
-    if (config->decode_conf.file_depth > 0)
+    if (config->decode_conf.file_depth > -1)
         config->log_config.log_filename = 1;
 
     if (file_api->is_decoding_enabled(&config->decode_conf) )
diff --git a/src/service_inspectors/smtp/smtp.cc b/src/service_inspectors/smtp/smtp.cc
index 296d98166..355ce6a20 100644
--- a/src/service_inspectors/smtp/smtp.cc
+++ b/src/service_inspectors/smtp/smtp.cc
@@ -1647,7 +1647,7 @@ bool Smtp::configure(SnortConfig*)
 {
     config->decode_conf.file_depth = file_api->get_max_file_depth();
 
-    if (config->decode_conf.file_depth > 0)
+    if (config->decode_conf.file_depth > -1)
         config->log_config.log_filename = 1;
 
     if (file_api->is_decoding_enabled(&config->decode_conf) )