aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update for the logging module and symbol renaming

Browse Source
remotes/origin/master-1.0.x
Anoop Saldanha 16 years ago committed by Victor Julien
parent 3a28171fbd
commit b3a7f4c015
2 changed files with 177 additions and 154 deletions
Show Stats Download Patch File Download Diff File

139
src/util-debug.c
Unescape Escape View File

@ -87,7 +87,7 @@ static SCLogConfig *sc_log_config = NULL;
/**
* \brief Holds the global log level. Is the same as sc_log_config->log_level
*/
SCLogLevel sc_global_log_level;
SCLogLevel sc_log_global_log_level;
/**
* \brief Used to indicate whether the logging module has been init or not
@ -194,8 +194,8 @@ void SCLogOutputBuffer(SCLogLevel log_level, char *msg)
/* We need to add a \n for our messages, before logging them. If the
* messages have hit the 1023 length limit, strip the message to
* accomodate the \n */
if (len == SC_MAX_LOG_MSG_LEN - 1)
len = SC_MAX_LOG_MSG_LEN - 2;
if (len == SC_LOG_MAX_LOG_MSG_LEN - 1)
len = SC_LOG_MAX_LOG_MSG_LEN - 2;
temp[len] = '\n';
temp[len + 1] = '\0';
@ -291,7 +291,7 @@ SCError SCLogMessage(SCLogLevel log_level, char **msg, const char *file,
gettimeofday(&tval, NULL);
tms = (struct tm *)localtime(&tval.tv_sec);
cw = snprintf(temp, SC_MAX_LOG_MSG_LEN,
cw = snprintf(temp, SC_LOG_MAX_LOG_MSG_LEN,
"%s%d/%d/%04d -- %02d:%02d:%02d",
substr, tms->tm_mday, tms->tm_mon,
tms->tm_year + 1900, tms->tm_hour, tms->tm_min,
@ -306,7 +306,7 @@ SCError SCLogMessage(SCLogLevel log_level, char **msg, const char *file,
case SC_LOG_FMT_PID:
temp_fmt[0] = '\0';
cw = snprintf(temp, SC_MAX_LOG_MSG_LEN, "%s%u", substr,
cw = snprintf(temp, SC_LOG_MAX_LOG_MSG_LEN, "%s%u", substr,
getpid());
if (cw < 0)
goto error;
@ -318,7 +318,7 @@ SCError SCLogMessage(SCLogLevel log_level, char **msg, const char *file,
case SC_LOG_FMT_TID:
temp_fmt[0] = '\0';
cw = snprintf(temp, SC_MAX_LOG_MSG_LEN, "%s%lu", substr,
cw = snprintf(temp, SC_LOG_MAX_LOG_MSG_LEN, "%s%lu", substr,
syscall(SYS_gettid));
if (cw < 0)
goto error;
@ -331,7 +331,7 @@ SCError SCLogMessage(SCLogLevel log_level, char **msg, const char *file,
case SC_LOG_FMT_TM:
temp_fmt[0] = '\0';
ThreadVars *tv = TmThreadsGetCallingThread();
cw = snprintf(temp, SC_MAX_LOG_MSG_LEN, "%s%s", substr,
cw = snprintf(temp, SC_LOG_MAX_LOG_MSG_LEN, "%s%s", substr,
((tv != NULL)? tv->name: "UNKNOWN TM"));
if (cw < 0)
goto error;
@ -345,9 +345,10 @@ SCError SCLogMessage(SCLogLevel log_level, char **msg, const char *file,
temp_fmt[0] = '\0';
s = SCMapEnumValueToName(log_level, sc_log_level_map);
if (s != NULL)
cw = snprintf(temp, SC_MAX_LOG_MSG_LEN, "%s%s", substr, s);
cw = snprintf(temp, SC_LOG_MAX_LOG_MSG_LEN, "%s%s", substr,
s);
else
cw = snprintf(temp, SC_MAX_LOG_MSG_LEN, "%s%s", substr,
cw = snprintf(temp, SC_LOG_MAX_LOG_MSG_LEN, "%s%s", substr,
"INVALID");
if (cw < 0)
goto error;
@ -359,7 +360,8 @@ SCError SCLogMessage(SCLogLevel log_level, char **msg, const char *file,
case SC_LOG_FMT_FILE_NAME:
temp_fmt[0] = '\0';
cw = snprintf(temp, SC_MAX_LOG_MSG_LEN, "%s%s", substr, file);
cw = snprintf(temp, SC_LOG_MAX_LOG_MSG_LEN, "%s%s", substr,
file);
if (cw < 0)
goto error;
temp += cw;
@ -370,7 +372,8 @@ SCError SCLogMessage(SCLogLevel log_level, char **msg, const char *file,
case SC_LOG_FMT_LINE:
temp_fmt[0] = '\0';
cw = snprintf(temp, SC_MAX_LOG_MSG_LEN, "%s%d", substr, line);
cw = snprintf(temp, SC_LOG_MAX_LOG_MSG_LEN, "%s%d", substr,
line);
if (cw < 0)
goto error;
temp += cw;
@ -381,7 +384,7 @@ SCError SCLogMessage(SCLogLevel log_level, char **msg, const char *file,
case SC_LOG_FMT_FUNCTION:
temp_fmt[0] = '\0';
cw = snprintf(temp, SC_MAX_LOG_MSG_LEN, "%s%s", substr,
cw = snprintf(temp, SC_LOG_MAX_LOG_MSG_LEN, "%s%s", substr,
function);
if (cw < 0)
goto error;
@ -394,7 +397,7 @@ SCError SCLogMessage(SCLogLevel log_level, char **msg, const char *file,
}
temp_fmt++;
}
cw = snprintf(temp, SC_MAX_LOG_MSG_LEN, "%s - ", substr);
cw = snprintf(temp, SC_LOG_MAX_LOG_MSG_LEN, "%s - ", substr);
if (cw < 0)
goto error;
@ -408,6 +411,24 @@ SCError SCLogMessage(SCLogLevel log_level, char **msg, const char *file,
return SC_SPRINTF_ERROR;
}
/**
* \brief Returns whether debug messages are enabled to be logged or not
*
* \retval 1 if debug messages are enabled to be logged
* \retval 0 if debug messages are not enabled to be logged
*/
int SCLogDebugEnabled()
{
#ifndef DEBUG
return 0;
#endif
if (sc_log_global_log_level == SC_LOG_DEBUG)
return 1;
else
return 0;
}
/**
* \brief Allocates an output buffer for an output interface. Used when we
* want the op_interface log_format to override the global_log_format.
@ -556,7 +577,7 @@ static inline SCLogOPIfaceCtx *SCLogInitSyslogOPIface(int facility,
iface_ctx->iface = SC_LOG_OP_IFACE_SYSLOG;
if (facility == -1)
facility = SC_DEF_SYSLOG_FACILITY;
facility = SC_LOG_DEF_SYSLOG_FACILITY;
iface_ctx->facility = facility;
if (log_format != NULL &&
@ -619,7 +640,7 @@ static inline void SCLogSetLogLevel(SCLogInitData *sc_lid, SCLogConfig *sc_lc)
if (sc_lid != NULL)
log_level = sc_lid->global_log_level;
else {
s = getenv(SC_ENV_LOG_LEVEL);
s = getenv(SC_LOG_ENV_LOG_LEVEL);
if (s != NULL)
log_level = SCMapEnumNameToValue(s, sc_log_level_map);
}
@ -628,7 +649,7 @@ static inline void SCLogSetLogLevel(SCLogInitData *sc_lid, SCLogConfig *sc_lc)
if (log_level >= 0 && log_level < SC_LOG_LEVEL_MAX)
sc_lc->log_level = log_level;
else {
sc_lc->log_level = SC_DEF_LOG_LEVEL;
sc_lc->log_level = SC_LOG_DEF_LOG_LEVEL;
#ifndef UNITTESTS
printf("Warning: Invalid global_log_level assigned by user. Falling "
"back on the default_log_level \"%s\"\n",
@ -637,10 +658,10 @@ static inline void SCLogSetLogLevel(SCLogInitData *sc_lid, SCLogConfig *sc_lc)
}
/* we also set it to a global var, as it is easier to access it */
sc_global_log_level = sc_lc->log_level;
sc_log_global_log_level = sc_lc->log_level;
#ifdef DEBUG
printf("sc_global_log_level: %d\n", sc_global_log_level);
printf("sc_log_global_log_level: %d\n", sc_log_global_log_level);
#endif
return;
@ -660,15 +681,16 @@ static inline void SCLogSetLogFormat(SCLogInitData *sc_lid, SCLogConfig *sc_lc)
if (sc_lid != NULL)
format = sc_lid->global_log_format;
else
format = getenv(SC_ENV_LOG_FORMAT);
format = getenv(SC_LOG_ENV_LOG_FORMAT);
/* deal with the global log format to be used */
if (format == NULL || strlen(format) > SC_MAX_LOG_FORMAT_LEN) {
format = SC_DEF_LOG_FORMAT;
if (format == NULL || strlen(format) > SC_LOG_MAX_LOG_FORMAT_LEN) {
format = SC_LOG_DEF_LOG_FORMAT;
#ifndef UNITTESTS
printf("Warning: Invalid global_log_format supplied by user or format "
"length exceeded limit of \"%d\" characters. Falling back on "
"default log_format \"%s\"\n", SC_MAX_LOG_FORMAT_LEN, format);
"default log_format \"%s\"\n", SC_LOG_MAX_LOG_FORMAT_LEN,
format);
#endif
}
@ -704,12 +726,12 @@ static inline void SCLogSetOPIface(SCLogInitData *sc_lid, SCLogConfig *sc_lc)
sc_lc->op_ifaces_cnt = sc_lid->op_ifaces_cnt;
}
else {
s = getenv(SC_ENV_LOG_OP_IFACE);
s = getenv(SC_LOG_ENV_LOG_OP_IFACE);
if (s != NULL) {
op_iface = SCMapEnumNameToValue(s, sc_log_op_iface_map);
if(op_iface < 0 || op_iface >= SC_LOG_OP_IFACE_MAX) {
op_iface = SC_DEF_LOG_OP_IFACE;
op_iface = SC_LOG_DEF_LOG_OP_IFACE;
#ifndef UNITTESTS
printf("Warning: Invalid output interface supplied by user. "
"Falling back on default_output_interface \"%s\"\n",
@ -718,7 +740,7 @@ static inline void SCLogSetOPIface(SCLogInitData *sc_lid, SCLogConfig *sc_lc)
}
}
else {
op_iface = SC_DEF_LOG_OP_IFACE;
op_iface = SC_LOG_DEF_LOG_OP_IFACE;
#ifndef UNITTESTS
printf("Warning: Output_interface not supplied by user. Falling "
"back on default_output_interface \"%s\"\n",
@ -731,16 +753,16 @@ static inline void SCLogSetOPIface(SCLogInitData *sc_lid, SCLogConfig *sc_lc)
op_ifaces_ctx = SCLogInitConsoleOPIface(NULL, -1);
break;
case SC_LOG_OP_IFACE_FILE:
s = getenv(SC_ENV_LOG_FILE);
s = getenv(SC_LOG_ENV_LOG_FILE);
if (s == NULL)
s = SC_DEF_LOG_FILE;
s = SC_LOG_DEF_LOG_FILE;
op_ifaces_ctx = SCLogInitFileOPIface(s, NULL, -1);
break;
case SC_LOG_OP_IFACE_SYSLOG:
s = getenv(SC_ENV_LOG_FACILITY);
s = getenv(SC_LOG_ENV_LOG_FACILITY);
if (s == NULL)
s = SC_DEF_SYSLOG_FACILITY_STR;
s = SC_LOG_DEF_SYSLOG_FACILITY_STR;
op_ifaces_ctx = SCLogInitSyslogOPIface(SCMapEnumNameToValue(s, sc_syslog_facility_map), NULL, -1);
break;
@ -772,7 +794,7 @@ static inline void SCLogSetOPFilter(SCLogInitData *sc_lid, SCLogConfig *sc_lc)
if (sc_lid != NULL)
filter = sc_lid->op_filter;
else
filter = getenv(SC_ENV_LOG_OP_FILTER);
filter = getenv(SC_LOG_ENV_LOG_OP_FILTER);
if (filter != NULL && strcmp(filter, "") != 0) {
sc_lc->op_filter_regex = pcre_compile(filter, opts, &ep, &eo, NULL);
@ -998,12 +1020,12 @@ void SCLogInitLogModuleIfEnvSet(void)
/* Check if the user has set the op_iface env var. Only if it is set,
* we proceed with the initialization */
s = getenv(SC_ENV_LOG_OP_IFACE);
s = getenv(SC_LOG_ENV_LOG_OP_IFACE);
if (s != NULL) {
op_iface = SCMapEnumNameToValue(s, sc_log_op_iface_map);
if(op_iface < 0 || op_iface >= SC_LOG_OP_IFACE_MAX) {
op_iface = SC_DEF_LOG_OP_IFACE;
op_iface = SC_LOG_DEF_LOG_OP_IFACE;
#ifndef UNITTESTS
printf("Warning: Invalid output interface supplied by user. "
"Falling back on default_output_interface \"%s\"\n",
@ -1021,16 +1043,16 @@ void SCLogInitLogModuleIfEnvSet(void)
op_ifaces_ctx = SCLogInitConsoleOPIface(NULL, -1);
break;
case SC_LOG_OP_IFACE_FILE:
s = getenv(SC_ENV_LOG_FILE);
s = getenv(SC_LOG_ENV_LOG_FILE);
if (s == NULL)
s = SC_DEF_LOG_FILE;
s = SC_LOG_DEF_LOG_FILE;
op_ifaces_ctx = SCLogInitFileOPIface(s, NULL, -1);
break;
case SC_LOG_OP_IFACE_SYSLOG:
s = getenv(SC_ENV_LOG_FACILITY);
s = getenv(SC_LOG_ENV_LOG_FACILITY);
if (s == NULL)
s = SC_DEF_SYSLOG_FACILITY_STR;
s = SC_LOG_DEF_SYSLOG_FACILITY_STR;
op_ifaces_ctx = SCLogInitSyslogOPIface(SCMapEnumNameToValue(s, sc_syslog_facility_map), NULL, -1);
break;
@ -1041,7 +1063,7 @@ void SCLogInitLogModuleIfEnvSet(void)
/* Set the filter */
filter = getenv(SC_ENV_LOG_OP_FILTER);
filter = getenv(SC_LOG_ENV_LOG_OP_FILTER);
if (filter != NULL && strcmp(filter, "") != 0) {
sc_lc->op_filter_regex = pcre_compile(filter, opts, &ep, &eo, NULL);
if (sc_lc->op_filter_regex == NULL) {
@ -1059,13 +1081,14 @@ void SCLogInitLogModuleIfEnvSet(void)
}
/* Set the log_format */
format = getenv(SC_ENV_LOG_FORMAT);
if (format == NULL || strlen(format) > SC_MAX_LOG_FORMAT_LEN) {
format = SC_DEF_LOG_FORMAT;
format = getenv(SC_LOG_ENV_LOG_FORMAT);
if (format == NULL || strlen(format) > SC_LOG_MAX_LOG_FORMAT_LEN) {
format = SC_LOG_DEF_LOG_FORMAT;
#ifndef UNITTESTS
printf("Warning: Invalid global_log_format supplied by user or format "
"length exceeded limit of \"%d\" characters. Falling back on "
"default log_format \"%s\"\n", SC_MAX_LOG_FORMAT_LEN, format);
"default log_format \"%s\"\n", SC_LOG_MAX_LOG_FORMAT_LEN,
format);
#endif
}
@ -1076,14 +1099,14 @@ void SCLogInitLogModuleIfEnvSet(void)
}
/* Set the log_level */
s = getenv(SC_ENV_LOG_LEVEL);
s = getenv(SC_LOG_ENV_LOG_LEVEL);
if (s != NULL)
log_level = SCMapEnumNameToValue(s, sc_log_level_map);
if (log_level >= 0 && log_level < SC_LOG_LEVEL_MAX)
sc_lc->log_level = log_level;
else {
sc_lc->log_level = SC_DEF_LOG_LEVEL;
sc_lc->log_level = SC_LOG_DEF_LOG_LEVEL;
#ifndef UNITTESTS
printf("Warning: Invalid global_log_level assigned by user. Falling "
"back on default_log_level \"%s\"\n",
@ -1092,7 +1115,7 @@ void SCLogInitLogModuleIfEnvSet(void)
}
/* we also set it to a global var, as it is easier to access it */
sc_global_log_level = sc_lc->log_level;
sc_log_global_log_level = sc_lc->log_level;
sc_log_module_initialized = 1;
sc_log_module_cleaned = 0;
@ -1108,7 +1131,7 @@ void SCLogDeInitLogModule(void)
SCLogFreeLogConfig(sc_log_config);
/* reset the global logging_module variables */
sc_global_log_level = 0;
sc_log_global_log_level = 0;
sc_log_module_initialized = 0;
sc_log_module_cleaned = 1;
sc_log_config = NULL;
@ -1137,21 +1160,21 @@ int SCLogTestInit01()
int result = 1;
/* unset any environment variables set for the logging module */
unsetenv(SC_ENV_LOG_LEVEL);
unsetenv(SC_ENV_LOG_OP_IFACE);
unsetenv(SC_ENV_LOG_FORMAT);
unsetenv(SC_LOG_ENV_LOG_LEVEL);
unsetenv(SC_LOG_ENV_LOG_OP_IFACE);
unsetenv(SC_LOG_ENV_LOG_FORMAT);
SCLogInitLogModule(NULL);
result &= (SC_DEF_LOG_LEVEL == sc_log_config->log_level);
result &= (SC_DEF_LOG_OP_IFACE == sc_log_config->op_ifaces->iface);
result &= (strcmp(SC_DEF_LOG_FORMAT, sc_log_config->log_format) == 0);
result &= (SC_LOG_DEF_LOG_LEVEL == sc_log_config->log_level);
result &= (SC_LOG_DEF_LOG_OP_IFACE == sc_log_config->op_ifaces->iface);
result &= (strcmp(SC_LOG_DEF_LOG_FORMAT, sc_log_config->log_format) == 0);
SCLogDeInitLogModule();
setenv(SC_ENV_LOG_LEVEL, "Debug", 1);
setenv(SC_ENV_LOG_OP_IFACE, "Console", 1);
setenv(SC_ENV_LOG_FORMAT, "%n- %l", 1);
setenv(SC_LOG_ENV_LOG_LEVEL, "Debug", 1);
setenv(SC_LOG_ENV_LOG_OP_IFACE, "Console", 1);
setenv(SC_LOG_ENV_LOG_FORMAT, "%n- %l", 1);
SCLogInitLogModule(NULL);
@ -1159,9 +1182,9 @@ int SCLogTestInit01()
result &= (SC_LOG_OP_IFACE_CONSOLE == sc_log_config->op_ifaces->iface);
result &= !strcmp("%n- %l", sc_log_config->log_format);
unsetenv(SC_ENV_LOG_LEVEL);
unsetenv(SC_ENV_LOG_OP_IFACE);
unsetenv(SC_ENV_LOG_FORMAT);
unsetenv(SC_LOG_ENV_LOG_LEVEL);
unsetenv(SC_LOG_ENV_LOG_OP_IFACE);
unsetenv(SC_LOG_ENV_LOG_FORMAT);
SCLogDeInitLogModule();
@ -1190,7 +1213,7 @@ int SCLogTestInit02()
result &= (SC_LOG_DEBUG == sc_log_config->log_level);
result &= (SC_LOG_OP_IFACE_FILE == sc_log_config->op_ifaces->iface);
result &= (SC_LOG_OP_IFACE_CONSOLE == sc_log_config->op_ifaces->next->iface);
result &= (strcmp(SC_DEF_LOG_FORMAT, sc_log_config->log_format) == 0);
result &= (strcmp(SC_LOG_DEF_LOG_FORMAT, sc_log_config->log_format) == 0);
result &= (strcmp("%m - %d", sc_log_config->op_ifaces->log_format) == 0);
result &= (sc_log_config->op_ifaces->next->log_format == NULL);

192
src/util-debug.h
Unescape Escape View File

@ -18,12 +18,12 @@
/**
* \brief ENV vars that can be used to set the properties for the logging module
*/
#define SC_ENV_LOG_LEVEL "SC_LOG_LEVEL"
#define SC_ENV_LOG_OP_IFACE "SC_LOG_OP_IFACE"
#define SC_ENV_LOG_FILE "SC_LOG_FILE"
#define SC_ENV_LOG_FACILITY "SC_LOG_FACILITY"
#define SC_ENV_LOG_FORMAT "SC_LOG_FORMAT"
#define SC_ENV_LOG_OP_FILTER "SC_LOG_OP_FILTER"
#define SC_LOG_ENV_LOG_LEVEL "SC_LOG_LEVEL"
#define SC_LOG_ENV_LOG_OP_IFACE "SC_LOG_OP_IFACE"
#define SC_LOG_ENV_LOG_FILE "SC_LOG_FILE"
#define SC_LOG_ENV_LOG_FACILITY "SC_LOG_FACILITY"
#define SC_LOG_ENV_LOG_FORMAT "SC_LOG_FORMAT"
#define SC_LOG_ENV_LOG_OP_FILTER "SC_LOG_OP_FILTER"
/**
* \brief The various log levels
@ -52,33 +52,33 @@ typedef enum {
} SCLogOPIface;
/* The default log_format, if it is not supplied by the user */
#define SC_DEF_LOG_FORMAT "<%d> - <%t>"
#define SC_LOG_DEF_LOG_FORMAT "<%d> - <%t>"
/* The maximum length of the log message */
#define SC_MAX_LOG_MSG_LEN 1024
#define SC_LOG_MAX_LOG_MSG_LEN 1024
/* The maximum length of the log format */
#define SC_MAX_LOG_FORMAT_LEN 128
#define SC_LOG_MAX_LOG_FORMAT_LEN 128
/* The default log level, if it is not supplied by the user */
#define SC_DEF_LOG_LEVEL SC_LOG_ERROR
#define SC_LOG_DEF_LOG_LEVEL SC_LOG_ERROR
/* The default output interface to be used */
#define SC_DEF_LOG_OP_IFACE SC_LOG_OP_IFACE_FILE
#define SC_LOG_DEF_LOG_OP_IFACE SC_LOG_OP_IFACE_FILE
/* The default log file to be used */
#define SC_DEF_LOG_FILE "/var/log/eidps/sc_ids_log.log"
#define SC_LOG_DEF_LOG_FILE "/var/log/eidps/sc_ids_log.log"
/* The default syslog facility to be used */
#define SC_DEF_SYSLOG_FACILITY_STR "local0"
#define SC_DEF_SYSLOG_FACILITY LOG_LOCAL0
#define SC_LOG_DEF_SYSLOG_FACILITY_STR "local0"
#define SC_LOG_DEF_SYSLOG_FACILITY LOG_LOCAL0
/**
* \brief Structure to be used when log_level override support would be provided
* by the logging module
*/
typedef struct SCLogOPBuffer_ {
char msg[SC_MAX_LOG_MSG_LEN];
char msg[SC_LOG_MAX_LOG_MSG_LEN];
char *temp;
const char *log_format;
} SCLogOPBuffer;
@ -160,55 +160,55 @@ typedef struct SCLogConfig_ {
/* The log format prefix for the format specifiers */
#define SC_LOG_FMT_PREFIX '%'
extern SCLogLevel sc_global_log_level;
extern SCLogLevel sc_log_global_log_level;
extern int sc_log_module_initialized;
extern int sc_log_module_cleaned;
#define SCLog(x, ...) do { \
char msg[SC_MAX_LOG_MSG_LEN]; \
char *temp = msg; \
if ( !( \
(sc_global_log_level >= x) && \
SCLogMessage(x, &temp, \
__FILE__, \
__LINE__, \
__FUNCTION__) \
== SC_OK) ) \
{ } else { \
snprintf(temp, \
(SC_MAX_LOG_MSG_LEN - \
(msg - temp)), \
__VA_ARGS__); \
SCLogOutputBuffer(x, msg); \
} \
#define SCLog(x, ...) do { \
char msg[SC_LOG_MAX_LOG_MSG_LEN]; \
char *temp = msg; \
if ( !( \
(sc_log_global_log_level >= x) && \
SCLogMessage(x, &temp, \
__FILE__, \
__LINE__, \
__FUNCTION__) \
== SC_OK) ) \
{ } else { \
snprintf(temp, \
(SC_LOG_MAX_LOG_MSG_LEN - \
(msg - temp)), \
__VA_ARGS__); \
SCLogOutputBuffer(x, msg); \
} \
} while(0)
#define SCLogErr(x, err, ...) do { \
char msg[SC_MAX_LOG_MSG_LEN]; \
char *temp = msg; \
if ( !( \
(sc_global_log_level >= x) && \
SCLogMessage(x, &temp, \
__FILE__, \
__LINE__, \
__FUNCTION__) \
== SC_OK) ) \
{ } else { \
temp = temp + snprintf(temp, \
(SC_MAX_LOG_MSG_LEN - \
(msg - temp)), \
"[ERRCODE: %s(%d)] - ",\
SCErrorToString(err), \
err); \
snprintf(temp, \
(SC_MAX_LOG_MSG_LEN - \
(msg - temp)), \
__VA_ARGS__); \
SCLogOutputBuffer(x, msg); \
} \
#define SCLogErr(x, err, ...) do { \
char msg[SC_LOG_MAX_LOG_MSG_LEN]; \
char *temp = msg; \
if ( !( \
(sc_log_global_log_level >= x) && \
SCLogMessage(x, &temp, \
__FILE__, \
__LINE__, \
__FUNCTION__) \
== SC_OK) ) \
{ } else { \
temp = temp + snprintf(temp, \
(SC_LOG_MAX_LOG_MSG_LEN - \
(msg - temp)), \
"[ERRCODE: %s(%d)] - ", \
SCErrorToString(err), \
err); \
snprintf(temp, \
(SC_LOG_MAX_LOG_MSG_LEN - \
(msg - temp)), \
__VA_ARGS__); \
SCLogOutputBuffer(x, msg); \
} \
} while(0)
/**
@ -216,14 +216,14 @@ extern int sc_log_module_cleaned;
*
* \retval ... Takes as argument(s), a printf style format message
*/
#define SCInfo(...) SCLog(SC_LOG_INFO, __VA_ARGS__)
#define SCLogInfo(...) SCLog(SC_LOG_INFO, __VA_ARGS__)
/**
* \brief Macro used to log NOTICE messages.
*
* \retval ... Takes as argument(s), a printf style format message
*/
#define SCNotice(...) SCLog(SC_LOG_NOTICE, __VA_ARGS__)
#define SCLogNotice(...) SCLog(SC_LOG_NOTICE, __VA_ARGS__)
/**
* \brief Macro used to log WARNING messages.
@ -232,7 +232,7 @@ extern int sc_log_module_cleaned;
* warning message
* \retval ... Takes as argument(s), a printf style format message
*/
#define SCWarning(err_code, ...) SCLogErr(SC_LOG_WARNING, err_code, \
#define SCLogWarning(err_code, ...) SCLogErr(SC_LOG_WARNING, err_code, \
__VA_ARGS__)
/**
* \brief Macro used to log ERROR messages.
@ -241,7 +241,7 @@ extern int sc_log_module_cleaned;
* error message
* \retval ... Takes as argument(s), a printf style format message
*/
#define SCErrorLog(err_code, ...) SCLogErr(SC_LOG_ERROR, err_code, \
#define SCLogError(err_code, ...) SCLogErr(SC_LOG_ERROR, err_code, \
__VA_ARGS__)
/**
* \brief Macro used to log CRITICAL messages.
@ -250,7 +250,7 @@ extern int sc_log_module_cleaned;
* critical message
* \retval ... Takes as argument(s), a printf style format message
*/
#define SCCritical(err_code, ...) SCLogErr(SC_LOG_CRITICAL, err_code, \
#define SCLogCritical(err_code, ...) SCLogErr(SC_LOG_CRITICAL, err_code, \
__VA_ARGS__)
/**
* \brief Macro used to log ALERT messages.
@ -259,7 +259,7 @@ extern int sc_log_module_cleaned;
* alert message
* \retval ... Takes as argument(s), a printf style format message
*/
#define SCAlert(err_code, ...) SCLogErr(SC_LOG_ALERT, err_code, \
#define SCLogAlert(err_code, ...) SCLogErr(SC_LOG_ALERT, err_code, \
__VA_ARGS__)
/**
* \brief Macro used to log EMERGENCY messages.
@ -268,14 +268,14 @@ extern int sc_log_module_cleaned;
* emergency message
* \retval ... Takes as argument(s), a printf style format message
*/
#define SCEmerg(err_code, ...) SCLogErr(SC_LOG_EMERGENCY, err_code, \
#define SCLogEmerg(err_code, ...) SCLogErr(SC_LOG_EMERGENCY, err_code, \
__VA_ARGS__)
/* Avoid the overhead of using the debugging subsystem, in production mode */
#ifndef DEBUG
#define SCDebug(...)
#define SCLogDebug(...)
#define SCEnter(...)
@ -305,7 +305,7 @@ extern int sc_log_module_cleaned;
*
* \retval ... Takes as argument(s), a printf style format message
*/
#define SCDebug(...) SCLog(SC_LOG_DEBUG, __VA_ARGS__)
#define SCLogDebug(...) SCLog(SC_LOG_DEBUG, __VA_ARGS__)
/**
* \brief Macro used to log debug messages on function entry. Comes under the
@ -315,20 +315,20 @@ extern int sc_log_module_cleaned;
*
* \retval f An argument can be supplied, although it is not used
*/
#define SCEnter(f) do { \
char msg[SC_MAX_LOG_MSG_LEN]; \
char *temp = msg; \
if (sc_global_log_level >= SC_LOG_DEBUG && \
SCLogCheckFDFilterEntry(__FUNCTION__) &&\
SCLogMessage(SC_LOG_DEBUG, &temp, \
__FILE__, \
__LINE__, \
__FUNCTION__) == SC_OK) { \
snprintf(temp, (SC_MAX_LOG_MSG_LEN - \
(msg - temp)), \
"%s", "Entering ... >>"); \
SCLogOutputBuffer(SC_LOG_DEBUG, msg); \
} \
#define SCEnter(f) do { \
char msg[SC_LOG_MAX_LOG_MSG_LEN]; \
char *temp = msg; \
if (sc_log_global_log_level >= SC_LOG_DEBUG &&\
SCLogCheckFDFilterEntry(__FUNCTION__) && \
SCLogMessage(SC_LOG_DEBUG, &temp, \
__FILE__, \
__LINE__, \
__FUNCTION__) == SC_OK) { \
snprintf(temp, (SC_LOG_MAX_LOG_MSG_LEN - \
(msg - temp)), \
"%s", "Entering ... >>"); \
SCLogOutputBuffer(SC_LOG_DEBUG, msg); \
} \
} while(0)
@ -341,9 +341,9 @@ extern int sc_log_module_cleaned;
* a value.
*/
#define SCReturn do { \
if (sc_global_log_level >= SC_LOG_DEBUG) { \
if (sc_log_global_log_level >= SC_LOG_DEBUG) { \
SCDebug("Returning ... <<" ); \
SCLogCheckFDFilterExit(__FUNCTION__); \
SCLogCheckFDFilterExit(__FUNCTION__); \
} \
return; \
} while(0)
@ -359,9 +359,9 @@ extern int sc_log_module_cleaned;
* \retval x Variable of type 'integer' that has to be returned
*/
#define SCReturnInt(x) do { \
if (sc_global_log_level >= SC_LOG_DEBUG) { \
if (sc_log_global_log_level >= SC_LOG_DEBUG) { \
SCDebug("Returning: %d ... <<", x); \
SCLogCheckFDFilterExit(__FUNCTION__); \
SCLogCheckFDFilterExit(__FUNCTION__); \
} \
return x; \
} while(0)
@ -377,9 +377,9 @@ extern int sc_log_module_cleaned;
* \retval x Variable of type 'unsigned integer' that has to be returned
*/
#define SCReturnUInt(x) do { \
if (sc_global_log_level >= SC_LOG_DEBUG) { \
if (sc_log_global_log_level >= SC_LOG_DEBUG) { \
SCDebug("Returning: %u ... <<", x); \
SCLogCheckFDFilterExit(__FUNCTION__); \
SCLogCheckFDFilterExit(__FUNCTION__); \
} \
return x; \
} while(0)
@ -395,9 +395,9 @@ extern int sc_log_module_cleaned;
* \retval x Variable of type 'float/double' that has to be returned
*/
#define SCReturnDbl(x) do { \
if (sc_global_log_level >= SC_LOG_DEBUG) { \
if (sc_log_global_log_level >= SC_LOG_DEBUG) { \
SCDebug("Returning: %f ... <<", x); \
SCLogCheckFDFilterExit(__FUNCTION__); \
SCLogCheckFDFilterExit(__FUNCTION__); \
} \
return x; \
} while(0)
@ -413,9 +413,9 @@ extern int sc_log_module_cleaned;
* \retval x Variable of type 'char' that has to be returned
*/
#define SCReturnChar(x) do { \
if (sc_global_log_level >= SC_LOG_DEBUG) { \
if (sc_log_global_log_level >= SC_LOG_DEBUG) { \
SCDebug("Returning: %c ... <<", x); \
SCLogCheckFDFilterExit(__FUNCTION__); \
SCLogCheckFDFilterExit(__FUNCTION__); \
} \
return x; \
} while(0)
@ -431,9 +431,9 @@ extern int sc_log_module_cleaned;
* \retval x Pointer to the char string that has to be returned
*/
#define SCReturnCharPtr(x) do { \
if (sc_global_log_level >= SC_LOG_DEBUG) { \
if (sc_log_global_log_level >= SC_LOG_DEBUG) { \
SCDebug("Returning: %s ... <<", x); \
SCLogCheckFDFilterExit(__FUNCTION__); \
SCLogCheckFDFilterExit(__FUNCTION__); \
} \
return x; \
} while(0)
@ -452,10 +452,10 @@ extern int sc_log_module_cleaned;
* type(the argument x) that has to be returned
*/
#define SCReturnCT(x, type) do { \
if (sc_global_log_level >= SC_LOG_DEBUG) { \
if (sc_log_global_log_level >= SC_LOG_DEBUG) { \
SCDebug("Returning var of " \
"type %s ... <<", type); \
SCLogCheckFDFilterExit(__FUNCTION__); \
SCLogCheckFDFilterExit(__FUNCTION__); \
} \
return x; \
} while(0)
@ -474,10 +474,10 @@ extern int sc_log_module_cleaned;
* type(the argument x) that has to be returned
*/
#define SCReturnPtr(x, type) do { \
if (sc_global_log_level >= SC_LOG_DEBUG) { \
if (sc_log_global_log_level >= SC_LOG_DEBUG) { \
SCDebug("Returning pointer of " \
"type %s ... <<", type); \
SCLogCheckFDFilterExit(__FUNCTION__); \
SCLogCheckFDFilterExit(__FUNCTION__); \
} \
return x; \
} while(0)
@ -504,7 +504,7 @@ void SCLogOutputBuffer(SCLogLevel, char *);
SCLogOPBuffer *SCLogAllocLogOPBuffer(void);
int SCLogAddFGFilter(const char *, const char *, unsigned, int);
int SCLogDebugEnabled(void);
void SCLogRegisterTests(void);

Write Preview
Loading…
Cancel
Save