From 894ad21be53e9c7ad2c3ae5a83c6e0951b45be5c Mon Sep 17 00:00:00 2001 From: Nikolay Denev Date: Sat, 22 Dec 2012 16:28:29 +0200 Subject: [PATCH] setsockopt() failures are already fatal, so treat them as such and print error instead of warning. --- src/source-ipfw.c | 4 ++-- src/util-error.c | 2 +- src/util-error.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/source-ipfw.c b/src/source-ipfw.c index b423337564..3b450ad9ca 100644 --- a/src/source-ipfw.c +++ b/src/source-ipfw.c @@ -349,7 +349,7 @@ TmEcode ReceiveIPFWThreadInit(ThreadVars *tv, void *initdata, void **data) timev.tv_usec = 0; if (setsockopt(nq->fd, SOL_SOCKET, SO_RCVTIMEO, &timev, sizeof(timev)) == -1) { - SCLogWarning(SC_WARN_IPFW_SETSOCKOPT,"Can't set IPFW divert socket timeout: %s", strerror(errno)); + SCLogError(SC_ERR_IPFW_SETSOCKOPT,"Can't set IPFW divert socket timeout: %s", strerror(errno)); SCReturnInt(TM_ECODE_FAILED); } @@ -358,7 +358,7 @@ TmEcode ReceiveIPFWThreadInit(ThreadVars *tv, void *initdata, void **data) flag = 1; if (setsockopt(nq->fd, SOL_SOCKET, SO_BROADCAST, &flag, sizeof(flag)) == -1) { - SCLogWarning(SC_WARN_IPFW_SETSOCKOPT,"Can't set IPFW divert socket broadcast flag: %s", strerror(errno)); + SCLogError(SC_ERR_IPFW_SETSOCKOPT,"Can't set IPFW divert socket broadcast flag: %s", strerror(errno)); SCReturnInt(TM_ECODE_FAILED); } diff --git a/src/util-error.c b/src/util-error.c index 0a5e02b40d..f8426b991a 100644 --- a/src/util-error.c +++ b/src/util-error.c @@ -139,10 +139,10 @@ const char * SCErrorToString(SCError err) CASE_CODE (SC_ERR_IPFW_NOSUPPORT); CASE_CODE (SC_ERR_IPFW_BIND); CASE_CODE (SC_ERR_IPFW_SOCK); + CASE_CODE (SC_ERR_IPFW_SETSOCKOPT); CASE_CODE (SC_ERR_IPFW_NOPORT); CASE_CODE (SC_WARN_IPFW_RECV); CASE_CODE (SC_WARN_IPFW_XMIT); - CASE_CODE (SC_WARN_IPFW_SETSOCKOPT); CASE_CODE (SC_WARN_IPFW_UNBIND); CASE_CODE (SC_ERR_MULTIPLE_RUN_MODE); CASE_CODE (SC_ERR_BPF); diff --git a/src/util-error.h b/src/util-error.h index b9b0f0b2fd..6c8a5062e7 100644 --- a/src/util-error.h +++ b/src/util-error.h @@ -109,10 +109,10 @@ typedef enum { SC_ERR_IPFW_NOSUPPORT, SC_ERR_IPFW_BIND, SC_ERR_IPFW_SOCK, + SC_ERR_IPFW_SETSOCKOPT, SC_ERR_IPFW_NOPORT, SC_WARN_IPFW_RECV, SC_WARN_IPFW_XMIT, - SC_WARN_IPFW_SETSOCKOPT, SC_WARN_IPFW_UNBIND, SC_ERR_DAEMON, SC_ERR_UNIMPLEMENTED,