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

fix for unclear error messages bug 15

Browse Source
remotes/origin/master-1.0.x
Anoop Saldanha 16 years ago committed by Victor Julien
parent 47ad1e5b2e
commit 4d430060d2
8 changed files with 74 additions and 29 deletions
Show Stats Download Patch File Download Diff File

9
src/alert-debuglog.c
Unescape Escape View File

@ -193,7 +193,8 @@ TmEcode AlertDebuglogThreadInit(ThreadVars *t, void *initdata, void **data)
if(initdata == NULL) if(initdata == NULL)
{ {
printf("Error getting context for the file\n"); SCLogError(SC_ERR_DEBUG_LOG_GENERIC_ERROR, "Error getting context for "
"DebugLog. \"initdata\" argument NULL");
return TM_ECODE_FAILED; return TM_ECODE_FAILED;
} }
/** Use the Ouptut Context (file pointer and mutex) */ /** Use the Ouptut Context (file pointer and mutex) */
@ -238,7 +239,8 @@ LogFileCtx *AlertDebuglogInitCtx(char *config_file)
if(file_ctx == NULL) if(file_ctx == NULL)
{ {
printf("AlertDebuglogInitCtx: Couldn't create new file_ctx\n"); SCLogError(SC_ERR_DEBUG_LOG_GENERIC_ERROR, "AlertDebuglogInitCtx: Couldn't "
"create new file_ctx");
return NULL; return NULL;
} }
@ -277,7 +279,8 @@ int AlertDebuglogOpenFileCtx(LogFileCtx *file_ctx, char *config_file)
snprintf(log_path, PATH_MAX, "%s/%s", log_dir, DEFAULT_LOG_FILENAME); snprintf(log_path, PATH_MAX, "%s/%s", log_dir, DEFAULT_LOG_FILENAME);
file_ctx->fp = fopen(log_path, "w"); file_ctx->fp = fopen(log_path, "w");
if (file_ctx->fp == NULL) { if (file_ctx->fp == NULL) {
printf("ERROR: failed to open %s: %s\n", log_path, strerror(errno)); SCLogError(SC_ERR_FOPEN, "ERROR: failed to open %s: %s", log_path,
strerror(errno));
return -1; return -1;
} }
} }

9
src/alert-fastlog.c
Unescape Escape View File

@ -161,7 +161,8 @@ TmEcode AlertFastlogThreadInit(ThreadVars *t, void *initdata, void **data)
memset(aft, 0, sizeof(AlertFastlogThread)); memset(aft, 0, sizeof(AlertFastlogThread));
if(initdata == NULL) if(initdata == NULL)
{ {
printf("Error getting context for the file\n"); SCLogError(SC_ERR_FAST_LOG_GENERIC_ERROR, "Error getting context for "
"AlertFastLog. \"initdata\" argument NULL");
return TM_ECODE_FAILED; return TM_ECODE_FAILED;
} }
/** Use the Ouptut Context (file pointer and mutex) */ /** Use the Ouptut Context (file pointer and mutex) */
@ -204,7 +205,8 @@ LogFileCtx *AlertFastlogInitCtx(char *config_file)
if(file_ctx == NULL) if(file_ctx == NULL)
{ {
printf("AlertFastlogInitCtx: Couldn't create new file_ctx\n"); SCLogError(SC_ERR_FAST_LOG_GENERIC_ERROR, "AlertFastlogInitCtx: Couldn't "
"create new file_ctx");
return NULL; return NULL;
} }
@ -244,7 +246,8 @@ int AlertFastlogOpenFileCtx(LogFileCtx *file_ctx, char *config_file)
file_ctx->fp = fopen(log_path, "w"); file_ctx->fp = fopen(log_path, "w");
if (file_ctx->fp == NULL) { if (file_ctx->fp == NULL) {
printf("ERROR: failed to open %s: %s\n", log_path, strerror(errno)); SCLogError(SC_ERR_FOPEN, "ERROR: failed to open %s: %s", log_path,
strerror(errno));
return -1; return -1;
} }
} }

28
src/alert-unified-alert.c
Unescape Escape View File

@ -24,6 +24,8 @@
#include "util-unittest.h" #include "util-unittest.h"
#include "util-time.h" #include "util-time.h"
#include "util-error.h"
#include "util-debug.h"
#define DEFAULT_LOG_FILENAME "unified.alert" #define DEFAULT_LOG_FILENAME "unified.alert"
@ -94,7 +96,8 @@ int AlertUnifiedAlertWriteFileHeader(ThreadVars *t, AlertUnifiedAlertThread *aun
ret = fwrite(&hdr, sizeof(hdr), 1, aun->file_ctx->fp); ret = fwrite(&hdr, sizeof(hdr), 1, aun->file_ctx->fp);
if (ret != 1) { if (ret != 1) {
printf("Error: fwrite failed: ret = %" PRId32 ", %s\n", ret, strerror(errno)); SCLogError(SC_ERR_FWRITE, "Error: fwrite failed: ret = %" PRId32 ", %s",
ret, strerror(errno));
return -1; return -1;
} }
fflush(aun->file_ctx->fp); fflush(aun->file_ctx->fp);
@ -114,15 +117,18 @@ int AlertUnifiedAlertCloseFile(ThreadVars *t, AlertUnifiedAlertThread *aun) {
int AlertUnifiedAlertRotateFile(ThreadVars *t, AlertUnifiedAlertThread *aun) { int AlertUnifiedAlertRotateFile(ThreadVars *t, AlertUnifiedAlertThread *aun) {
if (AlertUnifiedAlertCloseFile(t,aun) < 0) { if (AlertUnifiedAlertCloseFile(t,aun) < 0) {
printf("Error: AlertUnifiedAlertCloseFile failed\n"); SCLogError(SC_ERR_UNIFIED_ALERT_GENERIC_ERROR,
"Error: AlertUnifiedAlertCloseFile failed");
return -1; return -1;
} }
if (AlertUnifiedAlertOpenFileCtx(aun->file_ctx,aun->file_ctx->config_file) < 0) { if (AlertUnifiedAlertOpenFileCtx(aun->file_ctx,aun->file_ctx->config_file) < 0) {
printf("Error: AlertUnifiedLogOpenFileCtx, open new log file failed\n"); SCLogError(SC_ERR_UNIFIED_ALERT_GENERIC_ERROR,
"Error: AlertUnifiedLogOpenFileCtx, open new log file failed");
return -1; return -1;
} }
if (AlertUnifiedAlertWriteFileHeader(t, aun) < 0) { if (AlertUnifiedAlertWriteFileHeader(t, aun) < 0) {
printf("Error: AlertUnifiedLogAppendFile, write unified header failed\n"); SCLogError(SC_ERR_UNIFIED_ALERT_GENERIC_ERROR, "Error: "
"AlertUnifiedLogAppendFile, write unified header failed");
return -1; return -1;
} }
@ -181,7 +187,7 @@ TmEcode AlertUnifiedAlert (ThreadVars *tv, Packet *p, void *data, PacketQueue *p
/* write and flush so it's written immediately */ /* write and flush so it's written immediately */
ret = fwrite(&hdr, sizeof(hdr), 1, aun->file_ctx->fp); ret = fwrite(&hdr, sizeof(hdr), 1, aun->file_ctx->fp);
if (ret != 1) { if (ret != 1) {
printf("Error: fwrite failed: %s\n", strerror(errno)); SCLogError(SC_ERR_FWRITE, "Error: fwrite failed: %s", strerror(errno));
return TM_ECODE_FAILED; return TM_ECODE_FAILED;
} }
/* force writing to disk so barnyard will not read half /* force writing to disk so barnyard will not read half
@ -202,7 +208,8 @@ TmEcode AlertUnifiedAlertThreadInit(ThreadVars *t, void *initdata, void **data)
if(initdata == NULL) if(initdata == NULL)
{ {
printf("Error getting context for the file\n"); SCLogError(SC_ERR_UNIFIED_ALERT_GENERIC_ERROR, "Error getting context for "
"UnifiedAlert. \"initdata\" argument NULL");
return TM_ECODE_FAILED; return TM_ECODE_FAILED;
} }
/** Use the Ouptut Context (file pointer and mutex) */ /** Use the Ouptut Context (file pointer and mutex) */
@ -212,7 +219,8 @@ TmEcode AlertUnifiedAlertThreadInit(ThreadVars *t, void *initdata, void **data)
/** Write Unified header */ /** Write Unified header */
int ret = AlertUnifiedAlertWriteFileHeader(t, aun); int ret = AlertUnifiedAlertWriteFileHeader(t, aun);
if (ret != 0) { if (ret != 0) {
printf("Error: AlertUnifiedLogWriteFileHeader failed.\n"); SCLogError(SC_ERR_UNIFIED_ALERT_GENERIC_ERROR,
"Error: AlertUnifiedLogWriteFileHeader failed");
return TM_ECODE_FAILED; return TM_ECODE_FAILED;
} }
@ -255,7 +263,8 @@ LogFileCtx *AlertUnifiedAlertInitCtx(char *config_file)
LogFileCtx *file_ctx = LogFileNewCtx(); LogFileCtx *file_ctx = LogFileNewCtx();
if (file_ctx == NULL) { if (file_ctx == NULL) {
printf("AlertUnifiedAlertInitCtx: Couldn't create new file_ctx\n"); SCLogError(SC_ERR_UNIFIED_ALERT_GENERIC_ERROR,
"AlertUnifiedAlertInitCtx: Couldn't create new file_ctx");
return NULL; return NULL;
} }
@ -307,7 +316,8 @@ int AlertUnifiedAlertOpenFileCtx(LogFileCtx *file_ctx, char *config_file)
/* XXX filename & location */ /* XXX filename & location */
file_ctx->fp = fopen(filename, "wb"); file_ctx->fp = fopen(filename, "wb");
if (file_ctx->fp == NULL) { if (file_ctx->fp == NULL) {
printf("Error: fopen %s failed: %s\n", filename, strerror(errno)); /* XXX errno threadsafety? */ SCLogError(SC_ERR_FOPEN, "ERROR: failed to open %s: %s", filename,
strerror(errno));
return -1; return -1;
} }
} }

8
src/alert-unified-log.c
Unescape Escape View File

@ -24,6 +24,8 @@
#include "util-unittest.h" #include "util-unittest.h"
#include "util-time.h" #include "util-time.h"
#include "util-debug.h"
#include "util-error.h"
#define DEFAULT_LOG_FILENAME "unified.log" #define DEFAULT_LOG_FILENAME "unified.log"
@ -218,7 +220,8 @@ TmEcode AlertUnifiedLogThreadInit(ThreadVars *t, void *initdata, void **data)
memset(aun, 0, sizeof(AlertUnifiedLogThread)); memset(aun, 0, sizeof(AlertUnifiedLogThread));
if(initdata == NULL) if(initdata == NULL)
{ {
printf("Error getting context for the file\n"); SCLogError(SC_ERR_UNIFIED_LOG_GENERIC_ERROR, "Error getting context for "
"UnifiedLog. \"initdata\" argument NULL");
return TM_ECODE_FAILED; return TM_ECODE_FAILED;
} }
/** Use the Ouptut Context (file pointer and mutex) */ /** Use the Ouptut Context (file pointer and mutex) */
@ -325,7 +328,8 @@ int AlertUnifiedLogOpenFileCtx(LogFileCtx *file_ctx, char *config_file)
/* XXX filename & location */ /* XXX filename & location */
file_ctx->fp = fopen(filename, "wb"); file_ctx->fp = fopen(filename, "wb");
if (file_ctx->fp == NULL) { if (file_ctx->fp == NULL) {
printf("Error: fopen %s failed: %s\n", filename, strerror(errno)); /* XXX errno threadsafety? */ SCLogError(SC_ERR_FOPEN, "ERROR: failed to open %s: %s", filename,
strerror(errno));
return -1; return -1;
} }
} }

25
src/alert-unified2-alert.c
Unescape Escape View File

@ -18,6 +18,7 @@
#include "alert-unified2-alert.h" #include "alert-unified2-alert.h"
#include "decode-ipv4.h" #include "decode-ipv4.h"
#include "util-error.h"
#include "util-debug.h" #include "util-debug.h"
#include "util-time.h" #include "util-time.h"
#ifndef IPPROTO_SCTP #ifndef IPPROTO_SCTP
@ -152,11 +153,13 @@ int Unified2AlertCloseFile(ThreadVars *t, Unified2AlertThread *aun) {
int Unified2AlertRotateFile(ThreadVars *t, Unified2AlertThread *aun) { int Unified2AlertRotateFile(ThreadVars *t, Unified2AlertThread *aun) {
if (Unified2AlertCloseFile(t,aun) < 0) { if (Unified2AlertCloseFile(t,aun) < 0) {
printf("Error: Unified2AlertCloseFile failed\n"); SCLogError(SC_ERR_UNIFIED2_ALERT_GENERIC_ERROR,
"Error: Unified2AlertCloseFile failed");
return -1; return -1;
} }
if (Unified2AlertOpenFileCtx(aun->file_ctx,aun->file_ctx->config_file) < 0) { if (Unified2AlertOpenFileCtx(aun->file_ctx,aun->file_ctx->config_file) < 0) {
printf("Error: Unified2AlertOpenFileCtx, open new log file failed\n"); SCLogError(SC_ERR_UNIFIED2_ALERT_GENERIC_ERROR,
"Error: Unified2AlertOpenFileCtx, open new log file failed");
return -1; return -1;
} }
return 0; return 0;
@ -236,7 +239,7 @@ int Unified2PacketTypeAlert (ThreadVars *t, Packet *p, void *data)
ret = fwrite(write_buffer,len, 1, aun->file_ctx->fp); ret = fwrite(write_buffer,len, 1, aun->file_ctx->fp);
if (ret != 1) { if (ret != 1) {
printf("Error: fwrite failed: %s\n", strerror(errno)); SCLogError(SC_ERR_FWRITE, "Error: fwrite failed: %s", strerror(errno));
return -1; return -1;
} }
@ -346,7 +349,7 @@ int Unified2IPv6TypeAlert (ThreadVars *t, Packet *p, void *data, PacketQueue *pq
ret = fwrite(write_buffer,len, 1, aun->file_ctx->fp); ret = fwrite(write_buffer,len, 1, aun->file_ctx->fp);
if (ret != 1) { if (ret != 1) {
printf("Error: fwrite failed: %s\n", strerror(errno)); SCLogError(SC_ERR_FWRITE, "Error: fwrite failed: %s", strerror(errno));
return -1; return -1;
} }
@ -457,7 +460,7 @@ int Unified2IPv4TypeAlert (ThreadVars *tv, Packet *p, void *data, PacketQueue *p
ret = fwrite(write_buffer,len, 1, aun->file_ctx->fp); ret = fwrite(write_buffer,len, 1, aun->file_ctx->fp);
if (ret != 1) { if (ret != 1) {
printf("Error: fwrite failed: %s\n", strerror(errno)); SCLogError(SC_ERR_FWRITE, "Error: fwrite failed: %s", strerror(errno));
return -1; return -1;
} }
@ -488,7 +491,8 @@ TmEcode Unified2AlertThreadInit(ThreadVars *t, void *initdata, void **data)
memset(aun, 0, sizeof(Unified2AlertThread)); memset(aun, 0, sizeof(Unified2AlertThread));
if(initdata == NULL) if(initdata == NULL)
{ {
printf("Error getting context for the file\n"); SCLogError(SC_ERR_UNIFIED2_ALERT_GENERIC_ERROR, "Error getting context for "
"Unified2Alert. \"initdata\" argument NULL");
return TM_ECODE_FAILED; return TM_ECODE_FAILED;
} }
/** Use the Ouptut Context (file pointer and mutex) */ /** Use the Ouptut Context (file pointer and mutex) */
@ -542,7 +546,8 @@ LogFileCtx *Unified2AlertInitCtx(char *config_file)
if(file_ctx == NULL) if(file_ctx == NULL)
{ {
printf("Unified2AlertInitCtx: Couldn't create new file_ctx\n"); SCLogError(SC_ERR_UNIFIED2_ALERT_GENERIC_ERROR, "Unified2AlertInitCtx: "
"Couldn't create new file_ctx");
return NULL; return NULL;
} }
@ -594,7 +599,8 @@ int Unified2AlertOpenFileCtx(LogFileCtx *file_ctx, char *config_file)
/* XXX filename & location */ /* XXX filename & location */
file_ctx->fp = fopen(filename, "wb"); file_ctx->fp = fopen(filename, "wb");
if (file_ctx->fp == NULL) { if (file_ctx->fp == NULL) {
printf("Error: fopen %s failed: %s\n", filename, strerror(errno)); /* XXX errno threadsafety? */ SCLogError(SC_ERR_FOPEN, "ERROR: failed to open %s: %s", filename,
strerror(errno));
return -1; return -1;
} }
} }
@ -969,7 +975,8 @@ static int Unified2TestRotate01(void)
goto error; goto error;
if (strcmp(filename, lf->filename) == 0) { if (strcmp(filename, lf->filename) == 0) {
printf("filename \"%s\" == \"%s\": ", filename, lf->filename); SCLogError(SC_ERR_UNIFIED2_ALERT_GENERIC_ERROR,
"filename \"%s\" == \"%s\": ", filename, lf->filename);
goto error; goto error;
} }

9
src/log-httplog.c
Unescape Escape View File

@ -184,7 +184,8 @@ TmEcode LogHttplogThreadInit(ThreadVars *t, void *initdata, void **data)
if(initdata == NULL) if(initdata == NULL)
{ {
printf("Error getting context for the file\n"); SCLogError(SC_ERR_HTTP_LOG_GENERIC_ERROR, "Error getting context for "
"HTTPLog. \"initdata\" argument NULL");
return TM_ECODE_FAILED; return TM_ECODE_FAILED;
} }
/** Use the Ouptut Context (file pointer and mutex) */ /** Use the Ouptut Context (file pointer and mutex) */
@ -228,7 +229,8 @@ LogFileCtx *LogHttplogInitCtx(char *config_file)
if(file_ctx == NULL) if(file_ctx == NULL)
{ {
printf("LogHttplogInitCtx: Couldn't create new file_ctx\n"); SCLogError(SC_ERR_HTTP_LOG_GENERIC_ERROR, "LogHttplogInitCtx: Couldn't "
"create new file_ctx");
return NULL; return NULL;
} }
@ -268,7 +270,8 @@ int LogHttplogOpenFileCtx(LogFileCtx *file_ctx, char *config_file)
file_ctx->fp = fopen(log_path, "w"); file_ctx->fp = fopen(log_path, "w");
if (file_ctx->fp == NULL) { if (file_ctx->fp == NULL) {
printf("ERROR: failed to open %s: %s\n", log_path, strerror(errno)); SCLogError(SC_ERR_FOPEN, "ERROR: failed to open %s: %s", log_path,
strerror(errno));
return -1; return -1;
} }
if(file_ctx->config_file == NULL) if(file_ctx->config_file == NULL)

8
src/util-error.c
Unescape Escape View File

@ -53,6 +53,14 @@ const char * SCErrorToString(SCError err)
CASE_CODE (SC_ERR_REASSEMBLY_FAILED); CASE_CODE (SC_ERR_REASSEMBLY_FAILED);
CASE_CODE (SC_ERR_POOL_INIT_FAILED); CASE_CODE (SC_ERR_POOL_INIT_FAILED);
CASE_CODE (SC_UNIMPLEMENTED); CASE_CODE (SC_UNIMPLEMENTED);
CASE_CODE (SC_ERR_FAST_LOG_GENERIC_ERROR);
CASE_CODE (SC_ERR_DEBUG_LOG_GENERIC_ERROR);
CASE_CODE (SC_ERR_UNIFIED_LOG_GENERIC_ERROR);
CASE_CODE (SC_ERR_HTTP_LOG_GENERIC_ERROR);
CASE_CODE (SC_ERR_UNIFIED_ALERT_GENERIC_ERROR);
CASE_CODE (SC_ERR_UNIFIED2_ALERT_GENERIC_ERROR);
CASE_CODE (SC_ERR_FWRITE);
CASE_CODE (SC_ERR_FOPEN);
default: default:
return "UNKNOWN_ERROR"; return "UNKNOWN_ERROR";
} }

7
src/util-error.h
Unescape Escape View File

@ -66,6 +66,13 @@ typedef enum {
SC_ERR_DAEMON, SC_ERR_DAEMON,
SC_UNIMPLEMENTED, SC_UNIMPLEMENTED,
SC_ERR_ADDRESS_ENGINE_GENERIC_ERROR, SC_ERR_ADDRESS_ENGINE_GENERIC_ERROR,
SC_ERR_FAST_LOG_GENERIC_ERROR,
SC_ERR_DEBUG_LOG_GENERIC_ERROR,
SC_ERR_UNIFIED_LOG_GENERIC_ERROR,
SC_ERR_HTTP_LOG_GENERIC_ERROR,
SC_ERR_UNIFIED_ALERT_GENERIC_ERROR,
SC_ERR_UNIFIED2_ALERT_GENERIC_ERROR,
SC_ERR_FWRITE,
} SCError; } SCError;
const char *SCErrorToString(SCError); const char *SCErrorToString(SCError);

Write Preview
Loading…
Cancel
Save