Merge remote-tracking branch 'upstream/master'

1 files changed, 29 insertions, 10 deletions

diff --git a/src/sp_utils.h b/src/sp_utils.h
index 9df196c..d2b88fb 100644
--- a/src/sp_utils.h
+++ b/src/sp_utils.h
@@ -28,24 +28,42 @@
 #define HOOK_FUNCTION_BY_REGEXP(regexp, hook_table, new_function) \
   hook_regexp(regexp, SNUFFLEUPAGUS_G(hook_table), new_function)
 
-#define SP_LOG_SIMULATION E_WARNING
-#define SP_LOG_DROP E_ERROR
+#define SP_TYPE_LOG (0)
+#define SP_TYPE_DROP (1)
+#define SP_TYPE_SIMULATION (2)
+
 #define SP_LOG_DEBUG E_NOTICE
 #define SP_LOG_ERROR E_ERROR
 #define SP_LOG_WARN E_WARNING
 
-#define sp_log_err(feature, ...) sp_log_msg(feature, SP_LOG_ERROR, __VA_ARGS__)
-#define sp_log_warn(feature, ...) sp_log_msg(feature, SP_LOG_WARN, __VA_ARGS__)
+#define sp_log_msg(feature, level, ...) \
+  sp_log_msgf(feature, level, SP_TYPE_LOG, __VA_ARGS__)
+#define sp_log_drop(feature, ...) \
+  sp_log_msgf(feature, SP_LOG_ERROR, SP_TYPE_DROP, __VA_ARGS__)
+#define sp_log_simulation(feature, ...) \
+  sp_log_msgf(feature, SP_LOG_WARN, SP_TYPE_SIMULATION, __VA_ARGS__)
+#define sp_log_auto(feature, is_simulation, ...)                     \
+  sp_log_msgf(feature, (is_simulation ? SP_LOG_WARN : SP_LOG_ERROR), \
+              (is_simulation ? SP_TYPE_SIMULATION : SP_TYPE_DROP),   \
+              __VA_ARGS__)
+
+#define sp_log_err(feature, ...) \
+  sp_log_msgf(feature, SP_LOG_ERROR, SP_TYPE_LOG, __VA_ARGS__)
+#define sp_log_warn(feature, ...) \
+  sp_log_msgf(feature, SP_LOG_WARN, SP_TYPE_LOG, __VA_ARGS__)
 #ifdef SP_DEBUG
-#define sp_log_debug(fmt, ...) sp_log_msg("DEBUG", SP_LOG_DEBUG, "%s(): " fmt, __FUNCTION__, ##__VA_ARGS__)
+#define sp_log_debug(...) \
+  sp_log_msgf("DEBUG", SP_LOG_DEBUG, SP_TYPE_LOG, "%s(): " fmt, __FUNCTION__, ##__VA_ARGS__)
 #else
 #define sp_log_debug(...)
 #endif
 
 #define GET_SUFFIX(x) (x == 1) ? "st" : ((x == 2) ? "nd" : "th")
 
-void sp_log_msg(char const *feature, int type, const char *fmt, ...);
-int compute_hash(const char *const filename, char *file_hash);
+const char *get_ipaddr(void);
+void sp_log_msgf(char const *restrict feature, int level, int type,
+                 const char *restrict fmt, ...);
+int compute_hash(const char *const restrict filename, char *restrict file_hash);
 const zend_string *sp_zval_to_zend_string(const zval *);
 bool sp_match_value(const zend_string *, const zend_string *, const sp_pcre *);
 bool sp_match_array_key(const zval *, const zend_string *, const sp_pcre *);
@@ -54,11 +72,12 @@ void sp_log_disable(const char *restrict, const char *restrict,
                     const zend_string *restrict, const sp_disabled_function *);
 void sp_log_disable_ret(const char *restrict, const zend_string *restrict,
                         const sp_disabled_function *);
-int hook_function(const char *, HashTable *, zif_handler);
+bool hook_function(const char *, HashTable *, zif_handler);
 int hook_regexp(const sp_pcre *, HashTable *, zif_handler);
 bool check_is_in_eval_whitelist(const zend_string *const function_name);
-int sp_log_request(const zend_string *folder, const zend_string *text_repr,
-                   char *from);
+int sp_log_request(const zend_string *restrict folder,
+                   const zend_string *restrict text_repr,
+                   char const *const from);
 bool sp_zend_string_equals(const zend_string *s1, const zend_string *s2);
 
 #endif /* SP_UTILS_H */